diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json index 074af15ee..2a7aeebb0 100644 --- a/AndorsTrail/res/raw/conversationlist_stoutford.json +++ b/AndorsTrail/res/raw/conversationlist_stoutford.json @@ -503,7 +503,7 @@ }, { "requireType":"questProgress", - "value":71, + "value":70, "requireID":"farrik" } ] @@ -929,7 +929,7 @@ }, { "nextPhraseID":"glasforn_rumblings60_1", - "text":"I'm all hears." + "text":"I'm all ears." } ], "rewards":[ diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java index 15bf2e4db..083c68f78 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java @@ -56,6 +56,7 @@ public final class PredefinedMap { this.initiallyActiveMapObjectGroups = initiallyActiveMapObjectGroups; this.activeMapObjectGroups = new LinkedList(); this.activeMapObjectGroups.addAll(this.initiallyActiveMapObjectGroups); + activateMapObjects(); assert(size.width > 0); assert(size.height > 0); this.isOutdoors = isOutdoors;