diff --git a/game/game_tileset.h b/game/game_tileset.h index 979535e..663cb32 100644 --- a/game/game_tileset.h +++ b/game/game_tileset.h @@ -474,7 +474,7 @@ typedef enum EntityType { ENTITY_MAGE, ENTITY_ORC, ENTITY_POP, - ENTITY_SOILDER, + ENTITY_SOLDIER, ENTITY_STONE, ENTITY_WARRIOR, ENTITY_WOOD, @@ -494,7 +494,7 @@ typedef enum AnimType { static BzTileID getEntityTile(EntityType type) { switch (type) { case ENTITY_WORKER: return 27; - case ENTITY_SOILDER: return 539; + case ENTITY_SOLDIER: return 539; case ENTITY_WARRIOR: return 1051; case ENTITY_MAGE: return 1563; case ENTITY_ORC: return 2075; @@ -511,7 +511,7 @@ static BzTileID getEntityTile(EntityType type) { static const char *getEntityStr(EntityType type) { switch (type) { case ENTITY_WORKER: return "worker"; - case ENTITY_SOILDER: return "soilder"; + case ENTITY_SOLDIER: return "soldier"; case ENTITY_WARRIOR: return "warrior"; case ENTITY_MAGE: return "mage"; case ENTITY_ORC: return "orc"; @@ -549,7 +549,7 @@ static bool entityHasAnimation(EntityType entity, AnimType type) { default: return false; } - case ENTITY_SOILDER: + case ENTITY_SOLDIER: switch (type) { case ANIM_IDLE: case ANIM_WALK: @@ -614,7 +614,7 @@ static AnimationSequence entityGetAnimationSequence(EntityType entity, AnimType case ANIM_DIE: return (AnimationSequence) {.startFrame = 32, .frameCount = 5}; default: break; } - case ENTITY_SOILDER: + case ENTITY_SOLDIER: switch (type) { case ANIM_IDLE: return (AnimationSequence) {.startFrame = 539, .frameCount = 2}; case ANIM_WALK: return (AnimationSequence) {.startFrame = 541, .frameCount = 4}; @@ -670,7 +670,7 @@ static AnimationFrame entityGetAnimationFrame(EntityType entity, AnimType type, case ANIM_DIE: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}, {35, 0.1400f}, {36, 0.1400f}}) [frameIdx]; default: break; } - case ENTITY_SOILDER: + case ENTITY_SOLDIER: switch (type) { case ANIM_IDLE: return ((AnimationFrame []) {{539, 0.2000f}, {540, 0.2000f}}) [frameIdx]; case ANIM_WALK: return ((AnimationFrame []) {{541, 0.1800f}, {542, 0.1800f}, {543, 0.1800f}, {542, 0.1800f}}) [frameIdx]; diff --git a/rawAssets/game.tsj b/rawAssets/game.tsj index a96a2e2..a17db08 100644 --- a/rawAssets/game.tsj +++ b/rawAssets/game.tsj @@ -1018,7 +1018,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":540, @@ -1038,7 +1038,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "animation":[ @@ -1080,7 +1080,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":542, @@ -1100,7 +1100,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":543, @@ -1120,7 +1120,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "animation":[ @@ -1158,7 +1158,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":545, @@ -1178,7 +1178,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":546, @@ -1198,7 +1198,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "animation":[ @@ -1244,7 +1244,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":548, @@ -1264,7 +1264,7 @@ "type":"int", "value":2 }], - "type":"soilder" + "type":"soldier" }, { "id":549, diff --git a/rawAssets/game.tsx b/rawAssets/game.tsx index a32c348..547fe2f 100644 --- a/rawAssets/game.tsx +++ b/rawAssets/game.tsx @@ -505,7 +505,7 @@ - + @@ -517,14 +517,14 @@ - + - + @@ -538,21 +538,21 @@ - + - + - + @@ -565,21 +565,21 @@ - + - + - + @@ -594,7 +594,7 @@ - +