This is a manual commit to update master to the demo. Undoing this co…

…mmit should return master to its previous state.
sharris40 · Apr 12, 2016 · f3338a8 · f3338a8
1 parent 1d919be
commit f3338a8
Show file tree

Hide file tree

Showing 18 changed files with 4,840 additions and 224 deletions.
diff --git a/HighScores b/HighScores
@@ -0,0 +1,74 @@
+1000-Player A
+2000-Player B
+5000-Player C
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
+500-New Name
diff --git a/nbproject/UPDATED.TXT b/nbproject/UPDATED.TXT
@@ -5,7 +5,7 @@ Project RocketDog build script updated
 Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
 as compliant with this version of NetBeans JavaFX support module. To ensure correct
 and complete functionality within this NetBeans installation the script file has been
-backed up to jfx-impl_backup_4.xml and then updated to the currently supported state.
+backed up to jfx-impl_backup_5.xml and then updated to the currently supported state.
 
 FX Project build script auto-update may be triggered on project open either after
 NetBeans installation update or by manual changes in jfx-impl.xml. Please note that

diff --git a/nbproject/jfx-impl.xml b/nbproject/jfx-impl.xml
@@ -3678,7 +3678,6 @@
             <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
             <jvmarg line="${debug-args-line}"/>
             <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-            <jvmarg value="-Dglass.disableGrab=true"/>
             <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
             <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
             <jvmarg line="${run.jvmargs}"/>
@@ -3817,7 +3816,7 @@
     <target name="-debug-javaws-debuggee" depends="-init-debug-args">
         <echo message="Executing ${jfx.deployment.jnlp} in debug mode using ${active.webstart.executable}"/>
         <exec executable="${active.webstart.executable}">
-            <env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address} -Dglass.disableGrab=true"/>
+            <env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
             <arg value="-wait"/>
             <arg file="${jfx.deployment.jnlp}"/>
         </exec>

diff --git a/nbproject/jfx-impl_backup_5.xml b/nbproject/jfx-impl_backup_5.xml
diff --git a/src/edu/uco/sdd/rocketdog/controller/DefaultKeyMapping.java b/src/edu/uco/sdd/rocketdog/controller/DefaultKeyMapping.java
@@ -92,7 +92,7 @@ public void handleKeyPressed(RocketDogController rdController, Level currentLeve
                 currentLevel.setVisibleHitBoxes(!currentLevel.getVisibleHitBoxes());
                 break;
             case P:
-                currentLevel.setDone(true);
+                currentLevel.addAidItem(new HealthItem(new Point2D(100, 100)), 56, 56);
                 break;
             case O:
                 //game.displayOptionsScreen();

diff --git a/src/edu/uco/sdd/rocketdog/controller/ProjectileAttackController.java b/src/edu/uco/sdd/rocketdog/controller/ProjectileAttackController.java
@@ -52,7 +52,7 @@ public void setMaxRange(double maxRange) {
   public boolean attack(TangibleEntity target) {
     double distance = controlledObject.getPosition().distance(target.getPosition());
     if (target instanceof Attackable && Math.abs(distance) < maxRange
-            && Math.abs(distance) > minRange) {
+            && Math.abs(distance) > minRange && !target.isImmune()) {
         Point2D velocity = target.getPosition()
                                  .subtract(controlledObject.getPosition())
                                  .normalize()

diff --git a/src/edu/uco/sdd/rocketdog/controller/RocketDogGame.java b/src/edu/uco/sdd/rocketdog/controller/RocketDogGame.java
@@ -22,7 +22,6 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import org.scenicview.ScenicView;
 
 public class RocketDogGame extends Application {
 
@@ -47,7 +46,7 @@ public void init() {
          */
         levels = new String[]{
             //"Test",
-            //"Splash",
+            "Splash",
             //"One",
             "Two"
         };
@@ -68,7 +67,7 @@ public void start(Stage primaryStage) {
         primaryStage.setMaxWidth(GAME_SCREEN_WIDTH);
         primaryStage.setMaxHeight(GAME_SCREEN_HEIGHT);
         primaryStage.setScene(currentLevel);
-        ScenicView.show(currentLevel);
+        //ScenicView.show(currentLevel);
         primaryStage.show();
         primaryStage.setOnCloseRequest((WindowEvent t) -> {
             Platform.exit();

diff --git a/src/edu/uco/sdd/rocketdog/model/DeliveryMan.java b/src/edu/uco/sdd/rocketdog/model/DeliveryMan.java
@@ -42,19 +42,26 @@ public DeliveryMan(double x, double y){
 
         this.setMultiHibox(true);
         hitboxes = new ArrayList();
-        Hitbox hitbox = new Hitbox(this.getPosition().getX(), this.getPosition().getY());
-        hitbox.setWidth(400);
+        Hitbox hitbox = new Hitbox(this.getSprite().getTranslateX(), this.getSprite().getTranslateX());
+        hitbox.setWidth(350);
         hitbox.setHeight(100);
         hitbox.setOffsetX(10);
         hitbox.setOffsetY(250);
         hitboxes.add(hitbox);
-        Hitbox nhitbox = new Hitbox(this.getPosition().getX(), this.getPosition().getY());
+        Hitbox nhitbox = new Hitbox(this.getSprite().getTranslateX(), this.getSprite().getTranslateX());
         nhitbox.setWidth(100);
-        nhitbox.setHeight(300);
+        nhitbox.setHeight(250);
         nhitbox.setOffsetX(250);
         nhitbox.setOffsetY(10);
         hitboxes.add(nhitbox);
         setHitboxes(hitboxes);
+        Hitbox nnhitbox = new Hitbox(this.getSprite().getTranslateX(), this.getSprite().getTranslateX());
+        nnhitbox.setWidth(125);
+        nnhitbox.setHeight(125);
+        nnhitbox.setOffsetX(125);
+        nnhitbox.setOffsetY(125);
+        hitboxes.add(nnhitbox);
+        setHitboxes(hitboxes);
 
         entityClass = new EntityClass("Enemy");
         PatrolController controller = new PatrolController(this);
@@ -79,19 +86,16 @@ public void update(){
             getSprite().setScaleX(1);
             hitboxes.get(1).setOffsetX(250);
         }
-        
+
         getSprite().setTranslateX(getPosition().getX());
         getSprite().setTranslateY(getPosition().getY());
-
         hitboxes.forEach((hitbox) -> {
             hitbox.setTranslateX(getPosition().getX());
             hitbox.setTranslateY(getPosition().getY());
             hitbox.resize(this);
             super.update();
         });
-
         getSprite().setViewport(animating.getCurrentView());
-
         handle(); // Animations*/
         setPosition(new Point2D(getPosition().getX(),getPosition().getY()));
         if (getLevel().getRocketDog().getPosition().getX() > this.getPosition().getX()){
@@ -102,17 +106,17 @@ public void update(){
         getSprite().setLayoutX(getPosition().getX());
         getSprite().setLayoutY(getPosition().getY());
 
-        getHitbox().setLayoutX(getPosition().getX());
-        getHitbox().setLayoutY(getPosition().getY());
+        //getHitbox().setLayoutX(getPosition().getX());
+        //getHitbox().setLayoutY(getPosition().getY());
 
         getSprite().setViewport(animating.getCurrentView());
 
         hitboxes.forEach((hitbox) -> {
-            hitbox.setTranslateX(getSprite().getTranslateX());
-            hitbox.setTranslateY(getSprite().getTranslateY());
+            hitbox.setLayoutX(this.getSprite().getLayoutX());
+            hitbox.setLayoutY(this.getSprite().getLayoutY());
             hitbox.resize(this);
         });
-        
+
         handle(); // Animations
     }
 
@@ -158,4 +162,4 @@ public Rectangle2D getCurrentView() {
     public Image getImage() {
         return animating.getImage();
     }
-}
+}
diff --git a/src/edu/uco/sdd/rocketdog/model/HealthBar.java b/src/edu/uco/sdd/rocketdog/model/HealthBar.java
@@ -0,0 +1,52 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.uco.sdd.rocketdog.model;
+
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.StrokeType;
+
+/**
+ *
+ * @author Sophia
+ */
+public class HealthBar extends Pane {
+    Rectangle healthBarBorder;
+    Rectangle innerHealthBar;
+    double height;
+    double outerHealthBarWidth;
+    double innerhealthBarWidth;
+
+    public HealthBar() {
+        this.height=10;
+        this.outerHealthBarWidth=60;
+        this.innerhealthBarWidth=50;
+
+        double posX=0.0;
+        double posY=0.0;
+
+        healthBarBorder= new Rectangle(posX, posY, outerHealthBarWidth, height);//healthbar outline
+
+        healthBarBorder.setArcHeight(5);
+        healthBarBorder.setArcWidth(5);
+
+        healthBarBorder.setStroke(Color.BLACK);
+        healthBarBorder.setWidth(2);
+        healthBarBorder.setStrokeType(StrokeType.OUTSIDE);
+        healthBarBorder.setFill(Color.RED);
+
+        innerHealthBar= new Rectangle(posX, posY,innerhealthBarWidth , height);// draws healthbar
+        innerHealthBar.setStrokeType(StrokeType.OUTSIDE);
+        innerHealthBar.setFill(Color.GREEN);
+
+        getChildren().addAll(healthBarBorder,innerHealthBar);
+
+    }
+
+
+
+}