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

Tweaked skill effects.

Browse Source 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@136 08aca716-68be-ccc6-4d58-36f5abd142ac
This commit is contained in:
oskar.wiksten
2011-07-17 17:37:42 +00:00
parent 585025f8d3
commit c67c9ef111
6 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
View File

@@ -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));

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
View File

@@ -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;

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
View File

@@ -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;

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

@@ -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();
}

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapater.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
View File

@@ -18,11 +18,11 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
public final class SkillListAdapater extends ArrayAdapter<SkillInfo> {
public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
private final Resources r;
private final Player player;
public SkillListAdapater(Context context, Collection<SkillInfo> skills, Player player) {
public SkillListAdapter(Context context, Collection<SkillInfo> 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<SkillInfo> {
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()) {