Merge branch 'main' of github.com:Chocobois/built-to-scale

Chocobois · Aug 20, 2024 · ddeb581 · ddeb581
2 parents abf0a15 + bf563e5
commit ddeb581
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/src/assets/images/characters/largeCSit1.png b/src/assets/images/characters/largeCSit1.png
diff --git a/src/assets/images/characters/largeCWalk1.png b/src/assets/images/characters/largeCWalk1.png
diff --git a/src/assets/images/characters/largeCWalk2.png b/src/assets/images/characters/largeCWalk2.png
diff --git a/src/assets/images/characters/largeCWalk3.png b/src/assets/images/characters/largeCWalk3.png
diff --git a/src/assets/sounds/chomp.mp3 b/src/assets/sounds/chomp.mp3
diff --git a/src/components/ItemHandler.ts b/src/components/ItemHandler.ts
@@ -186,7 +186,7 @@ export class ItemHandler {
             ct.happinessBonus -= 2.125;
             ct.maxHappiness = 4.01;
             ct.tipMultiplier*=0.25;
-            //ct.queueFail = true;
+            ct.queueFail();
             return;
         } else {
             ct.happinessBonus += 0.5;

diff --git a/src/scenes/GameScene.ts b/src/scenes/GameScene.ts
@@ -484,10 +484,10 @@ export class GameScene extends BaseScene {
 			if (!this.viewedShopTutorial) {
 				this.beginShopTutorial(0);
 				return;
-			}
-		} else {
-			if(this.shopinventory.isOpen){
-				this.toggleShop();
+			} else {
+				if(this.shopinventory.isOpen){
+					this.toggleShop();
+				}
 			}
 		}
 		this.setState(GameState.Day);