From a99b0fc96f120b61cfa6b8ee55187692c77ccfd1 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sat, 10 Nov 2012 15:25:53 +0100 Subject: [PATCH] Initialize Player & Monster health correctly when respawning either one. --- .../src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java | 6 ++++-- .../src/com/gpl/rpg/AndorsTrail/model/actor/Player.java | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java index 8e5923fa2..dd690f385 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java @@ -32,12 +32,14 @@ public final class Monster extends Actor { this.iconID = monsterType.iconID; this.nextPosition = new CoordRect(new Coord(), monsterType.tileSize); resetStatsToBaseTraits(); + setMaxAP(); + setMaxHP(); } public void resetStatsToBaseTraits() { this.name = monsterType.name; - this.ap.set(monsterType.maxAP, monsterType.maxAP); - this.health.set(monsterType.maxHP, monsterType.maxHP); + this.ap.max = monsterType.maxAP; + this.health.max = monsterType.maxHP; this.position.set(position); this.moveCost = monsterType.moveCost; this.attackCost = monsterType.attackCost; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java index 2a551243a..855636756 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java @@ -126,6 +126,9 @@ public final class Player extends Actor { this.skillLevels.clear(); this.availableSkillIncreases = 0; this.alignments.clear(); + this.ap.set(baseTraits.maxAP, baseTraits.maxAP); + this.health.set(baseTraits.maxHP, baseTraits.maxHP); + this.conditions.clear(); Loot startItems = new Loot(); dropLists.getDropList(DropListCollection.DROPLIST_STARTITEMS).createRandomLoot(startItems, this);