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

Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories

Browse Source 
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
This commit is contained in:
HummusSamurai
2017-01-04 19:17:41 +02:00
parent 5283b04615 e2b8ac73e8
commit c42e5b80bd
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndorsTrail/res/layout/shoplist.xml
View File

@@ -37,6 +37,7 @@
<ListView
android:id="@+id/shop_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
/>
</LinearLayout>

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
View File

@@ -88,9 +88,9 @@ public final class SkillInfo {
private int getRequirementActualValue(Player player) {
switch (requirementType) {
case skillLevel: return player.getSkillLevel(SkillCollection.SkillID.valueOf(skillOrStatID));
case experienceLevel: return player.getLevel();
case playerStat: return player.getStatValue(Player.StatID.valueOf(skillOrStatID));
case skillLevel: return player.getSkillLevel(SkillCollection.SkillID.valueOf(skillOrStatID));
case experienceLevel: return player.getLevel();
case playerStat: return player.getStatValue(Player.StatID.valueOf(skillOrStatID));
default: return 0;
}
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
View File

@@ -96,7 +96,7 @@ public final class Inventory extends ItemContainer {
if (i == null) break;
if (i.itemType.isQuestItem())
questItems.items.add(i);
}
}
return questItems;
}
// Move to item container?