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

v2.0.0: implemented the focused meal talent

Browse Source
This commit is contained in:
Evan Debenham
2022-12-12 15:49:18 -05:00
parent e4c7352e32
commit 553c17566d
5 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ public enum Talent {
//Duelist T1
STRENGTHENING_MEAL(128), ADVENTURERS_INTUITION(129), DUELIST_T1_3(130), AGGRESSIVE_BARRIER(131),
//Duelist T2
DUELIST_T2_1(132), DUELIST_T2_2(133), DUELIST_T2_3(134), DUELIST_T2_4(135), DUELIST_T2_5(136),
FOCUSED_MEAL(132), DUELIST_T2_2(133), DUELIST_T2_3(134), DUELIST_T2_4(135), DUELIST_T2_5(136),
//Duelist T3
DUELIST_T3_1(137, 3), DUELIST_T3_2(138, 3),
//Duelist S1 T3
@@ -382,6 +382,15 @@ public enum Talent {
//2 bonus physical damage for next 2/3 attacks
Buff.affect( hero, PhysicalEmpower.class).set(2, 1 + hero.pointsInTalent(STRENGTHENING_MEAL));
}
if (hero.hasTalent(FOCUSED_MEAL)){
if (hero.heroClass == HeroClass.DUELIST){
//1/1.5 charge for the duelist
Buff.affect( hero, MeleeWeapon.Charger.class ).gainCharge(0.5f*(hero.pointsInTalent(FOCUSED_MEAL)+1));
} else {
// lvl/3 / lvl/2 bonus dmg on next hit for other classes
Buff.affect( hero, PhysicalEmpower.class).set(Math.round(hero.lvl / (4f - hero.pointsInTalent(FOCUSED_MEAL))), 1);
}
}
}
public static class WarriorFoodImmunity extends FlavourBuff{
@@ -621,7 +630,7 @@ public enum Talent {
Collections.addAll(tierTalents, INVIGORATING_MEAL, RESTORED_NATURE, REJUVENATING_STEPS, HEIGHTENED_SENSES, DURABLE_PROJECTILES);
break;
case DUELIST:
Collections.addAll(tierTalents, DUELIST_T2_1, DUELIST_T2_2, DUELIST_T2_3, DUELIST_T2_4, DUELIST_T2_5);
Collections.addAll(tierTalents, FOCUSED_MEAL, DUELIST_T2_2, DUELIST_T2_3, DUELIST_T2_4, DUELIST_T2_5);
break;
}
for (Talent talent : tierTalents){

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
View File

@@ -126,7 +126,8 @@ public class HornOfPlenty extends Artifact {
if (Dungeon.hero.hasTalent(Talent.IRON_STOMACH)
|| Dungeon.hero.hasTalent(Talent.ENERGIZING_MEAL)
|| Dungeon.hero.hasTalent(Talent.MYSTICAL_MEAL)
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)
|| Dungeon.hero.hasTalent(Talent.FOCUSED_MEAL)){
hero.spend(Food.TIME_TO_EAT - 2);
} else {
hero.spend(Food.TIME_TO_EAT);

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Berry.java
View File

@@ -44,7 +44,8 @@ public class Berry extends Food {
if (Dungeon.hero.hasTalent(Talent.IRON_STOMACH)
|| Dungeon.hero.hasTalent(Talent.ENERGIZING_MEAL)
|| Dungeon.hero.hasTalent(Talent.MYSTICAL_MEAL)
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)
|| Dungeon.hero.hasTalent(Talent.FOCUSED_MEAL)){
return 0;
} else {
return 1;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
View File

@@ -96,7 +96,8 @@ public class Food extends Item {
if (Dungeon.hero.hasTalent(Talent.IRON_STOMACH)
|| Dungeon.hero.hasTalent(Talent.ENERGIZING_MEAL)
|| Dungeon.hero.hasTalent(Talent.MYSTICAL_MEAL)
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)
|| Dungeon.hero.hasTalent(Talent.FOCUSED_MEAL)){
return TIME_TO_EAT - 2;
} else {
return TIME_TO_EAT;

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
View File

@@ -297,6 +297,18 @@ public class MeleeWeapon extends Weapon {
return Math.min(10, 3 + (Dungeon.hero.lvl-1)/3);
}
public void gainCharge( float charge ){
if (charges < chargeCap()) {
partialCharge += charge;
while (partialCharge >= 1f) {
charges++;
partialCharge--;
}
charges = Math.min(charges, chargeCap());
updateQuickslot();
}
}
public static final String CHARGES = "charges";
private static final String PARTIALCHARGE = "partialCharge";