diff --git a/AndorsTrail/res/raw/conversationlist_maevalia.json b/AndorsTrail/res/raw/conversationlist_maevalia.json index e16bd6e86..f1cde9f02 100644 --- a/AndorsTrail/res/raw/conversationlist_maevalia.json +++ b/AndorsTrail/res/raw/conversationlist_maevalia.json @@ -727,7 +727,12 @@ { "requireType": "questProgress", "requireID": "charwood1", - "value": "110" + "value": "65" + }, + { + "requireType": "questProgress", + "requireID": "charwood1", + "value": "90" } ], "text": "I've spoken to them both.", diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java index 483b850f8..185dd6f4f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java @@ -55,8 +55,6 @@ public final class SkillCollection { ,specializationWeaponShield } - public static final int NUM_SKILLS = SkillID.specializationWeaponShield.ordinal() + 1; - public static final int PER_SKILLPOINT_INCREASE_WEAPON_CHANCE = 12; public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MAX = 2; public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MIN = 0;