fixed widget duplication issue and boss hp in 2nd phase

Chocobois · May 22, 2024 · d7afef6 · d7afef6
1 parent ca27e28
commit d7afef6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/components/Boss.ts b/src/components/Boss.ts
@@ -564,6 +564,7 @@ export class Boss extends Enemy {
             ]),
             new BossCommand(this, [
                 {key: "HPThreshold", value: [0.01], args: [], conditions: []},
+                {key: "HPChange", value: [815000], args: [], conditions: []},
                 {key: "refillHP", value: [], args: [], conditions: []},
                 {key: "nextScript", value: [], args: [], conditions: []},
             ]),
@@ -590,6 +591,7 @@ export class Boss extends Enemy {
         ],
         [
             new BossCommand(this, [
+                {key: "prorate", value: [], args: [], conditions: []},
                 {key: "wait", value: [2500], args: [], conditions: []},
                 {key: "nohit", value: [], args: [], conditions: [false]},
                 {key: "wait", value: [250], args: [], conditions: []},
@@ -606,7 +608,7 @@ export class Boss extends Enemy {
                 {key: "shootCorner", value: [3], args: [], conditions: []},
                 {key: "wait", value: [150], args: [], conditions: []},
                 {key: "wait", value: [6500], args: [], conditions: []},
-                {key: "loop", value: [1], args: [], conditions: []},
+                {key: "loop", value: [2], args: [], conditions: []},
             ]), 
             new BossCommand(this, [
                 {key: "wait", value: [3500], args: [], conditions: []},

diff --git a/src/scenes/ShopScene.ts b/src/scenes/ShopScene.ts
diff --git a/src/scenes/Thunder.ts b/src/scenes/Thunder.ts
@@ -0,0 +1,5 @@
+export class Thunder{
+    constructor () {
+
+    }
+}
diff --git a/src/scenes/UpgradeScene.ts b/src/scenes/UpgradeScene.ts
@@ -448,7 +448,7 @@ export class UpgradeScene extends BaseScene {
 		}
 		this.dataHandler.returnWidget(index);
 		if(this.dataHandler.myWidgets[index][2] < this.dataHandler.myWidgets[index][1]){
-			if(this.currentWidgetButton.veiled) {
+			if(this.currentWidgetButton.veiled && (this.currentIndex == index)) {
 				this.currentWidgetButton.unveil();
 			}
 		}