From 8e22f02c7a02caa0f6b1e3705ee4d317c2624963 Mon Sep 17 00:00:00 2001 From: Aldin Duraki Date: Thu, 21 May 2020 03:18:07 +0200 Subject: [PATCH] * Impl. debugging move on MapGeneration * Changed fire particle with master designer niko von jochim --- GoldWars/GoldWars/Partikels/Fire.sks | Bin 7975 -> 7929 bytes GoldWars/GoldWars/Scenes/GameScene.swift | 3 +++ 2 files changed, 3 insertions(+) diff --git a/GoldWars/GoldWars/Partikels/Fire.sks b/GoldWars/GoldWars/Partikels/Fire.sks index f25e78f0519eda7cf34d37d2aaf74a2bb8d5574a..1f31d2ee246501b8f420929f38872eb5d147ae58 100644 GIT binary patch delta 2264 zcmZux4Rln+6~1?O-<$X5En(%fW#4-clPrXU1k7ePi3vZ81S~coh#N=rO(@F&;~JK+QP5cb0XI0Q%G z7#xRd@HyOoui$IA4d1~XxC{5--)KTJ)Sv~e_zN6}4jhC@n1X5O!iRAbj>X?#9!|n3 zSdKodz}e`>N}PjFB33tjzAsb;bNHQA5a6_w&uW+pHBie}0hq^W#G}&Qy$^z18i1z_ z?a0apjqt3YRnDmo7IXaoFk>CX1MmWuya-F79A1W3U>Ucy+&H-sUWF#gRe#U7r4ZOT z%yiE(-g66#;TWUF-<`#mOmsvg01nTdHEWt9GRfgN5nVdQgvJ=S!}I5@1G@RrF~$>a zAOl^Du)Yjf9G}2!1_c)DI2h64gNe2X;OGSsI8P5>AP-`E_%6|u)sPQsxW{W@T{uok zBpaX^TA(#NQHpi9KwEKvcarZ(e?_npHo==*cQd>NZx=9h3@XTbAYU<;F5 zU~71Tl$0D%d>6JgGo=F}2H%4n{KzBq_2mt%eA5<{w!{13TarE04!fXjMuB%+pduKk zt1Yi@=rFF@4SSkdOjLI->?K21oZdBYUPYp|~;Aof?{P6QY8~NHth26Q(vgQ{$YAj3^Kgr+M=V{m%p!)cacz zcyWHRT-2DB8aFI$(ODEAA4Mc6p^OyP!8%l?mIVVf{`qCLer17L9{aqyx#f{OPpk{C zQ2OUQ#GGu9kwokRdp2PV_C*^$fc@BDHk75ZVQe^yIg7uQ+vuu{bMuxNWg?UCxVU^KR zBbZQTOKnUWp5{z^h{@l+ZE}b;m!=FJ3Bku>2hT|-5KumtVNxXvh(cD zh3mZF-|I=CWRO6G1V{xZGrws*Y(8baY`$qRTVgD#CDG!s6k94R)s~Ru zB}=Pio8^GzjOCK$j$jdDg%rUR67q!#;VFR$D}>F$9^trfR=6PC76nlk-Qo!GF>$gu zORN!@_>$Npt`WD0yTlV>r`Rpt5WgcPl1P$>ljM+*WIQP#kCSP{N2*DX{FXdJ7Lw=5 z60(%MOqP-5WF=`LVe&`v8d*culJ#T*X(3xl=pFJd*-mzlcCw4?CLfZ0ZFCz zA}J(2C%quOC~cA6lXgh$(thcvbW-Y+zL0K7Kgyy^WLfSf$ID3}IayAZU2=vzR?d~j z$&bpD>ZBL1)r3I*a<~ zY+6aHXn)^XNH ztrM(MtR>c2R-bjYwbH)BzSn--e%gNCe%bz|{g#TVtXkC=)uyVdt`1bw)k1Z?xF&`#V Olw)m__fj+HKmG?Kad7Ma delta 2263 zcmZ7#3v^V)_1^uwnK!c}D}greJw8h|#1InLkllnRBw#=f1s5bpASfY$4Qvca3@a5v z+~KE|gEV#R2Z1IbA$$}mVvAN9B8NW(gn$S=B5GBrQoxd05T&zkQE6w++nj+Dq${ELA9hR;7JK5EB`^F-%s zU>vNK$^0G~BUYM1)4_VKnt+Z2D{__B(?%upw6g3VHQ3%m-i75NJXJrP(i zuUO)0Q#`L3UJ+_DY>h0Tso|*Nc6hx>@RJaA_y+t@nvATiEnTo)UfN>Zo$zLfGr?c@ z@Kd4EvdX}y;LK34x~jBxK@04Jx1jAYf8me3lV?&&`mo4#A1J?fo? zW6FC>rY6xnX8jf%S|1Jac;VR5bAzE!pw?eKEAXMy34ev7a14&ayKn+d z%0xQh6r6_l;0(MEXW^V2;|}-$&YQRqK9cwo+4E23>41xHskkH<*`yxjUz&xzEDL)j zB3Q5fvHMriyU>JvN?o=$-IeXF?}UGwnqN!FjmSGJC45&)giY8xA;!2J?UCps?33#< z(_NYMW*%ro+tk9blLAkNo~jM3M=P`y*ZF*dvVG|;U;Ph3it0S+t_)B8X;fhxGUVvM zZWsrR(1`JqOG3f9fq5m)?j^yhP#`jmC*9`}LqvbGjCc?1+JN0L0efIi{E0{r14V`y zBnFGP)2N}22KJIZdt)Ezt1r4DJNc@9_lmSmOhUI5Bx8R}ndC1VGwM+Z3JRP=q>2GM z${l`3Sk49xz%<$Dg6hiZ+QORBnKFlgX6t|C#1hTGL2`yn?t09Cwo~Z26FL)a;1G04 zY0;cuDDZ#>M7l^jiAgfL4^x~LG2rf(4#nKqOUFmDw2_JOsdr0kHOR*1gta)=#b1Y<8Q|X4q0~BW=aDfNidAv2BH|)wbQ% zVLNI2$ad4N*j@GvyU*^o2ki6gOY9By&GxtLhwW$VAK0%eMCq+$hn3;VSfx-YQ>v9E z$_gc-tWmZoZz@NW)5^!n73Bu8kyMgKvdA!!M;;;*$V4)Y%p!Bid=e&$$x^bMtRfBM zMe-8)4QV9Jq=jrC8_8z!3fW4wk?mv$*+tsP0dj~OAxFt^a)NY{)8q^}Oa4awPQss& zi{u*l7wIBjlN;n4@-4YdDP`0_<7fhP(R7+abLstbI2}bFrc-Ds4bm$5bGnSKq`##v z)3vmbHq#cmj~=7P=?Qv{eoQ~7S5-yrrs}F&O;%IX!D^m5T76I*uTD@WswL_SwN#y{ zR;o{`;jp?#J*vL1o>woa*VS8$vjod(Qd!DUe4Qw6T#I~?k*=uYk+spQ|gX{!5&n~eq*kyKwTX;ObhbM3sPvXgZAoub- zUcmjlh?npXujAnczLvN0Hol2(;X8Oc@8Em*UcR3njiq5K1(mxtM!HYBK?^vUFb{nW%{%FFZJK)TlLrV1NyuAdHr*}OTT4M zqo>iwa2ZKPvXNp8HZqMY!)N3exyD4J+*oEb8*RomW0%oxbQqV7o4xwUA1Rl`62n*< K!{5VR?*9VN;C1-` diff --git a/GoldWars/GoldWars/Scenes/GameScene.swift b/GoldWars/GoldWars/Scenes/GameScene.swift index 962fe46..8a967a0 100644 --- a/GoldWars/GoldWars/Scenes/GameScene.swift +++ b/GoldWars/GoldWars/Scenes/GameScene.swift @@ -30,6 +30,9 @@ class GameScene: SKScene{ MultiplayerNetwork.sharedInstance.sendMapModelToPlayers(mapModel: mapModel) DataService.sharedInstance.setSnapshotModel(snapshotModel: EntityManager.sharedInstance.getSnapshotModel()) } + if CommandLine.arguments.contains("--no-matchmaking") { + MapFactory(scene: self, entityManager: EntityManager.sharedInstance).loadMap() + } } override func touchesEnded(_ touches: Set, with event: UIEvent?) {