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

repeatableQuest improvement

Browse Source 
repeatableQuest improvement

add our name into authors file

add our name into authors file
This commit is contained in:
FlorianDoublet
2015-03-06 18:26:13 +01:00
parent 4b406eb4f7
commit 6124e074ec
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/res/values/authors.xml
View File

@@ -16,6 +16,8 @@
Additional programming by Ethan Wessel<br />
Additional programming by Scott Lund<br />
Additional programming by <a href="https://github.com/Zukero">Kevin Pochat</a><br />
Additional programming by Lucas Delvallet<br />
Additional programming by Florian Doublet<br />
Additional graphics by Karvis<br />
Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br />
Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br />

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

@@ -1,6 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller;
import android.content.res.Resources;
import android.util.Log;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -171,8 +173,8 @@ public final class ConversationController {
}
private void addRemoveQuestProgressReward(Player player, String questID, int questProgress) {
Quest currentQuest = world.quests.getQuest(questID);
player.removeQuestProgress(currentQuest,questProgress);
QuestProgress progress = new QuestProgress(questID, questProgress);
boolean removed = player.removeQuestProgress(progress);
}
private void addDropListReward(Player player, String droplistID, ScriptEffectResult result) {

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
View File

@@ -159,8 +159,10 @@ public final class Player extends Actor {
return true; //Progress was added.
}
public void removeQuestProgress(Quest quest, int removeProgress){
questProgress.get(quest.questID).remove(progress);
public boolean removeQuestProgress(QuestProgress progress){
if (!hasExactQuestProgress(progress.questID, progress.progress)) return false;
questProgress.get(progress.questID).remove(progress.progress);
return true; //Progress was removed.
}
public void recalculateLevelExperience() {

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
View File

@@ -14,7 +14,6 @@ public final class Requirement {
,spentGold
,consumedBonemeals
,hasActorCondition
,removeQuestProgress
}
public final RequirementType requireType;