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

Only notify rewards in conversation if there actually are any.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-02-22 12:14:59 +01:00
parent e965afc699
commit 2da410118e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,15 @@ public final class ConversationController {
public final ArrayList<ActorConditionEffect> actorConditions = new ArrayList<ActorConditionEffect>();
public final ArrayList<SkillInfo> skillIncrease = new ArrayList<SkillInfo>();
public final ArrayList<QuestProgress> questProgress = new ArrayList<QuestProgress>();
}
public boolean isEmpty() {
if (loot.hasItemsOrExp()) return false;
if (!actorConditions.isEmpty()) return false;
if (!skillIncrease.isEmpty()) return false;
if (!questProgress.isEmpty()) return false;
return true;
}
}
private PhraseRewards applyPhraseRewards(final Player player, final Phrase phrase) {
if (phrase.rewards == null || phrase.rewards.length == 0) return null;
@@ -65,9 +73,12 @@ public final class ConversationController {
break;
}
}
if (result.isEmpty()) return null;
player.inventory.add(result.loot);
controllers.actorStatsController.addExperience(result.loot.exp);
return result;
}