Fixed looting enemies

Kikketer · Jul 15, 2024 · 3ab7c77 · 3ab7c77
1 parent 85fe825
commit 3ab7c77
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 9 deletions.
diff --git a/images.g.jres b/images.g.jres
@@ -79,6 +79,11 @@
         "mimeType": "image/x-mkcd-f4",
         "displayName": "Pirate"
     },
+    "image17": {
+        "data": "hwQQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADw/wAAAODu7u7uAAAADu7u7u4AAAAAoA6gzAAAAACg3a2sAAAAAK7d26oAAACgrt3dqgAAAKCq3d2qAAAAoKre3aoAAAAAqt6trAAAAAAAAADdAAAAAAAAAN0AAAAAAADw/w==",
+        "mimeType": "image/x-mkcd-f4",
+        "displayName": "Militia Broken and Broke Left"
+    },
     "anim14": {
         "namespace": "myAnimations",
         "id": "anim14",

diff --git a/images.g.ts b/images.g.ts
@@ -495,6 +495,25 @@ d d d 7 7 7 7 d d d . . . . . .
 d d a a a c c d d . . . . . . . 
 . a a a . . c c . . . . . . . . 
 . f f f f . f f f . . . . . . . 
+`;
+            case "image17":
+            case "Militia Broken and Broke Left":return img`
+. . . . . . . . . . . . . . . . 
+. . . . . . . . . . . . . . . . 
+. . . . . . . . . . . . . . . . 
+. . . . . . . . . . . . . . . . 
+. . . . . . . . . . . . . . . . 
+. . . . . . . . . . . . . . . . 
+. . . . . e . . . . . . . . . . 
+. . . . e . . . . a a a . . . . 
+. . . . e e . . e e a a a . . . 
+. . . . e e a a a a a a a . . . 
+. . . . e e e d d d d e e . . . 
+. . . . e e . d d d d d d . . . 
+. . . . e e . d b d d d d . . . 
+. . . f e e a a d d d d a . . f 
+. . . f e e c c a a a a c d d f 
+. . . f e e c a a a a a a d d f 
 `;
         }
         return null;

diff --git a/island.ts b/island.ts
@@ -44,22 +44,26 @@ namespace Island {
 
         // manually check each enemy to see if they overlap, also check for parry
         currentEnemies.forEach((enemy) => {
-            if (enemy.health <= 0 && enemy.riches > 0) {
-                enemy.lootTheBody()
-            }
-
             // Don't hurt the dead, that's just mean
-            if (enemy.health <= 0) return
+            if (enemy.health <= 0 && enemy.riches <= 0) return
             if (direction === 'right' 
                 && enemy.sprite.x >= hitXZone[0] && enemy.sprite.x <= hitXZone[1]
                 // Bottom of pirate is overlapping the top of the enemy (and opposite)
                 && hitYZone[1] >= enemy.sprite.y - (enemy.sprite.height / 2) && hitYZone[0] <= enemy.sprite.y + (enemy.sprite.height / 2)) {
+                if (enemy.health <= 0 && enemy.riches > 0) {
+                    enemy.lootTheBody()
+                } else {
                     enemy.hit(1)
+                }
             } else if (direction === 'left' 
                 && enemy.sprite.x <= hitXZone[0] && enemy.sprite.x >= hitXZone[1]
                 // Same vertical check as the right side
                 && hitYZone[1] >= enemy.sprite.y - (enemy.sprite.height / 2) && hitYZone[0] <= enemy.sprite.y + (enemy.sprite.height / 2)) {
-                enemy.hit(1)
+                if (enemy.health <= 0 && enemy.riches > 0) {
+                    enemy.lootTheBody()
+                } else {
+                    enemy.hit(1)
+                }
             }
         })
 

diff --git a/map.ts b/map.ts
@@ -98,7 +98,7 @@ namespace Map {
         _bulkyBgSprite.z = 2
 
         music.play(music.createSong(assets.song`We be Sailin`), music.PlaybackMode.LoopingInBackground)
-        TreasureStats.show({ combination: ['island', 'boat'] })
+        TreasureStats.show({ combination: ['island', 'boat'], location: 'left' })
 
         // Cursor
         cursor = sprites.create(assets.image`empty`)

diff --git a/militia.ts b/militia.ts
@@ -137,7 +137,12 @@ class Militia {
             const oldY = this.sprite.y
 
             this.sprite.destroy()
-            this.sprite = sprites.create(assets.image`Militia Broken and Broke`)
+            if (this.facing === 'left') {
+                this.sprite = sprites.create(assets.image`Militia Broken and Broke Left`)
+            } else {
+                this.sprite = sprites.create(assets.image`Militia Broken and Broke`)
+            }
+
             this.sprite.x = oldX
             this.sprite.y = oldY
         }

diff --git a/treasureStats.ts b/treasureStats.ts
@@ -94,7 +94,7 @@ namespace TreasureStats {
             const locX = currentPosition === 'center' ? 80 : 5
 
             const scoreSprite = textsprite.create(text + '', 1, 15)
-            scoreSprite.x = locX + 8 + (scoreSprite.width / 2)
+            scoreSprite.x = locX + 10 + (scoreSprite.width / 2)
             scoreSprite.y = currentY
             scoreSprite.z = 100
             treasureSprites.push(scoreSprite)