remove duplicate assets, update game objects, util functions

a16z-infra · Jul 17, 2023 · 74d85f7 · 74d85f7
1 parent 9e6a77d
commit 74d85f7
Show file tree

Hide file tree

Showing 143 changed files with 5 additions and 33,284 deletions.
diff --git a/assets/environment/objects.png b/assets/environment/objects.png
diff --git a/assets/environment/sliced-objects/bush-tall.png b/assets/environment/sliced-objects/bush-tall.png
diff --git a/assets/environment/sliced-objects/bush.png b/assets/environment/sliced-objects/bush.png
diff --git a/assets/environment/sliced-objects/rock-monument.png b/assets/environment/sliced-objects/rock-monument.png
diff --git a/assets/environment/sliced-objects/rock.png b/assets/environment/sliced-objects/rock.png
diff --git a/assets/environment/sliced-objects/sign.png b/assets/environment/sliced-objects/sign.png
diff --git a/assets/environment/sliced-objects/tree-dried.png b/assets/environment/sliced-objects/tree-dried.png
diff --git a/assets/environment/sliced-objects/tree-orange.png b/assets/environment/sliced-objects/tree-orange.png
diff --git a/assets/environment/sliced-objects/tree-pink.png b/assets/environment/sliced-objects/tree-pink.png
diff --git a/assets/environment/sliced-objects/trunk.png b/assets/environment/sliced-objects/trunk.png
diff --git a/assets/environment/tileset.png b/assets/environment/tileset.png
diff --git a/assets/environment/waterfall/waterfall-1.png b/assets/environment/waterfall/waterfall-1.png
diff --git a/assets/environment/waterfall/waterfall-2.png b/assets/environment/waterfall/waterfall-2.png
diff --git a/assets/environment/waterfall/waterfall-3.png b/assets/environment/waterfall/waterfall-3.png
diff --git a/assets/heart-empty.png b/assets/heart-empty.png
diff --git a/assets/heart.png b/assets/heart.png
diff --git a/assets/logo.png b/assets/logo.png
diff --git a/assets/map.tmx b/assets/map.tmx
diff --git a/assets/npc.png b/assets/npc.png
diff --git a/assets/player.png b/assets/player.png
diff --git a/assets/second-map.json b/assets/second-map.json
diff --git a/assets/second-map.tmx b/assets/second-map.tmx
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-1.png b/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-1.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-2.png b/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-2.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-3.png b/assets/sprites/hero/attack-weapon/hero-attack-back/hero-attack-back-weapon-3.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-1.png b/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-1.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-2.png b/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-2.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-3.png b/assets/sprites/hero/attack-weapon/hero-attack-front/hero-attack-front-weapon-3.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-1.png b/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-1.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-2.png b/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-2.png
diff --git a/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-3.png b/assets/sprites/hero/attack-weapon/hero-attack-side/hero-attack-side-weapon-3.png
diff --git a/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-1.png b/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-1.png
diff --git a/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-2.png b/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-2.png
diff --git a/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-3.png b/assets/sprites/hero/attack/hero-attack-back/hero-attack-back-3.png
diff --git a/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-1.png b/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-1.png
diff --git a/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-2.png b/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-2.png
diff --git a/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-3.png b/assets/sprites/hero/attack/hero-attack-front/hero-attack-front-3.png
diff --git a/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-1.png b/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-1.png
diff --git a/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-2.png b/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-2.png
diff --git a/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-3.png b/assets/sprites/hero/attack/hero-attack-side/hero-attack-side-3.png
diff --git a/assets/sprites/hero/idle/hero-idle-back/hero-idle-back.png b/assets/sprites/hero/idle/hero-idle-back/hero-idle-back.png
diff --git a/assets/sprites/hero/idle/hero-idle-front/hero-idle-front.png b/assets/sprites/hero/idle/hero-idle-front/hero-idle-front.png
diff --git a/assets/sprites/hero/idle/hero-idle-side/hero-idle-side.png b/assets/sprites/hero/idle/hero-idle-side/hero-idle-side.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-1.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-1.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-2.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-2.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-3.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-3.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-4.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-4.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-5.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-5.png
diff --git a/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-6.png b/assets/sprites/hero/walk/hero-walk-back/hero-walk-back-6.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-1.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-1.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-2.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-2.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-3.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-3.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-4.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-4.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-5.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-5.png
diff --git a/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-6.png b/assets/sprites/hero/walk/hero-walk-front/hero-walk-front-6.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-1.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-1.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-2.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-2.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-3.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-3.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-4.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-4.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-5.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-5.png
diff --git a/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-6.png b/assets/sprites/hero/walk/hero-walk-side/hero-walk-side-6.png
diff --git a/assets/sprites/misc/arrow.png b/assets/sprites/misc/arrow.png
diff --git a/assets/sprites/misc/coin/coin-1.png b/assets/sprites/misc/coin/coin-1.png
diff --git a/assets/sprites/misc/coin/coin-2.png b/assets/sprites/misc/coin/coin-2.png
diff --git a/assets/sprites/misc/coin/coin-3.png b/assets/sprites/misc/coin/coin-3.png
diff --git a/assets/sprites/misc/coin/coin-4.png b/assets/sprites/misc/coin/coin-4.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-1.png b/assets/sprites/misc/enemy-death/enemy-death-1.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-2.png b/assets/sprites/misc/enemy-death/enemy-death-2.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-3.png b/assets/sprites/misc/enemy-death/enemy-death-3.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-4.png b/assets/sprites/misc/enemy-death/enemy-death-4.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-5.png b/assets/sprites/misc/enemy-death/enemy-death-5.png
diff --git a/assets/sprites/misc/enemy-death/enemy-death-6.png b/assets/sprites/misc/enemy-death/enemy-death-6.png
diff --git a/assets/sprites/misc/gem/gem-1.png b/assets/sprites/misc/gem/gem-1.png
diff --git a/assets/sprites/misc/gem/gem-2.png b/assets/sprites/misc/gem/gem-2.png
diff --git a/assets/sprites/misc/gem/gem-3.png b/assets/sprites/misc/gem/gem-3.png
diff --git a/assets/sprites/misc/gem/gem-4.png b/assets/sprites/misc/gem/gem-4.png
diff --git a/assets/sprites/misc/hearts/hearts-1.png b/assets/sprites/misc/hearts/hearts-1.png
diff --git a/assets/sprites/misc/hearts/hearts-2.png b/assets/sprites/misc/hearts/hearts-2.png
diff --git a/assets/sprites/mole/idle/mole-idle-back.png b/assets/sprites/mole/idle/mole-idle-back.png
diff --git a/assets/sprites/mole/idle/mole-idle-front.png b/assets/sprites/mole/idle/mole-idle-front.png
diff --git a/assets/sprites/mole/idle/mole-idle-side.png b/assets/sprites/mole/idle/mole-idle-side.png
diff --git a/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-1.png b/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-1.png
diff --git a/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-2.png b/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-2.png
diff --git a/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-3.png b/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-3.png
diff --git a/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-4.png b/assets/sprites/mole/walk/mole-walk-back/mole-walk-back-4.png
diff --git a/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-1.png b/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-1.png
diff --git a/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-2.png b/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-2.png
diff --git a/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-3.png b/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-3.png
diff --git a/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-4.png b/assets/sprites/mole/walk/mole-walk-front/mole-walk-front-4.png
diff --git a/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-1.png b/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-1.png
diff --git a/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-2.png b/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-2.png
diff --git a/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-3.png b/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-3.png
diff --git a/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-4.png b/assets/sprites/mole/walk/mole-walk-side/mole-walk-side-4.png
diff --git a/assets/sprites/treant/idle/treant-idle-back.png b/assets/sprites/treant/idle/treant-idle-back.png
diff --git a/assets/sprites/treant/idle/treant-idle-front.png b/assets/sprites/treant/idle/treant-idle-front.png
diff --git a/assets/sprites/treant/idle/treant-idle-side.png b/assets/sprites/treant/idle/treant-idle-side.png
diff --git a/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-1.png b/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-1.png
diff --git a/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-2.png b/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-2.png
diff --git a/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-3.png b/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-3.png
diff --git a/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-4.png b/assets/sprites/treant/walk/treant-walk-back/treant-walk-back-4.png
diff --git a/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-1.png b/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-1.png
diff --git a/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-2.png b/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-2.png
diff --git a/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-3.png b/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-3.png
diff --git a/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-4.png b/assets/sprites/treant/walk/treant-walk-front/treant-walk-front-4.png
diff --git a/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-1.png b/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-1.png
diff --git a/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-2.png b/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-2.png
diff --git a/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-3.png b/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-3.png
diff --git a/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-4.png b/assets/sprites/treant/walk/treant-walk-side/treant-walk-side-4.png
diff --git a/assets/spritesheets/hero/attack-weapon/hero-attack-back-weapon.png b/assets/spritesheets/hero/attack-weapon/hero-attack-back-weapon.png
diff --git a/assets/spritesheets/hero/attack-weapon/hero-attack-front-weapon.png b/assets/spritesheets/hero/attack-weapon/hero-attack-front-weapon.png
diff --git a/assets/spritesheets/hero/attack-weapon/hero-attack-side-weapon.png b/assets/spritesheets/hero/attack-weapon/hero-attack-side-weapon.png
diff --git a/assets/spritesheets/hero/attack/hero-attack-back.png b/assets/spritesheets/hero/attack/hero-attack-back.png
diff --git a/assets/spritesheets/hero/attack/hero-attack-front.png b/assets/spritesheets/hero/attack/hero-attack-front.png
diff --git a/assets/spritesheets/hero/attack/hero-attack-side.png b/assets/spritesheets/hero/attack/hero-attack-side.png
diff --git a/assets/spritesheets/hero/idle/hero-idle-back.png b/assets/spritesheets/hero/idle/hero-idle-back.png
diff --git a/assets/spritesheets/hero/idle/hero-idle-front.png b/assets/spritesheets/hero/idle/hero-idle-front.png
diff --git a/assets/spritesheets/hero/idle/hero-idle-side.png b/assets/spritesheets/hero/idle/hero-idle-side.png
diff --git a/assets/spritesheets/hero/walk/hero-walk-back.png b/assets/spritesheets/hero/walk/hero-walk-back.png
diff --git a/assets/spritesheets/hero/walk/hero-walk-front.png b/assets/spritesheets/hero/walk/hero-walk-front.png
diff --git a/assets/spritesheets/hero/walk/hero-walk-side.png b/assets/spritesheets/hero/walk/hero-walk-side.png
diff --git a/assets/spritesheets/misc/arrow-side.png b/assets/spritesheets/misc/arrow-side.png
diff --git a/assets/spritesheets/misc/arrow-up.png b/assets/spritesheets/misc/arrow-up.png
diff --git a/assets/spritesheets/misc/coin.png b/assets/spritesheets/misc/coin.png
diff --git a/assets/spritesheets/misc/enemy-death.png b/assets/spritesheets/misc/enemy-death.png
diff --git a/assets/spritesheets/misc/gem.png b/assets/spritesheets/misc/gem.png
diff --git a/assets/spritesheets/mole/idle/mole-idle-back.png b/assets/spritesheets/mole/idle/mole-idle-back.png
diff --git a/assets/spritesheets/mole/idle/mole-idle-front.png b/assets/spritesheets/mole/idle/mole-idle-front.png
diff --git a/assets/spritesheets/mole/idle/mole-idle-side.png b/assets/spritesheets/mole/idle/mole-idle-side.png
diff --git a/assets/spritesheets/mole/walk/mole-walk-back.png b/assets/spritesheets/mole/walk/mole-walk-back.png
diff --git a/assets/spritesheets/mole/walk/mole-walk-front.png b/assets/spritesheets/mole/walk/mole-walk-front.png
diff --git a/assets/spritesheets/mole/walk/mole-walk-side.png b/assets/spritesheets/mole/walk/mole-walk-side.png
diff --git a/assets/spritesheets/treant/idle/treant-idle-back.png b/assets/spritesheets/treant/idle/treant-idle-back.png
diff --git a/assets/spritesheets/treant/idle/treant-idle-front.png b/assets/spritesheets/treant/idle/treant-idle-front.png
diff --git a/assets/spritesheets/treant/idle/treant-idle-side.png b/assets/spritesheets/treant/idle/treant-idle-side.png
diff --git a/assets/spritesheets/treant/walk/treant-walk-back.png b/assets/spritesheets/treant/walk/treant-walk-back.png
diff --git a/assets/spritesheets/treant/walk/treant-walk-front.png b/assets/spritesheets/treant/walk/treant-walk-front.png
diff --git a/assets/spritesheets/treant/walk/treant-walk-side.png b/assets/spritesheets/treant/walk/treant-walk-side.png
diff --git a/assets/tilemap.json b/assets/tilemap.json
diff --git a/assets/tiles.png b/assets/tiles.png
diff --git a/assets/tileset.tsx b/assets/tileset.tsx
diff --git a/assets/tomb.png b/assets/tomb.png
diff --git a/src/game-objects/Monster.ts b/src/game-objects/Monster.ts
@@ -38,12 +38,15 @@ export abstract class Monster extends Character {
       (otherNpc as Monster).setTalking(true);
     }
 
-    let from = 'Alex';
-    let to = 'Sebastian';
+    let from = npc.name;
+    let to = otherNpc.name;
+    console.log('npc names', from, to);
     while (true) {
       let result = await converse(this.scene, from, to);
       console.log(result);
       if (result == undefined || !result || result!.text === 'STOP') {
+        this.isTalking = false;
+
         break;
       }
       [from, to] = [to, from];

diff --git a/src/utils.ts b/src/utils.ts
@@ -23,6 +23,5 @@ export async function converse(scene: AbstractScene, fromNPC: string, toNPC: str
     body: JSON.stringify({ characters: [fromNPC, toNPC] }),
   });
   const data = await response.json();
-  console.log(data);
   return data;
 }