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

v0.3.0: reworked Wand of Disintegration

Browse Source
This commit is contained in:
Evan Debenham 2015-04-05 16:44:00 -04:00
parent 9c0391f39e
commit f3c6296dd8
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

33
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
View File

@ -42,7 +42,7 @@ public class WandOfDisintegration extends Wand {
name = "Wand of Disintegration"; name = "Wand of Disintegration";
image = ItemSpriteSheet.WAND_DISINTEGRATION; image = ItemSpriteSheet.WAND_DISINTEGRATION;
collisionProperties = Ballistica.STOP_TERRAIN; collisionProperties = Ballistica.WONT_STOP;
} }
@Override @Override
@ -56,28 +56,31 @@ public class WandOfDisintegration extends Wand {
ArrayList<Char> chars = new ArrayList<Char>(); ArrayList<Char> chars = new ArrayList<Char>();
int terrainPassed = 2, terrainBonus = 0;
for (int c : beam.subPath(1, maxDistance)) { for (int c : beam.subPath(1, maxDistance)) {
Char ch; Char ch;
if ((ch = Actor.findChar( c )) != null) { if ((ch = Actor.findChar( c )) != null) {
//we don't want to count passed terrain after the last enemy hit. That would be a lot of bonus levels.
//terrainPassed starts at 2, equivalent of rounding up when /3 for integer arithmetic.
terrainBonus += terrainPassed/3;
terrainPassed = 1;
chars.add( ch ); chars.add( ch );
} }
int terr = Dungeon.level.map[c]; if (Level.flamable[c]) {
if (terr == Terrain.DOOR || terr == Terrain.BARRICADE) {
Level.set( c, Terrain.EMBERS ); Level.set( c, Terrain.EMBERS );
GameScene.updateMap( c ); GameScene.updateMap( c );
terrainAffected = true; terrainAffected = true;
} else if (terr == Terrain.HIGH_GRASS) {
Level.set( c, Terrain.GRASS );
GameScene.updateMap( c );
terrainAffected = true;
} }
if (!Level.passable[c])
terrainPassed++;
CellEmitter.center( c ).burst( PurpleParticle.BURST, Random.IntRange( 1, 2 ) ); CellEmitter.center( c ).burst( PurpleParticle.BURST, Random.IntRange( 1, 2 ) );
} }
@ -85,7 +88,7 @@ public class WandOfDisintegration extends Wand {
Dungeon.observe(); Dungeon.observe();
} }
int lvl = level + chars.size(); int lvl = level + chars.size() + terrainBonus;
int dmgMin = lvl; int dmgMin = lvl;
int dmgMax = 8 + lvl * lvl / 3; int dmgMax = 8 + lvl * lvl / 3;
for (Char ch : chars) { for (Char ch : chars) {
@ -98,12 +101,12 @@ public class WandOfDisintegration extends Wand {
@Override @Override
public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) { public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) {
//less likely Grim proc //less likely Grim proc
if (Random.Int(10) == 0) if (Random.Int(3) == 0)
new Death().proc( staff, attacker, defender, damage); new Death().proc( staff, attacker, defender, damage);
} }
private int distance() { private int distance() {
return level() + 4; return level()*2 + 4;
} }
@Override @Override
@ -117,7 +120,9 @@ public class WandOfDisintegration extends Wand {
@Override @Override
public String desc() { public String desc() {
return return
"This wand emits a beam of destructive energy, which pierces all creatures in its way. " + "This wand is made from a solid smooth chunk of obsidian, with a deep purple light running up its side, " +
"The more targets it hits, the more damage it inflicts to each of them."; "ending at the tip. It glows with destructive energy, waiting to shoot forward.\n\n" +
"This wand shoots a beam that pierces any obstacle, and will go farther the more it is upgraded.\n\n" +
"This wand deals bonus damage the more enemies and terrain it penetrates.";
} }
} }