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

Extend death animation

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-02-07 18:01:44 +01:00
parent e595ec9333
commit 593c947f2e
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game/game_tileset.h
View File

@@ -751,7 +751,7 @@ static f32 entityGetAnimationLength(EntityType entity, AnimType type) {
case ANIM_IDLE: return 0.4f; case ANIM_IDLE: return 0.4f;
case ANIM_WALK: return 0.72f; case ANIM_WALK: return 0.72f;
case ANIM_HURT: return 0.42000000000000004f; case ANIM_HURT: return 0.42000000000000004f;
case ANIM_DIE: return 0.9000000000000001f; case ANIM_DIE: return 1.2400000000000002f;
default: break; default: break;
} }
case ENTITY_SOLDIER: case ENTITY_SOLDIER:
@@ -863,7 +863,7 @@ static AnimationFrame entityGetAnimationFrame(EntityType entity, AnimType type,
case ANIM_IDLE: return ((AnimationFrame []) {{27, 0.2000f}, {28, 0.2000f}}) [frameIdx]; case ANIM_IDLE: return ((AnimationFrame []) {{27, 0.2000f}, {28, 0.2000f}}) [frameIdx];
case ANIM_WALK: return ((AnimationFrame []) {{29, 0.1800f}, {30, 0.1800f}, {31, 0.1800f}, {30, 0.1800f}}) [frameIdx]; case ANIM_WALK: return ((AnimationFrame []) {{29, 0.1800f}, {30, 0.1800f}, {31, 0.1800f}, {30, 0.1800f}}) [frameIdx];
case ANIM_HURT: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}}) [frameIdx]; case ANIM_HURT: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}}) [frameIdx];
case ANIM_DIE: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}, {35, 0.1400f}, {36, 0.3400f}}) [frameIdx]; case ANIM_DIE: return ((AnimationFrame []) {{32, 0.1400f}, {33, 0.1400f}, {34, 0.1400f}, {35, 0.1400f}, {36, 0.6800f}}) [frameIdx];
default: break; default: break;
} }
case ENTITY_SOLDIER: case ENTITY_SOLDIER:

12
rawAssets/game.tsj
View File

@@ -432,7 +432,7 @@
"tileid":35 "tileid":35
}, },
{ {
"duration":340, "duration":680,
"tileid":36 "tileid":36
}], }],
"id":35, "id":35,
@@ -1265,7 +1265,7 @@
"tileid":547 "tileid":547
}, },
{ {
"duration":140, "duration":680,
"tileid":548 "tileid":548
}], }],
"id":547, "id":547,
@@ -1930,7 +1930,7 @@
"tileid":1059 "tileid":1059
}, },
{ {
"duration":140, "duration":680,
"tileid":1060 "tileid":1060
}], }],
"id":1059, "id":1059,
@@ -2697,7 +2697,7 @@
"tileid":1571 "tileid":1571
}, },
{ {
"duration":140, "duration":680,
"tileid":1572 "tileid":1572
}], }],
"id":1571, "id":1571,
@@ -5380,7 +5380,7 @@
"tileid":2083 "tileid":2083
}, },
{ {
"duration":140, "duration":680,
"tileid":2084 "tileid":2084
}], }],
"id":2083, "id":2083,
@@ -6593,7 +6593,7 @@
"tileid":2595 "tileid":2595
}, },
{ {
"duration":140, "duration":680,
"tileid":2596 "tileid":2596
}], }],
"id":2595, "id":2595,

12
rawAssets/game.tsx
View File

@@ -199,7 +199,7 @@
<frame tileid="33" duration="140"/> <frame tileid="33" duration="140"/>
<frame tileid="34" duration="140"/> <frame tileid="34" duration="140"/>
<frame tileid="35" duration="140"/> <frame tileid="35" duration="140"/>
<frame tileid="36" duration="340"/> <frame tileid="36" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="36" type="worker"> <tile id="36" type="worker">
@@ -597,7 +597,7 @@
<frame tileid="545" duration="140"/> <frame tileid="545" duration="140"/>
<frame tileid="546" duration="140"/> <frame tileid="546" duration="140"/>
<frame tileid="547" duration="140"/> <frame tileid="547" duration="140"/>
<frame tileid="548" duration="140"/> <frame tileid="548" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="548" type="soldier"> <tile id="548" type="soldier">
@@ -877,7 +877,7 @@
<frame tileid="1057" duration="140"/> <frame tileid="1057" duration="140"/>
<frame tileid="1058" duration="140"/> <frame tileid="1058" duration="140"/>
<frame tileid="1059" duration="140"/> <frame tileid="1059" duration="140"/>
<frame tileid="1060" duration="140"/> <frame tileid="1060" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="1060" type="warrior"> <tile id="1060" type="warrior">
@@ -1212,7 +1212,7 @@
<frame tileid="1569" duration="140"/> <frame tileid="1569" duration="140"/>
<frame tileid="1570" duration="140"/> <frame tileid="1570" duration="140"/>
<frame tileid="1571" duration="140"/> <frame tileid="1571" duration="140"/>
<frame tileid="1572" duration="140"/> <frame tileid="1572" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="1572" type="mage"> <tile id="1572" type="mage">
@@ -2036,7 +2036,7 @@
<frame tileid="2081" duration="140"/> <frame tileid="2081" duration="140"/>
<frame tileid="2082" duration="140"/> <frame tileid="2082" duration="140"/>
<frame tileid="2083" duration="140"/> <frame tileid="2083" duration="140"/>
<frame tileid="2084" duration="140"/> <frame tileid="2084" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="2084" type="orc"> <tile id="2084" type="orc">
@@ -2410,7 +2410,7 @@
<frame tileid="2593" duration="140"/> <frame tileid="2593" duration="140"/>
<frame tileid="2594" duration="140"/> <frame tileid="2594" duration="140"/>
<frame tileid="2595" duration="140"/> <frame tileid="2595" duration="140"/>
<frame tileid="2596" duration="140"/> <frame tileid="2596" duration="680"/>
</animation> </animation>
</tile> </tile>
<tile id="2596" type="goblin"> <tile id="2596" type="goblin">