From 0570589ecc2f1942bb7197dba424ac0c05a93902 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 27 Oct 2013 08:38:27 +0100
Subject: [PATCH] Refactor: Rename reset() -> resetForNewGame() on map data
 classes

---
 .../src/com/gpl/rpg/AndorsTrail/WorldSetup.java        |  2 +-
 .../com/gpl/rpg/AndorsTrail/context/WorldContext.java  |  4 ++--
 .../rpg/AndorsTrail/controller/MovementController.java |  2 +-
 .../gpl/rpg/AndorsTrail/model/map/MapCollection.java   |  4 ++--
 .../rpg/AndorsTrail/model/map/MonsterSpawnArea.java    |  6 +++++-
 .../gpl/rpg/AndorsTrail/model/map/PredefinedMap.java   | 10 +++++-----
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index 001cec802..0a7349887 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -102,7 +102,7 @@ public final class WorldSetup {
 			@Override
 			protected Void doInBackground(Void... arg0) {
 				synchronized (onlyOneThreadAtATimeMayLoadSavegames) {
-					if (world.model != null) world.reset();
+					if (world.model != null) world.resetForNewGame();
 					if (createNewCharacter) {
 						createNewWorld();
 						loadResult = Savegames.LOAD_RESULT_SUCCESS;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
index c401fcbbd..a3bd99db5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
@@ -59,7 +59,7 @@ public final class WorldContext {
 		this.actorConditionsTypes = copy.actorConditionsTypes;
 		this.skills = copy.skills;
 	}
-	public void reset() {
-		maps.reset();
+	public void resetForNewGame() {
+		maps.resetForNewGame();
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index b9f778e01..35be2f2a5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -85,7 +85,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 	}
 
 	private void playerVisitsMapFirstTime(PredefinedMap m) {
-		m.reset();
+		m.resetForNewGame();
 		m.createAllContainerLoot();
 		world.maps.worldMapRequiresUpdate = true;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index c8b3aa233..c30eefb68 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -40,9 +40,9 @@ public final class MapCollection {
 		return predefinedMaps.get(name);
 	}
 
-	public void reset() {
+	public void resetForNewGame() {
 		for (PredefinedMap m : getAllMaps()) {
-			m.reset();
+			m.resetForNewGame();
 		}
 		worldMapRequiresUpdate = true;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index 2444f43a9..42dcfe0f9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -86,7 +86,7 @@ public final class MonsterSpawnArea {
 		return Constants.rollResult(spawnChance);
 	}
 
-	public void reset() {
+	public void removeAllMonsters() {
 		monsters.clear();
 		quantity.current = 0;
 	}
@@ -97,6 +97,10 @@ public final class MonsterSpawnArea {
 		}
 	}
 
+	public void resetForNewGame() {
+		removeAllMonsters();
+	}
+
 
 	// ====== PARCELABLE ===================================================================
 
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 e18b9cf3e..ae90e0aff 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -143,11 +143,11 @@ public final class PredefinedMap {
 	public void removeGroundLoot(Loot loot) {
 		groundBags.remove(loot);
 	}
-	public void reset() {
-		resetTemporaryData();
+	public void resetForNewGame() {
 		for(MonsterSpawnArea a : spawnAreas) {
-			a.reset();
+			a.resetForNewGame();
 		}
+		resetTemporaryData();
 		groundBags.clear();
 		visited = false;
 		lastSeenLayoutHash = "";
@@ -163,7 +163,7 @@ public final class PredefinedMap {
 	public void resetTemporaryData() {
 		for(MonsterSpawnArea a : spawnAreas) {
 			if (a.isUnique) a.resetShops();
-			else a.reset();
+			else a.removeAllMonsters();
 		}
 		splatters.clear();
 		lastVisitTime = VISIT_RESET;
@@ -247,7 +247,7 @@ public final class PredefinedMap {
 		for(int i = loadedSpawnAreas; i < spawnAreas.length; ++i) {
 			MonsterSpawnArea area = this.spawnAreas[i];
 			if (area.isUnique && visited) controllers.monsterSpawnController.spawnAllInArea(this, null, area, true);
-			else area.reset();
+			else area.resetForNewGame();
 		}
 	}