LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging 1.7.5 source: items/armor/glyphs changes

Browse Source
This commit is contained in:
Evan Debenham 2015-02-03 23:57:37 -05:00
parent 1acebb380c
commit 9410dbbc8f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java
View File

@ -42,12 +42,14 @@ public class Affection extends Glyph {
if (Level.adjacent( attacker.pos, defender.pos ) && Random.Int( level / 2 + 5 ) >= 4) { if (Level.adjacent( attacker.pos, defender.pos ) && Random.Int( level / 2 + 5 ) >= 4) {
int duration = Random.IntRange( 2, 5 ); int duration = Random.IntRange( 3, 7 );
Buff.affect( attacker, Charm.class, Charm.durationFactor( attacker ) * duration ); Buff.affect( attacker, Charm.class, Charm.durationFactor( attacker ) * duration ).object = defender.id();
attacker.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 ); 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 ); defender.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 );
} }

2
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java
View File

@ -60,7 +60,7 @@ public class Multiplicity extends Glyph {
GameScene.add( mob ); GameScene.add( mob );
WandOfBlink.appear( mob, Random.element( respawnPoints ) ); 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 ); checkOwner( defender );
} }