Fixed positioning of Rocketdog for video demo.

Fixed laser attack to work on both sides (bug fix needed when attacking to the left)
sharris40 · Feb 27, 2016 · 80324d0 · 80324d0
1 parent fdba91e
commit 80324d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/edu/uco/sdd/rocketdog/controller/DefaultKeyMapping.java b/src/edu/uco/sdd/rocketdog/controller/DefaultKeyMapping.java
@@ -38,7 +38,11 @@ public void handleKeyPressed(Level currentLevel, KeyEvent keyEvent, double speed
                 currentLevel.getLaserWeapon(i).setVisableOn();
                 currentLevel.getLaserWeapon(i).setPosition(new Point2D(currentLevel.getRocketDog().getPosition().getX() + 100,
                         currentLevel.getRocketDog().getPosition().getY() + 65));
-                currentLevel.getLaserWeapon(i).setVelocity(new Point2D(speed, currentLevel.getRocketDog().getVelocity().getY()));
+                if (currentLevel.getRocketDog().getSprite().getScaleX() == -1) {
+                    currentLevel.getLaserWeapon(i).setVelocity(new Point2D(-speed, currentLevel.getRocketDog().getVelocity().getY()));
+                } else {
+                    currentLevel.getLaserWeapon(i).setVelocity(new Point2D(speed, currentLevel.getRocketDog().getVelocity().getY()));
+                }
                 break;
             case K:
                 int j = currentLevel.checkFiredLargerLaser();
@@ -49,7 +53,11 @@ public void handleKeyPressed(Level currentLevel, KeyEvent keyEvent, double speed
                 currentLevel.getLargeLaserWeapon(j).setVisableOn();
                 currentLevel.getLargeLaserWeapon(j).setPosition(new Point2D(currentLevel.getRocketDog().getPosition().getX() + 100,
                         currentLevel.getRocketDog().getPosition().getY() + 15));
-                currentLevel.getLargeLaserWeapon(j).setVelocity(new Point2D(speed, currentLevel.getRocketDog().getVelocity().getY()));
+                if (currentLevel.getRocketDog().getSprite().getScaleX() == -1) {
+                    currentLevel.getLargeLaserWeapon(j).setVelocity(new Point2D(-speed, currentLevel.getRocketDog().getVelocity().getY()));
+                } else {
+                    currentLevel.getLargeLaserWeapon(j).setVelocity(new Point2D(speed, currentLevel.getRocketDog().getVelocity().getY()));
+                }
                 break;
             case F1:
                 currentLevel.getRocketDog().setState(new FullHealthState(1000));

diff --git a/src/edu/uco/sdd/rocketdog/model/Level.java b/src/edu/uco/sdd/rocketdog/model/Level.java
@@ -65,7 +65,7 @@ public Level(Group root, ImageView background, int width, int height) {
         //root.setAlignment(Pos.TOP_LEFT);
 
         //Hero information added to game
-        rocketDog.setPosition(new Point2D(150, 400));
+        rocketDog.setPosition(new Point2D(350, 300));
         rocketDog.addEntityClass(player, 1);
         rocketDog.getHitbox().setWidth(130);
         rocketDog.getHitbox().setHeight(130);
@@ -409,10 +409,7 @@ public void update() {
 
         enemies.stream().forEach((entity) -> {
             if (entity.hasCollided(rocketDog)) {
-                entity.setState(new CollisionState(entity.getCurrentHealth() - 15));
-                rocketDog.setCurrentHealth(rocketDog.getCurrentHealth() - 5);
-                rocketDog.setState(new DamagedState());
-                update(rocketDog.currentHealth);
+                update(rocketDog.getCurrentHealth());
             } else if (!entity.hasCollided(rocketDog)) {
                 entity.setState(new DamagedState());
             }
@@ -443,7 +440,8 @@ public void update() {
                 //Check for collision
                 p.processCollision(rocketDog);
                 if(p.hasCollided(rocketDog)) {
-                    this.update(rocketDog.getCurrentHealth());
+                rocketDog.setState(new DamagedState());
+                update(rocketDog.currentHealth);
                 }
             } else {
                 removeProjectile(p);