Skip to content

Add wounding hit flash, replace HP damage color with yellow #143

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

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add wounding hit flash, replace HP damage color with yellow #143

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fd11ea7
Merge pull request #1 from SolariusScorch/master
SparroHawc Nov 4, 2019
ab766dc
Merge pull request #2 from SolariusScorch/master
SparroHawc Sep 1, 2020
599da3e
Change HP damage flash to orange, add red for wounds
SparroHawc Sep 1, 2020
0f0b87c
Merge pull request #3 from SolariusScorch/master
SparroHawc Nov 11, 2020
9a526db
Merge branch 'SolariusScorch:master' into master
SparroHawc Jul 24, 2021
b8c5a3d
Merge pull request #4 from SolariusScorch/master
SparroHawc Aug 10, 2021
2c03f7a
Add check for wounds on hitflash
SparroHawc Aug 10, 2021
e83c894
Merge branch 'master' of https://github.com/SparroHawc/XComFiles
SparroHawc Aug 10, 2021
b2015b6
Fix differentiation between wounds and HP damage
SparroHawc Aug 11, 2021
a900f81
Merge pull request #5 from SolariusScorch/master
SparroHawc Aug 1, 2022
6193dd1
Merge branch 'SolariusScorch:master' into master
SparroHawc Aug 8, 2022
83f402a
Merge branch 'SolariusScorch:master' into master
SparroHawc Aug 20, 2022
c38b7d4
Merge branch 'SolariusScorch:master' into master
SparroHawc Oct 5, 2022
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
60 changes: 43 additions & 17 deletions Ruleset/HitFX-basic.rul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extended:
tags:
BattleUnit:
LAST_HIT_FRAME: int
# 1: only armor damaged, 2: hp damaged
# 1: only armor damaged, 2: hp damaged, 3: stun taken, 4: morale damaged, 5: wounded
LAST_HIT_TYPE: int
LAST_HIT_POWER: int

Expand Down Expand Up @@ -36,7 +36,9 @@ extended:
unit.setTag Tag.LAST_HIT_FRAME temp;

if eq to_health 0;
if gt to_armor 0;
if gt to_wound 0;
unit.setTag Tag.LAST_HIT_TYPE 5;
else gt to_armor 0;
unit.setTag Tag.LAST_HIT_TYPE 1;
else eq to_armor 0;
if gt to_stun 0;
Expand All @@ -48,7 +50,11 @@ extended:
end;
end;
else gt to_health 0;
unit.setTag Tag.LAST_HIT_TYPE 2;
if eq to_wound 0;
unit.setTag Tag.LAST_HIT_TYPE 2;
else;
unit.setTag Tag.LAST_HIT_TYPE 5;
end;
# hits_to_kill = uni health here
div hits_to_kill to_health;
# If it takes 3 or more hits_to_kill, use weaker hit effect
Expand Down Expand Up @@ -88,10 +94,12 @@ extended:
var int temp;
var int hittype;
var int hitpower;
var int wounds;

unit.getTag temp Tag.LAST_HIT_FRAME;
unit.getTag hittype Tag.LAST_HIT_TYPE;
unit.getTag hitpower Tag.LAST_HIT_POWER;
unit.getFatalwoundsTotal wounds;

if neq temp 0;
sub temp anim_frame;
Expand All @@ -106,33 +114,51 @@ extended:
set_color new_pixel 14;
set_shade new_pixel 0;
end;
# Hit type 2 = hitpoint damage
else eq hittype 2;
if eq hitpower 0;
if gt temp -3; # number of frames to blink
set_color new_pixel 2;
#set_shade new_pixel 0;
end;
else gt hitpower 0;
if gt temp -2; # number of frames to blink
set_color new_pixel 2;
set_shade new_pixel 5;
# Hit type 5 = wound
else eq hittype 5;
if eq wounds 0;
set hittype 2;
else;
if eq hitpower 0;
if gt temp -3; # number of frames to blink
set_color new_pixel 2;
set_shade new_pixel 0;
end;
else gt hitpower 0;
if gt temp -2;
set_color new_pixel 2;
set_shade new_pixel 0;
end;
end;
end;
# Hit type 3 = stun damage
# Hit type 3 = stun damage
else eq hittype 3;
if gt temp -3; # number of frames to blink
set_color new_pixel 175;
#set_color new_pixel 0;
#set_shade new_pixel 10;
end;
# Hit type 4 = morale damage
# Hit type 4 = morale damage
else eq hittype 4;
if gt temp -10; # number of frames to blink
set_color new_pixel 112;
#set_shade new_pixel 0;
end;
end;
# Hit type 2 = hitpoint damage; we need to test this separately due to wounding logic
if eq hittype 2;
if eq hitpower 0;
if gt temp -3; # number of frames to blink
set_color new_pixel 6;
#set_shade new_pixel 0;
end;
else gt hitpower 0;
if gt temp -2; # number of frames to blink
set_color new_pixel 6;
set_shade new_pixel 5;
end;
end;
end;
end;

return new_pixel;
return new_pixel;