make emotes separate from speech bubbles and not flipped

cheryllium · Jan 4, 2024 · 0dc46e8 · 0dc46e8
1 parent 82410d8
commit 0dc46e8
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 7 deletions.
diff --git a/assets/emotes/angry.png b/assets/emotes/angry.png
diff --git a/assets/emotes/happy.png b/assets/emotes/happy.png
diff --git a/assets/emotes/heart.png b/assets/emotes/heart.png
diff --git a/assets/emotes/sleepy.png b/assets/emotes/sleepy.png
diff --git a/assets/speech/speech-bubble-blank.png → assets/speech-bubble-blank.png b/assets/speech/speech-bubble-blank.png → assets/speech-bubble-blank.png
diff --git a/assets/speech-bubbles.aseprite b/assets/speech-bubbles.aseprite
diff --git a/assets/speech/speech-bubble-angry.png b/assets/speech/speech-bubble-angry.png
diff --git a/assets/speech/speech-bubble-happy.png b/assets/speech/speech-bubble-happy.png
diff --git a/assets/speech/speech-bubble-heart.png b/assets/speech/speech-bubble-heart.png
diff --git a/assets/speech/speech-bubble-sleepy.png b/assets/speech/speech-bubble-sleepy.png
diff --git a/src/fish.js b/src/fish.js
@@ -198,17 +198,18 @@ export default class Fish {
       scale(-1, 1);
       image(fishImage, -fishImage.width, 0);
       if (this.emotion) {
-        image(emoteImages[this.emotion],
-              -emoteImages[this.emotion].width - fishImages[this.type-1].width + 15,
-              -20);
+        image(speechBubbleImage, -fishImage.width - speechBubbleImage.width, -20);
+        scale(-1, 1); 
+        image(emoteImages[this.emotion], fishImage.width + 10, -17); 
       }
       pop(); 
     } else {
       image(fishImage, this.x, this.y);
       if (this.emotion) {
+        image(speechBubbleImage, this.x - speechBubbleImage.width, this.y - 20); 
         image(emoteImages[this.emotion],
-              this.x - fishImage.width + emoteImages[this.emotion].width/2 + 15,
-              this.y - 20);
+              this.x - speechBubbleImage.width + emoteImages[this.emotion].width/2 - 5,
+              this.y - 17);
       }
     }
   }

diff --git a/src/main.js b/src/main.js
@@ -10,7 +10,8 @@ window.NUM_TYPES_FISH = 10;
 
 window.bg = null; // The aquarium's background image
 window.fishImages = []; // The fish images
-window.fishImagesSelected = []; 
+window.fishImagesSelected = [];
+window.speechBubbleImage = null; 
 window.emoteImages = {
   heart: null,
   happy: null,
@@ -44,8 +45,9 @@ function preload() {
   }
 
   // Load emote images
+  speechBubbleImage = loadImage("assets/speech-bubble-blank.png");
   for(let key of Object.keys(emoteImages)) {
-    emoteImages[key] = loadImage(`assets/speech/speech-bubble-${key}.png`)
+    emoteImages[key] = loadImage(`assets/emotes/${key}.png`)
   }
 
   // Load food images