Skip to content

Implemented K Tag #1234

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
LegendaryBlueShirt merged 5 commits into from
Apr 26, 2025
Merged

Implemented K Tag #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad57e22
Added rectest
LegendaryBlueShirt Apr 25, 2025
855765f
Merge branch 'master' into k_tag
LegendaryBlueShirt Apr 25, 2025
600f196
Implemented K tag, fixed K tag typo reporting an incorrect value
LegendaryBlueShirt Apr 25, 2025
afcd6dc
Fix formatting
LegendaryBlueShirt Apr 25, 2025
4bf3661
Merge remote-tracking branch 'origin/k_tag' into k_tag
LegendaryBlueShirt Apr 25, 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 rectests/KATANA_DAMAGE.REC
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions run_rectests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ tests=(
"Katana's corkscrew blade has landing recovery:LANDING_RECOVERY.REC"
"Flail 66K is unblockable:UNBLOCKABLE_THROW.REC"
"Electra 66P dodges Earthquake Smash:DODGE_EARTHQUAKE.REC"
"Katana's extended rising blade deals the correct amount of damage:KATANA_DAMAGE.REC"
)

# Setup temp directory for outputs
Expand Down
4 changes: 2 additions & 2 deletions src/formats/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ const sd_script_tag *sd_script_get_tag(const sd_script_frame *frame, const char
}
iterator it;
sd_script_tag *now;
vector_iter_begin(&frame->tags, &it);
foreach(it, now) {
vector_iter_end(&frame->tags, &it);
foreach_reverse(it, now) {
if(strcmp(tag, now->key) == 0) {
return now;
}
Expand Down
123 changes: 70 additions & 53 deletions src/game/objects/har.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,60 @@ void har_debug(object *obj) {
}
#endif // DEBUGMODE

void calc_damage_and_stun(object *obj, af_move *move, int *damage, int *stun) {
har *h = obj->userdata;
game_player *gp = game_state_get_player(obj->gs, h->player_id);
sd_pilot *pilot = gp->pilot;

int multiplier = 100;
if(player_frame_isset(obj, "k")) {
multiplier = player_frame_get(obj, "k") + 10;
// log_debug("Set multiplier %d", multiplier);
}

*damage = move->damage * multiplier / 100;
if(multiplier < 100) {
*damage = *damage + 1;
}

if(!is_tournament(obj->gs)) {
// Single Player
// Damage = Base Damage * (20 + Power) / 30 + 1
// Stun = (Base Damage * 2 + 12) * 256
*stun = *damage;
*damage = *damage * (20 + pilot->power) / 30 + 1;
} else {
// Tournament Mode
// Damage = (Base Damage * (25 + Power) / 35 + 1) * leg/arm power / armor
// Stun = ((Base Damage * (35 + Power) / 45) * 2 + 12) * 256
*stun = *damage * (35 + pilot->power) / 45;
*damage = *damage * (25 + pilot->power) / 35 + 1;

// (Limb Power + 3) * .192
float leg_power = (pilot->leg_power + 3) * 0.192f;
float arm_power = (pilot->arm_power + 3) * 0.192f;

switch(move->extra_string_selector) {
case 0:
break;
case 1:
case 3:
// apply arm power for damage
*damage = *damage * arm_power;
break;
case 2:
case 4:
// apply leg power for damage
*damage = *damage * leg_power;
break;
case 5:
// apply leg and arm power for damage
*damage = *damage * arm_power * leg_power;
}
}
// log_debug("Calculated damage %d", *damage);
}

// function to check if har A is hitting har B. Returns 1 if the har is executing a priority move which
// would interrupt B. Currently only throws are considered priority.
int har_collide_with_har(object *obj_a, object *obj_b, int loop) {
Expand Down Expand Up @@ -1275,8 +1329,12 @@ int har_collide_with_har(object *obj_a, object *obj_b, int loop) {
}
}

int damage = 0;
int stun = 0;
calc_damage_and_stun(obj_a, move, &damage, &stun);

// rehits only do 60% damage
int damage = rehit ? move->damage * 0.6 : move->damage;
damage = rehit ? damage * 0.6 : damage;

if(object_is_airborne(obj_a) && object_is_airborne(obj_b)) {
// modify the horizontal velocity of the attacker when doing air knockback
Expand All @@ -1295,12 +1353,12 @@ int har_collide_with_har(object *obj_a, object *obj_b, int loop) {
if(player_frame_isset(obj_a, "ai")) {
str str;
str_from_c(&str, "A1-s01l50B2-C2-L5-M400");
har_take_damage(obj_b, &str, damage, move->stun);
har_take_damage(obj_b, &str, damage, stun);
str_free(&str);
obj_b->vel.x = -5.0 * object_get_direction(obj_b);
obj_b->vel.y = -9.0;
} else {
har_take_damage(obj_b, &move->footer_string, damage, move->stun);
har_take_damage(obj_b, &move->footer_string, damage, stun);
}

if(rehit) {
Expand Down Expand Up @@ -1459,16 +1517,19 @@ void har_collide_with_projectile(object *o_har, object *o_pjt) {
// face B to the direction they're being attacked from
object_set_direction(o_har, -object_get_direction(o_pjt));

int damage = rehit ? move->damage * 0.6 : move->damage;
int damage = 0;
int stun = 0;
calc_damage_and_stun(o_pjt, move, &damage, &stun);
damage = rehit ? damage * 0.6 : damage;
if(player_frame_isset(o_pjt, "ai")) {
str str;
str_from_c(&str, "A1-s01l50B2-C2-L5-M400");
har_take_damage(o_har, &str, damage, move->stun);
har_take_damage(o_har, &str, damage, stun);
str_free(&str);
o_har->vel.x = -5.0 * object_get_direction(o_har);
o_har->vel.y = -9.0;
} else {
har_take_damage(o_har, &move->footer_string, damage, move->stun);
har_take_damage(o_har, &move->footer_string, damage, stun);
if(rehit) {
o_har->vel.y -= 3;
}
Expand Down Expand Up @@ -2659,32 +2720,14 @@ int har_create(object *obj, af *af_data, int dir, int har_id, int pilot_id, int
// Enable Electra Electricity & Pyros Fire palette tricks
object_add_animation_effects(obj, EFFECT_HAR_QUIRKS);

// fixup a bunch of stuff based on player stats

float leg_power = 0.0f;
float arm_power = 0.0f;
// cheap way to check if we're in tournament mode
if(is_tournament(obj->gs)) {
// (Limb Power + 3) * .192
leg_power = (pilot->leg_power + 3) * 0.192f;
arm_power = (pilot->arm_power + 3) * 0.192f;
}

af_move *move;
int extra_index;
int fight_mode = obj->gs->match_settings.fight_mode;
// apply pilot stats and HAR upgrades/enhancements/hyper mode to the HAR
// apply HAR upgrades/enhancements/hyper mode to the HAR
for(int i = 0; i < MAX_AF_MOVES; i++) {
move = af_get_move(af_data, i);
if(move != NULL) {
if(!is_tournament(obj->gs)) {
// Single Player
// Damage = Base Damage * (20 + Power) / 30 + 1
// Stun = (Base Damage + 6) * 512
if(move->damage) {
move->stun = move->damage;
move->damage = move->damage * (20 + pilot->power) / 30 + 1;
}
// projectiles have hyper mode, but may have extra_string_selector of 0
if(move->ani.extra_string_count > 0 && move->extra_string_selector != 1 &&
move->extra_string_selector != 2) {
Expand All @@ -2700,12 +2743,6 @@ int har_create(object *obj, af *af_data, int dir, int har_id, int pilot_id, int
} else {
// normal or hyper
extra_index = fight_mode ? 1 : 0;
// Tournament Mode
// Damage = (Base Damage * (25 + Power) / 35 + 1) * leg/arm power / armor
// Stun = ((Base Damage * (35 + Power) / 45) * 2 + 12) * 256
if(move->damage) {
move->stun = move->damage * (35 + pilot->power) / 45;
}

// check for enhancements
if(move->ani.extra_string_count > 0 && move->extra_string_selector != 1 &&
Expand Down Expand Up @@ -2737,10 +2774,7 @@ int har_create(object *obj, af *af_data, int dir, int har_id, int pilot_id, int
case 0:
break;
case 1:
// arm speed and power
if(move->damage) {
move->damage = (move->damage * (25 + pilot->power) / 35 + 1) * arm_power;
}
// arm speed
if(move->ani.extra_string_count > 0) {
// sometimes there's not enough extra strings, so take the last available
str_set(&move->ani.animation_string,
Expand All @@ -2749,10 +2783,7 @@ int har_create(object *obj, af *af_data, int dir, int har_id, int pilot_id, int
}
break;
case 2:
// leg speed and power
if(move->damage) {
move->damage = (move->damage * (25 + pilot->power) / 35 + 1) * leg_power;
}
// leg speed
if(move->ani.extra_string_count > 0) {
// sometimes there's not enough extra strings, so take the last available
str_set(&move->ani.animation_string,
Expand All @@ -2761,22 +2792,8 @@ int har_create(object *obj, af *af_data, int dir, int har_id, int pilot_id, int
}
break;
case 3:
// apply arm power for damage
if(move->damage) {
move->damage = (move->damage * (25 + pilot->power) / 35 + 1) * arm_power;
}
break;
case 4:
// apply leg power for damage
if(move->damage) {
move->damage = (move->damage * (25 + pilot->power) / 35 + 1) * leg_power;
}
break;
case 5:
// apply leg and arm power for damage
if(move->damage) {
move->damage = (move->damage * (25 + pilot->power) / 35 + 1) * arm_power * leg_power;
}
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/utils/iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ void *iter_peek(iterator *iterator);
void *iter_prev(iterator *iterator);

#define foreach(iterator, item) while((item = iter_next(&iterator)) != NULL)
#define foreach_reverse(iterator, item) while((item = iter_prev(&iterator)) != NULL)

#endif // ITERATOR_H
Loading