Skip to content

Commit dfeca9e

Browse files
committed
Redesigned wizard and animated movement left; deleted old wizard images
1 parent 39a6872 commit dfeca9e

8 files changed

+27
-9
lines changed

src/main/java/edu/pacific/comp55/starter/DisplayPane.java

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public class DisplayPane extends GraphicsPane implements ActionListener{
3434

3535
private MainApplication program;
3636

37+
//player animation members
38+
private int frame = 0;
39+
private String[] wizardBobbing = {"PlayerWizardStandingLeft.png", "PlayerWizardMoveLeft1.png", "PlayerWizardMoveLeft2.png", "PlayerWizardMoveLeft1.png", "PlayerWizardStandingLeft.png", "PlayerWizardMoveLeftVar1.png", "PlayerWizardMoveLeftVar2.png", "PlayerWizardMoveLeftVar1.png"};
40+
3741
private ArrayList<GImage> backgroundTiles;
3842
private ArrayList<GImage> playerHealth;
3943
private ArrayList<GImage> playerInventory;
@@ -64,7 +68,7 @@ public DisplayPane(MainApplication app) {
6468

6569
timer = new Timer(0, this); // create timer object
6670

67-
initializeGame();
71+
initializeGame();
6872
}
6973

7074
private void initializeGame() {
@@ -91,11 +95,11 @@ private void initializeGame() {
9195
itemLabel.put("chest", "Press e to open chest.");
9296
itemLabel.put("upgrade", "Press e to upgrade your weapon.");
9397
itemLabel.put("life", "Press e to gain an extra life.");
94-
98+
9599
//create player object with knight sprite as default.
96100
GImage playerSprite = new GImage (ImageFolder.get() + "PlayerKnightSprite.png");
97101
player = new Player(playerSprite, PLAYER_STARTING_HEALTH);
98-
player.randomizeXLocation(program.getWidth(), program.getHeight()); //Randomize player location at bottom of screen
102+
player.randomizeXLocation(program.getWidth(), program.getHeight()); //Randomize player location at bottom of screen
99103
player.setSpeed(PLAYER_STARTING_SPEED); // initialize speed
100104
attackArea = new GImage(""); // initialize attack area
101105

@@ -147,7 +151,8 @@ public void createRoom(int roomNum) {
147151
weapon = new Weapon(new GImage(""), "long range weapon", PLAYER_STARTING_LONG_RANGE);
148152
player.setWeapon(weapon);
149153
}
150-
player.setSprite(new GImage (ImageFolder.get() + "PlayerWizardSprite.png"));
154+
GImage wizardSprite = new GImage (ImageFolder.get() + "PlayerWizardStandingLeft.png");
155+
player.setSprite(wizardSprite);
151156
program.add(player.getBulletSprite()); // add bullet to the screen
152157
}
153158

@@ -777,6 +782,7 @@ private double angle(GImage playerSprite) { // return angle between player and m
777782
@Override
778783
public void keyPressed(KeyEvent e) {
779784
GImage playerSprite = player.getSprite();
785+
GImage wizardBobSprite = new GImage("", playerSprite.getX(), playerSprite.getY());
780786
int keyCode = e.getKeyCode();
781787
if (keyCode == 87) { // w
782788
player.setMoveY(-1);
@@ -875,9 +881,9 @@ else if (keyCode == 82) { // r
875881
System.out.println("Heart consumed");
876882
player.changeHealth(1); //add one health to player.
877883
}
878-
}
884+
}
879885
updateHealth(); //update health changes
880-
updateInventory(); //update inventory changes
886+
updateInventory(); //update inventory changes
881887
}
882888

883889
// for normalizing diagonal movement
@@ -898,8 +904,20 @@ else if (keyCode == 82) { // r
898904
player.setSprite(newPlayerSprite);
899905
}
900906
else {
901-
newPlayerSprite.setImage(ImageFolder.get() + "PlayerWizardSprite.png");
907+
// If the player is not moving left, set to left stationary image.
908+
if (!(keyCode == 65)) { // If !(a) key pressed
909+
newPlayerSprite.setImage(ImageFolder.get() + "PlayerWizardStandingLeft.png");
910+
player.setSprite(newPlayerSprite);
911+
}
912+
913+
// If player is moving left (If a key pressed), animate sprite.
914+
newPlayerSprite.setImage(ImageFolder.get() + wizardBobbing[frame]);
915+
frame++;
902916
player.setSprite(newPlayerSprite);
917+
if(frame>=wizardBobbing.length){
918+
frame = 0;
919+
}
920+
player.setSprite(newPlayerSprite);
903921
}
904922
}
905923
else { // player moving right
@@ -908,7 +926,7 @@ else if (keyCode == 82) { // r
908926
player.setSprite(newPlayerSprite);
909927
}
910928
else {
911-
newPlayerSprite.setImage(ImageFolder.get() + "PlayerWizardMirroredSprite.png");
929+
newPlayerSprite.setImage(ImageFolder.get() + "PlayerWizardMirroredSprite2.png");
912930
player.setSprite(newPlayerSprite);
913931
}
914932
}
@@ -954,4 +972,4 @@ public static void main(String[] args) {
954972

955973
}
956974

957-
}
975+
}
Binary file not shown.
Loading
1020 Bytes
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)