diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java index 6b0ea8b17..b4bb9f16f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java @@ -18,7 +18,7 @@ import com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList; import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter; import com.gpl.rpg.AndorsTrail.view.ItemEffectsView; import com.gpl.rpg.AndorsTrail.view.RangeBar; -import com.gpl.rpg.AndorsTrail.view.SkillListAdapater; +import com.gpl.rpg.AndorsTrail.view.SkillListAdapter; import com.gpl.rpg.AndorsTrail.view.TraitsInfoView; import android.app.TabActivity; @@ -71,7 +71,7 @@ public final class HeroinfoActivity extends TabActivity { private final ImageView[] wornItemImage = new ImageView[Inventory.NUM_WORN_SLOTS]; private final int[] defaultWornItemImageResourceIDs = new int[Inventory.NUM_WORN_SLOTS]; - private SkillListAdapater skillListAdapter; + private SkillListAdapter skillListAdapter; /** Called when the activity is first created. */ @Override @@ -167,7 +167,7 @@ public final class HeroinfoActivity extends TabActivity { inventoryList.setAdapter(new ItemContainerAdapter(this, world.tileStore, container)); - skillListAdapter = new SkillListAdapater(this, world.skills.getAllSkills(), player); + skillListAdapter = new SkillListAdapter(this, world.skills.getAllSkills(), player); ListView skillList = (ListView) findViewById(R.id.heroinfo_listskills_list); skillList.setAdapter(skillListAdapter); skillList.setOnItemClickListener(new OnItemClickListener() { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java index 8d2ec1329..21d989fcf 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java @@ -43,7 +43,7 @@ public final class SkillInfoActivity extends Activity { SkillController.setSkillIcon(skillinfo_image, skillID, res); TextView skillinfo_title = (TextView) findViewById(R.id.skillinfo_title); - skillinfo_title.setText(SkillCollection.getSkillTitle(skillID, res)); + skillinfo_title.setText(SkillCollection.getSkillTitleResourceID(skillID)); TextView skillinfo_longdescription = (TextView) findViewById(R.id.skillinfo_longdescription); skillinfo_longdescription.setText(SkillCollection.getSkillLongDescription(skillID, res)); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java index 875eb587d..18c9a5071 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java @@ -11,7 +11,7 @@ public final class Constants { public static final int LEVELUP_EFFECT_ATK_CH = 5; public static final int LEVELUP_EFFECT_ATK_DMG = 1; public static final int LEVELUP_EFFECT_DEF_CH = 3; - public static final int FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL = 3; + public static final int FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL = 4; public static final int NEW_SKILL_POINT_EVERY_N_LEVELS = 4; public static final int MARKET_PRICEFACTOR_PERCENT = 15; public static final int MONSTER_AGGRESSION_CHANCE_PERCENT = 15; 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 0e1469006..90ca7ee7c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java @@ -40,12 +40,12 @@ public final class SkillCollection { public static final int PER_SKILLPOINT_INCREASE_MORE_CRITICALS_PERCENT = 20; public static final int PER_SKILLPOINT_INCREASE_BETTER_CRITICALS_PERCENT = 50; public static final int PER_SKILLPOINT_INCREASE_SPEED = 1; - public static final int PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE = 5; + public static final int PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE = 4; public static final int PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT = 30; - public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 100; + public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 50; public static final int PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT = 50; - public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 10; - public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 10; + public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5; + public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 3; public static final int PER_SKILLPOINT_INCREASE_EATER_HEALTH = 1; public static final int PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH = 2; public static final int PER_SKILLPOINT_INCREASE_EVASION_FLEE_CHANCE_PERCENTAGE = 5; @@ -67,10 +67,10 @@ public final class SkillCollection { initializeSkill(new SkillInfo(SKILL_WEAPON_DMG, SkillInfo.MAXLEVEL_NONE, false)); initializeSkill(new SkillInfo(SKILL_BARTER, Constants.MARKET_PRICEFACTOR_PERCENT / PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE, false)); initializeSkill(new SkillInfo(SKILL_DODGE, SkillInfo.MAXLEVEL_NONE, false)); - initializeSkill(new SkillInfo(SKILL_BARKSKIN, SkillInfo.MAXLEVEL_NONE, false)); + initializeSkill(new SkillInfo(SKILL_BARKSKIN, 5, false)); initializeSkill(new SkillInfo(SKILL_MORE_CRITICALS, SkillInfo.MAXLEVEL_NONE, false)); initializeSkill(new SkillInfo(SKILL_BETTER_CRITICALS, SkillInfo.MAXLEVEL_NONE, false)); - initializeSkill(new SkillInfo(SKILL_SPEED, SkillInfo.MAXLEVEL_NONE, false)); + initializeSkill(new SkillInfo(SKILL_SPEED, 2, false)); initializeSkill(new SkillInfo(SKILL_COINFINDER, SkillInfo.MAXLEVEL_NONE, false)); initializeSkill(new SkillInfo(SKILL_MORE_EXP, SkillInfo.MAXLEVEL_NONE, false)); initializeSkill(new SkillInfo(SKILL_CLEAVE, SkillInfo.MAXLEVEL_NONE, false)); @@ -90,11 +90,7 @@ public final class SkillCollection { return skills.values(); } - public static String getSkillTitle(final int skill, final Resources res) { - return res.getString(getSkillTitleResourceID(skill)); - } - - private static int getSkillTitleResourceID(int skill) { + public static int getSkillTitleResourceID(int skill) { switch (skill) { case SkillCollection.SKILL_WEAPON_CHANCE: return R.string.skill_title_weapon_chance; case SkillCollection.SKILL_WEAPON_DMG: return R.string.skill_title_weapon_dmg; @@ -118,11 +114,7 @@ public final class SkillCollection { } } - public static String getSkillShortDescription(final int skill, final Resources res) { - return res.getString(getSkillShortDescriptionResourceID(skill)); - } - - private static int getSkillShortDescriptionResourceID(int skill) { + public static int getSkillShortDescriptionResourceID(int skill) { switch (skill) { case SkillCollection.SKILL_WEAPON_CHANCE: return R.string.skill_shortdescription_weapon_chance; case SkillCollection.SKILL_WEAPON_DMG: return R.string.skill_shortdescription_weapon_dmg; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java index f7566bc38..13b6bed39 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java @@ -251,7 +251,9 @@ public final class Player extends Actor { } if (fileversion <= 21) { - this.availableSkillIncreases = getExpectedNumberOfSkillpointsForLevel(this.level); + int assignedSkillpoints = 0; + for (int v : skillLevels.values()) assignedSkillpoints += v; + this.availableSkillIncreases = getExpectedNumberOfSkillpointsForLevel(this.level) - assignedSkillpoints; } else { this.availableSkillIncreases = src.readInt(); } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapater.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java similarity index 87% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapater.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java index 6add38c22..051355b7d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapater.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java @@ -18,11 +18,11 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -public final class SkillListAdapater extends ArrayAdapter { +public final class SkillListAdapter extends ArrayAdapter { private final Resources r; private final Player player; - public SkillListAdapater(Context context, Collection skills, Player player) { + public SkillListAdapter(Context context, Collection skills, Player player) { super(context, 0, filterNondisplayedSkills(skills, player)); this.r = context.getResources(); this.player = player; @@ -57,13 +57,13 @@ public final class SkillListAdapater extends ArrayAdapter { final TextView description = (TextView) result.findViewById(R.id.skillentry_description); SkillController.setSkillIcon(icon, skillID, r); - String skillTitle = SkillCollection.getSkillTitle(skillID, r); + String skillTitle = r.getString(SkillCollection.getSkillTitleResourceID(skillID)); final int skillLevel = player.getSkillLevel(skillID); if (skillLevel > 0) { skillTitle += " (" + skillLevel + ")"; } title.setText(skillTitle); - description.setText(SkillCollection.getSkillShortDescription(skillID, r)); + description.setText(SkillCollection.getSkillShortDescriptionResourceID(skillID)); boolean enabled = true; if (player.hasAvailableSkillpoints()) {