konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: added ID talent for Duelist and changed Warrior's ID talent

Browse Source
This commit is contained in:
Evan Debenham
2022-12-08 13:28:07 -05:00
parent 45c8063dec
commit 5317c6f98e
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/assets/messages/actors/actors.properties
View File

@@ -543,8 +543,8 @@ actors.hero.talent$seershotcooldown.desc=You have recently used this talent, and
#warrior #warrior
actors.hero.talent.hearty_meal.title=hearty meal actors.hero.talent.hearty_meal.title=hearty meal
actors.hero.talent.hearty_meal.desc=_+1:_ Eating heals the Warrior for _2 HP_ when he is below 50% health, and _3 HP_ when he is below 25% health.\n\n_+2:_ Eating heals the Warrior for _3 HP_ when he is below 50% health, and _5 HP_ when he is below 25% health. actors.hero.talent.hearty_meal.desc=_+1:_ Eating heals the Warrior for _2 HP_ when he is below 50% health, and _3 HP_ when he is below 25% health.\n\n_+2:_ Eating heals the Warrior for _3 HP_ when he is below 50% health, and _5 HP_ when he is below 25% health.
actors.hero.talent.armsmasters_intuition.title=armsmaster's intuition actors.hero.talent.veterans_intuition.title=Veteran's intuition
actors.hero.talent.armsmasters_intuition.desc=_+1:_ The Warrior identifies weapons and armor _2x faster_.\n\n_+2:_ The Warrior identifies weapons and armor _when he equips them_. actors.hero.talent.veterans_intuition.desc=_+1:_ The Warrior identifies weapons _1.75x faster_ and armor _2.5x faster_.\n\n_+2:_ The Warrior identifies weapons _2.5x faster_ and armor _when he equips it_.
actors.hero.talent.test_subject.title=test subject actors.hero.talent.test_subject.title=test subject
actors.hero.talent.test_subject.desc=_+1:_ Whenever the Warrior identifies an item, he heals for _2 HP_.\n\n_+2:_ Whenever the Warrior identifies an item, he heals for _3 HP_. actors.hero.talent.test_subject.desc=_+1:_ Whenever the Warrior identifies an item, he heals for _2 HP_.\n\n_+2:_ Whenever the Warrior identifies an item, he heals for _3 HP_.
actors.hero.talent.iron_will.title=iron will actors.hero.talent.iron_will.title=iron will
@@ -792,6 +792,10 @@ actors.hero.talent.go_for_the_eyes.desc=_+1:_ Attacks from the spirit hawk blind
actors.hero.talent.swift_spirit.title=swift spirit actors.hero.talent.swift_spirit.title=swift spirit
actors.hero.talent.swift_spirit.desc=_+1:_ The spirit hawk's movement speed is increased to _2.5 tiles_ from 2, and it is guaranteed to dodge the first _2 attacks_ made against it.\n\n_+2:_ The spirit hawk's movement speed is increased to _3 tiles_ from 2, and it is guaranteed to dodge the first _4 attacks_ made against it.\n\n_+3:_ The spirit hawk's movement speed is increased to _3.5 tiles_ from 2, and it is guaranteed to dodge the first _6 attacks_ made against it.\n\n_+4:_The spirit hawk's movement speed is increased to _4 tiles_ from 2, and it is guaranteed to dodge the first _8 attacks_ made against it. actors.hero.talent.swift_spirit.desc=_+1:_ The spirit hawk's movement speed is increased to _2.5 tiles_ from 2, and it is guaranteed to dodge the first _2 attacks_ made against it.\n\n_+2:_ The spirit hawk's movement speed is increased to _3 tiles_ from 2, and it is guaranteed to dodge the first _4 attacks_ made against it.\n\n_+3:_ The spirit hawk's movement speed is increased to _3.5 tiles_ from 2, and it is guaranteed to dodge the first _6 attacks_ made against it.\n\n_+4:_The spirit hawk's movement speed is increased to _4 tiles_ from 2, and it is guaranteed to dodge the first _8 attacks_ made against it.
#duelist
actors.hero.talent.adventurers_intuition.title=Adventurer's Intuition
actors.hero.talent.adventurers_intuition.desc=_+1:_ The Duelist identifies weapons _2.5x faster_ and armor _1.75x faster_.\n\n_+2:_ The Duelist identifies weapons _when she equips them_ and armor _2.5x faster_.
#universal #universal
actors.hero.talent.heroic_energy.title=heroic energy actors.hero.talent.heroic_energy.title=heroic energy
actors.hero.talent.heroic_energy.rat_title=ratroic energy actors.hero.talent.heroic_energy.rat_title=ratroic energy

41
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
View File

@@ -77,7 +77,7 @@ import java.util.LinkedHashMap;
public enum Talent { public enum Talent {
//Warrior T1 //Warrior T1
HEARTY_MEAL(0), ARMSMASTERS_INTUITION(1), TEST_SUBJECT(2), IRON_WILL(3), HEARTY_MEAL(0), VETERANS_INTUITION(1), TEST_SUBJECT(2), IRON_WILL(3),
//Warrior T2 //Warrior T2
IRON_STOMACH(4), RESTORED_WILLPOWER(5), RUNIC_TRANSFERENCE(6), LETHAL_MOMENTUM(7), IMPROVISED_PROJECTILES(8), IRON_STOMACH(4), RESTORED_WILLPOWER(5), RUNIC_TRANSFERENCE(6), LETHAL_MOMENTUM(7), IMPROVISED_PROJECTILES(8),
//Warrior T3 //Warrior T3
@@ -145,7 +145,7 @@ public enum Talent {
EAGLE_EYE(119, 4), GO_FOR_THE_EYES(120, 4), SWIFT_SPIRIT(121, 4), EAGLE_EYE(119, 4), GO_FOR_THE_EYES(120, 4), SWIFT_SPIRIT(121, 4),
//Duelist T1 //Duelist T1
DUELIST_T1_1(128), DUELIST_T1_2(129), DUELIST_T1_3(130), DUELIST_T1_4(131), DUELIST_T1_1(128), ADVENTURERS_INTUITION(129), DUELIST_T1_3(130), DUELIST_T1_4(131),
//Duelist T2 //Duelist T2
DUELIST_T2_1(132), DUELIST_T2_2(133), DUELIST_T2_3(134), DUELIST_T2_4(135), DUELIST_T2_5(136), DUELIST_T2_1(132), DUELIST_T2_2(133), DUELIST_T2_3(134), DUELIST_T2_4(135), DUELIST_T2_5(136),
//Duelist T3 //Duelist T3
@@ -295,8 +295,7 @@ public enum Talent {
Buff.affect(hero, BrokenSeal.WarriorShield.class); Buff.affect(hero, BrokenSeal.WarriorShield.class);
} }
if (talent == ARMSMASTERS_INTUITION && hero.pointsInTalent(ARMSMASTERS_INTUITION) == 2){ if (talent == VETERANS_INTUITION && hero.pointsInTalent(VETERANS_INTUITION) == 2){
if (hero.belongings.weapon() != null) hero.belongings.weapon().identify();
if (hero.belongings.armor() != null) hero.belongings.armor.identify(); if (hero.belongings.armor() != null) hero.belongings.armor.identify();
} }
if (talent == THIEFS_INTUITION && hero.pointsInTalent(THIEFS_INTUITION) == 2){ if (talent == THIEFS_INTUITION && hero.pointsInTalent(THIEFS_INTUITION) == 2){
@@ -312,6 +311,9 @@ public enum Talent {
if (hero.belongings.ring instanceof Ring) hero.belongings.ring.setKnown(); if (hero.belongings.ring instanceof Ring) hero.belongings.ring.setKnown();
if (hero.belongings.misc instanceof Ring) ((Ring) hero.belongings.misc).setKnown(); if (hero.belongings.misc instanceof Ring) ((Ring) hero.belongings.misc).setKnown();
} }
if (talent == ADVENTURERS_INTUITION && hero.pointsInTalent(ADVENTURERS_INTUITION) == 2){
if (hero.belongings.weapon() != null) hero.belongings.weapon().identify();
}
if (talent == LIGHT_CLOAK && hero.heroClass == HeroClass.ROGUE){ if (talent == LIGHT_CLOAK && hero.heroClass == HeroClass.ROGUE){
for (Item item : Dungeon.hero.belongings.backpack){ for (Item item : Dungeon.hero.belongings.backpack){
@@ -380,18 +382,24 @@ public enum Talent {
} }
public static float itemIDSpeedFactor( Hero hero, Item item ){ public static float itemIDSpeedFactor( Hero hero, Item item ){
// 1.75x/2.5x speed with huntress talent // 1.75x/2.5x speed with Huntress talent
float factor = 1f + hero.pointsInTalent(SURVIVALISTS_INTUITION)*0.75f; float factor = 1f + 0.75f*hero.pointsInTalent(SURVIVALISTS_INTUITION);
// 2x/instant for Warrior (see onItemEquipped) // Affected by both Warrior(1.75x/2.5x) and Duelist(2.5x/inst.) talents
if (item instanceof MeleeWeapon || item instanceof Armor){ if (item instanceof MeleeWeapon){
factor *= 1f + hero.pointsInTalent(ARMSMASTERS_INTUITION); factor *= 1f + 1.5f*hero.pointsInTalent(ADVENTURERS_INTUITION); //instant at +2 (see onItemEquipped)
factor *= 1f + 0.75f*hero.pointsInTalent(VETERANS_INTUITION);
} }
// 3x/instant for mage (see Wand.wandUsed()) // Affected by both Warrior(2.5x/inst.) and Duelist(1.75x/2.5x) talents
if (item instanceof Armor){
factor *= 1f + 0.75f*hero.pointsInTalent(ADVENTURERS_INTUITION);
factor *= 1f + hero.pointsInTalent(VETERANS_INTUITION); //instant at +2 (see onItemEquipped)
}
// 3x/instant for Mage (see Wand.wandUsed())
if (item instanceof Wand){ if (item instanceof Wand){
factor *= 1f + 2*hero.pointsInTalent(SCHOLARS_INTUITION); factor *= 1f + 2.0f*hero.pointsInTalent(SCHOLARS_INTUITION);
} }
// 2x/instant for rogue (see onItemEqupped), also id's type on equip/on pickup // 2x/instant for Rogue (see onItemEqupped), also id's type on equip/on pickup
if (item instanceof Ring){ if (item instanceof Ring){
factor *= 1f + hero.pointsInTalent(THIEFS_INTUITION); factor *= 1f + hero.pointsInTalent(THIEFS_INTUITION);
} }
@@ -484,7 +492,7 @@ public enum Talent {
} }
public static void onItemEquipped( Hero hero, Item item ){ public static void onItemEquipped( Hero hero, Item item ){
if (hero.pointsInTalent(ARMSMASTERS_INTUITION) == 2 && (item instanceof Weapon || item instanceof Armor)){ if (hero.pointsInTalent(VETERANS_INTUITION) == 2 && item instanceof Armor){
item.identify(); item.identify();
} }
if (hero.hasTalent(THIEFS_INTUITION) && item instanceof Ring){ if (hero.hasTalent(THIEFS_INTUITION) && item instanceof Ring){
@@ -494,6 +502,9 @@ public enum Talent {
((Ring) item).setKnown(); ((Ring) item).setKnown();
} }
} }
if (hero.pointsInTalent(ADVENTURERS_INTUITION) == 2 && item instanceof Weapon){
item.identify();
}
} }
public static void onItemCollected( Hero hero, Item item ){ public static void onItemCollected( Hero hero, Item item ){
@@ -565,7 +576,7 @@ public enum Talent {
//tier 1 //tier 1
switch (cls){ switch (cls){
case WARRIOR: default: case WARRIOR: default:
Collections.addAll(tierTalents, HEARTY_MEAL, ARMSMASTERS_INTUITION, TEST_SUBJECT, IRON_WILL); Collections.addAll(tierTalents, HEARTY_MEAL, VETERANS_INTUITION, TEST_SUBJECT, IRON_WILL);
break; break;
case MAGE: case MAGE:
Collections.addAll(tierTalents, EMPOWERING_MEAL, SCHOLARS_INTUITION, TESTED_HYPOTHESIS, BACKUP_BARRIER); Collections.addAll(tierTalents, EMPOWERING_MEAL, SCHOLARS_INTUITION, TESTED_HYPOTHESIS, BACKUP_BARRIER);
@@ -577,7 +588,7 @@ public enum Talent {
Collections.addAll(tierTalents, NATURES_BOUNTY, SURVIVALISTS_INTUITION, FOLLOWUP_STRIKE, NATURES_AID); Collections.addAll(tierTalents, NATURES_BOUNTY, SURVIVALISTS_INTUITION, FOLLOWUP_STRIKE, NATURES_AID);
break; break;
case DUELIST: case DUELIST:
Collections.addAll(tierTalents, DUELIST_T1_1, DUELIST_T1_2, DUELIST_T1_3, DUELIST_T1_4); Collections.addAll(tierTalents, DUELIST_T1_1, ADVENTURERS_INTUITION, DUELIST_T1_3, DUELIST_T1_4);
break; break;
} }
for (Talent talent : tierTalents){ for (Talent talent : tierTalents){