From 59c55cdd7471e147a48af4358e82fbcd7e68f1b3 Mon Sep 17 00:00:00 2001
From: Jakob Haag <jakob.haag@gmx.de>
Date: Thu, 2 Jul 2020 17:50:01 +0200
Subject: [PATCH] final release

---
 GoldWars/GoldWars.xcodeproj/project.pbxproj   |   2 ++
 GoldWars/GoldWars/GameCenterManager.swift     |   2 +-
 GoldWars/GoldWars/GameViewController.swift    |   4 ++--
 GoldWars/GoldWars/Partikels/Explosion.sks     | Bin 7564 -> 7555 bytes
 GoldWars/GoldWars/Partikels/Fire.sks          | Bin 7928 -> 8046 bytes
 GoldWars/GoldWars/Partikels/LoserFire.sks     | Bin 7687 -> 7677 bytes
 .../GoldWars/RoundCalculatorService.swift     |   2 +-
 7 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj
index d42f8be..8566de1 100644
--- a/GoldWars/GoldWars.xcodeproj/project.pbxproj
+++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj
@@ -614,6 +614,7 @@
 				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -637,6 +638,7 @@
 				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/GameCenterManager.swift
index ead0e7d..05cb687 100644
--- a/GoldWars/GoldWars/GameCenterManager.swift
+++ b/GoldWars/GoldWars/GameCenterManager.swift
@@ -178,9 +178,9 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG
                      (EntityManager.gameEMInstance.scene as! GameScene).gameEnd()
                 case 6:
                     os_log("State 6 erhalten, Peer hat Spiel verlassen ", log: LOG, type: .info)
-                    (EntityManager.gameEMInstance.scene as! GameScene).gameQuit()
                     opponentQuit = true
                     quitGame = true
+                    (EntityManager.gameEMInstance.scene as! GameScene).gameQuit()
                 default:
                     break
             }
diff --git a/GoldWars/GoldWars/GameViewController.swift b/GoldWars/GoldWars/GameViewController.swift
index 3ab5d6e..600fbc6 100644
--- a/GoldWars/GoldWars/GameViewController.swift
+++ b/GoldWars/GoldWars/GameViewController.swift
@@ -22,8 +22,8 @@ class GameViewController: UIViewController {
             scene.scaleMode = .aspectFill
             view.presentScene(scene)
             //TODO: create dev profile or remove on delivery
-            view.showsFPS = true
-            view.showsNodeCount = true
+//            view.showsFPS = true
+//            view.showsNodeCount = true
         }
         GameCenterManager.sharedInstance.viewController = self
     }
diff --git a/GoldWars/GoldWars/Partikels/Explosion.sks b/GoldWars/GoldWars/Partikels/Explosion.sks
index 05170cb0fec07030c05c6d63e195d097f038fc6a..8e57ed70efbd8d17916798d87c08602c67f88378 100644
GIT binary patch
delta 148
zcmeCNZnoagz|Qo5VRIAvHK9<wYFz_80~2!t0|R3dGaxiFvotm^(op~j8yT5cSXdYv
znV1`!n*y1}wO1MC7{wUH8RZ##7{eID8D=voF-p1{D1e}$8<=Kj(A>OBYAusyyVM-1
XB~q)U)-r$r6BC4HjDpZGQffT_7f>BN

delta 157
zcmZp+?y=s`z|Qp0VRIAvHK8QkYFz_817kxAQ*#S*3j<SAGb3{oa}yl}kf?!yg@vVo
zk*Tqfp_zrLfko|QMlnWl1|P;ShWCt;{sJlndWNP3U|<H+fR)X#d9Bo1Ce=2n$x^!*
Rz<`MfLNi7{Xc#HA2LP5yA7TIi

diff --git a/GoldWars/GoldWars/Partikels/Fire.sks b/GoldWars/GoldWars/Partikels/Fire.sks
index 93a4b7435900ffcbc23fb3677f0fc26c4b577a3d..f78fb6b31b25b0976b591e2c4e3eb395b97b66fe 100644
GIT binary patch
delta 1386
zcmY*Ydr*{B6#vfmy02C7h5OyR$O__v=kBu0?qUM@Kukgs2~j|ihkz)GIGUz>CS#9r
z#%!~h@;QP`p=E{dQq;2Pp@pPb=47L0la85T<dA=~299>m+;i^y?z#8;erM*~8~c08
ztL3`KguNlD8>^=z4u+vH9HL+}#DWvt;D;0#4;k<bOoJTAgF>i;Dwq$|umBc94b;Mt
z53XO(!QFZcwJ9kMGtnI0AvH^x&__Dl41J*=gg}2700Ye^Gun(b<IH$7!R&h;LSYD4
z!3bt@5YiT~L0I4*3$Spo2eDxg0g<h_mJ&<-2pCzAl{3Dkx~4W~QE^GxP8cOM{txMp
zwo5x88e;N#^L9eC)OZf!dJDu$U624_!P~rw%DS>~4#|u$M|VJYu#gKPLu7N*<9s}j
z)Wc_LNVwA;@EYR=J|de8V|vN1Hwqn(@Ki{9_{ipn_a}N>PM6>5aM>MpM|@IJqTk_j
zy4(SSM-6_w)&!W?``vvb!#_FLGpVS@APc6NsMnmP%j_GOdVFe&U6Q28)U$70oD)3s
z2%iqQfkk|X@~qStjDrK)xo({S`Gq-CCN8L~t1GL`swpjNf|)Q23Ia!Y%*Y}rkv?sL
z*)Ru+VXm2EdQG3{Z-P=NgL0T>CYxi-C(M*UKVcRxk~T|Q%(136J0xLcoFm@haC@CD
zkIxxY<9VRc=ZUpHz@2`N+vD_m-M%EB*XwpWS3Rz?4wm-loD}Rw(46W2Madiy=oVr1
zH>5x01UXsGmMi62`DJ;#yh}bTpOr7kH{`z+s)Q;D%9Bc_lCM-KwaSai2Bk&$Olens
zRXSCq4p76?Xmz|=pw3fk)V1n*wOMUdPpaqCtLl9XYY|$4=GC&bdD>E~L3>TxtsT`)
zYd>h0wJx3L;kqwPPt~8+bM;bvvEHDs*Ei`~^*#C#{fvG=zoy^O|3Ny6MzP3)QcxP2
zjHaRKs1TK-8nhg(K+mJqfs3}V`bM-1y@%dMAEJHe06K(@ppVfpbR3;TU!gPT8}vQ8
zh%TX@(9h@!x`wW!+vpDJM1P@fjPO7_6x(qG9*$$M8>iw7oQ-pF5uT5i;MI5yUW?b^
zm+&ii58jUt;6wNX{sMoEFW_7FE&)ObBYo;gD2XDmB#tBzFY%LfGKpl6r$`Q&LCVQH
zWFKiGr${^bkz6Hzl5VO~K}S#@O{dv3pU$MSXd#_V=g?wWLQ82mt)Nx3nl7L<bTM5<
z8|VhQkp}1{x{dCp@6x^W5IsfPX$L(=zoWm=E?R$&b~D5XV{8BuEQ&?5L^g(HvpiPK
zmNS#Rz#7;(wt;P7+t?1alQpqs_BLx_ZR|AbV3*lli`|lG$+Bcy3N3Rj6_zSXwPm68
zi1ia|yY;;FiuI<o(|XS!Mt@_F5o%bCVMe48Wh5H~#!6$AQD1MoZX7pm8n=wwT;-8`
z9G}3``7FMIzsWcAt-P7H^8NfEKg>VkM|m4R!N26+@=N><?-EQ55)mRs_(ht?6!~JV
zC>7<RLR5(*VyRdro)as@D)EMB5ub}+#0}ADlWek0wI$i6*m7($Z3V$$3=3{q4!Yoi
L<vsDCw-x;h$u?fQ

delta 1362
zcmZuw2~3n%5PtJt?^<!Chx@-D5K$2XVVB+IQXoOJv}{3K5JeCL7O@C;U|Y4iFIrnu
zdzm%Hs;L&ddZeDUT3d}qTeaF4&}wW`O^r6KXKh1`u}xPYsZE?oW?sJeCiBgEc{g+K
z=DgcrxFu|}=d74fl=>t@!yp(836KO%a6=~KKt4PNMNk6eFcoT{4(cHQ4KNK}fTkV4
zoiiY9*I|56%}$jrIk*#TMn33+_HBX)=nHn}2a$4!943?HaG4?_&cajhH1r2Ym}P=M
z>%fAj&_N#JF)$#E#lk>{+f{9=vjvAhd{wc3RO^h^+5VYR>jLdC6m|R$=|t<%21tZq
z6}`N6NJJfHAh~zIaMTSc5EZUgG)`{|<U5f}l8K!V6CUJ(IJ+Vf9@XOkZ;zf5`v6yL
zD9_A);y<xjklibGrCI$5o(p-s_#{yn92H(1P400hl(^TOGGb8Pkv>N^AcT5E`{4N+
zd!)apC@`;K_SEKpKQL=<pyk1m#i--4m7cz_P+ILT8r?j-tt~LSxV1j85ypWZ%23Ax
zIFxD)89E*&p(7ii0w%yjsFWV*mFY5LBUC{(OokenDYIm@92r_*$zUT|i`K~zQm?Tm
zEg0@h@ua!aGM(Pcbhj%#!;|67N{)4=xIHenGsByi<?*IF(=swV3%ee?VfYefpz9D-
zVjt{Gae18&Ej`SC>>0^KM39N%P%?6%Y?OyeQDtam6b)WQ*OeqCUGXUarA1k)tW`cx
zK2uI9=as9<AF827s!3{&TBw$*^=gZ{L|v|KRu8Ku)ywKFP1PbaQ;XN~v<X_B)}#fs
zWm>zoO*^2S)-Gyybxn`alXSQ4)9dtEy42s+x9I!yWBOVB2mOwr8<ycIFh&^98l}b*
zquG$gGGm4Dp0U-~V;ncSj7!E1<1eh>c$|P;I2(_|qj51Fiznh*+=Scki}+<cA1}d6
zLz&Uh!H@7K_*1+c@5H<D9=sQSfxpBD@HhB4{uZCX-{bT60{#*IgfHQr@ilw{-@?D+
zZlaRDM35*FLt@EL;v^$T0r8PiQc0$fRx+O~Btf#6yh>gpTgeWxlk6s6k)z}U=_0?9
z+vIO*P)sR}qyvLAfhN*4>ZV?rPe;)LI);|eGFnSF(d~3UJw#8^bMzv;NxPZC`m;FZ
zVfoC*%Gr2U!6vdvtcq2$8a9R1vU=9Q8rgK##G2V0CfRcK7JG-SU~AYG_96S2?PiDA
zN%kE(%{ti?c8C4Rx_MCLI>$VM_vZt7JWu5r+{gXAk+<<z_#!U(V!oWO;;Z=@zK*}o
zH}H1;IX}Wr@N@jS&0#CBjj<Kl%59alDYjZ$y{*Bq)3M)i%yG(b!ExDf&2ifVlbSX&
z!nB*FX_?VxnptMfG3S~unQxkV&C5aaiusFqUsxhrj1;-z88J?jiSc5Bs1#LVvX~}j
zilyQWv0iKyd&EI;N}Lgw#0}9c?uvWjzWB$&7PYw5$LeeKvxZr@R+Tl+T4cR$t+ZBI
btF5oCF6&<S1BXpfdNQ>1<cCoYN9+E-b}L!7

diff --git a/GoldWars/GoldWars/Partikels/LoserFire.sks b/GoldWars/GoldWars/Partikels/LoserFire.sks
index bd7ef75471e8590bfb64b3d3b86c5bdb1d77f60f..318f58bcb74cd9207bc388b89e37ebf9e57db922 100644
GIT binary patch
delta 91
zcmZp-`D?x5tCZSRMoC5~MrlSF1|P;4##n|$jPi^M?gk1VXy^u}85-0#YfA5CQs<Hu
Wl9rT~W&i^wCJ4=#0HI-|v@8HtEe%Wn

delta 101
zcmexs-EOnttCY!QMkz*V1|P;4hEI$N{sJlndWNP3U|^<zgUzs6T6#B=GLy6>0~jzd
NL1@M}2n{2pwE=rx5Pkpv

diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/RoundCalculatorService.swift
index d146659..1a6e106 100644
--- a/GoldWars/GoldWars/RoundCalculatorService.swift
+++ b/GoldWars/GoldWars/RoundCalculatorService.swift
@@ -20,7 +20,7 @@ class RoundCalculatorService {
     
     let ATK_BOOST_MULTIPLICATOR = 1.1
     let DEF_BOOST_MULTIPLICATOR = 1.1
-    let MAX_ROUNDS = 3
+    let MAX_ROUNDS = 20
     var currentRound = 1
     var isCalculating = false
     var numberOfAttacks = 0