From a0363aa3d88d8a07f8e8dda0518cf6016c13dd8b Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sun, 3 Jun 2007 11:34:27 +0000 Subject: [PATCH] added network buttons to the menu and changed som small things --- src/data/ui/host.png | Bin 0 -> 3415 bytes src/data/ui/host_ontop.png | Bin 0 -> 3299 bytes src/data/ui/join.png | Bin 0 -> 3308 bytes src/data/ui/join_ontop.png | Bin 0 -> 3210 bytes src/ei/game/algo/AStar.java | 6 +++-- src/ei/game/gamestate/MenuState.java | 35 ++++++++++++++++++++++----- src/ei/game/scene/units/Unit.java | 3 ++- 7 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 src/data/ui/host.png create mode 100644 src/data/ui/host_ontop.png create mode 100644 src/data/ui/join.png create mode 100644 src/data/ui/join_ontop.png diff --git a/src/data/ui/host.png b/src/data/ui/host.png new file mode 100644 index 0000000000000000000000000000000000000000..b2a3e635686ec7df3628724171ee86fcf06460a3 GIT binary patch literal 3415 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 literal 0 HcmV?d00001 diff --git a/src/data/ui/join.png b/src/data/ui/join.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc02def99f0d71d83e4306da6ef8096882c9c5a GIT binary patch literal 3308 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 literal 0 HcmV?d00001 diff --git a/src/ei/game/algo/AStar.java b/src/ei/game/algo/AStar.java index f3a5df7..caeea0c 100644 --- a/src/ei/game/algo/AStar.java +++ b/src/ei/game/algo/AStar.java @@ -32,7 +32,7 @@ public class AStar{ } public List startSearch(Vector2i start, Vector2i goal){ - //map[goal.getX()][goal.getY()].setBlocked(false); + //checks that the start and goul are inside the map if(start.getX() >= map.length) start.setX(map.length-1); if(start.getX() < 0) @@ -52,6 +52,8 @@ public class AStar{ goal.setY(map[0].length-1); if(goal.getY() < 0) goal.setY(0); + + map[goal.getX()][goal.getY()].setBlocked(false); return pathfinder.findPath(map[start.getX()][start.getY()], map[goal.getX()][goal.getY()]); } @@ -90,7 +92,7 @@ public class AStar{ if(!InGameState.getMap().isPosEmpty(x, y)) { map[x][y].setBlocked(true); - MultiPrintStream.out.print(1); + MultiPrintStream.out.print(""+1); } else MultiPrintStream.out.print(""+0); } diff --git a/src/ei/game/gamestate/MenuState.java b/src/ei/game/gamestate/MenuState.java index 251a117..3aee2c4 100644 --- a/src/ei/game/gamestate/MenuState.java +++ b/src/ei/game/gamestate/MenuState.java @@ -18,6 +18,8 @@ public class MenuState extends GameState implements UiListener{ private Button resume; private Button newGame; + private Button join; + private Button host; private Button quit; public MenuState(String name){ @@ -29,6 +31,7 @@ public class MenuState extends GameState implements UiListener{ menuNode = new Node("MenuNode"); int x = LWJGLGameWindow.getWidth()/2; + int y = 250; Sprite logo = new Sprite("Logo","data/logo.png"); logo.setLocation(new Vector2f(x,100)); @@ -41,24 +44,44 @@ public class MenuState extends GameState implements UiListener{ resume.setButtonSprite(s1); resume.setOnTopButtonSprite(new Sprite("ResumeButton_Selected","data/ui/resume_ontop.png")); resume.setDisabledButtonSprite(new Sprite("ResumeButton_Disabled","data/ui/resume_disabled.png")); - resume.getNode().setLocation(new Vector2f(x,250)); + resume.getNode().setLocation(new Vector2f(x,y)); resume.addListener(this); resume.setEnabled(false); ui.addUi(resume); + y += 40; Sprite s2 = new Sprite("NewButton","data/ui/new.png"); newGame = new Button("New", s2.getSize()); newGame.setButtonSprite(s2); newGame.setOnTopButtonSprite(new Sprite("NewButton_Selected","data/ui/new_ontop.png")); - newGame.getNode().setLocation(new Vector2f(x,300)); + newGame.getNode().setLocation(new Vector2f(x,y)); newGame.addListener(this); ui.addUi(newGame); - Sprite s3 = new Sprite("QuitButton","data/ui/quit.png"); - quit = new Button("Quit", s3.getSize()); - quit.setButtonSprite(s3); + y += 40; + Sprite s3 = new Sprite("JoinButton","data/ui/join.png"); + join = new Button("Join", s3.getSize()); + join.setButtonSprite(s3); + join.setOnTopButtonSprite(new Sprite("JoinButton_Selected","data/ui/join_ontop.png")); + join.getNode().setLocation(new Vector2f(x,y)); + join.addListener(this); + ui.addUi(join); + + y += 40; + Sprite s4 = new Sprite("HostButton","data/ui/host.png"); + host = new Button("Host", s4.getSize()); + host.setButtonSprite(s4); + host.setOnTopButtonSprite(new Sprite("HostButton_Selected","data/ui/host_ontop.png")); + host.getNode().setLocation(new Vector2f(x,y)); + host.addListener(this); + ui.addUi(host); + + y += 40; + Sprite s5 = new Sprite("QuitButton","data/ui/quit.png"); + quit = new Button("Quit", s5.getSize()); + quit.setButtonSprite(s5); quit.setOnTopButtonSprite(new Sprite("QuitButton_Selected","data/ui/quit_ontop.png")); - quit.getNode().setLocation(new Vector2f(x,350)); + quit.getNode().setLocation(new Vector2f(x,y)); quit.addListener(this); ui.addUi(quit); diff --git a/src/ei/game/scene/units/Unit.java b/src/ei/game/scene/units/Unit.java index 6b7da99..30c774d 100644 --- a/src/ei/game/scene/units/Unit.java +++ b/src/ei/game/scene/units/Unit.java @@ -322,7 +322,8 @@ public abstract class Unit extends GameEntity{ setPos(temp.getX(), temp.getY()); } else if(!path.isEmpty()){ - move(false, path.getLast().getX(), path.getLast().getY()); + //removed because its making problem whit the bomber unit + //move(false, path.getLast().getX(), path.getLast().getY()); } } else{