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

v0.9.3: added targeting logic to abilities, fixed a few not using charge

Browse Source
This commit is contained in:
Evan Debenham
2021-05-21 14:04:08 -04:00
parent dd6bf06c13
commit af5898b6a8
13 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ public abstract class ArmorAbility implements Bundlable {
}
//leave null for no targeting
protected String targetingPrompt(){
public String targetingPrompt(){
return null;
}

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java
View File

@@ -10,7 +10,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Rat;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
@@ -34,7 +33,7 @@ public class Ratmogrify extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/NaturesPower.java
View File

@@ -48,6 +48,9 @@ public class NaturesPower extends ArmorAbility {
hero.sprite.operate(hero.pos);
Sample.INSTANCE.play(Assets.Sounds.CHARGEUP);
hero.sprite.emitter().burst(LeafParticle.GENERAL, 10);
armor.charge -= chargeUse(hero);
armor.updateQuickslot();
hero.spendAndNext(Actor.TICK);
}
@@ -90,7 +93,5 @@ public class NaturesPower extends ArmorAbility {
return Messages.get(this, "desc", dispTurns(visualcooldown()));
}
//TODO name/desc
}
}

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpectralBlades.java
View File

@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
@@ -49,7 +48,7 @@ public class SpectralBlades extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/ElementalBlast.java
View File

@@ -123,9 +123,6 @@ public class ElementalBlast extends ArmorAbility {
@Override
protected void activate(ClassArmor armor, Hero hero, Integer target) {
armor.charge -= chargeUse(hero);
Item.updateQuickslot();
Ballistica aim;
//Basically the direction of the aim only matters if it goes outside the map
//So we just ensure it won't do that.
@@ -141,7 +138,6 @@ public class ElementalBlast extends ArmorAbility {
}
if (wandCls == null){
//TODO
return;
}
@@ -397,6 +393,9 @@ public class ElementalBlast extends ArmorAbility {
Invisibility.dispel();
hero.busy();
armor.charge -= chargeUse(hero);
armor.updateQuickslot();
Sample.INSTANCE.play( Assets.Sounds.CHARGEUP );
}

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WarpBeacon.java
View File

@@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.EtherealChains;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@@ -61,7 +60,7 @@ public class WarpBeacon extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
if (Dungeon.hero.buff(WarpBeaconTracker.class) == null
&& Dungeon.hero.hasTalent(Talent.REMOTE_BEACON)){
return Messages.get(this, "prompt");
@@ -106,6 +105,9 @@ public class WarpBeacon extends ArmorAbility {
return;
}
armor.charge -= chargeNeeded;
armor.updateQuickslot();
if (tracker.depth == Dungeon.depth){
Char existing = Actor.findChar(tracker.pos);

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java
View File

@@ -46,7 +46,7 @@ public class WildMagic extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}
@@ -99,6 +99,9 @@ public class WildMagic extends ArmorAbility {
Buff.affect(hero, WildMagicTracker.class, 0f);
armor.charge -= chargeUse(hero);
armor.updateQuickslot();
zapWand(wands, hero, target);
}

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

@@ -42,7 +42,7 @@ import com.watabou.utils.Bundle;
public class DeathMark extends ArmorAbility {
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

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

@@ -52,7 +52,7 @@ import com.watabou.utils.Random;
public class SmokeBomb extends ArmorAbility {
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Endure.java
View File

@@ -62,7 +62,6 @@ public class Endure extends ArmorAbility {
hero.spendAndNext(3f);
}
//TODO visual buff stuff
public static class EndureTracker extends FlavourBuff {
public boolean enduring;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/HeroicLeap.java
View File

@@ -46,7 +46,7 @@ public class HeroicLeap extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Shockwave.java
View File

@@ -51,7 +51,7 @@ public class Shockwave extends ArmorAbility {
}
@Override
protected String targetingPrompt() {
public String targetingPrompt() {
return Messages.get(this, "prompt");
}

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java
View File

@@ -170,6 +170,7 @@ abstract public class ClassArmor extends Armor {
} else if (charge < hero.armorAbility.chargeUse(hero)) {
GLog.w( Messages.get(this, "low_charge") );
} else {
usesTargeting = hero.armorAbility.targetingPrompt() != null;
hero.armorAbility.use(this, hero);
}