From 4cbb91fd43efda5ead8709e57f1e1a239c75aabe Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 18 Nov 2014 13:50:36 +0100
Subject: [PATCH] DREVCKSFICKEKACKEKACKE

---
 res/images/items/ItemOneUp.png                | Bin 967 -> 0 bytes
 res/images/items/item2.png                    | Bin 832 -> 0 bytes
 res/images/items/item3.png                    | Bin 1297 -> 0 bytes
 res/images/items/item4.png                    | Bin 1464 -> 0 bytes
 res/images/items/item5.png                    | Bin 1188 -> 0 bytes
 .../spacescooter/entity/item/TestItem2.java   |  18 -----------------
 .../spacescooter/entity/item/TestItem3.java   |  18 -----------------
 .../spacescooter/entity/item/TestItem4.java   |  18 -----------------
 .../spacescooter/entity/item/TestItem5.java   |  19 ------------------
 9 files changed, 73 deletions(-)
 delete mode 100644 res/images/items/ItemOneUp.png
 delete mode 100644 res/images/items/item2.png
 delete mode 100644 res/images/items/item3.png
 delete mode 100644 res/images/items/item4.png
 delete mode 100644 res/images/items/item5.png
 delete mode 100644 src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
 delete mode 100644 src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
 delete mode 100644 src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
 delete mode 100644 src/de/teamteamteam/spacescooter/entity/item/TestItem5.java

diff --git a/res/images/items/ItemOneUp.png b/res/images/items/ItemOneUp.png
deleted file mode 100644
index c156e9e041f33f556a5ec33abf4fc5f338a8b2af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI3s
z000xg<<S5D010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|{8Dj+mJY<>U$02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00S>cL_t(o!=0DGY7{XT$A8I8
zz3d~*BkaQ77NkBwrLYH;szpUmv}X@Jc_~N{JruOwN~t}F2-cG?P^owum_EWj!d~pm
z#KUA~l5CP4yAYC{`6mA_|L@B`Uj#jW>VN@~DUwqpv@J2lP1{CtCbpROnOCd?e#;O+
z;RQ?d42#~i5sbtZm)CYc?V(89$$YEzfiBsJtuT)Fg?h~pC`clpGVo3W8S=6rm%w*f
zr=*|;YM=zFKr211(%;p_xakY^h4m-{>Xi}iSgcpE;<M?Vjl}(qiPUoEO4F`PuXK}+
z%PP{O$EJH$m<w+Q>II6mNSq@ppB>w@W;>nj?7((9+XdD@JZzpy0QH<9%88j7=TQ8s
z4m`Wa$u4pLW{3LSfx(1c?ra~p0(HW$3&CFs)(m6mp*0DFM1#+6jx82uhi-NooL7Ko
zLXoOR4BBi@98jEI8a8$3lnWkLHjSk~9Wh8LnUd%U2_%%8SkhqRI={N@r$XI9aU-&=
zdZ^y)dw=Zgr7=$mvQ4_uNjNw8e0Dl?*|g880@<_WM3$D?)dqlXH`E>n7fx)(oyeZ}
z=a8*z)`4vp+mep-woW*XWDmj%kSjslwx7eBeA!w3U3S}+xa_Xy>@dEQEnw-1wd>IP
zyjzz0uI?t!HZ=IuvjFFSODXk)rqBqF0DZ`9UMt7OIWMve$HpgW!ewAFKF;AN@7VaH
z!FR^C1672rsz)x>jTCQFak`{{80z?RyevLdKq<`?)*f}WPulI2inG@6n?v)7{{MJv
zgP9?aMrorw4&g|*vefiUigV^IB{Au&3<)Jr8M#STM#7>%>@iQZha)NqHZ|2h^vdsz
z?K&?BB%um~LOQjVvRD|k^?>-zrRAxa1EnEUCE;!8lkM6w$71#GnzGEU2`8xD2hsl=
zUM7PHh>sm^>O^})O%bdK7Wp8Z+91?$b_E^v!Fz$4unwHJncZh~NssqUe@h(kYxTus
zqAw;m^o7R#YKW2eynHc<U(F^4`LVdlfJ1sLzJ_sR^y2sj0Xk;2C(}b&-s!+722Q^^
pre$LQOo7v2+!Nz^{<Gip{2zcr*+B#ZS}Onm002ovPDHLkV1g^7zbgO$

diff --git a/res/images/items/item2.png b/res/images/items/item2.png
deleted file mode 100644
index 780135e3d896acdbf5fa89a17559e25f56d02ccc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI5)
z0JFj~V{ZTe010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|{84hZmKB_aR-02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00O8<L_t(o!=+a{i&ZfY{t^W(
zEaV~<BCCkST?;!47r{zF@hsT6zi_R#Sr8N(3s<lZ3t=x<h*z)?6kjYBNi1&W>}1YN
zlB)yZJo1=tzIh~ZSW~_O$pP^B`$T@a+)k|?-O@Gq3sXuHJo|Ryoumg$b--t#SiZOV
zdVrW6pR#gI*?D8mPX$m5g!=OXkUXQB7Q4X4q_6wsLbG9f|0MwU3W$^P$9o_}0Fg~}
z04{2Z7sCXQn+-UV*+|Sn2jCBoB#7c;!D#1HUXjX~;zH*81sgw%_&Ck<j&6Dfq>wF_
ztxGxUqp>tU0pM#Nt$vjN<Uo2}RTNZ(jX5jUl17aH-ekXr3?j0LTEO)P%?SnzzcULS
z0%c(D*DBU8J_2s**zXn#=h(WE;Q~MsK8rQ$m%!!@OTVS=io;zLECj_3{uQG?7=Du0
zyGO^s(&N>)3WAJKjEexi0m)0nfwfk!r2~v0Y7#`_M*5^gXpjsDIowtJzcF<a&#<T%
z83B09KQ#vCmokXi0Nib7NKlN65`b)}vFJJ=EQW)0f%FkNK%@gD6P8l|mZ3fx9W?;t
zf48-&2QASG(a3;>EVP0!Z#bJf?Mi7ekO265fD1;Hw){U9s%OI_3l>QaLayU7;EGZl
zlpu7oL8W=_a{epINvK*{aaNRKZ8v<{v+F4N&#ix}&>kg#ZNNpNW|Jio7B*m7&aIaf
zkT#`xK9qPZR}*_a5j$X2g!QjG0(=DUFtZ?im4rnqh-Imq##-g~Iy;h0PN{oYrxPdQ
z2P_3C6R6;Dt4aAw<#_G^+^8K&H4uD}LDT}x=K%1+xTxGz^qCivJ+>XlldW|!e6A>^
zdAHWNm}nq0Al|T4_TB!Mt62?*Z`=*Z=Xd`1a@rFg62Sd6*Zd24mzPHCK`l`L0000<
KMNUMnLSTZ~WL|3k

diff --git a/res/images/items/item3.png b/res/images/items/item3.png
deleted file mode 100644
index 2d12ab2343359353f6f41105b5158c442988041a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1297
zcmV+s1@8KZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;wl^4*+?Qb}f4V000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-3
z3pN9FU{=%s000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000DRNkl<Z
zSi`lK&8t>b6vlsRuan(T5j2zRodiKq*5q12lzj@377i{V6od-a>mZCMBFk)&1l2{%
zOd<N1Bn>KpKEP_yq*(-plQ8-t?CgD3gZ**#e($|{-=qVF^R>@j&wAEcdp}FejCl@s
z>JLLZOck61*MTayc-oWK$vpGPdI0G1uZGiPR6)CRb<yYy2vh;Vc3dM@1VE4eY>juW
zOGZ1yDW<M~G1d4k18@rBK)|-I4P;FK-J9QA_E?Jd5r7pI+zcZXSgoE}8^o#rx<g+_
z&oz1^t4-=6AkzwjwtyNo)(FW80Nu-HY)mYNY1aa9Bd}~t(m0%}m`QBa?BG^_XaIBv
zKQ&zKi55?!WPS@msxg!>jm(+GF*O@?I0}HP4xF}T!aCzq+{JYb3w69lAeoVLUm2H*
zIoolq0CdIu;1LWkFe~?lfhpp^G`<rXz$`wSAr`OZ4Ad~|;<%W8aXg0E0BSH;8-fjc
z-?KWVby>A^j&U~U8p>xw)2tPe##D=!sbV{?m&kzkh=L_=me1~K67$)|Kf{uj$G+Iv
zetYVN#71N#dTjAl2e1wtAVXqTiR4BWT&CZ=hu~R0yB~mk=SG^2eYp#~Utt{J*hddS
z@R0tOkgt8Y%HR<n;u!BC^l=;@8<q~6Ra7qja*%!Jj1xDnZ%KbFw9lLN{8++q;rQLn
zw;NvgJ%wT{b2p;zBMUIM@r~z=jprj{7f#*>gI{4B;IE^%zz`xkJ~Gr1{1`jtKQ^8>
z{=TXG^TNsd*Z#r#l+-cjA_Kug2#D{Q-f?&?0JFv~yZeR6HbV~~;4CMO?_)It&vf(a
z{9lLV1WaLf;`=6hEqG+`OgF!F$%&qO-~^LxAI@cb)83yDKUNIh<0OQN7GDO4_e^g;
zw7T(o-;Jf@J(EX2SfBByzl%0X$UTxn5D|qDS#=(`?bT+Y>6W*^2PA|9A~1R6(jac!
z^%ar~mbvqKU}jvsb&uilX0dWN!zs(Zy}|U(Bjc8<8kghzpLYED?Y@=9cYfY#g{&b|
z2`_FH2OvI%!F;Y!PsxqM%JkM(!1q<c_LT6YRc`X|@y7UM`zJ8?iuw?9EaySJ6yw9V
zj1C?dB3(9&3CiHHLSq2mV|mihgAYs|iXbN2PL*70D9<IIm*T7k7Vg<?Ekzwj+RgIL
zHlvDW<yjW2vuZi(f~+A;6@TQ389m^A+^fwH>*DI@20+u!mcPY4-I8v=jo+{il(^$*
zsr;lZ;?8Jk)m>GREi5isL7C8xdav@h7OO?PX06aFp*oSX#^~SPEo+L>g)K`4QW+V$
zpt?#%0h$cRj0n-L1(|eXzx<3`R+cX;F2$GHO7EhIDwR`oWTTX4WP1YEzrSDB-Ix>*
zSz>32Uh2QA5;Tvg8WtUyF;)80&&%Ac*}~$I34ln`memc2RSjw*+bc!=&&Myxf9efa
z4~e#+k-BH7yXB6HXAWOkbGj;+yLMTfRBin$7r%LDE`jhbvk|Il4K*S(00000NkvXX
Hu0mjf<w#kZ

diff --git a/res/images/items/item4.png b/res/images/items/item4.png
deleted file mode 100644
index 2f200a519dc13a0047fc224ce90d0ee2a808032c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1464
zcmV;p1xNacP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;wl^4*+?Qb}f4V000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-3
z3;-IPSb5|C000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000FONkl<Z
zSi`NCO>9(E7>1wk&e$J75*jtQ(gaXIr4_73qL65@#TXNG;X)Uh5PuS*Thqjq%7%@`
z1sfAtnYdzMw0~36goTL&(kX&MENom<iESd%nQ7;q*Tp$!=HAY2fZ$1P?%%oReZTkn
zIo~x&+|KAfzX>ZDlz<XgVo;L5F2T9`uiw^sb}IxP`)Lza0urz?P%?iXpG7i(Se$$I
zo`3F)z@tBIgfdu?0gWV*3|I!-t0F(Y3>cj4Tc1d>-it@ZH=-2O1f>Q|e~k<06mUW*
z&=hJ4nm{V#!n-j4iN(#gr@-#-Hnc5_5|^!ISyW})XNLrE_0x(esNvPhD3Z{cU!+6_
zfg?wb2;kCNla}*w*+>$hvJbrN#}8>}WEg<T_ykuzsaV?`Ye|R)-Ww9YsZ*yci&xIx
z?EGc}yBMZ_pdY@*6FE9*0t}%N?D*mZ0Yvb4UHRD0zj~}<Et4c3{J;bE5A;)=t+H=%
zb54mCfrn4_dd8VW0r-lXL|Ll~pN|&LzqYX8IW@_VXe*F{^50S!pU7F71)e_r3XktT
z0l@3Czc99z_<C!&5Wral9y;NzUrV6K(#q+Vz`8K&ZawQUV`O@oWhW{(OZ=t~#@@f~
z=G=YPJprX43Bx+(PtH7zSvO{Pf%SlO0bSu72mmrr0tcrmEKAgJEITnjGLm1=;nOv^
z+q<CYqqax^4;}!+Vd}zYE6{5R{%eO4A!k5>%yq1%W=QXVRo;HQ$LFdQ*-r*I5FtY-
zDv%g*AWIMq68VB<opnyBFhIcGKQ>dQNsmg@6a0qKflstHfRj-pjBYcOfCN$kIFuO9
zbt>S4Jur|cOZ1W&f_ibW?nZP4>$_SpkPX5OK|RIdt^}OGtUv)Uz~twb!9eO&YM>$#
z0j%Z!?sgz%6mY~C^4^uH*aginC-5s115fHDwcfQK?A`VGO}EtdckNjBUEkUV&Zi<J
ziwY2UdlBcJ9P8z0YW)MD#EwsJbY_Nbv)s{T@a|3zT>bqdunJlMts<=eD?GRVONK^<
zxwf!Cb+*d<M^mPdah5Ga{w69xhYEFkolr2q0g`0`wSh9gEi!A3Z-$L3xXWbu&1k(*
za}H+-4u>N_0+)#|xdy^p53Bx~)xr$ODlUm+ezd-{Ht{+Xkf_U17u21o;qTj<-b%2z
z0jh%w=Yld!>I<JzF}LsEs6YhuZkQV!>*EZIF%G^5UYwrxwayGDLph?2w)|Q_tTOb>
zw>ke`erL*X2B}X$!lqr$ib6Y^3ss2zcQTY@=BW{^UtfN?(6R-Dq?zdny&Kd5FQTw4
zQ4`c0G~}pdIw`4<A<+O=EWbJL0&BwggE!W8L~S=1#@yg|&J7jdsmUp1;LJ!}h5&Ue
zNRL(+Ixvxw|F<_L%?F@)>q-S(@%(6QsqKnlH`L^)BO1<8SKb98qe4OTQ)=D~skkt5
zqqr@fAFVGbLt<`ltgkv-<=VmmLnFh?4G&XuUjACHne{;^8Vntn$ytB#)d_EX>SN&I
z%ge0Wlmc8CtuJjm*0UwFp&fl+uH*UpPyhVcA3A%<mhan=|N7eUt^XNC5+L@RIlS0E
z&=0`9Teo(!Ygy3Pd{$?xTsS<@YSk~jxqSP-X4{VSY>5upbLQ}3Y_H>pWFlw;2DtG2
zxW!+!%Wv22?B~?0;YTErB@;mb&hH-!z{c+%*8ZQr<C~G08yxG4sqC}q*2jOKy11KT
S(0~O10000<MNUMnLSTY?Or~o9

diff --git a/res/images/items/item5.png b/res/images/items/item5.png
deleted file mode 100644
index 125f528c93802498a61061f13af5e5f4125bd689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1188
zcmV;V1Y7%wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;!#Qe*g=B+WiOs000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-3
z3>hLWT4-Vb000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000C3Nkl<Z
zSi_~4%Zpq^6vls5)!TGW_e_EV!O^H8M2DzRNgQS{KC%m=uA)0}Bk_?;{tpR)h`1FO
zBH~6D;x3Mun4lPq1Ozc4Mx1`k^la<YaZz<&cBj*~Q_$SuPSrWzdDQovYgCmwYq-5n
z8F$1esG-^Z*VM6RrUCHJ-+R?ra1NX^7z+>`Mk{Hf7C<o2oVzoai2(lmV<9@W2HQwa
z3(hIlCEKcCOmd#1pq!;iS-CBM-)}6ab@1T9UjFXZUkf-3))|}wYsW+nwA$VL%+6q8
zVrlHSm%m<{S1(#|4j@7C0en!rC=yZzDnV5JwAx)TsduIU@YB_K4FZQB>5pvQe{YW<
z5Il&aUnn~@wAx!E=UVM8P-Qq61yKQT`BF!{C`TUe-?lG&aw-Br6cO+;{$f->bh=<h
zLF527FSb=YJaud^(a?Pdx`-%25*QC5Wn*0QBjrFV<;Veuhn3aARChO~UlCtqLu5KW
zX?41lp0NPmeBD-&>G|V<hk6BwRDyl?bZfAW$+KXyh@Lw+sKtm9($7O3@I_OWGB9oW
z%In~vUd%vHmhSH|>uP-Q`J6g8+u<0w&g^_R*sC@KSbu4!_Tis@?8N$exba)3_W4$4
z3ouyk>ql_qQU@QD<s&^FUhX3@8wh}gNc}@TD94`|aO>O>0E^2vx&F&t0QltNW)hc7
z?V{{vs+UQzO?!eL&kfhF&6oCNcBlwgR8+;<*gusFWc*-EQ5G%fzGmvHu=#D9#nqbt
zT>YVqNZhL!9Ez%`*map5SNzXfgN;n4C1TNBXd=~`3h4w<)=mrvqHJDl^Zj=ng1}=(
z`-MQ2bRwheP_~)*3D6L);1Ws~hY7{tG)7aoW~yK#`n6}aN6HXHtJ{-8YI^O8sRcFA
zK;uC2(T7d7sXn7Mi#5%jr`9K5*(;aZsb@?)m-?pYqvG$y{adDyHIQawUaGsxB2bgp
z-c3tRTFQWex?)tz@|tBLr{c)zv0mb{I>sqTL<vE8@#Q-c*0HDiNXTlPX-2gld`Uem
zz+3O^nye{`XSr!&BTi4z3A8BQYcWA(cD=H6pld4gKuF5wOSho770T&Xhf@PsSskQE
zP2T;Ln-<1QL}xd4O-z-^Q}4aWuVH<miq8E1vM2(F4)@I1neg1ku89Ius##E8dwp0N
zz}ksH?4wdSMPT{So|!lmZ=4^Rq8DNWv#z4?Vi}J<*)vmp7i^s0HQqxI!<jdCX9n=>
z^MkyRkFWGi?N74{?>03PmAB8<1M=0Eb2)jvaB@)p)2zJSyRb)X#*z-+I5Qs1XP-8s
zz$E58wZ46KAE)Ei2k-CEf=*3^rk#V+uk6&CQ2zsV{=Kgj?TwxQ0000<MNUMnLSTYr
C9V+4g

diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem2.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
deleted file mode 100644
index 3943e11..0000000
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.teamteamteam.spacescooter.entity.item;
-
-import de.teamteamteam.spacescooter.entity.Player;
-
-public class TestItem2 extends Item {
-	
-	public static int chance = 2;
-	
-	public TestItem2(int x, int y) {
-		super(x, y);
-		this.setImage("images/items/item2.png");
-	}
-
-	@Override
-	public void itemCollected(Player player) {
-		player.setShootDamage(player.getShootDamage()+5);
-	}
-}
diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
deleted file mode 100644
index da47b0f..0000000
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.teamteamteam.spacescooter.entity.item;
-
-import de.teamteamteam.spacescooter.entity.Player;
-
-public class TestItem3 extends Item {
-	
-	public static int chance = 3;
-	
-	public TestItem3(int x, int y) {
-		super(x, y);
-		this.setImage("images/items/item3.png");
-	}
-
-	@Override
-	public void itemCollected(Player player) {
-		player.increaseHealthPoints(15);
-	}
-}
diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem4.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
deleted file mode 100644
index 7b4b390..0000000
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.teamteamteam.spacescooter.entity.item;
-
-import de.teamteamteam.spacescooter.entity.Player;
-
-public class TestItem4 extends Item {
-	
-	public static int chance = 4;
-	
-	public TestItem4(int x, int y) {
-		super(x, y);
-		this.setImage("images/items/item4.png");
-	}
-
-	@Override
-	public void itemCollected(Player player) {
-		player.setShootDamage(player.getShootDamage()+5);
-	}
-}
diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem5.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem5.java
deleted file mode 100644
index 5d0632a..0000000
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem5.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.teamteamteam.spacescooter.entity.item;
-
-import de.teamteamteam.spacescooter.entity.Player;
-
-public class TestItem5 extends Item {
-
-public static int chance = 2;
-	
-	public TestItem5(int x, int y) {
-		super(x, y);
-		this.setImage("images/items/item5.png");
-	}
-
-	@Override
-	public void itemCollected(Player player) {
-		
-	}
-
-}