From f8eee8b09e236e4e256578f97ba77a1e66058993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcell=20Isp=C3=A1nki?= Date: Fri, 27 Nov 2015 15:26:26 +0100 Subject: [PATCH 1/5] random update --- Assets/scripts/Buildings/Old/Miner.meta | 9 --------- Assets/scripts/Items.meta | 9 --------- ProjectSettings/ProjectSettings.asset | Bin 40845 -> 42921 bytes ProjectSettings/ProjectVersion.txt | 2 +- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 Assets/scripts/Buildings/Old/Miner.meta delete mode 100644 Assets/scripts/Items.meta diff --git a/Assets/scripts/Buildings/Old/Miner.meta b/Assets/scripts/Buildings/Old/Miner.meta deleted file mode 100644 index a0fcbd2..0000000 --- a/Assets/scripts/Buildings/Old/Miner.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a4b1a82bee9595649a13750df7982280 -folderAsset: yes -timeCreated: 1445957826 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/scripts/Items.meta b/Assets/scripts/Items.meta deleted file mode 100644 index c810a99..0000000 --- a/Assets/scripts/Items.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: cbd7ef222c40b934a93f7b2918175de6 -folderAsset: yes -timeCreated: 1445957826 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a02c341e9ddf0ac457130832f003dacb40981c69..56b9f86a1faf0d31160cc3b028b40683187cfc7e 100644 GIT binary patch literal 42921 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 literal 40845 zcmd6w2b^4G`R~t$(7W^=ARs7UvYUhuL1s(J!ftkx-4sBC*_qkwklC4GN|Hr|K~$s( zD58i6h^Sx%DHc!^8(6>sDq=yUSx_vf2y%bF_j%5<=RI={e?Rx$&*$C)vpe%W@ALBc z+i=28&u_i;eea$b1b;gu2)5)EIF1g27Q(;eUbKRs1OI(wv!HcrN6i{W}=%2);BUXuS=u>0tTsK>A%e-;L)?=T43ZKMLvj0A4dsI~(r^9tFQq zIcgurEa$l%DgG>8(X$J2gx`)=WBhF8 zY^TxuUJA~1&LYPVrvDb@2MRX+W90|M_+OMC9N|poHZvrhvt#^F<%h)hfbv6QysZ3{ zF@CA?!(#k;<%h@koyuQDo{{`AoewF0bu9eT%8!Wg&Ct=2<>1H|-$nURG5$*BuZi*3 zDt99o&awQNo>j`xzugh?g7VH7uPN_}@wY3V7vt|&K0n59R=yy{?^TZR(j8%X9#GD4 zjz`EJSAL9O5wbjA8{@N;9~Z zd1gAD+hgKoIdC54!FUe@I|>h6609L?k@WXX16$ z(P@5&@-t)nNaeK{pRc@bT>ABK${R7hT6r_Z*DK!;;cRagfwR4BByYKNdiAvlIH^5w zU76G#&N43Pyi((RBRCK1@8G=tO@tZY91ri(@NXu^5sow8SAMo&$C>_Tz?uGY$Xg8W zw>O}~^q))a9)5d%i*acuT&yzOd3f*$)4!+kw+c3Xl=8R5`0JFvJ;sNXpC99=DSrof zCP1s|2ryT+roh>*E+EGdwzn&lU+7rIrHAEtjq;0JXh}c$r<7kD;cVw$1806OiSdV( zzca@Fr2Ntt@7P*Amqj?^-5H$ezdXV@-yHF_dV}5E}kLvyf4Lbm4){`?>8=l_O6wik&yzjZexOnbW&xcbyH(Ge#^AY3Xc~m_gP4Rrp!uy_^jEm<5_1v7|`M8Dm zJ)bZxp53>RcKFE@&!;TB@Ac7Rf-_CC}kMIAiaq;BTb6bk% zb_?%&?oiJ01Z$zzn>3wwMm(Iqu2%jz^K=AgGp*~Cf8N3izf<`aBAny%x4}6+f04Y! zKJ1UrcL68OFL#r>hd(}l$+(pBQyTA=!Fh!9#S6;saa1_RnccRP`u&P=zx==I91QQ5 z+r7qR9d$T7%-7fGX}R#;y!my8&yf4;v~Q5Rho7%+8W;a@>i-salK(!2&$RpRCwC9u z|83(kudRTe;l6_hk8oa_Q2t%P#y2Sc9(hK>bG>&VILqMy3-8zOgU0=G_*big;)5?Do;jG^~z&VdRWPEdP-S{xLl+WhgJo01X(ys1S|4+;# z{q85~|EY1m{XAkGzy18oxU7@^1P{yYQF>ZTlV5H>H}01k=1_OAUCls7S#I?F(!$Sl z`+mFN9Qm(|Z|=3v$H1liY~ji$+*kZHxqEEk?JNGq_)NFXKT!R@1?SNb`2NQQgZus` zBK&Yo|4v{}8sF0GD=xq}{2x4Jd@HXWp9Yt7ZspbE?~HHh!XF0-+t2UKBjw)*&hq&K zd5bQ;{Qqd&FaKxAaj^VPh9fNhKM}Ub{qp~_ald??1y3sfzmU6!U;ckJKGWTwmJv6@ z{S6NujCTMjI7j*42{Yu9-^;<7-{;6%HU0kq=MisjF9`KpoJelC%%DC^} znj8oH2k8AW>vtOqFYOTPPB%VmYuv9F?q?^}%l72X@7K!?#>Kx4>YnlL$iOXLdubKD#)73m(7xcXfVpzkGIc9^ujQ-`%+Qx87d*#U3gCJyZO9 zna8i+y^YH}vK#ztZ~M@X0t(kBhbiAT!r70G)%5H~-fGY9{`6-gUziJ8;kbPOx%2z! znPpt^JE;BxQ~U>|`1$@ul7F^w@t>srLsI;QrubiJ9zXqu85jSA`VUX>zbeK5YV-L1 zBaBOZy&3+QDEcGmcjYPkGUZ1_IM+WP*7UrFyv2I)+vgnPe*2tjp3U5R9geG=7JjBT zU-Nw=sdrh=g!Mj;+@*7KZ=9KLT+)B1rhftbIKp=Lfbyeb{AuM2Bb@827r@aagJT?b z`Ss@IMc|SifBo}X3L$ z9(s&Rxg7`pOsIS5$H8(NKum7{C+dswrt-xxeyQ>$zke8<>0e6TBKO08+8yEk5>K{t+52yH7n8)|8G%o%} z)IXBqA5HPEGLP?HZCvX23HVvRYv{)j_KW9~uZ?iF|DAS}c6*X>fBk>5`Tcf#ig9T_ z2f{-I-|r3E1Ixb?oas5097ovRhBf>fV!W#Sw1|i8>Jo6atJBF_^!V*63!YT(W8^Mg zzua=hrCzR6f1ZI8`~`;3(B=2Lar5~8b;iYii~1*0{KXW1_&#~OU#yS$zpDOHihnZ2 zUp9}Q{)%x)|BuvPP4S zA1^m9^}e(E-^IWQ{&zEcMm*7Z>I(Dt<^LYzQvQd)&wO1;KaQ~87ihfiC2x`Y`FbBc znf7?EGQS`1`;AMyy&CV;^y3KQ9nyF|K;CMP_ZoUK?eTul{C>RG8kh1sUH#Xk_^(g# zf5<$({|4idud?Rr!}Q|_^EIXM-bmhR&(}xj$+YL|qvrSH{g`oy_X3UgCi-zOUbctp zl;0fTY`1r4dOl9xYERE6=+CsL=ab~l@2BTe#-*IUr~XefaDx9c44>e?#XP?MR^#G- zLj9jj@!yu>zui2({|@8ge^LE+ruaXX;{UvPeE%1Wi+|@=$hh&v6#rc*{=3cN`@dvd z{D-Rl%PIbQQv6>rkMIAgaq-Vr|Gg>xuci3EZXVzN4ddd^sQ;TO{%@uD?=z3@zu&m{ zSE&EnDgN)I_`ho&-~T=1((iKc&qULIfPNg|IB>Sc`yhFX+#grJPfv#2UmyO!{C>PY zG%oR8rSblVejMRAaI5l%V*H!RACB=ymH#-#pH=>o7~f(S$?s2Nd~fBCL^#KvBfz;{ z`Wbnvy&N6|Pb!C>le>KRJY>I{!>h%Xz&0oM#z6Bk75* zXZ~Uyzuy09Tjiyi-q9qkAEk}5%$Mrnx5y#TjYMZ{R2EHJ^v(k9zQ+* zGA{W&Mg7k+aDxBe44M4#|0l)&Qi>ndmze$zvH7ypgw=jXDM(!Xtre>?N|{_Ty6{|@!< zkmBDl#lMqzeE-hI#s78nzaquIONxJ2^Z5SVjEnyf_3xhI-y_Apr+Iw;UdF}$H}&tG z;@>C5zpr_G|9-~Bzxi&`KKD=Y<2|6n_BqQuzW+eu;@?O82c`HAPVvt+kMBRkxcIx& z&%X~yYM-x6@gHU$-+#Dq@eio~RVn^gr}&RBkMBRyxcE<3|4}La*QEI8n8)|eH7?`! znefj<(R9*}BV5m1pu8)_-=ln9jNhnyeuQ)0yc3+`+XC_y{r>oWG8?{ z|AP9Lr1+Pn_?MZ-_xBqY|Mt5}{hpBGKQYB0{#{OdT{IZ;AFTf6DgL1p|FC)d^sg{3 z?f*FV+5T73k0WgVL&`@Yob5TQ=@}(&wYTS0^k>NZ^~P#)=l9dI#<-McRsCyI{3oUO zPd1P5KgGD@_iWAA>*;stk$5lCcuys7wdd;%^kmxeb(;D8cuzMj{%h2qP4SPV_;cp* z{dwb(uTN;c3iRU$>+y@q$0MBgDG!0OKGwzf6UrxI{6*!(7~gIW@thIk`zv1`<8zgl zVtk46N%D-OpYQvu0q1=I|6WbFe_v1mmv-gf7gUW)`H#cHarjJnTD-;|hieR33JA_}`o2f1i1L|5e7t zzlZwYpW?qd#s2~G`2K5*i+_&#KbYdbHpPFPd3^u%#>Kx({U1v4-;m<}uz7s{jmA6N z=QB@(AAc$me1v{{6fWGC*rf4(l)Tm6uRlglroCU^WPU&1n~h7pu2BESQ~aMu@qf}h zzW-Ck#eb9fKb_+LOp5;&^Z5Q-jf?*-^?x?Se_M+GcJuiDJB*9}2kO5w#s9e!|L4u) z`@djZ{7iz)uQQv7$D$M<6{#u(3s_&fHJe*NVX|2--Gub9X8f7Q77_f-GADgLje z_`hx*-~SEc;_p=dH&guIO7Y)k9^Zezaq$nR|Jy14@1*#@YaZYKJ>%jZSN{Vk{s&Y1 z-#3r%|ABGwpRN8Mrucu9;(y3IzW-t4;=fA$KTh%gB*p(z^Z5QpjEny^_5Uoz|7eQ; z=jQSKzc4QT`_=!;6#uVM{EwN(_y5|s_ax|DRL*&zi^g|HZiY7pVWQDgM8u z`2TJm-~XI(@eiv1A1VHSruhG59^e1Gaq;KX|L+w43n~5=&Exz3V_f_#^}m$j$L&Dk z`k{l|%_F{lhH>#fbWOzg3EVYxDSid>-GMA0Jfz zwkiJYQvBPS$M^4GT+;uz`gct6@08--**w1g6~@K?y!!e5D@oEAcSzn^)0|Nh3sf2{fsNb%1~@gHa&-+z#C z@vl(-!72XPDgHyum+w6#u*w|9tcK{sqRxe~A3;{Y#9C z|48*OP4Q!|J8}N%H;?Z>!MN8^)ISsnPkyWN;Rs(1em^)qVj8S)d=}C$Be)*?HyVB=ctJ*I0N-PZ;mo7!Tt;DaONiPc|;)yxo4xPY|2}9+um)$nP9* z?gPJ`{2qq!_cKo=Z;|`^nQtJ+5#Ogh&BFVC_jkH+e?K-0-jSil-;W(5cYc3AHfMaM z`@6;P@BZ@Ol1|@WFz)-u$#F2=10sL7xX!|F=|0DPHLNV33FBLNpPwm$cVy_<+I>DJ z{ClV~$en*{@9&}38yA0={t~#P-}g^4e1gAh9^YRvF8zA3)^8PD{C@qO$?(qa*KhcJ zZ>-vsygBSVj0zh{v< zzu$h|Xk7f~s{c*kN$uy&44>dX+dRJi9OF{{7plJno>czlGQ9Kq4oBwp|DFfRG}p878UPx4>L@Cp8l z%;V?lV&md}QvH{JC;8vW@Cp7)&ExwoGcNvrtN(KFB>%e@KEeNP^Z5QNjEjHg{bgKz z4|tOQN`_DHzt=pz|9!^A|4Q{=1)k)8Kf@>ZuQreG|A2AvAFuvvz?1wRWcURCwdV2t z*BKZ8D)nCvp5*@!!zcJ}Fpuy5uyL91*2B+sd?PrIaJ_N9@{h#$4az?n<98|lSd2fS z{H7RxUir=B8Hx87$l)#rNI(5}Bs}(zTZe%2{oGF&_utR`B)IfP|NY!g8JEwCE>_Q{ zQ#_xs@V@63=RurvEy`d)zF!{{9#rR{rf6KSlX>V!WvQyW|=1GhZ9QnXm7Wx5)i`JpkU} z!u$DpkQ|r9^Ywk>+HPlw{|Den{vR@Yg8xV6@#`IHB#l@6m#hC_@Ff3_89u@P6Z81~ zpBfkc4eEacJjwqvhEMQ6Y98PJbK~N_P5r+BPxAkg;S>D7GLP?n%((dPSO2fUll;G7 z_yqrN&ExwYH!l94ss9P^B>$5PpWuJWJih;F zGn4%t;!N0S4 zeE%zqOTYUT{6N7j{DFi0j^*%}@?9gG{juX9>5sdSw;0|p&)vb3(z6G-^ZV)9)3~f3 zc7>ne_5u&*NA9N`p?vQM=RVIeP0v2$_q3;HU-A~YKR)b7j)Oe9PqM#-_xE`YFz(-{ z&jOeH`uFJvk~_bDAAOMVnZX*QeH)Z1$G3y0{chaD-_tri+xQmV{><WEh8h4_nwT z4mJOl-u}ibjc@M!6)m^JQv8Rf_+Mon-~Vdk^8Gm*;HUZs{=k9nt#aRMcdo{Jq;WrA zM;Z6?^_m#xz6#MCt8U2m1@hfpA|dW8wYpQ|bnna`wMZsfXNo{O?ohH7@^-z|%-4)qVVdgX7Z9 zhwu7 zP(B#r%at#W@%74wV*Fg?!!dr9@)a?Dr}C9C{($n47=KLpXpFz8d{vC^I9u|&nmi-< zWqln2&hc#xd5heyueHYg`Z|dmN4&kAY~lU-It9EV!|;B4t;(ji{L@4J)LJTe1_al=X!GI_viPLaq)k9w)iK(g9Lw>;S>D) z_ePTZRpa7+VYc|s1P>DYHHJ^{*U51S^A&wxpkZA62OlE-CU}tG-@xz*{*C7G{hN%7 ze?a|H;6Z}_EQU|;ztKFt|4qilKc@aSg9i!zvl%|Ye~x*4f6KV|YwAB2JZU}lmK6Va z=JEY+H7?`oHSkmYHvVwwlz8vfc;8OmVmwNH}e7%Dlm&EJ+0^{QUj`}YI4-)(r zF?>cm(ff#t&Ex0m6650kiTd9O9whiLW%vaDW#;kymm8OH>`C~U&v$|I7%pX}3bm0! zqfsocs|VfXe63Q<57#Q=#ZsXbKACvQW+!YA7J42d@V!V@P3~cIO(!4TauHsZtxM zW>G8%IBJ3HGM|m0fC`m*u2L=Ly841*rOu2w74p_!&KGmpMx{1X9;jsVNI{U58u}kX z!P8x>_LqCIx%KO6m1a5LQ<%tZD57}t#X3rCYPz=iirG>H;!>%yv5@a>BDxA{xiDH8 zuGAW}Y_aij=T=qg#eAW!vay^LY5>Wt=d#tpN>}a)aaf3f!gwQS)(b-;mIO95kgm?2 zVxv!z-P0T&XS*!cvty+~U!mHVK$}G=mUG3DoUDfx*jutjC3%!yP zM;Djr>fVq=&y9c+i{(NNeG1n}2m!2u(Ha_0D3y~-ij8uiUJo`P@vwQtHkr+_xa)4H z7_8(ALB1=0Ogox8H^vzENVQPNP4x9d60)q2%|}O^=_D>~7V3?l+?B7RQ7~80PPDpM z*yzqlibp0;MfrhZy)jgkYlN>JnJVX8Y(wQ}W2n}sG+%_(bEuK(UUE)mGo4ywY+y?u)+~|xYVqB7$bVj)Xn}b z%{y!-j9@xcFNTdq&|R;hfvjXxt78n)_%TjI`MgD4!Td$@g1HM8&7H%a#{@%-i9)R& zjA7_OL&;;}D2^AA2>~cbHh;_lg%Sof>gt6CA}AoUQbQQ~3RMog3a z5CfHs0~n_;v!E;1!>OrzxIe5{Z64C3msXpojY17QfH7|<)*8)hX=MQ&36qFaL?Iu} zOG{T_-a!Y;o-*fD`8`*Eck1u1Q^VP^$K_G8)XSEy)97HaJd$4@=2aomiV+Nr()ILG zX`q4;o+-*!*hcZJ9%QSKytpW}$MSFbs1B1aXv5iwg|k9LL;zaD5_ri)O(s9Spsjf4f;>_?f_+#HQk%^~&8{*_pBpeNRm z_&Pd2qFhs4QpAZ7Ol{42PqwzKm`B?JS-h#(7%Go6(V)xuXo!)Srm#xa8g*lSTqRO+n#)?*w20pPc1#PY1)~(YFgGd%D3#@CEjjr}OaESZsoC3lK zWT5L|7vQp2FO}D}7T41o-C}k^)~{o7NmkNHWi^}EF-(R5G<{u+%ks`5ah+d^fnB8@ zv;lNJ4iFLs$&z6Fxu)2da78VU(*XZ7(-=OLb}^d8-Hw~1iw$?P;ihM- zl&cu`WgeWItdvKx8?Y`z9*MehIZlZl8!Bx8#?Xa^p}w*koO!_sm13Ed(=StW_>#+o zK@M}%@$^*c^>{o!%jbv6xZlB@RDYkOd@x%qk4|7j#_|^{HM^X53WZwInGv+z!Xy?} zRSP`28W&?Gtm;CSNzzqH`-$+ja6mg%7I!?A@=&?2(pX+-tSVzL$7G*hyeWruIcJfA zTXf3wk}ZXo2e{oB8atzRRXLY!;&#l!*Y$$l8t&*;7OGepaW*gM47sYFU56zrrOK474KR$m)kWQ%i4F*n z1*xo29q7*Ii%dbbdP#`2llu%++J~jD5A*B8n_wmiw>YNYEf!aQ zAy_`#V5fv4Br8#W4R;TWVG>LI;=1xA3XdZ1)L_=FWc!LWo?6UhX-~7!sFeL{P@*Mk ztti8}3>}A^Nw6yk&LiXw25&`}ao3Z8_br`3B!UD z?l<{)0=xR!u6OsrA;rXoo2(5;Xth%YyCO$U_d22RS38#v>!nM31}n9tCk$)Q=(xgA zt|Lv?I}yi$y6Yw3D;sHiT=xc^Ffe9Cjv=_w_B%_p6QzOsH*I0n&H-%dbYn7HimuoO z+4$WqSlgL4Fj~XdWE4+w6TC@ThnuAFiqEk-fqOBAcB7*vQ%A~reIs^*9FsL;+4T_z zWH_@sC)+;gTREs>1L_5fh2Ry46`s72rpmB`BkW^&gyT!84%S?!FBovc)U@Whr%bo4~> zR&(;P5=$E*7*L1*#gk1JtK07w-B@g3P|+<6uLLB!HuuQz#9!~L8HUS4T*kD~(QL}bX0F6-PyZkKZuvkEgEX2*l#@Q{^- zPuniXmVdH0JP~t;xZQ7O+Ts|Q#5PG{;_XZ<7US*FOrP@NahQdaOe1~^>AR<~XBglP zOPkkd#B0p=PGip-U0J);Ma0y0&NsH74$W>C3{A=H{J6FgC1#1j>Av80&{$KR;YgK+)Vpb~0SK`@*(M&CK+;(R+F< z;)IU-ya5ba-L-XfF8m}W4ZCqV=yXo`cGWbu*5TtYUp~e7$hRP!-R(ATNZ~82kPGtO z7T@lePQ&z^r~60&-gF7F5+It@ct9CH9)2~!ESZ);Ps zm4*A!8sC?Rb1tdeGGzM1Xk~o?_jq_8GsdtD3P+q`PX&{AGR5uVw4=9nFn3jKY_X9tTpu5z&PoP3_E^XdJwNS@qIl$T4} zyo|P^$Q9wHXUgf3Gn=?q@=i9;rg7`w-VBdUf>FL|Hi34*iPxJKf5tY92V z&NbgPL$hAI$!%k~yAdL`GPWSzVi$8*pUPWk)1mb30)|Bx-EHD4*(My;Zs9IlSy+eG z>Yj20klQJSh4P3B)U+VeYbDMGm&)xO26LN;J0#sgaVtU+GgWm@g%lPXw!=^ zf~}9dv~?&qj_{_ShC%`qtg7a*JmNl|f)NaZ2s<4jT-e$rZp}M=ex!H$IUC(jJ?zr1 zgM<;gwKl3b=_HB7KwY)@|o~EN8 zt-_5{dTp3(*_l~7ylOQJG6jpYJb=!K} zzYTY2W$-&q@2=&Y9Cz0{d73l?y&{YxGGd1jyTyKipJU;NO!{#j9u}^>AH)@XiR(n% zWw{&vV!46vRjh>FCsb?$e$gWAjdI7aypFR0-z0J)dICq+DChBMigF?07Q*LJcvT_XX$|k}l~2lk8K+ASbWUtHB*cMtQ5G%gu3^8vfi*ln zFu?a!62gsDD%`w{6phA%4T;j!Sp_#vx-wLbj)Hqtc^^Pg6N3)kam0IW(>IY}r641C zi_pEl=?1q*L{5#SP~!)Uq~+xoElQ%n;##dzTh<(F3!QQzNDAA|f>qetZgVC;7PYIC zNx8Qxl({|%DK_4@cEEc-ws+iL>g=sn8EDa>BpQqtYxM@+LM>pd$dBZ(fz5Yd>>fPG zl`2iPao&MpWU0zC*L^Crbr>e(ZC{*nA+`A2=fCjLFMbRxJWkyf|5P7doQn^qhAinf zKQ%T(PaKQi_}4oFU7)d%;=^4*09DXi+%TA})%g~MhW3BCxGCEVpAN)hEu>^&n)sU^ zljXrH-MJ1Pc+Ma84~z4xq{&fvDL)BPj__3YJB(PP2=Fbr{IuFpnyI5u$o6S9BsZ9Q z)Ev*8{pZPpSKYpG=|_I`D|DXQ& zR!sfzQW(UW^+8|pfR&d zqR)9QJdo}G>WKE$#0yaVvv6X(*1e)9w{T58J9pFS;qeV8grw6wYYEj#AH{!GSD+TarE4i3Y(h6mlY(P zJWSftmN3=5}_?oA2ttJzH?}!efXRFQG14?$PHw$8p0t z2cO4||7NU>U1Bf)Pp&n||AQxN9PJIHb-bUH_-i@aew}~S|CLvWgl%EYCRf>bHY1p^ zWw05?Bd+@0{EX)kX33JSC9WBO{O=#Go%|PEcb>jJvi1!Ed~4myu7G)6`zkmHn2+SO zFizkI%bUO1rZ`5rwxta$%DI-%e7CKa@vk3-=b~%oFx^~ECN7+}$8~x~ql;$%B!O+} zRd^&VkW-e;Zaz#|A}?B$a^g_L(Y{n(w5Xj00fxu_dJXN`PvSB<2=Fg%hh=4pY34O) z>725lcJ(w`YZf@pF3Fbg83!4E!{@9=p2x4?<<=WK&v|xy&cfV+g>#QN^61X7t|RC1 rM|NRX?#Qvuxt(L Date: Mon, 21 Dec 2015 15:29:56 +0100 Subject: [PATCH 2/5] - Some scripts moved to right place --- Assets/AssetsLoading/AssetsLoader.cs | 23 +- .../Buildings/Old.meta => BasicUtility.meta} | 4 +- Assets/{ => BasicUtility}/ScreenManagger.cs | 0 .../{ => BasicUtility}/ScreenManagger.cs.meta | 0 Assets/{ => BasicUtility}/TileMap.meta | 18 +- .../TileMap/SavedMapData.cs | 0 .../TileMap/SavedMapData.cs.meta | 0 .../{ => BasicUtility}/TileMap/SavedTile.cs | 0 .../TileMap/SavedTile.cs.meta | 0 Assets/{ => BasicUtility/TileMap}/Tile.meta | 0 .../TileMap}/Tile/Surface.meta | 18 +- .../TileMap}/Tile/Surface/Surface.cs | 34 +-- .../TileMap}/Tile/Surface/Surface.cs.meta | 24 +- .../TileMap}/Tile/Surface/Surface.prefab | Bin .../TileMap}/Tile/Surface/Surface.prefab.meta | 16 +- .../{ => BasicUtility/TileMap}/Tile/Tile.cs | 0 .../TileMap}/Tile/Tile.cs.meta | 0 Assets/{ => BasicUtility}/TileMap/TileMap.cs | 0 .../TileMap/TileMap.cs.meta | 24 +- .../TileMap/TileTransform.cs | 0 .../TileMap/TileTransform.cs.meta | 24 +- .../{ => BasicUtility}/TileMap/TileVector.cs | 0 .../TileMap/TileVector.cs.meta | 24 +- .../{ => BasicUtility}/TogleGroupAdvanced.cs | 0 .../TogleGroupAdvanced.cs.meta | 24 +- Assets/Behaviour.cs | 17 -- .../Buildings/Old/Miner.meta => CivMars.meta} | 4 +- Assets/CivMarsInit.cs | 75 +++--- Assets/Class1.cs | 13 -- Assets/GUI/Buildables/BuildingLister.cs | 8 +- .../{ => GUI/Crafting Desplay}/QueueItem.cs | 0 .../Crafting Desplay}/QueueItem.cs.meta | 24 +- Assets/{scripts.meta => GUI/Inventory.meta} | 4 +- Assets/{ => GUI/Inventory}/PlayerInventory.cs | 0 .../Inventory}/PlayerInventory.cs.meta | 24 +- .../PlayerInventoryDrawedElement.cs | 0 .../PlayerInventoryDrawedElement.cs.meta | 24 +- .../Buildings.meta => GUI/MapListing.meta} | 4 +- Assets/{ => GUI/MapListing}/NewMap.cs | 0 Assets/{ => GUI/MapListing}/NewMap.cs.meta | 0 Assets/{ => GUI/MapListing}/SavedMapLister.cs | 0 .../MapListing}/SavedMapLister.cs.meta | 0 Assets/{ => GUI}/PauseTab.cs | 0 Assets/{ => GUI}/PauseTab.cs.meta | 0 Assets/{ => GUI}/UITextures.meta | 18 +- Assets/{ => GUI}/UITextures/Animation.meta | 0 Assets/{ => GUI}/UITextures/Fonts.meta | 18 +- .../{ => GUI}/UITextures/Fonts/Consolas.meta | 18 +- .../UITextures/Fonts/Consolas/CONSOLA.TTF | Bin .../Fonts/Consolas/CONSOLA.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAB.TTF | Bin .../Fonts/Consolas/CONSOLAB.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAI.TTF | Bin .../Fonts/Consolas/CONSOLAI.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAZ.TTF | Bin .../Fonts/Consolas/CONSOLAZ.TTF.meta | 38 +-- Assets/{ => GUI}/UITextures/Fonts/Google.meta | 18 +- .../Fonts/Google/Aldrich-Regular.ttf | Bin .../Fonts/Google/Aldrich-Regular.ttf.meta | 38 +-- .../Fonts/Google/Electrolize-Regular.ttf | Bin .../Fonts/Google/Electrolize-Regular.ttf.meta | 38 +-- .../Fonts/Google/Orbitron-Regular.ttf | Bin .../Fonts/Google/Orbitron-Regular.ttf.meta | 38 +-- .../Fonts/Google/Quantico-Regular.ttf | Bin .../Fonts/Google/Quantico-Regular.ttf.meta | 38 +-- .../{ => GUI}/UITextures/Fonts/Michroma.ttf | Bin .../UITextures/Fonts/Michroma.ttf.meta | 0 Assets/{ => GUI}/UITextures/Fonts/Other.meta | 0 .../UITextures/Fonts/Other/Minecraft.ttf | Bin .../UITextures/Fonts/Other/Minecraft.ttf.meta | 0 .../Fonts/Other/Squares Bold Free.otf | Bin .../Fonts/Other/Squares Bold Free.otf.meta | 0 .../UITextures/Fonts/Other/monofonto.ttf | Bin .../UITextures/Fonts/Other/monofonto.ttf.meta | 0 Assets/{ => GUI}/UITextures/GUI.Header.png | Bin .../{ => GUI}/UITextures/GUI.Header.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.Inverted.png | Bin .../UITextures/GUI.Inverted.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.Inverted2.png | Bin .../UITextures/GUI.Inverted2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.base.png | Bin Assets/{ => GUI}/UITextures/GUI.base.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Noise.mat | Bin Assets/{ => GUI}/UITextures/Noise.mat.meta | 16 +- .../{ => GUI}/UITextures/NoiseEffectGrain.png | Bin .../UITextures/NoiseEffectGrain.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Ring.full.png | Bin .../{ => GUI}/UITextures/Ring.full.png.meta | 0 Assets/{ => GUI}/UITextures/Ring.png | Bin Assets/{ => GUI}/UITextures/Ring.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Ring2.png | Bin Assets/{ => GUI}/UITextures/Ring2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenu.png | Bin Assets/{ => GUI}/UITextures/SideMenu.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenuv2.png | Bin .../{ => GUI}/UITextures/SideMenuv2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenuv3.png | Bin .../{ => GUI}/UITextures/SideMenuv3.png.meta | 112 ++++----- ...video---noise-on-a-green-old-TV-screen.jpg | Bin ...---noise-on-a-green-old-TV-screen.jpg.meta | 112 ++++----- Assets/GameController.cs | 2 + Assets/{Tile => Interfaces}/IWorldGen.cs | 0 Assets/{Tile => Interfaces}/IWorldGen.cs.meta | 24 +- Assets/Map.cs | 4 +- Assets/NeedToBeImplemented/Old/Generato.cs | 34 +-- .../NeedToBeImplemented/Old/Miner/SpecMine.cs | 9 +- .../NeedToBeImplemented/Old/Oxigeneration.cs | 14 +- .../NeedToBeImplemented/Old/UniverzalMiner.cs | 3 +- .../OxigenRecoverer.cs | 0 .../OxigenRecoverer.cs.meta | 0 Assets/OLD/Generate/IronOreTile.prefab | Bin 7712 -> 0 bytes Assets/OLD/Generate/SandTile.prefab | Bin 7704 -> 0 bytes Assets/OLD/Generate/StoneOreTile.prefab | Bin 7712 -> 0 bytes Assets/OLD/Generate/StoneOreTile.prefab.meta | 8 - Assets/OLD/Generate/UraniumOreTile.prefab | Bin 7720 -> 0 bytes .../OLD/Generate/UraniumOreTile.prefab.meta | 8 - Assets/OLD/MapOld.cs | 221 ------------------ Assets/TerrainGen.cs | 64 ----- Assets/TileMap/SavedMap.cs | 104 --------- saves/asd/asd.bin | Bin 60263 -> 0 bytes saves/asd/asd.ddc | Bin 171 -> 0 bytes saves/fgh/fgh.bin | Bin 36220 -> 0 bytes saves/fgh/fgh.ddc | Bin 171 -> 0 bytes 123 files changed, 1059 insertions(+), 1490 deletions(-) rename Assets/{scripts/Buildings/Old.meta => BasicUtility.meta} (67%) rename Assets/{ => BasicUtility}/ScreenManagger.cs (100%) rename Assets/{ => BasicUtility}/ScreenManagger.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap.meta (95%) rename Assets/{ => BasicUtility}/TileMap/SavedMapData.cs (100%) rename Assets/{ => BasicUtility}/TileMap/SavedMapData.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap/SavedTile.cs (100%) rename Assets/{ => BasicUtility}/TileMap/SavedTile.cs.meta (100%) rename Assets/{ => BasicUtility/TileMap}/Tile.meta (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.cs (92%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.cs.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.prefab (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.prefab.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Tile.cs (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Tile.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap/TileMap.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileMap.cs.meta (96%) rename Assets/{ => BasicUtility}/TileMap/TileTransform.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileTransform.cs.meta (95%) rename Assets/{ => BasicUtility}/TileMap/TileVector.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileVector.cs.meta (95%) rename Assets/{ => BasicUtility}/TogleGroupAdvanced.cs (100%) rename Assets/{ => BasicUtility}/TogleGroupAdvanced.cs.meta (95%) delete mode 100644 Assets/Behaviour.cs rename Assets/{scripts/Buildings/Old/Miner.meta => CivMars.meta} (67%) delete mode 100644 Assets/Class1.cs rename Assets/{ => GUI/Crafting Desplay}/QueueItem.cs (100%) rename Assets/{ => GUI/Crafting Desplay}/QueueItem.cs.meta (95%) rename Assets/{scripts.meta => GUI/Inventory.meta} (67%) rename Assets/{ => GUI/Inventory}/PlayerInventory.cs (100%) rename Assets/{ => GUI/Inventory}/PlayerInventory.cs.meta (95%) rename Assets/{ => GUI/Inventory}/PlayerInventoryDrawedElement.cs (100%) rename Assets/{ => GUI/Inventory}/PlayerInventoryDrawedElement.cs.meta (95%) rename Assets/{scripts/Buildings.meta => GUI/MapListing.meta} (67%) rename Assets/{ => GUI/MapListing}/NewMap.cs (100%) rename Assets/{ => GUI/MapListing}/NewMap.cs.meta (100%) rename Assets/{ => GUI/MapListing}/SavedMapLister.cs (100%) rename Assets/{ => GUI/MapListing}/SavedMapLister.cs.meta (100%) rename Assets/{ => GUI}/PauseTab.cs (100%) rename Assets/{ => GUI}/PauseTab.cs.meta (100%) rename Assets/{ => GUI}/UITextures.meta (95%) rename Assets/{ => GUI}/UITextures/Animation.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLA.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLA.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAB.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAI.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAZ.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Aldrich-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Electrolize-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Orbitron-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Quantico-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Quantico-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Michroma.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Michroma.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Minecraft.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Minecraft.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Squares Bold Free.otf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Squares Bold Free.otf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/monofonto.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/monofonto.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/GUI.Header.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Header.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.Inverted.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Inverted.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.Inverted2.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Inverted2.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.base.png (100%) rename Assets/{ => GUI}/UITextures/GUI.base.png.meta (95%) rename Assets/{ => GUI}/UITextures/Noise.mat (100%) rename Assets/{ => GUI}/UITextures/Noise.mat.meta (95%) rename Assets/{ => GUI}/UITextures/NoiseEffectGrain.png (100%) rename Assets/{ => GUI}/UITextures/NoiseEffectGrain.png.meta (95%) rename Assets/{ => GUI}/UITextures/Ring.full.png (100%) rename Assets/{ => GUI}/UITextures/Ring.full.png.meta (100%) rename Assets/{ => GUI}/UITextures/Ring.png (100%) rename Assets/{ => GUI}/UITextures/Ring.png.meta (95%) rename Assets/{ => GUI}/UITextures/Ring2.png (100%) rename Assets/{ => GUI}/UITextures/Ring2.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenu.png (100%) rename Assets/{ => GUI}/UITextures/SideMenu.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenuv2.png (100%) rename Assets/{ => GUI}/UITextures/SideMenuv2.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenuv3.png (100%) rename Assets/{ => GUI}/UITextures/SideMenuv3.png.meta (95%) rename Assets/{ => GUI}/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg (100%) rename Assets/{ => GUI}/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta (95%) rename Assets/{Tile => Interfaces}/IWorldGen.cs (100%) rename Assets/{Tile => Interfaces}/IWorldGen.cs.meta (95%) rename Assets/{ => NeedToBeImplemented}/OxigenRecoverer.cs (100%) rename Assets/{ => NeedToBeImplemented}/OxigenRecoverer.cs.meta (100%) delete mode 100644 Assets/OLD/Generate/IronOreTile.prefab delete mode 100644 Assets/OLD/Generate/SandTile.prefab delete mode 100644 Assets/OLD/Generate/StoneOreTile.prefab delete mode 100644 Assets/OLD/Generate/StoneOreTile.prefab.meta delete mode 100644 Assets/OLD/Generate/UraniumOreTile.prefab delete mode 100644 Assets/OLD/Generate/UraniumOreTile.prefab.meta delete mode 100644 Assets/OLD/MapOld.cs delete mode 100644 Assets/TerrainGen.cs delete mode 100644 Assets/TileMap/SavedMap.cs delete mode 100644 saves/asd/asd.bin delete mode 100644 saves/asd/asd.ddc delete mode 100644 saves/fgh/fgh.bin delete mode 100644 saves/fgh/fgh.ddc diff --git a/Assets/AssetsLoading/AssetsLoader.cs b/Assets/AssetsLoading/AssetsLoader.cs index 7193efe..4c35574 100644 --- a/Assets/AssetsLoading/AssetsLoader.cs +++ b/Assets/AssetsLoading/AssetsLoader.cs @@ -1,18 +1,19 @@ -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; +using UnityEngine; +using CivMars; -public class AssetsLoader : MonoBehaviour +namespace CivMarsEngine.Registry { - - public void CallRegister() + public class AssetsLoader : MonoBehaviour { - - CivMarsInit.Init(); + public void CallRegister() + { - } -} + CivMarsInit.Init(); + + } + + } +} \ No newline at end of file diff --git a/Assets/scripts/Buildings/Old.meta b/Assets/BasicUtility.meta similarity index 67% rename from Assets/scripts/Buildings/Old.meta rename to Assets/BasicUtility.meta index 301a1ce..b6b431c 100644 --- a/Assets/scripts/Buildings/Old.meta +++ b/Assets/BasicUtility.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d09cb17d294bf204fa6cb5c50593bf21 +guid: 5245ae4032d6ec343986cbe1d3a70aab folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702604 licenseType: Free DefaultImporter: userData: diff --git a/Assets/ScreenManagger.cs b/Assets/BasicUtility/ScreenManagger.cs similarity index 100% rename from Assets/ScreenManagger.cs rename to Assets/BasicUtility/ScreenManagger.cs diff --git a/Assets/ScreenManagger.cs.meta b/Assets/BasicUtility/ScreenManagger.cs.meta similarity index 100% rename from Assets/ScreenManagger.cs.meta rename to Assets/BasicUtility/ScreenManagger.cs.meta diff --git a/Assets/TileMap.meta b/Assets/BasicUtility/TileMap.meta similarity index 95% rename from Assets/TileMap.meta rename to Assets/BasicUtility/TileMap.meta index d761635..baf5efc 100644 --- a/Assets/TileMap.meta +++ b/Assets/BasicUtility/TileMap.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 81c0fb70137fcf34bbe321863914ae28 -folderAsset: yes -timeCreated: 1446149952 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 81c0fb70137fcf34bbe321863914ae28 +folderAsset: yes +timeCreated: 1446149952 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/SavedMapData.cs b/Assets/BasicUtility/TileMap/SavedMapData.cs similarity index 100% rename from Assets/TileMap/SavedMapData.cs rename to Assets/BasicUtility/TileMap/SavedMapData.cs diff --git a/Assets/TileMap/SavedMapData.cs.meta b/Assets/BasicUtility/TileMap/SavedMapData.cs.meta similarity index 100% rename from Assets/TileMap/SavedMapData.cs.meta rename to Assets/BasicUtility/TileMap/SavedMapData.cs.meta diff --git a/Assets/TileMap/SavedTile.cs b/Assets/BasicUtility/TileMap/SavedTile.cs similarity index 100% rename from Assets/TileMap/SavedTile.cs rename to Assets/BasicUtility/TileMap/SavedTile.cs diff --git a/Assets/TileMap/SavedTile.cs.meta b/Assets/BasicUtility/TileMap/SavedTile.cs.meta similarity index 100% rename from Assets/TileMap/SavedTile.cs.meta rename to Assets/BasicUtility/TileMap/SavedTile.cs.meta diff --git a/Assets/Tile.meta b/Assets/BasicUtility/TileMap/Tile.meta similarity index 100% rename from Assets/Tile.meta rename to Assets/BasicUtility/TileMap/Tile.meta diff --git a/Assets/Tile/Surface.meta b/Assets/BasicUtility/TileMap/Tile/Surface.meta similarity index 95% rename from Assets/Tile/Surface.meta rename to Assets/BasicUtility/TileMap/Tile/Surface.meta index 2640f3f..73a4047 100644 --- a/Assets/Tile/Surface.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 3f806b90a6fab1f48bef970c6a37c1aa -folderAsset: yes -timeCreated: 1446325857 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3f806b90a6fab1f48bef970c6a37c1aa +folderAsset: yes +timeCreated: 1446325857 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Surface/Surface.cs b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs similarity index 92% rename from Assets/Tile/Surface/Surface.cs rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs index 0aa2e17..6c5717c 100644 --- a/Assets/Tile/Surface/Surface.cs +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs @@ -1,17 +1,17 @@ -using UnityEngine; -using System.Collections; - -public class Surface : Tiled { - - /* - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } - */ -} +using UnityEngine; +using System.Collections; + +public class Surface : Tiled { + + /* + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + */ +} diff --git a/Assets/Tile/Surface/Surface.cs.meta b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta similarity index 95% rename from Assets/Tile/Surface/Surface.cs.meta rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta index 235ef6d..ba46ad8 100644 --- a/Assets/Tile/Surface/Surface.cs.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 1a52bc9f00fa2ac4ebb989f05239adbf -timeCreated: 1446234690 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 1a52bc9f00fa2ac4ebb989f05239adbf +timeCreated: 1446234690 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Surface/Surface.prefab b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab similarity index 100% rename from Assets/Tile/Surface/Surface.prefab rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab diff --git a/Assets/Tile/Surface/Surface.prefab.meta b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta similarity index 95% rename from Assets/Tile/Surface/Surface.prefab.meta rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta index 719367f..3ad6048 100644 --- a/Assets/Tile/Surface/Surface.prefab.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: b9c22948c674e79498b9c92e06de87c8 -timeCreated: 1446234227 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: b9c22948c674e79498b9c92e06de87c8 +timeCreated: 1446234227 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Tile.cs b/Assets/BasicUtility/TileMap/Tile/Tile.cs similarity index 100% rename from Assets/Tile/Tile.cs rename to Assets/BasicUtility/TileMap/Tile/Tile.cs diff --git a/Assets/Tile/Tile.cs.meta b/Assets/BasicUtility/TileMap/Tile/Tile.cs.meta similarity index 100% rename from Assets/Tile/Tile.cs.meta rename to Assets/BasicUtility/TileMap/Tile/Tile.cs.meta diff --git a/Assets/TileMap/TileMap.cs b/Assets/BasicUtility/TileMap/TileMap.cs similarity index 100% rename from Assets/TileMap/TileMap.cs rename to Assets/BasicUtility/TileMap/TileMap.cs diff --git a/Assets/TileMap/TileMap.cs.meta b/Assets/BasicUtility/TileMap/TileMap.cs.meta similarity index 96% rename from Assets/TileMap/TileMap.cs.meta rename to Assets/BasicUtility/TileMap/TileMap.cs.meta index 7841546..c9ceaf4 100644 --- a/Assets/TileMap/TileMap.cs.meta +++ b/Assets/BasicUtility/TileMap/TileMap.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 9164dff99a7da7c43bafb1ba97602dad -timeCreated: 1446224690 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9164dff99a7da7c43bafb1ba97602dad +timeCreated: 1446224690 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/TileTransform.cs b/Assets/BasicUtility/TileMap/TileTransform.cs similarity index 100% rename from Assets/TileMap/TileTransform.cs rename to Assets/BasicUtility/TileMap/TileTransform.cs diff --git a/Assets/TileMap/TileTransform.cs.meta b/Assets/BasicUtility/TileMap/TileTransform.cs.meta similarity index 95% rename from Assets/TileMap/TileTransform.cs.meta rename to Assets/BasicUtility/TileMap/TileTransform.cs.meta index 1ff2f9c..7b47a65 100644 --- a/Assets/TileMap/TileTransform.cs.meta +++ b/Assets/BasicUtility/TileMap/TileTransform.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 3a510d09d4fef3f428aca1c7eb5cd212 -timeCreated: 1446133115 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3a510d09d4fef3f428aca1c7eb5cd212 +timeCreated: 1446133115 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/TileVector.cs b/Assets/BasicUtility/TileMap/TileVector.cs similarity index 100% rename from Assets/TileMap/TileVector.cs rename to Assets/BasicUtility/TileMap/TileVector.cs diff --git a/Assets/TileMap/TileVector.cs.meta b/Assets/BasicUtility/TileMap/TileVector.cs.meta similarity index 95% rename from Assets/TileMap/TileVector.cs.meta rename to Assets/BasicUtility/TileMap/TileVector.cs.meta index 1950cb3..58fcc8b 100644 --- a/Assets/TileMap/TileVector.cs.meta +++ b/Assets/BasicUtility/TileMap/TileVector.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 64d5c9a1773d68948bfd954115a4aa4d -timeCreated: 1446139365 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 64d5c9a1773d68948bfd954115a4aa4d +timeCreated: 1446139365 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TogleGroupAdvanced.cs b/Assets/BasicUtility/TogleGroupAdvanced.cs similarity index 100% rename from Assets/TogleGroupAdvanced.cs rename to Assets/BasicUtility/TogleGroupAdvanced.cs diff --git a/Assets/TogleGroupAdvanced.cs.meta b/Assets/BasicUtility/TogleGroupAdvanced.cs.meta similarity index 95% rename from Assets/TogleGroupAdvanced.cs.meta rename to Assets/BasicUtility/TogleGroupAdvanced.cs.meta index e7920b1..7572d2b 100644 --- a/Assets/TogleGroupAdvanced.cs.meta +++ b/Assets/BasicUtility/TogleGroupAdvanced.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: e1e32676a7f0a6340a1ad226215a6275 -timeCreated: 1446128939 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e1e32676a7f0a6340a1ad226215a6275 +timeCreated: 1446128939 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Behaviour.cs b/Assets/Behaviour.cs deleted file mode 100644 index cbf2792..0000000 --- a/Assets/Behaviour.cs +++ /dev/null @@ -1,17 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class Behaviour : MonoBehaviour { - - public GameController GameCon; - - // Use this for initialization - void Start () { - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/Assets/scripts/Buildings/Old/Miner.meta b/Assets/CivMars.meta similarity index 67% rename from Assets/scripts/Buildings/Old/Miner.meta rename to Assets/CivMars.meta index a0fcbd2..ddef1af 100644 --- a/Assets/scripts/Buildings/Old/Miner.meta +++ b/Assets/CivMars.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a4b1a82bee9595649a13750df7982280 +guid: c5ab95ac4eb1cd24682e34df66e301d2 folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702941 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMarsInit.cs b/Assets/CivMarsInit.cs index 7d508b1..a1d64d3 100644 --- a/Assets/CivMarsInit.cs +++ b/Assets/CivMarsInit.cs @@ -4,52 +4,55 @@ using System.Text; using UnityEngine; -[Mod] -public static class CivMarsInit +namespace CivMars { - public const string ModSpace = "CivMars"; - public const string BlockSpace = "CivMars.block"; - public const string ItemSpace = "CivMars.item"; - - [ModInit] - public static void Init() + [Mod] + public static class CivMarsInit { - GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); - GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); - GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); - GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); - //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); - //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); - //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); - //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); - //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); - //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); - - GameObject[] goBuild = Resources.LoadAll("Buildings"); - - foreach (GameObject item in goBuild) - { - IRegystratabe a = item.GetComponent(); + public const string ModSpace = "CivMars"; + public const string BlockSpace = "CivMars.block"; + public const string ItemSpace = "CivMars.item"; - if (a != null) + [ModInit] + public static void Init() + { + GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); + GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); + GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); + GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); + //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); + //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); + //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); + //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); + //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); + //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); + + GameObject[] goBuild = Resources.LoadAll("Buildings"); + + foreach (GameObject item in goBuild) { - a.Regystrate(); - } - } + IRegystratabe a = item.GetComponent(); - GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); + if (a != null) + { + a.Regystrate(); + } + } - foreach (GameObject item in goTiles) - { - IRegystratabe a = item.GetComponent(); + GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); - if (a != null) + foreach (GameObject item in goTiles) { - a.Regystrate(); + IRegystratabe a = item.GetComponent(); + + if (a != null) + { + a.Regystrate(); + } } } - } -} + } +} \ No newline at end of file diff --git a/Assets/Class1.cs b/Assets/Class1.cs deleted file mode 100644 index 9aa5f14..0000000 --- a/Assets/Class1.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public enum GUIState -{ - BuildingGui, - AccesPanel, - Building, - None -} - diff --git a/Assets/GUI/Buildables/BuildingLister.cs b/Assets/GUI/Buildables/BuildingLister.cs index 4d1c7a9..4479465 100644 --- a/Assets/GUI/Buildables/BuildingLister.cs +++ b/Assets/GUI/Buildables/BuildingLister.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Collections; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using CivMarsEngine; + public class BuildingLister : MonoBehaviour, IHasGui { public GameObject buildableDrawElement; diff --git a/Assets/QueueItem.cs b/Assets/GUI/Crafting Desplay/QueueItem.cs similarity index 100% rename from Assets/QueueItem.cs rename to Assets/GUI/Crafting Desplay/QueueItem.cs diff --git a/Assets/QueueItem.cs.meta b/Assets/GUI/Crafting Desplay/QueueItem.cs.meta similarity index 95% rename from Assets/QueueItem.cs.meta rename to Assets/GUI/Crafting Desplay/QueueItem.cs.meta index f938bc2..8961923 100644 --- a/Assets/QueueItem.cs.meta +++ b/Assets/GUI/Crafting Desplay/QueueItem.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 232e9f834b9e33c469d296deb0600b54 -timeCreated: 1448726693 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 232e9f834b9e33c469d296deb0600b54 +timeCreated: 1448726693 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts.meta b/Assets/GUI/Inventory.meta similarity index 67% rename from Assets/scripts.meta rename to Assets/GUI/Inventory.meta index 11d2037..81c09bd 100644 --- a/Assets/scripts.meta +++ b/Assets/GUI/Inventory.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6363259cb6dda0e43a3261f13e54e2e4 +guid: b9993e6819173d14ca48149aad6b814a folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702762 licenseType: Free DefaultImporter: userData: diff --git a/Assets/PlayerInventory.cs b/Assets/GUI/Inventory/PlayerInventory.cs similarity index 100% rename from Assets/PlayerInventory.cs rename to Assets/GUI/Inventory/PlayerInventory.cs diff --git a/Assets/PlayerInventory.cs.meta b/Assets/GUI/Inventory/PlayerInventory.cs.meta similarity index 95% rename from Assets/PlayerInventory.cs.meta rename to Assets/GUI/Inventory/PlayerInventory.cs.meta index cec5e59..1748c93 100644 --- a/Assets/PlayerInventory.cs.meta +++ b/Assets/GUI/Inventory/PlayerInventory.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 90f1701421bfcdb4980981a334136186 -timeCreated: 1449316567 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 90f1701421bfcdb4980981a334136186 +timeCreated: 1449316567 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerInventoryDrawedElement.cs b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs similarity index 100% rename from Assets/PlayerInventoryDrawedElement.cs rename to Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs diff --git a/Assets/PlayerInventoryDrawedElement.cs.meta b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta similarity index 95% rename from Assets/PlayerInventoryDrawedElement.cs.meta rename to Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta index 84861a8..ded6546 100644 --- a/Assets/PlayerInventoryDrawedElement.cs.meta +++ b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: e99515fb53cbfb24a8b6eb1f9f704e91 -timeCreated: 1449317235 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e99515fb53cbfb24a8b6eb1f9f704e91 +timeCreated: 1449317235 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/Buildings.meta b/Assets/GUI/MapListing.meta similarity index 67% rename from Assets/scripts/Buildings.meta rename to Assets/GUI/MapListing.meta index f2ca6a3..b53be47 100644 --- a/Assets/scripts/Buildings.meta +++ b/Assets/GUI/MapListing.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 5c219a7a106001e4db3ac48786412de0 +guid: 0d55a1c3588edda4f8ecd747fa1fca5d folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702701 licenseType: Free DefaultImporter: userData: diff --git a/Assets/NewMap.cs b/Assets/GUI/MapListing/NewMap.cs similarity index 100% rename from Assets/NewMap.cs rename to Assets/GUI/MapListing/NewMap.cs diff --git a/Assets/NewMap.cs.meta b/Assets/GUI/MapListing/NewMap.cs.meta similarity index 100% rename from Assets/NewMap.cs.meta rename to Assets/GUI/MapListing/NewMap.cs.meta diff --git a/Assets/SavedMapLister.cs b/Assets/GUI/MapListing/SavedMapLister.cs similarity index 100% rename from Assets/SavedMapLister.cs rename to Assets/GUI/MapListing/SavedMapLister.cs diff --git a/Assets/SavedMapLister.cs.meta b/Assets/GUI/MapListing/SavedMapLister.cs.meta similarity index 100% rename from Assets/SavedMapLister.cs.meta rename to Assets/GUI/MapListing/SavedMapLister.cs.meta diff --git a/Assets/PauseTab.cs b/Assets/GUI/PauseTab.cs similarity index 100% rename from Assets/PauseTab.cs rename to Assets/GUI/PauseTab.cs diff --git a/Assets/PauseTab.cs.meta b/Assets/GUI/PauseTab.cs.meta similarity index 100% rename from Assets/PauseTab.cs.meta rename to Assets/GUI/PauseTab.cs.meta diff --git a/Assets/UITextures.meta b/Assets/GUI/UITextures.meta similarity index 95% rename from Assets/UITextures.meta rename to Assets/GUI/UITextures.meta index 0c2aea8..5159e95 100644 --- a/Assets/UITextures.meta +++ b/Assets/GUI/UITextures.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 8c1a24996afdb234590f79fc13e9c81b -folderAsset: yes -timeCreated: 1448801260 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8c1a24996afdb234590f79fc13e9c81b +folderAsset: yes +timeCreated: 1448801260 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Animation.meta b/Assets/GUI/UITextures/Animation.meta similarity index 100% rename from Assets/UITextures/Animation.meta rename to Assets/GUI/UITextures/Animation.meta diff --git a/Assets/UITextures/Fonts.meta b/Assets/GUI/UITextures/Fonts.meta similarity index 95% rename from Assets/UITextures/Fonts.meta rename to Assets/GUI/UITextures/Fonts.meta index 5580765..6526470 100644 --- a/Assets/UITextures/Fonts.meta +++ b/Assets/GUI/UITextures/Fonts.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 04866a43f01a3d74590f4bf4206502d0 -folderAsset: yes -timeCreated: 1449001566 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 04866a43f01a3d74590f4bf4206502d0 +folderAsset: yes +timeCreated: 1449001566 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas.meta b/Assets/GUI/UITextures/Fonts/Consolas.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas.meta rename to Assets/GUI/UITextures/Fonts/Consolas.meta index adce0b3..9d96ec6 100644 --- a/Assets/UITextures/Fonts/Consolas.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: c87e1939091425348975b789273b5625 -folderAsset: yes -timeCreated: 1449001586 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c87e1939091425348975b789273b5625 +folderAsset: yes +timeCreated: 1449001586 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLA.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta index d6386b8..2595666 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: eabdb8fe246655140bbb30fb1476f1de -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: eabdb8fe246655140bbb30fb1476f1de +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta index 4e6373a..874595b 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 9f1a9c7411c571e479dfe4eb81cd1368 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9f1a9c7411c571e479dfe4eb81cd1368 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta index a7f3fc0..d656b9f 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 271a35a004b7f96459bd2dc62e3076ae -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 271a35a004b7f96459bd2dc62e3076ae +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta index c428bae..5a636ca 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 0bb9dbbefb31df54094b8044d3a152c8 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0bb9dbbefb31df54094b8044d3a152c8 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google.meta b/Assets/GUI/UITextures/Fonts/Google.meta similarity index 95% rename from Assets/UITextures/Fonts/Google.meta rename to Assets/GUI/UITextures/Fonts/Google.meta index e95791c..bdbaad6 100644 --- a/Assets/UITextures/Fonts/Google.meta +++ b/Assets/GUI/UITextures/Fonts/Google.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 22138de56c4fe5d4faa7b031fe00f0da -folderAsset: yes -timeCreated: 1449001600 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 22138de56c4fe5d4faa7b031fe00f0da +folderAsset: yes +timeCreated: 1449001600 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta index 8ff7661..3dfc8c9 100644 --- a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 393b1e2283a68b94f84e2bbaabc64318 -timeCreated: 1449001663 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 393b1e2283a68b94f84e2bbaabc64318 +timeCreated: 1449001663 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta index 2d2ebed..e79f43f 100644 --- a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: e5759157bd675904a9ab0103173475c5 -timeCreated: 1449001642 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e5759157bd675904a9ab0103173475c5 +timeCreated: 1449001642 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta index 87bbabd..32bb45b 100644 --- a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 30a2dd171e2e59440a734a603e640bb6 -timeCreated: 1449001540 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 30a2dd171e2e59440a734a603e640bb6 +timeCreated: 1449001540 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Quantico-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta index 13b8321..391b048 100644 --- a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: f114ec948a28aac46a8a0baf8ff44612 -timeCreated: 1449001501 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f114ec948a28aac46a8a0baf8ff44612 +timeCreated: 1449001501 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Michroma.ttf b/Assets/GUI/UITextures/Fonts/Michroma.ttf similarity index 100% rename from Assets/UITextures/Fonts/Michroma.ttf rename to Assets/GUI/UITextures/Fonts/Michroma.ttf diff --git a/Assets/UITextures/Fonts/Michroma.ttf.meta b/Assets/GUI/UITextures/Fonts/Michroma.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Michroma.ttf.meta rename to Assets/GUI/UITextures/Fonts/Michroma.ttf.meta diff --git a/Assets/UITextures/Fonts/Other.meta b/Assets/GUI/UITextures/Fonts/Other.meta similarity index 100% rename from Assets/UITextures/Fonts/Other.meta rename to Assets/GUI/UITextures/Fonts/Other.meta diff --git a/Assets/UITextures/Fonts/Other/Minecraft.ttf b/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf similarity index 100% rename from Assets/UITextures/Fonts/Other/Minecraft.ttf rename to Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf diff --git a/Assets/UITextures/Fonts/Other/Minecraft.ttf.meta b/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/Minecraft.ttf.meta rename to Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta diff --git a/Assets/UITextures/Fonts/Other/Squares Bold Free.otf b/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf similarity index 100% rename from Assets/UITextures/Fonts/Other/Squares Bold Free.otf rename to Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf diff --git a/Assets/UITextures/Fonts/Other/Squares Bold Free.otf.meta b/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/Squares Bold Free.otf.meta rename to Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta diff --git a/Assets/UITextures/Fonts/Other/monofonto.ttf b/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf similarity index 100% rename from Assets/UITextures/Fonts/Other/monofonto.ttf rename to Assets/GUI/UITextures/Fonts/Other/monofonto.ttf diff --git a/Assets/UITextures/Fonts/Other/monofonto.ttf.meta b/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/monofonto.ttf.meta rename to Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta diff --git a/Assets/UITextures/GUI.Header.png b/Assets/GUI/UITextures/GUI.Header.png similarity index 100% rename from Assets/UITextures/GUI.Header.png rename to Assets/GUI/UITextures/GUI.Header.png diff --git a/Assets/UITextures/GUI.Header.png.meta b/Assets/GUI/UITextures/GUI.Header.png.meta similarity index 95% rename from Assets/UITextures/GUI.Header.png.meta rename to Assets/GUI/UITextures/GUI.Header.png.meta index 54f8ad6..c59e2a8 100644 --- a/Assets/UITextures/GUI.Header.png.meta +++ b/Assets/GUI/UITextures/GUI.Header.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 0fac5183a68542f4585ed060192a365f -timeCreated: 1449315158 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0fac5183a68542f4585ed060192a365f +timeCreated: 1449315158 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.Inverted.png b/Assets/GUI/UITextures/GUI.Inverted.png similarity index 100% rename from Assets/UITextures/GUI.Inverted.png rename to Assets/GUI/UITextures/GUI.Inverted.png diff --git a/Assets/UITextures/GUI.Inverted.png.meta b/Assets/GUI/UITextures/GUI.Inverted.png.meta similarity index 95% rename from Assets/UITextures/GUI.Inverted.png.meta rename to Assets/GUI/UITextures/GUI.Inverted.png.meta index 7b3dba9..3b00b4c 100644 --- a/Assets/UITextures/GUI.Inverted.png.meta +++ b/Assets/GUI/UITextures/GUI.Inverted.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7068eaecd68c2f341b7386d155509882 -timeCreated: 1449314286 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7068eaecd68c2f341b7386d155509882 +timeCreated: 1449314286 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.Inverted2.png b/Assets/GUI/UITextures/GUI.Inverted2.png similarity index 100% rename from Assets/UITextures/GUI.Inverted2.png rename to Assets/GUI/UITextures/GUI.Inverted2.png diff --git a/Assets/UITextures/GUI.Inverted2.png.meta b/Assets/GUI/UITextures/GUI.Inverted2.png.meta similarity index 95% rename from Assets/UITextures/GUI.Inverted2.png.meta rename to Assets/GUI/UITextures/GUI.Inverted2.png.meta index 9f1861d..bb7ce03 100644 --- a/Assets/UITextures/GUI.Inverted2.png.meta +++ b/Assets/GUI/UITextures/GUI.Inverted2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 99cfc7bc65b4343478d39c84e04a0005 -timeCreated: 1449316125 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 99cfc7bc65b4343478d39c84e04a0005 +timeCreated: 1449316125 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.base.png b/Assets/GUI/UITextures/GUI.base.png similarity index 100% rename from Assets/UITextures/GUI.base.png rename to Assets/GUI/UITextures/GUI.base.png diff --git a/Assets/UITextures/GUI.base.png.meta b/Assets/GUI/UITextures/GUI.base.png.meta similarity index 95% rename from Assets/UITextures/GUI.base.png.meta rename to Assets/GUI/UITextures/GUI.base.png.meta index e99c6a3..e2fbeda 100644 --- a/Assets/UITextures/GUI.base.png.meta +++ b/Assets/GUI/UITextures/GUI.base.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7fc277f0bb101e04ca1c0188b8f16d59 -timeCreated: 1449080092 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7fc277f0bb101e04ca1c0188b8f16d59 +timeCreated: 1449080092 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Noise.mat b/Assets/GUI/UITextures/Noise.mat similarity index 100% rename from Assets/UITextures/Noise.mat rename to Assets/GUI/UITextures/Noise.mat diff --git a/Assets/UITextures/Noise.mat.meta b/Assets/GUI/UITextures/Noise.mat.meta similarity index 95% rename from Assets/UITextures/Noise.mat.meta rename to Assets/GUI/UITextures/Noise.mat.meta index 9ce9e12..d9ffeaa 100644 --- a/Assets/UITextures/Noise.mat.meta +++ b/Assets/GUI/UITextures/Noise.mat.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: d6713d1ba52181a4486dc7cb3c150e82 -timeCreated: 1448806667 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: d6713d1ba52181a4486dc7cb3c150e82 +timeCreated: 1448806667 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/NoiseEffectGrain.png b/Assets/GUI/UITextures/NoiseEffectGrain.png similarity index 100% rename from Assets/UITextures/NoiseEffectGrain.png rename to Assets/GUI/UITextures/NoiseEffectGrain.png diff --git a/Assets/UITextures/NoiseEffectGrain.png.meta b/Assets/GUI/UITextures/NoiseEffectGrain.png.meta similarity index 95% rename from Assets/UITextures/NoiseEffectGrain.png.meta rename to Assets/GUI/UITextures/NoiseEffectGrain.png.meta index a9a1333..6f4b90a 100644 --- a/Assets/UITextures/NoiseEffectGrain.png.meta +++ b/Assets/GUI/UITextures/NoiseEffectGrain.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: ffa9c02760c2b4e8eb9814ec06c4b05b -timeCreated: 1448806696 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 2 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 0 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ffa9c02760c2b4e8eb9814ec06c4b05b +timeCreated: 1448806696 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 2 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Ring.full.png b/Assets/GUI/UITextures/Ring.full.png similarity index 100% rename from Assets/UITextures/Ring.full.png rename to Assets/GUI/UITextures/Ring.full.png diff --git a/Assets/UITextures/Ring.full.png.meta b/Assets/GUI/UITextures/Ring.full.png.meta similarity index 100% rename from Assets/UITextures/Ring.full.png.meta rename to Assets/GUI/UITextures/Ring.full.png.meta diff --git a/Assets/UITextures/Ring.png b/Assets/GUI/UITextures/Ring.png similarity index 100% rename from Assets/UITextures/Ring.png rename to Assets/GUI/UITextures/Ring.png diff --git a/Assets/UITextures/Ring.png.meta b/Assets/GUI/UITextures/Ring.png.meta similarity index 95% rename from Assets/UITextures/Ring.png.meta rename to Assets/GUI/UITextures/Ring.png.meta index a2d489a..947c889 100644 --- a/Assets/UITextures/Ring.png.meta +++ b/Assets/GUI/UITextures/Ring.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 2da70774bb3fb1a4ca35de73be77aed9 -timeCreated: 1449241165 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 256 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 2da70774bb3fb1a4ca35de73be77aed9 +timeCreated: 1449241165 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 256 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Ring2.png b/Assets/GUI/UITextures/Ring2.png similarity index 100% rename from Assets/UITextures/Ring2.png rename to Assets/GUI/UITextures/Ring2.png diff --git a/Assets/UITextures/Ring2.png.meta b/Assets/GUI/UITextures/Ring2.png.meta similarity index 95% rename from Assets/UITextures/Ring2.png.meta rename to Assets/GUI/UITextures/Ring2.png.meta index a9eae88..af6d751 100644 --- a/Assets/UITextures/Ring2.png.meta +++ b/Assets/GUI/UITextures/Ring2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: bbc55cc13fc683247ad356f7da2bd5b4 -timeCreated: 1449255822 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: bbc55cc13fc683247ad356f7da2bd5b4 +timeCreated: 1449255822 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenu.png b/Assets/GUI/UITextures/SideMenu.png similarity index 100% rename from Assets/UITextures/SideMenu.png rename to Assets/GUI/UITextures/SideMenu.png diff --git a/Assets/UITextures/SideMenu.png.meta b/Assets/GUI/UITextures/SideMenu.png.meta similarity index 95% rename from Assets/UITextures/SideMenu.png.meta rename to Assets/GUI/UITextures/SideMenu.png.meta index 64d3edd..b3ebdd6 100644 --- a/Assets/UITextures/SideMenu.png.meta +++ b/Assets/GUI/UITextures/SideMenu.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 52b199ad536282a44970513f637512c1 -timeCreated: 1448801260 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 52b199ad536282a44970513f637512c1 +timeCreated: 1448801260 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenuv2.png b/Assets/GUI/UITextures/SideMenuv2.png similarity index 100% rename from Assets/UITextures/SideMenuv2.png rename to Assets/GUI/UITextures/SideMenuv2.png diff --git a/Assets/UITextures/SideMenuv2.png.meta b/Assets/GUI/UITextures/SideMenuv2.png.meta similarity index 95% rename from Assets/UITextures/SideMenuv2.png.meta rename to Assets/GUI/UITextures/SideMenuv2.png.meta index 1baae22..5008965 100644 --- a/Assets/UITextures/SideMenuv2.png.meta +++ b/Assets/GUI/UITextures/SideMenuv2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 6867f2a1f077fa548892daa44aacd7c2 -timeCreated: 1448802831 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 0 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 6867f2a1f077fa548892daa44aacd7c2 +timeCreated: 1448802831 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 0 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenuv3.png b/Assets/GUI/UITextures/SideMenuv3.png similarity index 100% rename from Assets/UITextures/SideMenuv3.png rename to Assets/GUI/UITextures/SideMenuv3.png diff --git a/Assets/UITextures/SideMenuv3.png.meta b/Assets/GUI/UITextures/SideMenuv3.png.meta similarity index 95% rename from Assets/UITextures/SideMenuv3.png.meta rename to Assets/GUI/UITextures/SideMenuv3.png.meta index 5f4d3f3..f8f5a83 100644 --- a/Assets/UITextures/SideMenuv3.png.meta +++ b/Assets/GUI/UITextures/SideMenuv3.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 81f19520dc61ae6448cc2dccd52581a9 -timeCreated: 1448904895 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 81f19520dc61ae6448cc2dccd52581a9 +timeCreated: 1448904895 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg similarity index 100% rename from Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg rename to Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg diff --git a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta similarity index 95% rename from Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta rename to Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta index 19cfd73..81d6769 100644 --- a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta +++ b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: c213f44e2f12ef143a08457fad8b736c -timeCreated: 1448806884 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c213f44e2f12ef143a08457fad8b736c +timeCreated: 1448806884 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameController.cs b/Assets/GameController.cs index bee0eff..3339c54 100644 --- a/Assets/GameController.cs +++ b/Assets/GameController.cs @@ -8,6 +8,8 @@ using System.IO; using System.Collections.Generic; +using CivMarsEngine.Registry; + public class GameController : MonoBehaviour { diff --git a/Assets/Tile/IWorldGen.cs b/Assets/Interfaces/IWorldGen.cs similarity index 100% rename from Assets/Tile/IWorldGen.cs rename to Assets/Interfaces/IWorldGen.cs diff --git a/Assets/Tile/IWorldGen.cs.meta b/Assets/Interfaces/IWorldGen.cs.meta similarity index 95% rename from Assets/Tile/IWorldGen.cs.meta rename to Assets/Interfaces/IWorldGen.cs.meta index 7864fb8..7354591 100644 --- a/Assets/Tile/IWorldGen.cs.meta +++ b/Assets/Interfaces/IWorldGen.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 9e261beaea0c372429f7583c092894a3 -timeCreated: 1446131198 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9e261beaea0c372429f7583c092894a3 +timeCreated: 1446131198 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map.cs b/Assets/Map.cs index ab1cc0a..f27528e 100644 --- a/Assets/Map.cs +++ b/Assets/Map.cs @@ -50,10 +50,10 @@ public void AddBasicBuildings() int xMpos; xMpos = mapHeight / 2; - TileTransform mainBuilding = Instantiate(GameRegystry.buildings[MainBuilding.ID].gameObject).GetComponent(); + TileTransform mainBuilding = Instantiate(GameRegystry.buildings[CivMars.MainBuilding.ID].gameObject).GetComponent(); Buildings.SetTile(xMpos, xMpos, mainBuilding); - TileTransform chest = Instantiate(GameRegystry.buildings[Chest.ID].gameObject).GetComponent(); + TileTransform chest = Instantiate(GameRegystry.buildings[CivMars.Chest.ID].gameObject).GetComponent(); Buildings.SetTile(xMpos+5, xMpos+5, chest); } diff --git a/Assets/NeedToBeImplemented/Old/Generato.cs b/Assets/NeedToBeImplemented/Old/Generato.cs index d6bd9e9..d271fb7 100644 --- a/Assets/NeedToBeImplemented/Old/Generato.cs +++ b/Assets/NeedToBeImplemented/Old/Generato.cs @@ -3,24 +3,26 @@ using System.Linq; using System.Text; - - public class Generator:Building - { +namespace CivMars +{ + public class Generator : Building + { - public MainBuilding main; - public int internalsorage; + public MainBuilding main; + public int internalsorage; - public void Gen() - {} - + public void Gen() + { } - public void Transfer() - { - if (this.internalsorage > 1) - { - //main.Inventory =+ this.internalsorage; - } - } - } + public void Transfer() + { + if (this.internalsorage > 1) + { + //main.Inventory =+ this.internalsorage; + } + } + } + +} \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs b/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs index f03e57a..1324166 100644 --- a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs +++ b/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - +/* public class SpecMine : Miner { //public OreType type; @@ -13,3 +7,4 @@ public class SpecMine : Miner } + */ \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs b/Assets/NeedToBeImplemented/Old/Oxigeneration.cs index a2f7121..7edc702 100644 --- a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs +++ b/Assets/NeedToBeImplemented/Old/Oxigeneration.cs @@ -3,12 +3,14 @@ using System.Linq; using System.Text; - - public class Oxigenerator:Generator - { - public int speed; - public int capacity; +namespace CivMars +{ + public class Oxigenerator : Generator + { + public int speed; + public int capacity; - } + } +} \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs b/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs index 7456a6b..216bfa6 100644 --- a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs +++ b/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; - + /* public class UniverzalMiner:Miner { @@ -13,3 +13,4 @@ public class UniverzalMiner:Miner } + */ \ No newline at end of file diff --git a/Assets/OxigenRecoverer.cs b/Assets/NeedToBeImplemented/OxigenRecoverer.cs similarity index 100% rename from Assets/OxigenRecoverer.cs rename to Assets/NeedToBeImplemented/OxigenRecoverer.cs diff --git a/Assets/OxigenRecoverer.cs.meta b/Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta similarity index 100% rename from Assets/OxigenRecoverer.cs.meta rename to Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta diff --git a/Assets/OLD/Generate/IronOreTile.prefab b/Assets/OLD/Generate/IronOreTile.prefab deleted file mode 100644 index 4e45171e87a634b65f434b76c0cfb18e35d2379c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7712 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 diff --git a/Assets/OLD/Generate/StoneOreTile.prefab.meta b/Assets/OLD/Generate/StoneOreTile.prefab.meta deleted file mode 100644 index 7156633..0000000 --- a/Assets/OLD/Generate/StoneOreTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4d601b73a3e3ab643affb27e2c2f6966 -timeCreated: 1446325067 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OLD/Generate/UraniumOreTile.prefab b/Assets/OLD/Generate/UraniumOreTile.prefab deleted file mode 100644 index b44d4a3f0fc6f3482ec646593cf5a0c0ca19e9ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7720 zcmeHMZEPGz8J_i5KA7D^J5OKU<}h)Wzp3u%*c9LI5M*T!EIN-^uZ_1z|Sw`On8 zwJWNgN*fh^R8bK~2vIqJ5GheXK?DRBZRc}_Rif+rO zqD0(M-)vUZlX%wxi0$;vU!|6SzZuUa+-z&1bQV3|jyl^n$M8<@Y(af>_)fRC)R87t z{aMJ<8fzct;d~5#oM%-Hw^TQH=0YBh(bGVlH8DKSv$lp?Y7uhY10K%sO}MQdJvQ}l z2XM}db2fU&W89a*ajyc-t6mT51k-qYT&!M==OFmM4Ib*BD{57xy|oki_=h54)Q2SyN+?7L-y<*73hK@FzIB_Tg`f9H$d+xU(HXU zq88+ri?L?Y!aw%>`I$4B-W|VRa&LH|yL;l<5A8bj+du63YJX($1RGx70BN z9y%|bl)+v*uf|71JXMDq=iOR|yJ7q5VmOn6AL7@?@c6tsh&Pzmy8$rZ_cdFE~D)<92Q=@ZC}l<$;V>!sAYRZpbO;O^bnYPbP5Z z91-#_*XDk4;qm=TA3Xfi^>^Oi`X@%7`$K^OOeW!Mg8%<*k6(as&}ogcsnsbl4o3c4 zfOD~FIC1>LAuikFSbG{V+tb1;ZPB!dE-P2DZ0@nuJod}?se9?b#7Dxtx2cZ-b5QBcyM?Up(3=lnA1|Ih>UqJipGEl$ z1bFzw`04h{&F4S%@`ZnX>Cuk%E?@y9qj0hIAi!r~5D#xWG^D^U}K$+v}tVujMuF0ClVU2#YBWs>x;QtXg$e+TEL@fMV z-_uezjvV37hxm1TrZrBU7f~k;>+W#e8-eqx*V}sq(|Fvj-dDpd1skts z!9$zffm@|h!gCCG0XXHMzAY8ur4YZV4xbJ2_t)Wmi0=&Xv02{@oKdHQz=qIv`Ej+^ zE(c?IJL}zBMwA?NG7k1Q5in#2j_=w9z8tGemz`jslyx(X)ESI3`|Kc-XHZ3piLx{3 z=JLUa?@ddSQD>%r&m#!g0!@_d9OJT7dT_$QcN6e3S`U<@XVIRO_fFaI=bVX2jx&Jm znve5N&_94$PbKgsCWq|#{pJu9!+J_N1b&&lp&PM%yXasRWq#LLi2@u0J+^+b)02-r zA)wO)-ivb4u-7X&5s^Iivj1oX|s*Ka%Se<&PFw7p@oOiB4Vm z6l>On`NQZZZa>T)8rS=hVO%YGb56E)@?==kqiccL1R=B^k!n~v z0~jdlccGN@Shemr1B1T4jE7c{{x{609;5RrwTL^5TZaYx?(-v00zpVXhllW_Nzui4 zUF!diJdfhtU98JHGAs4eQ~RaxB7VPt`Wd-3=VI>ft!#4?B0Yj9!{Pa6yrYP^yE?a^ zxe1vv(Omp_nkVmjJ~+Oe$8)=4qezg{NS%PeCFw&@7StQd4(VP zytxYQv~T+hH&se*u#n1P(JO@@X!tbq z(E8GEj4nA}UPce~Ix}^nU$&)~6Zn|tR*J*E!~YQIP&`oz>|D;tvQ7OJs>`S?@!H5o zFuwj#qw3zM%o6M7PQEcUGoGpQ*=QWoj!(0G@jk|Oh&^}uG`u~v4@^B6|0mpXF>Lj^ zb3?XY?wl@onZuotX4uE@vuv){lOt|NrhTL5mGZJZEu_ip`x=q1z-oGjzE5J_D=*qq ts<|%|$E=BYuAD#T7r&TxYx@tBlYCK228Zxlu()40_ly7LGPXqF{sk!mb^HJT diff --git a/Assets/OLD/Generate/UraniumOreTile.prefab.meta b/Assets/OLD/Generate/UraniumOreTile.prefab.meta deleted file mode 100644 index f305ec9..0000000 --- a/Assets/OLD/Generate/UraniumOreTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9830936db7341f64b84cad43527b9475 -timeCreated: 1446326106 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OLD/MapOld.cs b/Assets/OLD/MapOld.cs deleted file mode 100644 index 1ba6ffd..0000000 --- a/Assets/OLD/MapOld.cs +++ /dev/null @@ -1,221 +0,0 @@ -using System; -using System.IO; -using UnityEngine; - -//public class Map -//{ -// public int mapHeight; -// public GeneratedTile[,] mapGenerated; -// public Building[,] mapBuilt; - -// public int seed; - -// public Map(GeneratedTile[,] inmap, int inputseed) -// { -// this.mapHeight = (int)Math.Sqrt(inmap.Length); - -// this.mapGenerated = new GeneratedTile[mapHeight, mapHeight]; - -// for (int i = 0; i < mapHeight; i++) -// { -// for (int j = 0; j < mapHeight; j++) -// { -// mapGenerated[i, j] = inmap[i, j]; -// } -// } -// mapBuilt = new Building[mapHeight, mapHeight]; - -// seed = inputseed; -// } - -// public Map(int inputseed, float h, float reduce, int maxOre, GameObject mapPiece) -// { -// Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); - -// this.mapHeight = (int)Math.Sqrt(h); -// this.mapGenerated = new GeneratedTile[mapHeight, mapHeight]; -// seed = inputseed; - -// #region File -// FileStream file = new FileStream("./file.txt", FileMode.Create); -// StreamWriter wf = new StreamWriter(file); -// #endregion - -// int gen = 50; -// float[,] h2 = new float[,] { { 3f, 15f }, { 2f, 20f }, { 1f, 22f }, { 0.2f, 30f }, { 0.1f, 40f }, { 0.001f, 45 } }; - -// System.Random rand = new System.Random(seed); - -// GeneratedTile[,] map = new GeneratedTile[50, 50]; -// GeneratedTile initial; - - - -// for (int i = 0; i < gen; i++) -// { -// for (int j = 0; j < gen; j++) -// { -// initial = new OreTile(rand, i, j, maxOre); - -// h = h2[(int)initial.type, 0]; - -// reduce = h2[(int)initial.type, 1]; - -// if (rand.Next(0, 100) <= h) -// { -// map[i, j] = initial; - -// map = ((OreTile)map[i, j]).Spread(map, h, rand, reduce, rand.Next(1, maxOre)); -// } -// } -// wf.WriteLine(); -// } - -// for (int xPos = 0; xPos < gen; xPos++) -// { -// for (int yPos = 0; yPos < gen; yPos++) -// { -// if (map[xPos, yPos] == null) -// { -// map[xPos, yPos] = new GeneratedTile(xPos, yPos); -// } -// if (map[xPos, yPos] != null) -// { -// wf.Write((int)map[xPos, yPos].type + ","); -// } - -// Debug.Log(xPos + "," + yPos); - -// GameObject go = GameObject.Instantiate(mapPiece); -// go.name = "Tile_" + xPos + "_" + yPos; -// SpriteRenderer curr = go.GetComponent(); - -// Debug.Log(xPos + "," + yPos); -// curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; - -// curr.transform.parent = showLay.transform; - -// Vector2 pos = new Vector3(yPos, -xPos) * tileSize; -// pos = pos + posMultiplyer; - -// curr.transform.localPosition = (pos); - -// Debug.Log("Tile Done"); - -// } -// } - -// wf.Close(); - - -// } - - - -// public Map() -// { } - -// public void GenerateBuildings() -// { -// int xMpos; -// xMpos = ((int)Math.Floor((double)mapHeight / 2)); - -// mapBuilt[xMpos, xMpos] = new MainBuilding(xMpos, xMpos); -// mapBuilt[xMpos + 5, xMpos - 5] = new Chest(xMpos + 5, xMpos - 5); - -// } - - -// public static void MapDraw(Map map, GameObject mapPiece, Sprite[] GeneratedSprites, GameObject[] BuildingPrefabs, float tileSize) -// { - -// Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); -// GameObject allTile = new GameObject("AllTitle"); - -// Debug.Log("MapShowing started"); - -// GameObject showLay = new GameObject(""); -// showLay.transform.position = new Vector3(0, 0, 0); -// showLay.transform.parent = allTile.transform; - - -// if (map.mapGenerated != null) -// Debug.Log("OK"); - - - -// Debug.Log(map.seed); -// Debug.Log(map.mapHeight); - -// #region load generated -// for (int xPos = 0; xPos < map.mapHeight; xPos++) -// { - -// for (int yPos = 0; yPos < map.mapHeight; yPos++) -// { - -// Debug.Log(xPos + "," + yPos); - -// GameObject go = GameObject.Instantiate(mapPiece); -// go.name = "Tile_" + xPos + "_" + yPos; -// SpriteRenderer curr = go.GetComponent(); - -// Debug.Log(xPos + "," + yPos); -// curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; - -// curr.transform.parent = showLay.transform; - -// Vector2 pos = new Vector3(yPos, -xPos) * tileSize; -// pos = pos + posMultiplyer; - -// curr.transform.localPosition = (pos); - -// Debug.Log("Tile Done"); -// } -// } -// #endregion - - -// #region Building load OUT DATED -// /* -// for (int xPos = 0; xPos < map.mapHeight; xPos++) -// { - -// for (int yPos = 0; yPos < map.mapHeight; yPos++) -// { -// if (map.mapBuilt[xPos, yPos] != null) -// { -// Debug.Log(xPos + "," + yPos); - -// foreach (GameObject i in BuildingPrefabs) -// { -// Debug.Log(map.mapBuilt[xPos, yPos].GetType().ToString()); -// if (i.name == map.mapBuilt[xPos, yPos].GetType().ToString()) -// { -// GameObject go = GameObject.Instantiate(i); - -// Vector3 pos = new Vector3(yPos + posMultiplyer.x, -xPos + posMultiplyer.y, -5) * tileSize; - -// go.transform.localPosition = (pos); - -// break; -// } -// } - - - - - -// Debug.Log("Tile Done"); -// } -// } -// } -// */ -// #endregion - - - -// } -//} - - diff --git a/Assets/TerrainGen.cs b/Assets/TerrainGen.cs deleted file mode 100644 index 524f110..0000000 --- a/Assets/TerrainGen.cs +++ /dev/null @@ -1,64 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.IO; -/* -public class TerrainGen{ - - - - public static GeneratedTile[,] Generate(float h, float reduce , int seed,int maxOre) - { - - FileStream file = new FileStream("./file.txt", FileMode.Create); - StreamWriter wf = new StreamWriter(file); - - - int gen = 50; - float[,] h2 = new float[,] { {3f, 15f}, {2f,20f}, {1f,22f}, {0.2f,30f}, {0.1f,40f}, {0.001f,45}}; - System.Random rand = new System.Random(seed); - - GeneratedTile[,] map = new GeneratedTile[50, 50]; - GeneratedTile initial; - - bool t = false; - - - for (int i = 0; i < gen; i++) - { - for (int j = 0; j < gen; j++) - { - map[i, j] = new GeneratedTile(i, j); - } - } - - for (int i = 0; i < gen; i++) - { - for (int j = 0; j < gen; j++) - { - initial = new OreTile(rand, i, j, maxOre); - h = h2[(int)initial.type,0]; - reduce = h2[(int)initial.type, 1]; - if (rand.Next(0, 100) <= h && !t) - { - map[i, j] = initial; - - map = ((OreTile)map[i, j]).Spread(map, h, rand, reduce); - - t = false; - } - if (map[i, j] != null) - { - wf.Write((int)map[i, j].type + ","); - } - - } - wf.WriteLine(); - } - wf.Close(); - - return map; - - } - } - - */ diff --git a/Assets/TileMap/SavedMap.cs b/Assets/TileMap/SavedMap.cs deleted file mode 100644 index e53ee8c..0000000 --- a/Assets/TileMap/SavedMap.cs +++ /dev/null @@ -1,104 +0,0 @@ -/* -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using System.Text; -using UnityEngine; -using UnityEngine.Serialization; - -class SavedMap -{ - Map RealMap; - SavedMapData mapdata; - - public SavedMap(Map m) - { - RealMap = m; - //mapdata = new SavedMapData(); - mapdata.height = m.mapHeight; - mapdata.GeaneratedTiles = new SavedTile[m.mapHeight, m.mapHeight]; - } - - public SavedMap(string path, Map map) - { - RealMap = map; - IFormatter formatter = new BinaryFormatter(); - Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read); - SavedMapData obj = (SavedMapData)formatter.Deserialize(stream); - mapdata = obj; - stream.Close(); - } - - public void Refresh() - { - for (int i = 0; i < RealMap.mapHeight; i++) - { - for (int j = 0; j < RealMap.mapHeight; j++) - { - TileTransform tile = RealMap.Generated.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapdata.GeaneratedTiles[i, j] = ((ISaveble)t).Save(); - } - } - - - tile = RealMap.Buildings.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapdata.BuildingTiles[i, j] = ((ISaveble)t).Save(); - } - } - } - } - } - - public void LoadFromSave() - { - for (int i = 0; i < mapdata.height; i++) - { - for (int j = 0; j < mapdata.height; j++) - { - SavedTile tile = mapdata.GeaneratedTiles[i, j]; - if (tile != null) - { - if (tile is SavedOre) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); - RealMap.GeneratedReloaded.SetTile(i, j, trans); - } - } - - tile = mapdata.BuildingTiles[i, j]; - if (tile != null) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); - RealMap.Buildings.SetTile(i, j, trans); - } - } - } - } - - public void Save(string path) - { - Refresh(); - - IFormatter formatter = new BinaryFormatter(); - Stream stream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None); - formatter.Serialize(stream, mapdata); - stream.Close(); - } -} - -*/ \ No newline at end of file diff --git a/saves/asd/asd.bin b/saves/asd/asd.bin deleted file mode 100644 index 407a7a1f24d0acec103ccfb8a9056808c35eea51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60263 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 diff --git a/saves/asd/asd.ddc b/saves/asd/asd.ddc deleted file mode 100644 index 9bff184555dfd5da1065ac881885095104e23021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmXv{TMEK35KL_viVyto(<2nyGl=;Wgq~o_E+&wc;0B?m@u<4{;lRu+%&=oBW6W2e zuGnuxj#p-yr?g&fV}Ms~G(C^-CcH!TP@waXbAr`VAxPXvZWoxz1&Ys5EEC~20hfoA m2yKQE^hwpW2VHQrNDYiA{t^D+tX!vlU>V~<3d(+p%kBrWrYRW! diff --git a/saves/fgh/fgh.bin b/saves/fgh/fgh.bin deleted file mode 100644 index 8af2bbd00bff46efcc4b6741944ef2d2685d03bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36220 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 From d479b3ff314b5d8952f357a052161fd3e154cf15 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Mon, 21 Dec 2015 15:30:46 +0100 Subject: [PATCH 3/5] - Content Creation --- Assets/Buildings/Chest.cs | 167 ---------- Assets/Buildings/Furnace.cs | 283 ----------------- Assets/Buildings/GreenHouse.cs | 156 ---------- Assets/Buildings/MainBuilding.cs | 188 ------------ Assets/Buildings/Miner.cs | 202 ------------- Assets/Buildings/PlanedBuilding.cs | 193 ------------ Assets/{ => CivMars}/Buildings.meta | 0 Assets/{ => CivMars}/Buildings/Building.cs | 0 .../{ => CivMars}/Buildings/Building.cs.meta | 0 Assets/CivMars/Buildings/Chest.cs | 170 +++++++++++ Assets/{ => CivMars}/Buildings/Chest.cs.meta | 0 Assets/CivMars/Buildings/Furnace.cs | 286 ++++++++++++++++++ .../{ => CivMars}/Buildings/Furnace.cs.meta | 24 +- Assets/CivMars/Buildings/GreenHouse.cs | 159 ++++++++++ .../Buildings/GreenHouse.cs.meta | 0 Assets/CivMars/Buildings/MainBuilding.cs | 192 ++++++++++++ .../Buildings/MainBuilding.cs.meta | 0 Assets/CivMars/Buildings/Miner.cs | 205 +++++++++++++ Assets/{ => CivMars}/Buildings/Miner.cs.meta | 24 +- Assets/CivMars/Buildings/PlanedBuilding.cs | 196 ++++++++++++ .../Buildings/PlanedBuilding.cs.meta | 24 +- Assets/CivMars/Buildings/Press.cs | 283 +++++++++++++++++ Assets/{ => CivMars/Buildings}/Press.cs.meta | 24 +- Assets/{ => CivMars}/Buildings/Tiled.cs | 0 Assets/{ => CivMars}/Buildings/Tiled.cs.meta | 0 Assets/{ => CivMars}/Items.meta | 0 .../Items/BasicMaterials.meta} | 4 +- .../Items/BasicMaterials/CopperIngot.cs | 28 ++ .../Items/BasicMaterials/CopperIngot.cs.meta} | 4 +- .../CivMars/Items/BasicMaterials/GoldIngot.cs | 28 ++ .../Items/BasicMaterials/GoldIngot.cs.meta} | 4 +- .../CivMars/Items/BasicMaterials/IronIngot.cs | 35 +++ .../Items/BasicMaterials}/IronIngot.cs.meta | 24 +- Assets/CivMars/Items/BasicMaterials/Resin.cs | 25 ++ .../Items/BasicMaterials/Resin.cs.meta} | 4 +- .../Items/BasicMaterials/SiliconRod.cs | 32 ++ .../Items.meta => CivMars/Items/Chips.meta} | 4 +- Assets/CivMars/Items/Chips/ControllChip.cs | 28 ++ .../Items/Chips/ControllChip.cs.meta} | 4 +- .../Items/Circuits.meta} | 4 +- .../CivMars/Items/Circuits/ControlCircuit.cs | 29 ++ .../Items/Circuits}/ControlCircuit.cs.meta | 0 Assets/{ => CivMars}/Items/GlassPLane.cs | 3 + Assets/{ => CivMars}/Items/GlassPLane.cs.meta | 24 +- Assets/CivMars/Items/InteriorPlate.cs | 34 +++ .../{ => CivMars}/Items/InteriorPlate.cs.meta | 0 Assets/CivMars/Items/IronPipe.cs | 33 ++ Assets/{ => CivMars}/Items/IronPipe.cs.meta | 24 +- Assets/{ => CivMars}/Items/Item.cs | 0 Assets/{ => CivMars}/Items/Item.cs.meta | 0 Assets/{ => CivMars}/Items/Ore.meta | 0 Assets/CivMars/Items/Ore/CoalOre.cs | 16 + .../{ => CivMars}/Items/Ore/CoalOre.cs.meta | 0 Assets/CivMars/Items/Ore/CopperOre.cs | 26 ++ Assets/CivMars/Items/Ore/CopperOre.cs.meta | 12 + Assets/CivMars/Items/Ore/GoldOre.cs | 25 ++ Assets/CivMars/Items/Ore/GoldOre.cs.meta | 12 + Assets/CivMars/Items/Ore/IronOre.cs | 16 + .../{ => CivMars}/Items/Ore/IronOre.cs.meta | 0 Assets/CivMars/Items/Ore/SandOre.cs | 18 ++ .../{ => CivMars}/Items/Ore/SandOre.cs.meta | 0 Assets/CivMars/Items/Ore/StoneOre.cs | 18 ++ .../{ => CivMars}/Items/Ore/StoneOre.cs.meta | 0 Assets/CivMars/Items/Ore/UraniumOre.cs | 19 ++ .../Items/Ore/UraniumOre.cs.meta | 0 Assets/CivMars/Items/OxygenTank.cs | 34 +++ Assets/{ => CivMars}/Items/OxygenTank.cs.meta | 0 Assets/CivMars/Items/Piston.cs | 34 +++ Assets/{ => CivMars}/Items/Piston.cs.meta | 24 +- .../{OLD.meta => CivMars/Items/Plates.meta} | 4 +- Assets/CivMars/Items/Plates/IronPlate.cs | 34 +++ .../Items/Plates}/IronPlate.cs.meta | 24 +- Assets/CivMars/Items/Plates/PlasticPlate.cs | 28 ++ .../CivMars/Items/Plates/PlasticPlate.cs.meta | 12 + Assets/CivMars/Items/Roof.cs | 34 +++ Assets/{ => CivMars}/Items/Roof.cs.meta | 24 +- Assets/{ => CivMars}/Items/Sapling.cs | 0 Assets/{ => CivMars}/Items/Sapling.cs.meta | 24 +- Assets/CivMars/Items/StoneBrick.cs | 34 +++ Assets/{ => CivMars}/Items/StoneBrick.cs.meta | 24 +- Assets/{ => CivMars}/Items/Wood.cs | 0 Assets/{ => CivMars}/Items/Wood.cs.meta | 24 +- Assets/{Tile => CivMars}/Ores.meta | 18 +- Assets/CivMars/Ores/CoalOreTile.cs | 60 ++++ .../Ores/CoalOreTile.cs.meta | 24 +- Assets/CivMars/Ores/IronOreTile.cs | 54 ++++ .../Ores/IronOreTile.cs.meta | 24 +- Assets/{Tile => CivMars}/Ores/OreTile.cs | 0 Assets/{Tile => CivMars}/Ores/OreTile.cs.meta | 24 +- Assets/CivMars/Ores/SandTile.cs | 53 ++++ .../{Tile => CivMars}/Ores/SandTile.cs.meta | 24 +- Assets/CivMars/Ores/StoneOreTile.cs | 54 ++++ .../Ores/StoneOreTile.cs.meta | 24 +- Assets/CivMars/Ores/UraniumOreTile.cs | 54 ++++ .../Ores/UraniumOreTile.cs.meta | 24 +- Assets/Items/ControlCircuit.cs | 34 --- Assets/Items/InteriorPlate.cs | 32 -- Assets/Items/IronIngot.cs | 33 -- Assets/Items/IronPipe.cs | 31 -- Assets/Items/IronPlate.cs | 32 -- Assets/Items/Ore/CoalOre.cs | 21 -- Assets/Items/Ore/IronOre.cs | 20 -- Assets/Items/Ore/SandOre.cs | 20 -- Assets/Items/Ore/StoneOre.cs | 23 -- Assets/Items/Ore/UraniumOre.cs | 23 -- Assets/Items/OxygenTank.cs | 32 -- Assets/Items/Piston.cs | 32 -- Assets/Items/Roof.cs | 32 -- Assets/Items/StoneBrick.cs | 31 -- Assets/OLD/Generate/IronOreTile.prefab.meta | 8 - Assets/OLD/Generate/SandTile.prefab.meta | 8 - Assets/Press.cs | 280 ----------------- Assets/Tile/Ores/CoalOreTile.cs | 57 ---- Assets/Tile/Ores/IronOreTile.cs | 51 ---- Assets/Tile/Ores/SandTile.cs | 50 --- Assets/Tile/Ores/StoneOreTile.cs | 51 ---- Assets/Tile/Ores/UraniumOreTile.cs | 51 ---- Assets/TileMap/SavedMap.cs.meta | 12 - ProjectSettings/ClusterInputManager.asset | Bin 0 -> 4104 bytes 119 files changed, 2666 insertions(+), 2406 deletions(-) delete mode 100644 Assets/Buildings/Chest.cs delete mode 100644 Assets/Buildings/Furnace.cs delete mode 100644 Assets/Buildings/GreenHouse.cs delete mode 100644 Assets/Buildings/MainBuilding.cs delete mode 100644 Assets/Buildings/Miner.cs delete mode 100644 Assets/Buildings/PlanedBuilding.cs rename Assets/{ => CivMars}/Buildings.meta (100%) rename Assets/{ => CivMars}/Buildings/Building.cs (100%) rename Assets/{ => CivMars}/Buildings/Building.cs.meta (100%) create mode 100644 Assets/CivMars/Buildings/Chest.cs rename Assets/{ => CivMars}/Buildings/Chest.cs.meta (100%) create mode 100644 Assets/CivMars/Buildings/Furnace.cs rename Assets/{ => CivMars}/Buildings/Furnace.cs.meta (95%) create mode 100644 Assets/CivMars/Buildings/GreenHouse.cs rename Assets/{ => CivMars}/Buildings/GreenHouse.cs.meta (100%) create mode 100644 Assets/CivMars/Buildings/MainBuilding.cs rename Assets/{ => CivMars}/Buildings/MainBuilding.cs.meta (100%) create mode 100644 Assets/CivMars/Buildings/Miner.cs rename Assets/{ => CivMars}/Buildings/Miner.cs.meta (95%) create mode 100644 Assets/CivMars/Buildings/PlanedBuilding.cs rename Assets/{ => CivMars}/Buildings/PlanedBuilding.cs.meta (95%) create mode 100644 Assets/CivMars/Buildings/Press.cs rename Assets/{ => CivMars/Buildings}/Press.cs.meta (95%) rename Assets/{ => CivMars}/Buildings/Tiled.cs (100%) rename Assets/{ => CivMars}/Buildings/Tiled.cs.meta (100%) rename Assets/{ => CivMars}/Items.meta (100%) rename Assets/{OLD/Generate.meta => CivMars/Items/BasicMaterials.meta} (67%) create mode 100644 Assets/CivMars/Items/BasicMaterials/CopperIngot.cs rename Assets/{Behaviour.cs.meta => CivMars/Items/BasicMaterials/CopperIngot.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/BasicMaterials/GoldIngot.cs rename Assets/{Class1.cs.meta => CivMars/Items/BasicMaterials/GoldIngot.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/BasicMaterials/IronIngot.cs rename Assets/{Items => CivMars/Items/BasicMaterials}/IronIngot.cs.meta (95%) create mode 100644 Assets/CivMars/Items/BasicMaterials/Resin.cs rename Assets/{OLD/MapOld.cs.meta => CivMars/Items/BasicMaterials/Resin.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/BasicMaterials/SiliconRod.cs rename Assets/{scripts/Items.meta => CivMars/Items/Chips.meta} (67%) create mode 100644 Assets/CivMars/Items/Chips/ControllChip.cs rename Assets/{TerrainGen.cs.meta => CivMars/Items/Chips/ControllChip.cs.meta} (76%) rename Assets/{NeedToBeImplemented/Resources.meta => CivMars/Items/Circuits.meta} (67%) create mode 100644 Assets/CivMars/Items/Circuits/ControlCircuit.cs rename Assets/{Items => CivMars/Items/Circuits}/ControlCircuit.cs.meta (100%) rename Assets/{ => CivMars}/Items/GlassPLane.cs (92%) rename Assets/{ => CivMars}/Items/GlassPLane.cs.meta (95%) create mode 100644 Assets/CivMars/Items/InteriorPlate.cs rename Assets/{ => CivMars}/Items/InteriorPlate.cs.meta (100%) create mode 100644 Assets/CivMars/Items/IronPipe.cs rename Assets/{ => CivMars}/Items/IronPipe.cs.meta (95%) rename Assets/{ => CivMars}/Items/Item.cs (100%) rename Assets/{ => CivMars}/Items/Item.cs.meta (100%) rename Assets/{ => CivMars}/Items/Ore.meta (100%) create mode 100644 Assets/CivMars/Items/Ore/CoalOre.cs rename Assets/{ => CivMars}/Items/Ore/CoalOre.cs.meta (100%) create mode 100644 Assets/CivMars/Items/Ore/CopperOre.cs create mode 100644 Assets/CivMars/Items/Ore/CopperOre.cs.meta create mode 100644 Assets/CivMars/Items/Ore/GoldOre.cs create mode 100644 Assets/CivMars/Items/Ore/GoldOre.cs.meta create mode 100644 Assets/CivMars/Items/Ore/IronOre.cs rename Assets/{ => CivMars}/Items/Ore/IronOre.cs.meta (100%) create mode 100644 Assets/CivMars/Items/Ore/SandOre.cs rename Assets/{ => CivMars}/Items/Ore/SandOre.cs.meta (100%) create mode 100644 Assets/CivMars/Items/Ore/StoneOre.cs rename Assets/{ => CivMars}/Items/Ore/StoneOre.cs.meta (100%) create mode 100644 Assets/CivMars/Items/Ore/UraniumOre.cs rename Assets/{ => CivMars}/Items/Ore/UraniumOre.cs.meta (100%) create mode 100644 Assets/CivMars/Items/OxygenTank.cs rename Assets/{ => CivMars}/Items/OxygenTank.cs.meta (100%) create mode 100644 Assets/CivMars/Items/Piston.cs rename Assets/{ => CivMars}/Items/Piston.cs.meta (95%) rename Assets/{OLD.meta => CivMars/Items/Plates.meta} (67%) create mode 100644 Assets/CivMars/Items/Plates/IronPlate.cs rename Assets/{Items => CivMars/Items/Plates}/IronPlate.cs.meta (95%) create mode 100644 Assets/CivMars/Items/Plates/PlasticPlate.cs create mode 100644 Assets/CivMars/Items/Plates/PlasticPlate.cs.meta create mode 100644 Assets/CivMars/Items/Roof.cs rename Assets/{ => CivMars}/Items/Roof.cs.meta (95%) rename Assets/{ => CivMars}/Items/Sapling.cs (100%) rename Assets/{ => CivMars}/Items/Sapling.cs.meta (95%) create mode 100644 Assets/CivMars/Items/StoneBrick.cs rename Assets/{ => CivMars}/Items/StoneBrick.cs.meta (95%) rename Assets/{ => CivMars}/Items/Wood.cs (100%) rename Assets/{ => CivMars}/Items/Wood.cs.meta (95%) rename Assets/{Tile => CivMars}/Ores.meta (95%) create mode 100644 Assets/CivMars/Ores/CoalOreTile.cs rename Assets/{Tile => CivMars}/Ores/CoalOreTile.cs.meta (95%) create mode 100644 Assets/CivMars/Ores/IronOreTile.cs rename Assets/{Tile => CivMars}/Ores/IronOreTile.cs.meta (95%) rename Assets/{Tile => CivMars}/Ores/OreTile.cs (100%) rename Assets/{Tile => CivMars}/Ores/OreTile.cs.meta (95%) create mode 100644 Assets/CivMars/Ores/SandTile.cs rename Assets/{Tile => CivMars}/Ores/SandTile.cs.meta (95%) create mode 100644 Assets/CivMars/Ores/StoneOreTile.cs rename Assets/{Tile => CivMars}/Ores/StoneOreTile.cs.meta (95%) create mode 100644 Assets/CivMars/Ores/UraniumOreTile.cs rename Assets/{Tile => CivMars}/Ores/UraniumOreTile.cs.meta (95%) delete mode 100644 Assets/Items/ControlCircuit.cs delete mode 100644 Assets/Items/InteriorPlate.cs delete mode 100644 Assets/Items/IronIngot.cs delete mode 100644 Assets/Items/IronPipe.cs delete mode 100644 Assets/Items/IronPlate.cs delete mode 100644 Assets/Items/Ore/CoalOre.cs delete mode 100644 Assets/Items/Ore/IronOre.cs delete mode 100644 Assets/Items/Ore/SandOre.cs delete mode 100644 Assets/Items/Ore/StoneOre.cs delete mode 100644 Assets/Items/Ore/UraniumOre.cs delete mode 100644 Assets/Items/OxygenTank.cs delete mode 100644 Assets/Items/Piston.cs delete mode 100644 Assets/Items/Roof.cs delete mode 100644 Assets/Items/StoneBrick.cs delete mode 100644 Assets/OLD/Generate/IronOreTile.prefab.meta delete mode 100644 Assets/OLD/Generate/SandTile.prefab.meta delete mode 100644 Assets/Press.cs delete mode 100644 Assets/Tile/Ores/CoalOreTile.cs delete mode 100644 Assets/Tile/Ores/IronOreTile.cs delete mode 100644 Assets/Tile/Ores/SandTile.cs delete mode 100644 Assets/Tile/Ores/StoneOreTile.cs delete mode 100644 Assets/Tile/Ores/UraniumOreTile.cs delete mode 100644 Assets/TileMap/SavedMap.cs.meta create mode 100644 ProjectSettings/ClusterInputManager.asset diff --git a/Assets/Buildings/Chest.cs b/Assets/Buildings/Chest.cs deleted file mode 100644 index b7f0ab7..0000000 --- a/Assets/Buildings/Chest.cs +++ /dev/null @@ -1,167 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; -using System; -using System.Collections.Generic; - -[AddComponentMenu("Buildings/Chest")] -public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble -{ - new public static string ID = CivMarsInit.BlockSpace + ".Chest"; - - public Text Name; - public Text InventoryButtonText; - - public Inventory inventory = new Inventory(15); - - public Sprite Icon; - - static Item[] buildingMaterials = { new SandOre(2) }; - - bool invOn; - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - public void OpenInventory() - { - invOn = !invOn; - if (invOn) - GameCon.guiHandler.defaultInventory.Activate(this); - else - GameCon.guiHandler.defaultInventory.Deactive(); - - } - - #region IHasGUI - - public override void Close() - { - base.Close(); - GameCon.guiHandler.defaultInventory.Deactive(); - } - - #endregion - - - #region IBuildable - - public Sprite GetImage() - { - return Icon; - } - - public GameObject GetPrefab() - { - return gameObject; - } - - public Image GetBuildedState() - { - throw new NotImplementedException(); - } - - public Item[] GetNeededMaterials() - { - return buildingMaterials; - } - - public float GetBuildtime() - { - return 5f; - } - - public void Setup() - { - } - - #endregion - - public void Regystrate() - { - base.ID = ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } - - #region Inventory - - public int GetInventorySize() - { - return inventory.size; - } - - public string GetInventoryName() - { - throw new NotImplementedException(); - } - - public bool HasCustomInventoryName() - { - return false; - } - - public Item GetStackInSlot(int i) - { - return inventory.Get(i); - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - throw new NotImplementedException(); - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - return true; - } - - public Item Add(Item i) - { - return inventory.Add(i); - } - - public Item Remove(Item i) - { - return inventory.Remove(i); - } - - public void TransferItem(IInventory ToInv, int index) - { - throw new NotImplementedException(); - } - - public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) - { - throw new NotImplementedException(); - } - - - - #endregion - - public override SavedTile Save() - { - return new Saved(this); - } - - [Serializable] - public class Saved : SavedTile - { - Inventory inv; - - public Saved(Chest c):base(Chest.ID) - { - inv = c.inventory; - } - } -} - diff --git a/Assets/Buildings/Furnace.cs b/Assets/Buildings/Furnace.cs deleted file mode 100644 index 15b5a38..0000000 --- a/Assets/Buildings/Furnace.cs +++ /dev/null @@ -1,283 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System; -using UnityEngine.UI; - -public class Furnace : Building, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter -{ - - enum States - { - None, - Inv, - Craft - } - - public List craftingQueue = new List(); - - public string ID = "CivMars.Furnace"; - static Item[] neededMaterials = { new SandOre(1) }; - public Sprite icon; - - States invOn; - - Inventory inv = new Inventory(10); - - Item remaining; - - // Use this for initialization - void Start() - { - - } - - // Update is called once per frame - void Update() - { - if (remaining == null && craftingQueue.Count > 0) - { - CraftingProcess a = (CraftingProcess)craftingQueue[0]; - if (a.HasItems()) - { - a.status -= Time.deltaTime; - - if (a.status <= 0f) - { - remaining = (Item)Activator.CreateInstance(a.recipe.Crafted.GetType()); - remaining.amount = a.amount * a.recipe.Crafted.amount; - craftingQueue.RemoveAt(0); - } - - } - else - { - Inventory inv = this.inv; - - for (int i = 0; i < a.recipe.Materials.Length; i++) - { - if (a.materials[i] > 0) - { - Item needed = (Item)Activator.CreateInstance(null, a.recipe.Materials[i].GetType().ToString()).Unwrap(); - needed.amount = a.materials[i]; - - Item remainingItem = inv.Remove(needed); - if (remainingItem != null) - { - a.materials[i] = remainingItem.amount; - } - else - { - a.materials[i] = 0; - } - - - } - } - } - } - else if (remaining != null) - { - remaining = inv.Add(remaining); - } - } - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - public void OpenInventory() - { - if (invOn != States.Inv) - { - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - - GameCon.guiHandler.defaultInventory.Activate(this); - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - invOn = States.Inv; - } - else - { - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - - GameCon.guiHandler.defaultInventory.Deactive(); - invOn = States.None; - } - } - - public void OpenCrafting() - { - - if (invOn != States.Craft) - { - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(true); - - GameCon.guiHandler.defaultInventory.Deactive(); - GameCon.guiHandler.defaultCrafting.SetBuilding(this); - invOn = States.Craft; - } - else - { - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - invOn = States.None; - } - - } - - #region IHasGUI - - public override void Close() - { - base.Close(); - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultInventory.Deactive(); - - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - } - - #endregion - - #region IRegystratabe - - public void Regystrate() - { - base.ID = this.ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } - - #endregion - - #region IBuildable - - public float GetBuildtime() - { - return 1; - } - - public Sprite GetImage() - { - return icon; - } - - public GameObject GetPrefab() - { - return gameObject; - } - - public Image GetBuildedState() - { - throw new NotImplementedException(); - } - - public Item[] GetNeededMaterials() - { - return neededMaterials; - } - - public void Setup() - { - return; - } - - - #endregion - - #region IInventory - - public int GetInventorySize() - { - return 10; - } - - public string GetInventoryName() - { - return "asd"; - } - - public bool HasCustomInventoryName() - { - return true; - } - - public Item GetStackInSlot(int i) - { - return inv.Get(i); - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - throw new NotImplementedException(); - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - throw new NotImplementedException(); - } - - public Item Add(Item i) - { - return inv.Add(i); - } - - public Item Remove(Item i) - { - return inv.Remove(i); - } - - public void TransferItem(IInventory ToInv, int index) - { - inv.TransferItem(ToInv, index); - } - - public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) - { - inv.TransferItemAmount(Toinv, fromindex, transferingAmount); - } - - #endregion - - #region ICrafter - public void AddToQueue(int i) - { - //throw new NotImplementedException(); - craftingQueue.Add(new CraftingProcess(GameRegystry.recepies[ID][i], 1)); - Debug.Log("asdasd"); - } - - public CraftingProcess[] GetQueue() - { - CraftingProcess[] a = new CraftingProcess[craftingQueue.Count]; - - for (int i = 0; i < a.Length; i++) - { - a[i] = (CraftingProcess)craftingQueue.ToArray()[i]; - } - - return a; - } - - public string GetCraftingID() - { - return ID; - } - - public void RemoveFromQueue(int i) - { - craftingQueue.RemoveAt(i); - } - #endregion - -} - diff --git a/Assets/Buildings/GreenHouse.cs b/Assets/Buildings/GreenHouse.cs deleted file mode 100644 index 8d54221..0000000 --- a/Assets/Buildings/GreenHouse.cs +++ /dev/null @@ -1,156 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; -using UnityEngine.UI; - -public class GreenHouse : Building, IInventory, IHasGui, IBuildable, IRegystratabe -{ - Inventory storage = new Inventory(5); - public Sprite icon; - Item[] x = { new IronPlate(1), new GlassPlane(1), new Sapling(1) }; - string ID = "CivMars.GreenHouse"; - float timeleft = 6000; - bool onoff = false; - - // Use this for initialization - void Start() - { - - } - - // Update is called once per frame - void Update() - { - if (onoff == true) - { - timeleft -= Time.deltaTime; - if (timeleft <= 0) - { - storage.Add(new Wood(10)); - storage.Add(new Sapling(3)); - if (storage.Remove(new Sapling(1)) != null) - { - timeleft = 6000; - - } - - } - } - - - - } - - #region IInventory - - public Item Add(Item i) - { - return storage.Add(i); - } - - public string GetInventoryName() - { - throw new NotImplementedException(); - } - - public int GetInventorySize() - { - return storage.size; - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public Item GetStackInSlot(int i) - { - return storage.Get(i); - } - - public bool HasCustomInventoryName() - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - if (givenItem is Sapling || givenItem is Wood) - { - return true; - } - return false; - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - return true; - } - - public Item Remove(Item i) - { - return storage.Remove(i); - } - - public void TransferItem(IInventory ToInv, int index) - { - storage.TransferItem(ToInv, index); - } - - public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) - { - storage.TransferItemAmount(Toinv, fromindex, transferingAmount); - } - - - #endregion - - #region IBuildable - - public float GetBuildtime() - { - return 10; - } - - public Sprite GetImage() - { - return icon; - } - - public GameObject GetPrefab() - { - return this.gameObject; - } - - public Image GetBuildedState() - { - throw new NotImplementedException(); - } - - public Item[] GetNeededMaterials() - { - return x; - } - - public void Setup() - { - throw new NotImplementedException(); - } - - - #endregion - - #region IRegystratable - - public void Regystrate() - { - base.ID = this.ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } - - #endregion - - - - -} diff --git a/Assets/Buildings/MainBuilding.cs b/Assets/Buildings/MainBuilding.cs deleted file mode 100644 index 9c660bf..0000000 --- a/Assets/Buildings/MainBuilding.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System; -using UnityEngine.UI; -using UnityEngine; - -[AddComponentMenu("Buildings/Main Building")] -[System.Serializable] -public class MainBuilding : Building, IInventory, IGasTank, IRegystratabe, ISaveble -{ - enum States - { - None, - Inv, - Gas - } - - public static string ID = "CivMars.MainBuilding"; - - public Text Name; - public Text InventoryButtonText; - - - public Inventory inventory = new Inventory(20); - - public static float[] max = { 1000f, 1000f, 1000f, 1000f }; - public GasTankCluster tanks = new GasTankCluster(4, max); - [SerializeField] - States invOn; - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - //this.Graphicks.transform.position = Vector3.zero; - } - - public void OpenInventory() - { - if (invOn != States.Inv) - { - GameCon.guiHandler.defaultGas.gameObject.SetActive(false); - - GameCon.guiHandler.defaultInventory.Activate(this); - GameCon.guiHandler.defaultGas.SetOtherInv(null); - invOn = States.Inv; - } - else - { - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - - GameCon.guiHandler.defaultInventory.Deactive(); - invOn = States.None; - } - } - - public void OpenGas() - { - - if (invOn != States.Gas) - { - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultGas.gameObject.SetActive(true); - - GameCon.guiHandler.defaultInventory.Deactive(); - GameCon.guiHandler.defaultGas.SetOtherInv(this); - invOn = States.Gas; - } - else - { - GameCon.guiHandler.defaultGas.gameObject.SetActive(false); - - GameCon.guiHandler.defaultGas.SetOtherInv(null); - invOn = States.None; - } - - } - - #region IHasGUI - - public override void Close() - { - base.Close(); - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultInventory.Deactive(); - - GameCon.guiHandler.defaultGas.gameObject.SetActive(false); - GameCon.guiHandler.defaultGas.SetOtherInv(null); - - invOn = States.None; - } - - #endregion - - public GasTankCluster GetTankCluster() - { - return tanks; - } - - #region IInventory - - public int GetInventorySize() - { - return inventory.size; - } - - public string GetInventoryName() - { - throw new NotImplementedException(); - } - - public bool HasCustomInventoryName() - { - return false; - } - - public Item GetStackInSlot(int i) - { - return inventory.Get(i); - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - throw new NotImplementedException(); - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - return true; - } - - public Item Add(Item i) - { - return inventory.Add(i); - } - - public Item Remove(Item i) - { - inventory.Remove(i); - throw new NotImplementedException(); - } - - public void TransferItem(IInventory ToInv, int index) - { - inventory.TransferItem(ToInv, index); - } - - public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) - { - inventory.TransferItemAmount(Toinv, fromindex, transferingAmount); - } - - #endregion - - #region IRgeistraste - public void Regystrate() - { - base.ID = ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } - #endregion - - public GameObject GetPrefab() - { - return gameObject; - } - - public override SavedTile Save() - { - return new Saved(this); - } - - [Serializable] - public class Saved : SavedTile - { - Inventory inv; - - public Saved(MainBuilding c) : base(MainBuilding.ID) - { - inv = c.inventory; - } - } -} - - diff --git a/Assets/Buildings/Miner.cs b/Assets/Buildings/Miner.cs deleted file mode 100644 index 4a52a73..0000000 --- a/Assets/Buildings/Miner.cs +++ /dev/null @@ -1,202 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.UI; - -public class Miner : Building, IInventory, IHasGui, IRegystratabe, IBuildable -{ - public string ID = "CivMars.Miner"; - static Item[] neededMaterials = { new SandOre(1) }; - public Sprite icon; - - - public OreTile mining; - public float time; - public float startTime; - public bool on; - - public Text TypeDesplay; - public Slider TimeLeft; - - bool invOn; - - Inventory inv = new Inventory(1); - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - public void OpenInventory() - { - invOn = !invOn; - if (invOn) - GameCon.guiHandler.defaultInventory.Activate(this); - else - GameCon.guiHandler.defaultInventory.Deactive(); - - } - - #region IHasGUI - - public override void Close() - { - base.Close(); - GameCon.guiHandler.defaultInventory.Deactive(); - } - - #endregion - - #region IInventory - - public Item Add(Item i) - { - return i; - } - - public string GetInventoryName() - { - throw new NotImplementedException(); - } - - public int GetInventorySize() - { - return 1; - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public Item GetStackInSlot(int i) - { - return inv.Get(i); - } - - public bool HasCustomInventoryName() - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - throw new NotImplementedException(); - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - return true; - } - - public Item Remove(Item i) - { - return inv.Remove(i); - } - - public void TransferItem(IInventory ToInv, int index) - { - inv.TransferItem(ToInv, index); - } - - public void TransferItemAmount(IInventory ToInv, int index, int transferingAmount) - { - inv.TransferItemAmount(ToInv, index, transferingAmount); - } - #endregion - - #region IRegystratabe - public void Regystrate() - { - base.ID = this.ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } - #endregion - - #region IBuildable - public float GetBuildtime() - { - return 1f; - } - - public Sprite GetImage() - { - return icon; - } - - public GameObject GetPrefab() - { - return gameObject; - } - - public Image GetBuildedState() - { - throw new NotImplementedException(); - } - - public Item[] GetNeededMaterials() - { - return neededMaterials; - } - - #endregion - - - // Update is called every frame, if the MonoBehaviour is enabled - public void Update() - { - if (on) - { - if (mining != null) - { - if (time > 0f) - { - time -= Time.deltaTime; - } - else - { - time = startTime; - Item minedOre = ((Item)Activator.CreateInstance(((OreTile)mining).GetItemType())); - minedOre.amount = 1; - mining.Mine(1); - inv.Add(minedOre); - } - - TypeDesplay.text = "Mining: " + mining.GetType(); - TimeLeft.value = time; - } - else - { - TypeDesplay.text = "No ore was found!"; - } - } - - - } - - public void TurnOn(bool a) - { - on = a; - } - - public void Setup() - { - TileVector pos = new TileVector((int)Mathf.Round(transform.position.x), (int)Mathf.Round(transform.position.y), TileVectorTypes.ySwaped); - TileTransform tile = GameCon.map.Generated.GetTileOn(pos); - - if (tile != null) - { - OreTile ore = ((OreTile)tile.GetComponent()); - - if (ore != null) - { - mining = ore; - startTime = ore.GetMiningTime(); - TimeLeft.maxValue = startTime; - } - } - - } -} - diff --git a/Assets/Buildings/PlanedBuilding.cs b/Assets/Buildings/PlanedBuilding.cs deleted file mode 100644 index 61fffa9..0000000 --- a/Assets/Buildings/PlanedBuilding.cs +++ /dev/null @@ -1,193 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using UnityEngine.UI; -using System; - -public class PlanedBuilding : Building, ISaveble, IRegystratabe -{ - public new string ID = CivMarsInit.BlockSpace + ".PlanedBuilding"; - - Item[] Materials = new Item[1]; - int[] MaterialsAmount; - - public Button buttonscript; - public Text Name; - public GameObject NeededItemsDesp; - public GameObject neededItemPrefab; - public List neededItemsDrawn; - - public IBuildable building; - - public float counter = -1f; - public float buildtime; - - public float defaultYPos; - public float defaultXPos; - public RectTransform maskRect; - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - void Start() - { - //maskRect = gameObject.transform.FindChild("Mask").GetComponent(); - defaultYPos = maskRect.localPosition.y; - counter = -1f; - } - - void Update() - { - UpdateMaterials(); - - BuildingButonUpdate(); - } - - void BuildingButonUpdate() - { - if (counter > 0) - { - buttonscript.interactable = false; - - maskRect.localPosition = new Vector2(maskRect.localPosition.x, Mathf.Lerp(defaultYPos + maskRect.rect.height, defaultYPos, (counter / buildtime))); - //ActionRuned = false; - GameCon.playerclass.GetComponent().isKinematic = true; - - counter -= Time.deltaTime; - if (counter < 0) - { - counter = 0; - } - - } - if (counter == 0) - { - counter = -1; - BuildBuilding(); - } - } - - void UpdateMaterials() - { - for (int i = 0; i < Materials.Length; i++) - { - - if (neededItemsDrawn[i] == null) - { - GameObject go = Instantiate(neededItemPrefab); - neededItemsDrawn[i] = go; - neededItemsDrawn[i].transform.SetParent(NeededItemsDesp.transform); - neededItemsDrawn[i].transform.SetSiblingIndex(i); - } - else - { - neededItemsDrawn[i].transform.SetParent(NeededItemsDesp.transform); - neededItemsDrawn[i].transform.SetSiblingIndex(i); - } - - neededItemsDrawn[i].transform.FindChild("Name").GetComponent().text = Materials[i].GetType().ToString(); - neededItemsDrawn[i].transform.FindChild("Amount").GetComponent().text = Materials[i].amount + "/" + MaterialsAmount[i]; - neededItemsDrawn[i].transform.FindChild("Slider").GetComponent().value = (float)MaterialsAmount[i] / Materials[i].amount; - } - } - - - - /// - /// Sets what building to build - /// - /// Ibuildable for building - public void SetBuilding(IBuildable b) - { - building = b; - buildtime = b.GetBuildtime(); - - Materials = new Item[building.GetNeededMaterials().Length]; - building.GetNeededMaterials().CopyTo(Materials, 0); - - - - MaterialsAmount = new int[Materials.Length]; - - - for (int i = 0; i < Materials.Length; i++) - { - //MaterialsAmount[i] = Materials[i].amount; - neededItemsDrawn.Add(null); - } - - - Name.text = building.GetType().ToString(); - } - - /// - /// Builds The actual building - /// - void BuildBuilding() - { - GameObject go = GameObject.Instantiate(building.GetPrefab()); - - GameCon.map.Buildings.tiles[transform.position.x, transform.position.y] = null; - GameCon.map.Buildings.SetTile(transform.position.x, transform.position.y, go.GetComponent()); - go.GetComponent().Setup(); - - //Destroy itself - GameCon.CloseGUI(this); - Destroy(this.gameObject); - } - - /// - /// Starts The building counter - /// - public void Build() - { - for (int i = 0; i < Materials.Length; i++) - { - if ((Materials[i].amount - MaterialsAmount[i]) == 0) - { - counter = buildtime; - return; - } - } - } - - /// - /// Removes Items From the player for the building - /// - public void Place() - { - Inventory playerinv = GameCon.playerclass.inventory; - - for (int i = 0; i < Materials.Length; i++) - { - if ((Materials[i].amount - MaterialsAmount[i]) != 0) - { - - Item needed = (Item)Activator.CreateInstance(null, Materials[i].GetType().ToString()).Unwrap(); - needed.amount = Materials[i].amount; - - Item remaining = playerinv.Remove(needed); - if (remaining != null) - { - Materials[i] = remaining; - MaterialsAmount[i] += Materials[i].amount - remaining.amount; - } - else - { - MaterialsAmount[i] = Materials[i].amount; - } - - } - } - } - - public void Regystrate() - { - base.ID = this.ID; - GameRegystry.RegisterBuildableBuilding(ID, this); - } -} diff --git a/Assets/Buildings.meta b/Assets/CivMars/Buildings.meta similarity index 100% rename from Assets/Buildings.meta rename to Assets/CivMars/Buildings.meta diff --git a/Assets/Buildings/Building.cs b/Assets/CivMars/Buildings/Building.cs similarity index 100% rename from Assets/Buildings/Building.cs rename to Assets/CivMars/Buildings/Building.cs diff --git a/Assets/Buildings/Building.cs.meta b/Assets/CivMars/Buildings/Building.cs.meta similarity index 100% rename from Assets/Buildings/Building.cs.meta rename to Assets/CivMars/Buildings/Building.cs.meta diff --git a/Assets/CivMars/Buildings/Chest.cs b/Assets/CivMars/Buildings/Chest.cs new file mode 100644 index 0000000..2737212 --- /dev/null +++ b/Assets/CivMars/Buildings/Chest.cs @@ -0,0 +1,170 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using System; +using System.Collections.Generic; + +namespace CivMars +{ + [AddComponentMenu("Buildings/Chest")] + public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble + { + new public static string ID = CivMarsInit.BlockSpace + ".Chest"; + + public Text Name; + public Text InventoryButtonText; + + public Inventory inventory = new Inventory(15); + + public Sprite Icon; + + static Item[] buildingMaterials = { new SandOre(2) }; + + bool invOn; + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + public void OpenInventory() + { + invOn = !invOn; + if (invOn) + GameCon.guiHandler.defaultInventory.Activate(this); + else + GameCon.guiHandler.defaultInventory.Deactive(); + + } + + #region IHasGUI + + public override void Close() + { + base.Close(); + GameCon.guiHandler.defaultInventory.Deactive(); + } + + #endregion + + + #region IBuildable + + public Sprite GetImage() + { + return Icon; + } + + public GameObject GetPrefab() + { + return gameObject; + } + + public Image GetBuildedState() + { + throw new NotImplementedException(); + } + + public Item[] GetNeededMaterials() + { + return buildingMaterials; + } + + public float GetBuildtime() + { + return 5f; + } + + public void Setup() + { + } + + #endregion + + public void Regystrate() + { + base.ID = ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + + #region Inventory + + public int GetInventorySize() + { + return inventory.size; + } + + public string GetInventoryName() + { + throw new NotImplementedException(); + } + + public bool HasCustomInventoryName() + { + return false; + } + + public Item GetStackInSlot(int i) + { + return inventory.Get(i); + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + return true; + } + + public Item Add(Item i) + { + return inventory.Add(i); + } + + public Item Remove(Item i) + { + return inventory.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + throw new NotImplementedException(); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + throw new NotImplementedException(); + } + + + + #endregion + + public override SavedTile Save() + { + return new Saved(this); + } + + [Serializable] + public class Saved : SavedTile + { + Inventory inv; + + public Saved(Chest c) : base(Chest.ID) + { + inv = c.inventory; + } + } + } + +} \ No newline at end of file diff --git a/Assets/Buildings/Chest.cs.meta b/Assets/CivMars/Buildings/Chest.cs.meta similarity index 100% rename from Assets/Buildings/Chest.cs.meta rename to Assets/CivMars/Buildings/Chest.cs.meta diff --git a/Assets/CivMars/Buildings/Furnace.cs b/Assets/CivMars/Buildings/Furnace.cs new file mode 100644 index 0000000..a016170 --- /dev/null +++ b/Assets/CivMars/Buildings/Furnace.cs @@ -0,0 +1,286 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using System; +using UnityEngine.UI; + +namespace CivMars +{ + public class Furnace : Building, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter + { + + enum States + { + None, + Inv, + Craft + } + + public List craftingQueue = new List(); + + public string ID = "CivMars.Furnace"; + static Item[] neededMaterials = { new SandOre(1) }; + public Sprite icon; + + States invOn; + + Inventory inv = new Inventory(10); + + Item remaining; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (remaining == null && craftingQueue.Count > 0) + { + CraftingProcess a = (CraftingProcess)craftingQueue[0]; + if (a.HasItems()) + { + a.status -= Time.deltaTime; + + if (a.status <= 0f) + { + remaining = (Item)Activator.CreateInstance(a.recipe.Crafted.GetType()); + remaining.amount = a.amount * a.recipe.Crafted.amount; + craftingQueue.RemoveAt(0); + } + + } + else + { + Inventory inv = this.inv; + + for (int i = 0; i < a.recipe.Materials.Length; i++) + { + if (a.materials[i] > 0) + { + Item needed = (Item)Activator.CreateInstance(null, a.recipe.Materials[i].GetType().ToString()).Unwrap(); + needed.amount = a.materials[i]; + + Item remainingItem = inv.Remove(needed); + if (remainingItem != null) + { + a.materials[i] = remainingItem.amount; + } + else + { + a.materials[i] = 0; + } + + + } + } + } + } + else if (remaining != null) + { + remaining = inv.Add(remaining); + } + } + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + public void OpenInventory() + { + if (invOn != States.Inv) + { + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + + GameCon.guiHandler.defaultInventory.Activate(this); + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + invOn = States.Inv; + } + else + { + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + + GameCon.guiHandler.defaultInventory.Deactive(); + invOn = States.None; + } + } + + public void OpenCrafting() + { + + if (invOn != States.Craft) + { + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(true); + + GameCon.guiHandler.defaultInventory.Deactive(); + GameCon.guiHandler.defaultCrafting.SetBuilding(this); + invOn = States.Craft; + } + else + { + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + invOn = States.None; + } + + } + + #region IHasGUI + + public override void Close() + { + base.Close(); + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultInventory.Deactive(); + + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + } + + #endregion + + #region IRegystratabe + + public void Regystrate() + { + base.ID = this.ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + + #endregion + + #region IBuildable + + public float GetBuildtime() + { + return 1; + } + + public Sprite GetImage() + { + return icon; + } + + public GameObject GetPrefab() + { + return gameObject; + } + + public Image GetBuildedState() + { + throw new NotImplementedException(); + } + + public Item[] GetNeededMaterials() + { + return neededMaterials; + } + + public void Setup() + { + return; + } + + + #endregion + + #region IInventory + + public int GetInventorySize() + { + return 10; + } + + public string GetInventoryName() + { + return "asd"; + } + + public bool HasCustomInventoryName() + { + return true; + } + + public Item GetStackInSlot(int i) + { + return inv.Get(i); + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + throw new NotImplementedException(); + } + + public Item Add(Item i) + { + return inv.Add(i); + } + + public Item Remove(Item i) + { + return inv.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + inv.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + inv.TransferItemAmount(Toinv, fromindex, transferingAmount); + } + + #endregion + + #region ICrafter + public void AddToQueue(int i) + { + //throw new NotImplementedException(); + craftingQueue.Add(new CraftingProcess(GameRegystry.recepies[ID][i], 1)); + Debug.Log("asdasd"); + } + + public CraftingProcess[] GetQueue() + { + CraftingProcess[] a = new CraftingProcess[craftingQueue.Count]; + + for (int i = 0; i < a.Length; i++) + { + a[i] = (CraftingProcess)craftingQueue.ToArray()[i]; + } + + return a; + } + + public string GetCraftingID() + { + return ID; + } + + public void RemoveFromQueue(int i) + { + craftingQueue.RemoveAt(i); + } + #endregion + + } + +} \ No newline at end of file diff --git a/Assets/Buildings/Furnace.cs.meta b/Assets/CivMars/Buildings/Furnace.cs.meta similarity index 95% rename from Assets/Buildings/Furnace.cs.meta rename to Assets/CivMars/Buildings/Furnace.cs.meta index 0efd4d5..6e90c95 100644 --- a/Assets/Buildings/Furnace.cs.meta +++ b/Assets/CivMars/Buildings/Furnace.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 05ee10308b2072c4583d94495ed84e12 -timeCreated: 1448101879 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 05ee10308b2072c4583d94495ed84e12 +timeCreated: 1448101879 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Buildings/GreenHouse.cs b/Assets/CivMars/Buildings/GreenHouse.cs new file mode 100644 index 0000000..4cfc01e --- /dev/null +++ b/Assets/CivMars/Buildings/GreenHouse.cs @@ -0,0 +1,159 @@ +using UnityEngine; +using System.Collections; +using System; +using UnityEngine.UI; + +namespace CivMars +{ + public class GreenHouse : Building, IInventory, IHasGui, IBuildable, IRegystratabe + { + Inventory storage = new Inventory(5); + public Sprite icon; + Item[] x = { new IronPlate(1), new GlassPlane(1), new Sapling(1) }; + string ID = "CivMars.GreenHouse"; + float timeleft = 6000; + bool onoff = false; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (onoff == true) + { + timeleft -= Time.deltaTime; + if (timeleft <= 0) + { + storage.Add(new Wood(10)); + storage.Add(new Sapling(3)); + if (storage.Remove(new Sapling(1)) != null) + { + timeleft = 6000; + + } + + } + } + + + + } + + #region IInventory + + public Item Add(Item i) + { + return storage.Add(i); + } + + public string GetInventoryName() + { + throw new NotImplementedException(); + } + + public int GetInventorySize() + { + return storage.size; + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public Item GetStackInSlot(int i) + { + return storage.Get(i); + } + + public bool HasCustomInventoryName() + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + if (givenItem is Sapling || givenItem is Wood) + { + return true; + } + return false; + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + return true; + } + + public Item Remove(Item i) + { + return storage.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + storage.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + storage.TransferItemAmount(Toinv, fromindex, transferingAmount); + } + + + #endregion + + #region IBuildable + + public float GetBuildtime() + { + return 10; + } + + public Sprite GetImage() + { + return icon; + } + + public GameObject GetPrefab() + { + return this.gameObject; + } + + public Image GetBuildedState() + { + throw new NotImplementedException(); + } + + public Item[] GetNeededMaterials() + { + return x; + } + + public void Setup() + { + throw new NotImplementedException(); + } + + + #endregion + + #region IRegystratable + + public void Regystrate() + { + base.ID = this.ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + + #endregion + + + + + } +} \ No newline at end of file diff --git a/Assets/Buildings/GreenHouse.cs.meta b/Assets/CivMars/Buildings/GreenHouse.cs.meta similarity index 100% rename from Assets/Buildings/GreenHouse.cs.meta rename to Assets/CivMars/Buildings/GreenHouse.cs.meta diff --git a/Assets/CivMars/Buildings/MainBuilding.cs b/Assets/CivMars/Buildings/MainBuilding.cs new file mode 100644 index 0000000..60e8cd5 --- /dev/null +++ b/Assets/CivMars/Buildings/MainBuilding.cs @@ -0,0 +1,192 @@ +using System; +using UnityEngine.UI; +using UnityEngine; + + +namespace CivMars +{ + [AddComponentMenu("Buildings/Main Building")] + [System.Serializable] + public class MainBuilding : Building, IInventory, IGasTank, IRegystratabe, ISaveble + { + enum States + { + None, + Inv, + Gas + } + + public static string ID = "CivMars.MainBuilding"; + + public Text Name; + public Text InventoryButtonText; + + + public Inventory inventory = new Inventory(20); + + public static float[] max = { 1000f, 1000f, 1000f, 1000f }; + public GasTankCluster tanks = new GasTankCluster(4, max); + [SerializeField] + States invOn; + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + //this.Graphicks.transform.position = Vector3.zero; + } + + public void OpenInventory() + { + if (invOn != States.Inv) + { + GameCon.guiHandler.defaultGas.gameObject.SetActive(false); + + GameCon.guiHandler.defaultInventory.Activate(this); + GameCon.guiHandler.defaultGas.SetOtherInv(null); + invOn = States.Inv; + } + else + { + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + + GameCon.guiHandler.defaultInventory.Deactive(); + invOn = States.None; + } + } + + public void OpenGas() + { + + if (invOn != States.Gas) + { + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultGas.gameObject.SetActive(true); + + GameCon.guiHandler.defaultInventory.Deactive(); + GameCon.guiHandler.defaultGas.SetOtherInv(this); + invOn = States.Gas; + } + else + { + GameCon.guiHandler.defaultGas.gameObject.SetActive(false); + + GameCon.guiHandler.defaultGas.SetOtherInv(null); + invOn = States.None; + } + + } + + #region IHasGUI + + public override void Close() + { + base.Close(); + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultInventory.Deactive(); + + GameCon.guiHandler.defaultGas.gameObject.SetActive(false); + GameCon.guiHandler.defaultGas.SetOtherInv(null); + + invOn = States.None; + } + + #endregion + + public GasTankCluster GetTankCluster() + { + return tanks; + } + + #region IInventory + + public int GetInventorySize() + { + return inventory.size; + } + + public string GetInventoryName() + { + throw new NotImplementedException(); + } + + public bool HasCustomInventoryName() + { + return false; + } + + public Item GetStackInSlot(int i) + { + return inventory.Get(i); + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + return true; + } + + public Item Add(Item i) + { + return inventory.Add(i); + } + + public Item Remove(Item i) + { + inventory.Remove(i); + throw new NotImplementedException(); + } + + public void TransferItem(IInventory ToInv, int index) + { + inventory.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + inventory.TransferItemAmount(Toinv, fromindex, transferingAmount); + } + + #endregion + + #region IRgeistraste + public void Regystrate() + { + base.ID = ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + #endregion + + public GameObject GetPrefab() + { + return gameObject; + } + + public override SavedTile Save() + { + return new Saved(this); + } + + [Serializable] + public class Saved : SavedTile + { + Inventory inv; + + public Saved(MainBuilding c) : base(MainBuilding.ID) + { + inv = c.inventory; + } + } + } + + +} \ No newline at end of file diff --git a/Assets/Buildings/MainBuilding.cs.meta b/Assets/CivMars/Buildings/MainBuilding.cs.meta similarity index 100% rename from Assets/Buildings/MainBuilding.cs.meta rename to Assets/CivMars/Buildings/MainBuilding.cs.meta diff --git a/Assets/CivMars/Buildings/Miner.cs b/Assets/CivMars/Buildings/Miner.cs new file mode 100644 index 0000000..2c51d69 --- /dev/null +++ b/Assets/CivMars/Buildings/Miner.cs @@ -0,0 +1,205 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +namespace CivMars +{ + public class Miner : Building, IInventory, IHasGui, IRegystratabe, IBuildable + { + public string ID = "CivMars.Miner"; + static Item[] neededMaterials = { new SandOre(1) }; + public Sprite icon; + + + public OreTile mining; + public float time; + public float startTime; + public bool on; + + public Text TypeDesplay; + public Slider TimeLeft; + + bool invOn; + + Inventory inv = new Inventory(1); + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + public void OpenInventory() + { + invOn = !invOn; + if (invOn) + GameCon.guiHandler.defaultInventory.Activate(this); + else + GameCon.guiHandler.defaultInventory.Deactive(); + + } + + #region IHasGUI + + public override void Close() + { + base.Close(); + GameCon.guiHandler.defaultInventory.Deactive(); + } + + #endregion + + #region IInventory + + public Item Add(Item i) + { + return i; + } + + public string GetInventoryName() + { + throw new NotImplementedException(); + } + + public int GetInventorySize() + { + return 1; + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public Item GetStackInSlot(int i) + { + return inv.Get(i); + } + + public bool HasCustomInventoryName() + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + return true; + } + + public Item Remove(Item i) + { + return inv.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + inv.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory ToInv, int index, int transferingAmount) + { + inv.TransferItemAmount(ToInv, index, transferingAmount); + } + #endregion + + #region IRegystratabe + public void Regystrate() + { + base.ID = this.ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + #endregion + + #region IBuildable + public float GetBuildtime() + { + return 1f; + } + + public Sprite GetImage() + { + return icon; + } + + public GameObject GetPrefab() + { + return gameObject; + } + + public Image GetBuildedState() + { + throw new NotImplementedException(); + } + + public Item[] GetNeededMaterials() + { + return neededMaterials; + } + + #endregion + + + // Update is called every frame, if the MonoBehaviour is enabled + public void Update() + { + if (on) + { + if (mining != null) + { + if (time > 0f) + { + time -= Time.deltaTime; + } + else + { + time = startTime; + Item minedOre = ((Item)Activator.CreateInstance(((OreTile)mining).GetItemType())); + minedOre.amount = 1; + mining.Mine(1); + inv.Add(minedOre); + } + + TypeDesplay.text = "Mining: " + mining.GetType(); + TimeLeft.value = time; + } + else + { + TypeDesplay.text = "No ore was found!"; + } + } + + + } + + public void TurnOn(bool a) + { + on = a; + } + + public void Setup() + { + TileVector pos = new TileVector((int)Mathf.Round(transform.position.x), (int)Mathf.Round(transform.position.y), TileVectorTypes.ySwaped); + TileTransform tile = GameCon.map.Generated.GetTileOn(pos); + + if (tile != null) + { + OreTile ore = ((OreTile)tile.GetComponent()); + + if (ore != null) + { + mining = ore; + startTime = ore.GetMiningTime(); + TimeLeft.maxValue = startTime; + } + } + + } + } + +} \ No newline at end of file diff --git a/Assets/Buildings/Miner.cs.meta b/Assets/CivMars/Buildings/Miner.cs.meta similarity index 95% rename from Assets/Buildings/Miner.cs.meta rename to Assets/CivMars/Buildings/Miner.cs.meta index 32f395e..505da44 100644 --- a/Assets/Buildings/Miner.cs.meta +++ b/Assets/CivMars/Buildings/Miner.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 7d455d133e1765c47a481f4768a34d18 -timeCreated: 1438684110 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7d455d133e1765c47a481f4768a34d18 +timeCreated: 1438684110 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Buildings/PlanedBuilding.cs b/Assets/CivMars/Buildings/PlanedBuilding.cs new file mode 100644 index 0000000..4b26b5d --- /dev/null +++ b/Assets/CivMars/Buildings/PlanedBuilding.cs @@ -0,0 +1,196 @@ +using UnityEngine; +using System.Collections.Generic; +using UnityEngine.UI; +using System; + + +namespace CivMarsEngine +{ + public class PlanedBuilding : Building, ISaveble, IRegystratabe + { + public new string ID = "CivMarsEngine.PlanedBuilding"; + + Item[] Materials = new Item[1]; + int[] MaterialsAmount; + + public Button buttonscript; + public Text Name; + public GameObject NeededItemsDesp; + public GameObject neededItemPrefab; + public List neededItemsDrawn; + + public IBuildable building; + + public float counter = -1f; + public float buildtime; + + public float defaultYPos; + public float defaultXPos; + public RectTransform maskRect; + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + void Start() + { + //maskRect = gameObject.transform.FindChild("Mask").GetComponent(); + defaultYPos = maskRect.localPosition.y; + counter = -1f; + } + + void Update() + { + UpdateMaterials(); + + BuildingButonUpdate(); + } + + void BuildingButonUpdate() + { + if (counter > 0) + { + buttonscript.interactable = false; + + maskRect.localPosition = new Vector2(maskRect.localPosition.x, Mathf.Lerp(defaultYPos + maskRect.rect.height, defaultYPos, (counter / buildtime))); + //ActionRuned = false; + GameCon.playerclass.GetComponent().isKinematic = true; + + counter -= Time.deltaTime; + if (counter < 0) + { + counter = 0; + } + + } + if (counter == 0) + { + counter = -1; + BuildBuilding(); + } + } + + void UpdateMaterials() + { + for (int i = 0; i < Materials.Length; i++) + { + + if (neededItemsDrawn[i] == null) + { + GameObject go = Instantiate(neededItemPrefab); + neededItemsDrawn[i] = go; + neededItemsDrawn[i].transform.SetParent(NeededItemsDesp.transform); + neededItemsDrawn[i].transform.SetSiblingIndex(i); + } + else + { + neededItemsDrawn[i].transform.SetParent(NeededItemsDesp.transform); + neededItemsDrawn[i].transform.SetSiblingIndex(i); + } + + neededItemsDrawn[i].transform.FindChild("Name").GetComponent().text = Materials[i].GetType().ToString(); + neededItemsDrawn[i].transform.FindChild("Amount").GetComponent().text = Materials[i].amount + "/" + MaterialsAmount[i]; + neededItemsDrawn[i].transform.FindChild("Slider").GetComponent().value = (float)MaterialsAmount[i] / Materials[i].amount; + } + } + + + + /// + /// Sets what building to build + /// + /// Ibuildable for building + public void SetBuilding(IBuildable b) + { + building = b; + buildtime = b.GetBuildtime(); + + Materials = new Item[building.GetNeededMaterials().Length]; + building.GetNeededMaterials().CopyTo(Materials, 0); + + + + MaterialsAmount = new int[Materials.Length]; + + + for (int i = 0; i < Materials.Length; i++) + { + //MaterialsAmount[i] = Materials[i].amount; + neededItemsDrawn.Add(null); + } + + + Name.text = building.GetType().ToString(); + } + + /// + /// Builds The actual building + /// + void BuildBuilding() + { + GameObject go = GameObject.Instantiate(building.GetPrefab()); + + GameCon.map.Buildings.tiles[transform.position.x, transform.position.y] = null; + GameCon.map.Buildings.SetTile(transform.position.x, transform.position.y, go.GetComponent()); + go.GetComponent().Setup(); + + //Destroy itself + GameCon.CloseGUI(this); + Destroy(this.gameObject); + } + + /// + /// Starts The building counter + /// + public void Build() + { + for (int i = 0; i < Materials.Length; i++) + { + if ((Materials[i].amount - MaterialsAmount[i]) == 0) + { + counter = buildtime; + return; + } + } + } + + /// + /// Removes Items From the player for the building + /// + public void Place() + { + Inventory playerinv = GameCon.playerclass.inventory; + + for (int i = 0; i < Materials.Length; i++) + { + if ((Materials[i].amount - MaterialsAmount[i]) != 0) + { + + Item needed = (Item)Activator.CreateInstance(null, Materials[i].GetType().ToString()).Unwrap(); + needed.amount = Materials[i].amount; + + Item remaining = playerinv.Remove(needed); + if (remaining != null) + { + Materials[i] = remaining; + MaterialsAmount[i] += Materials[i].amount - remaining.amount; + } + else + { + MaterialsAmount[i] = Materials[i].amount; + } + + } + } + } + + public void Regystrate() + { + base.ID = this.ID; + GameRegystry.RegisterBuildableBuilding(ID, this); + } + } +} \ No newline at end of file diff --git a/Assets/Buildings/PlanedBuilding.cs.meta b/Assets/CivMars/Buildings/PlanedBuilding.cs.meta similarity index 95% rename from Assets/Buildings/PlanedBuilding.cs.meta rename to Assets/CivMars/Buildings/PlanedBuilding.cs.meta index d4edb75..d501875 100644 --- a/Assets/Buildings/PlanedBuilding.cs.meta +++ b/Assets/CivMars/Buildings/PlanedBuilding.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: f50436f0ed8ba8d4386fdfe84465b84e -timeCreated: 1442428990 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f50436f0ed8ba8d4386fdfe84465b84e +timeCreated: 1442428990 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Buildings/Press.cs b/Assets/CivMars/Buildings/Press.cs new file mode 100644 index 0000000..b82928e --- /dev/null +++ b/Assets/CivMars/Buildings/Press.cs @@ -0,0 +1,283 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using System; +using UnityEngine.UI; + +namespace CivMars +{ + public class Press : Building, IInventory, IHasGui, IRegystratabe, ICrafter, IBuildable + { + + enum States + { + None, + Inv, + Craft + } + + public List craftingQueue = new List(); + + static public string ID = "CivMars.Press"; + static Item[] neededMaterials = { new SandOre(1) }; + public Sprite icon; + + States invOn; + + Inventory inv = new Inventory(10); + + Item remaining; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (remaining == null && craftingQueue.Count > 0) + { + CraftingProcess a = (CraftingProcess)craftingQueue[0]; + if (a.HasItems()) + { + a.status -= Time.deltaTime; + + if (a.status <= 0) + { + remaining = (Item)Activator.CreateInstance(a.recipe.Crafted.GetType()); + remaining.amount = a.amount * a.recipe.Crafted.amount; + craftingQueue.RemoveAt(0); + } + + } + else + { + Inventory playerinv = GameCon.playerclass.inventory; + + for (int i = 0; i < a.recipe.Materials.Length; i++) + { + if (a.materials[i] > 0) + { + Item needed = (Item)Activator.CreateInstance(null, a.recipe.Materials[i].GetType().ToString()).Unwrap(); + needed.amount = a.materials[i]; + + Item remainingItem = playerinv.Remove(needed); + if (remainingItem != null) + { + a.materials[i] = remainingItem.amount; + } + else + { + a.materials[i] = 0; + } + + + } + } + } + } + else if (remaining != null) + { + remaining = inv.Add(remaining); + } + } + + public override void Awake() + { + base.Awake(); + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + public void OpenInventory() + { + if (invOn != States.Inv) + { + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + + GameCon.guiHandler.defaultInventory.Activate(this); + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + invOn = States.Inv; + } + else + { + + GameCon.guiHandler.defaultInventory.Deactive(); + invOn = States.None; + } + } + + public void OpenCrafting() + { + + if (invOn != States.Craft) + { + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(true); + + GameCon.guiHandler.defaultInventory.Deactive(); + GameCon.guiHandler.defaultCrafting.SetBuilding(this); + invOn = States.Craft; + } + else + { + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + invOn = States.None; + } + + } + + #region IHasGUI + + public override void Close() + { + base.Close(); + GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); + GameCon.guiHandler.defaultInventory.Deactive(); + + GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); + GameCon.guiHandler.defaultCrafting.SetBuilding(null); + } + + #endregion + + #region IRegystratabe + + public void Regystrate() + { + GameRegystry.RegisterBuildableBuilding(ID, this); + } + + #endregion + + #region IBuildable + + public float GetBuildtime() + { + return 1; + } + + public Sprite GetImage() + { + return icon; + } + + public GameObject GetPrefab() + { + return gameObject; + } + + public Image GetBuildedState() + { + throw new NotImplementedException(); + } + + public Item[] GetNeededMaterials() + { + return neededMaterials; + } + + public void Setup() + { + return; + } + + + #endregion + + #region IInventory + + public int GetInventorySize() + { + return 10; + } + + public string GetInventoryName() + { + return "asd"; + } + + public bool HasCustomInventoryName() + { + return true; + } + + public Item GetStackInSlot(int i) + { + return inv.Get(i); + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + throw new NotImplementedException(); + } + + public Item Add(Item i) + { + return inv.Add(i); + } + + public Item Remove(Item i) + { + return inv.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + inv.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + inv.TransferItemAmount(Toinv, fromindex, transferingAmount); + } + + #endregion + + #region ICrafter + public void AddToQueue(int i) + { + //throw new NotImplementedException(); + craftingQueue.Add(new CraftingProcess(GameRegystry.recepies[ID][i], 1)); + Debug.Log("asdasd"); + } + + public CraftingProcess[] GetQueue() + { + CraftingProcess[] a = new CraftingProcess[craftingQueue.Count]; + + for (int i = 0; i < a.Length; i++) + { + a[i] = (CraftingProcess)craftingQueue.ToArray()[i]; + } + + return a; + } + + public string GetCraftingID() + { + return ID; + } + + public void RemoveFromQueue(int i) + { + craftingQueue.RemoveAt(i); + } + #endregion + + } +} \ No newline at end of file diff --git a/Assets/Press.cs.meta b/Assets/CivMars/Buildings/Press.cs.meta similarity index 95% rename from Assets/Press.cs.meta rename to Assets/CivMars/Buildings/Press.cs.meta index 120c092..7f8511f 100644 --- a/Assets/Press.cs.meta +++ b/Assets/CivMars/Buildings/Press.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: dea52372f7655e54b83ce23083e74e8f -timeCreated: 1448647958 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: dea52372f7655e54b83ce23083e74e8f +timeCreated: 1448647958 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Buildings/Tiled.cs b/Assets/CivMars/Buildings/Tiled.cs similarity index 100% rename from Assets/Buildings/Tiled.cs rename to Assets/CivMars/Buildings/Tiled.cs diff --git a/Assets/Buildings/Tiled.cs.meta b/Assets/CivMars/Buildings/Tiled.cs.meta similarity index 100% rename from Assets/Buildings/Tiled.cs.meta rename to Assets/CivMars/Buildings/Tiled.cs.meta diff --git a/Assets/Items.meta b/Assets/CivMars/Items.meta similarity index 100% rename from Assets/Items.meta rename to Assets/CivMars/Items.meta diff --git a/Assets/OLD/Generate.meta b/Assets/CivMars/Items/BasicMaterials.meta similarity index 67% rename from Assets/OLD/Generate.meta rename to Assets/CivMars/Items/BasicMaterials.meta index 4d938d0..7fe8644 100644 --- a/Assets/OLD/Generate.meta +++ b/Assets/CivMars/Items/BasicMaterials.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8b038418483e99f4189b93edc6ac183c +guid: 028be8173f5941744a5012a2cc60c9f1 folderAsset: yes -timeCreated: 1449421384 +timeCreated: 1450705902 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs new file mode 100644 index 0000000..355ea0d --- /dev/null +++ b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs @@ -0,0 +1,28 @@ +namespace CivMars +{ + class CopperIngot : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public CopperIngot(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public CopperIngot() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new CopperOre(2) }; + Recipe r = new Recipe("CivMars.Press", a, new CopperIngot(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} diff --git a/Assets/Behaviour.cs.meta b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs.meta similarity index 76% rename from Assets/Behaviour.cs.meta rename to Assets/CivMars/Items/BasicMaterials/CopperIngot.cs.meta index c7fca94..d0d4808 100644 --- a/Assets/Behaviour.cs.meta +++ b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3a21f751365037e4083d9b9c46a12914 -timeCreated: 1438600314 +guid: 1e17fc7ed17105745a35da5bfc014d0c +timeCreated: 1450705902 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs new file mode 100644 index 0000000..bf4c426 --- /dev/null +++ b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs @@ -0,0 +1,28 @@ +namespace CivMars +{ + class GoldIngot : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public GoldIngot(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public GoldIngot() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new GoldOre(4) }; + Recipe r = new Recipe("CivMars.Furnace", a, new GoldIngot(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Class1.cs.meta b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs.meta similarity index 76% rename from Assets/Class1.cs.meta rename to Assets/CivMars/Items/BasicMaterials/GoldIngot.cs.meta index 28a4949..7d5d80c 100644 --- a/Assets/Class1.cs.meta +++ b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 707f50adefa66874081f29806ee5ff53 -timeCreated: 1443817394 +guid: 09f88bab25066f046830e5297cc528f5 +timeCreated: 1450705902 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/BasicMaterials/IronIngot.cs b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs new file mode 100644 index 0000000..13aefba --- /dev/null +++ b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +namespace CivMars +{ + public class IronIngot : Item, IRegystratabe + { + public string name = "IronIngot"; + + + public IronIngot(int am) : base(am, 10) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StealIngot"); + maxStackSize = 10; + } + + public IronIngot() + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StealIngot"); + maxStackSize = 10; + } + + public void Regystrate() + { + + Item[] a = { new IronOre(2) }; + Recipe r = new Recipe("CivMars.Furnace", a, new IronIngot(1), 10); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } + + +} \ No newline at end of file diff --git a/Assets/Items/IronIngot.cs.meta b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs.meta similarity index 95% rename from Assets/Items/IronIngot.cs.meta rename to Assets/CivMars/Items/BasicMaterials/IronIngot.cs.meta index 59510f8..8ffc03c 100644 --- a/Assets/Items/IronIngot.cs.meta +++ b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 8ac5b6e02ff314644b4cdc5c4cdcb93d -timeCreated: 1443810981 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8ac5b6e02ff314644b4cdc5c4cdcb93d +timeCreated: 1443810981 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/BasicMaterials/Resin.cs b/Assets/CivMars/Items/BasicMaterials/Resin.cs new file mode 100644 index 0000000..53f84f8 --- /dev/null +++ b/Assets/CivMars/Items/BasicMaterials/Resin.cs @@ -0,0 +1,25 @@ +namespace CivMars +{ + class Resin : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public Resin(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public Resin() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + } + } +} \ No newline at end of file diff --git a/Assets/OLD/MapOld.cs.meta b/Assets/CivMars/Items/BasicMaterials/Resin.cs.meta similarity index 76% rename from Assets/OLD/MapOld.cs.meta rename to Assets/CivMars/Items/BasicMaterials/Resin.cs.meta index 6f16d68..4b8ac89 100644 --- a/Assets/OLD/MapOld.cs.meta +++ b/Assets/CivMars/Items/BasicMaterials/Resin.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: c7b9027f238758f46a230baf344459ce -timeCreated: 1437576203 +guid: 977152d5c1ea2f442b34f5c8a2b55008 +timeCreated: 1450705903 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs new file mode 100644 index 0000000..76f947f --- /dev/null +++ b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMars +{ + class SiliconRod : Item, IRegystratabe + { + public string name = "ControlCircuit"; + + + public SiliconRod(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public SiliconRod() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new SandOre(2) }; + Recipe r = new Recipe("CivMars.Press", a, new SiliconRod(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} diff --git a/Assets/scripts/Items.meta b/Assets/CivMars/Items/Chips.meta similarity index 67% rename from Assets/scripts/Items.meta rename to Assets/CivMars/Items/Chips.meta index c810a99..9dea816 100644 --- a/Assets/scripts/Items.meta +++ b/Assets/CivMars/Items/Chips.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: cbd7ef222c40b934a93f7b2918175de6 +guid: 906122b3f76127c4f846ee2390175e80 folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450705902 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMars/Items/Chips/ControllChip.cs b/Assets/CivMars/Items/Chips/ControllChip.cs new file mode 100644 index 0000000..bb3ff1f --- /dev/null +++ b/Assets/CivMars/Items/Chips/ControllChip.cs @@ -0,0 +1,28 @@ +namespace CivMars +{ + class ControllChip : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public ControllChip(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public ControllChip() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new PlasticPlate(2),new SiliconRod(1), new CopperIngot(1), new GoldIngot(1)}; + Recipe r = new Recipe("CivMars.Press", a, new ControllChip(3), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/TerrainGen.cs.meta b/Assets/CivMars/Items/Chips/ControllChip.cs.meta similarity index 76% rename from Assets/TerrainGen.cs.meta rename to Assets/CivMars/Items/Chips/ControllChip.cs.meta index aa77b3f..b128302 100644 --- a/Assets/TerrainGen.cs.meta +++ b/Assets/CivMars/Items/Chips/ControllChip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: ad51d2fe7e21e1147951e0e2d22f8913 -timeCreated: 1437563722 +guid: 08f503cd7b3a40e47ad4b7fb79c32d50 +timeCreated: 1450705902 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/NeedToBeImplemented/Resources.meta b/Assets/CivMars/Items/Circuits.meta similarity index 67% rename from Assets/NeedToBeImplemented/Resources.meta rename to Assets/CivMars/Items/Circuits.meta index 51f77a2..5cdfe87 100644 --- a/Assets/NeedToBeImplemented/Resources.meta +++ b/Assets/CivMars/Items/Circuits.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9b7487aa1c512d543a2d3dfe7d454cdc +guid: 4f13b022836c7db44ac4252975322faf folderAsset: yes -timeCreated: 1439211145 +timeCreated: 1450705902 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMars/Items/Circuits/ControlCircuit.cs b/Assets/CivMars/Items/Circuits/ControlCircuit.cs new file mode 100644 index 0000000..c0067ca --- /dev/null +++ b/Assets/CivMars/Items/Circuits/ControlCircuit.cs @@ -0,0 +1,29 @@ +namespace CivMars +{ + class ControlCircuit : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public ControlCircuit(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public ControlCircuit() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + + Item[] a = { new ControllChip(1), new PlasticPlate(1), new SiliconRod(2), new CopperIngot(1) }; + Recipe r = new Recipe("CivMars.Press", a, new ControlCircuit(3), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/ControlCircuit.cs.meta b/Assets/CivMars/Items/Circuits/ControlCircuit.cs.meta similarity index 100% rename from Assets/Items/ControlCircuit.cs.meta rename to Assets/CivMars/Items/Circuits/ControlCircuit.cs.meta diff --git a/Assets/Items/GlassPLane.cs b/Assets/CivMars/Items/GlassPLane.cs similarity index 92% rename from Assets/Items/GlassPLane.cs rename to Assets/CivMars/Items/GlassPLane.cs index b099ad0..ce3c7a2 100644 --- a/Assets/Items/GlassPLane.cs +++ b/Assets/CivMars/Items/GlassPLane.cs @@ -4,6 +4,8 @@ using System.Text; using UnityEngine; +namespace CivMars +{ public class GlassPlane:Item, IRegystratabe { public string name = "GlassPlane"; @@ -31,3 +33,4 @@ public void Regystrate() } +} \ No newline at end of file diff --git a/Assets/Items/GlassPLane.cs.meta b/Assets/CivMars/Items/GlassPLane.cs.meta similarity index 95% rename from Assets/Items/GlassPLane.cs.meta rename to Assets/CivMars/Items/GlassPLane.cs.meta index 17023c7..ef0fa44 100644 --- a/Assets/Items/GlassPLane.cs.meta +++ b/Assets/CivMars/Items/GlassPLane.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 7adf476588083c44ba20a4b1c60b19fa -timeCreated: 1448650661 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7adf476588083c44ba20a4b1c60b19fa +timeCreated: 1448650661 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/InteriorPlate.cs b/Assets/CivMars/Items/InteriorPlate.cs new file mode 100644 index 0000000..3fa1edb --- /dev/null +++ b/Assets/CivMars/Items/InteriorPlate.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMars +{ + public class InteriorPlate : Item, IRegystratabe + { + public string name = "InteriorPlate"; + + public InteriorPlate(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.InteriorPlate"); + maxStackSize = 30; + } + + public InteriorPlate() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.InteriorPlate"); + maxStackSize = 30; + } + + public void Regystrate() + { + + Item[] a = { new IronPlate(2), new GlassPlane(1) }; + Recipe r = new Recipe("CivMars.Press", a, new InteriorPlate(5), 10); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } + +} \ No newline at end of file diff --git a/Assets/Items/InteriorPlate.cs.meta b/Assets/CivMars/Items/InteriorPlate.cs.meta similarity index 100% rename from Assets/Items/InteriorPlate.cs.meta rename to Assets/CivMars/Items/InteriorPlate.cs.meta diff --git a/Assets/CivMars/Items/IronPipe.cs b/Assets/CivMars/Items/IronPipe.cs new file mode 100644 index 0000000..6ec376a --- /dev/null +++ b/Assets/CivMars/Items/IronPipe.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMars +{ + public class IronPipe : Item, IRegystratabe + { + public string name = "IronPipe"; + public IronPipe(int am) : base(am, 10) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPipe"); + maxStackSize = 10; + } + + public IronPipe() + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPipe"); + maxStackSize = 10; + } + + public void Regystrate() + { + + Item[] a = { new IronOre(4) }; + Recipe r = new Recipe("CivMars.Furnace", a, new IronPipe(1), 20); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } + +} \ No newline at end of file diff --git a/Assets/Items/IronPipe.cs.meta b/Assets/CivMars/Items/IronPipe.cs.meta similarity index 95% rename from Assets/Items/IronPipe.cs.meta rename to Assets/CivMars/Items/IronPipe.cs.meta index 4bf4f37..b110837 100644 --- a/Assets/Items/IronPipe.cs.meta +++ b/Assets/CivMars/Items/IronPipe.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 55af5c5299e26e04bb5583a0acb33281 -timeCreated: 1448650128 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 55af5c5299e26e04bb5583a0acb33281 +timeCreated: 1448650128 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Item.cs b/Assets/CivMars/Items/Item.cs similarity index 100% rename from Assets/Items/Item.cs rename to Assets/CivMars/Items/Item.cs diff --git a/Assets/Items/Item.cs.meta b/Assets/CivMars/Items/Item.cs.meta similarity index 100% rename from Assets/Items/Item.cs.meta rename to Assets/CivMars/Items/Item.cs.meta diff --git a/Assets/Items/Ore.meta b/Assets/CivMars/Items/Ore.meta similarity index 100% rename from Assets/Items/Ore.meta rename to Assets/CivMars/Items/Ore.meta diff --git a/Assets/CivMars/Items/Ore/CoalOre.cs b/Assets/CivMars/Items/Ore/CoalOre.cs new file mode 100644 index 0000000..4b6e377 --- /dev/null +++ b/Assets/CivMars/Items/Ore/CoalOre.cs @@ -0,0 +1,16 @@ +namespace CivMars +{ + public class CoalOre : Item + { + public CoalOre(int am) : base(am, 4) + { + maxStackSize = 4; + } + + public CoalOre() + { + maxStackSize = 4; + } + + } +} \ No newline at end of file diff --git a/Assets/Items/Ore/CoalOre.cs.meta b/Assets/CivMars/Items/Ore/CoalOre.cs.meta similarity index 100% rename from Assets/Items/Ore/CoalOre.cs.meta rename to Assets/CivMars/Items/Ore/CoalOre.cs.meta diff --git a/Assets/CivMars/Items/Ore/CopperOre.cs b/Assets/CivMars/Items/Ore/CopperOre.cs new file mode 100644 index 0000000..654f971 --- /dev/null +++ b/Assets/CivMars/Items/Ore/CopperOre.cs @@ -0,0 +1,26 @@ + +namespace CivMars +{ + class CopperOre : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public CopperOre(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public CopperOre() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + } + } +} diff --git a/Assets/CivMars/Items/Ore/CopperOre.cs.meta b/Assets/CivMars/Items/Ore/CopperOre.cs.meta new file mode 100644 index 0000000..a6b209c --- /dev/null +++ b/Assets/CivMars/Items/Ore/CopperOre.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 6d7309f4124a9894bb656030f44fa3e8 +timeCreated: 1450705903 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/Ore/GoldOre.cs b/Assets/CivMars/Items/Ore/GoldOre.cs new file mode 100644 index 0000000..dc1edb8 --- /dev/null +++ b/Assets/CivMars/Items/Ore/GoldOre.cs @@ -0,0 +1,25 @@ +namespace CivMars +{ + class GoldOre : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public GoldOre(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public GoldOre() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + } + } +} \ No newline at end of file diff --git a/Assets/CivMars/Items/Ore/GoldOre.cs.meta b/Assets/CivMars/Items/Ore/GoldOre.cs.meta new file mode 100644 index 0000000..1bc99c7 --- /dev/null +++ b/Assets/CivMars/Items/Ore/GoldOre.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c46a25742ea8777469363563925b6b84 +timeCreated: 1450705903 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/Ore/IronOre.cs b/Assets/CivMars/Items/Ore/IronOre.cs new file mode 100644 index 0000000..f1e6926 --- /dev/null +++ b/Assets/CivMars/Items/Ore/IronOre.cs @@ -0,0 +1,16 @@ +namespace CivMars +{ + public class IronOre : Item + { + public IronOre(int am) : base(am, 4) + { + maxStackSize = 4; + } + + public IronOre() : base(4) + { + maxStackSize = 4; + } + + } +} \ No newline at end of file diff --git a/Assets/Items/Ore/IronOre.cs.meta b/Assets/CivMars/Items/Ore/IronOre.cs.meta similarity index 100% rename from Assets/Items/Ore/IronOre.cs.meta rename to Assets/CivMars/Items/Ore/IronOre.cs.meta diff --git a/Assets/CivMars/Items/Ore/SandOre.cs b/Assets/CivMars/Items/Ore/SandOre.cs new file mode 100644 index 0000000..b9d5532 --- /dev/null +++ b/Assets/CivMars/Items/Ore/SandOre.cs @@ -0,0 +1,18 @@ +namespace CivMars +{ + public class SandOre : Item + { + + public SandOre(int am) : base(am) + { + maxStackSize = 4; + } + + public SandOre() + { + maxStackSize = 4; + } + + + } +} \ No newline at end of file diff --git a/Assets/Items/Ore/SandOre.cs.meta b/Assets/CivMars/Items/Ore/SandOre.cs.meta similarity index 100% rename from Assets/Items/Ore/SandOre.cs.meta rename to Assets/CivMars/Items/Ore/SandOre.cs.meta diff --git a/Assets/CivMars/Items/Ore/StoneOre.cs b/Assets/CivMars/Items/Ore/StoneOre.cs new file mode 100644 index 0000000..8fafc81 --- /dev/null +++ b/Assets/CivMars/Items/Ore/StoneOre.cs @@ -0,0 +1,18 @@ +namespace CivMars +{ + public class StoneOre : Item + { + public string name = "Stone" + "Ore"; + + public StoneOre(int am) : base(am, 4) + { + maxStackSize = 4; + } + + public StoneOre() : base(4) + { + maxStackSize = 4; + } + + } +} \ No newline at end of file diff --git a/Assets/Items/Ore/StoneOre.cs.meta b/Assets/CivMars/Items/Ore/StoneOre.cs.meta similarity index 100% rename from Assets/Items/Ore/StoneOre.cs.meta rename to Assets/CivMars/Items/Ore/StoneOre.cs.meta diff --git a/Assets/CivMars/Items/Ore/UraniumOre.cs b/Assets/CivMars/Items/Ore/UraniumOre.cs new file mode 100644 index 0000000..46547af --- /dev/null +++ b/Assets/CivMars/Items/Ore/UraniumOre.cs @@ -0,0 +1,19 @@ +namespace CivMars +{ + public class UraniumOre : Item + { + public string name = "Uranium" + "Ore"; + + public UraniumOre(int am) : base(am, 4) + { + maxStackSize = 4; + } + + public UraniumOre() : base(4) + { + maxStackSize = 4; + } + + } +} + diff --git a/Assets/Items/Ore/UraniumOre.cs.meta b/Assets/CivMars/Items/Ore/UraniumOre.cs.meta similarity index 100% rename from Assets/Items/Ore/UraniumOre.cs.meta rename to Assets/CivMars/Items/Ore/UraniumOre.cs.meta diff --git a/Assets/CivMars/Items/OxygenTank.cs b/Assets/CivMars/Items/OxygenTank.cs new file mode 100644 index 0000000..8fc0e24 --- /dev/null +++ b/Assets/CivMars/Items/OxygenTank.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +namespace CivMars +{ + class OxygenTank : Item, IRegystratabe + { + + public string name = "OxygenTank"; + + + public OxygenTank(int am) : base(am, 3) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.OxygenTank"); + maxStackSize = 3; + } + + public OxygenTank() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.OxygenTank"); + maxStackSize = 3; + } + + public void Regystrate() + { + + Item[] a = { new IronPlate(2), new GlassPlane(5), new Piston(1), new IronPipe(2) }; + Recipe r = new Recipe("CivMars.Press", a, new OxygenTank(3), 400); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/OxygenTank.cs.meta b/Assets/CivMars/Items/OxygenTank.cs.meta similarity index 100% rename from Assets/Items/OxygenTank.cs.meta rename to Assets/CivMars/Items/OxygenTank.cs.meta diff --git a/Assets/CivMars/Items/Piston.cs b/Assets/CivMars/Items/Piston.cs new file mode 100644 index 0000000..88d5b57 --- /dev/null +++ b/Assets/CivMars/Items/Piston.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +namespace CivMars +{ + class Piston : Item, IRegystratabe + { + + public string name = "Piston"; + + + public Piston(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.Piston"); + maxStackSize = 30; + } + + public Piston() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.Piston"); + maxStackSize = 30; + } + + public void Regystrate() + { + + Item[] a = { new IronPlate(2), new IronIngot(1), new ControlCircuit(1) }; + Recipe r = new Recipe("CivMars.Press", a, new Piston(1), 150); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/Piston.cs.meta b/Assets/CivMars/Items/Piston.cs.meta similarity index 95% rename from Assets/Items/Piston.cs.meta rename to Assets/CivMars/Items/Piston.cs.meta index 6f3d13b..cd14390 100644 --- a/Assets/Items/Piston.cs.meta +++ b/Assets/CivMars/Items/Piston.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 19d5ac20e4e383a41b4a7218211ac515 -timeCreated: 1449337240 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 19d5ac20e4e383a41b4a7218211ac515 +timeCreated: 1449337240 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/OLD.meta b/Assets/CivMars/Items/Plates.meta similarity index 67% rename from Assets/OLD.meta rename to Assets/CivMars/Items/Plates.meta index f153472..9a33bfd 100644 --- a/Assets/OLD.meta +++ b/Assets/CivMars/Items/Plates.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9c6ba4b956a80ec4c879e3c670350351 +guid: 41e18138e84779b498281d2d150bf042 folderAsset: yes -timeCreated: 1440095782 +timeCreated: 1450705902 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMars/Items/Plates/IronPlate.cs b/Assets/CivMars/Items/Plates/IronPlate.cs new file mode 100644 index 0000000..7df5b94 --- /dev/null +++ b/Assets/CivMars/Items/Plates/IronPlate.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + + +namespace CivMars +{ + public class IronPlate : Item, IRegystratabe + { + public string name = "IronPlate"; + + public IronPlate(int am) : base(am, 10) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPlate"); + maxStackSize = 10; + } + + public IronPlate() + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPlate"); + maxStackSize = 10; + } + + public void Regystrate() + { + + Item[] a = { new IronIngot(1) }; + Recipe r = new Recipe("CivMars.Press", a, new IronPlate(2), 30); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/IronPlate.cs.meta b/Assets/CivMars/Items/Plates/IronPlate.cs.meta similarity index 95% rename from Assets/Items/IronPlate.cs.meta rename to Assets/CivMars/Items/Plates/IronPlate.cs.meta index fc44d4f..9861836 100644 --- a/Assets/Items/IronPlate.cs.meta +++ b/Assets/CivMars/Items/Plates/IronPlate.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 215d10495251f784f889a148c92e4e2f -timeCreated: 1448648010 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 215d10495251f784f889a148c92e4e2f +timeCreated: 1448648010 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/Plates/PlasticPlate.cs b/Assets/CivMars/Items/Plates/PlasticPlate.cs new file mode 100644 index 0000000..82bf973 --- /dev/null +++ b/Assets/CivMars/Items/Plates/PlasticPlate.cs @@ -0,0 +1,28 @@ +namespace CivMars +{ + class PlasticPlate : Item, IRegystratabe + { + + public string name = "ControlCircuit"; + + + public PlasticPlate(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public PlasticPlate() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new Resin(4) }; + Recipe r = new Recipe("CivMars.Press", a, new PlasticPlate(3), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/CivMars/Items/Plates/PlasticPlate.cs.meta b/Assets/CivMars/Items/Plates/PlasticPlate.cs.meta new file mode 100644 index 0000000..f172c84 --- /dev/null +++ b/Assets/CivMars/Items/Plates/PlasticPlate.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5c7bf0fe357f4984b899da3849cdcb1e +timeCreated: 1450705903 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/Roof.cs b/Assets/CivMars/Items/Roof.cs new file mode 100644 index 0000000..b4ba694 --- /dev/null +++ b/Assets/CivMars/Items/Roof.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMars +{ + public class Roof : Item + { + public string name = "Roof"; + + + public Roof(int am) : base(am, 3) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.Roof"); + maxStackSize = 3; + } + + public Roof() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.Roof"); + maxStackSize = 3; + } + + public void Regystrate() + { + + Item[] a = { new IronPlate(10), new GlassPlane(5), new StoneBrick(50) }; + Recipe r = new Recipe("CivMars.Furnace", a, new Roof(1), 200); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/Roof.cs.meta b/Assets/CivMars/Items/Roof.cs.meta similarity index 95% rename from Assets/Items/Roof.cs.meta rename to Assets/CivMars/Items/Roof.cs.meta index 3a1d3bf..bb122ec 100644 --- a/Assets/Items/Roof.cs.meta +++ b/Assets/CivMars/Items/Roof.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 6bc5c4f7b01178b4cbe52aea7a841228 -timeCreated: 1449337240 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 6bc5c4f7b01178b4cbe52aea7a841228 +timeCreated: 1449337240 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Sapling.cs b/Assets/CivMars/Items/Sapling.cs similarity index 100% rename from Assets/Items/Sapling.cs rename to Assets/CivMars/Items/Sapling.cs diff --git a/Assets/Items/Sapling.cs.meta b/Assets/CivMars/Items/Sapling.cs.meta similarity index 95% rename from Assets/Items/Sapling.cs.meta rename to Assets/CivMars/Items/Sapling.cs.meta index 4f33899..e5cbf27 100644 --- a/Assets/Items/Sapling.cs.meta +++ b/Assets/CivMars/Items/Sapling.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 5848dd036409aeb4ba2eb16abcfdecbf -timeCreated: 1449337240 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 5848dd036409aeb4ba2eb16abcfdecbf +timeCreated: 1449337240 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/StoneBrick.cs b/Assets/CivMars/Items/StoneBrick.cs new file mode 100644 index 0000000..cd20ed8 --- /dev/null +++ b/Assets/CivMars/Items/StoneBrick.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMars +{ + public class StoneBrick : Item, IRegystratabe + { + public string name = "StoneBrick"; + + + public StoneBrick(int am) : base(am, 100) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StoneBrick"); + maxStackSize = 100; + } + + public StoneBrick() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.StoneBrick"); + maxStackSize = 100; + } + + public void Regystrate() + { + + Item[] a = { new StoneOre(1) }; + Recipe r = new Recipe("CivMars.Furnace", a, new StoneBrick(10), 10); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} \ No newline at end of file diff --git a/Assets/Items/StoneBrick.cs.meta b/Assets/CivMars/Items/StoneBrick.cs.meta similarity index 95% rename from Assets/Items/StoneBrick.cs.meta rename to Assets/CivMars/Items/StoneBrick.cs.meta index 466389c..fc792da 100644 --- a/Assets/Items/StoneBrick.cs.meta +++ b/Assets/CivMars/Items/StoneBrick.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 7c09fc3161e2807409dffbf9db14a33d -timeCreated: 1449337240 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7c09fc3161e2807409dffbf9db14a33d +timeCreated: 1449337240 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Wood.cs b/Assets/CivMars/Items/Wood.cs similarity index 100% rename from Assets/Items/Wood.cs rename to Assets/CivMars/Items/Wood.cs diff --git a/Assets/Items/Wood.cs.meta b/Assets/CivMars/Items/Wood.cs.meta similarity index 95% rename from Assets/Items/Wood.cs.meta rename to Assets/CivMars/Items/Wood.cs.meta index e1b97bd..9ca1980 100644 --- a/Assets/Items/Wood.cs.meta +++ b/Assets/CivMars/Items/Wood.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 353b7bbc064e4924b95183d4b2fe7921 -timeCreated: 1449253873 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 353b7bbc064e4924b95183d4b2fe7921 +timeCreated: 1449253873 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Ores.meta b/Assets/CivMars/Ores.meta similarity index 95% rename from Assets/Tile/Ores.meta rename to Assets/CivMars/Ores.meta index 5cb5a0f..ce3d92d 100644 --- a/Assets/Tile/Ores.meta +++ b/Assets/CivMars/Ores.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: ddeefb390ccd7cc4fbd3ad182db0df96 -folderAsset: yes -timeCreated: 1446235568 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ddeefb390ccd7cc4fbd3ad182db0df96 +folderAsset: yes +timeCreated: 1446235568 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Ores/CoalOreTile.cs b/Assets/CivMars/Ores/CoalOreTile.cs new file mode 100644 index 0000000..ea8f026 --- /dev/null +++ b/Assets/CivMars/Ores/CoalOreTile.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMars +{ + class CoalOreTile : OreTile + { + public new string ID = CivMarsInit.BlockSpace + ".CoalOre"; + + static Type item = typeof(CoalOre); + + + public override void Generate(System.Random r, TileMap map) + { + base.Generate(r, map); + } + + + override public void Regystrate() + { + base.ID = this.ID; + + chanche = 0; + chanche2 = 250; + chancheReduce = 5; + distance = -1; + + + GameRegystry.RegisterWorldGen(ID, this); + } + + public override float GetMiningTime() + { + return 5f; + } + + public override Type GetItemType() + { + return item; + } + + public override bool Mine(int remAmount) + { + amount -= remAmount; + if (amount <= 0) + { + transform.tileMap.RemoveTile(transform.position); + return true; + } + return false; + } + + public override float GetAmountLeft() + { + return amount; + } + } +} \ No newline at end of file diff --git a/Assets/Tile/Ores/CoalOreTile.cs.meta b/Assets/CivMars/Ores/CoalOreTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/CoalOreTile.cs.meta rename to Assets/CivMars/Ores/CoalOreTile.cs.meta index ea5072e..250829d 100644 --- a/Assets/Tile/Ores/CoalOreTile.cs.meta +++ b/Assets/CivMars/Ores/CoalOreTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 3a48f20e033736441a58a321149b28b3 -timeCreated: 1446233233 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3a48f20e033736441a58a321149b28b3 +timeCreated: 1446233233 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Ores/IronOreTile.cs b/Assets/CivMars/Ores/IronOreTile.cs new file mode 100644 index 0000000..0e0d8f6 --- /dev/null +++ b/Assets/CivMars/Ores/IronOreTile.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMars +{ + public class IronOreTile : OreTile + { + public string ID = CivMarsInit.BlockSpace + ".IronOre"; + + + static Type item = typeof(IronOre); + + public override void Generate(System.Random r, TileMap map) + { + chanche = 1; + chanche2 = 40; + chancheReduce = 20; + distance = -1; + base.Generate(r, map); + } + + override public void Regystrate() + { + GameRegystry.RegisterWorldGen(ID, this); + } + + public override float GetMiningTime() + { + return 7f; + } + + public override Type GetItemType() + { + return item; + } + + public override bool Mine(int remAmount) + { + amount -= remAmount; + if (amount <= 0) + { + transform.tileMap.RemoveTile(transform.position); + return true; + } + return false; + } + + public override float GetAmountLeft() + { + return amount; + } + } +} \ No newline at end of file diff --git a/Assets/Tile/Ores/IronOreTile.cs.meta b/Assets/CivMars/Ores/IronOreTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/IronOreTile.cs.meta rename to Assets/CivMars/Ores/IronOreTile.cs.meta index 19471d6..d90fd7a 100644 --- a/Assets/Tile/Ores/IronOreTile.cs.meta +++ b/Assets/CivMars/Ores/IronOreTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 96af196cff2a5b742ac8c9a9e2e697bc -timeCreated: 1446235809 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 96af196cff2a5b742ac8c9a9e2e697bc +timeCreated: 1446235809 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Ores/OreTile.cs b/Assets/CivMars/Ores/OreTile.cs similarity index 100% rename from Assets/Tile/Ores/OreTile.cs rename to Assets/CivMars/Ores/OreTile.cs diff --git a/Assets/Tile/Ores/OreTile.cs.meta b/Assets/CivMars/Ores/OreTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/OreTile.cs.meta rename to Assets/CivMars/Ores/OreTile.cs.meta index ab1021a..4c11d27 100644 --- a/Assets/Tile/Ores/OreTile.cs.meta +++ b/Assets/CivMars/Ores/OreTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: a0d4e139a2c42884a9e9ca0d0b6ca51c -timeCreated: 1446150048 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a0d4e139a2c42884a9e9ca0d0b6ca51c +timeCreated: 1446150048 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Ores/SandTile.cs b/Assets/CivMars/Ores/SandTile.cs new file mode 100644 index 0000000..958e4e5 --- /dev/null +++ b/Assets/CivMars/Ores/SandTile.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMars +{ + public class SandTile : OreTile + { + public string ID = CivMarsInit.BlockSpace + ".Sand"; + + static Type item = typeof(SandOre); + + override public void Regystrate() + { + chanche = 30; + chanche2 = 150; + chancheReduce = 20; + distance = -1; + GameRegystry.RegisterWorldGen(ID, this); + } + + public override void Generate(System.Random r, TileMap map) + { + base.Generate(r, map); + } + + public override float GetMiningTime() + { + return 4f; + } + + public override Type GetItemType() + { + return item; + } + + public override bool Mine(int remAmount) + { + amount -= remAmount; + if (amount <= 0) + { + transform.tileMap.RemoveTile(transform.position); + return true; + } + return false; + } + + public override float GetAmountLeft() + { + return amount; + } + } +} \ No newline at end of file diff --git a/Assets/Tile/Ores/SandTile.cs.meta b/Assets/CivMars/Ores/SandTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/SandTile.cs.meta rename to Assets/CivMars/Ores/SandTile.cs.meta index fd9eb64..7d11244 100644 --- a/Assets/Tile/Ores/SandTile.cs.meta +++ b/Assets/CivMars/Ores/SandTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: de1eda63b9f991e499739502471209b9 -timeCreated: 1446235750 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: de1eda63b9f991e499739502471209b9 +timeCreated: 1446235750 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Ores/StoneOreTile.cs b/Assets/CivMars/Ores/StoneOreTile.cs new file mode 100644 index 0000000..3269202 --- /dev/null +++ b/Assets/CivMars/Ores/StoneOreTile.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMars +{ + public class StoneOreTile : OreTile + { + public string ID = CivMarsInit.BlockSpace + ".StoneOre"; + + static Type item = typeof(StoneOre); + + override public void Regystrate() + { + chanche = 20; + chanche2 = 220; + chancheReduce = 20; + distance = -1; + GameRegystry.RegisterWorldGen(ID, this); + } + + public override void Generate(System.Random r, TileMap map) + { + base.Generate(r, map); + } + + public override float GetMiningTime() + { + return 4.5f; + } + + public override Type GetItemType() + { + return item; + } + + public override bool Mine(int remAmount) + { + amount -= remAmount; + if (amount <= 0) + { + transform.tileMap.RemoveTile(transform.position); + return true; + } + return false; + } + + public override float GetAmountLeft() + { + return amount; + } + + } +} \ No newline at end of file diff --git a/Assets/Tile/Ores/StoneOreTile.cs.meta b/Assets/CivMars/Ores/StoneOreTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/StoneOreTile.cs.meta rename to Assets/CivMars/Ores/StoneOreTile.cs.meta index c985775..ae9dc93 100644 --- a/Assets/Tile/Ores/StoneOreTile.cs.meta +++ b/Assets/CivMars/Ores/StoneOreTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 14137b566949e2a4eb963a7be1456e30 -timeCreated: 1446324837 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 14137b566949e2a4eb963a7be1456e30 +timeCreated: 1446324837 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Ores/UraniumOreTile.cs b/Assets/CivMars/Ores/UraniumOreTile.cs new file mode 100644 index 0000000..b219d9e --- /dev/null +++ b/Assets/CivMars/Ores/UraniumOreTile.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMars +{ + public class UraniumOreTile : OreTile + { + public string ID = CivMarsInit.BlockSpace + ".UraniumOre"; + + + static Type item = typeof(UraniumOre); + + public override void Generate(System.Random r, TileMap map) + { + chanche = 0.1f; + chanche2 = 40; + chancheReduce = 20; + distance = -1; + base.Generate(r, map); + } + + override public void Regystrate() + { + GameRegystry.RegisterWorldGen(ID, this); + } + + public override float GetMiningTime() + { + return 14f; + } + + public override Type GetItemType() + { + return item; + } + + public override bool Mine(int remAmount) + { + amount -= remAmount; + if (amount <= 0) + { + transform.tileMap.RemoveTile(transform.position); + return true; + } + return false; + } + + public override float GetAmountLeft() + { + return amount; + } + } +} \ No newline at end of file diff --git a/Assets/Tile/Ores/UraniumOreTile.cs.meta b/Assets/CivMars/Ores/UraniumOreTile.cs.meta similarity index 95% rename from Assets/Tile/Ores/UraniumOreTile.cs.meta rename to Assets/CivMars/Ores/UraniumOreTile.cs.meta index fcaf15d..6d1e8da 100644 --- a/Assets/Tile/Ores/UraniumOreTile.cs.meta +++ b/Assets/CivMars/Ores/UraniumOreTile.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 42b45fad80cf68f48ae86223a76b6bff -timeCreated: 1446325231 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 42b45fad80cf68f48ae86223a76b6bff +timeCreated: 1446325231 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/ControlCircuit.cs b/Assets/Items/ControlCircuit.cs deleted file mode 100644 index 92a480f..0000000 --- a/Assets/Items/ControlCircuit.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -class ControlCircuit : Item, IRegystratabe -{ - - public string name = "ControlCircuit"; - - - public ControlCircuit(int am) : base(am, 30) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); - maxStackSize = 30; - } - - public ControlCircuit() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); - maxStackSize = 30; - } - - public void Regystrate() - { - - Item[] a = { new IronPlate(2), new GlassPlane(5), new IronIngot(1) }; - Recipe r = new Recipe("CivMars.Press", a, new ControlCircuit(3), 100); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} - - diff --git a/Assets/Items/InteriorPlate.cs b/Assets/Items/InteriorPlate.cs deleted file mode 100644 index cfc5b19..0000000 --- a/Assets/Items/InteriorPlate.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - - -public class InteriorPlate : Item, IRegystratabe -{ - public string name = "InteriorPlate"; - - public InteriorPlate(int am) : base(am, 30) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.InteriorPlate"); - maxStackSize = 30; - } - - public InteriorPlate() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.InteriorPlate"); - maxStackSize = 30; - } - - public void Regystrate() - { - - Item[] a = { new IronPlate(2), new GlassPlane(1) }; - Recipe r = new Recipe("CivMars.Press", a, new InteriorPlate(5), 10); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} - diff --git a/Assets/Items/IronIngot.cs b/Assets/Items/IronIngot.cs deleted file mode 100644 index 2dd1c86..0000000 --- a/Assets/Items/IronIngot.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -public class IronIngot : Item, IRegystratabe -{ - public string name = "IronIngot"; - - - public IronIngot(int am) : base(am, 10) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StealIngot"); - maxStackSize = 10; - } - - public IronIngot() - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StealIngot"); - maxStackSize = 10; - } - - public void Regystrate() - { - - Item[] a = { new IronOre(2) }; - Recipe r = new Recipe("CivMars.Furnace", a , new IronIngot(1),10); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} - - diff --git a/Assets/Items/IronPipe.cs b/Assets/Items/IronPipe.cs deleted file mode 100644 index 5b9fed7..0000000 --- a/Assets/Items/IronPipe.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - - -public class IronPipe:Item, IRegystratabe -{ - public string name = "IronPipe"; - public IronPipe(int am) : base(am, 10) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPipe"); - maxStackSize = 10; - } - - public IronPipe() - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPipe"); - maxStackSize = 10; - } - - public void Regystrate() - { - - Item[] a = { new IronOre(4) }; - Recipe r = new Recipe("CivMars.Furnace", a, new IronPipe(1), 20); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} - diff --git a/Assets/Items/IronPlate.cs b/Assets/Items/IronPlate.cs deleted file mode 100644 index e9ab18f..0000000 --- a/Assets/Items/IronPlate.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - - - -public class IronPlate:Item, IRegystratabe -{ - public string name = "IronPlate"; - - public IronPlate(int am) : base(am, 10) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPlate"); - maxStackSize = 10; - } - - public IronPlate() - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.IronPlate"); - maxStackSize = 10; - } - - public void Regystrate() - { - - Item[] a = { new IronIngot(1) }; - Recipe r = new Recipe("CivMars.Press", a, new IronPlate(2) , 30); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} diff --git a/Assets/Items/Ore/CoalOre.cs b/Assets/Items/Ore/CoalOre.cs deleted file mode 100644 index 210057b..0000000 --- a/Assets/Items/Ore/CoalOre.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - -public class CoalOre : Item -{ - public CoalOre(int am) : base(am, 4) - { - maxStackSize = 4; - } - - public CoalOre() - { - maxStackSize = 4; - } - -} - diff --git a/Assets/Items/Ore/IronOre.cs b/Assets/Items/Ore/IronOre.cs deleted file mode 100644 index 5bc31e3..0000000 --- a/Assets/Items/Ore/IronOre.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - -public class IronOre : Item -{ - public IronOre(int am) : base(am, 4) - { - maxStackSize = 4; - } - - public IronOre() : base(4) - { - maxStackSize = 4; - } - -} - diff --git a/Assets/Items/Ore/SandOre.cs b/Assets/Items/Ore/SandOre.cs deleted file mode 100644 index 90513e0..0000000 --- a/Assets/Items/Ore/SandOre.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public class SandOre : Item -{ - - public SandOre(int am) : base(am) - { - maxStackSize = 4; - } - - public SandOre() - { - maxStackSize = 4; - } - - -} diff --git a/Assets/Items/Ore/StoneOre.cs b/Assets/Items/Ore/StoneOre.cs deleted file mode 100644 index 8c47859..0000000 --- a/Assets/Items/Ore/StoneOre.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - public class StoneOre: Item -{ - public string name = "Stone"+"Ore"; - - public StoneOre(int am) : base(am, 4) - { - maxStackSize = 4; - } - - public StoneOre() : base(4) - { - maxStackSize = 4; - } - -} - diff --git a/Assets/Items/Ore/UraniumOre.cs b/Assets/Items/Ore/UraniumOre.cs deleted file mode 100644 index 1e85248..0000000 --- a/Assets/Items/Ore/UraniumOre.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - -public class UraniumOre : Item -{ - public string name = "Uranium" + "Ore"; - - public UraniumOre(int am) : base(am, 4) - { - maxStackSize = 4; - } - - public UraniumOre() : base(4) - { - maxStackSize = 4; - } - -} - diff --git a/Assets/Items/OxygenTank.cs b/Assets/Items/OxygenTank.cs deleted file mode 100644 index f963b5b..0000000 --- a/Assets/Items/OxygenTank.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -class OxygenTank : Item, IRegystratabe -{ - - public string name = "OxygenTank"; - - - public OxygenTank(int am) : base(am, 3) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.OxygenTank"); - maxStackSize = 3; - } - - public OxygenTank() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.OxygenTank"); - maxStackSize = 3; - } - - public void Regystrate() - { - - Item[] a = { new IronPlate(2), new GlassPlane(5), new Piston(1), new IronPipe(2) }; - Recipe r = new Recipe("CivMars.Press", a, new OxygenTank(3), 400); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} diff --git a/Assets/Items/Piston.cs b/Assets/Items/Piston.cs deleted file mode 100644 index 9b37e0f..0000000 --- a/Assets/Items/Piston.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -class Piston : Item, IRegystratabe -{ - - public string name = "Piston"; - - - public Piston(int am) : base(am, 30) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.Piston"); - maxStackSize = 30; - } - - public Piston() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.Piston"); - maxStackSize = 30; - } - - public void Regystrate() - { - - Item[] a = { new IronPlate(2), new IronIngot(1), new ControlCircuit(1) }; - Recipe r = new Recipe("CivMars.Press", a, new Piston(1), 150); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} diff --git a/Assets/Items/Roof.cs b/Assets/Items/Roof.cs deleted file mode 100644 index ab43388..0000000 --- a/Assets/Items/Roof.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - - -public class Roof : Item -{ - public string name = "Roof"; - - - public Roof(int am) : base(am, 3) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.Roof"); - maxStackSize = 3; - } - - public Roof() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.Roof"); - maxStackSize = 3; - } - - public void Regystrate() - { - - Item[] a = { new IronPlate(10), new GlassPlane(5), new StoneBrick(50) }; - Recipe r = new Recipe("CivMars.Furnace", a, new Roof(1), 200); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} \ No newline at end of file diff --git a/Assets/Items/StoneBrick.cs b/Assets/Items/StoneBrick.cs deleted file mode 100644 index cdc313e..0000000 --- a/Assets/Items/StoneBrick.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -public class StoneBrick : Item, IRegystratabe -{ - public string name = "StoneBrick"; - - - public StoneBrick(int am) : base(am, 100) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.StoneBrick"); - maxStackSize = 100; - } - - public StoneBrick() - { - texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.StoneBrick"); - maxStackSize = 100; - } - - public void Regystrate() - { - - Item[] a = { new StoneOre(1) }; - Recipe r = new Recipe("CivMars.Furnace", a, new StoneBrick(10), 10); - GameRegystry.RegisterRecepie(r.buildingID, r); - } -} diff --git a/Assets/OLD/Generate/IronOreTile.prefab.meta b/Assets/OLD/Generate/IronOreTile.prefab.meta deleted file mode 100644 index 4fe22e2..0000000 --- a/Assets/OLD/Generate/IronOreTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ffe2355c57af0b640bb5d33181d2f375 -timeCreated: 1446236129 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OLD/Generate/SandTile.prefab.meta b/Assets/OLD/Generate/SandTile.prefab.meta deleted file mode 100644 index f7d1829..0000000 --- a/Assets/OLD/Generate/SandTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f06caaff22ac6af42a2760e82bd7e65c -timeCreated: 1446236146 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Press.cs b/Assets/Press.cs deleted file mode 100644 index dd2c8e8..0000000 --- a/Assets/Press.cs +++ /dev/null @@ -1,280 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System; -using UnityEngine.UI; - -public class Press : Building, IInventory, IHasGui, IRegystratabe, ICrafter, IBuildable -{ - - enum States - { - None, - Inv, - Craft - } - - public List craftingQueue = new List(); - - static public string ID = "CivMars.Press"; - static Item[] neededMaterials = { new SandOre(1) }; - public Sprite icon; - - States invOn; - - Inventory inv = new Inventory(10); - - Item remaining; - - // Use this for initialization - void Start() - { - - } - - // Update is called once per frame - void Update() - { - if (remaining == null && craftingQueue.Count > 0) - { - CraftingProcess a = (CraftingProcess)craftingQueue[0]; - if (a.HasItems()) - { - a.status -= Time.deltaTime; - - if (a.status <= 0) - { - remaining = (Item)Activator.CreateInstance(a.recipe.Crafted.GetType()); - remaining.amount = a.amount * a.recipe.Crafted.amount; - craftingQueue.RemoveAt(0); - } - - } - else - { - Inventory playerinv = GameCon.playerclass.inventory; - - for (int i = 0; i < a.recipe.Materials.Length; i++) - { - if (a.materials[i] > 0) - { - Item needed = (Item)Activator.CreateInstance(null, a.recipe.Materials[i].GetType().ToString()).Unwrap(); - needed.amount = a.materials[i]; - - Item remainingItem = playerinv.Remove(needed); - if (remainingItem != null) - { - a.materials[i] = remainingItem.amount; - } - else - { - a.materials[i] = 0; - } - - - } - } - } - } - else if (remaining != null) - { - remaining = inv.Add(remaining); - } - } - - public override void Awake() - { - base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - public void OpenInventory() - { - if (invOn != States.Inv) - { - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - - GameCon.guiHandler.defaultInventory.Activate(this); - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - invOn = States.Inv; - } - else - { - - GameCon.guiHandler.defaultInventory.Deactive(); - invOn = States.None; - } - } - - public void OpenCrafting() - { - - if (invOn != States.Craft) - { - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(true); - - GameCon.guiHandler.defaultInventory.Deactive(); - GameCon.guiHandler.defaultCrafting.SetBuilding(this); - invOn = States.Craft; - } - else - { - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - invOn = States.None; - } - - } - - #region IHasGUI - - public override void Close() - { - base.Close(); - GameCon.guiHandler.defaultInventory.gameObject.SetActive(false); - GameCon.guiHandler.defaultInventory.Deactive(); - - GameCon.guiHandler.defaultCrafting.gameObject.SetActive(false); - GameCon.guiHandler.defaultCrafting.SetBuilding(null); - } - - #endregion - - #region IRegystratabe - - public void Regystrate() - { - GameRegystry.RegisterBuildableBuilding(ID, this); - } - - #endregion - - #region IBuildable - - public float GetBuildtime() - { - return 1; - } - - public Sprite GetImage() - { - return icon; - } - - public GameObject GetPrefab() - { - return gameObject; - } - - public Image GetBuildedState() - { - throw new NotImplementedException(); - } - - public Item[] GetNeededMaterials() - { - return neededMaterials; - } - - public void Setup() - { - return; - } - - - #endregion - - #region IInventory - - public int GetInventorySize() - { - return 10; - } - - public string GetInventoryName() - { - return "asd"; - } - - public bool HasCustomInventoryName() - { - return true; - } - - public Item GetStackInSlot(int i) - { - return inv.Get(i); - } - - public int GetInventoryStackLimit(int i) - { - throw new NotImplementedException(); - } - - public bool IsItemValidForSlot(int slot, Item givenItem) - { - throw new NotImplementedException(); - } - - public bool IsUseableByPlayer(Player p_70300_1_) - { - throw new NotImplementedException(); - } - - public Item Add(Item i) - { - return inv.Add(i); - } - - public Item Remove(Item i) - { - return inv.Remove(i); - } - - public void TransferItem(IInventory ToInv, int index) - { - inv.TransferItem(ToInv, index); - } - - public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) - { - inv.TransferItemAmount(Toinv, fromindex, transferingAmount); - } - - #endregion - - #region ICrafter - public void AddToQueue(int i) - { - //throw new NotImplementedException(); - craftingQueue.Add(new CraftingProcess(GameRegystry.recepies[ID][i], 1)); - Debug.Log("asdasd"); - } - - public CraftingProcess[] GetQueue() - { - CraftingProcess[] a = new CraftingProcess[craftingQueue.Count]; - - for (int i = 0; i < a.Length; i++) - { - a[i] = (CraftingProcess)craftingQueue.ToArray()[i]; - } - - return a; - } - - public string GetCraftingID() - { - return ID; - } - - public void RemoveFromQueue(int i) - { - craftingQueue.RemoveAt(i); - } - #endregion - -} diff --git a/Assets/Tile/Ores/CoalOreTile.cs b/Assets/Tile/Ores/CoalOreTile.cs deleted file mode 100644 index 5acf0dc..0000000 --- a/Assets/Tile/Ores/CoalOreTile.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -class CoalOreTile : OreTile -{ - public new string ID = CivMarsInit.BlockSpace + ".CoalOre"; - - static Type item = typeof(CoalOre); - - - public override void Generate(System.Random r, TileMap map) - { - base.Generate(r, map); - } - - - override public void Regystrate() - { - base.ID = this.ID; - - chanche = 0; - chanche2 = 250; - chancheReduce = 5; - distance = -1; - - - GameRegystry.RegisterWorldGen(ID,this); - } - - public override float GetMiningTime() - { - return 5f; - } - - public override Type GetItemType() - { - return item; - } - - public override bool Mine(int remAmount) - { - amount -= remAmount; - if (amount <= 0) - { - transform.tileMap.RemoveTile(transform.position); - return true; - } - return false; - } - - public override float GetAmountLeft() - { - return amount; - } -} diff --git a/Assets/Tile/Ores/IronOreTile.cs b/Assets/Tile/Ores/IronOreTile.cs deleted file mode 100644 index f1cde16..0000000 --- a/Assets/Tile/Ores/IronOreTile.cs +++ /dev/null @@ -1,51 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - -public class IronOreTile : OreTile -{ - public string ID = CivMarsInit.BlockSpace + ".IronOre"; - - - static Type item = typeof(IronOre); - - public override void Generate(System.Random r, TileMap map) - { - chanche = 1; - chanche2 = 40; - chancheReduce = 20; - distance = -1; - base.Generate(r, map); - } - - override public void Regystrate() - { - GameRegystry.RegisterWorldGen(ID, this); - } - - public override float GetMiningTime() - { - return 7f; - } - - public override Type GetItemType() - { - return item; - } - - public override bool Mine(int remAmount) - { - amount -= remAmount; - if (amount <= 0) - { - transform.tileMap.RemoveTile(transform.position); - return true; - } - return false; - } - - public override float GetAmountLeft() - { - return amount; - } -} diff --git a/Assets/Tile/Ores/SandTile.cs b/Assets/Tile/Ores/SandTile.cs deleted file mode 100644 index 43a5f76..0000000 --- a/Assets/Tile/Ores/SandTile.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - -public class SandTile : OreTile -{ - public string ID = CivMarsInit.BlockSpace + ".Sand"; - - static Type item = typeof(SandOre); - - override public void Regystrate() - { - chanche = 30; - chanche2 = 150; - chancheReduce = 20; - distance = -1; - GameRegystry.RegisterWorldGen(ID,this); - } - - public override void Generate(System.Random r, TileMap map) - { - base.Generate(r, map); - } - - public override float GetMiningTime() - { - return 4f; - } - - public override Type GetItemType() - { - return item; - } - - public override bool Mine(int remAmount) - { - amount -= remAmount; - if (amount <= 0) - { - transform.tileMap.RemoveTile(transform.position); - return true; - } - return false; - } - - public override float GetAmountLeft() - { - return amount; - } -} diff --git a/Assets/Tile/Ores/StoneOreTile.cs b/Assets/Tile/Ores/StoneOreTile.cs deleted file mode 100644 index d7d99aa..0000000 --- a/Assets/Tile/Ores/StoneOreTile.cs +++ /dev/null @@ -1,51 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - -public class StoneOreTile : OreTile -{ - public string ID = CivMarsInit.BlockSpace + ".StoneOre"; - - static Type item = typeof(StoneOre); - - override public void Regystrate() - { - chanche = 20; - chanche2 = 220; - chancheReduce = 20; - distance = -1; - GameRegystry.RegisterWorldGen(ID, this); - } - - public override void Generate(System.Random r, TileMap map) - { - base.Generate(r, map); - } - - public override float GetMiningTime() - { - return 4.5f; - } - - public override Type GetItemType() - { - return item; - } - - public override bool Mine(int remAmount) - { - amount -= remAmount; - if (amount <= 0) - { - transform.tileMap.RemoveTile(transform.position); - return true; - } - return false; - } - - public override float GetAmountLeft() - { - return amount; - } - -} diff --git a/Assets/Tile/Ores/UraniumOreTile.cs b/Assets/Tile/Ores/UraniumOreTile.cs deleted file mode 100644 index 685127b..0000000 --- a/Assets/Tile/Ores/UraniumOreTile.cs +++ /dev/null @@ -1,51 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - -public class UraniumOreTile : OreTile -{ - public string ID = CivMarsInit.BlockSpace + ".UraniumOre"; - - - static Type item = typeof(UraniumOre); - - public override void Generate(System.Random r, TileMap map) - { - chanche = 0.1f; - chanche2 = 40; - chancheReduce = 20; - distance = -1; - base.Generate(r, map); - } - - override public void Regystrate() - { - GameRegystry.RegisterWorldGen(ID, this); - } - - public override float GetMiningTime() - { - return 14f; - } - - public override Type GetItemType() - { - return item; - } - - public override bool Mine(int remAmount) - { - amount -= remAmount; - if (amount <= 0) - { - transform.tileMap.RemoveTile(transform.position); - return true; - } - return false; - } - - public override float GetAmountLeft() - { - return amount; - } -} \ No newline at end of file diff --git a/Assets/TileMap/SavedMap.cs.meta b/Assets/TileMap/SavedMap.cs.meta deleted file mode 100644 index f8081a7..0000000 --- a/Assets/TileMap/SavedMap.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 88abcab9f460ebd4f9be8a3fb8e96fa1 -timeCreated: 1449340030 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000000000000000000000000000000000000..aaa577040bd1f72b86663181e50d839f867cf893 GIT binary patch literal 4104 zcmeH_yGjE=6o$|2=HmTsCBA?~P*iLKvCu+6B(@S{6eS6=xzqz%+xiBku=8C+2x6mU zp27A1cb1jK)K+KUaOQk-=AYSrRwU?)EKG>VJTj8VZe_c&dATFsaU2^1FhUGIR|jXo z+wgsO|KRFhk1Jp`1lKwCL>&6#q;TX$oi-eB6AP4Au#<|ofWxSZvFN2#Z`%5`}I^pkGk`pLWpY>$M zz5WJj>Q5p2bMyMs?63aSpCL~ouRoh{uMa;H{W;`u`gpCe`h3E1`imJaB;R|NzRMCg z2YsW@<-q&A?6K6Ey-wFghwa;5_o&fsT-iuk=SkVgErRab{`G}DZnP|lQycYdRF9hJ qby7VfTFhT+gb)0sI#UPK0d+tfPzTfjbwC|Z2h;&|KpprG2Yvu3zI&7a literal 0 HcmV?d00001 From 045a083835007308a2c92b86d9da20259e73402c Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Tue, 22 Dec 2015 17:03:12 +0100 Subject: [PATCH 4/5] Namespacing - Added - CivMars - CivMarsEngine - Sorting Folders --- Assets/AssetsLoading/GameRegystry.cs | 107 +-- .../TileMap/Tile/Surface/Surface.cs | 26 +- Assets/BasicUtility/TileMap/Tile/Tile.cs | 2 +- Assets/BasicUtility/TileMap/TileTransform.cs | 2 +- Assets/CivMars/Buildings/Building.cs | 86 -- Assets/CivMars/Buildings/Chest.cs | 7 +- Assets/CivMars/Buildings/Furnace.cs | 7 +- Assets/CivMars/Buildings/GreenHouse.cs | 7 +- Assets/CivMars/Buildings/MainBuilding.cs | 8 +- Assets/CivMars/Buildings/Miner.cs | 7 +- Assets/CivMars/Buildings/PlanedBuilding.cs | 2 +- Assets/CivMars/Buildings/Press.cs | 5 +- Assets/CivMars/Buildings/Tiled.cs | 29 +- Assets/{ => CivMars}/CivMarsInit.cs | 115 +-- Assets/{ => CivMars}/CivMarsInit.cs.meta | 0 Assets/CivMars/ClassDiagram1.cd | 396 +++++++++ Assets/CivMars/ClassDiagram1.cd.meta | 8 + .../Items/BasicMaterials/CopperIngot.cs | 4 +- .../CivMars/Items/BasicMaterials/GoldIngot.cs | 4 +- .../CivMars/Items/BasicMaterials/IronIngot.cs | 1 + Assets/CivMars/Items/BasicMaterials/Resin.cs | 4 +- .../Items/BasicMaterials/SiliconRod.cs | 5 +- .../Items/BasicMaterials/SiliconRod.cs.meta} | 4 +- Assets/CivMars/Items/Chips/ControllChip.cs | 4 +- .../Items/Chips/RadioTransmitterChip.cs | 33 + .../Items/Chips/RadioTransmitterChip.cs.meta} | 4 +- .../CivMars/Items/Circuits/ControlCircuit.cs | 4 +- Assets/CivMars/Items/Circuits/RadioCircuit.cs | 33 + .../Items/Circuits/RadioCircuit.cs.meta} | 4 +- Assets/CivMars/Items/ElctricalParts.meta | 9 + .../Items/ElctricalParts/Transistor.cs | 33 + .../Items/ElctricalParts/Transistor.cs.meta} | 4 +- Assets/CivMars/Items/GlassPLane.cs | 41 +- Assets/CivMars/Items/InteriorPlate.cs | 1 + Assets/CivMars/Items/IronPipe.cs | 1 + Assets/CivMars/Items/Item.cs | 1 + Assets/CivMars/Items/Ore/CopperOre.cs | 2 + Assets/CivMars/Items/Ore/GoldOre.cs | 4 +- Assets/CivMars/Items/OxygenTank.cs | 1 + Assets/CivMars/Items/Piston.cs | 1 + Assets/CivMars/Items/Plates/IronPlate.cs | 1 + Assets/CivMars/Items/Plates/PlasticPlate.cs | 6 +- Assets/CivMars/Items/Roof.cs | 1 + Assets/CivMars/Items/Sapling.cs | 1 + Assets/CivMars/Items/StoneBrick.cs | 3 +- Assets/CivMars/Items/Wood.cs | 1 + Assets/{ => CivMars}/NeedToBeImplemented.meta | 0 .../{ => CivMars}/NeedToBeImplemented/Food.cs | 20 +- .../NeedToBeImplemented/Food.cs.meta | 0 .../NeedToBeImplemented/Module.cs | 14 +- .../NeedToBeImplemented/Module.cs.meta | 0 .../NeedToBeImplemented/Old.meta | 0 .../NeedToBeImplemented/Old/Assembler.cs | 32 +- .../NeedToBeImplemented/Old/Assembler.cs.meta | 0 .../NeedToBeImplemented/Old/Furnace.cs | 32 +- .../NeedToBeImplemented/Old/Furnace.cs.meta | 0 .../NeedToBeImplemented/Old/Generato.cs | 55 +- .../NeedToBeImplemented/Old/Generato.cs.meta | 0 .../NeedToBeImplemented/Old/Miner.meta | 0 .../NeedToBeImplemented/Old/Miner/SpecMine.cs | 18 +- .../Old/Miner/SpecMine.cs.meta | 0 .../NeedToBeImplemented/Old/NuclearReactor.cs | 24 +- .../Old/NuclearReactor.cs.meta | 0 .../NeedToBeImplemented/Old/Oxigeneration.cs | 30 +- .../Old/Oxigeneration.cs.meta | 0 .../NeedToBeImplemented/Old/Producer.cs | 30 +- .../NeedToBeImplemented/Old/Producer.cs.meta | 0 .../Old/ResearchFacility.cs | 34 +- .../Old/ResearchFacility.cs.meta | 0 .../NeedToBeImplemented/Old/UniverzalMiner.cs | 30 +- .../Old/UniverzalMiner.cs.meta | 0 .../NeedToBeImplemented/Old/UraniumRefiner.cs | 34 +- .../Old/UraniumRefiner.cs.meta | 0 .../NeedToBeImplemented/OxigenRecoverer.cs | 22 +- .../OxigenRecoverer.cs.meta | 0 .../NeedToBeImplemented/RefrinedUranium.cs | 26 +- .../RefrinedUranium.cs.meta | 0 .../NeedToBeImplemented/Resource.cs | 22 +- .../NeedToBeImplemented/Resource.cs.meta | 0 .../{ => CivMars}/NeedToBeImplemented/Tool.cs | 22 +- .../NeedToBeImplemented/Tool.cs.meta | 0 Assets/CivMars/Ores/CoalOreTile.cs | 1 + Assets/CivMars/Ores/IronOreTile.cs | 1 + Assets/CivMars/Ores/OreTile.cs | 1 + Assets/CivMars/Ores/SandTile.cs | 1 + Assets/CivMars/Ores/StoneOreTile.cs | 1 + Assets/CivMars/Ores/UraniumOreTile.cs | 1 + Assets/CivMarsEngine.meta | 9 + Assets/CivMarsEngine/Building.cs | 51 ++ .../Building.cs.meta | 0 Assets/CivMarsEngine/BuildingWGUI.cs | 55 ++ Assets/CivMarsEngine/BuildingWGUI.cs.meta | 12 + Assets/{ => CivMarsEngine}/Camera.meta | 0 .../{ => CivMarsEngine}/Camera/CameraChase.cs | 398 ++++----- .../Camera/CameraChase.cs.meta | 0 Assets/CivMarsEngine/ClassDiagram1.cd | 298 +++++++ Assets/CivMarsEngine/ClassDiagram1.cd.meta | 8 + Assets/{ => CivMarsEngine}/Crafting.meta | 4 +- Assets/CivMarsEngine/Crafting/Recipe.cs | 24 + .../Crafting/Recipe.cs.meta | 0 Assets/{ => CivMarsEngine}/GUI.meta | 4 +- .../{ => CivMarsEngine}/GUI/Access Panel.meta | 0 .../GUI/Access Panel/AccesPanel.cs | 69 ++ .../GUI/Access Panel/AccesPanel.cs.meta | 0 .../GUI/Access Panel/GasDesplay.meta | 0 .../GUI/Access Panel/GasDesplay/GasDesplay.cs | 292 ++++++ .../GasDesplay/GasDesplay.cs.meta | 0 .../GasDesplay/GasDesplayElement.cs | 156 ++++ .../GasDesplay/GasDesplayElement.cs.meta | 0 .../GUI/Access Panel/InventoryDesplay.meta | 0 .../InventoryDesplay/InventoryDesplay.cs | 284 ++++++ .../InventoryDesplay/InventoryDesplay.cs.meta | 0 .../InventoryDrawedElement.cs | 99 +++ .../InventoryDrawedElement.cs.meta | 0 .../GUI/Access Panel/PlayerStatsDesplay.cs | 35 + .../Access Panel/PlayerStatsDesplay.cs.meta | 0 .../{ => CivMarsEngine}/GUI/Buildables.meta | 0 .../GUI/Buildables/BuildingLister.cs | 174 ++++ .../GUI/Buildables/BuildingLister.cs.meta | 0 .../GUI/Crafting Desplay.meta | 0 .../GUI/Crafting Desplay/CraftingDesplay.cs | 189 ++++ .../Crafting Desplay/CraftingDesplay.cs.meta | 0 .../GUI/Crafting Desplay/CraftingProcess.cs | 63 ++ .../Crafting Desplay/CraftingProcess.cs.meta | 0 .../GUI/Crafting Desplay/QueueItem.cs | 42 + .../GUI/Crafting Desplay/QueueItem.cs.meta | 24 +- .../GUI/Crafting Desplay/RecipeButton.cs | 41 + .../GUI/Crafting Desplay/RecipeButton.cs.meta | 0 Assets/{ => CivMarsEngine}/GUI/GUIHandler.cs | 59 +- .../GUI/GUIHandler.cs.meta | 0 Assets/{ => CivMarsEngine}/GUI/Inventory.meta | 0 .../GUI/Inventory/PlayerInventory.cs | 121 +++ .../GUI/Inventory/PlayerInventory.cs.meta | 24 +- .../Inventory/PlayerInventoryDrawedElement.cs | 77 ++ .../PlayerInventoryDrawedElement.cs.meta | 24 +- .../{ => CivMarsEngine}/GUI/MapListing.meta | 0 Assets/CivMarsEngine/GUI/MapListing/NewMap.cs | 34 + .../GUI/MapListing/NewMap.cs.meta | 0 .../GUI/MapListing/SavedMapLister.cs | 79 ++ .../GUI/MapListing/SavedMapLister.cs.meta | 0 Assets/{ => CivMarsEngine}/GUI/PauseTab.cs | 117 +-- .../{ => CivMarsEngine}/GUI/PauseTab.cs.meta | 0 .../{ => CivMarsEngine}/GUI/PlayerStats.meta | 0 .../PlayerStats/PlayerStatsSidebarDesplay.cs | 42 + .../PlayerStatsSidebarDesplay.cs.meta | 0 .../{ => CivMarsEngine}/GUI/UITextures.meta | 18 +- .../GUI/UITextures/Animation.meta | 0 .../GUI/UITextures/Fonts.meta | 18 +- .../GUI/UITextures/Fonts/Consolas.meta | 18 +- .../GUI/UITextures/Fonts/Consolas/CONSOLA.TTF | Bin .../Fonts/Consolas/CONSOLA.TTF.meta | 38 +- .../UITextures/Fonts/Consolas/CONSOLAB.TTF | Bin .../Fonts/Consolas/CONSOLAB.TTF.meta | 38 +- .../UITextures/Fonts/Consolas/CONSOLAI.TTF | Bin .../Fonts/Consolas/CONSOLAI.TTF.meta | 38 +- .../UITextures/Fonts/Consolas/CONSOLAZ.TTF | Bin .../Fonts/Consolas/CONSOLAZ.TTF.meta | 38 +- .../GUI/UITextures/Fonts/Google.meta | 18 +- .../Fonts/Google/Aldrich-Regular.ttf | Bin .../Fonts/Google/Aldrich-Regular.ttf.meta | 38 +- .../Fonts/Google/Electrolize-Regular.ttf | Bin .../Fonts/Google/Electrolize-Regular.ttf.meta | 38 +- .../Fonts/Google/Orbitron-Regular.ttf | Bin .../Fonts/Google/Orbitron-Regular.ttf.meta | 38 +- .../Fonts/Google/Quantico-Regular.ttf | Bin .../Fonts/Google/Quantico-Regular.ttf.meta | 38 +- .../GUI/UITextures/Fonts/Michroma.ttf | Bin .../GUI/UITextures/Fonts/Michroma.ttf.meta | 0 .../GUI/UITextures/Fonts/Other.meta | 0 .../GUI/UITextures/Fonts/Other/Minecraft.ttf | Bin .../UITextures/Fonts/Other/Minecraft.ttf.meta | 0 .../Fonts/Other/Squares Bold Free.otf | Bin .../Fonts/Other/Squares Bold Free.otf.meta | 0 .../GUI/UITextures/Fonts/Other/monofonto.ttf | Bin .../UITextures/Fonts/Other/monofonto.ttf.meta | 0 .../GUI/UITextures/GUI.Header.png | Bin .../GUI/UITextures/GUI.Header.png.meta | 112 +-- .../GUI/UITextures/GUI.Inverted.png | Bin .../GUI/UITextures/GUI.Inverted.png.meta | 112 +-- .../GUI/UITextures/GUI.Inverted2.png | Bin .../GUI/UITextures/GUI.Inverted2.png.meta | 112 +-- .../GUI/UITextures/GUI.base.png | Bin .../GUI/UITextures/GUI.base.png.meta | 112 +-- .../GUI/UITextures/Noise.mat | Bin .../GUI/UITextures/Noise.mat.meta | 16 +- .../GUI/UITextures/NoiseEffectGrain.png | Bin .../GUI/UITextures/NoiseEffectGrain.png.meta | 112 +-- .../GUI/UITextures/Ring.full.png | Bin .../GUI/UITextures/Ring.full.png.meta | 0 .../GUI/UITextures/Ring.png | Bin .../GUI/UITextures/Ring.png.meta | 112 +-- .../GUI/UITextures/Ring2.png | Bin .../GUI/UITextures/Ring2.png.meta | 112 +-- .../GUI/UITextures/SideMenu.png | Bin .../GUI/UITextures/SideMenu.png.meta | 112 +-- .../GUI/UITextures/SideMenuv2.png | Bin .../GUI/UITextures/SideMenuv2.png.meta | 112 +-- .../GUI/UITextures/SideMenuv3.png | Bin .../GUI/UITextures/SideMenuv3.png.meta | 112 +-- ...video---noise-on-a-green-old-TV-screen.jpg | Bin ...---noise-on-a-green-old-TV-screen.jpg.meta | 112 +-- Assets/CivMarsEngine/GameController.cs | 221 +++++ .../GameController.cs.meta | 4 +- Assets/{ => CivMarsEngine}/GameState.cs | 24 +- Assets/{ => CivMarsEngine}/GameState.cs.meta | 4 +- Assets/{ => CivMarsEngine}/GasSystem.meta | 4 +- .../GasSystem/GasObiects.cd | 64 +- .../GasSystem/GasObiects.cd.meta | 0 .../GasSystem/GasSystem.dgml | 84 +- .../GasSystem/GasSystem.dgml.meta | 0 Assets/CivMarsEngine/GasSystem/GasTank.cs | 107 +++ .../GasSystem/GasTank.cs.meta | 0 .../CivMarsEngine/GasSystem/GasTankCluster.cs | 107 +++ .../GasSystem/GasTankCluster.cs.meta | 0 .../{ => CivMarsEngine}/GasSystem/GasType.cs | 23 +- .../GasSystem/GasType.cs.meta | 0 .../{ => CivMarsEngine}/GasSystem/IGasTank.cs | 19 +- .../GasSystem/IGasTank.cs.meta | 0 Assets/CivMarsEngine/InputHandler.cs | 41 + .../{ => CivMarsEngine}/InputHandler.cs.meta | 4 +- Assets/{ => CivMarsEngine}/Interfaces.meta | 4 +- Assets/CivMarsEngine/Interfaces/IBuildable.cs | 24 + .../Interfaces/IBuildable.cs.meta | 0 Assets/CivMarsEngine/Interfaces/ICrafter.cs | 19 + .../Interfaces}/ICrafter.cs.meta | 0 Assets/CivMarsEngine/Interfaces/IHasGui.cs | 20 + .../Interfaces/IHasGui.cs.meta | 0 .../Interfaces/IRegystratabe.cs} | 24 +- .../Interfaces/IRegystratabe.cs.meta | 0 Assets/CivMarsEngine/Interfaces/ISaveble.cs | 17 + .../Interfaces/ISaveble.cs.meta | 0 Assets/CivMarsEngine/Interfaces/IWorldGen.cs | 8 + .../Interfaces/IWorldGen.cs.meta | 24 +- Assets/CivMarsEngine/InventorySystem.meta | 9 + .../InventorySystem/IInventory.cs | 77 ++ .../InventorySystem}/IInventory.cs.meta | 0 .../InventorySystem/Inventory.cs | 215 +++++ .../InventorySystem}/Inventory.cs.meta | 4 +- Assets/{ => CivMarsEngine}/Language.cs | 0 Assets/{ => CivMarsEngine}/Language.cs.meta | 4 +- Assets/{ => CivMarsEngine}/Map.cs | 267 +++--- Assets/{ => CivMarsEngine}/Map.cs.meta | 4 +- Assets/{ => CivMarsEngine}/MapLoad.cs | 234 ++--- Assets/{ => CivMarsEngine}/MapLoad.cs.meta | 4 +- Assets/{ => CivMarsEngine}/Player.meta | 4 +- Assets/CivMarsEngine/Player/Player.cs | 198 +++++ .../{ => CivMarsEngine}/Player/Player.cs.meta | 0 .../Player/PlayerMovment.cs | 114 +-- .../Player/PlayerMovment.cs.meta | 0 Assets/CivMarsEngine/Player/SpaceSuit.cs | 19 + .../Player/SpaceSuit.cs.meta | 0 Assets/ClassDiagram1.cd | 831 ++++++++++++++++++ Assets/ClassDiagram1.cd.meta | 8 + Assets/Crafting/ICrafter.cs | 18 - Assets/Crafting/Recipe.cs | 22 - Assets/GUI/Access Panel/AccesPanel.cs | 67 -- .../GUI/Access Panel/GasDesplay/GasDesplay.cs | 289 ------ .../GasDesplay/GasDesplayElement.cs | 150 ---- .../InventoryDesplay/InventoryDesplay.cs | 281 ------ .../InventoryDrawedElement.cs | 95 -- Assets/GUI/Access Panel/PlayerStatsDesplay.cs | 33 - Assets/GUI/ActionButton.cs | 93 -- Assets/GUI/Buildables/BuildableDrawElement.cs | 18 - Assets/GUI/Buildables/BuildingLister.cs | 174 ---- .../GUI/Crafting Desplay/CraftingDesplay.cs | 185 ---- .../GUI/Crafting Desplay/CraftingProcess.cs | 62 -- Assets/GUI/Crafting Desplay/QueueItem.cs | 39 - Assets/GUI/Crafting Desplay/RecipeButton.cs | 33 - Assets/GUI/Inventory/PlayerInventory.cs | 118 --- .../Inventory/PlayerInventoryDrawedElement.cs | 74 -- Assets/GUI/MapListing/NewMap.cs | 30 - Assets/GUI/MapListing/SavedMapLister.cs | 73 -- .../PlayerStats/PlayerStatsSidebarDesplay.cs | 38 - Assets/GameController.cs | 218 ----- Assets/GasSystem/GasTank.cs | 103 --- Assets/GasSystem/GasTankCluster.cs | 104 --- Assets/InputHandler.cs | 37 - Assets/Interfaces/IBuildable.cs | 22 - Assets/Interfaces/IHasGui.cs | 19 - Assets/Interfaces/IInventory.cs | 75 -- Assets/Interfaces/IRegystratabe.cs | 10 - Assets/Interfaces/ISaveble.cs | 15 - Assets/Interfaces/IWorldGen.cs | 6 - Assets/Inventory.cs | 212 ----- Assets/NeedToBeImplemented/Old/WareHouse.cs | 11 - Assets/Placing.cs | 30 - Assets/Placing.cs.meta | 12 - Assets/Player/Player.cs | 196 ----- Assets/Player/SpaceSuit.cs | 17 - Assets/Prefabs/_GameController.prefab | Bin 6812 -> 7148 bytes Assets/Scenes/Loading.unity | Bin 11788 -> 11764 bytes Assets/Scenes/Main.unity | Bin 211304 -> 211112 bytes Assets/Scenes/TestSceenTile.unity | Bin 14052 -> 15000 bytes 293 files changed, 6755 insertions(+), 5074 deletions(-) delete mode 100644 Assets/CivMars/Buildings/Building.cs rename Assets/{ => CivMars}/CivMarsInit.cs (96%) rename Assets/{ => CivMars}/CivMarsInit.cs.meta (100%) create mode 100644 Assets/CivMars/ClassDiagram1.cd create mode 100644 Assets/CivMars/ClassDiagram1.cd.meta rename Assets/{GUI/GuiType.cs.meta => CivMars/Items/BasicMaterials/SiliconRod.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/Chips/RadioTransmitterChip.cs rename Assets/{GUI/ActionButton.cs.meta => CivMars/Items/Chips/RadioTransmitterChip.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/Circuits/RadioCircuit.cs rename Assets/{NeedToBeImplemented/Old/WareHouse.cs.meta => CivMars/Items/Circuits/RadioCircuit.cs.meta} (76%) create mode 100644 Assets/CivMars/Items/ElctricalParts.meta create mode 100644 Assets/CivMars/Items/ElctricalParts/Transistor.cs rename Assets/{GUI/Buildables/BuildableDrawElement.cs.meta => CivMars/Items/ElctricalParts/Transistor.cs.meta} (76%) rename Assets/{ => CivMars}/NeedToBeImplemented.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Food.cs (92%) rename Assets/{ => CivMars}/NeedToBeImplemented/Food.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Module.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Module.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Assembler.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Assembler.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Furnace.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Furnace.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Generato.cs (93%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Generato.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Miner.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Miner/SpecMine.cs (92%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Miner/SpecMine.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/NuclearReactor.cs (93%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/NuclearReactor.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Oxigeneration.cs (93%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Oxigeneration.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Producer.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/Producer.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/ResearchFacility.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/ResearchFacility.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/UniverzalMiner.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/UniverzalMiner.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/UraniumRefiner.cs (94%) rename Assets/{ => CivMars}/NeedToBeImplemented/Old/UraniumRefiner.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/OxigenRecoverer.cs (92%) rename Assets/{ => CivMars}/NeedToBeImplemented/OxigenRecoverer.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/RefrinedUranium.cs (93%) rename Assets/{ => CivMars}/NeedToBeImplemented/RefrinedUranium.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Resource.cs (92%) rename Assets/{ => CivMars}/NeedToBeImplemented/Resource.cs.meta (100%) rename Assets/{ => CivMars}/NeedToBeImplemented/Tool.cs (92%) rename Assets/{ => CivMars}/NeedToBeImplemented/Tool.cs.meta (100%) create mode 100644 Assets/CivMarsEngine.meta create mode 100644 Assets/CivMarsEngine/Building.cs rename Assets/{CivMars/Buildings => CivMarsEngine}/Building.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/BuildingWGUI.cs create mode 100644 Assets/CivMarsEngine/BuildingWGUI.cs.meta rename Assets/{ => CivMarsEngine}/Camera.meta (100%) rename Assets/{ => CivMarsEngine}/Camera/CameraChase.cs (61%) rename Assets/{ => CivMarsEngine}/Camera/CameraChase.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/ClassDiagram1.cd create mode 100644 Assets/CivMarsEngine/ClassDiagram1.cd.meta rename Assets/{ => CivMarsEngine}/Crafting.meta (67%) create mode 100644 Assets/CivMarsEngine/Crafting/Recipe.cs rename Assets/{ => CivMarsEngine}/Crafting/Recipe.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI.meta (67%) rename Assets/{ => CivMarsEngine}/GUI/Access Panel.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/AccesPanel.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/Access Panel/GasDesplay.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/GasDesplay/GasDesplay.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/GasDesplay/GasDesplayElement.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/Access Panel/InventoryDesplay.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs rename Assets/{ => CivMarsEngine}/GUI/Access Panel/PlayerStatsDesplay.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/Buildables.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs rename Assets/{ => CivMarsEngine}/GUI/Buildables/BuildingLister.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/Crafting Desplay.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs rename Assets/{ => CivMarsEngine}/GUI/Crafting Desplay/CraftingDesplay.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs rename Assets/{ => CivMarsEngine}/GUI/Crafting Desplay/CraftingProcess.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs rename Assets/{ => CivMarsEngine}/GUI/Crafting Desplay/QueueItem.cs.meta (95%) create mode 100644 Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs rename Assets/{ => CivMarsEngine}/GUI/Crafting Desplay/RecipeButton.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/GUIHandler.cs (82%) rename Assets/{ => CivMarsEngine}/GUI/GUIHandler.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/Inventory.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs rename Assets/{ => CivMarsEngine}/GUI/Inventory/PlayerInventory.cs.meta (95%) create mode 100644 Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs rename Assets/{ => CivMarsEngine}/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/MapListing.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/MapListing/NewMap.cs rename Assets/{ => CivMarsEngine}/GUI/MapListing/NewMap.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs rename Assets/{ => CivMarsEngine}/GUI/MapListing/SavedMapLister.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/PauseTab.cs (94%) rename Assets/{ => CivMarsEngine}/GUI/PauseTab.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/PlayerStats.meta (100%) create mode 100644 Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs rename Assets/{ => CivMarsEngine}/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Animation.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Michroma.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Michroma.ttf.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/Minecraft.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/Squares Bold Free.otf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/monofonto.ttf (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Fonts/Other/monofonto.ttf.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Header.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Header.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Inverted.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Inverted.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Inverted2.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.Inverted2.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.base.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/GUI.base.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Noise.mat (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Noise.mat.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/NoiseEffectGrain.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/NoiseEffectGrain.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring.full.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring.full.png.meta (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring2.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/Ring2.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenu.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenu.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenuv2.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenuv2.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenuv3.png (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/SideMenuv3.png.meta (95%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg (100%) rename Assets/{ => CivMarsEngine}/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta (95%) create mode 100644 Assets/CivMarsEngine/GameController.cs rename Assets/{ => CivMarsEngine}/GameController.cs.meta (76%) rename Assets/{ => CivMarsEngine}/GameState.cs (92%) rename Assets/{ => CivMarsEngine}/GameState.cs.meta (76%) rename Assets/{ => CivMarsEngine}/GasSystem.meta (67%) rename Assets/{ => CivMarsEngine}/GasSystem/GasObiects.cd (97%) rename Assets/{ => CivMarsEngine}/GasSystem/GasObiects.cd.meta (100%) rename Assets/{ => CivMarsEngine}/GasSystem/GasSystem.dgml (99%) rename Assets/{ => CivMarsEngine}/GasSystem/GasSystem.dgml.meta (100%) create mode 100644 Assets/CivMarsEngine/GasSystem/GasTank.cs rename Assets/{ => CivMarsEngine}/GasSystem/GasTank.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/GasSystem/GasTankCluster.cs rename Assets/{ => CivMarsEngine}/GasSystem/GasTankCluster.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GasSystem/GasType.cs (52%) rename Assets/{ => CivMarsEngine}/GasSystem/GasType.cs.meta (100%) rename Assets/{ => CivMarsEngine}/GasSystem/IGasTank.cs (50%) rename Assets/{ => CivMarsEngine}/GasSystem/IGasTank.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/InputHandler.cs rename Assets/{ => CivMarsEngine}/InputHandler.cs.meta (76%) rename Assets/{ => CivMarsEngine}/Interfaces.meta (67%) create mode 100644 Assets/CivMarsEngine/Interfaces/IBuildable.cs rename Assets/{ => CivMarsEngine}/Interfaces/IBuildable.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/Interfaces/ICrafter.cs rename Assets/{Crafting => CivMarsEngine/Interfaces}/ICrafter.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/Interfaces/IHasGui.cs rename Assets/{ => CivMarsEngine}/Interfaces/IHasGui.cs.meta (100%) rename Assets/{GUI/GuiType.cs => CivMarsEngine/Interfaces/IRegystratabe.cs} (54%) rename Assets/{ => CivMarsEngine}/Interfaces/IRegystratabe.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/Interfaces/ISaveble.cs rename Assets/{ => CivMarsEngine}/Interfaces/ISaveble.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/Interfaces/IWorldGen.cs rename Assets/{ => CivMarsEngine}/Interfaces/IWorldGen.cs.meta (95%) create mode 100644 Assets/CivMarsEngine/InventorySystem.meta create mode 100644 Assets/CivMarsEngine/InventorySystem/IInventory.cs rename Assets/{Interfaces => CivMarsEngine/InventorySystem}/IInventory.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/InventorySystem/Inventory.cs rename Assets/{ => CivMarsEngine/InventorySystem}/Inventory.cs.meta (76%) rename Assets/{ => CivMarsEngine}/Language.cs (100%) rename Assets/{ => CivMarsEngine}/Language.cs.meta (76%) rename Assets/{ => CivMarsEngine}/Map.cs (95%) rename Assets/{ => CivMarsEngine}/Map.cs.meta (76%) rename Assets/{ => CivMarsEngine}/MapLoad.cs (95%) rename Assets/{ => CivMarsEngine}/MapLoad.cs.meta (76%) rename Assets/{ => CivMarsEngine}/Player.meta (67%) create mode 100644 Assets/CivMarsEngine/Player/Player.cs rename Assets/{ => CivMarsEngine}/Player/Player.cs.meta (100%) rename Assets/{ => CivMarsEngine}/Player/PlayerMovment.cs (96%) rename Assets/{ => CivMarsEngine}/Player/PlayerMovment.cs.meta (100%) create mode 100644 Assets/CivMarsEngine/Player/SpaceSuit.cs rename Assets/{ => CivMarsEngine}/Player/SpaceSuit.cs.meta (100%) create mode 100644 Assets/ClassDiagram1.cd create mode 100644 Assets/ClassDiagram1.cd.meta delete mode 100644 Assets/Crafting/ICrafter.cs delete mode 100644 Assets/Crafting/Recipe.cs delete mode 100644 Assets/GUI/Access Panel/AccesPanel.cs delete mode 100644 Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs delete mode 100644 Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs delete mode 100644 Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs delete mode 100644 Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs delete mode 100644 Assets/GUI/Access Panel/PlayerStatsDesplay.cs delete mode 100644 Assets/GUI/ActionButton.cs delete mode 100644 Assets/GUI/Buildables/BuildableDrawElement.cs delete mode 100644 Assets/GUI/Buildables/BuildingLister.cs delete mode 100644 Assets/GUI/Crafting Desplay/CraftingDesplay.cs delete mode 100644 Assets/GUI/Crafting Desplay/CraftingProcess.cs delete mode 100644 Assets/GUI/Crafting Desplay/QueueItem.cs delete mode 100644 Assets/GUI/Crafting Desplay/RecipeButton.cs delete mode 100644 Assets/GUI/Inventory/PlayerInventory.cs delete mode 100644 Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs delete mode 100644 Assets/GUI/MapListing/NewMap.cs delete mode 100644 Assets/GUI/MapListing/SavedMapLister.cs delete mode 100644 Assets/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs delete mode 100644 Assets/GameController.cs delete mode 100644 Assets/GasSystem/GasTank.cs delete mode 100644 Assets/GasSystem/GasTankCluster.cs delete mode 100644 Assets/InputHandler.cs delete mode 100644 Assets/Interfaces/IBuildable.cs delete mode 100644 Assets/Interfaces/IHasGui.cs delete mode 100644 Assets/Interfaces/IInventory.cs delete mode 100644 Assets/Interfaces/IRegystratabe.cs delete mode 100644 Assets/Interfaces/ISaveble.cs delete mode 100644 Assets/Interfaces/IWorldGen.cs delete mode 100644 Assets/Inventory.cs delete mode 100644 Assets/NeedToBeImplemented/Old/WareHouse.cs delete mode 100644 Assets/Placing.cs delete mode 100644 Assets/Placing.cs.meta delete mode 100644 Assets/Player/Player.cs delete mode 100644 Assets/Player/SpaceSuit.cs diff --git a/Assets/AssetsLoading/GameRegystry.cs b/Assets/AssetsLoading/GameRegystry.cs index edbfb1f..1ea3d84 100644 --- a/Assets/AssetsLoading/GameRegystry.cs +++ b/Assets/AssetsLoading/GameRegystry.cs @@ -4,77 +4,78 @@ using System.Text; using UnityEngine; - -static class GameRegystry +namespace CivMarsEngine { - public static Dictionary all = new Dictionary(); + static class GameRegystry + { + public static Dictionary all = new Dictionary(); - public static Dictionary buildings = new Dictionary(); + public static Dictionary buildings = new Dictionary(); - public static void RegisterBuildableBuilding(string ID, Building b) - { - if (b is Building) + public static void RegisterBuildableBuilding(string ID, Building b) { - buildings.Add(ID, b); - Debug.Log(ID); + if (b is Building) + { + buildings.Add(ID, b); + Debug.Log(ID); + } } - } - - public static Dictionary ores = new Dictionary(); - //public static List ores = new List(); - - public static void RegisterWorldGen(string ID,IWorldGen b) - { - ores.Add(ID,b); - Debug.Log(b.ToString()); - } - public static Dictionary> recepies = new Dictionary>(); + public static Dictionary ores = new Dictionary(); + //public static List ores = new List(); - public static void RegisterRecepie(string ID, Recipe b) - { - if (recepies.ContainsKey(ID)) - { - recepies[ID].Add(b); - } - else + public static void RegisterWorldGen(string ID, IWorldGen b) { - recepies.Add(ID, new List()); - recepies[ID].Add(b); + ores.Add(ID, b); + Debug.Log(b.ToString()); } - Debug.Log(ID); - } - public static Dictionary items = new Dictionary(); + public static Dictionary> recepies = new Dictionary>(); - public static void RegisterItem(string ID, Item b) - { - if (recepies.ContainsKey(ID)) - { - throw new System.NotImplementedException(); - } - else + public static void RegisterRecepie(string ID, Recipe b) { - if (b is IRegystratabe) - ((IRegystratabe)b).Regystrate(); - items.Add(ID, b); + if (recepies.ContainsKey(ID)) + { + recepies[ID].Add(b); + } + else + { + recepies.Add(ID, new List()); + recepies[ID].Add(b); + } Debug.Log(ID); } - } - public static Sprite GetSprite(string path,string name) - { - UnityEngine.Object[] a = Resources.LoadAll(path); - foreach (UnityEngine.Object item in a) - { + public static Dictionary items = new Dictionary(); - if (item is Sprite && item.name == name) + public static void RegisterItem(string ID, Item b) + { + if (recepies.ContainsKey(ID)) { - return item as Sprite; + throw new System.NotImplementedException(); + } + else + { + if (b is IRegystratabe) + ((IRegystratabe)b).Regystrate(); + items.Add(ID, b); + Debug.Log(ID); } } - return null; - } -} + public static Sprite GetSprite(string path, string name) + { + UnityEngine.Object[] a = Resources.LoadAll(path); + foreach (UnityEngine.Object item in a) + { + if (item is Sprite && item.name == name) + { + return item as Sprite; + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs index 6c5717c..82d4004 100644 --- a/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs @@ -1,17 +1,21 @@ using UnityEngine; using System.Collections; -public class Surface : Tiled { +namespace CivMarsEngine +{ + public class Surface : Tiled + { - /* - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - + /* + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + */ } - */ } diff --git a/Assets/BasicUtility/TileMap/Tile/Tile.cs b/Assets/BasicUtility/TileMap/Tile/Tile.cs index db91261..afc404f 100644 --- a/Assets/BasicUtility/TileMap/Tile/Tile.cs +++ b/Assets/BasicUtility/TileMap/Tile/Tile.cs @@ -12,4 +12,4 @@ public Tile(int xpos, int ypos) } -} +} \ No newline at end of file diff --git a/Assets/BasicUtility/TileMap/TileTransform.cs b/Assets/BasicUtility/TileMap/TileTransform.cs index 0ce7163..2550153 100644 --- a/Assets/BasicUtility/TileMap/TileTransform.cs +++ b/Assets/BasicUtility/TileMap/TileTransform.cs @@ -31,4 +31,4 @@ public void SetTileMap(TileMap t) } -} +} \ No newline at end of file diff --git a/Assets/CivMars/Buildings/Building.cs b/Assets/CivMars/Buildings/Building.cs deleted file mode 100644 index 414afb8..0000000 --- a/Assets/CivMars/Buildings/Building.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.EventSystems; - -[AddComponentMenu("Buildings/Building")] -public class Building : Tiled, IHasGui, IPointerClickHandler, ISaveble -{ - public string ID; - - public List buildingMaterials; - - public GameObject Graphicks; - public bool guion; - - public override void Awake() - { - base.Awake(); - } - - public void PositionUpdate() - { - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } - - #region IhasGui - public void TogelGui() - { - if (!guion) - { - if (GameCon.AlloweGUI(this as IHasGui)) - { - Open(); - } - } - else - { - GameCon.CloseGUI(this as IHasGui); - Close(); - } - } - - public virtual void Open() - { - guion = true; - Graphicks.SetActive(true); - } - - public virtual void Close() - { - guion = false; - Graphicks.SetActive(false); - } - - public int ClosingLevel() - { - return 1; - } - - public void OnPointerClick(PointerEventData eventData) - { - if (!eventData.rawPointerPress.transform.IsChildOf(Graphicks.transform)) - TogelGui(); - } - #endregion - - #region ISaveble - - public virtual SavedTile Save() - { - SavedTile s = new SavedTile(ID); - return s; - } - - public void Load(SavedTile data) - { - throw new NotImplementedException(); - } - - public GameObject GetPrefab() - { - throw new NotImplementedException(); - } - #endregion -} \ No newline at end of file diff --git a/Assets/CivMars/Buildings/Chest.cs b/Assets/CivMars/Buildings/Chest.cs index 2737212..83bc99b 100644 --- a/Assets/CivMars/Buildings/Chest.cs +++ b/Assets/CivMars/Buildings/Chest.cs @@ -3,11 +3,12 @@ using UnityEngine.UI; using System; using System.Collections.Generic; +using CivMarsEngine; namespace CivMars { [AddComponentMenu("Buildings/Chest")] - public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble + public class Chest : BuildingWGUI, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble { new public static string ID = CivMarsInit.BlockSpace + ".Chest"; @@ -18,7 +19,7 @@ public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, I public Sprite Icon; - static Item[] buildingMaterials = { new SandOre(2) }; + static new Item[] buildingMaterials = { new SandOre(2) }; bool invOn; @@ -57,7 +58,7 @@ public Sprite GetImage() return Icon; } - public GameObject GetPrefab() + public override GameObject GetPrefab() { return gameObject; } diff --git a/Assets/CivMars/Buildings/Furnace.cs b/Assets/CivMars/Buildings/Furnace.cs index a016170..fa82917 100644 --- a/Assets/CivMars/Buildings/Furnace.cs +++ b/Assets/CivMars/Buildings/Furnace.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System; using UnityEngine.UI; +using CivMarsEngine; namespace CivMars { - public class Furnace : Building, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter + public class Furnace : BuildingWGUI, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter { enum States @@ -18,7 +19,7 @@ enum States public List craftingQueue = new List(); - public string ID = "CivMars.Furnace"; + public new string ID = "CivMars.Furnace"; static Item[] neededMaterials = { new SandOre(1) }; public Sprite icon; @@ -168,7 +169,7 @@ public Sprite GetImage() return icon; } - public GameObject GetPrefab() + public override GameObject GetPrefab() { return gameObject; } diff --git a/Assets/CivMars/Buildings/GreenHouse.cs b/Assets/CivMars/Buildings/GreenHouse.cs index 4cfc01e..476583d 100644 --- a/Assets/CivMars/Buildings/GreenHouse.cs +++ b/Assets/CivMars/Buildings/GreenHouse.cs @@ -2,15 +2,16 @@ using System.Collections; using System; using UnityEngine.UI; +using CivMarsEngine; namespace CivMars { - public class GreenHouse : Building, IInventory, IHasGui, IBuildable, IRegystratabe + public class GreenHouse : BuildingWGUI, IInventory, IHasGui, IBuildable, IRegystratabe { Inventory storage = new Inventory(5); public Sprite icon; Item[] x = { new IronPlate(1), new GlassPlane(1), new Sapling(1) }; - string ID = "CivMars.GreenHouse"; + new string ID = "CivMars.GreenHouse"; float timeleft = 6000; bool onoff = false; @@ -119,7 +120,7 @@ public Sprite GetImage() return icon; } - public GameObject GetPrefab() + public override GameObject GetPrefab() { return this.gameObject; } diff --git a/Assets/CivMars/Buildings/MainBuilding.cs b/Assets/CivMars/Buildings/MainBuilding.cs index 60e8cd5..be26f44 100644 --- a/Assets/CivMars/Buildings/MainBuilding.cs +++ b/Assets/CivMars/Buildings/MainBuilding.cs @@ -1,13 +1,13 @@ using System; using UnityEngine.UI; using UnityEngine; - +using CivMarsEngine; namespace CivMars { [AddComponentMenu("Buildings/Main Building")] [System.Serializable] - public class MainBuilding : Building, IInventory, IGasTank, IRegystratabe, ISaveble + public class MainBuilding : BuildingWGUI, IInventory, IGasTank, IRegystratabe, ISaveble { enum States { @@ -16,7 +16,7 @@ enum States Gas } - public static string ID = "CivMars.MainBuilding"; + new public static string ID = "CivMars.MainBuilding"; public Text Name; public Text InventoryButtonText; @@ -166,7 +166,7 @@ public void Regystrate() } #endregion - public GameObject GetPrefab() + public override GameObject GetPrefab() { return gameObject; } diff --git a/Assets/CivMars/Buildings/Miner.cs b/Assets/CivMars/Buildings/Miner.cs index 2c51d69..d2ebd2d 100644 --- a/Assets/CivMars/Buildings/Miner.cs +++ b/Assets/CivMars/Buildings/Miner.cs @@ -1,12 +1,13 @@ using System; +using CivMarsEngine; using UnityEngine; using UnityEngine.UI; namespace CivMars { - public class Miner : Building, IInventory, IHasGui, IRegystratabe, IBuildable + public class Miner : BuildingWGUI, IInventory, IHasGui, IRegystratabe, IBuildable { - public string ID = "CivMars.Miner"; + new public string ID = "CivMars.Miner"; static Item[] neededMaterials = { new SandOre(1) }; public Sprite icon; @@ -127,7 +128,7 @@ public Sprite GetImage() return icon; } - public GameObject GetPrefab() + public override GameObject GetPrefab() { return gameObject; } diff --git a/Assets/CivMars/Buildings/PlanedBuilding.cs b/Assets/CivMars/Buildings/PlanedBuilding.cs index 4b26b5d..a6b3686 100644 --- a/Assets/CivMars/Buildings/PlanedBuilding.cs +++ b/Assets/CivMars/Buildings/PlanedBuilding.cs @@ -6,7 +6,7 @@ namespace CivMarsEngine { - public class PlanedBuilding : Building, ISaveble, IRegystratabe + public class PlanedBuilding : BuildingWGUI, ISaveble, IRegystratabe { public new string ID = "CivMarsEngine.PlanedBuilding"; diff --git a/Assets/CivMars/Buildings/Press.cs b/Assets/CivMars/Buildings/Press.cs index b82928e..3dc5f99 100644 --- a/Assets/CivMars/Buildings/Press.cs +++ b/Assets/CivMars/Buildings/Press.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System; using UnityEngine.UI; +using CivMarsEngine; namespace CivMars { - public class Press : Building, IInventory, IHasGui, IRegystratabe, ICrafter, IBuildable + public class Press : BuildingWGUI, IInventory, IHasGui, IRegystratabe, ICrafter, IBuildable { enum States @@ -18,7 +19,7 @@ enum States public List craftingQueue = new List(); - static public string ID = "CivMars.Press"; + new static public string ID = "CivMars.Press"; static Item[] neededMaterials = { new SandOre(1) }; public Sprite icon; diff --git a/Assets/CivMars/Buildings/Tiled.cs b/Assets/CivMars/Buildings/Tiled.cs index 32254b0..eb8c72a 100644 --- a/Assets/CivMars/Buildings/Tiled.cs +++ b/Assets/CivMars/Buildings/Tiled.cs @@ -1,23 +1,28 @@ using UnityEngine; using System.Collections; -[RequireComponent(typeof(TileTransform))] -public class Tiled : MonoBehaviour +namespace CivMarsEngine { - new public TileTransform transform; + [RequireComponent(typeof(TileTransform))] + public class Tiled : MonoBehaviour + { - protected GameController GameCon; + new public TileTransform transform; - // Use this for initialization - public virtual void Awake () { - transform = GetComponent(); + protected GameController GameCon; - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - if (GameCon == null) + // Use this for initialization + public virtual void Awake() { - Debug.LogErrorFormat("Can't find the GameController", this); - } + transform = GetComponent(); + + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + if (GameCon == null) + { + Debug.LogErrorFormat("Can't find the GameController", this); + } + } } -} +} \ No newline at end of file diff --git a/Assets/CivMarsInit.cs b/Assets/CivMars/CivMarsInit.cs similarity index 96% rename from Assets/CivMarsInit.cs rename to Assets/CivMars/CivMarsInit.cs index a1d64d3..56b3d1a 100644 --- a/Assets/CivMarsInit.cs +++ b/Assets/CivMars/CivMarsInit.cs @@ -1,58 +1,59 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; - -namespace CivMars -{ - [Mod] - public static class CivMarsInit - { - public const string ModSpace = "CivMars"; - public const string BlockSpace = "CivMars.block"; - public const string ItemSpace = "CivMars.item"; - - [ModInit] - public static void Init() - { - GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); - GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); - GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); - GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); - //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); - //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); - //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); - //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); - //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); - //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); - - GameObject[] goBuild = Resources.LoadAll("Buildings"); - - foreach (GameObject item in goBuild) - { - IRegystratabe a = item.GetComponent(); - - if (a != null) - { - a.Regystrate(); - } - } - - GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); - - foreach (GameObject item in goTiles) - { - IRegystratabe a = item.GetComponent(); - - if (a != null) - { - a.Regystrate(); - } - } - } - - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; +using UnityEngine; + +namespace CivMars +{ + [Mod] + public static class CivMarsInit + { + public const string ModSpace = "CivMars"; + public const string BlockSpace = "CivMars.block"; + public const string ItemSpace = "CivMars.item"; + + [ModInit] + public static void Init() + { + GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); + GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); + GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); + GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); + //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); + //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); + //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); + //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); + //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); + //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); + + GameObject[] goBuild = Resources.LoadAll("Buildings"); + + foreach (GameObject item in goBuild) + { + IRegystratabe a = item.GetComponent(); + + if (a != null) + { + a.Regystrate(); + } + } + + GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); + + foreach (GameObject item in goTiles) + { + IRegystratabe a = item.GetComponent(); + + if (a != null) + { + a.Regystrate(); + } + } + } + + + } + } \ No newline at end of file diff --git a/Assets/CivMarsInit.cs.meta b/Assets/CivMars/CivMarsInit.cs.meta similarity index 100% rename from Assets/CivMarsInit.cs.meta rename to Assets/CivMars/CivMarsInit.cs.meta diff --git a/Assets/CivMars/ClassDiagram1.cd b/Assets/CivMars/ClassDiagram1.cd new file mode 100644 index 0000000..aacebb5 --- /dev/null +++ b/Assets/CivMars/ClassDiagram1.cd @@ -0,0 +1,396 @@ + + + + + + AAIAAKAoCBAAkCAAACAAhAQQghAAAQACBACAAAGASEA= + Assets\CivMars\Buildings\Chest.cs + + + + + + + AAYAYCAgCDAAkGAABCQAhAgShhEAAAAABQCAAACASEA= + Assets\CivMars\Buildings\Furnace.cs + + + + + + + AAYAACAgCCAAkCAAAAAAhAAQwhAAAAAABQDCAAAASAA= + Assets\CivMars\Buildings\GreenHouse.cs + + + + + + + AAIAEKAgABAAkCAAACAChAQAgAAAAQgCFAAAAACASEA= + Assets\CivMars\Buildings\MainBuilding.cs + + + + + + + AA4BoCAgCBAAkCAAACAghAAQghEABAAIRQCAAACASEA= + Assets\CivMars\Buildings\Miner.cs + + + + + + + AAYAYCAgCDAAkGAABCQAhAgShhEAAAAABQCAAACASEA= + Assets\CivMars\Buildings\Press.cs + + + + + + + AQAAACAAAAAAAAAAAAAAAAAgAAAAAAAAAAACAAAAAAA= + Assets\CivMars\CivMarsInit.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\CopperIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\GoldIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\IronIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\Resin.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\SiliconRod.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\ControllChip.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\RadioCircuit.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\RadioTransmitterChip.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Circuits\ControlCircuit.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\ElctricalParts\Transistor.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\GlassPLane.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\InteriorPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\IronPipe.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\CoalOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Ore\CopperOre.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Ore\GoldOre.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\IronOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\SandOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\StoneOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\UraniumOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\OxygenTank.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Piston.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Plates\IronPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Plates\PlasticPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Roof.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\StoneBrick.cs + + + + + + + AAAAAAAAQAAAAABAAAAAAQAAAAAAAAAAAAAAAAAAAAQ= + Assets\CivMars\NeedToBeImplemented\Old\Generato.cs + + + + + + AAAAAAAAAAAAAAAAAAIAAAAAAAAAAQAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Old\Oxigeneration.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\CoalOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\IronOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\SandTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\StoneOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\UraniumOreTile.cs + + + + + + EEQACAAAACAAhABAAgAAAAQAICACgEEAUEAEAACACEA= + Assets\CivMars\Buildings\PlanedBuilding.cs + + + + + + + ABAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAEA= + Assets\CivMars\Buildings\Tiled.cs + + + + + + AAJAAAAAAAAAAAAAAAAABAAAAAAEggAAAAAAAAAAAAA= + Assets\CivMars\Items\Item.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Sapling.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Wood.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Food.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Module.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\OxigenRecoverer.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\RefrinedUranium.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Resource.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Tool.cs + + + + + + AIIIgIAgEAAAgAAAAAAAIgAAAEAAgIAAAAAAAEAACAI= + Assets\CivMars\Ores\OreTile.cs + + + + + \ No newline at end of file diff --git a/Assets/CivMars/ClassDiagram1.cd.meta b/Assets/CivMars/ClassDiagram1.cd.meta new file mode 100644 index 0000000..aaceb53 --- /dev/null +++ b/Assets/CivMars/ClassDiagram1.cd.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ad004385df306a4681f1c8dd9dda01c +timeCreated: 1450798790 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs index 355ea0d..bb4530d 100644 --- a/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs +++ b/Assets/CivMars/Items/BasicMaterials/CopperIngot.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class CopperIngot : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs index bf4c426..0b1c91d 100644 --- a/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs +++ b/Assets/CivMars/Items/BasicMaterials/GoldIngot.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class GoldIngot : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/BasicMaterials/IronIngot.cs b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs index 13aefba..91c22d5 100644 --- a/Assets/CivMars/Items/BasicMaterials/IronIngot.cs +++ b/Assets/CivMars/Items/BasicMaterials/IronIngot.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars { diff --git a/Assets/CivMars/Items/BasicMaterials/Resin.cs b/Assets/CivMars/Items/BasicMaterials/Resin.cs index 53f84f8..6e8f9b0 100644 --- a/Assets/CivMars/Items/BasicMaterials/Resin.cs +++ b/Assets/CivMars/Items/BasicMaterials/Resin.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class Resin : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs index 76f947f..2fc56cd 100644 --- a/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs +++ b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/GUI/GuiType.cs.meta b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs.meta similarity index 76% rename from Assets/GUI/GuiType.cs.meta rename to Assets/CivMars/Items/BasicMaterials/SiliconRod.cs.meta index 3ad1e21..b69768e 100644 --- a/Assets/GUI/GuiType.cs.meta +++ b/Assets/CivMars/Items/BasicMaterials/SiliconRod.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: fedc9a76fb009c2458f2e42f356ab089 -timeCreated: 1445851654 +guid: 5b765257c0b446540ba3836c77ddb198 +timeCreated: 1450709420 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/Chips/ControllChip.cs b/Assets/CivMars/Items/Chips/ControllChip.cs index bb3ff1f..db87d68 100644 --- a/Assets/CivMars/Items/Chips/ControllChip.cs +++ b/Assets/CivMars/Items/Chips/ControllChip.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class ControllChip : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/Chips/RadioTransmitterChip.cs b/Assets/CivMars/Items/Chips/RadioTransmitterChip.cs new file mode 100644 index 0000000..1614b61 --- /dev/null +++ b/Assets/CivMars/Items/Chips/RadioTransmitterChip.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; + +namespace CivMars +{ + class RadioTransmitterChip : Item, IRegystratabe + { + public string name = "RadioTransmitterChip"; + + + public RadioTransmitterChip(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public RadioTransmitterChip() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new SiliconRod(1), new CopperIngot(1) }; + Recipe r = new Recipe("CivMars.Press", a, new RadioTransmitterChip(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} diff --git a/Assets/GUI/ActionButton.cs.meta b/Assets/CivMars/Items/Chips/RadioTransmitterChip.cs.meta similarity index 76% rename from Assets/GUI/ActionButton.cs.meta rename to Assets/CivMars/Items/Chips/RadioTransmitterChip.cs.meta index 8e7a3dd..4714afb 100644 --- a/Assets/GUI/ActionButton.cs.meta +++ b/Assets/CivMars/Items/Chips/RadioTransmitterChip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: a87c14b7ad1ee1543ba1ee792499bde2 -timeCreated: 1438066433 +guid: 137db532b31ab784281b01387bc2a8a1 +timeCreated: 1450709420 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/Circuits/ControlCircuit.cs b/Assets/CivMars/Items/Circuits/ControlCircuit.cs index c0067ca..0eafb73 100644 --- a/Assets/CivMars/Items/Circuits/ControlCircuit.cs +++ b/Assets/CivMars/Items/Circuits/ControlCircuit.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class ControlCircuit : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/Circuits/RadioCircuit.cs b/Assets/CivMars/Items/Circuits/RadioCircuit.cs new file mode 100644 index 0000000..d4caf90 --- /dev/null +++ b/Assets/CivMars/Items/Circuits/RadioCircuit.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; + +namespace CivMars +{ + class RadioCircuit : Item, IRegystratabe + { + public string name = "ControlCircuit"; + + + public RadioCircuit(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public RadioCircuit() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new RadioTransmitterChip(1), new Transistor(5) }; + Recipe r = new Recipe("CivMars.Press", a, new SiliconRod(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} diff --git a/Assets/NeedToBeImplemented/Old/WareHouse.cs.meta b/Assets/CivMars/Items/Circuits/RadioCircuit.cs.meta similarity index 76% rename from Assets/NeedToBeImplemented/Old/WareHouse.cs.meta rename to Assets/CivMars/Items/Circuits/RadioCircuit.cs.meta index b02c36e..0d57d82 100644 --- a/Assets/NeedToBeImplemented/Old/WareHouse.cs.meta +++ b/Assets/CivMars/Items/Circuits/RadioCircuit.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3e24e35b988c3cb47b45ac743d99c73f -timeCreated: 1441725317 +guid: d82928a0d51a17c45800fe4f47353226 +timeCreated: 1450709425 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/ElctricalParts.meta b/Assets/CivMars/Items/ElctricalParts.meta new file mode 100644 index 0000000..d7569d4 --- /dev/null +++ b/Assets/CivMars/Items/ElctricalParts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a12abc73117771b4daefa90e74527247 +folderAsset: yes +timeCreated: 1450709420 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Items/ElctricalParts/Transistor.cs b/Assets/CivMars/Items/ElctricalParts/Transistor.cs new file mode 100644 index 0000000..63141f3 --- /dev/null +++ b/Assets/CivMars/Items/ElctricalParts/Transistor.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; + +namespace CivMars +{ + class Transistor : Item, IRegystratabe + { + public string name = "Transistor"; + + + public Transistor(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public Transistor() + { + texture = GameRegystry.GetSprite("Texturas/Items/", "CivMars.ControlCircuit"); + maxStackSize = 30; + } + + public void Regystrate() + { + Item[] a = { new SiliconRod(2)}; + Recipe r = new Recipe("CivMars.Press", a, new Transistor(1), 100); + GameRegystry.RegisterRecepie(r.buildingID, r); + } + } +} diff --git a/Assets/GUI/Buildables/BuildableDrawElement.cs.meta b/Assets/CivMars/Items/ElctricalParts/Transistor.cs.meta similarity index 76% rename from Assets/GUI/Buildables/BuildableDrawElement.cs.meta rename to Assets/CivMars/Items/ElctricalParts/Transistor.cs.meta index 55dbf05..a522684 100644 --- a/Assets/GUI/Buildables/BuildableDrawElement.cs.meta +++ b/Assets/CivMars/Items/ElctricalParts/Transistor.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 78efe7ee73e8ddd4aaccc45fa6e195f0 -timeCreated: 1441725317 +guid: 851e5bc087d2897439ff7adb92f96ea5 +timeCreated: 1450709420 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/CivMars/Items/GlassPLane.cs b/Assets/CivMars/Items/GlassPLane.cs index ce3c7a2..988e884 100644 --- a/Assets/CivMars/Items/GlassPLane.cs +++ b/Assets/CivMars/Items/GlassPLane.cs @@ -2,35 +2,36 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars -{ -public class GlassPlane:Item, IRegystratabe { - public string name = "GlassPlane"; + public class GlassPlane : Item, IRegystratabe + { + new public string name = "GlassPlane"; - public GlassPlane(int am) : base(am, 30) - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.GlassPlane"); - maxStackSize = 30; - } + public GlassPlane(int am) : base(am, 30) + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.GlassPlane"); + maxStackSize = 30; + } - public GlassPlane() - { - texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.GlassPlane"); - maxStackSize = 30; - } + public GlassPlane() + { + texture = GameRegystry.GetSprite("Textures/Items/", "CivMars.GlassPlane"); + maxStackSize = 30; + } - public void Regystrate() - { + public void Regystrate() + { - Item[] a = { new SandOre(4) }; - Recipe r = new Recipe("CivMars.Furnace", a, new GlassPlane(1), 50); - GameRegystry.RegisterRecepie(r.buildingID, r); - } + Item[] a = { new SandOre(4) }; + Recipe r = new Recipe("CivMars.Furnace", a, new GlassPlane(1), 50); + GameRegystry.RegisterRecepie(r.buildingID, r); + } -} + } } \ No newline at end of file diff --git a/Assets/CivMars/Items/InteriorPlate.cs b/Assets/CivMars/Items/InteriorPlate.cs index 3fa1edb..a3d4b01 100644 --- a/Assets/CivMars/Items/InteriorPlate.cs +++ b/Assets/CivMars/Items/InteriorPlate.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars diff --git a/Assets/CivMars/Items/IronPipe.cs b/Assets/CivMars/Items/IronPipe.cs index 6ec376a..411f383 100644 --- a/Assets/CivMars/Items/IronPipe.cs +++ b/Assets/CivMars/Items/IronPipe.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars diff --git a/Assets/CivMars/Items/Item.cs b/Assets/CivMars/Items/Item.cs index e5aecc6..860e2e5 100644 --- a/Assets/CivMars/Items/Item.cs +++ b/Assets/CivMars/Items/Item.cs @@ -6,6 +6,7 @@ public class Item { + public string name; public int amount; public int maxStackSize; public Sprite texture; diff --git a/Assets/CivMars/Items/Ore/CopperOre.cs b/Assets/CivMars/Items/Ore/CopperOre.cs index 654f971..4bad7c2 100644 --- a/Assets/CivMars/Items/Ore/CopperOre.cs +++ b/Assets/CivMars/Items/Ore/CopperOre.cs @@ -1,4 +1,6 @@  +using CivMarsEngine; + namespace CivMars { class CopperOre : Item, IRegystratabe diff --git a/Assets/CivMars/Items/Ore/GoldOre.cs b/Assets/CivMars/Items/Ore/GoldOre.cs index dc1edb8..c8a9772 100644 --- a/Assets/CivMars/Items/Ore/GoldOre.cs +++ b/Assets/CivMars/Items/Ore/GoldOre.cs @@ -1,4 +1,6 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class GoldOre : Item, IRegystratabe { diff --git a/Assets/CivMars/Items/OxygenTank.cs b/Assets/CivMars/Items/OxygenTank.cs index 8fc0e24..6b7db26 100644 --- a/Assets/CivMars/Items/OxygenTank.cs +++ b/Assets/CivMars/Items/OxygenTank.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars { diff --git a/Assets/CivMars/Items/Piston.cs b/Assets/CivMars/Items/Piston.cs index 88d5b57..4bf7764 100644 --- a/Assets/CivMars/Items/Piston.cs +++ b/Assets/CivMars/Items/Piston.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars { diff --git a/Assets/CivMars/Items/Plates/IronPlate.cs b/Assets/CivMars/Items/Plates/IronPlate.cs index 7df5b94..6e7eca3 100644 --- a/Assets/CivMars/Items/Plates/IronPlate.cs +++ b/Assets/CivMars/Items/Plates/IronPlate.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; diff --git a/Assets/CivMars/Items/Plates/PlasticPlate.cs b/Assets/CivMars/Items/Plates/PlasticPlate.cs index 82bf973..5e30883 100644 --- a/Assets/CivMars/Items/Plates/PlasticPlate.cs +++ b/Assets/CivMars/Items/Plates/PlasticPlate.cs @@ -1,9 +1,11 @@ -namespace CivMars +using CivMarsEngine; + +namespace CivMars { class PlasticPlate : Item, IRegystratabe { - public string name = "ControlCircuit"; + new public string name = "ControlCircuit"; public PlasticPlate(int am) : base(am, 30) diff --git a/Assets/CivMars/Items/Roof.cs b/Assets/CivMars/Items/Roof.cs index b4ba694..6c966ae 100644 --- a/Assets/CivMars/Items/Roof.cs +++ b/Assets/CivMars/Items/Roof.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars diff --git a/Assets/CivMars/Items/Sapling.cs b/Assets/CivMars/Items/Sapling.cs index 2c6a76c..a91deb3 100644 --- a/Assets/CivMars/Items/Sapling.cs +++ b/Assets/CivMars/Items/Sapling.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; class Sapling : Item diff --git a/Assets/CivMars/Items/StoneBrick.cs b/Assets/CivMars/Items/StoneBrick.cs index cd20ed8..a4d8463 100644 --- a/Assets/CivMars/Items/StoneBrick.cs +++ b/Assets/CivMars/Items/StoneBrick.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; namespace CivMars { public class StoneBrick : Item, IRegystratabe { - public string name = "StoneBrick"; + new public string name = "StoneBrick"; public StoneBrick(int am) : base(am, 100) diff --git a/Assets/CivMars/Items/Wood.cs b/Assets/CivMars/Items/Wood.cs index f5492e5..3388366 100644 --- a/Assets/CivMars/Items/Wood.cs +++ b/Assets/CivMars/Items/Wood.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; using UnityEngine; class Wood : Item diff --git a/Assets/NeedToBeImplemented.meta b/Assets/CivMars/NeedToBeImplemented.meta similarity index 100% rename from Assets/NeedToBeImplemented.meta rename to Assets/CivMars/NeedToBeImplemented.meta diff --git a/Assets/NeedToBeImplemented/Food.cs b/Assets/CivMars/NeedToBeImplemented/Food.cs similarity index 92% rename from Assets/NeedToBeImplemented/Food.cs rename to Assets/CivMars/NeedToBeImplemented/Food.cs index 8f860de..39d2ec2 100644 --- a/Assets/NeedToBeImplemented/Food.cs +++ b/Assets/CivMars/NeedToBeImplemented/Food.cs @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - public class Food:Item - { - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + public class Food:Item + { + } + diff --git a/Assets/NeedToBeImplemented/Food.cs.meta b/Assets/CivMars/NeedToBeImplemented/Food.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Food.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Food.cs.meta diff --git a/Assets/NeedToBeImplemented/Module.cs b/Assets/CivMars/NeedToBeImplemented/Module.cs similarity index 94% rename from Assets/NeedToBeImplemented/Module.cs rename to Assets/CivMars/NeedToBeImplemented/Module.cs index a2e707f..8430735 100644 --- a/Assets/NeedToBeImplemented/Module.cs +++ b/Assets/CivMars/NeedToBeImplemented/Module.cs @@ -1,8 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public class Module -{ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +public class Module +{ } \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Module.cs.meta b/Assets/CivMars/NeedToBeImplemented/Module.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Module.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Module.cs.meta diff --git a/Assets/NeedToBeImplemented/Old.meta b/Assets/CivMars/NeedToBeImplemented/Old.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old.meta rename to Assets/CivMars/NeedToBeImplemented/Old.meta diff --git a/Assets/NeedToBeImplemented/Old/Assembler.cs b/Assets/CivMars/NeedToBeImplemented/Old/Assembler.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/Assembler.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Assembler.cs index 2ec9c1b..55c2cbe 100644 --- a/Assets/NeedToBeImplemented/Old/Assembler.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Assembler.cs @@ -1,16 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - //public class Assembler:Producer - //{ - // public int speed; - - // public void Production() - // { - // throw new System.NotImplementedException(); - // } - //} - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + //public class Assembler:Producer + //{ + // public int speed; + + // public void Production() + // { + // throw new System.NotImplementedException(); + // } + //} + diff --git a/Assets/NeedToBeImplemented/Old/Assembler.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Assembler.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Assembler.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Assembler.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/Furnace.cs b/Assets/CivMars/NeedToBeImplemented/Old/Furnace.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/Furnace.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Furnace.cs index f86964c..0e6b676 100644 --- a/Assets/NeedToBeImplemented/Old/Furnace.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Furnace.cs @@ -1,16 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - //public class Furnace:Producer - //{ - // public int speed; - - // public void Production() - // { - // throw new System.NotImplementedException(); - // } - //} - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + //public class Furnace:Producer + //{ + // public int speed; + + // public void Production() + // { + // throw new System.NotImplementedException(); + // } + //} + diff --git a/Assets/NeedToBeImplemented/Old/Furnace.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Furnace.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Furnace.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Furnace.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/Generato.cs b/Assets/CivMars/NeedToBeImplemented/Old/Generato.cs similarity index 93% rename from Assets/NeedToBeImplemented/Old/Generato.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Generato.cs index d271fb7..c83158c 100644 --- a/Assets/NeedToBeImplemented/Old/Generato.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Generato.cs @@ -1,28 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace CivMars -{ - public class Generator : Building - { - - public MainBuilding main; - public int internalsorage; - - public void Gen() - { } - - - public void Transfer() - { - if (this.internalsorage > 1) - { - //main.Inventory =+ this.internalsorage; - } - } - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; + +namespace CivMars +{ + public class Generator : Building + { + + public MainBuilding main; + public int internalsorage; + + public void Gen() + { } + + + public void Transfer() + { + if (this.internalsorage > 1) + { + //main.Inventory =+ this.internalsorage; + } + } + + } + } \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Generato.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Generato.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Generato.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Generato.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/Miner.meta b/Assets/CivMars/NeedToBeImplemented/Old/Miner.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Miner.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Miner.meta diff --git a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs b/Assets/CivMars/NeedToBeImplemented/Old/Miner/SpecMine.cs similarity index 92% rename from Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Miner/SpecMine.cs index 1324166..faa0bf5 100644 --- a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Miner/SpecMine.cs @@ -1,10 +1,10 @@ -/* - public class SpecMine : Miner - { - //public OreType type; - public int capacity; - - - } - +/* + public class SpecMine : Miner + { + //public OreType type; + public int capacity; + + + } + */ \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Miner/SpecMine.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Miner/SpecMine.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/NuclearReactor.cs b/Assets/CivMars/NeedToBeImplemented/Old/NuclearReactor.cs similarity index 93% rename from Assets/NeedToBeImplemented/Old/NuclearReactor.cs rename to Assets/CivMars/NeedToBeImplemented/Old/NuclearReactor.cs index 768f312..57337e3 100644 --- a/Assets/NeedToBeImplemented/Old/NuclearReactor.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/NuclearReactor.cs @@ -1,12 +1,12 @@ -//using System; -//using System.Collections.Generic; -//using System.Linq; -//using System.Text; - - - -// public class NuclearReactor:Building -// { - -// } - +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; + + + +// public class NuclearReactor:Building +// { + +// } + diff --git a/Assets/NeedToBeImplemented/Old/NuclearReactor.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/NuclearReactor.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/NuclearReactor.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/NuclearReactor.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs b/Assets/CivMars/NeedToBeImplemented/Old/Oxigeneration.cs similarity index 93% rename from Assets/NeedToBeImplemented/Old/Oxigeneration.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Oxigeneration.cs index 7edc702..15c13c7 100644 --- a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Oxigeneration.cs @@ -1,16 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - -namespace CivMars -{ - public class Oxigenerator : Generator - { - public int speed; - public int capacity; - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + +namespace CivMars +{ + public class Oxigenerator : Generator + { + public int speed; + public int capacity; + + } + } \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Oxigeneration.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Oxigeneration.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Oxigeneration.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/Producer.cs b/Assets/CivMars/NeedToBeImplemented/Old/Producer.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/Producer.cs rename to Assets/CivMars/NeedToBeImplemented/Old/Producer.cs index 2dea727..86d7416 100644 --- a/Assets/NeedToBeImplemented/Old/Producer.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/Producer.cs @@ -1,15 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - //public class Producer:Building - //{ - // public void Production() - // { - // throw new System.NotImplementedException(); - // } - //} - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + //public class Producer:Building + //{ + // public void Production() + // { + // throw new System.NotImplementedException(); + // } + //} + diff --git a/Assets/NeedToBeImplemented/Old/Producer.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/Producer.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/Producer.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/Producer.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/ResearchFacility.cs b/Assets/CivMars/NeedToBeImplemented/Old/ResearchFacility.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/ResearchFacility.cs rename to Assets/CivMars/NeedToBeImplemented/Old/ResearchFacility.cs index 923787a..357d72d 100644 --- a/Assets/NeedToBeImplemented/Old/ResearchFacility.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/ResearchFacility.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - //public class ResearchFacility:Building - //{ - // private int researchspeed; - - // public void Research() - // { - // throw new System.NotImplementedException(); - // } - //} - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + //public class ResearchFacility:Building + //{ + // private int researchspeed; + + // public void Research() + // { + // throw new System.NotImplementedException(); + // } + //} + diff --git a/Assets/NeedToBeImplemented/Old/ResearchFacility.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/ResearchFacility.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/ResearchFacility.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/ResearchFacility.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs b/Assets/CivMars/NeedToBeImplemented/Old/UniverzalMiner.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/UniverzalMiner.cs rename to Assets/CivMars/NeedToBeImplemented/Old/UniverzalMiner.cs index 216bfa6..72fae96 100644 --- a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/UniverzalMiner.cs @@ -1,16 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - /* - - public class UniverzalMiner:Miner - { - public int capacity; - public int speed; - //public OreType type; - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + /* + + public class UniverzalMiner:Miner + { + public int capacity; + public int speed; + //public OreType type; + + } + */ \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/UniverzalMiner.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/UniverzalMiner.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/UniverzalMiner.cs.meta diff --git a/Assets/NeedToBeImplemented/Old/UraniumRefiner.cs b/Assets/CivMars/NeedToBeImplemented/Old/UraniumRefiner.cs similarity index 94% rename from Assets/NeedToBeImplemented/Old/UraniumRefiner.cs rename to Assets/CivMars/NeedToBeImplemented/Old/UraniumRefiner.cs index c51a212..22f0ba7 100644 --- a/Assets/NeedToBeImplemented/Old/UraniumRefiner.cs +++ b/Assets/CivMars/NeedToBeImplemented/Old/UraniumRefiner.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - //public class UraniumRefiner:Producer - //{ - // public int speed; - - // public void Production() - // { - // throw new System.NotImplementedException(); - // } - //} - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + //public class UraniumRefiner:Producer + //{ + // public int speed; + + // public void Production() + // { + // throw new System.NotImplementedException(); + // } + //} + diff --git a/Assets/NeedToBeImplemented/Old/UraniumRefiner.cs.meta b/Assets/CivMars/NeedToBeImplemented/Old/UraniumRefiner.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Old/UraniumRefiner.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Old/UraniumRefiner.cs.meta diff --git a/Assets/NeedToBeImplemented/OxigenRecoverer.cs b/Assets/CivMars/NeedToBeImplemented/OxigenRecoverer.cs similarity index 92% rename from Assets/NeedToBeImplemented/OxigenRecoverer.cs rename to Assets/CivMars/NeedToBeImplemented/OxigenRecoverer.cs index 96fd7c3..089aff4 100644 --- a/Assets/NeedToBeImplemented/OxigenRecoverer.cs +++ b/Assets/CivMars/NeedToBeImplemented/OxigenRecoverer.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - class OxigenRecoverer :Module - { - - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + class OxigenRecoverer :Module + { + + + } + diff --git a/Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta b/Assets/CivMars/NeedToBeImplemented/OxigenRecoverer.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta rename to Assets/CivMars/NeedToBeImplemented/OxigenRecoverer.cs.meta diff --git a/Assets/NeedToBeImplemented/RefrinedUranium.cs b/Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs similarity index 93% rename from Assets/NeedToBeImplemented/RefrinedUranium.cs rename to Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs index 6a02816..0ec460f 100644 --- a/Assets/NeedToBeImplemented/RefrinedUranium.cs +++ b/Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - public class RefrinedUranium:Item - { - public string name = "RefrinedUranium"; - - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + public class RefrinedUranium:Item + { + public string name = "RefrinedUranium"; + + } + diff --git a/Assets/NeedToBeImplemented/RefrinedUranium.cs.meta b/Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/RefrinedUranium.cs.meta rename to Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs.meta diff --git a/Assets/NeedToBeImplemented/Resource.cs b/Assets/CivMars/NeedToBeImplemented/Resource.cs similarity index 92% rename from Assets/NeedToBeImplemented/Resource.cs rename to Assets/CivMars/NeedToBeImplemented/Resource.cs index 773f40b..ad279f4 100644 --- a/Assets/NeedToBeImplemented/Resource.cs +++ b/Assets/CivMars/NeedToBeImplemented/Resource.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - public class Resource:Item - { - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + public class Resource:Item + { + } + diff --git a/Assets/NeedToBeImplemented/Resource.cs.meta b/Assets/CivMars/NeedToBeImplemented/Resource.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Resource.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Resource.cs.meta diff --git a/Assets/NeedToBeImplemented/Tool.cs b/Assets/CivMars/NeedToBeImplemented/Tool.cs similarity index 92% rename from Assets/NeedToBeImplemented/Tool.cs rename to Assets/CivMars/NeedToBeImplemented/Tool.cs index 64d14ab..57577b6 100644 --- a/Assets/NeedToBeImplemented/Tool.cs +++ b/Assets/CivMars/NeedToBeImplemented/Tool.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - - public class Tool:Item - { - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + + + public class Tool:Item + { + } + diff --git a/Assets/NeedToBeImplemented/Tool.cs.meta b/Assets/CivMars/NeedToBeImplemented/Tool.cs.meta similarity index 100% rename from Assets/NeedToBeImplemented/Tool.cs.meta rename to Assets/CivMars/NeedToBeImplemented/Tool.cs.meta diff --git a/Assets/CivMars/Ores/CoalOreTile.cs b/Assets/CivMars/Ores/CoalOreTile.cs index ea8f026..d481534 100644 --- a/Assets/CivMars/Ores/CoalOreTile.cs +++ b/Assets/CivMars/Ores/CoalOreTile.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/CivMars/Ores/IronOreTile.cs b/Assets/CivMars/Ores/IronOreTile.cs index 0e0d8f6..77e377e 100644 --- a/Assets/CivMars/Ores/IronOreTile.cs +++ b/Assets/CivMars/Ores/IronOreTile.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections; using System; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/CivMars/Ores/OreTile.cs b/Assets/CivMars/Ores/OreTile.cs index 3c5aafb..7b6ab69 100644 --- a/Assets/CivMars/Ores/OreTile.cs +++ b/Assets/CivMars/Ores/OreTile.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections; using System; +using CivMarsEngine; public class OreTile : Tiled, IRegystratabe, IWorldGen, ISaveble { diff --git a/Assets/CivMars/Ores/SandTile.cs b/Assets/CivMars/Ores/SandTile.cs index 958e4e5..4a48885 100644 --- a/Assets/CivMars/Ores/SandTile.cs +++ b/Assets/CivMars/Ores/SandTile.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections; using System; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/CivMars/Ores/StoneOreTile.cs b/Assets/CivMars/Ores/StoneOreTile.cs index 3269202..ebbc068 100644 --- a/Assets/CivMars/Ores/StoneOreTile.cs +++ b/Assets/CivMars/Ores/StoneOreTile.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections; using System; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/CivMars/Ores/UraniumOreTile.cs b/Assets/CivMars/Ores/UraniumOreTile.cs index b219d9e..c55d85e 100644 --- a/Assets/CivMars/Ores/UraniumOreTile.cs +++ b/Assets/CivMars/Ores/UraniumOreTile.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections; using System; +using CivMarsEngine; namespace CivMars { diff --git a/Assets/CivMarsEngine.meta b/Assets/CivMarsEngine.meta new file mode 100644 index 0000000..8f01275 --- /dev/null +++ b/Assets/CivMarsEngine.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6b487f7f5a9df494e9b0eb9d4718bb3b +folderAsset: yes +timeCreated: 1450796720 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/Building.cs b/Assets/CivMarsEngine/Building.cs new file mode 100644 index 0000000..7dd604f --- /dev/null +++ b/Assets/CivMarsEngine/Building.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace CivMarsEngine +{ + + [AddComponentMenu("Buildings/Building")] + public class Building : Tiled, ISaveble + { + public string ID; + + //public List buildingMaterials; + + public GameObject Graphicks; + public bool guion; + + public override void Awake() + { + base.Awake(); + } + + public void PositionUpdate() + { + Graphicks.SetActive(false); + this.Graphicks.transform.position = Vector3.zero; + } + + + + #region ISaveble + + public virtual SavedTile Save() + { + SavedTile s = new SavedTile(ID); + return s; + } + + public void Load(SavedTile data) + { + throw new NotImplementedException(); + } + + public virtual GameObject GetPrefab() + { + throw new NotImplementedException(); + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/CivMars/Buildings/Building.cs.meta b/Assets/CivMarsEngine/Building.cs.meta similarity index 100% rename from Assets/CivMars/Buildings/Building.cs.meta rename to Assets/CivMarsEngine/Building.cs.meta diff --git a/Assets/CivMarsEngine/BuildingWGUI.cs b/Assets/CivMarsEngine/BuildingWGUI.cs new file mode 100644 index 0000000..9b93d74 --- /dev/null +++ b/Assets/CivMarsEngine/BuildingWGUI.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using CivMarsEngine; +using UnityEngine.EventSystems; + +namespace CivMarsEngine +{ + public class BuildingWGUI : Building, IHasGui + { + + #region IhasGui + public void TogelGui() + { + if (!guion) + { + if (GameCon.AlloweGUI(this)) + { + Open(); + } + } + else + { + GameCon.CloseGUI(this); + Close(); + } + } + + public virtual void Open() + { + guion = true; + Graphicks.SetActive(true); + } + + public virtual void Close() + { + guion = false; + Graphicks.SetActive(false); + } + + public int ClosingLevel() + { + return 1; + } + + public void OnPointerClick(PointerEventData eventData) + { + if (!eventData.rawPointerPress.transform.IsChildOf(Graphicks.transform)) + TogelGui(); + } + #endregion + + } +} diff --git a/Assets/CivMarsEngine/BuildingWGUI.cs.meta b/Assets/CivMarsEngine/BuildingWGUI.cs.meta new file mode 100644 index 0000000..b6abb66 --- /dev/null +++ b/Assets/CivMarsEngine/BuildingWGUI.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1e9e07dee708e124f8d3319e398055d7 +timeCreated: 1450796720 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Camera.meta b/Assets/CivMarsEngine/Camera.meta similarity index 100% rename from Assets/Camera.meta rename to Assets/CivMarsEngine/Camera.meta diff --git a/Assets/Camera/CameraChase.cs b/Assets/CivMarsEngine/Camera/CameraChase.cs similarity index 61% rename from Assets/Camera/CameraChase.cs rename to Assets/CivMarsEngine/Camera/CameraChase.cs index 95e4116..ed26297 100644 --- a/Assets/Camera/CameraChase.cs +++ b/Assets/CivMarsEngine/Camera/CameraChase.cs @@ -1,198 +1,200 @@ -using UnityEngine; -using System.Collections; - - - -//[AddComponentMenu("Camera/CameraChase")] -//public class CameraChase : MonoBehaviour -//{ - - -// public Transform chase; -// public Rect area; -// public bool loaded = false; - -// public RectTransform rectTrans; - -// void Start() -// { -// } - -// // Use this for initialization -// public void MapLoaded() -// { -// GameController GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); -// if (GameCon.map == null) -// Debug.LogError("Can't find GameController"); - -// chase = GameObject.FindGameObjectWithTag("Player").transform; -// area = new Rect(); - -// /* -// area.x = 10.50f; -// area.y = -3f - (GameCon.map.mapHeight * 1.0f - 6f); -// area.width = GameCon.map.mapHeight * 1.0f - 11f; -// area.height = GameCon.map.mapHeight * 1.0f - 8f; -// */ - -// Debug.Log(Camera.main.rect); - -// area.x = 0 + (Camera.main.rect.x / 2); -// area.y = 0f - (GameCon.map.mapHeight); -// area.width = (GameCon.map.mapHeight); -// area.height = (GameCon.map.mapHeight); - - -// Debug.Log(area); -// loaded = true; -// } - -// // Update is called once per frame -// void Update() -// { -// if (chase == null) -// { - - - -// return; - -// } -// if (loaded) -// { -// if (area.Contains(new Vector2(chase.position.x, chase.position.y))) -// { -// transform.position = chase.position + Vector3.back * 10; - -// } -// else if (chase.position.x > area.xMax && chase.position.y > area.yMax) -// { -// transform.position = new Vector3(area.xMax, area.yMax); -// } -// else if (chase.position.x > area.xMax && chase.position.y < area.yMin) -// { -// transform.position = new Vector3(area.xMax, area.yMin); -// } -// else if (chase.position.x < area.xMin && chase.position.y > area.yMax) -// { -// transform.position = new Vector3(area.xMin, area.yMax); -// } -// else if (chase.position.x < area.xMin && chase.position.y < area.yMin) -// { -// transform.position = new Vector3(area.xMin, area.yMin); - -// } -// else if (chase.position.x < area.xMin && area.yMax > chase.position.y && chase.position.y > area.yMin) -// { -// transform.position = new Vector3(area.xMin, chase.position.y); -// } -// else if (chase.position.x > area.xMax && area.yMax > chase.position.y && chase.position.y > area.yMin) -// { -// transform.position = new Vector3(area.xMax, chase.position.y); -// } -// else if (area.xMax > chase.position.x && chase.position.x > area.xMin && chase.position.y < area.yMin) -// { -// transform.position = new Vector3(chase.position.x, area.yMin); -// } -// else if (area.xMax > chase.position.x && chase.position.x > area.xMin && chase.position.y > area.yMax) -// { -// transform.position = new Vector3(chase.position.x, area.yMax); -// } -// transform.position = new Vector3(transform.position.x, transform.position.y, -10); - -// } -// } -//} - - -[AddComponentMenu("Camera/CameraChase")] -public class CameraChase : MonoBehaviour -{ - - - public Transform chase; - public bool loaded = false; - - public float eventHorizont = 1.5f; - - public RectTransform rectTrans; - - Camera CameraScript; - GameController GameCon; - - void Start() - { - - - } - - // Use this for initialization - public void MapLoaded() - { - - CameraScript = this.GetComponent(); - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - - if (GameCon.map == null) - { - Debug.LogError("Can't find GameController"); - Debug.Break(); - } - - loaded = true; - } - - // Update is called once per frame - void Update() - { - if (chase == null) - { - - return; - - } - if (loaded) - { - float xCamPos = transform.position.x; - float yCamPos = -1 * transform.position.y; - - float xPos = chase.transform.position.x; - float yPos = -1 * chase.transform.position.y; - - float xCameraH = CameraScript.orthographicSize * (Screen.width / Screen.height) * (1 - CameraScript.rect.x); - float yCameraH = CameraScript.orthographicSize * (1-CameraScript.rect.y); - - //transform.position = new Vector3(Mathf.Clamp(xPos, xCameraH, GameCon.map.mapHeight - xCameraH),-1 * Mathf.Clamp(-1*yPos, yCameraH, GameCon.map.mapHeight - yCameraH), transform.position.z); - transform.position = new Vector3( - Mathf.Clamp( - xCamPos + OutRangeClamp(xPos, xCamPos - xCameraH / eventHorizont, xCamPos + xCameraH / eventHorizont), - xCameraH, - GameCon.map.mapHeight - xCameraH - ), - - -1 * Mathf.Clamp( - yCamPos + OutRangeClamp(yPos, yCamPos - yCameraH / eventHorizont, yCamPos + yCameraH / eventHorizont), - yCameraH, - GameCon.map.mapHeight - yCameraH - ), - transform.position.z); - } - } - - float OutRangeClamp(float value, float Min, float Max) - { - if (value < Min) - { - //Debug.Log("if"); - return value - Min; - } - else if (value > Max) - { - //Debug.Log("else"); - - return value - Max; - } - return 0; - } -} - +using UnityEngine; +using System.Collections; + + + +//[AddComponentMenu("Camera/CameraChase")] +//public class CameraChase : MonoBehaviour +//{ + + +// public Transform chase; +// public Rect area; +// public bool loaded = false; + +// public RectTransform rectTrans; + +// void Start() +// { +// } + +// // Use this for initialization +// public void MapLoaded() +// { +// GameController GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); +// if (GameCon.map == null) +// Debug.LogError("Can't find GameController"); + +// chase = GameObject.FindGameObjectWithTag("Player").transform; +// area = new Rect(); + +// /* +// area.x = 10.50f; +// area.y = -3f - (GameCon.map.mapHeight * 1.0f - 6f); +// area.width = GameCon.map.mapHeight * 1.0f - 11f; +// area.height = GameCon.map.mapHeight * 1.0f - 8f; +// */ + +// Debug.Log(Camera.main.rect); + +// area.x = 0 + (Camera.main.rect.x / 2); +// area.y = 0f - (GameCon.map.mapHeight); +// area.width = (GameCon.map.mapHeight); +// area.height = (GameCon.map.mapHeight); + + +// Debug.Log(area); +// loaded = true; +// } + +// // Update is called once per frame +// void Update() +// { +// if (chase == null) +// { + + + +// return; + +// } +// if (loaded) +// { +// if (area.Contains(new Vector2(chase.position.x, chase.position.y))) +// { +// transform.position = chase.position + Vector3.back * 10; + +// } +// else if (chase.position.x > area.xMax && chase.position.y > area.yMax) +// { +// transform.position = new Vector3(area.xMax, area.yMax); +// } +// else if (chase.position.x > area.xMax && chase.position.y < area.yMin) +// { +// transform.position = new Vector3(area.xMax, area.yMin); +// } +// else if (chase.position.x < area.xMin && chase.position.y > area.yMax) +// { +// transform.position = new Vector3(area.xMin, area.yMax); +// } +// else if (chase.position.x < area.xMin && chase.position.y < area.yMin) +// { +// transform.position = new Vector3(area.xMin, area.yMin); + +// } +// else if (chase.position.x < area.xMin && area.yMax > chase.position.y && chase.position.y > area.yMin) +// { +// transform.position = new Vector3(area.xMin, chase.position.y); +// } +// else if (chase.position.x > area.xMax && area.yMax > chase.position.y && chase.position.y > area.yMin) +// { +// transform.position = new Vector3(area.xMax, chase.position.y); +// } +// else if (area.xMax > chase.position.x && chase.position.x > area.xMin && chase.position.y < area.yMin) +// { +// transform.position = new Vector3(chase.position.x, area.yMin); +// } +// else if (area.xMax > chase.position.x && chase.position.x > area.xMin && chase.position.y > area.yMax) +// { +// transform.position = new Vector3(chase.position.x, area.yMax); +// } +// transform.position = new Vector3(transform.position.x, transform.position.y, -10); + +// } +// } +//} + +namespace CivMarsEngine +{ + [AddComponentMenu("Camera/CameraChase")] + public class CameraChase : MonoBehaviour + { + + + public Transform chase; + public bool loaded = false; + + public float eventHorizont = 1.5f; + + public RectTransform rectTrans; + + Camera CameraScript; + GameController GameCon; + + void Start() + { + + + } + + // Use this for initialization + public void MapLoaded() + { + + CameraScript = this.GetComponent(); + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + + if (GameCon.map == null) + { + Debug.LogError("Can't find GameController"); + Debug.Break(); + } + + loaded = true; + } + + // Update is called once per frame + void Update() + { + if (chase == null) + { + + return; + + } + if (loaded) + { + float xCamPos = transform.position.x; + float yCamPos = -1 * transform.position.y; + + float xPos = chase.transform.position.x; + float yPos = -1 * chase.transform.position.y; + + float xCameraH = CameraScript.orthographicSize * (Screen.width / Screen.height) * (1 - CameraScript.rect.x); + float yCameraH = CameraScript.orthographicSize * (1 - CameraScript.rect.y); + + //transform.position = new Vector3(Mathf.Clamp(xPos, xCameraH, GameCon.map.mapHeight - xCameraH),-1 * Mathf.Clamp(-1*yPos, yCameraH, GameCon.map.mapHeight - yCameraH), transform.position.z); + transform.position = new Vector3( + Mathf.Clamp( + xCamPos + OutRangeClamp(xPos, xCamPos - xCameraH / eventHorizont, xCamPos + xCameraH / eventHorizont), + xCameraH, + GameCon.map.mapHeight - xCameraH + ), + + -1 * Mathf.Clamp( + yCamPos + OutRangeClamp(yPos, yCamPos - yCameraH / eventHorizont, yCamPos + yCameraH / eventHorizont), + yCameraH, + GameCon.map.mapHeight - yCameraH + ), + transform.position.z); + } + } + + float OutRangeClamp(float value, float Min, float Max) + { + if (value < Min) + { + //Debug.Log("if"); + return value - Min; + } + else if (value > Max) + { + //Debug.Log("else"); + + return value - Max; + } + return 0; + } + } + +} \ No newline at end of file diff --git a/Assets/Camera/CameraChase.cs.meta b/Assets/CivMarsEngine/Camera/CameraChase.cs.meta similarity index 100% rename from Assets/Camera/CameraChase.cs.meta rename to Assets/CivMarsEngine/Camera/CameraChase.cs.meta diff --git a/Assets/CivMarsEngine/ClassDiagram1.cd b/Assets/CivMarsEngine/ClassDiagram1.cd new file mode 100644 index 0000000..249cd49 --- /dev/null +++ b/Assets/CivMarsEngine/ClassDiagram1.cd @@ -0,0 +1,298 @@ + + + + + + AAAAAAAAAgAAIBIAAAAAAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\BuildingWGUI.cs + + + + + + + AEABAAAAAAAAAAAAAAAAAAAACAABAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Crafting\Recipe.cs + + + + + + RAwAEAQAASgAAAiCACIAIMIEQAABAAAABEAAAAAAAEA= + Assets\CivMarsEngine\GameController.cs + + + + + + AAAAAAAAAAAAIAAEAAgAEQAAAAAIgCAAAgAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasTank.cs + + + + + + AAAAQAAAAAAAAAAgAIAAAAAAgAAAAAgAAAAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasTankCluster.cs + + + + + + ABQAAAAAACAAIBIAACgIAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\GUI\Access Panel\AccesPanel.cs + + + + + + + AIYAAAAIECAQAAAAAgCAAAAAgAIAAAABBAQAgAQQgAA= + Assets\CivMarsEngine\GUI\Access Panel\GasDesplay\GasDesplay.cs + + + + + + AAYAAAAABDAEhAQAAAAAAAAAAAAEgAAAAAAgAARQAAA= + Assets\CivMarsEngine\GUI\Access Panel\GasDesplay\GasDesplayElement.cs + + + + + + AAQAAAAAkCAAEABAAgCAAAAAAAAAQEABAAACAAwAAQA= + Assets\CivMarsEngine\GUI\Access Panel\InventoryDesplay\InventoryDesplay.cs + + + + + + ABQAAABAIAACBQAAAAAAAQAAAAAEgAAAAAAAAAQBgEA= + Assets\CivMarsEngine\GUI\Access Panel\InventoryDesplay\InventoryDrawedElement.cs + + + + + + ABQAAAAAECAAgAAAAAAAAAAAAAAAAAABAAAAAAAAAAg= + Assets\CivMarsEngine\GUI\Access Panel\PlayerStatsDesplay.cs + + + + + + ABQAAAAAACAAIBIBjAACgAAAAAABAAAEAAAAISCAAIA= + Assets\CivMarsEngine\GUI\Buildables\BuildingLister.cs + + + + + + + ACSAAIAEAKAAINCwAAAABAICQAABAAABEAAEEAAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\CraftingDesplay.cs + + + + + + AAQAAAAAAAAAQAAAAAAQAAAAAAEAgAAAAAAAAABAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\CraftingProcess.cs + + + + + + AAAAAAAAAAAABABAAAAABAAAEAAAAAAAAAAEAAAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\QueueItem.cs + + + + + + AAQAAAAAAiAAAABAAAAAAAAAAAAgAAAAAAAAAQAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\RecipeButton.cs + + + + + + + AAQAAAAAACAAEAAAAgAAAAAAAAAAAAABAAACAAgAAQA= + Assets\CivMarsEngine\GUI\Inventory\PlayerInventory.cs + + + + + + ABQAAAAAIAACBAAAAAAAAAAAAAIAgAAAAAAAAAABgEA= + Assets\CivMarsEngine\GUI\Inventory\PlayerInventoryDrawedElement.cs + + + + + + ABCAAAAAACAAAAAAAIAAAAAAAAABAAAAAAAAAAAAEAA= + Assets\CivMarsEngine\GUI\MapListing\NewMap.cs + + + + + + ABQAAAAAAABAAAAAAIgAAAACAAAEAAAQAEAAAAAAAEA= + Assets\CivMarsEngine\GUI\MapListing\SavedMapLister.cs + + + + + + ABQACAAAACAAgAAAAAAAAAAAAAAAAAQAAAAAAAAAAAA= + Assets\CivMarsEngine\GUI\PlayerStats\PlayerStatsSidebarDesplay.cs + + + + + + ABAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA= + Assets\CivMarsEngine\InputHandler.cs + + + + + + AAIAAAgAAAAAAABAAIAABAAAAAAIAAACAAAAAAAASAA= + Assets\CivMarsEngine\InventorySystem\Inventory.cs + + + + + + AF4IACAAECAAUCAEAAAAhAAAoACAAQACFCAAAAAASAg= + Assets\CivMarsEngine\Player\Player.cs + + + + + + + AIAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAAAAAAAAA= + Assets\CivMarsEngine\Player\SpaceSuit.cs + + + + + + + AAAAAAIACAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAA= + Assets\CivMarsEngine\GUI\GUIHandler.cs + + + + + + ABQAgAAAAyAAIBIAAAAAAAAAAAAAAAAAAAAAAACIAAA= + Assets\CivMarsEngine\GUI\PauseTab.cs + + + + + + + AAAAgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Language.cs + + + + + + QAAQAJAAACAAQAAAAAAAAAEAAAAAAABADAAAAEACAAA= + Assets\CivMarsEngine\Map.cs + + + + + + AAQAAAAAACAgAAAAAAAAAAAAAAAAAQAAAQAAAAAAAAA= + Assets\CivMarsEngine\Player\PlayerMovment.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\IGasTank.cs + + + + + + AAAAAAAgCAAAAAAAAAAAAAAQAhAAAAAAAACAAAAAAAA= + Assets\CivMarsEngine\Interfaces\IBuildable.cs + + + + + + AAAAAAAAAAAAAEAAAAQAAAACBAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Interfaces\ICrafter.cs + + + + + + AAAAAAAAAAAAIBIAAAAAAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\Interfaces\IHasGui.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA= + Assets\CivMarsEngine\Interfaces\IRegystratabe.cs + + + + + + AAAAgIAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Interfaces\ISaveble.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA= + Assets\CivMarsEngine\Interfaces\IWorldGen.cs + + + + + + AAIAACAAAAAAECAAAAAAhAAAgAAAAAAABAAAAAAASAA= + Assets\CivMarsEngine\InventorySystem\IInventory.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAIAIAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasType.cs + + + + + + AAAAABBAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\GUI\Buildables\BuildingLister.cs + + + + + + AEAAAAAAAAAAAAAAAAAAAAAQAAAACAAAAAAAAAAAAAA= + Assets\CivMarsEngine\GameState.cs + + + + \ No newline at end of file diff --git a/Assets/CivMarsEngine/ClassDiagram1.cd.meta b/Assets/CivMarsEngine/ClassDiagram1.cd.meta new file mode 100644 index 0000000..0ead961 --- /dev/null +++ b/Assets/CivMarsEngine/ClassDiagram1.cd.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96d8120e226501546aefbfa984898131 +timeCreated: 1450798791 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Crafting.meta b/Assets/CivMarsEngine/Crafting.meta similarity index 67% rename from Assets/Crafting.meta rename to Assets/CivMarsEngine/Crafting.meta index feeb8a8..b7d09fb 100644 --- a/Assets/Crafting.meta +++ b/Assets/CivMarsEngine/Crafting.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0ddcb3f9c1ae3f447affe4edb1ec6fa5 +guid: 2c9775a5c6c257543be27629469543ff folderAsset: yes -timeCreated: 1447772400 +timeCreated: 1450798791 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMarsEngine/Crafting/Recipe.cs b/Assets/CivMarsEngine/Crafting/Recipe.cs new file mode 100644 index 0000000..7c7b678 --- /dev/null +++ b/Assets/CivMarsEngine/Crafting/Recipe.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public class Recipe + { + public string buildingID; + public Item[] Materials; + public Item Crafted; + public float time; + + + public Recipe(string ID, Item[] m, Item c, float t) + { + buildingID = ID; + Materials = m; + Crafted = c; + time = t; + } + } +} \ No newline at end of file diff --git a/Assets/Crafting/Recipe.cs.meta b/Assets/CivMarsEngine/Crafting/Recipe.cs.meta similarity index 100% rename from Assets/Crafting/Recipe.cs.meta rename to Assets/CivMarsEngine/Crafting/Recipe.cs.meta diff --git a/Assets/GUI.meta b/Assets/CivMarsEngine/GUI.meta similarity index 67% rename from Assets/GUI.meta rename to Assets/CivMarsEngine/GUI.meta index e1e8aa7..ba4470e 100644 --- a/Assets/GUI.meta +++ b/Assets/CivMarsEngine/GUI.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 371f3a1cca3f0c3418f427f8cdf4391f +guid: 93d0924543f03a449b2d0451de3c2d6b folderAsset: yes -timeCreated: 1438703343 +timeCreated: 1450798791 licenseType: Free DefaultImporter: userData: diff --git a/Assets/GUI/Access Panel.meta b/Assets/CivMarsEngine/GUI/Access Panel.meta similarity index 100% rename from Assets/GUI/Access Panel.meta rename to Assets/CivMarsEngine/GUI/Access Panel.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs b/Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs new file mode 100644 index 0000000..5fc01f6 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs @@ -0,0 +1,69 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMarsEngine +{ + public class AccesPanel : MonoBehaviour, IHasGui + { + public GameController GameCon; + + public Building OpenBuilding; + + public bool open; + + public GameObject[] AccesTabs; + + public GameObject Graphicks; + + public void Start() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } + + + public void Update() + { + if (Input.GetButtonUp("Inventory")) + { + Debug.Log("Inventory opening"); + TogelGui(); + } + } + + #region IhasGui + public void TogelGui() + { + if (!open) + { + if (GameCon.AlloweGUI(this as IHasGui)) + { + Open(); + } + } + else + { + GameCon.CloseGUI(this as IHasGui); + Close(); + } + } + + public void Open() + { + open = true; + Graphicks.SetActive(true); + } + + public void Close() + { + open = false; + Graphicks.SetActive(false); + } + + public int ClosingLevel() + { + return 10; + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/AccesPanel.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/AccesPanel.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/AccesPanel.cs.meta diff --git a/Assets/GUI/Access Panel/GasDesplay.meta b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay.meta similarity index 100% rename from Assets/GUI/Access Panel/GasDesplay.meta rename to Assets/CivMarsEngine/GUI/Access Panel/GasDesplay.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs new file mode 100644 index 0000000..ee622f2 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs @@ -0,0 +1,292 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + public class GasDesplay : MonoBehaviour + { + + + public GameObject GasCanvasPlayer; + public GameObject GasCanvasOther; + + public GameObject TankElement; + public GameObject TankElementBack; + + public GameObject[] drawedInvPlayer = new GameObject[10]; + public GameObject[] drawedInvOther = new GameObject[10]; + + GasTankCluster player; + GasTankCluster other; + + public GasDesplayElement OutPuting; + public GasDesplayElement InPuting; + + void Start() + { + player = GameObject.FindGameObjectWithTag("Player").GetComponent().GetTankCluster(); + } + + + void Update() + { + UpdateDesplay(); + if ((OutPuting != null && InPuting != null) && (OutPuting.tank.gasType == InPuting.tank.gasType || InPuting.tank.gasType == GasType.Null)) + { + OutPuting.tank.Transfer(InPuting.tank, 5f * Time.deltaTime); + } + } + + public void UpdateData(Building datas) + { + if (datas is IGasTank) + { + other = ((IGasTank)datas).GetTankCluster(); + } + } + + public void UpdateDesplay() + { + if (other == null) + { + UpdateDesplaySection(player, drawedInvPlayer, GasCanvasPlayer.gameObject, true); + + foreach (GameObject item in drawedInvOther) + { + Destroy(item); + } + } + else + { + UpdateDesplaySection(player, other, drawedInvPlayer, GasCanvasPlayer.gameObject, true); + UpdateDesplaySection(other, player, drawedInvOther, GasCanvasOther.gameObject, false); + } + } + + void UpdateDesplaySection(GasTankCluster TankThis, GasTankCluster TankOthe, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) + { + for (int i = 0; i < TankThis.size; i++) + { + GameObject actual = drawed[i]; + + //van itt item + + //Van kint valami + if (actual != null) + { + //Background element + if (actual.GetComponent() == null) + { + //Destroy back + Destroy(actual); + actual = null; + + //Create item + actual = null; + actual = Instantiate(TankElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(TankThis.GetTank(i), this); + } + } + else + { + //create item + actual = null; + actual = Instantiate(TankElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(TankThis.GetTank(i), this); + } + + + drawed[i] = actual; + } + } + + void UpdateDesplaySection(GasTankCluster TankThis, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) + { + for (int i = 0; i < TankThis.size; i++) + { + GameObject actual = drawed[i]; + + //van itt item + if (TankThis.GetTank(i).gasType != GasType.Null) + { + //Van kint valami + if (actual != null) + { + //Background element + if (actual.GetComponent() == null) + { + //Destroy back + Destroy(actual); + actual = null; + + //Create item + actual = null; + actual = Instantiate(TankElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(TankThis.GetTank(i), this); + + + } + //Item element + else if (actual.GetComponent() != null) + { + //update item + drawed[i].GetComponent().Set(TankThis.GetTank(i), this); + } + } + else + { + //create item + actual = null; + actual = Instantiate(TankElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + Debug.Log(TankThis.GetTank(i).ToString()); + + actual.GetComponent().Set(TankThis.GetTank(i), this); + } + } + //nics item + else + { + //Van kint valami + if (actual != null) + { + // background + if (actual.GetComponent() == null) + { + //OK + } + // Item element + else if (actual.GetComponent() != null) + { + //Destroy older + Destroy(actual); + actual = null; + + //Create Back + actual = null; + actual = Instantiate(TankElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + else + { + //Create Back + actual = null; + actual = Instantiate(TankElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + drawed[i] = actual; + } + } + + + public void SetOtherInv(IGasTank OtherInventory) + { + + if (OtherInventory != null) + { + other = OtherInventory.GetTankCluster(); + foreach (GameObject des in drawedInvOther) + { + Destroy(des); + } + drawedInvOther = new GameObject[other.size]; + } + else + { + foreach (GameObject des in drawedInvOther) + { + Destroy(des); + } + } + } + + public bool SetInput(GasDesplayElement t) + { + if (InPuting != null && InPuting != t) + { + InPuting.SetInput(false); + } + if (t != null) + { + if (OutPuting != null) + { + //if (OutPuting.tank.gasType == t.tank.gasType || t.tank.gasType == GasType.Null) + //{ + InPuting = t; + return true; + //} + //else + //{ + //return false; + //} + } + else + { + InPuting = t; + return true; + } + } + else + { + InPuting = null; + return true; + } + + } + + public bool SetOutput(GasDesplayElement t) + { + if (OutPuting != null && OutPuting != t) + { + OutPuting.SetOutput(false); + } + if (t != null) + { + if (InPuting != null) + { + //if (InPuting.tank.gasType == t.tank.gasType || t.tank.gasType == GasType.Null) + //{ + OutPuting = t; + return true; + //} + //else + //{ + //return false; + //} + } + else + { + OutPuting = t; + return true; + } + } + else + { + OutPuting = null; + return true; + } + } + + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplay.cs.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs new file mode 100644 index 0000000..c7b212d --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs @@ -0,0 +1,156 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + public class GasDesplayElement : MonoBehaviour + { + + public Text gasName; + public Text amount; + public Slider amountSlider; + + public Toggle inButton; + public Toggle outButton; + + public bool inPressed; + public bool outPressed; + + public GasTank tank; + GasDesplay other; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (tank != null) + { + if (tank.gasType != GasType.Null) + { + gasName.text = tank.gasType.ToString(); + } + else + { + gasName.text = "Nothing"; + } + amount.text = tank.amount + " / " + tank.maxAmount; + amountSlider.value = tank.amount / tank.maxAmount; + + inButton.gameObject.SetActive(true); + outButton.gameObject.SetActive(true); + } + else + { + //inButton.gameObject.SetActive(false); + //outButton.gameObject.SetActive(false); + } + + ChangedState(); + } + + public void Set(GasTank thisTnak, GasDesplay otherD) + { + other = otherD; + + if (thisTnak != null) + { + tank = thisTnak; + } + else + { + tank = null; + } + } + + public void Set(GasTank thisTnak) + { + if (thisTnak != null) + { + tank = thisTnak; + } + else + { + tank = null; + } + } + + public void ChangedState() + { + if (inButton.isOn != inPressed) + { + if (inButton.isOn) + { + if (!(other.SetInput(this))) + { + inButton.isOn = false; + } + + if (outPressed) + { + other.SetOutput(null); + } + } + else + { + other.SetInput(null); + } + inPressed = inButton.isOn; + outPressed = outButton.isOn; + } + if (outButton.isOn != outPressed) + { + if (outButton.isOn) + { + if (!(other.SetOutput(this))) + { + outButton.isOn = false; + } + + if (inPressed) + { + other.SetInput(null); + } + } + else + { + other.SetOutput(null); + } + inPressed = inButton.isOn; + outPressed = outButton.isOn; + } + /* + if(!h) + { + if (outPressed) + { + other.SetOutput(null); + } + if (inPressed) + { + other.SetInput(null); + } + inPressed = inButton.isOn; + outPressed = outButton.isOn; + } + */ + } + + public void SetInput(bool a) + { + inPressed = a; + inButton.isOn = a; + } + + public void SetOutput(bool a) + { + outPressed = a; + outButton.isOn = a; + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/GasDesplay/GasDesplayElement.cs.meta diff --git a/Assets/GUI/Access Panel/InventoryDesplay.meta b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay.meta similarity index 100% rename from Assets/GUI/Access Panel/InventoryDesplay.meta rename to Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs new file mode 100644 index 0000000..3b5175c --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs @@ -0,0 +1,284 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMarsEngine +{ + public class InventoryDesplay : MonoBehaviour + { + public GameObject InventoryCanvasPlayer; + public GameObject InventoryCanvasOther; + + public GameObject InventoryDubleElement; + public GameObject InventoryElementBack; + + GameObject[] drawedInvPlayer = new GameObject[10]; + GameObject[] drawedInvOther = new GameObject[10]; + + IInventory player; + IInventory other; + + void Start() + { + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + } + + void Update() + { + UpdateInventory(); + } + + public void UpdateInventory() + { + UpdateInventorySection(player, other, drawedInvPlayer, InventoryCanvasPlayer, true); + + UpdateInventorySection(other, player, drawedInvOther, InventoryCanvasOther, false); + } + + void UpdateInventorySection(IInventory invThis, IInventory invOthe, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) + { + for (int i = 0; i < invThis.GetInventorySize(); i++) + { + GameObject actual = drawed[i]; + + //van itt item + if (invThis.GetStackInSlot(i) != null) + { + //Van kint valami + if (actual != null) + { + //Background element + if (actual.GetComponent() == null) + { + //Destroy back + Destroy(actual); + actual = null; + + //Create item + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, invOthe, invThis, i); + } + //Item element + else + { + //update item + drawed[i].GetComponent().Set(invThis.GetStackInSlot(i).amount); + drawed[i].GetComponent().other = invOthe; + drawed[i].GetComponent().thisinv = invThis; + } + } + else + { + //create item + actual = null; + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, invOthe, invThis, i); + drawed[i] = actual; + } + } + //nics item + else + { + //Van kint valami + if (actual != null) + { + // background + if (actual.GetComponent() != null) + { + //Destroy older + Destroy(actual); + actual = null; + + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + else + { + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + drawed[i] = actual; + } + + int a = invThis.GetInventorySize() / 3; + if (invThis.GetInventorySize() % 3 > 0) + { + a++; + } + drawingCanvas.GetComponent().sizeDelta = new Vector2(0, (a * (50)) + 10); + } + + /* + void UpdateInventorySection(IInventory invThis, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) + { + for (int i = 0; i < invThis.GetInventorySize(); i++) + { + + + GameObject actual = drawed[i]; + + //van itt item + if (invThis.GetStackInSlot(i) != null) + { + //Van kint valami + if (actual != null) + { + //Background element + if (actual.GetComponent() == null) + { + //Destroy back + Destroy(actual); + actual = null; + + //Create item + actual = null; + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, null, invThis, i); + + + } + //Item element + else if (actual.GetComponent() != null) + { + //update item + drawed[i].GetComponent().Set(invThis.GetStackInSlot(i).amount); + drawed[i].GetComponent().other = null; + drawed[i].GetComponent().thisinv = invThis; + + } + } + else + { + //create item + actual = null; + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, null, invThis, i); + } + } + //nics item + else + { + //Van kint valami + if (actual != null) + { + // background + if (actual.GetComponent() == null) + { + //OK + } + // Item element + else if (actual.GetComponent() != null) + { + //Destroy older + Destroy(actual); + actual = null; + + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + else + { + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(drawingCanvas.transform); + actual.transform.SetSiblingIndex(i); + } + } + drawed[i] = actual; + } + } + */ + + public void Activate(IInventory OtherInventory) + { + if (OtherInventory != null) + { + other = OtherInventory; + + drawedInvOther = new GameObject[other.GetInventorySize()]; + + gameObject.SetActive(true); + } + } + + public void Deactive() + { + other = null; + + foreach (GameObject des in drawedInvOther) + { + Destroy(des); + } + + gameObject.SetActive(false); + + } + + /* + public void SetOtherInv(IInventory OtherInventory) + { + other = OtherInventory; + if (OtherInventory != null) + { + foreach (GameObject des in drawedInvOther) + { + Destroy(des); + } + + drawedInvOther = new GameObject[other.GetInventorySize()]; + } + else + { + foreach (GameObject des in drawedInvOther) + { + Destroy(des); + } + } + } + */ + + public void UpdateData() + { + throw new NotImplementedException(); + } + + public void UpdateData(Building datas) + { + if (datas is IInventory) + { + Activate(((IInventory)datas)); + } + else + { + Deactive(); + } + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs new file mode 100644 index 0000000..c038112 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs @@ -0,0 +1,99 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + [AddComponentMenu("Inventory/Inventory Element")] + public class InventoryDrawedElement : MonoBehaviour + { + GameController GameCon; + + public bool isPlayer; + public string drawname_name; + public int amount; + public int index; + + public IInventory other; + public IInventory thisinv; + + + public GameObject nameDisplay; + public GameObject amountDisplay; + public Button button; + + + // Use this for initialization + void Awake() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } + + // Update is called once per frame + void Update() + { + if (other == null) + { + button.gameObject.SetActive(false); + } + else + { + button.gameObject.SetActive(true); + } + } + + + #region Set + public void Set(int setAmount) + { + this.amount = setAmount; + amountDisplay.GetComponent().text = null; + amountDisplay.GetComponent().text = setAmount.ToString(); + + //Debug.Log("updated drawed inv element: amount: " + amount + " type: " + this.name + " obj: " + this.GetType().ToString()); + } + + public void Set(string setName) + { + this.drawname_name = setName; + //Debug.Log(setName); + + nameDisplay.GetComponent().text = setName.ToString(); + } + + public void Set(string setName, int setAmount) + { + Set(setName); + Set(setAmount); + } + + public void Set(Item item, bool isp, IInventory o, IInventory t, int i) + { + isPlayer = isp; + other = o; + thisinv = t; + index = i; + + + Set(item.amount); + //Set(Language.Get(item, GameCon.language)); + Set(item.name); + } + #endregion + + + public void Transfer() + { + Debug.Log("Transfer"); + if (Input.GetButton("Specific")) + { + thisinv.TransferItemAmount(other, index, 1); + return; + } + + + thisinv.TransferItem(other, index); + + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs.meta diff --git a/Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs b/Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs new file mode 100644 index 0000000..d7df525 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + class PlayerStatsTabDesplay : MonoBehaviour + { + GameController GameCon; + Player player; + + public Text health; + public Text hearthRate; + + void Start() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + player = GameCon.playerclass; + } + + void Update() + { + health.text = player.health.ToString(); + hearthRate.text = "60 rp"; + } + + public void UpdateData(Building datas) + { + //throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/PlayerStatsDesplay.cs.meta b/Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs.meta similarity index 100% rename from Assets/GUI/Access Panel/PlayerStatsDesplay.cs.meta rename to Assets/CivMarsEngine/GUI/Access Panel/PlayerStatsDesplay.cs.meta diff --git a/Assets/GUI/Buildables.meta b/Assets/CivMarsEngine/GUI/Buildables.meta similarity index 100% rename from Assets/GUI/Buildables.meta rename to Assets/CivMarsEngine/GUI/Buildables.meta diff --git a/Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs b/Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs new file mode 100644 index 0000000..aab8e44 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs @@ -0,0 +1,174 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + public class BuildingLister : MonoBehaviour, IHasGui + { + public GameObject buildableDrawElement; + public GameObject buildingDesplayCanvas; + + public GameObject planedBuildingPrefab; + + bool guion; + + GameController GameCon; + + TogleGroupAdvanced toglegroup; + + BuildingListerStates state; + + public GameObject inBuilding; + public GameObject inSelecting; + + int SelectedBuilding; + + List buildingID; + + void Start() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + toglegroup = transform.FindChild("InSelecting").FindChild("Panel").GetComponent(); + state = BuildingListerStates.Idle; + + buildingID = new List(); + + foreach (KeyValuePair item in GameRegystry.buildings) + { + if (item.Value is IBuildable) + { + buildingID.Add(item.Key); + } + } + + for (int i = 0; i < buildingID.Count; i++) + { + GameObject actual = Instantiate(buildableDrawElement); + actual.transform.SetParent(buildingDesplayCanvas.transform); + actual.transform.SetSiblingIndex(i); + actual.transform.FindChild("Icon").GetComponent().sprite = ((IBuildable)GameRegystry.buildings[buildingID[i]]).GetImage(); + actual.GetComponent().group = toglegroup; + } + + } + + // Update is called once per frame + void Update() + { + + if (state == BuildingListerStates.Idle) + { + inBuilding.SetActive(false); + inSelecting.SetActive(false); + if (Input.GetButtonUp("BuildingList")) + { + Debug.Log("Buildning opening"); + + TogelGui(); + } + } + else if (state == BuildingListerStates.Building) + { + inBuilding.SetActive(true); + inSelecting.SetActive(false); + } + else if (state == BuildingListerStates.Selecting) + { + inBuilding.SetActive(false); + inSelecting.SetActive(true); + if (Input.GetButtonUp("BuildingList")) + { + Debug.Log("Buildning opening"); + + TogelGui(); + } + } + + if (Input.GetMouseButtonDown(0) && SelectedBuilding != -1 && state == BuildingListerStates.Building) + { + Vector3 ray = Camera.main.ScreenToWorldPoint(Input.mousePosition); + + TileVector pos = new TileVector(Mathf.Round(ray.x - 0.5f), -1 * Mathf.Round(ray.y + 0.5f + )); + + if (GameCon.map.Buildings.GetTileOn((int)pos.x, (int)pos.y) == null) + { + PlanedBuilding p = Instantiate(planedBuildingPrefab).GetComponent(); + GameCon.map.Buildings.SetTile(pos.x, pos.y, p.transform); + + p.SetBuilding(((IBuildable)GameRegystry.buildings[buildingID[SelectedBuilding]])); + + } + GameCon.CloseGUI(this); + Close(); + } + } + + public void BuildSelected() + { + SelectedBuilding = toglegroup.ActiveToggle().transform.GetSiblingIndex(); + if (SelectedBuilding == -1) + { + return; + } + + state = BuildingListerStates.Building; + } + + public void CancelBuilding() + { + SelectedBuilding = -1; + state = BuildingListerStates.Selecting; + } + + #region IhasGui + public void TogelGui() + { + if (!guion) + { + if (GameCon.AlloweGUI(this as IHasGui)) + { + Open(); + } + } + else + { + GameCon.CloseGUI(this as IHasGui); + Close(); + } + } + + public void Open() + { + guion = true; + state = BuildingListerStates.Selecting; + } + + public void Close() + { + guion = false; + state = BuildingListerStates.Idle; + } + + public int ClosingLevel() + { + if (state != BuildingListerStates.Building) + { + return 10; + } + else + { + return int.MaxValue; + } + } + #endregion + } + + public enum BuildingListerStates + { + Building, + Selecting, + Idle + } +} diff --git a/Assets/GUI/Buildables/BuildingLister.cs.meta b/Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs.meta similarity index 100% rename from Assets/GUI/Buildables/BuildingLister.cs.meta rename to Assets/CivMarsEngine/GUI/Buildables/BuildingLister.cs.meta diff --git a/Assets/GUI/Crafting Desplay.meta b/Assets/CivMarsEngine/GUI/Crafting Desplay.meta similarity index 100% rename from Assets/GUI/Crafting Desplay.meta rename to Assets/CivMarsEngine/GUI/Crafting Desplay.meta diff --git a/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs new file mode 100644 index 0000000..df7b35d --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs @@ -0,0 +1,189 @@ +using UnityEngine; +using System.Collections.Generic; +using UnityEngine.UI; + + +namespace CivMarsEngine +{ + public class CraftingDesplay : MonoBehaviour + { + public List recipes; + public string buildingID; + + public GameObject RecipeListCanvas; + public GameObject RecipeMaterialsCanvas; + public GameObject QueueCanvas; + public GameObject QueueMaterialsCanvas; + public Image RecipeIcon; + public Text RecipeText; + + public List recipesDesplayed; + public List recepiesDetealdMaterials; + public List queueDesplayed; + public List queueMaterialDesplayed; + + public GameObject recipeDesplayPref; + public GameObject queueItemPref; + public GameObject queueMaterialItemPref; + + public ICrafter crafter; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + UpdateQueue(); + } + + void UpdateQueue() + { + CraftingProcess[] k = crafter.GetQueue(); + + #region Queue + for (int i = 0; i < k.Length; i++) + { + if (i == queueDesplayed.Count) + { + queueDesplayed.Add(Instantiate(queueItemPref)); + queueDesplayed[i].GetComponent().Set(k[i].recipe.time, k[i].status, k[i].recipe.Crafted.texture, this); + queueDesplayed[i].transform.SetParent(QueueCanvas.transform); + } + else + { + queueDesplayed[i].GetComponent().Set(k[i].recipe.time, k[i].status, k[i].recipe.Crafted.texture, this); + } + } + + for (int i = k.Length; i < queueDesplayed.Count; i++) + { + Destroy(queueDesplayed[i]); + queueDesplayed.RemoveAt(i); + } + #endregion + + #region Queue Material; + if (k.Length > 0) + { + + for (int i = 0; i < k[0].recipe.Materials.Length; i++) + { + if (i == queueMaterialDesplayed.Count) + { + queueMaterialDesplayed.Add(Instantiate(queueMaterialItemPref)); + queueMaterialDesplayed[i].transform.FindChild("Image").GetComponent().sprite = k[0].recipe.Materials[i].texture; + queueMaterialDesplayed[i].transform.FindChild("Text").GetComponent().text = k[0].recipe.Materials[i].amount - k[0].materials[i] + "/" + k[0].recipe.Materials[i].amount; + queueMaterialDesplayed[i].transform.SetParent(QueueMaterialsCanvas.transform); + } + else + { + queueMaterialDesplayed[i].transform.FindChild("Image").GetComponent().sprite = k[0].recipe.Materials[i].texture; + queueMaterialDesplayed[i].transform.FindChild("Text").GetComponent().text = k[0].recipe.Materials[i].amount - k[0].materials[i] + "/" + k[0].recipe.Materials[i].amount; + } + } + + for (int i = k.Length; i < queueMaterialDesplayed.Count; i++) + { + Destroy(queueMaterialDesplayed[i]); + queueMaterialDesplayed.RemoveAt(i); + } + } + #endregion + + + } + + public void ChangeDetealsTab(int i) + { + if (i == -1) + { + RecipeIcon.sprite = null; + RecipeText.text = ""; + for (int j = 0; j < recepiesDetealdMaterials.Count; j++) + { + recepiesDetealdMaterials[j].SetActive(false); + } + } + else + { + RecipeIcon.sprite = recipes[i].Crafted.texture; + RecipeText.text = recipes[i].Crafted.ToString(); + + for (int j = 0; j < recepiesDetealdMaterials.Count; j++) + { + if (j == recipes[j].Materials.Length) + { + recepiesDetealdMaterials[j].SetActive(false); + } + else + { + recepiesDetealdMaterials[j].SetActive(true); + recepiesDetealdMaterials[j].transform.FindChild("Image").GetComponent().sprite = recipes[i].Materials[j].texture; + recepiesDetealdMaterials[j].transform.FindChild("Text").GetComponent().text = recipes[i].Materials[j].amount.ToString(); + Debug.Log(recipes[i].Materials[j].amount.ToString()); + + } + } + + for (int j = recepiesDetealdMaterials.Count; j < recipes[i].Materials.Length; j++) + { + recepiesDetealdMaterials.Add(Instantiate(queueMaterialItemPref)); + recepiesDetealdMaterials[j].transform.SetParent(RecipeMaterialsCanvas.transform); + recepiesDetealdMaterials[j].transform.FindChild("Image").GetComponent().sprite = recipes[i].Materials[j].texture; + recepiesDetealdMaterials[j].transform.FindChild("Text").GetComponent().text = recipes[i].Materials[j].amount.ToString(); + + } + } + + } + + public void AddToQueue(int i) + { + crafter.AddToQueue(i); + } + + public void RemoveFromQueue(int i) + { + crafter.RemoveFromQueue(i); + } + + public void SetBuilding(ICrafter b) + { + for (int i = 0; i < queueDesplayed.Count; i++) + { + Destroy(queueDesplayed[i]); + queueDesplayed.RemoveAt(i); + } + + for (int i = 0; i < recipesDesplayed.Count; i++) + { + Destroy(recipesDesplayed[i]); + } + + recipesDesplayed = new List(); + + if (b != null) + { + recipesDesplayed = new List(); + buildingID = b.GetCraftingID(); + crafter = b; + + recipes = GameRegystry.recepies[buildingID]; + + foreach (Recipe item in GameRegystry.recepies[buildingID]) + { + GameObject current = Instantiate(recipeDesplayPref); + recipesDesplayed.Add(current); + current.transform.FindChild("Image").GetComponent().sprite = item.Crafted.texture; + current.transform.SetParent(RecipeListCanvas.transform); + current.GetComponent().parent = this; + } + } + } + + } +} \ No newline at end of file diff --git a/Assets/GUI/Crafting Desplay/CraftingDesplay.cs.meta b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs.meta similarity index 100% rename from Assets/GUI/Crafting Desplay/CraftingDesplay.cs.meta rename to Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingDesplay.cs.meta diff --git a/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs new file mode 100644 index 0000000..355c287 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public class CraftingProcess + { + public Recipe recipe; + public float status; + //bool hasItems = false; + + int[] r_materials; + public int[] materials + { + get + { + return r_materials; + } + + set + { + r_materials = value; + bool k = true; + for (int i = 0; i < recipe.Materials.Length; i++) + { + if (r_materials[i] != 0) + { + k = false; + } + } + } + } + + public int amount; + + public CraftingProcess(Recipe r, int am) + { + recipe = r; + status = r.time; + materials = new int[r.Materials.Length]; + for (int i = 0; i < r.Materials.Length; i++) + { + materials[i] = r.Materials[i].amount; + } + amount = am; + } + + public bool HasItems() + { + for (int i = 0; i < recipe.Materials.Length; i++) + { + if (r_materials[i] != 0) + { + return false; + } + } + + return true; + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Crafting Desplay/CraftingProcess.cs.meta b/Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs.meta similarity index 100% rename from Assets/GUI/Crafting Desplay/CraftingProcess.cs.meta rename to Assets/CivMarsEngine/GUI/Crafting Desplay/CraftingProcess.cs.meta diff --git a/Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs b/Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs new file mode 100644 index 0000000..16de97d --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.EventSystems; +using System.Collections; + +namespace CivMarsEngine +{ + public class QueueItem : MonoBehaviour + { + + public CraftingDesplay parent; + + public Slider slider; + public Image image; + + /* + // Use this for initialization + void Start() + { + } + + // Update is called once per frame + void Update() + { + + } + */ + + public void Set(float max, float t, Sprite texture, CraftingDesplay p) + { + slider.maxValue = max; + slider.value = t; + image.sprite = texture; + parent = p; + } + + public void Remove() + { + parent.RemoveFromQueue(transform.GetSiblingIndex()); + } + } +} \ No newline at end of file diff --git a/Assets/GUI/Crafting Desplay/QueueItem.cs.meta b/Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs.meta similarity index 95% rename from Assets/GUI/Crafting Desplay/QueueItem.cs.meta rename to Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs.meta index 8961923..f938bc2 100644 --- a/Assets/GUI/Crafting Desplay/QueueItem.cs.meta +++ b/Assets/CivMarsEngine/GUI/Crafting Desplay/QueueItem.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 232e9f834b9e33c469d296deb0600b54 -timeCreated: 1448726693 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 232e9f834b9e33c469d296deb0600b54 +timeCreated: 1448726693 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs b/Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs new file mode 100644 index 0000000..1195d53 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs @@ -0,0 +1,41 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using System.Collections; +using System; + + +namespace CivMarsEngine +{ + public class RecipeButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler + { + + public CraftingDesplay parent; + + // Use this for initialization + void Start() + { + } + + // Update is called once per frame + void Update() + { + + } + + public void OnPointerEnter(PointerEventData eventData) + { + parent.ChangeDetealsTab(transform.GetSiblingIndex()); + } + + public void OnPointerExit(PointerEventData eventData) + { + parent.ChangeDetealsTab(-1); + } + + public void OnPointerClick(PointerEventData eventData) + { + parent.AddToQueue(transform.GetSiblingIndex()); + } + } + +} \ No newline at end of file diff --git a/Assets/GUI/Crafting Desplay/RecipeButton.cs.meta b/Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs.meta similarity index 100% rename from Assets/GUI/Crafting Desplay/RecipeButton.cs.meta rename to Assets/CivMarsEngine/GUI/Crafting Desplay/RecipeButton.cs.meta diff --git a/Assets/GUI/GUIHandler.cs b/Assets/CivMarsEngine/GUI/GUIHandler.cs similarity index 82% rename from Assets/GUI/GUIHandler.cs rename to Assets/CivMarsEngine/GUI/GUIHandler.cs index 851d294..2cdf010 100644 --- a/Assets/GUI/GUIHandler.cs +++ b/Assets/CivMarsEngine/GUI/GUIHandler.cs @@ -1,29 +1,30 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; -using System; - -public class GUIHandler : MonoBehaviour -{ - public AccesPanel AccesPanel; - - public ActionButton[] actions = new ActionButton[10]; - - - public InventoryDesplay defaultInventory; - public GasDesplay defaultGas; - public CraftingDesplay defaultCrafting; - - // Use this for initialization - void Start() - { - - - } - - // Update is called once per frame - void Update() - { - - } -} +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using System; +using CivMarsEngine; + +public class GUIHandler : MonoBehaviour +{ + public AccesPanel AccesPanel; + + public InventoryDesplay defaultInventory; + public GasDesplay defaultGas; + public CraftingDesplay defaultCrafting; + + /* + // Use this for initialization + void Start() + { + + + } + + // Update is called once per frame + void Update() + { + + } + */ + +} diff --git a/Assets/GUI/GUIHandler.cs.meta b/Assets/CivMarsEngine/GUI/GUIHandler.cs.meta similarity index 100% rename from Assets/GUI/GUIHandler.cs.meta rename to Assets/CivMarsEngine/GUI/GUIHandler.cs.meta diff --git a/Assets/GUI/Inventory.meta b/Assets/CivMarsEngine/GUI/Inventory.meta similarity index 100% rename from Assets/GUI/Inventory.meta rename to Assets/CivMarsEngine/GUI/Inventory.meta diff --git a/Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs new file mode 100644 index 0000000..f177605 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs @@ -0,0 +1,121 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMarsEngine +{ + public class PlayerInventory : MonoBehaviour + { + public GameObject InventoryCanvasPlayer; + //public GameObject InventoryCanvasOther; + + public GameObject InventoryDubleElement; + public GameObject InventoryElementBack; + + GameObject[] drawedInvPlayer = new GameObject[10]; + //GameObject[] drawedInvOther = new GameObject[10]; + + IInventory player; + //IInventory other; + + void Start() + { + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + } + + void Update() + { + UpdateInventory(); + } + + public void UpdateInventory() + { + + for (int i = 0; i < player.GetInventorySize(); i++) + { + GameObject actual = drawedInvPlayer[i]; + + //van itt item + if (player.GetStackInSlot(i) != null) + { + //Van kint valami + if (actual != null) + { + //Background element + if (actual.GetComponent() == null) + { + //Destroy back + Destroy(actual); + actual = null; + + //Create item + actual = null; + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(InventoryCanvasPlayer.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(player.GetStackInSlot(i), i); + + + } + //Item element + else + { + //update item + drawedInvPlayer[i].GetComponent().Set(player.GetStackInSlot(i), i); + + } + } + else + { + //create item + actual = null; + actual = Instantiate(InventoryDubleElement); + actual.transform.SetParent(InventoryCanvasPlayer.transform); + actual.transform.SetSiblingIndex(i); + + + actual.GetComponent().Set(player.GetStackInSlot(i), i); + } + } + //nics item + else + { + //Van kint valami + if (actual != null) + { + // background + if (actual.GetComponent() == null) + { + //OK + } + // Item element + else + { + //Destroy older + Destroy(actual); + actual = null; + + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(InventoryCanvasPlayer.transform); + actual.transform.SetSiblingIndex(i); + } + } + else + { + //Create Back + actual = null; + actual = Instantiate(InventoryElementBack); + actual.transform.SetParent(InventoryCanvasPlayer.transform); + actual.transform.SetSiblingIndex(i); + } + } + drawedInvPlayer[i] = actual; + } + } + + } +} \ No newline at end of file diff --git a/Assets/GUI/Inventory/PlayerInventory.cs.meta b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs.meta similarity index 95% rename from Assets/GUI/Inventory/PlayerInventory.cs.meta rename to Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs.meta index 1748c93..cec5e59 100644 --- a/Assets/GUI/Inventory/PlayerInventory.cs.meta +++ b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventory.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 90f1701421bfcdb4980981a334136186 -timeCreated: 1449316567 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 90f1701421bfcdb4980981a334136186 +timeCreated: 1449316567 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs new file mode 100644 index 0000000..ce9db48 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs @@ -0,0 +1,77 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + [AddComponentMenu("Inventory/Inventory Element")] + public class PlayerInventoryDrawedElement : MonoBehaviour + { + GameController GameCon; + + //public bool isPlayer; + public string drawname_name; + public int amount; + public int index; + + public GameObject nameDisplay; + public GameObject amountDisplay; + public GameObject iconDesplay; + + + // Use this for initialization + void Awake() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } + + // Update is called once per frame + void Update() + { + } + + + #region Set + /* + public void Set(int setAmount) + { + this.amount = setAmount; + amountDisplay.GetComponent().text = null; + amountDisplay.GetComponent().text = setAmount.ToString(); + + //Debug.Log("updated drawed inv element: amount: " + amount + " type: " + this.name + " obj: " + this.GetType().ToString()); + } + + public void Set(string setName) + { + this.drawname_name = setName; + //Debug.Log(setName); + + nameDisplay.GetComponent().text = setName.ToString(); + } + + public void Set(string setName, int setAmount) + { + Set(setName); + Set(setAmount); + } + */ + + public void Set(Item item, int i) + { + //isPlayer = isp; + //other = o; + //thisinv = t; + index = i; + + amount = item.amount; + amountDisplay.GetComponent().text = amount.ToString(); + + drawname_name = item.name; + nameDisplay.GetComponent().text = drawname_name; + + iconDesplay.GetComponent().sprite = item.texture; + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta similarity index 95% rename from Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta rename to Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta index ded6546..84861a8 100644 --- a/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta +++ b/Assets/CivMarsEngine/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: e99515fb53cbfb24a8b6eb1f9f704e91 -timeCreated: 1449317235 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e99515fb53cbfb24a8b6eb1f9f704e91 +timeCreated: 1449317235 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/MapListing.meta b/Assets/CivMarsEngine/GUI/MapListing.meta similarity index 100% rename from Assets/GUI/MapListing.meta rename to Assets/CivMarsEngine/GUI/MapListing.meta diff --git a/Assets/CivMarsEngine/GUI/MapListing/NewMap.cs b/Assets/CivMarsEngine/GUI/MapListing/NewMap.cs new file mode 100644 index 0000000..0a8e225 --- /dev/null +++ b/Assets/CivMarsEngine/GUI/MapListing/NewMap.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using UnityEngine.SceneManagement; +using CivMarsEngine; + +namespace CivMarsEngine +{ + public class NewMap : MonoBehaviour + { + public GameController GameCon; + + public InputField nameField; + public InputField seedField; + + AsyncOperation loadingmap; + + // Use this for initialization + void Start() + { + GameCon = GameObject.Find("_GameController").GetComponent(); + loadingmap = new AsyncOperation(); + } + + public void CreateMap() + { + SavedMapData map = new SavedMapData(int.Parse(seedField.text), nameField.text); + + GameCon.mapData = map; + + StartCoroutine(GameCon.LoadLevel("Main")); + } + } +} \ No newline at end of file diff --git a/Assets/GUI/MapListing/NewMap.cs.meta b/Assets/CivMarsEngine/GUI/MapListing/NewMap.cs.meta similarity index 100% rename from Assets/GUI/MapListing/NewMap.cs.meta rename to Assets/CivMarsEngine/GUI/MapListing/NewMap.cs.meta diff --git a/Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs b/Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs new file mode 100644 index 0000000..29d673e --- /dev/null +++ b/Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs @@ -0,0 +1,79 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using UnityEngine.UI; +using CivMarsEngine; + + +namespace CivMarsEngine +{ + public class SavedMapLister : MonoBehaviour + { + + GameController GameCon; + + public List desplayed = new List(); + + public GameObject desplayPref; + public GameObject canvas; + + public TogleGroupAdvanced togGrup; + + public Text mapName; + + /// Use this for initialization + void Awake() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } + + // Update is called once per frame + void Update() + { + Toggle num = togGrup.ActiveToggle(); + if (num == null) + { + mapName.text = ""; + } + else + { + + SavedMapData.DisplayDeteals selected = GameCon.savedMaps[num.transform.GetSiblingIndex()]; + mapName.text = selected.name; + } + } + + public void LoadSelected() + { + Toggle num = togGrup.ActiveToggle(); + if (num == null) + { + } + else + { + GameCon.mapData = GameCon.GetSavedMap(GameCon.savedMaps[num.transform.GetSiblingIndex()].path); + StartCoroutine(GameCon.LoadLevel("Main")); + } + } + + public void Refresh() + { + GameCon.LoadMaps(); + + foreach (GameObject item in desplayed) + { + Destroy(item); + } + + foreach (SavedMapData.DisplayDeteals item in GameCon.savedMaps) + { + GameObject a = Instantiate(desplayPref); + a.transform.SetParent(canvas.transform); + a.transform.FindChild("Name").GetComponent().text = item.name; + a.GetComponent().group = togGrup; + desplayed.Add(a); + } + } + + } +} \ No newline at end of file diff --git a/Assets/GUI/MapListing/SavedMapLister.cs.meta b/Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs.meta similarity index 100% rename from Assets/GUI/MapListing/SavedMapLister.cs.meta rename to Assets/CivMarsEngine/GUI/MapListing/SavedMapLister.cs.meta diff --git a/Assets/GUI/PauseTab.cs b/Assets/CivMarsEngine/GUI/PauseTab.cs similarity index 94% rename from Assets/GUI/PauseTab.cs rename to Assets/CivMarsEngine/GUI/PauseTab.cs index 195a193..4ad4933 100644 --- a/Assets/GUI/PauseTab.cs +++ b/Assets/CivMarsEngine/GUI/PauseTab.cs @@ -1,8 +1,9 @@ using UnityEngine; using System.Collections; -using System; - -public class PauseTab : MonoBehaviour, IHasGui +using System; +using CivMarsEngine; + +public class PauseTab : MonoBehaviour, IHasGui { bool on; @@ -16,60 +17,60 @@ void Start () { // Update is called once per frame void Update () { - if (Input.GetButtonUp("Pause")) - { - TogelGui(); + if (Input.GetButtonUp("Pause")) + { + TogelGui(); + } + } + + public void TogelGui() + { + if (!on) + { + if (GameCon.HasOpendGui()) + { + GameCon.CloseGUI(null); + } + else + { + if (GameCon.AlloweGUI(this)) + { + Open(); + } + } } - } - - public void TogelGui() - { - if (!on) - { - if (GameCon.HasOpendGui()) - { - GameCon.CloseGUI(null); - } - else - { - if (GameCon.AlloweGUI(this)) - { - Open(); - } - } - } - else - { - GameCon.CloseGUI(this); - Close(); - } - } - - public void Open() - { - Content.SetActive(true); - on = true; - } - - public void Close() - { - Content.SetActive(false); - on = false; - } - - public int ClosingLevel() - { - return int.MaxValue; - } - - public void SaveMap() - { - GameCon.SaveMap(); - } - - public void SaveNQuit() - { - GameCon.SaveMap(); - GameCon.QuitGame(); - } + else + { + GameCon.CloseGUI(this); + Close(); + } + } + + public void Open() + { + Content.SetActive(true); + on = true; + } + + public void Close() + { + Content.SetActive(false); + on = false; + } + + public int ClosingLevel() + { + return int.MaxValue; + } + + public void SaveMap() + { + GameCon.SaveMap(); + } + + public void SaveNQuit() + { + GameCon.SaveMap(); + GameCon.QuitGame(); + } } diff --git a/Assets/GUI/PauseTab.cs.meta b/Assets/CivMarsEngine/GUI/PauseTab.cs.meta similarity index 100% rename from Assets/GUI/PauseTab.cs.meta rename to Assets/CivMarsEngine/GUI/PauseTab.cs.meta diff --git a/Assets/GUI/PlayerStats.meta b/Assets/CivMarsEngine/GUI/PlayerStats.meta similarity index 100% rename from Assets/GUI/PlayerStats.meta rename to Assets/CivMarsEngine/GUI/PlayerStats.meta diff --git a/Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs b/Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs new file mode 100644 index 0000000..ed4ed6b --- /dev/null +++ b/Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using CivMarsEngine; + +namespace CivMarsEngine +{ + public class PlayerStatsSidebarDesplay : MonoBehaviour + { + public Slider OxigenSlider; + public Slider CarbonDioxideSlider; + public Image Health; + + GameController GameCon; + + //GameObject[] hRPeaces = new GameObject[10]; + + // Use this for initialization + void Start() + { + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } + + // Update is called once per frame + void Update() + { + GasTankCluster t = GameCon.playerclass.GetTankCluster(); + + OxigenSlider.value = t.GetTank(GasType.Oxigen).amount / t.GetTank(GasType.Oxigen).maxAmount; + CarbonDioxideSlider.value = t.GetTank(GasType.CarbonDeOxide).amount / t.GetTank(GasType.CarbonDeOxide).maxAmount; + + Health.color = new Color(0, 0, 0, 1 - GameCon.playerclass.health); + + /* + foreach (GameObject item in hRPeaces) + { + //item.transform.position = new Vector3(item.transform.position.x); + } + */ + } + } +} \ No newline at end of file diff --git a/Assets/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs.meta b/Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs.meta similarity index 100% rename from Assets/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs.meta rename to Assets/CivMarsEngine/GUI/PlayerStats/PlayerStatsSidebarDesplay.cs.meta diff --git a/Assets/GUI/UITextures.meta b/Assets/CivMarsEngine/GUI/UITextures.meta similarity index 95% rename from Assets/GUI/UITextures.meta rename to Assets/CivMarsEngine/GUI/UITextures.meta index 5159e95..0c2aea8 100644 --- a/Assets/GUI/UITextures.meta +++ b/Assets/CivMarsEngine/GUI/UITextures.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 8c1a24996afdb234590f79fc13e9c81b -folderAsset: yes -timeCreated: 1448801260 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8c1a24996afdb234590f79fc13e9c81b +folderAsset: yes +timeCreated: 1448801260 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Animation.meta b/Assets/CivMarsEngine/GUI/UITextures/Animation.meta similarity index 100% rename from Assets/GUI/UITextures/Animation.meta rename to Assets/CivMarsEngine/GUI/UITextures/Animation.meta diff --git a/Assets/GUI/UITextures/Fonts.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts.meta index 6526470..5580765 100644 --- a/Assets/GUI/UITextures/Fonts.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 04866a43f01a3d74590f4bf4206502d0 -folderAsset: yes -timeCreated: 1449001566 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 04866a43f01a3d74590f4bf4206502d0 +folderAsset: yes +timeCreated: 1449001566 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Consolas.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Consolas.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas.meta index 9d96ec6..adce0b3 100644 --- a/Assets/GUI/UITextures/Fonts/Consolas.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: c87e1939091425348975b789273b5625 -folderAsset: yes -timeCreated: 1449001586 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c87e1939091425348975b789273b5625 +folderAsset: yes +timeCreated: 1449001586 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF similarity index 100% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta index 2595666..d6386b8 100644 --- a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: eabdb8fe246655140bbb30fb1476f1de -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: eabdb8fe246655140bbb30fb1476f1de +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF similarity index 100% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta index 874595b..4e6373a 100644 --- a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 9f1a9c7411c571e479dfe4eb81cd1368 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9f1a9c7411c571e479dfe4eb81cd1368 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF similarity index 100% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta index d656b9f..a7f3fc0 100644 --- a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 271a35a004b7f96459bd2dc62e3076ae -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 271a35a004b7f96459bd2dc62e3076ae +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF similarity index 100% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF diff --git a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta index 5a636ca..c428bae 100644 --- a/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 0bb9dbbefb31df54094b8044d3a152c8 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0bb9dbbefb31df54094b8044d3a152c8 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Google.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Google.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google.meta index bdbaad6..e95791c 100644 --- a/Assets/GUI/UITextures/Fonts/Google.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 22138de56c4fe5d4faa7b031fe00f0da -folderAsset: yes -timeCreated: 1449001600 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 22138de56c4fe5d4faa7b031fe00f0da +folderAsset: yes +timeCreated: 1449001600 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf diff --git a/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta index 3dfc8c9..8ff7661 100644 --- a/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 393b1e2283a68b94f84e2bbaabc64318 -timeCreated: 1449001663 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 393b1e2283a68b94f84e2bbaabc64318 +timeCreated: 1449001663 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf diff --git a/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta index e79f43f..2d2ebed 100644 --- a/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: e5759157bd675904a9ab0103173475c5 -timeCreated: 1449001642 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e5759157bd675904a9ab0103173475c5 +timeCreated: 1449001642 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf diff --git a/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta index 32bb45b..87bbabd 100644 --- a/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 30a2dd171e2e59440a734a603e640bb6 -timeCreated: 1449001540 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 30a2dd171e2e59440a734a603e640bb6 +timeCreated: 1449001540 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf diff --git a/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta similarity index 95% rename from Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta index 391b048..13b8321 100644 --- a/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: f114ec948a28aac46a8a0baf8ff44612 -timeCreated: 1449001501 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f114ec948a28aac46a8a0baf8ff44612 +timeCreated: 1449001501 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Fonts/Michroma.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Michroma.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Michroma.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Michroma.ttf diff --git a/Assets/GUI/UITextures/Fonts/Michroma.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Michroma.ttf.meta similarity index 100% rename from Assets/GUI/UITextures/Fonts/Michroma.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Michroma.ttf.meta diff --git a/Assets/GUI/UITextures/Fonts/Other.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other.meta similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other.meta diff --git a/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Minecraft.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Minecraft.ttf diff --git a/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta diff --git a/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Squares Bold Free.otf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Squares Bold Free.otf diff --git a/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta diff --git a/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/monofonto.ttf similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/monofonto.ttf rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/monofonto.ttf diff --git a/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta b/Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/monofonto.ttf.meta similarity index 100% rename from Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta rename to Assets/CivMarsEngine/GUI/UITextures/Fonts/Other/monofonto.ttf.meta diff --git a/Assets/GUI/UITextures/GUI.Header.png b/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png similarity index 100% rename from Assets/GUI/UITextures/GUI.Header.png rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png diff --git a/Assets/GUI/UITextures/GUI.Header.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta similarity index 95% rename from Assets/GUI/UITextures/GUI.Header.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta index c59e2a8..54f8ad6 100644 --- a/Assets/GUI/UITextures/GUI.Header.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 0fac5183a68542f4585ed060192a365f -timeCreated: 1449315158 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0fac5183a68542f4585ed060192a365f +timeCreated: 1449315158 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/GUI.Inverted.png b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png similarity index 100% rename from Assets/GUI/UITextures/GUI.Inverted.png rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png diff --git a/Assets/GUI/UITextures/GUI.Inverted.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta similarity index 95% rename from Assets/GUI/UITextures/GUI.Inverted.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta index 3b00b4c..7b3dba9 100644 --- a/Assets/GUI/UITextures/GUI.Inverted.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7068eaecd68c2f341b7386d155509882 -timeCreated: 1449314286 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7068eaecd68c2f341b7386d155509882 +timeCreated: 1449314286 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/GUI.Inverted2.png b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png similarity index 100% rename from Assets/GUI/UITextures/GUI.Inverted2.png rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png diff --git a/Assets/GUI/UITextures/GUI.Inverted2.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta similarity index 95% rename from Assets/GUI/UITextures/GUI.Inverted2.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta index bb7ce03..9f1861d 100644 --- a/Assets/GUI/UITextures/GUI.Inverted2.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 99cfc7bc65b4343478d39c84e04a0005 -timeCreated: 1449316125 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 99cfc7bc65b4343478d39c84e04a0005 +timeCreated: 1449316125 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/GUI.base.png b/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png similarity index 100% rename from Assets/GUI/UITextures/GUI.base.png rename to Assets/CivMarsEngine/GUI/UITextures/GUI.base.png diff --git a/Assets/GUI/UITextures/GUI.base.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta similarity index 95% rename from Assets/GUI/UITextures/GUI.base.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta index e2fbeda..e99c6a3 100644 --- a/Assets/GUI/UITextures/GUI.base.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7fc277f0bb101e04ca1c0188b8f16d59 -timeCreated: 1449080092 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7fc277f0bb101e04ca1c0188b8f16d59 +timeCreated: 1449080092 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Noise.mat b/Assets/CivMarsEngine/GUI/UITextures/Noise.mat similarity index 100% rename from Assets/GUI/UITextures/Noise.mat rename to Assets/CivMarsEngine/GUI/UITextures/Noise.mat diff --git a/Assets/GUI/UITextures/Noise.mat.meta b/Assets/CivMarsEngine/GUI/UITextures/Noise.mat.meta similarity index 95% rename from Assets/GUI/UITextures/Noise.mat.meta rename to Assets/CivMarsEngine/GUI/UITextures/Noise.mat.meta index d9ffeaa..9ce9e12 100644 --- a/Assets/GUI/UITextures/Noise.mat.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Noise.mat.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: d6713d1ba52181a4486dc7cb3c150e82 -timeCreated: 1448806667 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: d6713d1ba52181a4486dc7cb3c150e82 +timeCreated: 1448806667 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/NoiseEffectGrain.png b/Assets/CivMarsEngine/GUI/UITextures/NoiseEffectGrain.png similarity index 100% rename from Assets/GUI/UITextures/NoiseEffectGrain.png rename to Assets/CivMarsEngine/GUI/UITextures/NoiseEffectGrain.png diff --git a/Assets/GUI/UITextures/NoiseEffectGrain.png.meta b/Assets/CivMarsEngine/GUI/UITextures/NoiseEffectGrain.png.meta similarity index 95% rename from Assets/GUI/UITextures/NoiseEffectGrain.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/NoiseEffectGrain.png.meta index 6f4b90a..a9a1333 100644 --- a/Assets/GUI/UITextures/NoiseEffectGrain.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/NoiseEffectGrain.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: ffa9c02760c2b4e8eb9814ec06c4b05b -timeCreated: 1448806696 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 2 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 0 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ffa9c02760c2b4e8eb9814ec06c4b05b +timeCreated: 1448806696 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 2 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Ring.full.png b/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png similarity index 100% rename from Assets/GUI/UITextures/Ring.full.png rename to Assets/CivMarsEngine/GUI/UITextures/Ring.full.png diff --git a/Assets/GUI/UITextures/Ring.full.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta similarity index 100% rename from Assets/GUI/UITextures/Ring.full.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta diff --git a/Assets/GUI/UITextures/Ring.png b/Assets/CivMarsEngine/GUI/UITextures/Ring.png similarity index 100% rename from Assets/GUI/UITextures/Ring.png rename to Assets/CivMarsEngine/GUI/UITextures/Ring.png diff --git a/Assets/GUI/UITextures/Ring.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta similarity index 95% rename from Assets/GUI/UITextures/Ring.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta index 947c889..a2d489a 100644 --- a/Assets/GUI/UITextures/Ring.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 2da70774bb3fb1a4ca35de73be77aed9 -timeCreated: 1449241165 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 256 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 2da70774bb3fb1a4ca35de73be77aed9 +timeCreated: 1449241165 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 256 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/Ring2.png b/Assets/CivMarsEngine/GUI/UITextures/Ring2.png similarity index 100% rename from Assets/GUI/UITextures/Ring2.png rename to Assets/CivMarsEngine/GUI/UITextures/Ring2.png diff --git a/Assets/GUI/UITextures/Ring2.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta similarity index 95% rename from Assets/GUI/UITextures/Ring2.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta index af6d751..a9eae88 100644 --- a/Assets/GUI/UITextures/Ring2.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: bbc55cc13fc683247ad356f7da2bd5b4 -timeCreated: 1449255822 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: bbc55cc13fc683247ad356f7da2bd5b4 +timeCreated: 1449255822 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/SideMenu.png b/Assets/CivMarsEngine/GUI/UITextures/SideMenu.png similarity index 100% rename from Assets/GUI/UITextures/SideMenu.png rename to Assets/CivMarsEngine/GUI/UITextures/SideMenu.png diff --git a/Assets/GUI/UITextures/SideMenu.png.meta b/Assets/CivMarsEngine/GUI/UITextures/SideMenu.png.meta similarity index 95% rename from Assets/GUI/UITextures/SideMenu.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/SideMenu.png.meta index b3ebdd6..64d3edd 100644 --- a/Assets/GUI/UITextures/SideMenu.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/SideMenu.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 52b199ad536282a44970513f637512c1 -timeCreated: 1448801260 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 52b199ad536282a44970513f637512c1 +timeCreated: 1448801260 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/SideMenuv2.png b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv2.png similarity index 100% rename from Assets/GUI/UITextures/SideMenuv2.png rename to Assets/CivMarsEngine/GUI/UITextures/SideMenuv2.png diff --git a/Assets/GUI/UITextures/SideMenuv2.png.meta b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv2.png.meta similarity index 95% rename from Assets/GUI/UITextures/SideMenuv2.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/SideMenuv2.png.meta index 5008965..1baae22 100644 --- a/Assets/GUI/UITextures/SideMenuv2.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 6867f2a1f077fa548892daa44aacd7c2 -timeCreated: 1448802831 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 0 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 6867f2a1f077fa548892daa44aacd7c2 +timeCreated: 1448802831 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 0 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/SideMenuv3.png b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv3.png similarity index 100% rename from Assets/GUI/UITextures/SideMenuv3.png rename to Assets/CivMarsEngine/GUI/UITextures/SideMenuv3.png diff --git a/Assets/GUI/UITextures/SideMenuv3.png.meta b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv3.png.meta similarity index 95% rename from Assets/GUI/UITextures/SideMenuv3.png.meta rename to Assets/CivMarsEngine/GUI/UITextures/SideMenuv3.png.meta index f8f5a83..5f4d3f3 100644 --- a/Assets/GUI/UITextures/SideMenuv3.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/SideMenuv3.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 81f19520dc61ae6448cc2dccd52581a9 -timeCreated: 1448904895 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 81f19520dc61ae6448cc2dccd52581a9 +timeCreated: 1448904895 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg b/Assets/CivMarsEngine/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg similarity index 100% rename from Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg rename to Assets/CivMarsEngine/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg diff --git a/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta b/Assets/CivMarsEngine/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta similarity index 95% rename from Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta rename to Assets/CivMarsEngine/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta index 81d6769..19cfd73 100644 --- a/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: c213f44e2f12ef143a08457fad8b736c -timeCreated: 1448806884 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c213f44e2f12ef143a08457fad8b736c +timeCreated: 1448806884 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/GameController.cs b/Assets/CivMarsEngine/GameController.cs new file mode 100644 index 0000000..59052b4 --- /dev/null +++ b/Assets/CivMarsEngine/GameController.cs @@ -0,0 +1,221 @@ +using UnityEngine; +using UnityEngine.SceneManagement; +using System.Collections; +using UnityEngine.UI; +using System; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters.Binary; +using System.IO; +using System.Collections.Generic; + +using CivMarsEngine.Registry; + +namespace CivMarsEngine +{ + public class GameController : MonoBehaviour + { + + public GameState gameS; + + //Gui + public int CanTurnOf; + IHasGui OpendGui; + + public Map map; + public Player playerclass; + + //settings + public int language; + + //UI + public GUIHandler guiHandler; + + public AssetsLoader Registry; + + //Map + public SavedMapData mapData; + + //Loading + AsyncOperation loadingmap; + + //Saved + public List savedMaps = new List(); + + void Awake() + { + Registry = this.GetComponent(); + } + + void Start() + { + Registry.CallRegister(); + + loadingmap = new AsyncOperation(); + DontDestroyOnLoad(transform.gameObject); + StartCoroutine(LoadLevel("Start")); + + gameS = GameState.MainManu; + } + + + public IEnumerator LoadLevel(string a) + { + + loadingmap = SceneManager.LoadSceneAsync(a); + + while (!loadingmap.isDone) + { + yield return loadingmap; + } + + loadingmap = null; + } + + public void Update() + { + if (gameS == GameState.Gui) + { + playerclass.GetComponent().isKinematic = true; + } + else if (gameS != GameState.MainManu) + { + playerclass.GetComponent().isKinematic = false; + } + } + + public bool HasOpendGui() + { + if (OpendGui == null) + { + return false; + } + else + { + return true; + } + } + + public bool AlloweGUI(IHasGui hasGui) + { + if (OpendGui != null) + { + CanTurnOf = OpendGui.ClosingLevel(); + } + if (CanTurnOf <= hasGui.ClosingLevel()) + { + if (OpendGui != null) + { + OpendGui.Close(); + } + OpendGui = hasGui; + + CanTurnOf = hasGui.ClosingLevel(); + + gameS = GameState.Gui; + return true; + } + else + { + return false; + } + } + + public void CloseGUI(IHasGui hasGui) + { + if (OpendGui != null) + { + OpendGui.Close(); + } + OpendGui = null; + gameS = GameState.InGame; + CanTurnOf = -1; + } + + void OnLevelWasLoaded(int level) + { + if (SceneManager.GetActiveScene().name == "Main") + { + guiHandler = GameObject.Find("_GUIHandler").GetComponent(); + map = GameObject.Find("Map").GetComponent(); + playerclass = GameObject.FindGameObjectWithTag("Player").GetComponent(); + + if (gameS == GameState.MainManu) + { + Debug.Log("Jeej!"); + + map.LoadMap(mapData); + + gameS = GameState.InGame; + + Camera.main.GetComponent().MapLoaded(); + } + + } + + } + + public void TogleAccesPanel() + { + guiHandler.AccesPanel.TogelGui(); + } + + public void ChangeLanguage(int num) + { + language = num; + } + + public void LoadMaps() + { + string[] files = Directory.GetFiles("./saves", "*.ddc", SearchOption.AllDirectories); + + for (int i = 0; i < savedMaps.Count; i++) + { + savedMaps.RemoveAt(i); + } + + foreach (string file in files) + { + IFormatter formatter = new BinaryFormatter(); + Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read); + SavedMapData.DisplayDeteals obj = (SavedMapData.DisplayDeteals)formatter.Deserialize(stream); + savedMaps.Add(obj); + stream.Close(); + } + } + + public SavedMapData GetSavedMap(string path) + { + IFormatter formatter = new BinaryFormatter(); + Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read); + SavedMapData obj = (SavedMapData)formatter.Deserialize(stream); + stream.Close(); + + return obj; + } + + + public void SaveMap() + { + mapData = map.Save(); + + DirectoryInfo a = Directory.CreateDirectory("./saves/" + mapData.name); + + IFormatter formatter = new BinaryFormatter(); + Stream stream = new FileStream("./saves/" + mapData.name + "/" + mapData.name + ".bin", FileMode.Create, FileAccess.Write, FileShare.None); + formatter.Serialize(stream, mapData); + stream.Close(); + + //IFormatter formatter = new BinaryFormatter(); + stream = new FileStream("./saves/" + mapData.name + "/" + mapData.name + ".ddc", FileMode.Create, FileAccess.Write, FileShare.None); + formatter.Serialize(stream, mapData.GetDeteails()); + stream.Close(); + + } + + public void QuitGame() + { + SceneManager.LoadScene("Start"); + gameS = GameState.MainManu; + } + } +} diff --git a/Assets/GameController.cs.meta b/Assets/CivMarsEngine/GameController.cs.meta similarity index 76% rename from Assets/GameController.cs.meta rename to Assets/CivMarsEngine/GameController.cs.meta index d9cb6f4..3f298cd 100644 --- a/Assets/GameController.cs.meta +++ b/Assets/CivMarsEngine/GameController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 320ec5351dc05ce4db4c662602605fef -timeCreated: 1437579355 +guid: 1e36b345d7bb3994a8e4fbb07d484cdb +timeCreated: 1450798792 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/GameState.cs b/Assets/CivMarsEngine/GameState.cs similarity index 92% rename from Assets/GameState.cs rename to Assets/CivMarsEngine/GameState.cs index 07adc40..d72a89a 100644 --- a/Assets/GameState.cs +++ b/Assets/CivMarsEngine/GameState.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public enum GameState -{ - InGame, - Gui, - MainManu - -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +public enum GameState +{ + InGame, + Gui, + MainManu + +} diff --git a/Assets/GameState.cs.meta b/Assets/CivMarsEngine/GameState.cs.meta similarity index 76% rename from Assets/GameState.cs.meta rename to Assets/CivMarsEngine/GameState.cs.meta index e81ca11..8d9d553 100644 --- a/Assets/GameState.cs.meta +++ b/Assets/CivMarsEngine/GameState.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 00abcc33a9d59124bb0390ff1f5758ac -timeCreated: 1438938039 +guid: bf54339ba6c85374f93dc72a98c2d379 +timeCreated: 1450798793 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/GasSystem.meta b/Assets/CivMarsEngine/GasSystem.meta similarity index 67% rename from Assets/GasSystem.meta rename to Assets/CivMarsEngine/GasSystem.meta index 4d50a86..649f431 100644 --- a/Assets/GasSystem.meta +++ b/Assets/CivMarsEngine/GasSystem.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d4a0b8fcf005b594ca6a3c983061d0d9 +guid: 3f4538e88980d9d4eabf0ca83a89799c folderAsset: yes -timeCreated: 1440689280 +timeCreated: 1450798791 licenseType: Free DefaultImporter: userData: diff --git a/Assets/GasSystem/GasObiects.cd b/Assets/CivMarsEngine/GasSystem/GasObiects.cd similarity index 97% rename from Assets/GasSystem/GasObiects.cd rename to Assets/CivMarsEngine/GasSystem/GasObiects.cd index 009644f..26944cb 100644 --- a/Assets/GasSystem/GasObiects.cd +++ b/Assets/CivMarsEngine/GasSystem/GasObiects.cd @@ -1,33 +1,33 @@ - - - - - - AAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Assets\GasSystem\GasDesplay.cs - - - - - - - AAAAAAAAAAAAAAAEAAAAEQAAAAAAgCAAAAAAAAAAAAA= - Assets\GasSystem\GasTank.cs - - - - - - AAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Assets\GasSystem\IGasTank.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAIAAAAAAAAAA= - Assets\GasSystem\GasType.cs - - - + + + + + + AAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= + Assets\GasSystem\GasDesplay.cs + + + + + + + AAAAAAAAAAAAAAAEAAAAEQAAAAAAgCAAAAAAAAAAAAA= + Assets\GasSystem\GasTank.cs + + + + + + AAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\GasSystem\IGasTank.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAIAAAAAAAAAA= + Assets\GasSystem\GasType.cs + + + \ No newline at end of file diff --git a/Assets/GasSystem/GasObiects.cd.meta b/Assets/CivMarsEngine/GasSystem/GasObiects.cd.meta similarity index 100% rename from Assets/GasSystem/GasObiects.cd.meta rename to Assets/CivMarsEngine/GasSystem/GasObiects.cd.meta diff --git a/Assets/GasSystem/GasSystem.dgml b/Assets/CivMarsEngine/GasSystem/GasSystem.dgml similarity index 99% rename from Assets/GasSystem/GasSystem.dgml rename to Assets/CivMarsEngine/GasSystem/GasSystem.dgml index 2181120..cf57735 100644 --- a/Assets/GasSystem/GasSystem.dgml +++ b/Assets/CivMarsEngine/GasSystem/GasSystem.dgml @@ -1,43 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/GasSystem/GasSystem.dgml.meta b/Assets/CivMarsEngine/GasSystem/GasSystem.dgml.meta similarity index 100% rename from Assets/GasSystem/GasSystem.dgml.meta rename to Assets/CivMarsEngine/GasSystem/GasSystem.dgml.meta diff --git a/Assets/CivMarsEngine/GasSystem/GasTank.cs b/Assets/CivMarsEngine/GasSystem/GasTank.cs new file mode 100644 index 0000000..e809f57 --- /dev/null +++ b/Assets/CivMarsEngine/GasSystem/GasTank.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + + +namespace CivMarsEngine +{ + public class GasTank + { + public GasType gasType; + public float amount; + public float maxAmount; + public bool locked; + + public GasTank(float max) + { + this.maxAmount = max; + } + + public bool CanAccept() + { + return true; + } + + public float AddAmount(float addAmount) + { + amount += addAmount; + if (amount <= maxAmount) + { + return 0; + } + else + { + float reamaining = amount - maxAmount; + amount = maxAmount; + return reamaining; + } + } + + public float AddAmount(float addAmount, GasType t) + { + if (t == gasType) + { + return AddAmount(addAmount); + } + else if (amount == 0 && gasType == GasType.Null) + { + gasType = t; + return AddAmount(addAmount); + } + return -1; + } + + public float RemoveAmount(float remAmount) + { + float old = amount; + amount -= remAmount; + if (amount >= 0) + { + return 0; + } + else + { + float reamaining = remAmount - old; + amount = 0; + if (!locked) + { + gasType = GasType.Null; + } + return reamaining; + } + } + + public void RemoveAmount(float remAmount, GasType t) + { + if (t == gasType) + { + RemoveAmount(remAmount); + } + } + + public void Transfer(GasTank other, float transAmount) + { + GasType b = gasType; + if (other.gasType == gasType || other.gasType == GasType.Null) + { + float rem = this.RemoveAmount(transAmount); + if (rem == 0) + { + other.AddAmount(transAmount, b); + } + else + { + Debug.Log(rem); + other.AddAmount(rem, b); + } + } + } + + public void SetLocked(bool a) + { + locked = a; + } + } +} \ No newline at end of file diff --git a/Assets/GasSystem/GasTank.cs.meta b/Assets/CivMarsEngine/GasSystem/GasTank.cs.meta similarity index 100% rename from Assets/GasSystem/GasTank.cs.meta rename to Assets/CivMarsEngine/GasSystem/GasTank.cs.meta diff --git a/Assets/CivMarsEngine/GasSystem/GasTankCluster.cs b/Assets/CivMarsEngine/GasSystem/GasTankCluster.cs new file mode 100644 index 0000000..27eea50 --- /dev/null +++ b/Assets/CivMarsEngine/GasSystem/GasTankCluster.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMarsEngine +{ + public class GasTankCluster + { + GasTank[] tanks; + + public int size; + + public GasTankCluster(int i, float[] max) + { + tanks = new GasTank[i]; + size = i; + for (int k = 0; k < i; k++) + { + tanks[k] = new GasTank(max[k]); + } + } + + public float AddGas(float rAmount, GasType t) + { + float size = rAmount; + + foreach (GasTank item in tanks) + { + + if (item.gasType != GasType.Null) + { + + if (item.gasType == t) + { + Debug.Log(item.gasType); + + size = item.AddAmount(rAmount); + + Debug.Log("Inventory added: " + item.gasType + " Amount: " + item.amount); + if (size == 0) + { + return 0; + } + rAmount = size; + } + } + } + + for (int i = 0; i < 10; i++) + { + if (tanks[i] == null) + { + tanks[i].AddAmount(rAmount); + return rAmount; + } + } + if (rAmount == 0) + { + return 0; + } + else + { + return rAmount; + } + } + + + public GasTank GetTank(int i) + { + return tanks[i]; + } + + public GasTank GetTank(GasType i) + { + foreach (var item in tanks) + { + if (item.gasType == i) + { + return item; + } + } + return null; + + } + + public List GetTanks(GasType i) + { + List a = new List(); + + foreach (var item in tanks) + { + if (item.gasType == i) + { + a.Add(item); + } + } + if (a.Count == 0) + { + return null; + } + return a; + + } + } +} \ No newline at end of file diff --git a/Assets/GasSystem/GasTankCluster.cs.meta b/Assets/CivMarsEngine/GasSystem/GasTankCluster.cs.meta similarity index 100% rename from Assets/GasSystem/GasTankCluster.cs.meta rename to Assets/CivMarsEngine/GasSystem/GasTankCluster.cs.meta diff --git a/Assets/GasSystem/GasType.cs b/Assets/CivMarsEngine/GasSystem/GasType.cs similarity index 52% rename from Assets/GasSystem/GasType.cs rename to Assets/CivMarsEngine/GasSystem/GasType.cs index 933e5ce..8ecc1cf 100644 --- a/Assets/GasSystem/GasType.cs +++ b/Assets/CivMarsEngine/GasSystem/GasType.cs @@ -1,11 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public enum GasType -{ - Null, - Oxigen, - CarbonDeOxide +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public enum GasType + { + Null, + Oxigen, + CarbonDeOxide + } } \ No newline at end of file diff --git a/Assets/GasSystem/GasType.cs.meta b/Assets/CivMarsEngine/GasSystem/GasType.cs.meta similarity index 100% rename from Assets/GasSystem/GasType.cs.meta rename to Assets/CivMarsEngine/GasSystem/GasType.cs.meta diff --git a/Assets/GasSystem/IGasTank.cs b/Assets/CivMarsEngine/GasSystem/IGasTank.cs similarity index 50% rename from Assets/GasSystem/IGasTank.cs rename to Assets/CivMarsEngine/GasSystem/IGasTank.cs index 90c026a..442d044 100644 --- a/Assets/GasSystem/IGasTank.cs +++ b/Assets/CivMarsEngine/GasSystem/IGasTank.cs @@ -1,9 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public interface IGasTank -{ - GasTankCluster GetTankCluster(); +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public interface IGasTank + { + GasTankCluster GetTankCluster(); + } } \ No newline at end of file diff --git a/Assets/GasSystem/IGasTank.cs.meta b/Assets/CivMarsEngine/GasSystem/IGasTank.cs.meta similarity index 100% rename from Assets/GasSystem/IGasTank.cs.meta rename to Assets/CivMarsEngine/GasSystem/IGasTank.cs.meta diff --git a/Assets/CivMarsEngine/InputHandler.cs b/Assets/CivMarsEngine/InputHandler.cs new file mode 100644 index 0000000..5c6ed8e --- /dev/null +++ b/Assets/CivMarsEngine/InputHandler.cs @@ -0,0 +1,41 @@ +using UnityEngine; +using System.Collections; +using CivMarsEngine; + +namespace CivMarsEngine +{ + public class InputHandler : MonoBehaviour + { + + public GameController GameCon; + + // Use this for initialization + void Start() + { + GameCon = GameObject.Find("_GameController").GetComponent(); + } + + void Awake() + { + DontDestroyOnLoad(transform.gameObject); + } + /* + // Update is called once per frame + void Update() + { + + if (GameCon.gameIsOn) + { + //Debug.Log("Check key"); + + if (Input.GetButtonUp("Mine") && (GameCon.gameS == GameState.InGame)) + { + Debug.Log("Mine"); + GameCon.playerclass.MineStar(); + } + } + + } + */ + } +} \ No newline at end of file diff --git a/Assets/InputHandler.cs.meta b/Assets/CivMarsEngine/InputHandler.cs.meta similarity index 76% rename from Assets/InputHandler.cs.meta rename to Assets/CivMarsEngine/InputHandler.cs.meta index 63328bb..8a5f0d3 100644 --- a/Assets/InputHandler.cs.meta +++ b/Assets/CivMarsEngine/InputHandler.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 279588099dc661349b5027691e78465b -timeCreated: 1438325158 +guid: 7d787404efa9b9d4f96bff82f6ca28d0 +timeCreated: 1450798793 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Interfaces.meta b/Assets/CivMarsEngine/Interfaces.meta similarity index 67% rename from Assets/Interfaces.meta rename to Assets/CivMarsEngine/Interfaces.meta index 169d4f0..5c836fa 100644 --- a/Assets/Interfaces.meta +++ b/Assets/CivMarsEngine/Interfaces.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a31f7f261a24252498e6f30e806344a0 +guid: 66725c71f87e27f4295f5d503fe8062a folderAsset: yes -timeCreated: 1443810980 +timeCreated: 1450798791 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMarsEngine/Interfaces/IBuildable.cs b/Assets/CivMarsEngine/Interfaces/IBuildable.cs new file mode 100644 index 0000000..aa7248c --- /dev/null +++ b/Assets/CivMarsEngine/Interfaces/IBuildable.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +using UnityEngine.UI; + +namespace CivMarsEngine +{ + public interface IBuildable + { + float GetBuildtime(); + + Sprite GetImage(); + + GameObject GetPrefab(); + + Image GetBuildedState(); + + Item[] GetNeededMaterials(); + + void Setup(); + } +} \ No newline at end of file diff --git a/Assets/Interfaces/IBuildable.cs.meta b/Assets/CivMarsEngine/Interfaces/IBuildable.cs.meta similarity index 100% rename from Assets/Interfaces/IBuildable.cs.meta rename to Assets/CivMarsEngine/Interfaces/IBuildable.cs.meta diff --git a/Assets/CivMarsEngine/Interfaces/ICrafter.cs b/Assets/CivMarsEngine/Interfaces/ICrafter.cs new file mode 100644 index 0000000..582da27 --- /dev/null +++ b/Assets/CivMarsEngine/Interfaces/ICrafter.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public interface ICrafter + { + void AddToQueue(int i); + + void RemoveFromQueue(int i); + + CraftingProcess[] GetQueue(); + + string GetCraftingID(); + + } +} \ No newline at end of file diff --git a/Assets/Crafting/ICrafter.cs.meta b/Assets/CivMarsEngine/Interfaces/ICrafter.cs.meta similarity index 100% rename from Assets/Crafting/ICrafter.cs.meta rename to Assets/CivMarsEngine/Interfaces/ICrafter.cs.meta diff --git a/Assets/CivMarsEngine/Interfaces/IHasGui.cs b/Assets/CivMarsEngine/Interfaces/IHasGui.cs new file mode 100644 index 0000000..8558f76 --- /dev/null +++ b/Assets/CivMarsEngine/Interfaces/IHasGui.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public interface IHasGui + { + void TogelGui(); + + void Open(); + + void Close(); + + int ClosingLevel(); + + + } +} \ No newline at end of file diff --git a/Assets/Interfaces/IHasGui.cs.meta b/Assets/CivMarsEngine/Interfaces/IHasGui.cs.meta similarity index 100% rename from Assets/Interfaces/IHasGui.cs.meta rename to Assets/CivMarsEngine/Interfaces/IHasGui.cs.meta diff --git a/Assets/GUI/GuiType.cs b/Assets/CivMarsEngine/Interfaces/IRegystratabe.cs similarity index 54% rename from Assets/GUI/GuiType.cs rename to Assets/CivMarsEngine/Interfaces/IRegystratabe.cs index 68a67c4..936f034 100644 --- a/Assets/GUI/GuiType.cs +++ b/Assets/CivMarsEngine/Interfaces/IRegystratabe.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - public enum GuiType - { - Closable, - UnClosable, - None - } - +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public interface IRegystratabe + { + void Regystrate(); + } +} \ No newline at end of file diff --git a/Assets/Interfaces/IRegystratabe.cs.meta b/Assets/CivMarsEngine/Interfaces/IRegystratabe.cs.meta similarity index 100% rename from Assets/Interfaces/IRegystratabe.cs.meta rename to Assets/CivMarsEngine/Interfaces/IRegystratabe.cs.meta diff --git a/Assets/CivMarsEngine/Interfaces/ISaveble.cs b/Assets/CivMarsEngine/Interfaces/ISaveble.cs new file mode 100644 index 0000000..dad12ad --- /dev/null +++ b/Assets/CivMarsEngine/Interfaces/ISaveble.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMarsEngine +{ + interface ISaveble + { + SavedTile Save(); + + void Load(SavedTile data); + + GameObject GetPrefab(); + } +} \ No newline at end of file diff --git a/Assets/Interfaces/ISaveble.cs.meta b/Assets/CivMarsEngine/Interfaces/ISaveble.cs.meta similarity index 100% rename from Assets/Interfaces/ISaveble.cs.meta rename to Assets/CivMarsEngine/Interfaces/ISaveble.cs.meta diff --git a/Assets/CivMarsEngine/Interfaces/IWorldGen.cs b/Assets/CivMarsEngine/Interfaces/IWorldGen.cs new file mode 100644 index 0000000..f168348 --- /dev/null +++ b/Assets/CivMarsEngine/Interfaces/IWorldGen.cs @@ -0,0 +1,8 @@ + +namespace CivMarsEngine +{ + public interface IWorldGen + { + void Generate(System.Random r, TileMap map); + } +} \ No newline at end of file diff --git a/Assets/Interfaces/IWorldGen.cs.meta b/Assets/CivMarsEngine/Interfaces/IWorldGen.cs.meta similarity index 95% rename from Assets/Interfaces/IWorldGen.cs.meta rename to Assets/CivMarsEngine/Interfaces/IWorldGen.cs.meta index 7354591..7864fb8 100644 --- a/Assets/Interfaces/IWorldGen.cs.meta +++ b/Assets/CivMarsEngine/Interfaces/IWorldGen.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 9e261beaea0c372429f7583c092894a3 -timeCreated: 1446131198 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9e261beaea0c372429f7583c092894a3 +timeCreated: 1446131198 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/InventorySystem.meta b/Assets/CivMarsEngine/InventorySystem.meta new file mode 100644 index 0000000..bd6d71c --- /dev/null +++ b/Assets/CivMarsEngine/InventorySystem.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a5196bf8aa5eecc40b41709dd8837d4c +folderAsset: yes +timeCreated: 1450798791 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMarsEngine/InventorySystem/IInventory.cs b/Assets/CivMarsEngine/InventorySystem/IInventory.cs new file mode 100644 index 0000000..92f79dc --- /dev/null +++ b/Assets/CivMarsEngine/InventorySystem/IInventory.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CivMarsEngine +{ + public interface IInventory + { + //Inventory GetInventory(); + + + /// + /// Returns the number of slots in the inventory. + /// + /// + int GetInventorySize(); + + /// + /// Returns the name of the inventory + /// + /// + String GetInventoryName(); + + /// + /// Returns if the inventory is named + /// + /// True if named + bool HasCustomInventoryName(); + + /// + /// Returns the item in slot i + /// + /// + /// + Item GetStackInSlot(int i); + + /// + /// Returns the maximum stack size for a inventory slot. + /// + /// + /// + int GetInventoryStackLimit(int i); + + /// + /// Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. + /// + /// Number of the slot + /// The item + /// True if allowed + bool IsItemValidForSlot(int slot, Item givenItem); + + //Do not make give this method the name canInteractWith because it clashes with Container + bool IsUseableByPlayer(Player p_70300_1_); + + //Adds the item to the inventory returns the remained amount + Item Add(Item i); + + //Removes the item to the inventory returns the remained amount + Item Remove(Item i); + + /// + /// Transfers a item from this inventory to a other + /// + /// other inv to transfer to + /// this inventorys index to transfer + void TransferItem(IInventory ToInv, int index); + + /// + /// Transfers a specific amount of a item from this inventory to a other + /// + /// other inv to transfer to + /// this inventorys index to transfer + /// amount to tramsfer + void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount); + } +} \ No newline at end of file diff --git a/Assets/Interfaces/IInventory.cs.meta b/Assets/CivMarsEngine/InventorySystem/IInventory.cs.meta similarity index 100% rename from Assets/Interfaces/IInventory.cs.meta rename to Assets/CivMarsEngine/InventorySystem/IInventory.cs.meta diff --git a/Assets/CivMarsEngine/InventorySystem/Inventory.cs b/Assets/CivMarsEngine/InventorySystem/Inventory.cs new file mode 100644 index 0000000..ed48957 --- /dev/null +++ b/Assets/CivMarsEngine/InventorySystem/Inventory.cs @@ -0,0 +1,215 @@ +using UnityEngine; +using System.Collections; +using System; + +namespace CivMarsEngine +{ + [System.Serializable] + public class Inventory + { + + public Item[] inventory; + + public int size; + + + public Inventory(int InventorySize) + { + if (InventorySize < 1) + Debug.LogErrorFormat("Inventory size can't be less than 0", this); + inventory = new Item[InventorySize]; + this.size = InventorySize; + } + + + public Item Add(Item adding) + { + //int size = adding.amount; + + foreach (Item item in inventory) + { + if (item != null) + { + if (item.GetType() == adding.GetType()) + { + //Debug.Log(adding.GetType()); + adding.amount = item.Add(adding.amount); + + Debug.Log("Inventory added: " + item.GetType() + " Amount: " + adding.amount); + + if (adding.amount == -1) + { + return null; + } + } + } + } + + for (int i = 0; i < size; i++) + { + if (inventory[i] == null) + { + inventory[i] = adding; + return null; + } + } + + return null; + + } + + + public Item Remove(Item removing) + { + for (int i = 0; i < inventory.GetLength(0); i++) + { + Item item = inventory[i]; + if (item != null) + { + if (item.GetType() == removing.GetType()) + { + //Debug.Log(adding.GetType()); + removing.amount = item.Remove(removing.amount); + Debug.Log("Inventory added: " + item.GetType() + " Amount: " + item.amount); + + Check(i); + + + } + } + } + if (removing.amount == -1) + { + return null; + } + return removing; + + } + + void Check(int i) + { + if (inventory[i].amount <= 0) + { + inventory[i] = null; + } + } + + /// + /// Remove item at index + /// + /// index of the item + public void Remove(int index) + { + inventory[index] = null; + } + + + /// + /// Remove amount from item at index + /// + /// index of the item + /// amount to remove + public int Remove(int index, int amount) + { + int remaining = inventory[index].Remove(amount); + if (remaining >= 0) + { + inventory[index] = null; + return -1; + } + return remaining; + + } + + /// + /// Finds the Iten witch is T + /// Returns null if not found + /// + /// Type of item + /// The first item witch matches + public Item Find() + { + foreach (Item i in inventory) + { + if (i is T) + { + return i; + } + } + + return null; + } + + /// + /// Gives the item at the index + /// + /// index + /// Item + public Item Get(int i) + { + return inventory[i]; + } + + /// + /// Transfers a item from this inventory to a other + /// + /// other inv to transfer to + /// this inventorys index to transfer + public void TransferItem(IInventory ToInv, int fromindex) + { + Item r = ToInv.Add(this.Get(fromindex)); + if (r != null) + this.Remove(fromindex, this.Get(fromindex).amount - r.amount); + else + this.Remove(fromindex); + } + + /// + /// Transfers a specific amount of a item from this inventory to a other + /// + /// other inv to transfer to + /// this inventorys index to transfer + /// amount to tramsfer + public void TransferItemAmount(IInventory ToInv, int fromindex, int transferingAmount) + { + Debug.Log(inventory[fromindex]); + + int remaining = inventory[fromindex].amount - transferingAmount; + + Item addable = (((Item)Activator.CreateInstance(null, inventory[fromindex].GetType().ToString()).Unwrap())); + + if (remaining < 0) + { + addable.amount = transferingAmount; + } + else + { + addable.amount = transferingAmount - remaining; + } + Item r = ToInv.Add(this.Get(fromindex)); + this.Remove(fromindex, this.Get(fromindex).amount - r.amount); + Check(fromindex); + } + + + /* + public int AddAmount(int rAmount, Item i) + { + if ((i.amount + rAmount) > (i.maxStackSize)) + { + int reamaining = (i.amount + rAmount) - i.maxStackSize; + i.amount = i.maxStackSize; + Debug.Log(i.amount); + return reamaining; + } + else + { + i.amount = i.amount + rAmount; + Debug.Log(i.amount); + return 0; + } + + } + */ + } +} diff --git a/Assets/Inventory.cs.meta b/Assets/CivMarsEngine/InventorySystem/Inventory.cs.meta similarity index 76% rename from Assets/Inventory.cs.meta rename to Assets/CivMarsEngine/InventorySystem/Inventory.cs.meta index 6bfd916..ff7b615 100644 --- a/Assets/Inventory.cs.meta +++ b/Assets/CivMarsEngine/InventorySystem/Inventory.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: e972b213b30b0344e9c97be76eee29d8 -timeCreated: 1437995144 +guid: da541832d6de5fd49a6b997ad67c2a30 +timeCreated: 1450798794 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Language.cs b/Assets/CivMarsEngine/Language.cs similarity index 100% rename from Assets/Language.cs rename to Assets/CivMarsEngine/Language.cs diff --git a/Assets/Language.cs.meta b/Assets/CivMarsEngine/Language.cs.meta similarity index 76% rename from Assets/Language.cs.meta rename to Assets/CivMarsEngine/Language.cs.meta index f80e83e..a6e3f67 100644 --- a/Assets/Language.cs.meta +++ b/Assets/CivMarsEngine/Language.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b2f26d04667fe8c44af62c54d78a8482 -timeCreated: 1437851766 +guid: 92b2e18001adf144d8096880974fe0d5 +timeCreated: 1450798793 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Map.cs b/Assets/CivMarsEngine/Map.cs similarity index 95% rename from Assets/Map.cs rename to Assets/CivMarsEngine/Map.cs index f27528e..641a7a9 100644 --- a/Assets/Map.cs +++ b/Assets/CivMarsEngine/Map.cs @@ -1,133 +1,134 @@ -using UnityEngine; -using System.Collections; -using System.IO; - -public class Map : MonoBehaviour -{ - public int seed; - public int mapHeight = 100; - - public Vector3 posMultiplyer; - - public TileMap Generated; - public TileMap GeneratedReloaded; - public TileMap Buildings; - - public SavedMapData mapData; - - // Use this for initialization - void Start() - { - //mapGenerated = new GeneratedTile[mapHeight, mapHeight]; - - //mapBuilt = new Building[mapHeight, mapHeight]; - } - - - - public void BuildMap() - { - //987, - System.Random r = new System.Random(mapData.seed); - - foreach (IWorldGen item in GameRegystry.ores.Values) - { - item.Generate(r, Generated); - } - - /* - SavedMap a = new SavedMap(this); - a.Save("./Map.bin"); - - SavedMap b = new SavedMap("./Map.bin", this); - b.LoadFromSave(); - */ - - } - - public void AddBasicBuildings() - { - int xMpos; - xMpos = mapHeight / 2; - - TileTransform mainBuilding = Instantiate(GameRegystry.buildings[CivMars.MainBuilding.ID].gameObject).GetComponent(); - Buildings.SetTile(xMpos, xMpos, mainBuilding); - - TileTransform chest = Instantiate(GameRegystry.buildings[CivMars.Chest.ID].gameObject).GetComponent(); - Buildings.SetTile(xMpos+5, xMpos+5, chest); - - } - - - public SavedMapData Save() - { - for (int i = 0; i < mapHeight; i++) - { - for (int j = 0; j < mapHeight; j++) - { - TileTransform tile = Generated.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapData.GeaneratedTiles[i, j] = ((ISaveble)t).Save(); - } - } - - - tile = Buildings.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapData.BuildingTiles[i, j] = ((ISaveble)t).Save(); - } - } - } - } - - return mapData; - } - - public void LoadMap(SavedMapData savedMap) - { - mapData = savedMap; - if (mapData.generated) - { - for (int i = 0; i < mapData.height; i++) - { - for (int j = 0; j < mapData.height; j++) - { - SavedTile tile = mapData.GeaneratedTiles[i, j]; - if (tile != null) - { - if (tile is SavedOre) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); - Generated.SetTile(i, j, trans); - } - } - - tile = mapData.BuildingTiles[i, j]; - if (tile != null) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.buildings[tile.ID]).GetPrefab()).GetComponent(); - Buildings.SetTile(i, j, trans); - } - } - } - } - else - { - BuildMap(); - AddBasicBuildings(); - mapData.SetSize(mapHeight); - mapData.generated = true; - } - } - -} +using UnityEngine; +using System.Collections; +using System.IO; +using CivMarsEngine; + +public class Map : MonoBehaviour +{ + public int seed; + public int mapHeight = 100; + + public Vector3 posMultiplyer; + + public TileMap Generated; + public TileMap GeneratedReloaded; + public TileMap Buildings; + + public SavedMapData mapData; + + // Use this for initialization + void Start() + { + //mapGenerated = new GeneratedTile[mapHeight, mapHeight]; + + //mapBuilt = new Building[mapHeight, mapHeight]; + } + + + + public void BuildMap() + { + //987, + System.Random r = new System.Random(mapData.seed); + + foreach (IWorldGen item in GameRegystry.ores.Values) + { + item.Generate(r, Generated); + } + + /* + SavedMap a = new SavedMap(this); + a.Save("./Map.bin"); + + SavedMap b = new SavedMap("./Map.bin", this); + b.LoadFromSave(); + */ + + } + + public void AddBasicBuildings() + { + int xMpos; + xMpos = mapHeight / 2; + + TileTransform mainBuilding = Instantiate(GameRegystry.buildings[CivMars.MainBuilding.ID].gameObject).GetComponent(); + Buildings.SetTile(xMpos, xMpos, mainBuilding); + + TileTransform chest = Instantiate(GameRegystry.buildings[CivMars.Chest.ID].gameObject).GetComponent(); + Buildings.SetTile(xMpos+5, xMpos+5, chest); + + } + + + public SavedMapData Save() + { + for (int i = 0; i < mapHeight; i++) + { + for (int j = 0; j < mapHeight; j++) + { + TileTransform tile = Generated.GetTileOn(i, j); + if (tile != null) + { + Tiled t = tile.GetComponent(); + + if (t is ISaveble) + { + mapData.GeaneratedTiles[i, j] = ((ISaveble)t).Save(); + } + } + + + tile = Buildings.GetTileOn(i, j); + if (tile != null) + { + Tiled t = tile.GetComponent(); + + if (t is ISaveble) + { + mapData.BuildingTiles[i, j] = ((ISaveble)t).Save(); + } + } + } + } + + return mapData; + } + + public void LoadMap(SavedMapData savedMap) + { + mapData = savedMap; + if (mapData.generated) + { + for (int i = 0; i < mapData.height; i++) + { + for (int j = 0; j < mapData.height; j++) + { + SavedTile tile = mapData.GeaneratedTiles[i, j]; + if (tile != null) + { + if (tile is SavedOre) + { + TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); + Generated.SetTile(i, j, trans); + } + } + + tile = mapData.BuildingTiles[i, j]; + if (tile != null) + { + TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.buildings[tile.ID]).GetPrefab()).GetComponent(); + Buildings.SetTile(i, j, trans); + } + } + } + } + else + { + BuildMap(); + AddBasicBuildings(); + mapData.SetSize(mapHeight); + mapData.generated = true; + } + } + +} diff --git a/Assets/Map.cs.meta b/Assets/CivMarsEngine/Map.cs.meta similarity index 76% rename from Assets/Map.cs.meta rename to Assets/CivMarsEngine/Map.cs.meta index 46ec713..a0fd2c7 100644 --- a/Assets/Map.cs.meta +++ b/Assets/CivMarsEngine/Map.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 00eab8da0c20eba41afa8b5ca3201706 -timeCreated: 1440095782 +guid: 2aee29a8bed530d43bb6e8ed2db64b50 +timeCreated: 1450798792 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/MapLoad.cs b/Assets/CivMarsEngine/MapLoad.cs similarity index 95% rename from Assets/MapLoad.cs rename to Assets/CivMarsEngine/MapLoad.cs index 5512429..562301e 100644 --- a/Assets/MapLoad.cs +++ b/Assets/CivMarsEngine/MapLoad.cs @@ -1,118 +1,118 @@ - -/*using UnityEngine; -using System.Collections; - -public class MapLoad -{ - - - - public static void MapDraw(Map map, GameObject mapPiece, Sprite[] GeneratedSprites, GameObject[] BuildingPrefabs, float tileSize) - { - - Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); - GameObject allTile = new GameObject("AllTitle"); - - Debug.Log("MapShowing started"); - - - - GameObject showLay = new GameObject(""); - showLay.transform.position = new Vector3(0, 0, 0); - showLay.transform.parent = allTile.transform; - - - - - - if (map.mapGenerated != null) - Debug.Log("OK"); - - - - Debug.Log(map.seed); - Debug.Log(map.mapHeight); - - #region load generated - for (int yPos = 0; yPos < map.mapHeight; yPos++) - { - - for (int xPos = 0; xPos < map.mapHeight; xPos++) - { - - //Debug.Log(xPos + "," + yPos); - - GameObject go = GameObject.Instantiate(mapPiece); - go.name = "Tile_" + xPos + "_" + yPos; - SpriteRenderer curr = go.GetComponent(); - - //Debug.Log(xPos + "," + yPos); - curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; - - curr.transform.parent = showLay.transform; - - Vector2 pos = new Vector3(xPos, -yPos) * tileSize; - pos = pos + posMultiplyer; - - curr.transform.localPosition = (pos); - - //Debug.Log("Tile Done"); - } - } - #endregion - - - #region Building load OUT DATED - /* - for (int xPos = 0; xPos < map.mapHeight; xPos++) - { - - for (int yPos = 0; yPos < map.mapHeight; yPos++) - { - if (map.mapBuilt[xPos, yPos] != null) - { - //Debug.Log(xPos + "," + yPos); - - foreach (GameObject i in BuildingPrefabs) - { - Debug.Log(map.mapBuilt[xPos, yPos].GetType().ToString()); - if (i.name == map.mapBuilt[xPos, yPos].GetType().ToString()) - { - GameObject go = GameObject.Instantiate(i); - - Vector3 pos = new Vector3(yPos + posMultiplyer.x, -xPos + posMultiplyer.y, -5) * tileSize; - - go.transform.localPosition = (pos); - - break; - } - } - - - - - - //Debug.Log("Tile Done"); - } - } - } - - #endregion - - - - } - - - public static void MapUpdate(int x, int y, Map map) - { - Sprite[] sprites = Resources.LoadAll("Texturas/Generated"); - - GameObject go = GameObject.Find("Tile_" + x + "_" + y); - SpriteRenderer curr = go.GetComponent(); - - curr.sprite = sprites[((int)map.mapGenerated[x, y].type)]; - - } -} + +/*using UnityEngine; +using System.Collections; + +public class MapLoad +{ + + + + public static void MapDraw(Map map, GameObject mapPiece, Sprite[] GeneratedSprites, GameObject[] BuildingPrefabs, float tileSize) + { + + Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); + GameObject allTile = new GameObject("AllTitle"); + + Debug.Log("MapShowing started"); + + + + GameObject showLay = new GameObject(""); + showLay.transform.position = new Vector3(0, 0, 0); + showLay.transform.parent = allTile.transform; + + + + + + if (map.mapGenerated != null) + Debug.Log("OK"); + + + + Debug.Log(map.seed); + Debug.Log(map.mapHeight); + + #region load generated + for (int yPos = 0; yPos < map.mapHeight; yPos++) + { + + for (int xPos = 0; xPos < map.mapHeight; xPos++) + { + + //Debug.Log(xPos + "," + yPos); + + GameObject go = GameObject.Instantiate(mapPiece); + go.name = "Tile_" + xPos + "_" + yPos; + SpriteRenderer curr = go.GetComponent(); + + //Debug.Log(xPos + "," + yPos); + curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; + + curr.transform.parent = showLay.transform; + + Vector2 pos = new Vector3(xPos, -yPos) * tileSize; + pos = pos + posMultiplyer; + + curr.transform.localPosition = (pos); + + //Debug.Log("Tile Done"); + } + } + #endregion + + + #region Building load OUT DATED + /* + for (int xPos = 0; xPos < map.mapHeight; xPos++) + { + + for (int yPos = 0; yPos < map.mapHeight; yPos++) + { + if (map.mapBuilt[xPos, yPos] != null) + { + //Debug.Log(xPos + "," + yPos); + + foreach (GameObject i in BuildingPrefabs) + { + Debug.Log(map.mapBuilt[xPos, yPos].GetType().ToString()); + if (i.name == map.mapBuilt[xPos, yPos].GetType().ToString()) + { + GameObject go = GameObject.Instantiate(i); + + Vector3 pos = new Vector3(yPos + posMultiplyer.x, -xPos + posMultiplyer.y, -5) * tileSize; + + go.transform.localPosition = (pos); + + break; + } + } + + + + + + //Debug.Log("Tile Done"); + } + } + } + + #endregion + + + + } + + + public static void MapUpdate(int x, int y, Map map) + { + Sprite[] sprites = Resources.LoadAll("Texturas/Generated"); + + GameObject go = GameObject.Find("Tile_" + x + "_" + y); + SpriteRenderer curr = go.GetComponent(); + + curr.sprite = sprites[((int)map.mapGenerated[x, y].type)]; + + } +} */ \ No newline at end of file diff --git a/Assets/MapLoad.cs.meta b/Assets/CivMarsEngine/MapLoad.cs.meta similarity index 76% rename from Assets/MapLoad.cs.meta rename to Assets/CivMarsEngine/MapLoad.cs.meta index d3f85fa..4f45ce0 100644 --- a/Assets/MapLoad.cs.meta +++ b/Assets/CivMarsEngine/MapLoad.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 20ecd41a6485e3e46923acd480431afc -timeCreated: 1437563355 +guid: af9ec8c593e9a7d46b2f85dd51f8a3a2 +timeCreated: 1450798793 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Player.meta b/Assets/CivMarsEngine/Player.meta similarity index 67% rename from Assets/Player.meta rename to Assets/CivMarsEngine/Player.meta index 1b674fe..580afa0 100644 --- a/Assets/Player.meta +++ b/Assets/CivMarsEngine/Player.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 385e96f64eb9ab74e89452f1ea0cf99f +guid: a161366b6ca81a1428db728b8cced795 folderAsset: yes -timeCreated: 1438242581 +timeCreated: 1450798791 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMarsEngine/Player/Player.cs b/Assets/CivMarsEngine/Player/Player.cs new file mode 100644 index 0000000..48c29af --- /dev/null +++ b/Assets/CivMarsEngine/Player/Player.cs @@ -0,0 +1,198 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + + +namespace CivMarsEngine +{ + public class Player : MonoBehaviour, IGasTank, IInventory + { + public GameController GameCon; + + SpaceSuit suit = new SpaceSuit(); + + public float health = 1; + + OreTile mining; + + public Inventory inventory = new Inventory(10); + + public int eatSpeed; + public float breathAmount = 1; + public int speed; + + public float miningTime; + + public void Start() + { + GetTankCluster().GetTank(0).gasType = GasType.Oxigen; + GetTankCluster().GetTank(0).SetLocked(true); + GetTankCluster().GetTank(1).gasType = GasType.CarbonDeOxide; + GetTankCluster().GetTank(1).SetLocked(true); + + GetTankCluster().GetTank(0).AddAmount(GetTankCluster().GetTank(0).maxAmount); + GameCon = GameObject.Find("_GameController").GetComponent(); + + } + + void Update() + { + //Breath(); + GasTank oxigen = GetTankCluster().GetTank(0); + GasTank carbonDioxide = GetTankCluster().GetTank(1); + + float OxigenTank = oxigen.amount; + float OxigenTankFull = oxigen.maxAmount; + + float CarbonDioxideTank = carbonDioxide.amount; + float CarbonDioxideTankFull = carbonDioxide.maxAmount; + + float OxigenHp = Mathf.Clamp((OxigenTank * 5) / OxigenTankFull, 0, 1); + float CarbonDioxideHp = Mathf.Clamp(((CarbonDioxideTankFull - CarbonDioxideTank) * 5) / CarbonDioxideTankFull, 0, 1); ; + + health = + ( + ((OxigenHp) * 10) * + ((CarbonDioxideHp) * 10) + ) / Mathf.Pow(10, 2); + //Debug.Log("Deadly Carbon percent: " + CarbonDioxideHp + " Deadly Oxigen percent: " + OxigenHp + " health: "+ health); + + Mine(); + + if (Input.GetButtonUp("Mine") && (GameCon.gameS == GameState.InGame) && mining == null) + { + Debug.Log("Mine"); + MineStar(); + } + } + + public void Eat() + { + throw new System.NotImplementedException(); + } + + public void Breath() + { + GetTankCluster().GetTank(0).RemoveAmount(breathAmount * Time.deltaTime, GasType.Oxigen); + GetTankCluster().GetTank(1).AddAmount(breathAmount * Time.deltaTime, GasType.CarbonDeOxide); + } + + public void walk() + { + throw new System.NotImplementedException(); + } + + public void Mine() + { + if (mining != null) + { + if (miningTime > 0) + { + miningTime -= Time.deltaTime; + } + else + { + Item mined; + mined = ((Item)Activator.CreateInstance(mining.GetItemType())); + mined.amount = 1; + + inventory.Add(mined); + + mining.Mine(1); + + mining = null; + } + } + + } + + public void MineStar() + { + + TileVector pos = new TileVector((int)Mathf.Round(transform.position.x - 0.5f), -1 * (int)Mathf.Round(transform.position.y + 0.5f)); + TileTransform tile = GameCon.map.Generated.GetTileOn(pos); + + if (tile != null) + { + OreTile ore = ((OreTile)tile.GetComponent()); + + if (ore.GetType() != null) + { + mining = ore; + //GameCon.guiHandler.actions[0].Action(((OreTile)ore).GetMiningTime(), "Mine"); + miningTime = ((OreTile)ore).GetMiningTime(); + } + } + + } + + #region Tank + + public GasTankCluster GetTankCluster() + { + return suit.GetTankCluster(); + } + + #endregion + + #region IInventory + + public int GetInventorySize() + { + return inventory.size; + } + + public string GetInventoryName() + { + throw new NotImplementedException(); + } + + public bool HasCustomInventoryName() + { + return false; + } + + public Item GetStackInSlot(int i) + { + return inventory.Get(i); + } + + public int GetInventoryStackLimit(int i) + { + throw new NotImplementedException(); + } + + public bool IsItemValidForSlot(int slot, Item givenItem) + { + throw new NotImplementedException(); + } + + public bool IsUseableByPlayer(Player p_70300_1_) + { + return true; + } + + public Item Add(Item i) + { + return inventory.Add(i); + } + + public Item Remove(Item i) + { + return inventory.Remove(i); + } + + public void TransferItem(IInventory ToInv, int index) + { + inventory.TransferItem(ToInv, index); + } + + public void TransferItemAmount(IInventory Toinv, int fromindex, int transferingAmount) + { + inventory.TransferItemAmount(Toinv, fromindex, transferingAmount); + } + + #endregion + } + +} diff --git a/Assets/Player/Player.cs.meta b/Assets/CivMarsEngine/Player/Player.cs.meta similarity index 100% rename from Assets/Player/Player.cs.meta rename to Assets/CivMarsEngine/Player/Player.cs.meta diff --git a/Assets/Player/PlayerMovment.cs b/Assets/CivMarsEngine/Player/PlayerMovment.cs similarity index 96% rename from Assets/Player/PlayerMovment.cs rename to Assets/CivMarsEngine/Player/PlayerMovment.cs index 72a4db5..54db167 100644 --- a/Assets/Player/PlayerMovment.cs +++ b/Assets/CivMarsEngine/Player/PlayerMovment.cs @@ -1,58 +1,58 @@ -using UnityEngine; -using System.Collections; - -public class PlayerMovment : MonoBehaviour -{ - public float speed; - Animator anim; - bool presd; - - // Use this for initialization - void Start() - { - //anim = GetComponent(); - //g = GameObject.FindGameObjectWithTag ("GameController").GetComponent (); - } - - // Update is called once per frame - void Update() - { - GetComponent().angularVelocity = 0; - transform.eulerAngles = Vector3.zero; - - //if (Input.anyKey && g.gameState == Globals.GameState.InGame) { - - //anim.SetBool("Stay", false); - - if (Input.GetAxis("Horizontal") < 0) - { - gameObject.GetComponent().AddForce(new Vector2(speed * Input.GetAxis("Horizontal"), 0)); - //anim.SetInteger("Direction", 1); - } - if (Input.GetAxis("Horizontal") > 0) - { - gameObject.GetComponent().AddForce(new Vector2(speed * Input.GetAxis("Horizontal"), 0)); - //anim.SetInteger("Direction", 3); - } - if (Input.GetAxis("Vertical") < 0) - { - gameObject.GetComponent().AddForce(new Vector2(0, speed * Input.GetAxis("Vertical"))); - //anim.SetInteger("Direction", 0); - } - if (Input.GetAxis("Vertical") > 0) - { - gameObject.GetComponent().AddForce(new Vector2(0, speed * Input.GetAxis("Vertical"))); - //anim.SetInteger("Direction", 2); - } - - - - - gameObject.GetComponent().velocity = Vector2.Lerp(gameObject.GetComponent().velocity, Vector2.zero, Time.deltaTime * speed * speed); - //anim.SetBool("Stay", true); - - - - - } +using UnityEngine; +using System.Collections; + +public class PlayerMovment : MonoBehaviour +{ + public float speed; + Animator anim; + bool presd; + + // Use this for initialization + void Start() + { + //anim = GetComponent(); + //g = GameObject.FindGameObjectWithTag ("GameController").GetComponent (); + } + + // Update is called once per frame + void Update() + { + GetComponent().angularVelocity = 0; + transform.eulerAngles = Vector3.zero; + + //if (Input.anyKey && g.gameState == Globals.GameState.InGame) { + + //anim.SetBool("Stay", false); + + if (Input.GetAxis("Horizontal") < 0) + { + gameObject.GetComponent().AddForce(new Vector2(speed * Input.GetAxis("Horizontal"), 0)); + //anim.SetInteger("Direction", 1); + } + if (Input.GetAxis("Horizontal") > 0) + { + gameObject.GetComponent().AddForce(new Vector2(speed * Input.GetAxis("Horizontal"), 0)); + //anim.SetInteger("Direction", 3); + } + if (Input.GetAxis("Vertical") < 0) + { + gameObject.GetComponent().AddForce(new Vector2(0, speed * Input.GetAxis("Vertical"))); + //anim.SetInteger("Direction", 0); + } + if (Input.GetAxis("Vertical") > 0) + { + gameObject.GetComponent().AddForce(new Vector2(0, speed * Input.GetAxis("Vertical"))); + //anim.SetInteger("Direction", 2); + } + + + + + gameObject.GetComponent().velocity = Vector2.Lerp(gameObject.GetComponent().velocity, Vector2.zero, Time.deltaTime * speed * speed); + //anim.SetBool("Stay", true); + + + + + } } \ No newline at end of file diff --git a/Assets/Player/PlayerMovment.cs.meta b/Assets/CivMarsEngine/Player/PlayerMovment.cs.meta similarity index 100% rename from Assets/Player/PlayerMovment.cs.meta rename to Assets/CivMarsEngine/Player/PlayerMovment.cs.meta diff --git a/Assets/CivMarsEngine/Player/SpaceSuit.cs b/Assets/CivMarsEngine/Player/SpaceSuit.cs new file mode 100644 index 0000000..47c5887 --- /dev/null +++ b/Assets/CivMarsEngine/Player/SpaceSuit.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +namespace CivMarsEngine +{ + class SpaceSuit : IGasTank + { + static float[] maxs = { 200f, 200f }; + GasTankCluster tanks = new GasTankCluster(2, maxs); + + public GasTankCluster GetTankCluster() + { + return tanks; + } + } +} \ No newline at end of file diff --git a/Assets/Player/SpaceSuit.cs.meta b/Assets/CivMarsEngine/Player/SpaceSuit.cs.meta similarity index 100% rename from Assets/Player/SpaceSuit.cs.meta rename to Assets/CivMarsEngine/Player/SpaceSuit.cs.meta diff --git a/Assets/ClassDiagram1.cd b/Assets/ClassDiagram1.cd new file mode 100644 index 0000000..20d5523 --- /dev/null +++ b/Assets/ClassDiagram1.cd @@ -0,0 +1,831 @@ + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAA= + Assets\AssetsLoading\AssetsLoader.cs + + + + + + EAAAAAAAAAAgEAAAQAgQQAAAAAAAAAAAAAAAAACAACA= + Assets\AssetsLoading\GameRegystry.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\BasicUtility\TileMap\Tile\Surface\Surface.cs + + + + + + ABQAAEAAACAAAAABEIAAAAAAAAAAQAAAAAAAAAgAEAA= + Assets\Camera\CameraChase.cs + + + + + + AAAAgIAgAAAAgAAACAgAAAAQAAAAAAAAAAAAAAAAAEA= + Assets\CivMarsEngine\Building.cs + + + + + + + EEQACAAAACAAhABAAgAAAAQAICACgEEAUEAEAACACEA= + Assets\CivMars\Buildings\PlanedBuilding.cs + + + + + + + ABAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAEA= + Assets\CivMars\Buildings\Tiled.cs + + + + + + AAAAAAAAAgAAIBIAAAAAAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\BuildingWGUI.cs + + + + + + + AEABAAAAAAAAAAAAAAAAAAAACAABAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Crafting\Recipe.cs + + + + + + RAwAEAQAASgAAAiCACIAIMIEQAABAAAABEAAAAAAAEA= + Assets\CivMarsEngine\GameController.cs + + + + + + AAAAAAAAAAAAIAAEAAgAEQAAAAAIgCAAAgAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasTank.cs + + + + + + AAAAQAAAAAAAAAAgAIAAAAAAgAAAAAgAAAAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasTankCluster.cs + + + + + + ABQAAAAAACAAIBIAACgIAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\GUI\Access Panel\AccesPanel.cs + + + + + + + AIYAAAAIECAQAAAAAgCAAAAAgAIAAAABBAQAgAQQgAA= + Assets\CivMarsEngine\GUI\Access Panel\GasDesplay\GasDesplay.cs + + + + + + AAYAAAAABDAEhAQAAAAAAAAAAAAEgAAAAAAgAARQAAA= + Assets\CivMarsEngine\GUI\Access Panel\GasDesplay\GasDesplayElement.cs + + + + + + AAQAAAAAkCAAEABAAgCAAAAAAAAAQEABAAACAAwAAQA= + Assets\CivMarsEngine\GUI\Access Panel\InventoryDesplay\InventoryDesplay.cs + + + + + + ABQAAABAIAACBQAAAAAAAQAAAAAEgAAAAAAAAAQBgEA= + Assets\CivMarsEngine\GUI\Access Panel\InventoryDesplay\InventoryDrawedElement.cs + + + + + + ABQAAAAAECAAgAAAAAAAAAAAAAAAAAABAAAAAAAAAAg= + Assets\CivMarsEngine\GUI\Access Panel\PlayerStatsDesplay.cs + + + + + + ABQAAAAAACAAIBIBjAACgAAAAAABAAAEAAAAISCAAIA= + Assets\CivMarsEngine\GUI\Buildables\BuildingLister.cs + + + + + + + ACSAAIAEAKAAINCwAAAABAICQAABAAABEAAEEAAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\CraftingDesplay.cs + + + + + + AAQAAAAAAAAAQAAAAAAQAAAAAAEAgAAAAAAAAABAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\CraftingProcess.cs + + + + + + AAAAAAAAAAAABABAAAAABAAAEAAAAAAAAAAEAAAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\QueueItem.cs + + + + + + AAQAAAAAAiAAAABAAAAAAAAAAAAgAAAAAAAAAQAAAAA= + Assets\CivMarsEngine\GUI\Crafting Desplay\RecipeButton.cs + + + + + + + AAQAAAAAACAAEAAAAgAAAAAAAAAAAAABAAACAAgAAQA= + Assets\CivMarsEngine\GUI\Inventory\PlayerInventory.cs + + + + + + ABQAAAAAIAACBAAAAAAAAAAAAAIAgAAAAAAAAAABgEA= + Assets\CivMarsEngine\GUI\Inventory\PlayerInventoryDrawedElement.cs + + + + + + ABCAAAAAACAAAAAAAIAAAAAAAAABAAAAAAAAAAAAEAA= + Assets\CivMarsEngine\GUI\MapListing\NewMap.cs + + + + + + ABQAAAAAAABAAAAAAIgAAAACAAAEAAAQAEAAAAAAAEA= + Assets\CivMarsEngine\GUI\MapListing\SavedMapLister.cs + + + + + + ABQACAAAACAAgAAAAAAAAAAAAAAAAAQAAAAAAAAAAAA= + Assets\CivMarsEngine\GUI\PlayerStats\PlayerStatsSidebarDesplay.cs + + + + + + ABAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA= + Assets\CivMarsEngine\InputHandler.cs + + + + + + AAIAAAgAAAAAAABAAIAABAAAAAAIAAACAAAAAAAASAA= + Assets\CivMarsEngine\InventorySystem\Inventory.cs + + + + + + AF4IACAAECAAUCAEAAAAhAAAoACAAQACFCAAAAAASAg= + Assets\CivMarsEngine\Player\Player.cs + + + + + + + AIAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAAAAAAAAA= + Assets\CivMarsEngine\Player\SpaceSuit.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\AssetsLoading\ModAttribute.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\AssetsLoading\ModAttribute.cs + + + + + + AAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA= + Assets\BasicUtility\ScreenManagger.cs + + + + + + AAAABAAAAAAAAAAAAAAAAAAAAAAEAAIAAAAAAAAAAAA= + Assets\BasicUtility\ScreenManagger.cs + + + + + + AAAAAAAAAAAAQAQAAAAIAAAAAAQEAAAAQAAAACAAAAA= + Assets\BasicUtility\TileMap\SavedMapData.cs + + + + + + AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAACAAAAAAAAA= + Assets\BasicUtility\TileMap\SavedTile.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\BasicUtility\TileMap\SavedTile.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAA= + Assets\BasicUtility\TileMap\SavedTile.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAA= + Assets\BasicUtility\TileMap\Tile\Tile.cs + + + + + + ABAABAAABAAQAQMAAAAAAAACAgCAQAACAIABBIAAIkA= + Assets\BasicUtility\TileMap\TileMap.cs + + + + + + AAAAAAAAAAAAAAAAAAgAIAAAAAAAAAIAAAIAAAAAAAA= + Assets\BasicUtility\TileMap\TileTransform.cs + + + + + + AQAAAAIAAAAAAQAAQAEBAAgAAAAAAAAAAQZgAAAQAAA= + Assets\BasicUtility\TileMap\TileVector.cs + + + + + + CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\BasicUtility\TogleGroupAdvanced.cs + + + + + + AAJAAAAAAAAAAAAAAAAABAAAAAAEggAAAAAAAAAAAAA= + Assets\CivMars\Items\Item.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Sapling.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Wood.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Food.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Module.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\OxigenRecoverer.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\RefrinedUranium.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Resource.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Tool.cs + + + + + + AIIIgIAgEAAAgAAAAAAAIgAAAEAAgIAAAAAAAEAACAI= + Assets\CivMars\Ores\OreTile.cs + + + + + + + AAAAAAIACAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAA= + Assets\CivMarsEngine\GUI\GUIHandler.cs + + + + + + ABQAgAAAAyAAIBIAAAAAAAAAAAAAAAAAAAAAAACIAAA= + Assets\CivMarsEngine\GUI\PauseTab.cs + + + + + + + AAAAgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Language.cs + + + + + + QAAQAJAAACAAQAAAAAAAAAEAAAAAAABADAAAAEACAAA= + Assets\CivMarsEngine\Map.cs + + + + + + AAQAAAAAACAgAAAAAAAAAAAAAAAAAQAAAQAAAAAAAAA= + Assets\CivMarsEngine\Player\PlayerMovment.cs + + + + + + AAQAAAAAACACAAIAADCAAAAiAAAAAgAAAAAAAAAAAQA= + Assets\PerlinTest.cs + + + + + + AAIAAKAoCBAAkCAAACAAhAQQghAAAQACBACAAAGASEA= + Assets\CivMars\Buildings\Chest.cs + + + + + + + AAYAYCAgCDAAkGAABCQAhAgShhEAAAAABQCAAACASEA= + Assets\CivMars\Buildings\Furnace.cs + + + + + + + AAYAACAgCCAAkCAAAAAAhAAQwhAAAAAABQDCAAAASAA= + Assets\CivMars\Buildings\GreenHouse.cs + + + + + + + AAIAEKAgABAAkCAAACAChAQAgAAAAQgCFAAAAACASEA= + Assets\CivMars\Buildings\MainBuilding.cs + + + + + + + AA4BoCAgCBAAkCAAACAghAAQghEABAAIRQCAAACASEA= + Assets\CivMars\Buildings\Miner.cs + + + + + + + AAYAYCAgCDAAkGAABCQAhAgShhEAAAAABQCAAACASEA= + Assets\CivMars\Buildings\Press.cs + + + + + + + AQAAACAAAAAAAAAAAAAAAAAgAAAAAAAAAAACAAAAAAA= + Assets\CivMars\CivMarsInit.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\CopperIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\GoldIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\IronIngot.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\Resin.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\BasicMaterials\SiliconRod.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\ControllChip.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\RadioCircuit.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Chips\RadioTransmitterChip.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Circuits\ControlCircuit.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\ElctricalParts\Transistor.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\GlassPLane.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\InteriorPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\IronPipe.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\CoalOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Ore\CopperOre.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Ore\GoldOre.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\IronOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\SandOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\StoneOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA= + Assets\CivMars\Items\Ore\UraniumOre.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\OxygenTank.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Piston.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Plates\IronPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Plates\PlasticPlate.cs + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\Roof.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAACAA= + Assets\CivMars\Items\StoneBrick.cs + + + + + + + AAAAAAAAQAAAAABAAAAAAQAAAAAAAAAAAAAAAAAAAAQ= + Assets\CivMars\NeedToBeImplemented\Old\Generato.cs + + + + + + AAAAAAAAAAAAAAAAAAIAAAAAAAAAAQAAAAAAAAAAAAA= + Assets\CivMars\NeedToBeImplemented\Old\Oxigeneration.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\CoalOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\IronOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\SandTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\StoneOreTile.cs + + + + + + AIIAAAAAEAAAgAAAAAQAIAAAAAAAAAAAAAAAAEAACAA= + Assets\CivMars\Ores\UraniumOreTile.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAA= + Assets\CivMarsEngine\GasSystem\IGasTank.cs + + + + + + AAAAAAAgCAAAAAAAAAAAAAAQAhAAAAAAAACAAAAAAAA= + Assets\CivMarsEngine\Interfaces\IBuildable.cs + + + + + + AAAAAAAAAAAAAEAAAAQAAAACBAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Interfaces\ICrafter.cs + + + + + + AAAAAAAAAAAAIBIAAAAAAAAAAAAAAAAAAAAAAACAAAA= + Assets\CivMarsEngine\Interfaces\IHasGui.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA= + Assets\CivMarsEngine\Interfaces\IRegystratabe.cs + + + + + + AAAAgIAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\Interfaces\ISaveble.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA= + Assets\CivMarsEngine\Interfaces\IWorldGen.cs + + + + + + AAIAACAAAAAAECAAAAAAhAAAgAAAAAAABAAAAAAASAA= + Assets\CivMarsEngine\InventorySystem\IInventory.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAIAIAAAAAAAA= + Assets\CivMarsEngine\GasSystem\GasType.cs + + + + + + AAAAABBAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAA= + Assets\CivMarsEngine\GUI\Buildables\BuildingLister.cs + + + + + + AQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAEAAA= + Assets\BasicUtility\TileMap\TileVector.cs + + + + + + AEAAAAAAAAAAAAAAAAAAAAAQAAAACAAAAAAAAAAAAAA= + Assets\CivMarsEngine\GameState.cs + + + + \ No newline at end of file diff --git a/Assets/ClassDiagram1.cd.meta b/Assets/ClassDiagram1.cd.meta new file mode 100644 index 0000000..d5b85d9 --- /dev/null +++ b/Assets/ClassDiagram1.cd.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0c0521138a02ee4da963f6d86c604e5 +timeCreated: 1450798790 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Crafting/ICrafter.cs b/Assets/Crafting/ICrafter.cs deleted file mode 100644 index a9d1b28..0000000 --- a/Assets/Crafting/ICrafter.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - -public interface ICrafter -{ - void AddToQueue(int i); - - void RemoveFromQueue(int i); - - CraftingProcess[] GetQueue(); - - string GetCraftingID(); - -} - diff --git a/Assets/Crafting/Recipe.cs b/Assets/Crafting/Recipe.cs deleted file mode 100644 index 4a79a16..0000000 --- a/Assets/Crafting/Recipe.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public class Recipe -{ - public string buildingID; - public Item[] Materials; - public Item Crafted; - public float time; - - - public Recipe(string ID, Item[] m, Item c, float t) - { - buildingID = ID; - Materials = m; - Crafted = c; - time = t; - } -} - diff --git a/Assets/GUI/Access Panel/AccesPanel.cs b/Assets/GUI/Access Panel/AccesPanel.cs deleted file mode 100644 index 69689d7..0000000 --- a/Assets/GUI/Access Panel/AccesPanel.cs +++ /dev/null @@ -1,67 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - - -public class AccesPanel : MonoBehaviour, IHasGui -{ - public GameController GameCon; - - public Building OpenBuilding; - - public bool open; - - public GameObject[] AccesTabs; - - public GameObject Graphicks; - - public void Start() - { - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - } - - - public void Update() - { - if (Input.GetButtonUp("Inventory")) - { - Debug.Log("Inventory opening"); - TogelGui(); - } - } - - #region IhasGui - public void TogelGui() - { - if (!open) - { - if (GameCon.AlloweGUI(this as IHasGui)) - { - Open(); - } - } - else - { - GameCon.CloseGUI(this as IHasGui); - Close(); - } - } - - public void Open() - { - open = true; - Graphicks.SetActive(true); - } - - public void Close() - { - open = false; - Graphicks.SetActive(false); - } - - public int ClosingLevel() - { - return 10; - } - #endregion -} diff --git a/Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs b/Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs deleted file mode 100644 index 051f93c..0000000 --- a/Assets/GUI/Access Panel/GasDesplay/GasDesplay.cs +++ /dev/null @@ -1,289 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using UnityEngine.UI; - -public class GasDesplay : MonoBehaviour -{ - - - public GameObject GasCanvasPlayer; - public GameObject GasCanvasOther; - - public GameObject TankElement; - public GameObject TankElementBack; - - public GameObject[] drawedInvPlayer = new GameObject[10]; - public GameObject[] drawedInvOther = new GameObject[10]; - - GasTankCluster player; - GasTankCluster other; - - public GasDesplayElement OutPuting; - public GasDesplayElement InPuting; - - void Start() - { - player = GameObject.FindGameObjectWithTag("Player").GetComponent().GetTankCluster(); - } - - - void Update() - { - UpdateDesplay(); - if ((OutPuting != null && InPuting != null) && (OutPuting.tank.gasType == InPuting.tank.gasType || InPuting.tank.gasType == GasType.Null)) - { - OutPuting.tank.Transfer(InPuting.tank, 5f * Time.deltaTime); - } - } - - public void UpdateData(Building datas) - { - if (datas is IGasTank) - { - other = ((IGasTank)datas).GetTankCluster(); - } - } - - public void UpdateDesplay() - { - if (other == null) - { - UpdateDesplaySection(player, drawedInvPlayer, GasCanvasPlayer.gameObject, true); - - foreach (GameObject item in drawedInvOther) - { - Destroy(item); - } - } - else - { - UpdateDesplaySection(player, other, drawedInvPlayer, GasCanvasPlayer.gameObject, true); - UpdateDesplaySection(other, player, drawedInvOther, GasCanvasOther.gameObject, false); - } - } - - void UpdateDesplaySection(GasTankCluster TankThis, GasTankCluster TankOthe, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) - { - for (int i = 0; i < TankThis.size; i++) - { - GameObject actual = drawed[i]; - - //van itt item - - //Van kint valami - if (actual != null) - { - //Background element - if (actual.GetComponent() == null) - { - //Destroy back - Destroy(actual); - actual = null; - - //Create item - actual = null; - actual = Instantiate(TankElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - - actual.GetComponent().Set(TankThis.GetTank(i), this); - } - } - else - { - //create item - actual = null; - actual = Instantiate(TankElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - - actual.GetComponent().Set(TankThis.GetTank(i), this); - } - - - drawed[i] = actual; - } - } - - void UpdateDesplaySection(GasTankCluster TankThis, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) - { - for (int i = 0; i < TankThis.size; i++) - { - GameObject actual = drawed[i]; - - //van itt item - if (TankThis.GetTank(i).gasType != GasType.Null) - { - //Van kint valami - if (actual != null) - { - //Background element - if (actual.GetComponent() == null) - { - //Destroy back - Destroy(actual); - actual = null; - - //Create item - actual = null; - actual = Instantiate(TankElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - - actual.GetComponent().Set(TankThis.GetTank(i), this); - - - } - //Item element - else if (actual.GetComponent() != null) - { - //update item - drawed[i].GetComponent().Set(TankThis.GetTank(i), this); - } - } - else - { - //create item - actual = null; - actual = Instantiate(TankElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - Debug.Log(TankThis.GetTank(i).ToString()); - - actual.GetComponent().Set(TankThis.GetTank(i), this); - } - } - //nics item - else - { - //Van kint valami - if (actual != null) - { - // background - if (actual.GetComponent() == null) - { - //OK - } - // Item element - else if (actual.GetComponent() != null) - { - //Destroy older - Destroy(actual); - actual = null; - - //Create Back - actual = null; - actual = Instantiate(TankElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - else - { - //Create Back - actual = null; - actual = Instantiate(TankElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - drawed[i] = actual; - } - } - - - public void SetOtherInv(IGasTank OtherInventory) - { - - if (OtherInventory != null) - { - other = OtherInventory.GetTankCluster(); - foreach (GameObject des in drawedInvOther) - { - Destroy(des); - } - drawedInvOther = new GameObject[other.size]; - } - else - { - foreach (GameObject des in drawedInvOther) - { - Destroy(des); - } - } - } - - public bool SetInput(GasDesplayElement t) - { - if (InPuting != null && InPuting != t) - { - InPuting.SetInput(false); - } - if (t != null) - { - if (OutPuting != null) - { - //if (OutPuting.tank.gasType == t.tank.gasType || t.tank.gasType == GasType.Null) - //{ - InPuting = t; - return true; - //} - //else - //{ - //return false; - //} - } - else - { - InPuting = t; - return true; - } - } - else - { - InPuting = null; - return true; - } - - } - - public bool SetOutput(GasDesplayElement t) - { - if (OutPuting != null && OutPuting != t) - { - OutPuting.SetOutput(false); - } - if (t != null) - { - if (InPuting != null) - { - //if (InPuting.tank.gasType == t.tank.gasType || t.tank.gasType == GasType.Null) - //{ - OutPuting = t; - return true; - //} - //else - //{ - //return false; - //} - } - else - { - OutPuting = t; - return true; - } - } - else - { - OutPuting = null; - return true; - } - } - -} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs b/Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs deleted file mode 100644 index f2f091d..0000000 --- a/Assets/GUI/Access Panel/GasDesplay/GasDesplayElement.cs +++ /dev/null @@ -1,150 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -public class GasDesplayElement : MonoBehaviour { - - public Text gasName; - public Text amount; - public Slider amountSlider; - - public Toggle inButton; - public Toggle outButton; - - public bool inPressed; - public bool outPressed; - - public GasTank tank; - GasDesplay other; - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - if (tank != null) - { - if (tank.gasType != GasType.Null) - { - gasName.text = tank.gasType.ToString(); - } - else - { - gasName.text = "Nothing"; - } - amount.text = tank.amount + " / " + tank.maxAmount; - amountSlider.value = tank.amount / tank.maxAmount; - - inButton.gameObject.SetActive(true); - outButton.gameObject.SetActive(true); - } - else - { - //inButton.gameObject.SetActive(false); - //outButton.gameObject.SetActive(false); - } - - ChangedState(); - } - - public void Set(GasTank thisTnak, GasDesplay otherD) - { - other = otherD; - - if (thisTnak != null) - { - tank = thisTnak; - } - else - { - tank = null; - } - } - - public void Set(GasTank thisTnak) - { - if (thisTnak != null) - { - tank = thisTnak; - } - else - { - tank = null; - } - } - - public void ChangedState() - { - if (inButton.isOn != inPressed ) - { - if (inButton.isOn) - { - if (!(other.SetInput(this))) - { - inButton.isOn = false; - } - - if (outPressed) - { - other.SetOutput(null); - } - } - else - { - other.SetInput(null); - } - inPressed = inButton.isOn; - outPressed = outButton.isOn; - } - if(outButton.isOn != outPressed) - { - if (outButton.isOn) - { - if (!(other.SetOutput(this))) - { - outButton.isOn = false; - } - - if (inPressed) - { - other.SetInput(null); - } - } - else - { - other.SetOutput(null); - } - inPressed = inButton.isOn; - outPressed = outButton.isOn; - } - /* - if(!h) - { - if (outPressed) - { - other.SetOutput(null); - } - if (inPressed) - { - other.SetInput(null); - } - inPressed = inButton.isOn; - outPressed = outButton.isOn; - } - */ - } - - public void SetInput(bool a) - { - inPressed = a; - inButton.isOn = a; - } - - public void SetOutput(bool a) - { - outPressed = a; - outButton.isOn = a; - } -} diff --git a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs b/Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs deleted file mode 100644 index f77cc82..0000000 --- a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDesplay.cs +++ /dev/null @@ -1,281 +0,0 @@ -using UnityEngine; -using System.Collections; -using System; - -public class InventoryDesplay : MonoBehaviour -{ - public GameObject InventoryCanvasPlayer; - public GameObject InventoryCanvasOther; - - public GameObject InventoryDubleElement; - public GameObject InventoryElementBack; - - GameObject[] drawedInvPlayer = new GameObject[10]; - GameObject[] drawedInvOther = new GameObject[10]; - - IInventory player; - IInventory other; - - void Start() - { - player = GameObject.FindGameObjectWithTag("Player").GetComponent(); - } - - void Update() - { - UpdateInventory(); - } - - public void UpdateInventory() - { - UpdateInventorySection(player, other, drawedInvPlayer, InventoryCanvasPlayer, true); - - UpdateInventorySection(other, player, drawedInvOther, InventoryCanvasOther, false); - } - - void UpdateInventorySection(IInventory invThis, IInventory invOthe, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) - { - for (int i = 0; i < invThis.GetInventorySize(); i++) - { - GameObject actual = drawed[i]; - - //van itt item - if (invThis.GetStackInSlot(i) != null) - { - //Van kint valami - if (actual != null) - { - //Background element - if (actual.GetComponent() == null) - { - //Destroy back - Destroy(actual); - actual = null; - - //Create item - actual = Instantiate(InventoryDubleElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, invOthe, invThis, i); - } - //Item element - else - { - //update item - drawed[i].GetComponent().Set(invThis.GetStackInSlot(i).amount); - drawed[i].GetComponent().other = invOthe; - drawed[i].GetComponent().thisinv = invThis; - } - } - else - { - //create item - actual = null; - actual = Instantiate(InventoryDubleElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, invOthe, invThis, i); - drawed[i] = actual; - } - } - //nics item - else - { - //Van kint valami - if (actual != null) - { - // background - if (actual.GetComponent() != null) - { - //Destroy older - Destroy(actual); - actual = null; - - //Create Back - actual = null; - actual = Instantiate(InventoryElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - else - { - //Create Back - actual = null; - actual = Instantiate(InventoryElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - drawed[i] = actual; - } - - int a = invThis.GetInventorySize() / 3; - if (invThis.GetInventorySize() % 3 > 0) - { - a++; - } - drawingCanvas.GetComponent().sizeDelta = new Vector2(0, (a * (50)) + 10); - } - - /* - void UpdateInventorySection(IInventory invThis, GameObject[] drawed, GameObject drawingCanvas, bool isplayer) - { - for (int i = 0; i < invThis.GetInventorySize(); i++) - { - - - GameObject actual = drawed[i]; - - //van itt item - if (invThis.GetStackInSlot(i) != null) - { - //Van kint valami - if (actual != null) - { - //Background element - if (actual.GetComponent() == null) - { - //Destroy back - Destroy(actual); - actual = null; - - //Create item - actual = null; - actual = Instantiate(InventoryDubleElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - - actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, null, invThis, i); - - - } - //Item element - else if (actual.GetComponent() != null) - { - //update item - drawed[i].GetComponent().Set(invThis.GetStackInSlot(i).amount); - drawed[i].GetComponent().other = null; - drawed[i].GetComponent().thisinv = invThis; - - } - } - else - { - //create item - actual = null; - actual = Instantiate(InventoryDubleElement); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - - - actual.GetComponent().Set(invThis.GetStackInSlot(i), isplayer, null, invThis, i); - } - } - //nics item - else - { - //Van kint valami - if (actual != null) - { - // background - if (actual.GetComponent() == null) - { - //OK - } - // Item element - else if (actual.GetComponent() != null) - { - //Destroy older - Destroy(actual); - actual = null; - - //Create Back - actual = null; - actual = Instantiate(InventoryElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - else - { - //Create Back - actual = null; - actual = Instantiate(InventoryElementBack); - actual.transform.SetParent(drawingCanvas.transform); - actual.transform.SetSiblingIndex(i); - } - } - drawed[i] = actual; - } - } - */ - - public void Activate(IInventory OtherInventory) - { - if (OtherInventory != null) - { - other = OtherInventory; - - drawedInvOther = new GameObject[other.GetInventorySize()]; - - gameObject.SetActive(true); - } - } - - public void Deactive() - { - other = null; - - foreach (GameObject des in drawedInvOther) - { - Destroy(des); - } - - gameObject.SetActive(false); - - } - -/* - public void SetOtherInv(IInventory OtherInventory) - { - other = OtherInventory; - if (OtherInventory != null) - { - foreach (GameObject des in drawedInvOther) - { - Destroy(des); - } - - drawedInvOther = new GameObject[other.GetInventorySize()]; - } - else - { - foreach (GameObject des in drawedInvOther) - { - Destroy(des); - } - } - } -*/ - - public void UpdateData() - { - throw new NotImplementedException(); - } - - public void UpdateData(Building datas) - { - if (datas is IInventory) - { - Activate(((IInventory)datas)); - } - else - { - Deactive(); - } - } -} diff --git a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs b/Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs deleted file mode 100644 index 6b4e4cd..0000000 --- a/Assets/GUI/Access Panel/InventoryDesplay/InventoryDrawedElement.cs +++ /dev/null @@ -1,95 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -[AddComponentMenu("Inventory/Inventory Element")] -public class InventoryDrawedElement : MonoBehaviour -{ - GameController GameCon; - - public bool isPlayer; - public string drawname_name; - public int amount; - public int index; - - public IInventory other; - public IInventory thisinv; - - - public GameObject nameDisplay; - public GameObject amountDisplay; - public Button button; - - - // Use this for initialization - void Awake() - { - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - } - - // Update is called once per frame - void Update() - { - if (other == null) - { - button.gameObject.SetActive(false); - } - else - { - button.gameObject.SetActive(true); - } - } - - - #region Set - public void Set(int setAmount) - { - this.amount = setAmount; - amountDisplay.GetComponent().text = null; - amountDisplay.GetComponent().text = setAmount.ToString(); - - //Debug.Log("updated drawed inv element: amount: " + amount + " type: " + this.name + " obj: " + this.GetType().ToString()); - } - - public void Set(string setName) - { - this.drawname_name = setName; - //Debug.Log(setName); - - nameDisplay.GetComponent().text = setName.ToString(); - } - - public void Set(string setName, int setAmount) - { - Set(setName); - Set(setAmount); - } - - public void Set(Item item, bool isp, IInventory o, IInventory t, int i) - { - isPlayer = isp; - other = o; - thisinv = t; - index = i; - - - Set(item.amount); - Set(Language.Get(item, GameCon.language)); - } - #endregion - - - public void Transfer() - { - Debug.Log("Transfer"); - if (Input.GetButton("Specific")) - { - thisinv.TransferItemAmount(other, index, 1); - return; - } - - - thisinv.TransferItem(other, index); - - } -} \ No newline at end of file diff --git a/Assets/GUI/Access Panel/PlayerStatsDesplay.cs b/Assets/GUI/Access Panel/PlayerStatsDesplay.cs deleted file mode 100644 index 60cd483..0000000 --- a/Assets/GUI/Access Panel/PlayerStatsDesplay.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; -using UnityEngine.UI; - -class PlayerStatsTabDesplay : MonoBehaviour -{ - GameController GameCon; - Player player; - - public Text health; - public Text hearthRate; - - void Start() - { - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - player = GameCon.playerclass; - } - - void Update() - { - health.text = player.health.ToString(); - hearthRate.text = "60 rp"; - } - - public void UpdateData(Building datas) - { - //throw new NotImplementedException(); - } -} - diff --git a/Assets/GUI/ActionButton.cs b/Assets/GUI/ActionButton.cs deleted file mode 100644 index 26ceb81..0000000 --- a/Assets/GUI/ActionButton.cs +++ /dev/null @@ -1,93 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Reflection; -using UnityEngine.UI; - -public class ActionButton : MonoBehaviour -{ - - - public float countdown; - public float fullcount; - - public GameController GameCon; - - GameObject playergo; - - public Button buttonscript; - - - public float defaultYPos; - public float defaultXPos; - - public RectTransform maskRect; - public string action = "Mine"; - - - public bool ActionRuned = true; - - // Use this for initialization - void Start() - { - ActionRuned = true; - - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - - countdown = 0; - - buttonscript = gameObject.GetComponent