KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo soldier typo

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-01-23 16:25:35 +01:00
parent c9a2bd2672
commit 811f22f7bc
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/game_tileset.h
View File

@@ -474,7 +474,7 @@ typedef enum EntityType {
ENTITY_MAGE, ENTITY_MAGE,
ENTITY_ORC, ENTITY_ORC,
ENTITY_POP, ENTITY_POP,
ENTITY_SOILDER, ENTITY_SOLDIER,
ENTITY_STONE, ENTITY_STONE,
ENTITY_WARRIOR, ENTITY_WARRIOR,
ENTITY_WOOD, ENTITY_WOOD,
@@ -494,7 +494,7 @@ typedef enum AnimType {
static BzTileID getEntityTile(EntityType type) { static BzTileID getEntityTile(EntityType type) {
switch (type) { switch (type) {
case ENTITY_WORKER: return 27; case ENTITY_WORKER: return 27;
case ENTITY_SOILDER: return 539; case ENTITY_SOLDIER: return 539;
case ENTITY_WARRIOR: return 1051; case ENTITY_WARRIOR: return 1051;
case ENTITY_MAGE: return 1563; case ENTITY_MAGE: return 1563;
case ENTITY_ORC: return 2075; case ENTITY_ORC: return 2075;
@@ -511,7 +511,7 @@ static BzTileID getEntityTile(EntityType type) {
static const char *getEntityStr(EntityType type) { static const char *getEntityStr(EntityType type) {
switch (type) { switch (type) {
case ENTITY_WORKER: return "worker"; case ENTITY_WORKER: return "worker";
case ENTITY_SOILDER: return "soilder"; case ENTITY_SOLDIER: return "soldier";
case ENTITY_WARRIOR: return "warrior"; case ENTITY_WARRIOR: return "warrior";
case ENTITY_MAGE: return "mage"; case ENTITY_MAGE: return "mage";
case ENTITY_ORC: return "orc"; case ENTITY_ORC: return "orc";
@@ -549,7 +549,7 @@ static bool entityHasAnimation(EntityType entity, AnimType type) {
default: default:
return false; return false;
} }
case ENTITY_SOILDER: case ENTITY_SOLDIER:
switch (type) { switch (type) {
case ANIM_IDLE: case ANIM_IDLE:
case ANIM_WALK: case ANIM_WALK:
@@ -614,7 +614,7 @@ static AnimationSequence entityGetAnimationSequence(EntityType entity, AnimType
case ANIM_DIE: return (AnimationSequence) {.startFrame = 32, .frameCount = 5}; case ANIM_DIE: return (AnimationSequence) {.startFrame = 32, .frameCount = 5};
default: break; default: break;
} }
case ENTITY_SOILDER: case ENTITY_SOLDIER:
switch (type) { switch (type) {
case ANIM_IDLE: return (AnimationSequence) {.startFrame = 539, .frameCount = 2}; case ANIM_IDLE: return (AnimationSequence) {.startFrame = 539, .frameCount = 2};
case ANIM_WALK: return (AnimationSequence) {.startFrame = 541, .frameCount = 4}; 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]; case ANIM_DIE: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}, {35, 0.1400f}, {36, 0.1400f}}) [frameIdx];
default: break; default: break;
} }
case ENTITY_SOILDER: case ENTITY_SOLDIER:
switch (type) { switch (type) {
case ANIM_IDLE: return ((AnimationFrame []) {{539, 0.2000f}, {540, 0.2000f}}) [frameIdx]; 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]; case ANIM_WALK: return ((AnimationFrame []) {{541, 0.1800f}, {542, 0.1800f}, {543, 0.1800f}, {542, 0.1800f}}) [frameIdx];

20
rawAssets/game.tsj
View File

@@ -1018,7 +1018,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":540, "id":540,
@@ -1038,7 +1038,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"animation":[ "animation":[
@@ -1080,7 +1080,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":542, "id":542,
@@ -1100,7 +1100,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":543, "id":543,
@@ -1120,7 +1120,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"animation":[ "animation":[
@@ -1158,7 +1158,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":545, "id":545,
@@ -1178,7 +1178,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":546, "id":546,
@@ -1198,7 +1198,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"animation":[ "animation":[
@@ -1244,7 +1244,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":548, "id":548,
@@ -1264,7 +1264,7 @@
"type":"int", "type":"int",
"value":2 "value":2
}], }],
"type":"soilder" "type":"soldier"
}, },
{ {
"id":549, "id":549,

20
rawAssets/game.tsx
View File

@@ -505,7 +505,7 @@
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
</tile> </tile>
<tile id="539" type="soilder"> <tile id="539" type="soldier">
<properties> <properties>
<property name="animation" value="idle"/> <property name="animation" value="idle"/>
<property name="entity" value=""/> <property name="entity" value=""/>
@@ -517,14 +517,14 @@
<frame tileid="540" duration="200"/> <frame tileid="540" duration="200"/>
</animation> </animation>
</tile> </tile>
<tile id="540" type="soilder"> <tile id="540" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>
<property name="size_y" type="int" value="2"/> <property name="size_y" type="int" value="2"/>
</properties> </properties>
</tile> </tile>
<tile id="541" type="soilder"> <tile id="541" type="soldier">
<properties> <properties>
<property name="animation" value="walk"/> <property name="animation" value="walk"/>
<property name="entity" value=""/> <property name="entity" value=""/>
@@ -538,21 +538,21 @@
<frame tileid="542" duration="180"/> <frame tileid="542" duration="180"/>
</animation> </animation>
</tile> </tile>
<tile id="542" type="soilder"> <tile id="542" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>
<property name="size_y" type="int" value="2"/> <property name="size_y" type="int" value="2"/>
</properties> </properties>
</tile> </tile>
<tile id="543" type="soilder"> <tile id="543" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>
<property name="size_y" type="int" value="2"/> <property name="size_y" type="int" value="2"/>
</properties> </properties>
</tile> </tile>
<tile id="544" type="soilder"> <tile id="544" type="soldier">
<properties> <properties>
<property name="animation" value="hurt"/> <property name="animation" value="hurt"/>
<property name="entity" value=""/> <property name="entity" value=""/>
@@ -565,21 +565,21 @@
<frame tileid="546" duration="140"/> <frame tileid="546" duration="140"/>
</animation> </animation>
</tile> </tile>
<tile id="545" type="soilder"> <tile id="545" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>
<property name="size_y" type="int" value="2"/> <property name="size_y" type="int" value="2"/>
</properties> </properties>
</tile> </tile>
<tile id="546" type="soilder"> <tile id="546" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>
<property name="size_y" type="int" value="2"/> <property name="size_y" type="int" value="2"/>
</properties> </properties>
</tile> </tile>
<tile id="547" type="soilder"> <tile id="547" type="soldier">
<properties> <properties>
<property name="animation" value="die"/> <property name="animation" value="die"/>
<property name="entity" value=""/> <property name="entity" value=""/>
@@ -594,7 +594,7 @@
<frame tileid="548" duration="140"/> <frame tileid="548" duration="140"/>
</animation> </animation>
</tile> </tile>
<tile id="548" type="soilder"> <tile id="548" type="soldier">
<properties> <properties>
<property name="entity" value=""/> <property name="entity" value=""/>
<property name="player" type="int" value="0"/> <property name="player" type="int" value="0"/>