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

v2.4.0: added branch checking functionality to boomerang circleback

Browse Source
This commit is contained in:
Evan Debenham
2024-03-26 16:15:45 -04:00
parent 7195d81d7b
commit 9accc5994a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java
+9 -4
View File
@@ -65,14 +65,14 @@ public class HeavyBoomerang extends MissileWeapon {
protected void rangedHit(Char enemy, int cell) { protected void rangedHit(Char enemy, int cell) {
decrementDurability(); decrementDurability();
if (durability > 0){ if (durability > 0){
Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth); Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth, Dungeon.branch);
} }
} }
@Override @Override
protected void rangedMiss(int cell) { protected void rangedMiss(int cell) {
parent = null; parent = null;
Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth); Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth, Dungeon.branch);
} }
public static class CircleBack extends Buff { public static class CircleBack extends Buff {
@@ -85,14 +85,16 @@ public class HeavyBoomerang extends MissileWeapon {
private int thrownPos; private int thrownPos;
private int returnPos; private int returnPos;
private int returnDepth; private int returnDepth;
private int returnBranch;
private int left; private int left;
public void setup( HeavyBoomerang boomerang, int thrownPos, int returnPos, int returnDepth){ public void setup( HeavyBoomerang boomerang, int thrownPos, int returnPos, int returnDepth, int returnBranch){
this.boomerang = boomerang; this.boomerang = boomerang;
this.thrownPos = thrownPos; this.thrownPos = thrownPos;
this.returnPos = returnPos; this.returnPos = returnPos;
this.returnDepth = returnDepth; this.returnDepth = returnDepth;
this.returnBranch = returnBranch;
left = 3; left = 3;
} }
@@ -111,7 +113,7 @@ public class HeavyBoomerang extends MissileWeapon {
@Override @Override
public boolean act() { public boolean act() {
if (returnDepth == Dungeon.depth){ if (returnDepth == Dungeon.depth && returnBranch == Dungeon.branch){
left--; left--;
if (left <= 0){ if (left <= 0){
final Char returnTarget = Actor.findChar(returnPos); final Char returnTarget = Actor.findChar(returnPos);
@@ -161,6 +163,7 @@ public class HeavyBoomerang extends MissileWeapon {
private static final String THROWN_POS = "thrown_pos"; private static final String THROWN_POS = "thrown_pos";
private static final String RETURN_POS = "return_pos"; private static final String RETURN_POS = "return_pos";
private static final String RETURN_DEPTH = "return_depth"; private static final String RETURN_DEPTH = "return_depth";
private static final String RETURN_BRANCH = "return_branch";
@Override @Override
public void storeInBundle(Bundle bundle) { public void storeInBundle(Bundle bundle) {
@@ -169,6 +172,7 @@ public class HeavyBoomerang extends MissileWeapon {
bundle.put(THROWN_POS, thrownPos); bundle.put(THROWN_POS, thrownPos);
bundle.put(RETURN_POS, returnPos); bundle.put(RETURN_POS, returnPos);
bundle.put(RETURN_DEPTH, returnDepth); bundle.put(RETURN_DEPTH, returnDepth);
bundle.put(RETURN_BRANCH, returnBranch);
} }
@Override @Override
@@ -178,6 +182,7 @@ public class HeavyBoomerang extends MissileWeapon {
thrownPos = bundle.getInt(THROWN_POS); thrownPos = bundle.getInt(THROWN_POS);
returnPos = bundle.getInt(RETURN_POS); returnPos = bundle.getInt(RETURN_POS);
returnDepth = bundle.getInt(RETURN_DEPTH); returnDepth = bundle.getInt(RETURN_DEPTH);
returnBranch = bundle.contains(RETURN_BRANCH) ? bundle.getInt(RETURN_BRANCH) : 0;
} }
} }