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

v0.9.0: added a 1 turn delay to tested hypothesis barrier

Browse Source
This commit is contained in:
Evan Debenham
2020-10-01 15:23:03 -04:00
parent 8accb14c9e
commit 6fabcbe3e9
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,7 @@ actors.hero.talent.energizing_meal.desc=_+1:_ Eating food grants the Mage _4 tur
actors.hero.talent.scholars_intuition.title=scholar's intuition
actors.hero.talent.scholars_intuition.desc=_+1:_ The Mage identifies wands _2x faster_.\n\n_+2:_ The Mage identifies wands _when he uses them_.
actors.hero.talent.tested_hypothesis.title=tested hypothesis
actors.hero.talent.tested_hypothesis.desc=_+1:_ Whenever he identifies a scroll by using it, the Mage gains _8 shielding_.\n\n_+2:_ Whenever he identifies a scroll by using it, the Mage gains _12 shielding_.
actors.hero.talent.tested_hypothesis.desc=_+1:_ Whenever he identifies a scroll by using it, the Mage gains _6 shielding_.\n\n_+2:_ Whenever he identifies a scroll by using it, the Mage gains _9 shielding_.
actors.hero.talent.energizing_upgrade.title=energizing upgrade
actors.hero.talent.energizing_upgrade.desc=_+1:_ The Mage's staff recharges for _1 extra charge_ whenever the Mage upgrades it.\n\n_+2:_ The Mage's staff recharges for _2 extra charges_ whenever the Mage upgrades it.
actors.hero.talent.rationed_meal.title=rationed meal

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ShieldBuff.java
View File

@@ -49,8 +49,13 @@ public abstract class ShieldBuff extends Buff {
}
public void setShield( int shield ) {
this.shielding = shield;
setShield(shield, 0);
}
public void setShield( int shield, float delay ) {
if (this.shielding <= shield) this.shielding = shield;
if (target != null) target.needsShieldUpdate = true;
spend(delay);
}
public void incShield(){
@@ -58,8 +63,13 @@ public abstract class ShieldBuff extends Buff {
}
public void incShield( int amt ){
incShield(amt, 0);
}
public void incShield( int amt, float delay ){
shielding += amt;
if (target != null) target.needsShieldUpdate = true;
spend(delay);
}
public void decShield(){
@@ -67,8 +77,13 @@ public abstract class ShieldBuff extends Buff {
}
public void decShield( int amt ){
decShield(amt, 0);
}
public void decShield( int amt, float delay ){
shielding -= amt;
if (target != null) target.needsShieldUpdate = true;
spend(delay);
}
//returns the amount of damage leftover

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
View File

@@ -223,10 +223,10 @@ public abstract class Scroll extends Item {
if (!isKnown()) {
setKnown();
//8/12 HP barrier
//6/9 HP barrier
Hero hero = Dungeon.hero;
if (hero.isAlive() && hero.hasTalent(Talent.TESTED_HYPOTHESIS)) {
Buff.affect(hero, Barrier.class).setShield(4 * (1+hero.pointsInTalent(Talent.TESTED_HYPOTHESIS)));
Buff.affect(hero, Barrier.class).setShield(3 + (3 * hero.pointsInTalent(Talent.TESTED_HYPOTHESIS)), 1);
ScrollOfRecharging.charge(hero);
}
}