From 77e85f72f4148501a6cef461e1c5fac5c80f0a48 Mon Sep 17 00:00:00 2001 From: bob Date: Wed, 1 Jun 2022 14:49:35 -0400 Subject: [PATCH] Changed map --- out/production/final/GamePanel.class | Bin 4848 -> 5316 bytes out/production/final/GenericSprite.class | Bin 2290 -> 2264 bytes src/GamePanel.java | 4 +--- src/GenericSprite.java | 9 +++++---- src/MenuPanel.java | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/out/production/final/GamePanel.class b/out/production/final/GamePanel.class index c4d26fae6d52027905be72ea7f27f1fbff20f0b3..d1e428a5f6d9e7d22f5c085b709678cb2aadb0c5 100644 GIT binary patch literal 5316 zcmai233wFc8GirW4YSz{WD{;7AOe~!fj|@xLL(3$hY3&;f&mqV%_JGv?8e;*5N$<; z)}valw%)Cvl-9O_N;W8J+o!d)w%FSHptZI2=zZDRQZ#+PnaS>kN==^K`R6~r^Zky0 zUwG%KX8}~J$szdQ*AUQ=hYNpqY zQKF>T6EmWwNK{kvuA74>(-FZeg8KC=`$HUM5E8vF$Wb2V>@D2k3*_1 zk+iN%#BC!M>r<%q$exMDd$7s+zh>pGsM%v%iFgQealVcV1aXD*cie8a zjp+84Bvse2fM#7AGy2SA2=j5FAajvIq_p1odrvgE5UtX&1n(my+LM%MtwxuogSLxw zEX6Vcy4&cX`mXDGZ7Wvc0I$(X*;N{96ap<)%nV^UR*D#_2ri0I)*3<`i0%d*7o%}V z$KmHm+-Pqn@m$xqD6J~nDAr%CV-40S=qb})m5BDHjIA+xK2W+*7zD9SM>AR!Mv>0N zW}gUU#zmE>Ic_m`m~p!zXSu4ZRYNNSDHE78=7q2xmxuywq*mIPS>aw`v`NRMxQzHF zqozb}%FMEw_CKtKZE%=v_R@wE-z%(cGoEsMd^uJM^{qOhpdrFkb8XUO+%xc-tt+YO z_#En)gAPr`WKM9mbR|urJp>b7qJ@<`>BQE$-gsPW$CHvuw(E$YTOriRY~&uLggN2q z&M~@8By{u$3iDF7k+enJq>dCA&;?QQv`sI-#)#Wp5)usAytPBePV6E9OHvu7K7CUN zSK=xSAJFkZTut+5GNDJgfKgnVG`uj2;XNNlwyjh$KRi7J_s4y-?dn>E~`-V*qu|(9enVi)MSsBoA)Y-Qy zgr{&!!_zvR!L!4{r@4=rg8>nY8}UR71Jp4?!-%D;*#q!z#IobZO&JJO4#?MYI=&_< zjf!@e(d{)Ns~ginJg?&$vLvO-VCEJJd{f7_aGVNnH~Sdksgx)@Imcp|EVWY76;+f| z-`4RRIaR<@>&%#G@R)}0G9eC?j8#tZeF@)}sQ%md z+h|DHk+`g1L-$AyQJCY2#U&v>RFThA;xzo6s$_!J1@*A@C4>`rS;sH&D+x~1-e9%c zU5p&agFV|{hrm8832OMe!dV%CGnUWh^ib`xrj?sF)URl%Qy5v3h%@)a?N;f9 z{6OHa)DGEEx3a#ru7y*+ODKM`)fqSJ-Xy_O;)cTTdbgxeN@Z1b6)jzp5M&oNT5)rA zZ}(O++2WSA;>JYOh_xC?OWwW75pKt)FeMvd?_y@sRV3=w>f!x_tg$Er>@JHrv>>Oz zQ9-A*Xfk>{c6knJc|f{1S7tgZ*&C<#Vn)h#<3ly@q|q&{?3#`iE4rO@eQ|!}wVN^9 z;E8yGiF9ICInb zp^=vN8e9^Mc|CckInkSpnu2A` zf5G1v`4jObbSV6TdBBH%^8Kxx_kVGPMU`tx>YejsIdY!tvz#Yuj`QTbz_;L}TpV}? zW7_=193qr-s}zoLqosJM#|H0SNxS+ zabFK2*u?qDy-FP%yghOZ^V^DimlUb;@P_cRaC3NtP#VC(ek^_*)yJ^Bt;qjIk$Q6g zE7GXlFf`|Tx=7u2+MMhwKW&ct@Vqw{38c{!iKOvXbdkU_s78JAfo{d)8cmr+Qma*P! z)=-}c(vD=75ow_(66d6agU_*E0eq)0QN!IQd6!kvYou*ySggwro1Q7dJ75-OIO!*_sQQ1sLbh zIN}d6+kqV9hM}E8p=0}!qH~LiCK9sw8RHdmRKOGMNAcv+G5BJ`7<{=bu_$lUB8@W( z^CxKI@~4_NO~^|`7jd|Bf>wCfeS@zPv|r)ptNeVO%4y-y!bNvefVhp8;DBN@0&ioqh7;-(Lh2-@OPUX=@k23#>5jpGf@7#_8^E8RK(*LkIr-bQ c*mU^S1kU-?M0FOQVxRSD5=S8!@yWmc0-dz!ssI20 literal 4848 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 delta 344 zcmX|*%Su8~6ox;^bJViSNgEktQkut-3^Xdzu23Y>g(4{{v&+EBpg|9^U%)1fBh>e3 z)=M-An)gE?o4wiV+w1%H`gFdXw`#EK*nd>q)WtKce^J6CiA6R&RN0abH!`>$SZn;H%u+}E;wixp^P1(1z zy{q^=M%h>FfxbUfK;uorJwJmzmj`{MHoGN`>GD1y* WUXkF&6#bRJ9X{?g{)2h<$A1AE@I2oD diff --git a/src/GamePanel.java b/src/GamePanel.java index fb75c80..77930d3 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -48,9 +48,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{ e.printStackTrace(); } } - player = new Player(GAME_WIDTH/2, GAME_HEIGHT/2, 'W', 'A', 'S', 'D', spriteArray); //create a player controlled player, set start location to middle of screen - map.add(new Tile(1000, 700)); - map.add(new Tile(700, 600)); + player = new Player(GAME_WIDTH/2, GAME_HEIGHT/2, 'W', 'A', 'S', 'D', spriteArray); //create a player controlled player, set start location to middle of screenk map.add(new Tile(1000, 500)); map.add(new Tile(700, 400)); map.add(new Tile(1000, 300)); diff --git a/src/GenericSprite.java b/src/GenericSprite.java index 00c2b4b..abffe35 100644 --- a/src/GenericSprite.java +++ b/src/GenericSprite.java @@ -31,20 +31,21 @@ public class GenericSprite extends Rectangle{ public void keyPressed(KeyEvent e){ if(e.getKeyChar() == 'd'){ rightPressed = true; - move(); + } if(e.getKeyChar() == 'a'){ leftPressed = true; - move(); + } if(e.getKeyChar() == 'w'){ upPressed = true; - move(); + } if(e.getKeyChar() == 's'){ downPressed = true; - move(); + } + move(); } //called from GamePanel when any key is released (no longer being pressed down) diff --git a/src/MenuPanel.java b/src/MenuPanel.java index 72b0a64..423b54a 100644 --- a/src/MenuPanel.java +++ b/src/MenuPanel.java @@ -14,7 +14,7 @@ public class MenuPanel extends JFrame implements ActionListener { this.setTitle("First"); this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); this.setSize(280, 200); - this.setVisible(true); + launchGame = new JButton("Click"); launchGame.addActionListener(this); @@ -22,6 +22,7 @@ public class MenuPanel extends JFrame implements ActionListener { menuContainer = getContentPane(); menuContainer.setLayout(new FlowLayout()); menuContainer.add(launchGame); + this.setVisible(true); } public void paint(Graphics g) {