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

v0.3.0: reworked the ballistica system

Browse Source
This commit is contained in:
Evan Debenham
2015-03-26 22:43:23 -04:00
parent 9c1cfc095f
commit 99f853c190
27 changed files with 230 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+1 -1
View File
@@ -452,7 +452,7 @@ public class Item implements Bundlable {
public void cast( final Hero user, int dst ) {
final int cell = Ballistica.cast( user.pos, dst, false, true );
final int cell = new Ballistica( user.pos, dst, Ballistica.PROJECTILE ).collisionPos;
user.sprite.zap( cell );
user.busy();
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java
+7 -4
View File
@@ -83,10 +83,13 @@ public class WarriorArmor extends ClassArmor {
public void onSelect( Integer target ) {
if (target != null && target != curUser.pos) {
int cell = Ballistica.cast( curUser.pos, target, false, true );
if (Actor.findChar( cell ) != null && cell != curUser.pos) {
cell = Ballistica.trace[Ballistica.distance - 2];
}
Ballistica route = new Ballistica(curUser.pos, target, Ballistica.PROJECTILE);
int cell = route.collisionPos;
//can't occupy the same cell as another char, so move back one.
if (Actor.findChar( cell ) != null && cell != curUser.pos)
cell = route.path.get(route.dist-1);
curUser.HP -= (curUser.HP / 3);
if (curUser.subClass == HeroSubClass.BERSERKER && curUser.HP <= curUser.HT * Fury.LEVEL) {
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+13 -10
View File
@@ -70,7 +70,7 @@ public abstract class Wand extends KindOfWeapon {
private int usagesToKnow = USAGES_TO_KNOW;
protected boolean hitChars = true;
protected int collisionProperties = Ballistica.MAGIC_BOLT;
{
@@ -125,7 +125,7 @@ public abstract class Wand extends KindOfWeapon {
}
}
protected abstract void onZap( int cell );
protected abstract void onZap( Ballistica attack );
@Override
public boolean collect( Bag container ) {
@@ -260,8 +260,8 @@ public abstract class Wand extends KindOfWeapon {
MAX = (tier * tier - tier + 10) / 2 + level;
}
protected void fx( int cell, Callback callback ) {
MagicMissile.blueLight( curUser.sprite.parent, curUser.pos, cell, callback );
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.blueLight( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
@@ -345,7 +345,8 @@ public abstract class Wand extends KindOfWeapon {
final Wand curWand = (Wand)Wand.curItem;
final int cell = Ballistica.cast( curUser.pos, target, true, curWand.hitChars );
final Ballistica shot = new Ballistica( curUser.pos, target, curWand.collisionProperties);
int cell = shot.collisionPos;
if (target == curUser.pos || cell == curUser.pos) {
GLog.i( TXT_SELF_TARGET );
@@ -354,17 +355,19 @@ public abstract class Wand extends KindOfWeapon {
curUser.sprite.zap(cell);
//targets the enemy hit for char-hitting wands, or the cell aimed at for other wands.
QuickSlotButton.target(Actor.findChar(curWand.hitChars ? cell : target));
//attempts to target the cell aimed at if something is there, otherwise targets the collision pos.
if (Actor.findChar(target) != null)
QuickSlotButton.target(Actor.findChar(target));
else
QuickSlotButton.target(Actor.findChar(cell));
if (curWand.curCharges > 0) {
curUser.busy();
curWand.fx( cell, new Callback() {
@Override
curWand.fx( shot, new Callback() {
public void call() {
curWand.onZap( cell );
curWand.onZap( shot );
curWand.wandUsed();
}
} );
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAmok.java
+7 -5
View File
@@ -19,6 +19,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vertigo;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -36,8 +37,8 @@ public class WandOfAmok extends Wand {
}
@Override
protected void onZap( int cell ) {
Char ch = Actor.findChar( cell );
protected void onZap( Ballistica bolt) {
Char ch = Actor.findChar( bolt.collisionPos );
if (ch != null) {
if (ch == Dungeon.hero) {
@@ -52,9 +53,10 @@ public class WandOfAmok extends Wand {
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.purpleLight( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.purpleLight( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java
+7 -8
View File
@@ -42,20 +42,18 @@ public class WandOfAvalanche extends Wand {
{
name = "Wand of Avalanche";
hitChars = false;
collisionProperties = Ballistica.STOP_TERRAIN;
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
Sample.INSTANCE.play( Assets.SND_ROCKS );
int level = level();
Ballistica.distance = Math.min( Ballistica.distance, 8 + level );
int size = 1 + level / 3;
PathFinder.buildDistanceMap( cell, BArray.not( Level.solid, null ), size );
PathFinder.buildDistanceMap( bolt.collisionPos, BArray.not( Level.solid, null ), size );
for (int i=0; i < Level.LENGTH; i++) {
@@ -85,9 +83,10 @@ public class WandOfAvalanche extends Wand {
GLog.n( "You killed yourself with your own Wand of Avalanche..." );
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.earth( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.earth( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlink.java
+8 -7
View File
@@ -35,24 +35,25 @@ public class WandOfBlink extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
int level = level();
if (Ballistica.distance > level + 4) {
//TODO: don't care about this atm as this wand is marked for death, should correct this logic if I end up keeping it.
/*if (Ballistica.distance > level + 4) {
cell = Ballistica.trace[level + 3];
} else if (Actor.findChar( cell ) != null && Ballistica.distance > 1) {
cell = Ballistica.trace[Ballistica.distance - 2];
}
}*/
curUser.sprite.visible = true;
appear( Dungeon.hero, cell );
appear( Dungeon.hero, bolt.collisionPos );
Dungeon.observe();
}
@Override
protected void fx( int cell, Callback callback ) {
MagicMissile.whiteLight( curUser.sprite.parent, curUser.pos, cell, callback );
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.whiteLight( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
curUser.sprite.visible = false;
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
+6 -9
View File
@@ -37,24 +37,21 @@ public class WandOfDisintegration extends Wand {
{
name = "Wand of Disintegration";
hitChars = false;
collisionProperties = Ballistica.STOP_TERRAIN;
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica beam ) {
boolean terrainAffected = false;
int level = level();
int maxDistance = distance();
Ballistica.distance = Math.min( Ballistica.distance, maxDistance );
int maxDistance = Math.min(distance(), beam.dist);
ArrayList<Char> chars = new ArrayList<Char>();
for (int i=1; i < Ballistica.distance; i++) {
int c = Ballistica.trace[i];
for (int c : beam.subPath(1, maxDistance)) {
Char ch;
if ((ch = Actor.findChar( c )) != null) {
@@ -98,9 +95,9 @@ public class WandOfDisintegration extends Wand {
}
@Override
protected void fx( int cell, Callback callback ) {
protected void fx( Ballistica beam, Callback callback ) {
cell = Ballistica.trace[Math.min( Ballistica.distance, distance() ) - 1];
int cell = beam.path.get(Math.min(beam.dist, distance()));
curUser.sprite.parent.add( new DeathRay( curUser.sprite.center(), DungeonTilemap.tileCenterToWorld( cell ) ) );
callback.call();
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java
+9 -7
View File
@@ -44,17 +44,18 @@ public class WandOfFirebolt extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
int level = level();
for (int i=1; i < Ballistica.distance - 1; i++) {
int c = Ballistica.trace[i];
for (int c : bolt.subPath(0, bolt.dist)) {
if (Level.flamable[c]) {
GameScene.add( Blob.seed( c, 1, Fire.class ) );
}
}
int cell = bolt.collisionPos;
GameScene.add( Blob.seed( cell, 1, Fire.class ) );
Char ch = Actor.findChar( cell );
@@ -71,9 +72,10 @@ public class WandOfFirebolt extends Wand {
}
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.fire( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.fire( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFlock.java
+7 -3
View File
@@ -42,15 +42,17 @@ public class WandOfFlock extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
int level = level();
int n = level + 2;
//TODO: don't care about this atm as this wand is marked for death, should correct this logic if I end up keeping it
/**
if (Actor.findChar( cell ) != null && Ballistica.distance > 2) {
cell = Ballistica.trace[Ballistica.distance - 2];
}
}*/
boolean[] passable = BArray.or( Level.passable, Level.avoid, null );
for (Actor actor : Actor.all()) {
@@ -58,6 +60,8 @@ public class WandOfFlock extends Wand {
passable[((Char)actor).pos] = false;
}
}
int cell = bolt.collisionPos;
PathFinder.buildDistanceMap( cell, passable, n );
int dist = 0;
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java
+5 -2
View File
@@ -20,6 +20,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import java.util.ArrayList;
import java.util.HashSet;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.watabou.noosa.Camera;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
@@ -47,7 +48,7 @@ public class WandOfLightning extends Wand {
private int nPoints;
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
// Everything is processed in fx() method
if (!curUser.isAlive()) {
Dungeon.fail( Utils.format( ResultDescriptions.ITEM, name ) );
@@ -87,10 +88,12 @@ public class WandOfLightning extends Wand {
}
@Override
protected void fx( int cell, Callback callback ) {
protected void fx( Ballistica bolt, Callback callback ) {
nPoints = 0;
points[nPoints++] = Dungeon.hero.pos;
int cell = bolt.collisionPos;
Char ch = Actor.findChar( cell );
if (ch != null) {
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
+3 -2
View File
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -66,9 +67,9 @@ public class WandOfMagicMissile extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
Char ch = Actor.findChar( cell );
Char ch = Actor.findChar( bolt.collisionPos );
if (ch != null) {
int level = level();
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java
+7 -5
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -34,8 +35,8 @@ public class WandOfPoison extends Wand {
}
@Override
protected void onZap( int cell ) {
Char ch = Actor.findChar( cell );
protected void onZap( Ballistica bolt ) {
Char ch = Actor.findChar( bolt.collisionPos );
if (ch != null) {
Buff.affect( ch, Poison.class ).set( Poison.durationFactor( ch ) * (5 + level()) );
@@ -46,9 +47,10 @@ public class WandOfPoison extends Wand {
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.poison( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.poison( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java
+10 -10
View File
@@ -37,28 +37,27 @@ public class WandOfRegrowth extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
for (int i=1; i < Ballistica.distance-1; i++) {
int p = Ballistica.trace[i];
int c = Dungeon.level.map[p];
for (int i : bolt.subPath(1, bolt.dist)) {
int c = Dungeon.level.map[i];
if (c == Terrain.EMPTY ||
c == Terrain.EMBERS ||
c == Terrain.EMPTY_DECO) {
Level.set( p, Terrain.GRASS );
Level.set( i, Terrain.GRASS );
}
}
int c = Dungeon.level.map[cell];
int c = Dungeon.level.map[bolt.collisionPos];
if (c == Terrain.EMPTY ||
c == Terrain.EMBERS ||
c == Terrain.EMPTY_DECO ||
c == Terrain.GRASS ||
c == Terrain.HIGH_GRASS) {
GameScene.add( Blob.seed( cell, (level() + 2) * 20, Regrowth.class ) );
GameScene.add( Blob.seed( bolt.collisionPos, (level() + 2) * 20, Regrowth.class ) );
} else {
@@ -66,9 +65,10 @@ public class WandOfRegrowth extends Wand {
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.foliage( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.foliage( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java
+7 -5
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -34,8 +35,8 @@ public class WandOfSlowness extends Wand {
}
@Override
protected void onZap( int cell ) {
Char ch = Actor.findChar( cell );
protected void onZap( Ballistica bolt) {
Char ch = Actor.findChar( bolt.collisionPos );
if (ch != null) {
Buff.affect( ch, Slow.class, Slow.duration( ch ) / 3 + level() );
@@ -46,9 +47,10 @@ public class WandOfSlowness extends Wand {
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.slowness( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.slowness( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java
+10 -14
View File
@@ -17,25 +17,17 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Callback;
@@ -45,12 +37,14 @@ public class WandOfTelekinesis extends Wand {
{
name = "Wand of Telekinesis";
hitChars = false;
collisionProperties = Ballistica.STOP_TERRAIN;
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
//TODO: this whole wand is getting reworked anyway, so screw trying to correct this logic, just rewrite.
/*
boolean mapUpdated = false;
int maxDistance = level() + 4;
@@ -131,6 +125,7 @@ public class WandOfTelekinesis extends Wand {
if (mapUpdated) {
Dungeon.observe();
}
*/
}
private void transport( Heap heap ) {
@@ -159,9 +154,10 @@ public class WandOfTelekinesis extends Wand {
heap.sprite.link();
heap.sprite.drop();
}
protected void fx( int cell, Callback callback ) {
MagicMissile.force( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.force( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTeleportation.java
+7 -5
View File
@@ -18,6 +18,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -35,9 +36,9 @@ public class WandOfTeleportation extends Wand {
}
@Override
protected void onZap( int cell ) {
protected void onZap( Ballistica bolt ) {
Char ch = Actor.findChar( cell );
Char ch = Actor.findChar( bolt.collisionPos );
if (ch == curUser) {
@@ -73,9 +74,10 @@ public class WandOfTeleportation extends Wand {
}
}
protected void fx( int cell, Callback callback ) {
MagicMissile.coldLight( curUser.sprite.parent, curUser.pos, cell, callback );
@Override
protected void fx( Ballistica bolt, Callback callback ) {
MagicMissile.coldLight( curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback );
Sample.INSTANCE.play( Assets.SND_ZAP );
}