From 9410dbbc8f469338a44a6625a690b3e52abe365a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 3 Feb 2015 23:57:37 -0500 Subject: [PATCH] merging 1.7.5 source: items/armor/glyphs changes --- .../items/armor/glyphs/Affection.java | 12 +++++++----- .../items/armor/glyphs/Multiplicity.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java index 5ce0887e1..81a2eaad1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java @@ -42,12 +42,14 @@ public class Affection extends Glyph { if (Level.adjacent( attacker.pos, defender.pos ) && Random.Int( level / 2 + 5 ) >= 4) { - int duration = Random.IntRange( 2, 5 ); - - Buff.affect( attacker, Charm.class, Charm.durationFactor( attacker ) * duration ); + int duration = Random.IntRange( 3, 7 ); + + Buff.affect( attacker, Charm.class, Charm.durationFactor( attacker ) * duration ).object = defender.id(); attacker.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 ); - - Buff.affect( defender, Charm.class, Random.Float( Charm.durationFactor( defender ) * duration / 2, duration ) ); + + duration *= Random.Float( 0.5f, 1 ); + + Buff.affect( defender, Charm.class, Charm.durationFactor( defender ) * duration ).object = attacker.id(); defender.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java index f89a54236..7dbe4a055 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java @@ -60,7 +60,7 @@ public class Multiplicity extends Glyph { GameScene.add( mob ); WandOfBlink.appear( mob, Random.element( respawnPoints ) ); - defender.damage( Random.IntRange( 1, defender.HT / 6 ), /*attacker*/ this ); + defender.damage( Random.IntRange( 1, defender.HT / 6 ), this ); checkOwner( defender ); }