@@ -112,16 +112,15 @@ class GameEngineTest : StringSpec({
112112 val newState = battleTick(state, attacker)
113113
114114 val compactLog = toCompactCombatEvents(newState.log)
115+ // [
116+ // CCharacterActivated(actor=Attacker, delta=BattleDelta(actors=[ActorDelta(name=Attacker, hp=30, maxHp=30, mana=100, maxMana=100, stats={}, statBuffs=[], resourceTicks=[], statOverrides=[], cooldowns={Strike=0}), ActorDelta(name=Defender, hp=25, maxHp=25, mana=100, maxMana=100, stats={}, statBuffs=[], resourceTicks=[], statOverrides=[], cooldowns={Strike=0})])),
117+ // CSkillUsed(actor=Attacker, skill=Strike, targets=[Defender], delta=BattleDelta(actors=[])),
118+ // CDamageDealt(source=Attacker, target=Defender, amount=20, targetHp=5, delta=BattleDelta(actors=[ActorDelta(name=Defender, hp=5, maxHp=null, mana=null, maxMana=null, stats=null, statBuffs=null, resourceTicks=null, statOverrides=null, cooldowns=null)]))
119+ // ]
115120
116121 val log0 = compactLog[0 ] as CompactCombatEvent .CCharacterActivated
117122 log0.actor shouldBe attacker.name
118-
119- val log1 = compactLog[1 ] as CompactCombatEvent .CSkillUsed
120-
121- log1.actor shouldBe attacker.name
122- log1.skill shouldBe " Strike"
123- log1.targets shouldBe listOf(defender.name)
124- log1.delta.actors[0 ] shouldBe ActorDelta (
123+ log0.delta.actors[0 ] shouldBe ActorDelta (
125124 name = attacker.name,
126125 hp = 30,
127126 maxHp = 30,
@@ -133,7 +132,7 @@ class GameEngineTest : StringSpec({
133132 cooldowns = mapOf("Strike " to 0),
134133 statOverrides = emptyList(),
135134 )
136- log1 .delta.actors[1 ] shouldBe ActorDelta (
135+ log0 .delta.actors[1 ] shouldBe ActorDelta (
137136 name = defender.name,
138137 hp = 25,
139138 maxHp = 25,
@@ -146,8 +145,13 @@ class GameEngineTest : StringSpec({
146145 statOverrides = emptyList(),
147146 )
148147
149- val log2 = compactLog[2 ] as CompactCombatEvent .CDamageDealt
148+ val log1 = compactLog[1 ] as CompactCombatEvent .CSkillUsed
149+
150+ log1.actor shouldBe attacker.name
151+ log1.skill shouldBe " Strike"
152+ log1.targets shouldBe listOf(defender.name)
150153
154+ val log2 = compactLog[2 ] as CompactCombatEvent .CDamageDealt
151155 log2.source shouldBe attacker.name
152156 log2.target shouldBe defender.name
153157 log2.amount shouldBe 20
0 commit comments