From b034e681380b64eaeaa22ce6a81e9143bb23cbd5 Mon Sep 17 00:00:00 2001
From: Sosch <F.Sosch@hotmail.de>
Date: Tue, 11 Nov 2014 14:25:46 +0100
Subject: [PATCH] =?UTF-8?q?Shop=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/images/shopTest01.png                     | Bin 0 -> 1121 bytes
 res/images/shopTest02.png                     | Bin 0 -> 1436 bytes
 .../spacescooter/entity/Player.java           |   6 +--
 .../spacescooter/entity/PlayerStatus.java     |  11 ----
 .../spacescooter/entity/StaticValue.java      |  18 +++++++
 .../spacescooter/gui/Credits.java             |   1 -
 .../spacescooter/gui/ShopOffer.java           |  51 ++++++++++++++++++
 .../spacescooter/gui/ShopOfferValue.java      |  13 +++++
 .../spacescooter/screen/ShopScreen.java       |  51 ++++++++++++------
 9 files changed, 121 insertions(+), 30 deletions(-)
 create mode 100644 res/images/shopTest01.png
 create mode 100644 res/images/shopTest02.png
 delete mode 100644 src/de/teamteamteam/spacescooter/entity/PlayerStatus.java
 create mode 100644 src/de/teamteamteam/spacescooter/entity/StaticValue.java
 create mode 100644 src/de/teamteamteam/spacescooter/gui/ShopOffer.java
 create mode 100644 src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java

diff --git a/res/images/shopTest01.png b/res/images/shopTest01.png
new file mode 100644
index 0000000000000000000000000000000000000000..964d920c46f39825350e231b74a632df6ab39164
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^+{
z3p)^LVR2Fb000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000BLNkl<Z
zSi`-S&5j#I5XXPjJ?&r|%TiW*fQ{nAN+F392?-&PR^rH8zzv>(1DxQ%Gk}x_;fS;n
z2{~|y5{Po}Dg>n9gLmyX+4gjCn40m}>+#xQNl9bb<L>(S_rE?Gwv+dPdw@1P_iW9^
zlCAw$2q^nN2RH$4+xI5v*qRqW7nmSCL5Z6<BP-s$3)}&I2krw8fbkjx#<u3Z?YUz*
z8g11PP~dH#540`f1K?AHJ-H<H)yb4dZLb;vx0r#xQcya;&%mJ}G6e>P(8{Q90$%|i
znFAeQpFk`01Fq)^(~2(bSNkP6NTWm?M2MUMPk@Oza2NO<c-X{&wi$n~dK19!_~fs6
zaXlxRE9e==rTi2xh!;)cr1>y!5xKd-Mk5JN?5T{0e!%Z|A%LDLRqPF-xk3v<KZv{R
zN+ee62gzz|-?cOE)FQ|4cwE<sMlF;BBC^`J+W%fe-YV9laUvh)r4t>qF+q5a620xc
z4txWA0bC{ELqCwclR>Z(PBph19GIVn6ng}G*CQ<<og_%~fRByn4}pKOTK*m&?2*}-
z?|9iX@@2<V6>{T4fyA5>GxpFq(pmj%<dTqG&G1+3%%d(uzO^LN5g=SEI5B%VLtkpe
zh0IFlZJ<pCuIF$)CwjVh<QpI%(vw2p-wWBM8SsO_(XYJD&u9BqqNa0>X5Z?~aRz+2
z0Gc9Yo^Km@6B4yrxmYm)w?RL+Xpwb=NZzFJRS3LsacAjrq4eWC{i_`KzeSfh@M|p%
zJM}JK)%MrShK2o7)@a1q^8h$@z?ase2PG!r<zne*ZMuf{z-)e=0l(RVGG$f_6XHc_
z6%~xMJrWD+9cZqqBPETJFaw*6?gEcXpSnO-Uny}AiAPb1AVL0Ho;cGHAs$7IgIJ7e
zX0KicCcq&|hsbU|%v<iVtA-Ns!X`+ph#Y;X<ilL@VJ<eJJ+~Qg0^se8Mh3|MxJ6<&
zoh0;B@m-H=yM+Wgw=H`?f}qm^(b-?Kav=Ew_!jsP;VF<ZON<CSt9wR-e3)ZMs39Ti
z618Nz=Bl;G>m%93Y&<K+*yU1OolWUP97NJMX}A{VEmhaET}MhhifXVo>$i4Xmy(@S
zV|ir1<V4j{&mYU{XTCg^PuDevRTq=*wz!xS%$;9M{sg{WcQMJ9oOw~dG??d~pd8p3
z)vhY$*)CVFa8omQ2>fLHT3)Z4RImWt06wtE`7^uwHQfy#*qZCM=Z5Kct=q9!c05{Y
nB*$y^90R`qkC$3cW5oXgN;AV3<+V7R00000NkvXXu0mjfE0Fy1

literal 0
HcmV?d00001

diff --git a/res/images/shopTest02.png b/res/images/shopTest02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a548428dc184e3ba9334e23f6ebf51722cf513fb
GIT binary patch
literal 1436
zcmV;N1!MY&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^+{
z3p)au*Z>*;000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000E{Nkl<Z
zSi{Aa&u>&!6vsd3y*sbG8QLMCZ)hr+@*`p)F_aQh6ILYRj(>mzcDgh%x^ST@U6`o<
zfF`Uk`~kWG7Q}?aB57bjC=dvYhyzm%)6)0o>wWjQnD@q^KZaHzoaAoayXV*UoO^!2
z=4b-A4Cp%Na(-vSWcvN|N?u7b-K$P3zyk0#Q0c=`$?wF#pm?$<zT9!kZh0fd$f^&%
zj3S%{ZUR?;>%h}K2t3X2Tmfz(oEBe3`|0XMK!Gwa2880tf@XRIcwdaXF}QP(pc)i6
zT`oj=com@n97x+K3lA1hs};@k7xCnhIvoTO;C_zKnqKb*J_Du@7Emg{-mn%1lb=j7
zGBrY$W~fzFw3lB6L5zqW_%x@R%zQUP@;FI>I|z#?gTOTKHE?6S90-9a;H{2)2&0ht
zdv#YoR+rkLn%LChtdq4M^^AuJ48c&KbJymyalR2Gtz>^8t4Bwd{O6>2vK2TEj26l#
zKb>U!)Hq=+#AQyhXBjSaxaHL+OEc_}#SeU<iAc&j$})Ft4jbFT%zNU=S(LxKX;x%A
z!iYLO3LFKZFbb(3t22IToM<8vx9r5m7R?kKsMA%)S%*s<CNxsrQ<YMsMBI#tn{i=8
z8|8QL<*{eHXX-R75ZI@xUjQEfJHsgSyPij3$Ghc>0!k6-`<7G{x8(2#e4>en@{Te&
z5>?<`U<~C3%AB9)@EGv17}*^ThkpH7-Sv2mO)O|faX;n7e|3smc9_sm-BYDhDQVn{
zHGUMEY$+SUQ9=0$__IJ@5I8<m9~zzbXoB&RdCZrcY}oS`A#t#i6HjhEVd=@zJ>V?x
zmzS5$DIg500V7i*)DG3el#SS=6Z02&zAh4(ViSug8>t<t$;i}5QA>)~_ND>8&r9eS
z(8=U9Pd4HIlh83FwPa~ld>zZ{&Ab8L>8XWIt%|cwikSZ|-37mbvktYYbShW{H~`?S
z<k1yX<7Lu{>bYhm6kaW@lJD`F$y<dIuP_E{$X{iEyuv8tvUOz+{MLPjLPd<=8LwMN
zHeG;vy;1E(-ZLIzL~<(@^SNN&13t`q^nCz7@G*fwe0e#+P!L}*fx!>D&G&w;^OOOu
z<`YViwo{tZO@g67!&-<5jbzJNrzmX#i7s-!;Fo-CZ1wTI$26y#lD1Rw$!Hq5U6`~B
zIFUY0x3{jgh?}uS6OmN+RK+cIdOfnqP$-xI!<Ow^Xy0u!^X-hz{x~b~qZk}dfuFn0
zNIa<mbsROjXt%`8*pzparBo^55BQkSpxWvA{gCMO+zc4(GfVq!o5s0@%$}K*q?M#N
zng|!glZ)MU>=~~OOrzWf4%pa6bJymGn=#QuM0HP<4I{DA^KWLDJu^$vN&s#FUy3h3
zh%XP+sWSli-2PBJxumL#C?u_f#`y-r2ZsSPj6zJsh-SKea!SX08(VE%ZP7T_kjD8&
zp&W!o5xJz9KFsq<{1w*k0!{$K05-PdNN990l5M-Ui5NkQ;04~QV?x8g)&bgg@|bsE
z@71t?c4EI?FDSB;Vk}Qu$==3=MlgJEm~=kf=vXd|3yn_9SC8dMzvl4#V&e1&@YN<3
z6Az$gG5G`dyx(H-+E+7Pw4913<G^8HA8;~Pu$}?e^E>;1!{W)fSMo~#bvu^)b<D2l
qX7hb`=7C><+wkx1kbAu5+xZ90>aWV<XK82v0000<MNUMnLSTYVDWV|&

literal 0
HcmV?d00001

diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index 3c060a0..d7290bf 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -18,14 +18,14 @@ public class Player extends ShootingEntity implements KeyboardListener {
 		super(x, y);
 		this.setImage("images/ship.png");
 		this.setPrimaryShotImage("images/shots/laser_blue.png");
-		this.setShootDamage(PlayerStatus.ShootDamage);
+		this.setShootDamage(StaticValue.ShootDamage);
 		this.setShootDelay(20);
 		this.setShootSpawn(50, 16);
 		this.setShootDirection(Shot.RIGHT);
 		this.setShootSpeed(10);
 		this.setCollisionDamage(10);
-		this.setShieldPoints(100);
-		this.setHealthPoints(PlayerStatus.HealthPoints);
+		this.setShieldPoints(StaticValue.ShieldPoints);
+		this.setHealthPoints(StaticValue.HealthPoints);
 		this.registerOnKeyboard(Keyboard.getInstance());
 	}
 
diff --git a/src/de/teamteamteam/spacescooter/entity/PlayerStatus.java b/src/de/teamteamteam/spacescooter/entity/PlayerStatus.java
deleted file mode 100644
index 5b2dcef..0000000
--- a/src/de/teamteamteam/spacescooter/entity/PlayerStatus.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.teamteamteam.spacescooter.entity;
-
-public class PlayerStatus {
-
-	/**
-	 * Status values for the player
-	 */
-	
-	public static int ShootDamage = 5;
-	public static int HealthPoints = 100;
-}
diff --git a/src/de/teamteamteam/spacescooter/entity/StaticValue.java b/src/de/teamteamteam/spacescooter/entity/StaticValue.java
new file mode 100644
index 0000000..dde2b4c
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/entity/StaticValue.java
@@ -0,0 +1,18 @@
+package de.teamteamteam.spacescooter.entity;
+
+public class StaticValue {
+	
+	/**
+	 * Values for the player
+	 */
+	public static int ShootDamage = 5;
+	public static int HealthPoints = 100;
+	public static int ShieldPoints = 100;
+	
+	/**
+	 * Values for the Shop
+	 */
+	public static int schaden = 0;
+	public static int schild = 0;
+	public static int leben = 0;
+}
diff --git a/src/de/teamteamteam/spacescooter/gui/Credits.java b/src/de/teamteamteam/spacescooter/gui/Credits.java
index 930a580..b1ebeb0 100644
--- a/src/de/teamteamteam/spacescooter/gui/Credits.java
+++ b/src/de/teamteamteam/spacescooter/gui/Credits.java
@@ -12,6 +12,5 @@ public class Credits {
 
 	public static void setCredits(int credits) {
 		Credits.credits = credits;
-		System.out.println(credits);
 	}
 }
diff --git a/src/de/teamteamteam/spacescooter/gui/ShopOffer.java b/src/de/teamteamteam/spacescooter/gui/ShopOffer.java
new file mode 100644
index 0000000..d05aa77
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/gui/ShopOffer.java
@@ -0,0 +1,51 @@
+package de.teamteamteam.spacescooter.gui;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+
+import de.teamteamteam.spacescooter.entity.Entity;
+
+public class ShopOffer extends Entity{
+
+	private String offer;
+	private int gekauft;
+	private int max;
+	
+	public ShopOffer(int x, int y, int max, int gekauft, String offer) {
+		super(x, y);
+		this.offer = offer;
+		this.gekauft = gekauft;
+		this.max = max;
+		for (int i = 0; i<max; i++){
+			if(i<gekauft){
+				new ShopOfferValue(x + 100 + i*35, y, "images/shopTest02.png");
+			}else{
+				new ShopOfferValue(x + 100 + i*35, y, "images/shopTest01.png");
+			}
+		}
+	}
+
+	@Override
+	public void paint(Graphics2D g) {
+		g.setFont(new Font("Monospace", 0, 20));
+		g.setColor(new Color(255, 255, 255));
+		g.drawString(offer, this.getX(), this.getY()+20);
+	}
+	
+	public void update() {}
+	
+	public void buy(){
+		new ShopOfferValue(this.getX() + 100 + gekauft*35, this.getY(), "images/shopTest02.png");
+		gekauft++;
+	}
+
+	public int getGekauft() {
+		return gekauft;
+	}
+
+	public int getMax() {
+		return max;
+	}
+}
+	
diff --git a/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java b/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java
new file mode 100644
index 0000000..3d66ec5
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java
@@ -0,0 +1,13 @@
+package de.teamteamteam.spacescooter.gui;
+
+import de.teamteamteam.spacescooter.entity.Entity;
+
+public class ShopOfferValue extends Entity{
+
+	public ShopOfferValue(int x, int y, String filename) {
+		super(x, y);
+		setImage(filename);
+	}
+
+	public void update(){}
+}
diff --git a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
index 64afe4a..699e010 100644
--- a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
@@ -8,9 +8,10 @@ import java.awt.image.BufferedImage;
 
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Player;
-import de.teamteamteam.spacescooter.entity.PlayerStatus;
+import de.teamteamteam.spacescooter.entity.StaticValue;
 import de.teamteamteam.spacescooter.gui.Button;
 import de.teamteamteam.spacescooter.gui.Credits;
+import de.teamteamteam.spacescooter.gui.ShopOffer;
 import de.teamteamteam.spacescooter.utility.GameConfig;
 import de.teamteamteam.spacescooter.utility.Loader;
 
@@ -22,14 +23,18 @@ public class ShopScreen extends Screen {
 	private boolean keyPressed = false;
 	private Player player;
 	private int animationStatus = 0; //0 = Animation noch nicht gestartet, 1 = Animation laeuft, 2 = Animation beendet
+	private ShopOffer schaden;
+	private ShopOffer schild;
+	private ShopOffer leben;
 	
 	public ShopScreen(Screen parent) {
 		super(parent);
 		this.img = Loader.getBufferedImageByFilename("images/testbackground.png");
-		new Button(GameConfig.windowWidth/2-125, 250);
-		new Button(GameConfig.windowWidth/2-125, 350);
 		new Button(GameConfig.windowWidth/2-125, 450);
-		player = new Player(GameConfig.windowWidth/2-170, 259);
+		schaden = new ShopOffer(100, 160, 15, StaticValue.schaden, "Schaden");
+		schild = new ShopOffer(100, 260, 15, StaticValue.schild, "Schild");
+		leben = new ShopOffer(100, 360, 15, StaticValue.leben, "Leben");
+		player = new Player(50, 159);
 		player.setCanMove(false);
 		player.setCanShoot(false);
 	}
@@ -43,43 +48,59 @@ public class ShopScreen extends Screen {
 		}
 		g.setFont(new Font("Monospace", 0, 20));
 		g.setColor(new Color(255, 255, 255));
-		g.drawString("Credits: " + String.valueOf(Credits.getCredits()), GameConfig.windowWidth/2-30, 200);
+		g.drawString("Credits: " + String.valueOf(Credits.getCredits()), GameConfig.windowWidth/2-30, 100);
 		g.setColor(new Color(0, 0, 0));
-		g.drawString("Schaden", GameConfig.windowWidth/2-30, 282);
-		g.drawString("Leben", GameConfig.windowWidth/2-50, 382);
-		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-50, 482);
+		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-55, 482);
 	}
 
 	@Override
 	protected void update() {
 		if(Keyboard.isKeyDown(KeyEvent.VK_DOWN) && !this.keyPressed && this.animationStatus == 0) {
 			this.keyPressed = true;
-			if(this.menuPoint<2){
+			if(this.menuPoint<3){
 				this.menuPoint++;
-				this.player.setPosition(this.player.getX(), 259+(this.menuPoint*100));
+				if(menuPoint == 3){
+					this.player.setPosition(GameConfig.windowWidth/2-170, this.player.getY());
+				}
+				this.player.setPosition(this.player.getX(), 159+(this.menuPoint*100));
 			}
 		}else if(Keyboard.isKeyDown(KeyEvent.VK_UP) && !this.keyPressed && this.animationStatus == 0) {
 			this.keyPressed = true;
 			if(this.menuPoint>0) {
 				this.menuPoint--;
-				this.player.setPosition(this.player.getX(), 259+(this.menuPoint*100));
+				this.player.setPosition(50, this.player.getY());
+				this.player.setPosition(this.player.getX(), 159+(this.menuPoint*100));
 			}
 		}else if(Keyboard.isKeyDown(KeyEvent.VK_ENTER) && !this.keyPressed && this.animationStatus == 0) {
 			this.keyPressed = true;
+			///////////////////////////////////////////////////////////////
 			switch (this.menuPoint) {
 			case 0:
-				if(Credits.getCredits() >= 5){
-					PlayerStatus.ShootDamage += 5;
+				if(Credits.getCredits() >= 5 && schaden.getGekauft() < schaden.getMax()){
+					schaden.buy();
+					StaticValue.ShootDamage += 5;
+					StaticValue.schaden++;
 					Credits.setCredits(Credits.getCredits() - 5);
+					System.out.println(schaden.getGekauft());
 				}
 				break;
 			case 1:
-				if(Credits.getCredits() >= 10){
-					PlayerStatus.HealthPoints += 10;
+				if(Credits.getCredits() >= 10 && schild.getGekauft() < schild.getMax()){
+					schild.buy();
+					StaticValue.ShieldPoints += 10;
+					StaticValue.schild++;
 					Credits.setCredits(Credits.getCredits() - 10);
 				}
 				break;
 			case 2:
+				if(Credits.getCredits() >= 10 && leben.getGekauft() < leben.getMax()){
+					leben.buy();
+					StaticValue.HealthPoints += 10;
+					StaticValue.leben++;
+					Credits.setCredits(Credits.getCredits() - 10);
+				}
+				break;
+			case 3:
 				this.animationStatus = 1;
 				break;
 			}