From 01a8d5a8b1ddd8790edc8e7e89ff5036d5ff5ed1 Mon Sep 17 00:00:00 2001 From: John W Bojorquez Date: Sat, 11 Apr 2015 15:19:23 -0400 Subject: [PATCH] Fixed bug with resetting player's location. --- MerchantRPGCSE2102/src/controller/RPGame.java | 5 ++--- MerchantRPGCSE2102/src/sprites/PlayerSprite.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java index 029a345..0ca095d 100644 --- a/MerchantRPGCSE2102/src/controller/RPGame.java +++ b/MerchantRPGCSE2102/src/controller/RPGame.java @@ -275,11 +275,10 @@ public static void main(String[] args) throws InterruptedException ArrayList playerInventory = _rpg.getMerchantInventoryList(1); playerInventory.addAll(_rpg.getMerchantInventoryList(2)); playerInventory.addAll(_rpg.getMerchantInventoryList(3)); - _rpg.buildPlayer("test", 500, playerInventory); - _rpg.getPlayer().getItem("armor").increaseQuantity(15); + _rpg.buildPlayer("test", 500, playerInventory); - // SETTING UP PLAYER AND MERCHANT + // SETTING UP PLAYER AND MERCHANT Player player = new Player("Player", 0, null); Merchant merch1 = new Merchant("Bill", 0, null); Merchant merch2 = new Merchant("Joe", 0, null); diff --git a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java index 0eaf106..0bff0a8 100644 --- a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java +++ b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java @@ -177,6 +177,9 @@ public void move() { public void resetLocation() { x = initialX; y = initialY; + changeInX = 15; + changeInY = 15; + } /**