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

v3.0.0: added glyph sharing property to aura of protection

Browse Source
This commit is contained in:
Evan Debenham
2025-01-20 12:33:54 -05:00
parent d556f966cc
commit 6808ee97d8
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,13 +684,28 @@ public abstract class Char extends Actor {
damage = Math.max(damage, 0); damage = Math.max(damage, 0);
} }
// hero and pris images skip this as they already benefit from hero's armor glyph proc
if (!(this instanceof Hero || this instanceof PrismaticImage)) {
if (Dungeon.hero.alignment == alignment && Dungeon.hero.belongings.armor() != null
&& Dungeon.level.distance(pos, Dungeon.hero.pos) <= 2
&& Dungeon.hero.buff(AuraOfProtection.AuraBuff.class) != null) {
damage = Dungeon.hero.belongings.armor().proc( enemy, this, damage );
}
}
return damage; return damage;
} }
//Returns the level a glyph is at for a char, or -1 if they are not benefitting from that glyph //Returns the level a glyph is at for a char, or -1 if they are not benefitting from that glyph
//This function is needed as (unlike enchantments) many glyphs trigger in a variety of cases //This function is needed as (unlike enchantments) many glyphs trigger in a variety of cases
public int glyphLevel(Class<? extends Armor.Glyph> cls){ public int glyphLevel(Class<? extends Armor.Glyph> cls){
return -1; if (Dungeon.hero != null && this != Dungeon.hero && Dungeon.hero.alignment == alignment
&& Dungeon.level.distance(pos, Dungeon.hero.pos) <= 2
&& Dungeon.hero.buff(AuraOfProtection.AuraBuff.class) != null) {
return Dungeon.hero.glyphLevel(cls);
} else {
return -1;
}
} }
public float speed() { public float speed() {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@@ -1518,7 +1518,7 @@ public class Hero extends Char {
if (belongings.armor() != null && belongings.armor().hasGlyph(cls, this)){ if (belongings.armor() != null && belongings.armor().hasGlyph(cls, this)){
return Math.max(super.glyphLevel(cls), belongings.armor.buffedLvl()); return Math.max(super.glyphLevel(cls), belongings.armor.buffedLvl());
} else { } else {
return super.glyphLevel(cls); //TODO going to have recursion? return super.glyphLevel(cls);
} }
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/ShadowClone.java
View File

@@ -238,7 +238,7 @@ public class ShadowClone extends ArmorAbility {
@Override @Override
public int glyphLevel(Class<? extends Armor.Glyph> cls) { public int glyphLevel(Class<? extends Armor.Glyph> cls) {
if (Random.Int(4) < Dungeon.hero.pointsInTalent(Talent.CLONED_ARMOR)){ if (Dungeon.hero != null && Random.Int(4) < Dungeon.hero.pointsInTalent(Talent.CLONED_ARMOR)){
return Math.max(super.glyphLevel(cls), Dungeon.hero.glyphLevel(cls)); return Math.max(super.glyphLevel(cls), Dungeon.hero.glyphLevel(cls));
} else { } else {
return super.glyphLevel(cls); return super.glyphLevel(cls);

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
View File

@@ -438,9 +438,20 @@ public class Armor extends EquipableItem {
} }
int blocking = ((Hero) defender).subClass == HeroSubClass.PALADIN ? 3 : 1; int blocking = ((Hero) defender).subClass == HeroSubClass.PALADIN ? 3 : 1;
damage -= Math.round(blocking * Glyph.genericProcChanceMultiplier(defender)); damage -= Math.round(blocking * Glyph.genericProcChanceMultiplier(defender));
} else if (glyph != null) { } else {
damage = glyph.proc( this, attacker, defender, damage ); if (glyph != null) {
damage = glyph.proc(this, attacker, defender, damage);
}
//so that this effect procs for allies using this armor via aura of protection
if (defender.alignment == Dungeon.hero.alignment
&& Dungeon.level.distance(defender.pos, Dungeon.hero.pos) <= 2
&& Dungeon.hero.buff(AuraOfProtection.AuraBuff.class) != null
&& Dungeon.hero.buff(HolyWard.HolyArmBuff.class) != null) {
int blocking = Dungeon.hero.subClass == HeroSubClass.PALADIN ? 3 : 1;
damage -= Math.round(blocking * Glyph.genericProcChanceMultiplier(defender));
}
} }
damage = Math.max(damage, 0);
} }
if (!levelKnown && defender == Dungeon.hero) { if (!levelKnown && defender == Dungeon.hero) {

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java
View File

@@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
@@ -49,7 +50,7 @@ public class Entanglement extends Glyph {
Buff.affect( defender, Earthroot.Armor.class ).level( Math.round((5 + 2 * level)*powerMulti) ); Buff.affect( defender, Earthroot.Armor.class ).level( Math.round((5 + 2 * level)*powerMulti) );
CellEmitter.bottom( defender.pos ).start( EarthParticle.FACTORY, 0.05f, 8 ); CellEmitter.bottom( defender.pos ).start( EarthParticle.FACTORY, 0.05f, 8 );
PixelScene.shake( 1, 0.4f ); if (defender == Dungeon.hero) PixelScene.shake( 1, 0.4f );
} }