diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java index f9a8aec25..4f2b0e8d0 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java @@ -94,6 +94,9 @@ public final class ConversationController { case alignmentChange: addAlignmentReward(player, effect.effectID, effect.value); break; + case alignmentSet: + setAlignmentReward(player, effect.effectID, effect.value); + break; case giveItem: addItemReward(effect.effectID, effect.value, result); break; @@ -172,6 +175,11 @@ public final class ConversationController { MovementController.refreshMonsterAggressiveness(world.model.currentMap, world.model.player); } + private void setAlignmentReward(Player player, String faction, int delta) { + player.setAlignment(faction, delta); + MovementController.refreshMonsterAggressiveness(world.model.currentMap, world.model.player); + } + private void addQuestProgressReward(Player player, String questID, int questProgress, ScriptEffectResult result) { QuestProgress progress = new QuestProgress(questID, questProgress); boolean added = player.addQuestProgress(progress); 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 6632c941c..c28e23e51 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java @@ -203,6 +203,9 @@ public final class Player extends Actor { if (v == null) return 0; return v; } + public void setAlignment(String faction, int newValue) { + alignments.put(faction, newValue); + } public void addAlignment(String faction, int delta) { int newValue = getAlignment(faction) + delta; alignments.put(faction, newValue); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java index 1cffcff6a..1284531ca 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java @@ -8,6 +8,7 @@ public final class ScriptEffect { , actorCondition , actorConditionImmunity , alignmentChange + , alignmentSet , giveItem , createTimer , spawnAll