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

v0.7.2: fixes:

Browse Source 
- vampiric allowing healing over max HP, and using defender HT
- typo fixes in magical infusion and polarized curse
This commit is contained in:
Evan Debenham
2019-03-08 14:03:41 -05:00
parent 71b268763b
commit 5058950d0a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Vampiric.java
+4 -3
View File
@@ -36,9 +36,10 @@ public class Vampiric extends Weapon.Enchantment {
public int proc( Weapon weapon, Char attacker, Char defender, int damage ) { public int proc( Weapon weapon, Char attacker, Char defender, int damage ) {
//heals for 0-10% of damage dealt, based on missing HP //heals for 0-10% of damage dealt, based on missing HP
float missingPercent = (attacker.HT - attacker.HP) / (float)defender.HT; float missingPercent = (attacker.HT - attacker.HP) / (float)attacker.HT;
float healValue = missingPercent * 0.1f; float healPercent = missingPercent * 0.1f;
int healAmt = Math.round(healValue * damage); int healAmt = Math.round(healPercent * damage);
healAmt = Math.min( healAmt, attacker.HT - attacker.HP );
if (healAmt > 0) { if (healAmt > 0) {
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
+2 -2
View File
@@ -967,7 +967,7 @@ items.spells.spell.no_magic=You can't cast spells while magic immune.
items.spells.magicalinfusion.name=magical infusion items.spells.magicalinfusion.name=magical infusion
items.spells.magicalinfusion.inv_title=Infuse an item items.spells.magicalinfusion.inv_title=Infuse an item
items.spells.magicalinfusion.infuse=Your %s is infused with arcane energy! items.spells.magicalinfusion.infuse=Your %s is infused with arcane energy!
items.spells.magicalinfusion.desc=This spell posses the same magical power as a scroll of upgrade, but in a more stable form.\n\nIn addition to upgrading an item as normal, it will never erase an enchantment on a weapon or a glyph on armor. items.spells.magicalinfusion.desc=This spell possesses the same magical power as a scroll of upgrade, but in a more stable form.\n\nIn addition to upgrading an item as normal, it will never erase an enchantment on a weapon or a glyph on armor.
items.spells.magicalporter.name=magical porter items.spells.magicalporter.name=magical porter
items.spells.magicalporter.inv_title=Port an item items.spells.magicalporter.inv_title=Port an item
@@ -1153,7 +1153,7 @@ items.weapon.curses.friendly.name=friendly %s
items.weapon.curses.friendly.desc=Friendly weapons are best suited for pacifists, occasionally triggering magic that makes it impossible to fight. items.weapon.curses.friendly.desc=Friendly weapons are best suited for pacifists, occasionally triggering magic that makes it impossible to fight.
items.weapon.curses.polarized.name=polarized %s items.weapon.curses.polarized.name=polarized %s
items.weapon.curses.polarized.desc=A polarized weapon is affected by magic that causes its attack to either deal 50% more damage, or not damage at all. items.weapon.curses.polarized.desc=A polarized weapon is affected by magic that causes its attack to either deal 50% more damage, or no damage at all.
items.weapon.curses.sacrificial.name=sacrificial %s items.weapon.curses.sacrificial.name=sacrificial %s
items.weapon.curses.sacrificial.desc=Sacrificial weapons will demand blood from the wearer in return for attacking foes. The more healthy the wearer is, the more blood the curse will take. items.weapon.curses.sacrificial.desc=Sacrificial weapons will demand blood from the wearer in return for attacking foes. The more healthy the wearer is, the more blood the curse will take.