From 4e3964c31c7b7c48952dabf78f913e568607dc4c Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 18 Nov 2014 13:08:08 +0100
Subject: [PATCH] Updated Items and added the first advanced Item-Icons

---
 res/images/items/item3.png                     | Bin 370 -> 1297 bytes
 res/images/items/item4.png                     | Bin 310 -> 1464 bytes
 .../spacescooter/entity/Player.java            |   8 ++++++++
 .../spacescooter/entity/item/Item.java         |  12 ++++++------
 .../spacescooter/entity/item/TestItem1.java    |   2 +-
 .../spacescooter/entity/item/TestItem3.java    |   2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/res/images/items/item3.png b/res/images/items/item3.png
index 5aaaf657a7b2a76e33c6c1bfe822b3b83229a506..2d12ab2343359353f6f41105b5158c442988041a 100644
GIT binary patch
delta 1194
zcmV;b1XcU;0+9-kHwg*=4*+?Qb}f66Kp_VUHUo8FR@9MbCw~NNNkl<ZSi`lK&8t>b
z6vlsRuan(T5j2zRodiKq*5q12lzj@377i{V6od-a>mZCMBFk)&1l2{%Od<N1Bn>Kp
zKEP_yq*(-plQ8-t?CgD3gZ**#e($|{-=qVF^R>@j&wAEcdp}FejCl@s>JLLZOck61
z*MTayc-oWK$$vca$$9|j@~?)|WK==Bbam0_3<y*K!FF6DR|G(h{%nnRu1iKc#3`n(
zfHBqhE(351;y}Q*uMK2P0NtD4TlQFr_Yr^<7TgRY6<DpFSsTQv0J=k8N6$5SB&$v8
zA|TTWgtmYhHr5Eq3IN^9XKYL?hiTUWa3ip6Owu@<tAChDY}M@GR)A;#bO%2*T<wV#
zPo!ji3qq<flrW9VnZ_|S8+AAefU6Fiwr0XQ<5S$lbqx!3yhk9Jk#t`fmx?*tajgJ!
z#r@zB3@|V&_lAKf;=nY%6C1!RKARyHujUNYFze#Dn0|3QhS>mWFjyOc4SV0SI;M45
zwRDbgHh<?D%4b8<tQC^RREw9XVmq&w$bk2Vf+cU3&+cgw^V!Eg!;+WBzS!A*d+LY8
zMr0*=Z1GkHunrs`Lt<Bn<VF@;rr*4W;8{MqAAo)5Mw*U&xeL5sVI1JtM-M{qkp7pD
zuYI}7;1M6<81EtUaU38UmJXX$R4)H=kbUQj6Mr|aZ%KbFw9lLN{8++q;rQLnw;Nvg
zJ%wT{b2p;zBMUIM@r~z=jprj{7f#*>gI{4B;IE^%zz`xkJ~Gr1{1`jtKQ^8>{=TXG
z^TNsd*Z#r#l+-cjA_Kug2#D{Q-f?&?0JFv~yZeR6HbV~~;4CMO?_)It&vf(a{9lLV
z1b<9ncjEgddo6fm@Ju(qcFBpJd*B3<Z6D5MeAC{a5I<H7-s2>MiWXl6i1$oyKeW2>
zd*6+v<UNx|KUkmfr@xCfO2|EuLl6;#5m|K}xb4+uqUn~mzy~CR1R^kb<kBE+-1QZb
z43@d`dSGT;y>*Y_@@BDeH^V8*zrDfq&VM80ma7_<<NTj?{Q2#^mBx2|-fD%cAyf%3
zZWRY0K8C@3u2E0Pjl|0I)>pvyRl@d^@TFC5^6>G-_+<MhF!+l45OXZ&LA?~?!?=tN
z9vLECHjD|%;ITqu0N-PI($IqsOdg6LCfiPxTxuxKC7+k#tOpkE*=;RF9Z1^E@_)`Y
zql#wbSr)9bYB}qItRYPmf8>c7J>Y%ZtIZJW;_B!IK-12azr{V>l5W6_->?ppxZ`Q5
z{G=`7&S+`XT~(4TEG}6=nb41VukyGSt3|wKt<Wl=I+3%+=-=KgYl_l^ElUPc85z5v
zx=Ka?nheN{2+^(unRH{n{ES>ymVYlSF2$GHO7EhIDwR`oWTTX4WP1YEzrSDB-Ix>*
zSz>32Uh2QA5;Tvg8WtUyF;)80&&%Ac*}~$I34ln`memc2RSjw*+bc!=&&Myxf9efa
z4~e#+k-BH7yXB6HXAWOkbGj;+yLMTfRBin$7r%LDE`jhbvk|Il4K*S(01E&B07*qo
IM6N<$f(U3wLI3~&

delta 259
zcmV+e0sQ`v3i1MwHwpg${{a7>y{D6rKp_VTD+=-w=v$F!Cw~CVNkl<ZSi|jCK@P((
z2m_QS^wj^qZKwRfyHr!VEo3ANawwOoQWG14C}sd;2_{w#fWW5vej(5Uogt$VXaR%J
z`rb^WjAs4Vw#)lotC~oQgm_9mQbvgY*Y1`m@D_$df`7vjN)Cz6{#}JN6i6kIA^*7y
zr8i!Uv)=-KJY<hkAbgD1f5l$wi@@E4=>#r4U<u3bSZl)4TP8df614=@9nLdA;JXQB
zWR>=kf2}zXslpjcW?YSjS&><5HS3hb!{5!=v~+8>wmFTk=TB@lXDTOHd(i*@002ov
JPDHLkV1gvNb#DLw

diff --git a/res/images/items/item4.png b/res/images/items/item4.png
index fd349ea8631c105d6774358ebb24d315d954c515..2f200a519dc13a0047fc224ce90d0ee2a808032c 100644
GIT binary patch
delta 1363
zcmV-Z1+4nE0=Ns1Hwg*=4*+?Qb}f66Kp+Sb3;-IPSb5};XeWOK6G=otR9M5UmrZO`
zRTze!@6OmCKoS}?xY7hrK&2I|Mxu~tvBek@bm2l5nh<{yqg&I&mCA;V#swP_S(&(E
zVYGi!(}abI1kx#jLM&`tREcdO(wS-Jp4Y`WXXf6{ZGhlOZtmZ?=Y7BT`#Ik=N!-rp
zKfehp8I*t$SYm%rlD{s&x%;o*)_Qg;1Rnco6IKEeurg3Ge;=PkGJ#l}d-k4x?u@{r
zKW>CFSdsyaB$5nR2HdM6KfeqZob6kmNV49GN5(gz6x0Nz22FpB3+EJYLMhM`Y6_Y_
zD&)euF#n0g&9|q(?(a6VEsPSEtz}tMW!q<m1aS4!iYb4n;nm70lF*u8q(ldSBS(%1
z;L=-@mh*AhND`s454`Qi4{2y*7=X(71Xn((Slb<INr(sD8xp{&Q>QG8SI*w-{AL5Y
z7^Z)qAHK#DIXY<q451S2_~HctMDTcB`Pk3DdaPnClO!JezytRW^i!R!vTt#7PKg$Q
zhfnr;#+iRb0r-lXL|Ll~pN|&LzqYX8IW@_VXe*F{^50S!pU7F71)e_r3XktT0l@3C
zzc99z_<C!&5Wral9y;NzUrV6K(#q+Vz`8K&ZawQUV`O@oWhW{(OZ=t~#@@f~=G=YP
zJprX43Bx+(PtH7zSvO{Pf%SlO0bSu72mmrr0tbJmDlALXaV$GAKQfYE(BacHxZAs+
z>7%wt0S_Jk!(r;eXe-cb3I1z`5+P?mg3NWSr)Eg+fK}dpyvOIN71>V)I1nL2C@PQ`
zav)0(4ifo-Wu0|SsW3pm-aj@|rb&-V)D!%M(t%I3Hh_~+BaCh{lz;?M0yvZy&UGr_
zgFSyRkSI&^k{W_~ak1`3bOr0XS}~9f!VN(^#p136oWQI=0WiSi=a<1i>Q!o>A`$_t
z<^S$>AZ8SB#2E74m8sYT%`hkMD-#1x>Ls<_wIA%=_4!S=)c1GoSodAu+6T_3A|;Co
z5O{kL=bjwv<!5UB1EIu@PjGZ*hHkUm(Pe+|?oJO}{rx1c3R(fJBCP-`Jh%T#hDL_D
zwy;2Tw#xiRQ>Kt{mMuj7CMrRP3Uz#)P%yv&l4Sz5fil1?GHZ=*hK(w?%Vhb@XuVN$
z4rd7tha*7(mx(XA2EtnptNxnR!VJhNE{SA*w7#@9@j4WcsLN3o)Sal|@7tT+O0a*p
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&9Q5`GYssc0_GA7{=V-c+L$K;Hk+eWZ=w5U4{U4
zEJ%-57&<VKlmE9jCd~(+dFx6AUGe;AZK>^wVmH*}s3RKAQCHptBBMe<^;2rz4XL;=
za-+B{pC7F+DMMmzaICL7Tjkoq0z)Ii%nc7yb6);hu9@{gC>jhMn8{gx@zs9`Z++@x
z;Nr{6tlN|VTp6t|Z9CSpCA6U(eP6EQ`TI}*{MjEmd&!pX+miqK+VZXc8ATEx_MADq
z*gwz@z`a|ycC>3*(Aa!dXRBN|Jke^^FTJ^Z`@d$}j`eJb4%u_&@M3JQ<A`J;Xaokh
z@cg*NU$x6`*Y51+)T`k~B$6{F6F~va?;i`m#_u22{-3|&n~|9t9P5jz?6c|C$A6%@
VxSM0pfCT^m002ovPDHLkV1hxtl(zr?

delta 200
zcmV;(05|`*3$_A~Hwpg${{a7>y{D6rKp+SN3>g@mB)OB3XeWOFkx4{BR9M69mq8A|
zAP59u|NrOhwP~ytK{P4cWmdQ_N>VJPD%}U9sHxwV03)a;OgF$R*b)S*;iFzy4IlMH
z2E5lBS@1UoGT|*2WOE_=_s=PuF@c?>BIK_pPys4H1%UO2i!4&KR)CpPI`U9GX9by4
zxU=A~ng~aLSFI?#f`SOY^VkuhBy(2H&X&^*J-+~@CP*lFlNW;k0000<MNUMnLSTY<
C2ULsz

diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index 689594b..a2a1f30 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -125,4 +125,12 @@ public class Player extends ShootingEntity implements KeyboardListener {
 		return (int) this.shieldPercent;
 	}
 	
+	public void increaseHealthPoints(int inc) {
+		if (this.getHealthPoints() <= 85) {
+			this.setHealthPoints(getHealthPercent() + inc);
+		} else {
+			this.setHealthPoints(100);
+		}
+	}
+	
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java
index 47a3b04..32177df 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/Item.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java
@@ -24,6 +24,12 @@ public abstract class Item extends CollidableEntity {
 	public void collideWith(Collidable entity) {
 		if(entity instanceof Player) {
 			SoundSystem.playSound("sounds/powerup_pickup.wav");
+			while(entityIterator.hasNext()) {
+				Entity e = entityIterator.next();
+				if(e instanceof Player){
+					itemCollected((Player) e);
+				}
+			}
 			this.remove();
 		}
 	}
@@ -34,12 +40,6 @@ public abstract class Item extends CollidableEntity {
 			this.remove();
 		};
 		entityIterator.reset();
-		while(entityIterator.hasNext()) {
-			Entity e = entityIterator.next();
-			if(e instanceof Player){
-				itemCollected((Player) e);
-			}
-		}
 	}
 	
 	public abstract void itemCollected(Player player);
diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
index cd400b0..1735360 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
@@ -6,7 +6,7 @@ public class TestItem1 extends Item {
 		
 	public TestItem1(int x, int y) {
 		super(x, y);
-		this.setImage("images/items/item.png");
+		this.setImage("images/items/item4.png");
 	}
 
 	@Override
diff --git a/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
index 8ff86bd..da47b0f 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
@@ -13,6 +13,6 @@ public class TestItem3 extends Item {
 
 	@Override
 	public void itemCollected(Player player) {
-		player.setShootDamage(player.getShootDamage()+5);
+		player.increaseHealthPoints(15);
 	}
 }