Skip to content

Adds 3 new animations sprite sheets replaces sword swing. #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LiquidityC merged 2 commits into from
Oct 10, 2025
Merged

Adds 3 new animations sprite sheets replaces sword swing. #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09f821c
Adds 3 new animations and replaces sword swing.
LiquidityC Oct 10, 2025
d7e6722
Adds support for custom skill animations
LiquidityC Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/Extras/Explosion.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/Extras/SwordSwing.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Extras/TrippleSwing.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 76 additions & 9 deletions src/player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,13 +442,74 @@ handle_next_move(UpdateData *data)
}

static void
use_skill(Skill *skill, SkillData *skillData)
update_skill_animations(Player *player)
{
LinkedList *next = player->skillAnimations;
LinkedList *prev = NULL;
while (next != NULL) {
Animation *a = next->data;
if (!a->running) {
next->data = NULL;
if (prev) {
prev->next = next->next;
} else {
player->skillAnimations = next->next;
}
LinkedList *tmp = next;
next = next->next;
free(tmp);
continue;
}
animation_update(a);
prev = next;
next = next->next;
}
}

static void
render_skill_animations(Player *player, Camera *cam)
{
LinkedList *next = player->skillAnimations;
while (next != NULL) {
Animation *a = next->data;
animation_render(a, cam);
next = next->next;
}
}

static void
destroy_skill_animations(LinkedList *skillAnimations)
{
LinkedList *next = skillAnimations;
LinkedList *tmp;
while (next != NULL) {
tmp = next;
next = next->next;
free(tmp);
}
}

static void
use_skill(Player *player, Skill *skill, SkillData *skillData)
{
skill->active = false;
skill->use(skill, skillData);
if (skill->actionRequired)
action_spent(skillData->player);
skill->resetCountdown = skill->resetTime;

if (skill->animation) {
Animation *a = skill->animation;

// Copy the orientation and position of the sword animation for the skill animation
// \see player_turn
a->sprite->pos = player->swordAnimation->sprite->pos;
a->sprite->flip = player->swordAnimation->sprite->flip;
a->sprite->angle = player->swordAnimation->sprite->angle;

animation_run(a);
linkedlist_append(&player->skillAnimations, skill->animation);
}
}
Comment on lines +492 to 513

@coderabbitai coderabbitai Bot Oct 10, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Fix: don’t spend action/cooldown or start animation on failed skill use; also dedupe animation entries

Respect the boolean return from skill->use. Only on success: set active=false, spend action, set cooldown, and start/append animation. Also avoid appending the same Animation* multiple times (causes double update/render).

Apply:

 static void
 use_skill(Player *player, Skill *skill, SkillData *skillData)
 {
-    skill->active = false;
-    skill->use(skill, skillData);
-    if (skill->actionRequired)
-        action_spent(skillData->player);
-    skill->resetCountdown = skill->resetTime;
+    bool used = skill->use(skill, skillData);
+    if (!used) {
+        // Keep skill active on failure so the player can retry (esp. directional skills)
+        return;
+    }
+    skill->active = false;
+    if (skill->actionRequired)
+        action_spent(skillData->player);
+    skill->resetCountdown = skill->resetTime;
 
-    if (skill->animation) {
+    if (skill->animation) {
         Animation *a = skill->animation;
 
         // Copy the orientation and position of the sword animation for the skill animation
         // \see player_turn
         a->sprite->pos = player->swordAnimation->sprite->pos;
         a->sprite->flip = player->swordAnimation->sprite->flip;
         a->sprite->angle = player->swordAnimation->sprite->angle;
 
         animation_run(a);
-        linkedlist_append(&player->skillAnimations, skill->animation);
+        // Avoid duplicate entries for the same animation instance
+        bool present = false;
+        for (LinkedList *it = player->skillAnimations; it; it = it->next) {
+            if (it->data == a) { present = true; break; }
+        }
+        if (!present) {
+            linkedlist_append(&player->skillAnimations, a);
+        }
     }
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
static void
use_skill(Player *player, Skill *skill, SkillData *skillData)
{
skill->active = false;
skill->use(skill, skillData);
if (skill->actionRequired)
action_spent(skillData->player);
skill->resetCountdown = skill->resetTime;
if (skill->animation) {
Animation *a = skill->animation;
// Copy the orientation and position of the sword animation for the skill animation
// \see player_turn
a->sprite->pos = player->swordAnimation->sprite->pos;
a->sprite->flip = player->swordAnimation->sprite->flip;
a->sprite->angle = player->swordAnimation->sprite->angle;
animation_run(a);
linkedlist_append(&player->skillAnimations, skill->animation);
}
}
static void
use_skill(Player *player, Skill *skill, SkillData *skillData)
{
bool used = skill->use(skill, skillData);
if (!used) {
// Keep skill active on failure so the player can retry (esp. directional skills)
return;
}
skill->active = false;
if (skill->actionRequired)
action_spent(skillData->player);
skill->resetCountdown = skill->resetTime;
if (skill->animation) {
Animation *a = skill->animation;
// Copy the orientation and position of the sword animation for the skill animation
// \see player_turn
a->sprite->pos = player->swordAnimation->sprite->pos;
a->sprite->flip = player->swordAnimation->sprite->flip;
a->sprite->angle = player->swordAnimation->sprite->angle;
animation_run(a);
// Avoid duplicate entries for the same animation instance
bool present = false;
for (LinkedList *it = player->skillAnimations; it; it = it->next) {
if (it->data == a) {
present = true;
break;
}
}
if (!present) {
linkedlist_append(&player->skillAnimations, a);
}
}
}
🤖 Prompt for AI Agents 
In src/player.c around lines 492 to 513, the code ignores the boolean return
from skill->use and always spends action, sets cooldown, and starts/appends the
animation (which can be appended multiple times). Change the flow to call
skill->use(skill, skillData) and store its bool result; only if true: set
skill->active = false, call action_spent(... ) when actionRequired, set
resetCountdown, run the animation and append it. When appending, first check the
player's skillAnimations list to avoid adding the same Animation* twice (skip
append if already present). If skill->use returns false, do none of those side
effects.


static void
Expand Down Expand Up @@ -487,7 +548,7 @@ check_skill_activation(UpdateData *data)
skill->active = (selected - 1) == i && !skill->active && skill->resetCountdown == 0;
if (skill->active && skill->instantUse) {
SkillData skillData = { player, matrix, VECTOR2D_NODIR };
use_skill(skill, &skillData);
use_skill(player, skill, &skillData);
}
}
}
Expand Down Expand Up @@ -515,7 +576,7 @@ check_skill_trigger(UpdateData *data)
return false;

SkillData skillData = { player, matrix, nextDir };
use_skill(player->skills[activeSkill], &skillData);
use_skill(player, player->skills[activeSkill], &skillData);

return true;
}
Expand All @@ -525,16 +586,16 @@ build_sword_animation(Player *p, SDL_Renderer *renderer)
{
animation_load_texture(p->swordAnimation, "Extras/SwordSwing.png", renderer);
animation_set_frames(p->swordAnimation, (AnimationClip[]) {
{ 0, 0, 16, 16, 20 },
{ 16, 0, 16, 16, 20 },
{ 32, 0, 16, 16, 20 },
{ 48, 0, 16, 16, 20 },
{ 64, 0, 16, 16, 20 }
{ 0, 0, 32, 32, 20 },
{ 32, 0, 32, 32, 20 },
{ 64, 0, 32, 32, 20 },
{ 96, 0, 32, 32, 20 },
{ 128, 0, 32, 32, 20 }
});

p->swordAnimation->loop = false;
p->swordAnimation->sprite->dim = GAME_DIMENSION;
p->swordAnimation->sprite->clip = (SDL_Rect) { 0, 0, 16, 16 };
p->swordAnimation->sprite->clip = (SDL_Rect) { 0, 0, 32, 32 };
p->swordAnimation->sprite->rotationPoint = (SDL_Point) { 16, 16 };
}

Expand Down Expand Up @@ -625,6 +686,8 @@ player_create(class_t class, Camera *cam)
player->sprite->dim = GAME_DIMENSION;
player->sprite->clip = (SDL_Rect) { 0, 0, 16, 16 };

player->skillAnimations = NULL;

return player;
}

Expand Down Expand Up @@ -736,6 +799,7 @@ void
player_render_toplayer(Player *player, Camera *camera)
{
animation_render(player->swordAnimation, camera);
render_skill_animations(player, camera);
}

void
Expand Down Expand Up @@ -788,6 +852,7 @@ player_update(UpdateData *data)
player->projectiles = remaining;

animation_update(player->swordAnimation);
update_skill_animations(player);

uint32_t damage_taken = player->stats.maxhp - player->stats.hp;
player->bleed_emitter->enabled = (int) damage_taken >= player->stats.maxhp / 2;
Expand Down Expand Up @@ -821,6 +886,8 @@ player_destroy(Player *player)
player->skills[i] = NULL;
}

destroy_skill_animations(player->skillAnimations);

particle_emitter_destroy(player->bleed_emitter);

free(player);
Expand Down
1 change: 1 addition & 0 deletions src/player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ typedef struct Player {
PlayerStateData stateData;
PlayerEffects effects;
ParticleEmitter *bleed_emitter;
LinkedList *skillAnimations;
} Player;

Player*
Expand Down
29 changes: 25 additions & 4 deletions src/skill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <stdlib.h>
#include <string.h>
#include "defines.h"
#include "texturecache.h"
#include "skill.h"
#include "util.h"
Expand Down Expand Up @@ -306,6 +307,7 @@ create_default(const char *s_label, Sprite *s)
skill->use = NULL;
skill->levelcap = 1;
skill->tooltip = NULL;
skill->animation = NULL;
return skill;
}

Expand Down Expand Up @@ -402,7 +404,6 @@ skill_use_flurry(Skill *skill, SkillData *data)
return false;
}

animation_run(data->player->swordAnimation);
Monster *monster = data->matrix->spaces[targetPos.x][targetPos.y].monster;
mixer_play_effect(TRIPPLE_SWING);
if (monster) {
Expand Down Expand Up @@ -433,7 +434,7 @@ skill_use_flurry(Skill *skill, SkillData *data)
}

static Skill *
create_flurry(void)
create_flurry(Camera *cam)
{
Texture *t = texturecache_add("Extras/Skills.png");
Sprite *s = sprite_create();
Expand All @@ -444,6 +445,25 @@ create_flurry(void)
Skill *skill = create_default("Flurry", s);
skill->levelcap = 2;
skill->use = skill_use_flurry;
skill->tooltip = tooltip_create(flurry_tooltip, cam);
skill->animation = animation_create(8);

Animation *a = skill->animation;
animation_load_texture(a, "Extras/TrippleSwing.png", cam->renderer);
animation_set_frames(a, (AnimationClip[]) {
{ 0, 0, 32, 32, 20 },
{ 32, 0, 32, 32, 20 },
{ 64, 0, 32, 32, 20 },
{ 96, 0, 32, 32, 20 },
{ 128, 0, 32, 32, 20 },
{ 160, 0, 32, 32, 20 },
{ 192, 0, 32, 32, 20 },
{ 224, 0, 32, 32, 20 }
});
a->loop = false;
a->sprite->dim = GAME_DIMENSION;
a->sprite->clip = (SDL_Rect) { 0, 0, 32, 32 };
a->sprite->rotationPoint = (SDL_Point) { 16, 16 };
return skill;
}

Expand Down Expand Up @@ -1016,8 +1036,7 @@ skill_create(enum SkillType t, Camera *cam)
Skill *skill;
switch (t) {
case FLURRY:
skill = create_flurry();
skill->tooltip = tooltip_create(flurry_tooltip, cam);
skill = create_flurry(cam);
break;
case VAMPIRIC_BLOW:
skill = create_vampiric_blow();
Expand Down Expand Up @@ -1076,5 +1095,7 @@ skill_destroy(Skill *skill)
sprite_destroy(skill->icon);
if (skill->tooltip)
tooltip_destroy(skill->tooltip);
if (skill->animation)
animation_destroy(skill->animation);
free(skill);
}
2 changes: 2 additions & 0 deletions src/skill.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define SKILL_H_

#include <stdbool.h>
#include "animation.h"
#include "roommatrix.h"
#include "sprite.h"
#include "vector2d.h"
Expand Down Expand Up @@ -60,6 +61,7 @@ typedef struct Skill_t {
bool (*available)(Player*);
bool (*use)(struct Skill_t*, SkillData*);
Tooltip *tooltip;
Animation *animation;
} Skill;

Skill*
Expand Down
Loading