Fix bug with frames not duplicating correctly. Adding multiple frames…

… at once (say, internal bomb bays) would link their settings so checking lifting body for one would check it for all of them.
Tetragramm · Jul 10, 2024 · 293e53f · 293e53f
1 parent 2402588
commit 293e53f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/PlaneBuilder/Hangar/hangar.js b/PlaneBuilder/Hangar/hangar.js
diff --git a/PlaneBuilder/plane_builder.js b/PlaneBuilder/plane_builder.js
diff --git a/PlaneBuilder/src/impl/Frames.ts b/PlaneBuilder/src/impl/Frames.ts
@@ -206,31 +206,31 @@ export class Frames extends Part {
 
     public DuplicateSection(num: number, count: number = 1) {
         const sec = this.section_list[num];
-        const new_section = {
-            frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
-            lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
-        };
-        if (new_section.internal_bracing) {
-            if (this.CountSections() + this.tail_section_list.length == this.interal_bracing_count)
-                return;
-            this.interal_bracing_count += count;
-        }
         for (let i = 0; i < count; i++) {
+            const new_section = {
+                frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
+                lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
+            };
+            if (new_section.internal_bracing) {
+                if (this.CountSections() + this.tail_section_list.length == this.interal_bracing_count)
+                    return;
+                this.interal_bracing_count += count;
+            }
             this.section_list.splice(num, 0, new_section);
         }
         this.CalculateStats();
     }
 
     private DuplicateTailSection(num: number, count: number = 1) {
         const sec = this.tail_section_list[num];
-        const new_section = {
-            frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
-            lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
-        };
-        if (new_section.internal_bracing && this.CountSections() == this.interal_bracing_count) {
-            return;
-        }
         for (let i = 0; i < count; i++) {
+            const new_section = {
+                frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
+                lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
+            };
+            if (new_section.internal_bracing && this.CountSections() == this.interal_bracing_count) {
+                return;
+            }
             this.tail_section_list.splice(num, 0, new_section);
         }
         this.CalculateStats();

diff --git a/Test/Hangar/hangar.js b/Test/Hangar/hangar.js
diff --git a/Test/plane_builder.js b/Test/plane_builder.js
diff --git a/Test/src/impl/Frames.ts b/Test/src/impl/Frames.ts
@@ -206,31 +206,31 @@ export class Frames extends Part {
 
     public DuplicateSection(num: number, count: number = 1) {
         const sec = this.section_list[num];
-        const new_section = {
-            frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
-            lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
-        };
-        if (new_section.internal_bracing) {
-            if (this.CountSections() + this.tail_section_list.length == this.interal_bracing_count)
-                return;
-            this.interal_bracing_count += count;
-        }
         for (let i = 0; i < count; i++) {
+            const new_section = {
+                frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
+                lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
+            };
+            if (new_section.internal_bracing) {
+                if (this.CountSections() + this.tail_section_list.length == this.interal_bracing_count)
+                    return;
+                this.interal_bracing_count += count;
+            }
             this.section_list.splice(num, 0, new_section);
         }
         this.CalculateStats();
     }
 
     private DuplicateTailSection(num: number, count: number = 1) {
         const sec = this.tail_section_list[num];
-        const new_section = {
-            frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
-            lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
-        };
-        if (new_section.internal_bracing && this.CountSections() == this.interal_bracing_count) {
-            return;
-        }
         for (let i = 0; i < count; i++) {
+            const new_section = {
+                frame: sec.frame, geodesic: sec.geodesic, monocoque: sec.monocoque,
+                lifting_body: sec.lifting_body, internal_bracing: sec.internal_bracing
+            };
+            if (new_section.internal_bracing && this.CountSections() == this.interal_bracing_count) {
+                return;
+            }
             this.tail_section_list.splice(num, 0, new_section);
         }
         this.CalculateStats();