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

Enable map scripts to run on every round or tick

Browse Source
This commit is contained in:
Oskar Wiksten
2013-08-07 17:00:38 +02:00
parent dc278fb5da
commit 02bfeb5625
7 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,7 +263,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
world.model.player.nextPosition.set(dest);
controllers.movementController.moveToNextIfPossible(false);
controllers.movementController.moveToNextIfPossible();
playerActionCompleted();
}

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
View File

@@ -14,6 +14,7 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail.util.L;
import java.util.ArrayList;
@@ -268,11 +269,21 @@ public final class ConversationController {
}
private void endConversationWithRemovingNPC() {
if (npc == null) {
if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("Tried to remove NPC from conversation without having a valid npc target!");
listener.onConversationEnded();
return;
}
controllers.monsterSpawnController.remove(world.model.currentMap, npc);
listener.onConversationEndedWithRemoval(npc);
}
private void endConversationWithCombat() {
if (npc == null) {
if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("Tried to enter combat from conversation without having a valid npc target!");
listener.onConversationEnded();
return;
}
npc.forceAggressive();
controllers.combatController.setCombatSelection(npc);
controllers.combatController.enterCombat(CombatController.BeginTurnAs.player);

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
View File

@@ -3,6 +3,7 @@ package com.gpl.rpg.AndorsTrail.controller;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListeners;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
public final class GameRoundController implements TimedMessageTask.Callback {
@@ -81,6 +82,7 @@ public final class GameRoundController implements TimedMessageTask.Callback {
public void onNewPlayerRound() {
controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
controllers.actorStatsController.applySkillEffectsForNewRound(world.model.player, world.model.currentMap);
controllers.mapController.handleMapEvents(world.model.currentMap, world.model.player.position, MapObject.MapObjectEvaluationType.afterEveryRound);
}
public void onNewMonsterRound() {
controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, false);
@@ -91,6 +93,7 @@ public final class GameRoundController implements TimedMessageTask.Callback {
controllers.monsterSpawnController.maybeSpawn(world.model.currentMap, world.model.currentTileMap);
controllers.monsterMovementController.attackWithAgressiveMonsters();
controllers.effectController.updateSplatters(world.model.currentMap);
controllers.mapController.handleMapEvents(world.model.currentMap, world.model.player.position, MapObject.MapObjectEvaluationType.continuously);
gameRoundListeners.onNewTick();
}
}

39
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
View File

@@ -29,7 +29,31 @@ public final class MapController {
this.world = world;
}
public void handleMapEvent(MapObject o, Coord position) {
public void handleMapEventsAfterMovement(PredefinedMap currentMap, Coord newPosition, Coord lastPosition) {
// We don't allow event objects to overlap, so there can only be one object returned here.
MapObject mapObject = currentMap.getEventObjectAt(newPosition);
if (mapObject == null) return;
switch (mapObject.evaluateWhen) {
case afterEveryRound:
return;
case whenEntering:
// Do not trigger event if the player already was on the same MapObject before.
if (mapObject.position.contains(lastPosition)) return;
break;
}
handleMapEvent(mapObject, newPosition);
}
public void handleMapEvents(PredefinedMap currentMap, Coord position, MapObject.MapObjectEvaluationType evaluationType) {
MapObject mapObject = currentMap.getEventObjectAt(position);
if (mapObject == null) return;
if (mapObject.evaluateWhen != evaluationType) return;
handleMapEvent(mapObject, position);
}
private void handleMapEvent(MapObject o, Coord position) {
if (!shouldHandleMapEvent(o)) return;
switch (o.type) {
case sign:
if (o.id == null || o.id.length() <= 0) return;
@@ -46,11 +70,22 @@ public final class MapController {
break;
case script:
runScriptArea(o);
break;
}
}
private boolean shouldHandleMapEvent(MapObject mapObject) {
if (world.model.uiSelections.isInCombat) {
// Only "script" events may run while in combat.
if (mapObject.type != MapObject.MapObjectType.script) return false;
}
return true;
}
private void runScriptArea(MapObject o) {
mapScriptExecutor.proceedToPhrase(controllers.getResources(), o.id, true, true);
Resources res = controllers.getResources();
mapScriptExecutor.proceedToPhrase(res, o.id, true, true);
controllers.mapController.applyCurrentMapReplacements(res, true);
}
private void steppedOnRestArea(MapObject area) {

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

@@ -121,7 +121,7 @@ public final class MovementController implements TimedMessageTask.Callback {
return;
}
moveToNextIfPossible(true);
moveToNextIfPossible();
}
private boolean findWalkablePosition(int dx, int dy) {
@@ -207,7 +207,7 @@ public final class MovementController implements TimedMessageTask.Callback {
else return -v;
}
public void moveToNextIfPossible(boolean handleEvents) {
public void moveToNextIfPossible() {
final Player player = world.model.player;
final PredefinedMap currentMap = world.model.currentMap;
final Coord newPosition = player.nextPosition;
@@ -225,14 +225,9 @@ public final class MovementController implements TimedMessageTask.Callback {
controllers.combatController.setCombatSelection(null, null);
playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition);
if (handleEvents) {
MapObject o = currentMap.getEventObjectAt(newPosition);
if (o != null) {
if (!o.position.contains(player.lastPosition)) { // Do not trigger event if the player already was on the same MapObject before.
controllers.mapController.handleMapEvent(o, newPosition);
}
}
controllers.mapController.handleMapEventsAfterMovement(currentMap, newPosition, player.lastPosition);
if (!world.model.uiSelections.isInCombat) {
Loot loot = currentMap.getBagAt(newPosition);
if (loot != null) controllers.itemController.playerSteppedOnLootBag(loot);
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
View File

@@ -17,7 +17,7 @@ public final class MapObject {
public static enum MapObjectEvaluationType {
whenEntering
,onEveryStep
,afterEveryTurn
,afterEveryRound
,continuously
}

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

@@ -147,8 +147,8 @@ public final class TMXMapTranslator {
evaluateWhen = MapObject.MapObjectEvaluationType.whenEntering;
} else if (p.value.equalsIgnoreCase("step")) {
evaluateWhen = MapObject.MapObjectEvaluationType.onEveryStep;
} else if (p.value.equalsIgnoreCase("turn")) {
evaluateWhen = MapObject.MapObjectEvaluationType.afterEveryTurn;
} else if (p.value.equalsIgnoreCase("round")) {
evaluateWhen = MapObject.MapObjectEvaluationType.afterEveryRound;
} else if (p.value.equalsIgnoreCase("always")) {
evaluateWhen = MapObject.MapObjectEvaluationType.continuously;
} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {