From c1a8ecd6b26ef06c34823f9ed210eb7b0c7086b1 Mon Sep 17 00:00:00 2001
From: Gresille&Siffle <diskun13@gmail.com>
Date: Sat, 15 Dec 2018 14:44:43 +0100
Subject: [PATCH] Keep battlers in the TurnQueue, close #121

---
 godot/animation/death.anim       | Bin 530 -> 597 bytes
 godot/combat/CombatArena.gd      |   6 ++++--
 godot/combat/battlers/Battler.gd |   1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/godot/animation/death.anim b/godot/animation/death.anim
index 11e57853aea56f8d34e790f6765a60ec5ec70f26..504cfaa2b7b3bfbf9bf67952729381aa0b5f323e 100644
GIT binary patch
literal 597
zcmV-b0;>H|Q$s@n000005C8zC1^@s(0ssIgwJ-f(rUji50G1U`KQK!*0l{WC!@>~W
zEes$I>_N|ve27vkxydw%lu4U{!D~-0MJMcfoYK>Xmh=uRy0QdG5(F6|Lt2c9E#me8
zGypjOKL9mvGjerq&E2o!zW*=p8Io9%{#U$b<naHAcaHPxs`tNf&VPvi1x~BX(UVlc
ze@FE{;tyTVP^2w+*ZEfK$;oZJ5jI=vq}<-lR7Nh!(Y7sR>wtwvT)f$K#<o_8i!ub-
z^FPJgixl#v&EYK>=7jQqVE7w2ZcpaSe*ln+hec)SZ$?tX^8rKc!3p)B@ncfwh;r=C
zik5{yldZfQ#xM-SFzmXn>$)yn>QM_o4M0^jV57-kE&>uTAZf6Wa-fYSY#bOiTwpLP
z0V<S<B+}W>6QNKcvm82T5<GmU5IELM64Q7e+5-$T5Dc>nola)@vkw>scBnyJLqjqG
z00<fqzygt>nKBZf^c0985K{__A}N>|%1A4ftpmV0(jq{#(n)Tc^I2NMVu)L-Do{Ut
zQ!h|O7z2b;GVSV<i7{v06)RgEgxOwAgI)K2nuF2mP36~s_;4~s>aBTmi*~*bCdBpO
z#_-wS&H5g;%zb_vd((pj$Ps8d$bfCtu&~FMflZ6-Vpbo{(`HI`EoMx}AiLt^i&fH*
z;!n2iGZUc!F6{)Y@IyO=#>w_(kQ(BgjuS#KG&^DkiH~v@?yNko>`bZ>!u6PIB~)B%
js9g0`+HbT9JuS_a@P`zr33KHa;x1kF*pgeGQd2`i9i$WY

literal 530
zcmV+t0`2`$Q$s@n000005C8x?1pom00RR9fwJ-f(JOqUg0LIftIY5sR4|UMSc^L#f
zL(Mpy#T0H_+#PM1rjSySBs$8MOhs*Su=hg?3ALuF0dNOvaF;YYNdn$b^8qjbGypgN
zy<x3pZOW}qt+)GC-1mROd&&*}A9!auKdyTJ4KDf*@Sowdc3FBI#rUtm{15m8lD6ku
z=Uc7UeQxCi(QK^~bbC9~uJcotwyi2(6&FTr@@Cr^+gb&F${)1ne}cCsDd$ZCBoGXL
zisSaW{P3THusOgi^fzUyfK&p*tb^71Gygvm7oD<f?vmGK0g-KYHymS(F-ELv6xY)u
z8Kw=>g+@xHB!weGi9~2lR!lM(g%IfD=_GLWBXvedFw4@Cg}A(gB#yIHhpD_d+khbk
zf+2=78eyv+D}f>Az-k3vsBy(1q9FhP1PukCf{`L34-!Bn8Hgc@vjQryAQCeQDwVAR
z6&QfPS7aL1Ci6!p!wx*QdOD#H#EuMZ_prGIZ}%T5M4fVKb4zEge9PuYZvt}mP8SdI
zkI^UCs^2WSV3UD2e6g}5SRx+a^S6@7Ulcc&YzN?*F*S<fQiMT*C_RE0<!_a9dT;tB
zIjGS={2`rz4-~O2KKpXV+x21h1a!rL>?rRSv|<*!4}jN>SzA={d!_Ju{V>wfw1fhC
UW!G{4%-H2=UQHga6H-${L#w;%r~m)}

diff --git a/godot/combat/CombatArena.gd b/godot/combat/CombatArena.gd
index d411532..f89062e 100644
--- a/godot/combat/CombatArena.gd
+++ b/godot/combat/CombatArena.gd
@@ -92,9 +92,11 @@ func play_turn():
 	var battler : Battler = get_active_battler()
 	var targets : Array
 	var action : CombatAction
-	if battler.stats.health == 0:
+
+	while battler.stats.health == 0:
 		turn_queue.skip_turn()
-	
+		battler = get_active_battler()
+
 	battler.selected = true
 	var opponents : Array = get_targets()
 	if not opponents:
diff --git a/godot/combat/battlers/Battler.gd b/godot/combat/battlers/Battler.gd
index 9dcc5bc..dd5a404 100644
--- a/godot/combat/battlers/Battler.gd
+++ b/godot/combat/battlers/Battler.gd
@@ -46,7 +46,6 @@ func take_damage(hit):
 func _on_health_depleted():
 	selectable = false
 	yield(skin.play_death(), "completed")
-	queue_free()
 
 func appear():
 	var offset_direction = 1.0 if party_member else -1.0
-- 
GitLab