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

Merge branch 'questsortorder' into nut_test_brimhaven

Browse Source
This commit is contained in:
Gonk
2020-01-20 22:57:43 +01:00
parent 31d272dd0e 708deec0d1
commit c51ab49864
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndorsTrail/res/values/strings.xml
View File

@@ -292,9 +292,9 @@
</string>
<string name="questlog_includecompleted_prompt">Select quests to show</string>
<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
<string name="questlog_includecompleted_includecompleted">Include completed quests</string>
<string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
<string name="questlog_includecompleted_hidecompleted">Active quests</string>
<string name="questlog_includecompleted_includecompleted">All quests</string>
<string name="questlog_includecompleted_onlycompleted">Completed quests</string>
<string name="questlog_queststatus">Status: %1$s</string>
<string name="questlog_queststatus_inprogress">In progress</string>
<string name="questlog_queststatus_completed">Completed</string>

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
View File

@@ -122,11 +122,11 @@ public final class HeroinfoActivity_Quests extends Fragment {
boolean isCompleted = q.isCompleted(player);
int v = world.model.uiSelections.selectedQuestFilter;
if (v == 0) { // Hide completed quests
if (v == 0) { // Active quests
if (isCompleted) continue;
} else if (v == 1) { // Include completed quests
} else if (v == 1) { // All quests
// Always show.
} else if (v == 2) { // Only completed quests
} else if (v == 2) { // Completed quests
if (!isCompleted) continue;
}

7
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
View File

@@ -47,6 +47,11 @@ public final class Quest implements Comparable<Quest> {
@Override
public int compareTo(Quest q) {
return sortOrder - q.sortOrder;
int comp = name.compareTo(q.name);
if (comp == 0) {
comp = sortOrder - q.sortOrder;
}
return comp;
}
}