From 0ebd6f0828780f3511f02fe234759068ceeff4ca Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Sun, 20 Jan 2019 22:41:24 -0200 Subject: [PATCH] Add Switch to Lounge and remove unneeded League Trainer files --- .../Data/Scripts/trainer/league/bruno.trainer | Bin 5720 -> 0 bytes .../Data/Scripts/trainer/league/karen.trainer | Bin 5922 -> 0 bytes .../Data/Scripts/trainer/league/koga.trainer | Bin 5834 -> 0 bytes .../Data/Scripts/trainer/league/lance.trainer | Bin 6702 -> 0 bytes .../Data/Scripts/trainer/league/will.trainer | Bin 5892 -> 0 bytes P3D/Content/Data/maps/kolben/lounge.dat | 9 ++++++++- P3D/P3D.vbproj | 15 --------------- 7 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 P3D/Content/Data/Scripts/trainer/league/bruno.trainer delete mode 100644 P3D/Content/Data/Scripts/trainer/league/karen.trainer delete mode 100644 P3D/Content/Data/Scripts/trainer/league/koga.trainer delete mode 100644 P3D/Content/Data/Scripts/trainer/league/lance.trainer delete mode 100644 P3D/Content/Data/Scripts/trainer/league/will.trainer diff --git a/P3D/Content/Data/Scripts/trainer/league/bruno.trainer b/P3D/Content/Data/Scripts/trainer/league/bruno.trainer deleted file mode 100644 index 2558585dc10615a01da42af39ffbeccb58127d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5720 zcmeI0T~8ZF6o$`rrT&LaE+d3k+n69lMI=CQ6(9;$qbiCb$2Qo-VAnCBR$YF2()T&z z+1AwDQh+&iBVVv$J2nytAggu}y2(zHRF%u^l_mxTm?My|ao!QXmoBG$XzW#Uh^uh-E_es}Gng*JmXdZn-$&6iMPtR~q#Z$Aot?0r+L$ed{ z3}v_LI$CzDr_Qr*(wex9;4#m`f{w2J<HCJ#k%Vybx#5 zh!wJ%h#qoqrr4K7eIW`Krfvfna@un~C>_y?*3mh(4O!il#tl))9{!`9s$D8?U1`PN z;C;}Ir@zmw3^WeyL>wLQ646-NLX|rn(`%nYQ`;ju54_(o$(TBf!n z>N91C4w<_2viu2g|Kc7;>%=(Fg|?8Xj*sLaR4hh3^eT*%6}n(B_wiVKR3hX8FLw2B zs9EaJlV9}PfofLXZ*Rpj_1qyxrP>O6|xO2sqP7?WqIZ!S%#mI@gitZTBoxlUjf>IvW46 zLr&>UP!)2}oO955vkPTy8ON0OpSWRi>rt~IS?wT$njQ}J@_^p%XVt!y4EYhY@m%pjdp z8$N$}Wp>~5cap8a$V87`Ne}%qaG9F?jg$keJ3%`uELWs#3RfVEm1OEXsi`(rZnbz2om`o6MfDtP-{9F zzSR>i+GD73ZIk}f{R-LnMa8{g?dl_fVIaBSWYo+#g)YqYsxgLDX{}rEe z8(a3$s}ih%2&G&!YKpaaF9@1FmBCE{3a$t?RlQvQl+wUA%X}Rw^!d zZ%1rE7j+EiT6Kwh<+(p}Rc}StkH2d@RaeB0dcao9#A4Vg@9FD17Q0ZY{WjdAts-C8 zuL4eQ;|qAINn80Icz<}R-H504!kfnbf3M2l%NBVD%vZDrEXDp_3`^`0cYOn7?fTx% z6A%UJ%HQjX=!?5l#W9+{*~Lii4^^u-qKbFh=-+>dDzdXu*gFbj9Os?cnc125W^eD`fA*y&yRs^qvMuX)N@PQJ@P7+qHF+;T%TJKh zAAGH&ktdjaXgj_jj)Gb9hrki zTh$YJ3f-5`y()ZNA_A_e39T88patniwX%j;9XXXp@ZN((TK)~vQ~8V>adkfDNNpTK zZgHMqUIHH{h~iLYb)1=LVihwOJ%eSgnfh(qf7j<+pX=~MUvUfu-{LzJ-1Z7xUrRdI;SRBdxTt&N)<^Xdtpetaa7px;Q@pW@Ajw zsrNPbIKm%wNAa~+#KkO)SMpjIA9FJ$NmN6`WUm}r+pq!XGgqN!#KZXV({6hVhMpym3z=&ne zqe{?8m{)3hhAh8V8089_o9rAlc>N1w>@W@BV{NQU?P9!HSnA6w_&bJvd(e0GAR`Bf z4P*WRY_f65OX%dERKAXEv6Hac>%CL@w1W9ZFoBXhJ7cYMfb#x!QR@^IT<2x$quS(zPV5Ea>**XBl$oy^i-#c z-NdDgjoD=8V^8$%Na1)onDJaC2SCAVWRqRd*-5=^M8~~h3*#3hbB22kXM}yyV+tNv zX)>953nkXrp~zD9JnAqS+a=f)8JXMM7*z2PD`j`T&>105~ZnMDLS9s=@zWNs~?Kh2`!5VyR0 zcE*{-w_>u-?`4|CtAzs3H`z2+RpE0HR>|v7nPEniaVQ=OF@HUy(us`XZWTKD_s^-Y zV@|VMvAUrSw`JA+el@&br9cYzpkY*xGpYhT>fF5l7^ldSFY6ksXt&Jj-SH}$$g7p8 zi+}&D3f!26RaMl^yX9>;b-z=Mz6EC3Rrm(>WmXYWH|d49Ki|u2U-KHpOm#+8!P2sQ z^6ogbFp*P?b!C9KZ^Tq#bXb{@@C9)FXd2Iuh0 ubsv3y^gHq%PSJnj-0a^t`uM8NZ)W_?*TDMYU*_AtK-X|m<`)ursK|dX6W9*` diff --git a/P3D/Content/Data/Scripts/trainer/league/koga.trainer b/P3D/Content/Data/Scripts/trainer/league/koga.trainer deleted file mode 100644 index 72db756a4820f25eeaffb1dcdfc8f7f6c64062a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5834 zcmeHL-A)r>5S?oi-(mHVsOh!^;Sxa%Dqy5BF~*nz3oW*^_J>NWyss~zo-?zv`}Jo7 z^}?D+Hr?IM|2H#d_S^mS^Mlmnt!&D!?8|f9MY1CYxbA^glaF#=?txR6wj?r^SJII) z{3Ep{J=`_r0-T;~Neln_IL5Hk0(}5Ft#xDwJ~j4mPw6YjRB@DWkiHA*05Tm&Bx<7$ zFZ8z~BUo)r{T|2)bRtmOID1SH^iSm)mKy4LUKCGKO~!YrQj9->Px?54g%R!_!Ac#} z3ting?&)z4aYssFtW7xv-PYL0^$Kg|dPm^2a9o4W)t=%!#PtNcdU`#9Bz3rA+PqR3 z`q)Z!hTu2#p0V`Rb|PJktP6S*G+KY6$BMjxE%NJnjbOV2yGI(4=i^di9^l-DP39`X z9sSc6*UFe!OX??xzoFDGh(FN`6j$R7?0uFWu*ayFr9RFV_&30ny~Frg@V0^&k3b(P z=LmG(F>}mR4_*^_jAJFuir0oY<$a>ET)lZp)XNb4(m;&trUSJ&ubVbi=33sX|43_Y zUC@Q+j&=m2w|X!SBT##Y&uwqR`zd~`{B*CfBm3}uBX0UX3c7H4Gul_K&4gY z{R}eHWxouuO6s(6=ha}(KGQXMy%>XKYoK{PMLg`f1iIegZh@<0rkG)`_GguDL6_1m zz$bRNa_bxK7;1e5Ez<0Cpl`^qZtkWr<=J9o83(c7gf4r)En3H0g=(o?&V>YP-=3N* zZ$UkS1;#X%m$)|6j?aoi@K|rwz>snbIp;PfsJZqhSoOK|2^M_jP;auXxy?|6sP)=Y z=b3iFK=U5Pah}B+dZdP-BtagzvKTRclZR8(hw=fOHCe~({jU7ys6iLLIdjHj&%e_!8qwFca6j(Szz7CNu&WQdLcUS4{De6AF9Rt%o`{~g=y@nljaZ7bL$DMP4 zrvfE8+3j%7X3!f~Dih0UrpMTbDP}(OMDL`sPe`w18e7WYjCzf1+AOw?q1-;?N9evi zNOkAvOg_7);ZG5dH@D9^bNWy!k2vRZ4iGUNppP<)#pV%_!}#6iPFBMctdr>Psz#na z&do#RTwp@bTF%>qC1#0LiIvAb*#IVENZHvvg|cOptw3@eQe~Cpd7f-VWyvkyXt$cm zmJ!7xeVW_Z?e3tnt(uk0r}<~Jc^v-F^|s|*rWZr9g7p=hsWXeLY9X@dHLu~nkF31k z7eQ9O!aH2q3|$mgWyMwAqu!gdxQc4?laK4)>o_e0M8Vyrl(N{T7& zLMER-p-scpMgdZnhpKWRs;WyuRo>%^AS%v~u?V8#V2!s$RJd!*_hA3;9>*9_YtL_*B3!nHOuKD$l?yd zS9)7y<$KLLT=5;el%jyW9ZsEDWX1Yan?*q=X-_MA2ebDfp1nq)r0)UwredBa{Vxw& zYrq!Yw)~3$zxBpxmTY2Fl^=eI7-N;x;TPsHrp5FZ-$T4T+ZRUrvN6W@JAPN@cd-QP U5C55O|87&m8#2F(Fosxu0}c7e6aWAK diff --git a/P3D/Content/Data/Scripts/trainer/league/lance.trainer b/P3D/Content/Data/Scripts/trainer/league/lance.trainer deleted file mode 100644 index d687c94c79cbae93c87865299d05f2efe4ec7974..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6702 zcmeI1Yik=<5QgV-q5nb27eg??y2gc4aN@XC>r076`yqs&+H2XhEvdTH6;bqm`zPAI z&m5iIwJweYsVGGV?VdezJu~y3SsnfT*IR4Y8{4zG9ouV-3U**8x*ut-Vejlq`$Cka z-CAN}JJhIcXBso#u%4c;G?Qrb%5L=3*JrHprOR|h?T8Ndk&hA^iC(oG|1e({eIWUc zI1-m{TFb4~ZOeYws9?Y7nuxDpcW!auR$F?$kX%pqk?uo#ZqMv%>$)c+N%S<+c25%f z#-4~;7w@&^5@{;PE`APD`E8qM{>ta0PPF$Wb0w`e8U-G#-PpNkiTlVJhSCMkNV7f7 zHx;Q%jfq`BBm7C+$42_JC5;97)A1{-JeLn~Rd>F+^OWb#rGIvP_=z>5!x{z}V`m_l ziL@jdVe!^u1?5gwv2*46SbHMQzW9iK+oR5EJF*{Q6ZGLloE?gvDDUNTu)>b(DJb?G z*}?9GM`+^Ovnnab*S5!vT8UOB_M_yk?N8T4o)4viIvDC+n5(Df@&PaE$_Bi#DxUJcaUGkfV$ z#5+>)lSrO>1TLgMQPx0EYr38-`5Nj0&){##XDTYIRciP~T3Att0$MM8RRdoi98o)! z*VIb8(gOE)>C>#vQ2Ag36jO;Yo)h^%)sTx&9Zik!j4a`4MAR(uL;Uu|hd=PnqC7+} z>?eu+A&#Nzt=sL*W>3FynTpj?%8B|(&=Yz?rf*L>9D5x&8aYo%D~KBLjk+QW zc}sMySWC>8Q;AnjAy`DT}fueyK^ z8bCIC0z7y#oYpY-AEYt|X%^`Rmx@N$C9*hy&{Ln{F;!Ie$@cJd;wsC@zmKVWf7@UxVqsNG(d|El zlh~)KQ=B~1(=tqj-U9D3tcE^S@@ie=!}>8*c@R@yr8~|#F-7!tEVI1|vRvm8SegjXsZ3M(8Nh~>=~Q>wC*zsej!o+{MHZGn2UVx3GaU49c0lv zTAnxbsiHJ;_VFoPE$Vvf=uh!njsH^krNpY@m6MD7dEHnQ${hdUz|ET&&)NSfr#fT$ gO{Yrn1aPc>csLyoC*0fjp6*LFbdJRNA$p7U4-_d@mjD0& diff --git a/P3D/Content/Data/Scripts/trainer/league/will.trainer b/P3D/Content/Data/Scripts/trainer/league/will.trainer deleted file mode 100644 index da352bd811344a9b3830ba628901a8e05ca3a018..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5892 zcmeI0+iDwE6o%Jzq3@vNCQwX?4sjeP1vj>fn%EApNG?JNjx?54$&zY~tAwh0-@HWH z|JzG@W^^QKOI?B)G@4m^o!9#JVgCH|#v1n0_N{IwcBrS49oeb=k40bZ?{O{AwMdMY~F26m%yB#!kA_XqLRtYQy!L9dIN zif15>B-ihSM;MyHUlHi|bV<0c0r>m+Pqi;$BdZWZJM6sqEW zJrJ)`J!ZNznN^E^^)Wi~K=cd!$l7909tH{gAtO|>t$(*Omc&T0whHp(kqXcqRJpIb zr{bZK#6@1{Kx#~RnU9nG~m+eue@o5+X zhs-_95pi~b^F;o!HXMsSTp`m?mg4;G`Ff^z`mw))n_7c7G_Uf2S;ps+R^Y)KpILnV zOEaBEvf;RDDOOg4;Vfe@Q_P)bVWclqVX>G+<_qTeu5!UxRe7ul?PSL9QO~|OBX4EK zyDMEgfisVy$X5+~Pi7k7Ew8a&3!IETnQ_hY9;vUrmhhm7pYIwLpQFbI_G%_mmE9f1 zw*HRHGNvjUFh!oCrT;&s%9*d*V5+PP#~AN0mE&eROnpxOJEF?!smjX!Uq;nl;M;^! z$5eHtzT3f5buFIugy-04Un-iItzwLKXv%Z39h%t9_zJaYJ&Aa#YS#C4!tXKv%Xq44 z9Rqt*X+5uFY8|3)2UWGTsA8?GWxr zf8kX1Ie3XH*18i=5ifqOs@bltP3Nz;1LRb<8Cn13scKiq;;a?F6!4XpoiFo4yfa?> z0x?nFL*v`@L{Tq(D?ZbS`B$Bh;}@ohzFTu5_b+NYb8l`tey?fhRLu7&d??#rYjo0H diff --git a/P3D/Content/Data/maps/kolben/lounge.dat b/P3D/Content/Data/maps/kolben/lounge.dat index 6822f24a1..6676ec13e 100644 --- a/P3D/Content/Data/maps/kolben/lounge.dat +++ b/P3D/Content/Data/maps/kolben/lounge.dat @@ -34,7 +34,14 @@ pillows: PC: {"Entity"{ENT[{"Scale"{sngArr[0.2,0.5,0.5]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[10.15,-0.1,9]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[96,80,5,11][101,80,11,11][101,91,11,5]]}}{"TextureIndex"{intArr[2,2,1,1,1,1,0,0,2,2,2,2]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[1]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,0,1.57]}}]}} -{"Entity"{ENT[{"Scale"{sngArr[0.1,0.2,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[9.44,-0.1,9]}}{"TexturePath"{str[House]}}{"Textures"{recArr[[80,32,6,16][86,32,14,16][100,32,6,14]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,2,2]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} + +Wii: +{"Entity"{ENT[{"Scale"{sngArr[0.1,0.2,0.25]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9,-0.45,9]}}{"TexturePath"{str[House]}}{"Textures"{recArr[[80,32,6,16][86,32,14,16][100,32,6,14][99,32,1,16][99,47,1,1]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,3,3,2,2,4,4]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,2,1.57]}}]}} + +Switch: +{"Entity"{ENT[{"Scale"{sngArr[0.3,0.2,0.1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[9.77,-0.1,9]}}{"TexturePath"{str[Switch]}}{"Textures"{recArr[[10,39,44,28][54,39,10,28][0,39,10,28][64,39,44,28][10,29,43,10]]}}{"TextureIndex"{intArr[0,0,1,1,2,2,3,3,4,4]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} +{"Entity"{ENT[{"Scale"{sngArr[0.45,0.2,0.04]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9.75,-0.05,9]}}{"TexturePath"{str[Switch]}}{"Textures"{recArr[[66,0,62,29][128,0,4,29][62,0,4,29][0,0,62,29][66,33,62,4][66,29,62,4]]}}{"TextureIndex"{intArr[0,0,1,1,2,2,3,3,4,4,5,5]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} + Monitore: {"Entity"{ENT[{"Scale"{sngArr[4,2,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9,1.2,9.4]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index d3f621e80..9ec540091 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -8338,9 +8338,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -8359,18 +8356,9 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest @@ -8386,9 +8374,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest