OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Refactor: Rename reset() -> resetForNewGame() on map data classes

Browse Source
This commit is contained in:
Oskar Wiksten
2013-10-27 08:38:27 +01:00
parent 9af062e36e
commit 0570589ecc
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
View File

@@ -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;

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
View File

@@ -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();
}
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
View File

@@ -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;
}

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
View File

@@ -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;
}

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
View File

@@ -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 ===================================================================

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
View File

@@ -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();
}
}