AndorsTrailRelease/archived-andors-trail
1
0
Fork 0
mirror of https://github.com/AndorsTrailRelease/andors-trail.git synced 2026-02-13 21:28:10 +01:00
Code Issues 9 Packages Projects Releases 6 Wiki Activity

the skill now works only when fully unarmed and unarmored

Browse Source
This commit is contained in:
Gonk
2020-03-28 19:12:19 +01:00
parent 284c50fa41
commit c3e012857e
4 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -660,9 +660,9 @@ Every skill level increases damage potential of two-handed weapons with %1$d %%
<string name="skill_longdescription_fightstyle_weapon_shield">"Gives benefits when fighting with a weapon in the main hand and having a shield equipped in the off-hand.
Every skill level increases the attack chance of weapons with %1$d %% of their original attack chances, and the block chance of shields by %2$d %% of their original block chances."</string>
<string name="skill_longdescription_fightstyle_unarmed_unarmored">"While fighting without having any piece of armor equipped, gain %1$d block chance and %2$d damage resistance per skill level. Items made of cloth are not considered as being armor.
<string name="skill_longdescription_fightstyle_unarmed_unarmored">"While fighting without having any piece of armor equipped and without using a weapon or shield, gain %1$d attack chance, %2$d block chance, %3$d damage resistance and increase the maximum damage by %4$d per skill level. The skill gives also a critical multiplier of 1 plus 0.%5$d per level.
Every skill level increases for each free hand the attack chance by %3$d, the maximum damage by %4$d and gives a critical multiplier of %5$d %% when both hands are free."</string>
Items made of cloth are not considered as being armor." </string>
<string name="skill_longdescription_specialization_dualwield">Increases the attack chance of both wielded weapons by an additional %1$d %% of their original attack chances, in addition to the benefits given by the weapon style skill. The block chances of both wielded weapons are also increased by %2$d %% of their original block chances.</string>
<string name="skill_longdescription_specialization_2hand">Increases damage potential of two-handed weapons by an additional %1$d %% of the original damage potential, in addition to the benefits given by the weapon style skill. The attack chances of two-handed weapons are also increased by %2$d %% of their original attack chances.</string>
<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>

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

@@ -200,9 +200,9 @@ public final class SkillInfoActivity extends AndorsTrailBaseActivity {
case fightstyle2hand: return res.getString(R.string.skill_longdescription_fightstyle_2hand, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT);
case fightstyleWeaponShield: return res.getString(R.string.skill_longdescription_fightstyle_weapon_shield, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_WEAPON_AC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT);
case fightstyleUnarmedUnarmored: return res.getString(R.string.skill_longdescription_fightstyle_unarmed_unarmored,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_BC,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DR,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DMG_MAX,
SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_CM_PERCENT);
case specializationDualWield: return res.getString(R.string.skill_longdescription_specialization_dualwield, SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_AC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_BC_PERCENT);

27
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
View File

@@ -308,27 +308,12 @@ public final class SkillController {
ItemType offHandItem = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.shield);
final int skillLevelFightStyleUnarmedUnarmored = player.getSkillLevel(SkillID.fightstyleUnarmedUnarmored);
if (skillLevelFightStyleUnarmedUnarmored > 0) {
if (isUnarmored(player)) {
player.blockChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_BC * skillLevelFightStyleUnarmedUnarmored;
player.damageResistance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DR * skillLevelFightStyleUnarmedUnarmored;
}
int multiplier = 0;
if (mainHandItem == null) {
multiplier++;
}
if (offHandItem == null) {
multiplier++;
}
if (multiplier > 0) {
player.attackChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC * skillLevelFightStyleUnarmedUnarmored * multiplier;
player.damagePotential.addToMax(SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DMG_MAX * skillLevelFightStyleUnarmedUnarmored * multiplier);
if (multiplier == 2) {
player.criticalMultiplier = 1 + ((float)SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_CM_PERCENT / 100) * skillLevelFightStyleUnarmedUnarmored;
}
}
if (skillLevelFightStyleUnarmedUnarmored > 0 && isUnarmored(player) && mainHandItem == null && offHandItem == null) {
player.blockChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_BC * skillLevelFightStyleUnarmedUnarmored;
player.damageResistance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DR * skillLevelFightStyleUnarmedUnarmored;
player.attackChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC * skillLevelFightStyleUnarmedUnarmored;
player.damagePotential.addToMax(SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DMG_MAX * skillLevelFightStyleUnarmedUnarmored;
player.criticalMultiplier = 1 + ((float)SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_CM_PERCENT / 100) * skillLevelFightStyleUnarmedUnarmored;
}
if (isWielding2HandItem(mainHandItem, offHandItem)) {

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

@@ -120,8 +120,8 @@ public final class SkillCollection {
public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT = 25;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_BC = 5;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DR = 1;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC = 6;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DMG_MAX = 2;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_AC = 12;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_DMG_MAX = 4;
public static final int PER_SKILLPOINT_INCREASE_UNARMED_UNARMORED_CM_PERCENT = 25;
public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_AC_PERCENT = 50;
public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_DMG_PERCENT = 20;