From 6bdaefdeb9b578726d7180c0c67a94be18fa6cd1 Mon Sep 17 00:00:00 2001
From: Alan Youngblood <ayoungblood@oakcityit.net>
Date: Sat, 12 Aug 2023 23:27:14 -0400
Subject: [PATCH] Clean up git merge on Game.cpp added assets

---
 assets/maps/kaiju-city-map.tiled-session |  26 ++++++++++++++---------
 assets/maps/kaiju-city-tileset.aseprite  | Bin 0 -> 1666 bytes
 assets/textures/ui/TitleScreen.aseprite  | Bin 0 -> 1827 bytes
 assets/textures/ui/titlescreen.png       | Bin 0 -> 988 bytes
 assets/textures/ui/titlescreenbig.png    | Bin 0 -> 3757 bytes
 src/config/intro.json                    |   7 ++++++
 src/game/Game.cpp                        |   8 -------
 7 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 assets/maps/kaiju-city-tileset.aseprite
 create mode 100644 assets/textures/ui/TitleScreen.aseprite
 create mode 100644 assets/textures/ui/titlescreen.png
 create mode 100644 assets/textures/ui/titlescreenbig.png
 create mode 100644 src/config/intro.json

diff --git a/assets/maps/kaiju-city-map.tiled-session b/assets/maps/kaiju-city-map.tiled-session
index 886321d..1482017 100644
--- a/assets/maps/kaiju-city-map.tiled-session
+++ b/assets/maps/kaiju-city-map.tiled-session
@@ -20,11 +20,14 @@
             "scaleInEditor": 4
         },
         "kaiju-city-map.json": {
-            "scale": 3,
-            "selectedLayer": 1,
+            "expandedObjectLayers": [
+                3
+            ],
+            "scale": 4,
+            "selectedLayer": -1,
             "viewCenter": {
-                "x": 86.16666666666666,
-                "y": 10.666666666666671
+                "x": 132.75,
+                "y": 137.875
             }
         },
         "kaiju-city-map.json#kaiju-city": {
@@ -34,10 +37,13 @@
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.38866396761134,
-                "y": 218.21862348178138
+                "x": 232.3886639676113,
+                "y": 218.57287449392717
             }
         },
+        "kaiju-city-map.tmj#kaiju-city": {
+            "scaleInDock": 1
+        },
         "kaiju-city-map.tmx": {
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
@@ -83,14 +89,14 @@
     ],
     "project": "kaiju-city-map.tiled-project",
     "recentFiles": [
+        "kaiju-city-map.json",
+        "kaiju-city-map.tmj",
+        "kaiju-city.tsj",
         "testmap.json",
         "kaiju-tokyo.tsj",
-        "kaiju-city-map.json",
         "kaiju-city.tsx",
         "br-tiles.tsj",
-        "kaiju-city-map.tmx",
-        "kaiju-city-map.tmj",
-        "kaiju-city.tsj"
+        "kaiju-city-map.tmx"
     ],
     "tileset.lastUsedFilter": "JSON tileset files (*.tsj *.json)",
     "tileset.lastUsedFormat": "json",
diff --git a/assets/maps/kaiju-city-tileset.aseprite b/assets/maps/kaiju-city-tileset.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..7699d364ec43d3c92de1e35855667953f1ff0b25
GIT binary patch
literal 1666
zcmb`Fi#L>M9LHbGgl>mZ(govIlUA5?lrU2(mC7xpQk%6YtQe9@cFc^4EtOkhY8Y=N
zMWvK#3XA9%w@e7N(hRvIWL#n}-gkexZ2Jf7?>*1wdCv2^=lOnq?|C`15JZxtfUx0F
zK@<=K@q+QA^bm!aO*m8evH3r)6d`|di1;Oy2=^|6p{)BQ@;@mOSTE7l`?jO|ZT@${
z5rog@192z>DPCa?l+e!s?X7<TUiZ=m_Qg_w;~joL(`}Bx&9O^?nRR5~vK4E9$lhom
z<=Qat!P`OL+ErZO5&s}yZEY<u*vJf6V|x?0%V{Gpmp_x(zZC&aKAZzoKQyzmkj(^Y
zlw|?+-N%5Jy(WO;@y)=|r-?u)+#f)g`T8?0&a{H#&;)b<`rr=YU=7OP3$kDen&1e6
zU<Yd81yW!HI^Y5#U;zq{58;puv5*OYa6f4#Ojil`y=E+wk)56=j~v&f1QHO0sQdK@
zSN#6Uuke3_rw{NV6Rw%5RqRm=+ScM6vOtVUr&!f#+{YI~Z?XHk0?LC;^ee>H{L4S5
zSfO@lu?4A3V+DtZ)~CfA+>3;*>8y9P!{Rj;6dx*}uj!)ms4&50vtPdLK-2x62`A5L
z3YXU_x9~Q?4(xqniJ2GGp>1fUEY$n2v8lYmeB96@r|JRLid)fGQK$|o5(N(&l}hH0
zMzJEX`SBiAEScuO-<<8_$<iH>{U@0ALD5<X-LA|kpG`s0E^<C^_H;I@kJt57grCMN
zIiFj~)#X)KCeo{R7ww_7??~;)a4%z7vzhHzMtWpqX7B35h@8r%<jc7|s2xLcptGdA
zsMA12rW%go$Ijo>T#ireG$QRgb|G0Yo`yI`gbG^dv-rVlFZOEbN~dpBqR!%H6NMyp
zQtrgd;_5Jk(s_sPG^%2;0dj;IgpT;H%%fku?<kxY*RY`4)J!RRi~UmvNcL)*RXN9)
zksrjPiXsw$Eod3%GE@cz=a^-iYo8QQjqW5wOf^i)^Nhro7+n_+lHN)6(isGK{JIoV
z12a!WIYFGjxw~S{us>^T$omXQVp~b|_OUPasuUEZ<C<NCZ$2(N-adJYSMBlW_oiEW
zZoB2We_b$>$~52Sn&eaJ>2`@sdFZMB*X%?5gV6&njm?YacSw!;n1!~MNW<-qCoZV8
zW_DmJvD_fpRANZUVRo5{apPqtb>j!aB#rpr+KB9Eq6#@jUftU{dUjATu}u%Jz?u+C
z4-reWwNQzAG^6d5JLkN|NAwJ>mKcaEeXh^&v{MLNzc^|;gOr4piMB)~7|vGP-}Tnj
zA&_7oXGKODu|%cbY5|eRCmqRbKVn9$rdxKNA&GF0aH(1x$nlwLgEkNwHU;;!PW6nb
zhWnC|Hk=~MxaQHaxP1?mo%;r8QS=Dv_2ir!zZjb~8b32h{tKC0FJSlyJH@?IR#%%G
zDC|tSz@)4OGm@%{U&ZN^*4t}&&LY(hzmzpMF6U^M-&??R(6fm6^Rb2Fh{TS9r={;+
zMXw{Zv(7TLaewUol4TK}oJq3r?bGWt7tZ>ilRd6*W7r|sQp+Tc()K<u`~-avR}~ld
zstuvWF|3X1XvWr&p|Z42+@6B&$5^})-}&>XX87s(B+Mu1^ZxF}7alKYi=OD=`y`HX
z%~Ut@k@9KV&si9SBQWLmn8uvz%9Cclrp3yWFVX8;ZX<E%n(G1U>EXWJZp^0QU6ZJE
zJ>oidqjr$x6XeyRgyMiAUP_8<jLgQ)mv=TZM4P6R^@u?(^0anbI=NdIo^CnpBIKs{
z*|q4ej#?X5%9^N@a<6QuFdjBYOv$QAs0b4{_qyfP2`cop1kZ)!==T=VsFDLi-cC*S
z&&r#{hAqnM!9d%WvJK^N6xrRy1%(wg!J+))VM2dPgg39X{al9bACDqpLvX9-A2cu}
J^<*87e*jdQ-s=DW

literal 0
HcmV?d00001

diff --git a/assets/textures/ui/TitleScreen.aseprite b/assets/textures/ui/TitleScreen.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..f8fc357789aaaa85fc88085f9ab7af544e362523
GIT binary patch
literal 1827
zcmcJQX;f237=|Z6SP~#WkbMbDF}Oj5mKG5yBC&vo*ovZuh!Ri|76oYpL=ogj1O#Le
z4T-WAH`Id-C`%H>(h3@JL2G~<6;KpB2o_mN`Xy?Mt^VxXbDz1H$=vsun=grt8bZ=a
z4Dx_O9bphcVQ~J_tPn;%h;-oiKU%peLX#u9id0<)Fo08yq==jqCxvTclGXbW()<4J
zPKHovX(><!4WVW`C!jRu5b!&<`M`=WYv7Aa3UK@}1L&~QALx~70xZ8d7iem?7>I(>
zft0e>z>AVsK<9bIKzh^;V0(KzFwWi)cw>1rFmSa8@NB6(@g)@jC+qM)-4OYR{=O98
z98o3EI`|J@N!SE%Jm)@etRWW&O%?@Ekw1O;7Uf%!$zT((1JDO|5C>~e249c`Q_uuQ
z5Cl6=122#QBhUdC5CIENfP4stWQc`K2!#8a$iqm=zz<Dsp@clC=FtCl28)71<LNs;
zH^~Uy9=Xf%lPlFw9Ah_gdo<nRlhdjwp3aKj67jjk@>vo+`g4n8=`pcP`d4skEC~Qj
zru42yigIRghJ+X`7!jSA_lnnPp-qNsX*WU^$nqduVijd(@zE-4#Ns^ZGsl*1ex~g1
zZmTCuA6ZG!I9W{SUSPJ)rhwq+!7>@Pn~tV-W{Oj7ee$-FZ~N^PP?-U`43iB8qgHv1
zPb=r^_uU;Mh90-Sm|eChJwI|nT%m59xdLOkGWYP|*fOc9?epY=8B3A2IQmf&eCAlv
zJMDklcNF`Uwd!bQTp}{a#3@=|rSsF&Yb6pt|Gu{~cIty1X6o-1Jocq+9s}#Of?YA5
zY2H&4*dTSWloG<_vsURp31voYdoAi@ulFcYx5=5J4(h0g*bx}V)E#$q2y3a{VL8<2
zd4w9ylKve5cl6t`mJ=ril;T^n@FDEM7ZhO&J5RDTnJ2(Sq`0}>d5LY5IemTotumiH
z(stnilkBfnaQ$+hp?!x+uHJx4eFZ&jrsZt^>Q)(9Dj9VXCmJlBJDqm+U;vdre25sr
z5Ln{kdmesaCOw~NEZve76j{e@Qcpj^RJ(E^LnY*XtX|U<LO@Yx6=RNgq`)#kK(rXz
zoWNyD*Kv84$MD@_Z?0<8@n2lV4coUg+`^>vIt=frsAlUqB>O}pUv=Ucos&B4DHe{p
zuQ=Ac|5mK|lnX1NYX0MxWNCfkOj4`(Nmm<jl0z6Gca7AKnGF9)p;?SZzV=RObL+ns
z#%kHhkL2ao%=}VY?=lgb71^92c4=n!s&a?Aja^2(tPBqqI^Y}&8+OswHT%?wI^J3m
zmQ9<*DvC({Mbi4Hh;*TdI>Z}s0+OcJnh1>_WycGHb(C)3HB3mEE+J;yzbVf@QFmiW
zD<+0rW@gmO8`G}|5^;);xv%g0A*xpDpq(_Fm^I$7$!aW49zU}?<>>}L)h-Es!$L)#
z3UGF*<Ip#dw>DrOM%5J^SmVe<C`ZLr*ra$f7JgJTXUW;21#-CpJnkCEUA-bZ$#1nY
zeuSlxZ?FSRcqO(eN{^qNzW#7Qq{abk6#3kRBj>$nOfHv($L}OBC!RjDs4sk?$Dp#@
zx7fs{$C+>{+<q|nrmSTDLy1vP^+2JIq0P~<!PD;5!kKS-YTN>A{c1g#K3ykttqm9Q
zIog}Z;k3Zo-@ez5e`QB#Z8rVVoc0rsCX4O8x3^MKElFxAYE#>2t3=3F$g9G?0cn=J
zJ-h<>+rBt~qq<6fu)RlFzfrbu<8w9ZlO=)pU52cq?Oy4ox&8&+{OLsAwdO&w$o*pS
z1KU$!1y$K;;ohEQoN-FyvMM7%O};M$nF*Hux=2-NQv4=PnDldRd;O}*3};H*nxe(B
QkRh(9VG5m_ID^&t3!KJwSO5S3

literal 0
HcmV?d00001

diff --git a/assets/textures/ui/titlescreen.png b/assets/textures/ui/titlescreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..b995e3124db538af083989d0602a088a8b852fff
GIT binary patch
literal 988
zcmV<210(#2P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00001b5ch_0Itp)
z=>Px#V^B;~MF0Q*ot>Tk|Np)wGvIHFNjxj0WFqT{G56wYFGx;Ai5jEMCmSX*09S-D
zqVlrb?=&ixWo>cH%*=BsFv~-yQcpmwoipr50Q$5G5neMCfPNLir6OAPnPmC*j@I<K
zkN^Mxk=CJ;0000XbW%=J0RR90|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|3>sq
zqyPW{`bk7VR9J<rm)o+dAPj~Tm*W*oy)1M_-~TDMIg$Xjt9$QE4`}&6k`Ta7=Z)po
zZu(8X62F1;0PS7K^lD7#0F7KB{Phv=PCq0}V|^a#q5U3EgZ27sukHcbvjr4SaE!^x
z^Ki&q+8cQQ$nOB13%LW>)H#68V3U<W4qWN9%|5Rc5CXi;bC7oL)-VbLgdQN3muIwl
z0t3zt!1dq&+4nGjlL6RMmJeYR;POHIHUu-&HS&&My8}SWro{jP1NI_b??5O9K)?7Y
zmRZ0z3U`(hpm+c_eJWiYkjwyz2h66egnt7R2GBJ0fNK>Qz}^G00>T)evtaT$XJ-Nk
z9|5}qC}=vh5WWHI+9Ci3@daRafWVdXd%*tR0q2(?G=P&!VgD;LmH7P1WYL>Sd_J#0
z;J2XffOq)zXMhTW0xZv16#d$GKtCHm7^%S+uvkEhI%44Ah1jS?zvh<%gb1(5fh(Yb
zqR4gp>^%sm$G2pIl4#W`hw<Hp5(nlTw{jX^0O-O9&>C;<D1Ctw4gd~E4kA(;KLg#-
z+||QjX#m_!Qc*J!tlpfPF967{jvl0>fFPVCfcnH|&bJ8{qVoX8PBd(S7J`jFx0|XQ
zZP;1I?n7uCD64GiaynOK>;N+zikkr}%L0T+>j<YYB~E0L7B=P(P`_>US?6c@fiF`?
zRZ{1jnwLJ{NooO)$D;vsRU;tQ!(nb7wjSlh0G)*!!_*WA;N<6=)tqjh0ay-{0e-lk
z^zlR*KuR`xYe%e0pr+5%!N`NOuA)9n5#^dbs>KeF_;X#?gD#Ha@Kwm^(@j+?(Pn=I
zzyTMaACz(C2SGWV+Yl6hAI(B!{kFARTCKm>=vx3Zud>?wmX>M+7vVUT7?&klfLX}p
zQlJMKxGmrWQnV<3b&ud1{YRKOH5uzuEe`wV4--I3bGkepl#dy|nr0r2^kM47w*a%H
z%cKSaaD_b7w}?_=1-Kcw2LM86^tuZ3M1$83)K<V~fzez<)W<)N2R$H=u&TTO0000<
KMNUMnLSTYK>CKP;

literal 0
HcmV?d00001

diff --git a/assets/textures/ui/titlescreenbig.png b/assets/textures/ui/titlescreenbig.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1ea961f26f0905e14dc7daba43317512e6ee57d
GIT binary patch
literal 3757
zcmc&$c~p~E7QbI&2nAW3ssSkw6>Uo;p&&(3NK_CwGKfOhgpgJW3_6Ii$RhC7rPUJ`
ziuC{rXhB5-3N=!c1c+EvrbwU~5H%s9(*Oxegcx?_<6weIXO92P{pbGPd%wH9_wHMc
z_;|Y;=q=I%00U1C*R23J4B|i+kEz=it?pq8iQDSF9<DZh(v3B?`*``eVLCrQe`;!~
zX1Tp|7u$2~7w5y5$d7!f?%YB3@OC}2sHo{vv*mUWaPZ5*m)D;5ue8qo_Mf{O8yn+3
zxBY!X@z%}sEBW>ccNo2{KaXiYA5C9ScVS8JtK9Gr_3_rBo0*vZA6tJuiK)f$TfKb&
zi}XKb<B<1xYy!V~x~}s}%Ig*XetfCB;l^iOzZ?s?`88FBd(=Pm6F%xUH!gdL=`G!h
zKgl{y*`2&)ReQ=O)Oj*}aC~e@cfswQ8~5T%x|#g*sfJuru|es@RApA*>c)t8$MVyC
z^_!|>wr5(zg6Jv|^+U;Mc3-{!h1BEzm}h1cDd1G!>R`-sQa3Y%Q6-D|Hr`QsA$2#S
zyP)V)i+GyM_+aw+=;o<hFHy2&LLAqM`Sge&Np0ppnSGU6W+O$gO&6Gv@s8x&P_)t*
z_)T3gbUPmGS`10~SfuboM6w<RoQilzg967t1kwa7!>o2fl0G7kAMMkLAnvkZ1w;sI
zoes8$0a7rpK;MONpzD5D3_vv&5zaYc_ArF451^8xR}awAlr2u7gV`8Fu${x?uNtww
zP{O7WSn8WI9DtRPc`n94Yo$47<nJD(!+7A-(0Ia~Zagxued57jn`yDp9Ki|IW?@)l
zp3`T%W(pJwMXJrc8|=Kz=b(?0i(f4^EjGl_6@1^Z%%i?Ugq$e3oaS-o@&Pbj)Bn)L
z>iNTUa5#T&v}M-r9y0vaw5GzSVO4@Ld?U+${6o0HI>g~#3`k_WCTGHSh4oytA`X$x
zy_kZuCQo+~Q2U%7LZB@9Y`+r;nphkXD_@pYBM*U92QD+wgaY-*)&FXs?u8_(PsQ*9
z{lm--@ek*t!?Lz8?(JB+rkvwcB6BP2@7u7og4%G&`h`P*c_1TSG+5ZSSH1Z1<Lq$1
z1uqu~4NEyqJ;^O{-dLtz?<PBrUh=U>qCX>2#qUyy(>yq@mYFgR@$Yc)B^+)Fb7-{B
z#fmYOb(FK7`Mmu*hA7CHnv%BHGK-VuxskEBOsNoXdP)mO)ipdLPf?B4_6oFZV5Uzd
z-pet{-!G=w`RluyHO<78q!o`gfBtA<>Glfx^=JPd;`3<s3BzyH0<Msu`nY#94*fg6
z$t6Iv`8w?*_{w0_SO|mGGHC^mR!S9dj0xAVlfZg_elYnuQohw8Clok6{_2XyYDLY)
zXML789~UNy2<VR`Hqim0VDbUYi9ne0QM$CPR@I4A9C?J?Pi2JGBmScMt(SW&fsHTa
zoVnsFqQOF9Aj5H6F((677?yKle)VQdLEtAWhInT_XA&u2CE!%GJ258ktlcOhft$b?
zr4m^e%;@pWlEIFwh5}!Q6J2BBi!~?b4Q<OEra<etB4Mu%OI4X_0lGSGjLtyYiX<a?
zd?uHgcTCi_0*&er>8lIysQs$<nDoyq(Dro^q|a58`<9R9J<ZTV1B7x%y-)RDpX@g+
zP_GE&9<KCzE_=kc-s}Yh+SQkXhgZx2tLZo7EwMBtr#e^Bt1l^*l%^~M=Nw-sOei6h
zjg^yuoU4!)B_QP{!0*F@wZ_isr1`$<6j+Ey+tLmqrOWkMiSwAwyUy{D#v1qgk28)F
z5NL2Ex{O&k$R}5Wk0wEKZkHgkqbNd5BffSPYYBgYwVIshb}j3Kn1|E7AT^x{hUyE(
z2$?1LX5$yKQ1I`NJ?zwY13E>M(9;Dd@fio=BZL(_3}j&Rsv%_k(xWA!Q+HFhz>A)K
zz1Q7p9BW->orImf2<51cP-0ZcA3>I~2NC?k2Zx5F<%?v?z~fE{5sKG+1bb8o{%5m+
zY+7akc{<DBo~SJ-jfq3U`6-ro!M3$fbG6cp{;P{7nK!gOtTlm0`mDbkEQ3J(S2)xe
z;zMDM9FZo}YAwkmEqosg(_stwo$lp$v;oL%RDb~oG-?I--+pl#5!}b4XNcfv1Thxy
zbS>OShS)(beECc2o|P{x{Zqn*f6ACQ2i-B}9STVQY&R5))_tl+r%{#6Mjka)+;f{_
z|3uvl<RtTVLIad9po?(T1ULEF{gq$T(w5SMl*!6SD1Ve4Q0xRb`&?2o7#%zu+8`@Z
z2dJvQ_^_^BM7rIY@=)Mcm86yZsb)nW<1goGV;^?Tum&ID>n)b(pfM}gG%M<^xVfJ_
z+Z*Z7;#NjsW+(?cBEeW|RFBa2NM}5tl?YiaCzZRjwOvWl4<`5+L?yPQJY$57cWFb+
z0v|*We5rD{OQqN!@wFSNwkoQjr>>fsKFiReOI{*!V*R!keFS+aCFJf{Cs8}31*k`1
zm~QW)hs9RBffaM*Y|9D4JUESef3KeEpfzE4&HP@~L``%}j1ET8{I9Ve`jooLgTjnw
ztGi96IY73#PjETrfr&r22qVjcHJcN+1VPJaE6EjfnVLk%rr`DZ9*UidR!W1wse{2M
zxRSnIR>e9pRH4U8RB|Cgh)1VCpl=DkrsH2v@XhQ3g0XpyI!`BD+;7ubQd}laiVYyu
z>XG#|c>wH7v(T8HH544M)fbor#t&E=?UHfZs>ha<fIrD5LwAWD0=MKE;wl7PWHQr`
zZihg2C6rSB;H57TI4+fRPK`8Dpw>i5*05)FpMhY%)P{)_c4$41799C2^ZM}>!NO%#
zN#^pKK~U?ml%0LHS~hE-MS-5G_1A>%a`*nqh5bl#T)TnPXerqCxc6&TOG^d5m#Qv;
zs~451TnL`3P6rqXnmnMZUCUWw431uVNj<_q8t(+(aP8wRyj(k=#M}=|N^eKQx#_?B
z+j4^dJ6fD1ONwfTpCR`qZ~d_IMab->sO5$c!4M{l)+A1CI3XU9n~tpJH7h!oaWe*P
zZM$Izc^cw?w%}pdshDI{p6=Vw+QM$7Z7O6RyA%9KVY%-x#bWk0H=%9Pm;&7ZRghdq
z)2ow?Fj+%+wMXx%tU=N_R9BQSu=oiP{Ity1K>8<?`XPrY!FPlCI_F4H`Oj@8SE5mc
zDs6erS`6#a=hwvmlLM~(4{{I1Mk_~+7$DG{Wz3-8UMgXQu4JNBP-E6WVg6B(<Vk|E
ztBQ4a>`BrH8lpkN@zCCND3W+4ttps4{+(M|?WB>(wF%E_z#+xhFz*Jh)i5DPUjzFM
zS&5Lvp(aMi<%c$&bZ&E^@h)-d<yF_B3<TIyeJc*Jy?IXj?lcs*^3<00Mv5d@(KF^o
zy0Jqkp{554vAX{S`>;doThI1qa4u}zn%$ZkI^ONVH7;aVW`**{H(0_>J@|^C$z(>;
z7od9^c#!EwP5CNC39IJA{C7%FzyQCAZw_Ve4dS2jB@eCM;{vDgX#Lx6pbKZqlQK;D
z4e9RG=!M@`#F__<V|Q`$C-1%dEJsuvrU;h@AkDJAl-l+{+tMV}Q0KqnV0tFaAA`x8
dTPScsr;zCF9)+~hGVke_o^IZ*SJ$)l{|9NBrV0Q6

literal 0
HcmV?d00001

diff --git a/src/config/intro.json b/src/config/intro.json
new file mode 100644
index 0000000..0400104
--- /dev/null
+++ b/src/config/intro.json
@@ -0,0 +1,7 @@
+{
+  "intro": {
+    "1": "IN THE YEAR\n23YY ...\nHUMAN\nPARANOIA\nRUNS WILD\nCONSUMED\nBY FEAR\nAND GREED",
+    "2": "THEY DESTROY\nEACH OTHER\nAND EARTH\nWHO CAN\nSAVE THEM?\n",
+    "3": "SURELY NOT\nANOTHER\nHUMAN?!?\nPERHAPS\nONLY A\nGREATER\nMONSTER..."
+  }
+}
diff --git a/src/game/Game.cpp b/src/game/Game.cpp
index 5e3424c..3f4dc24 100644
--- a/src/game/Game.cpp
+++ b/src/game/Game.cpp
@@ -145,7 +145,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         }
         
         std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png";
-<<<<<<< HEAD
         std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png";
         std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png";
         std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg";
@@ -154,13 +153,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         assets->AddTexture("player", kaijuTex.c_str());
         assets->AddTexture("font", fontTex.c_str());
         assets->AddTexture("textBox", textBoxTex.c_str());
-=======
-
-        assets->AddTexture("player", kaijuTex.c_str());
-        assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
-        assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
-        assets->AddTexture("collider","assets/textures/ColTex.png");
->>>>>>> f449eda43f6cbd3f90508029e94741f4c2de1f9b
         
         assets->AddMusicTrack("simonZ",musicFile.c_str());