Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop

Browse Source 
Reviewed-on: #44
This commit was merged in pull request #44.
This commit is contained in:
Jonathan
2025-12-16 20:44:26 +01:00
parent 2fa8aa9fbc 5f75bde317
commit e5b2b8b8ab
28 changed files with 343 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/CSharp/Common/Fight/Actions/AllyAttackAction.cs
+4 -3
View File
@@ -48,10 +48,11 @@ public class AllyAttackAction : FighterAction
public override void ExecuteAction()
{
var totalDamage = minigameDetail.damageHits!.Sum(dh => dh);
targetSelect.GetTarget().AddHealth(-totalDamage);
targetSelect.GetTarget().ChangeHealth(-totalDamage);
}
public override async Task AnimateAction(AllFightersVisual allFightersVisual)
public override async Task AnimateAction(AllFightersVisual allFightersVisual,
FightHappeningAnimationContext animationContext)
{
var currentFighter = HappeningData.fighterTurn.Current;
var targetFighter = targetSelect.GetTarget();
@@ -64,7 +65,7 @@ public class AllyAttackAction : FighterAction
foreach (var hit in minigameDetail.damageHits!)
{
targetFighterVisual.SpawnDamageIndicatorNumber(hit);
targetFighterVisual.SpawnDamageIndicatorNumber($"-{hit}");
}
await currentFighterVisual.AnimatePosToBase();