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

v0.7.1b: bugfixes:

Browse Source 
- fixed prison guards not correctly incrementing their potion drop count
- added safety checks to high grass and spirit bow
This commit is contained in:
Evan Debenham 2018-12-30 16:15:23 -05:00
parent 4737fb60b0
commit f4dbb59365
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java
View File

@ -139,7 +139,7 @@ public class Guard extends Mob {
//with 0 potions dropped that simplifies to 1/8
} else {
if (Random.Float() < ((6f - Dungeon.LimitedDrops.GUARD_HP.count) / 6f)){
Dungeon.LimitedDrops.GUARD_HP.drop();
Dungeon.LimitedDrops.GUARD_HP.count++;
return new PotionOfHealing();
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -518,6 +518,7 @@ public class Item implements Bundlable {
new Callback() {
@Override
public void call() {
curUser = user;
Item.this.detach(user.belongings.backpack).onThrow(cell);
user.spendAndNext(delay);
}
@ -530,6 +531,7 @@ public class Item implements Bundlable {
new Callback() {
@Override
public void call() {
curUser = user;
Item.this.detach(user.belongings.backpack).onThrow(cell);
user.spendAndNext(delay);
}

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java
View File

@ -68,9 +68,15 @@ public class SpiritBow extends Weapon {
@Override
public void execute(Hero hero, String action) {
super.execute(hero, action);
if (action.equals(AC_SHOOT)) {
curUser = hero;
curItem = this;
GameScene.selectCell( shooter );
}
}
@ -293,7 +299,10 @@ public class SpiritBow extends Weapon {
new Callback() {
@Override
public void call() {
if (enemy.isAlive()) onThrow(cell);
if (enemy.isAlive()) {
curUser = user;
onThrow(cell);
}
if (last) {
user.spendAndNext(castDelay(user, dst));

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java
View File

@ -22,6 +22,7 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.features;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@ -103,9 +104,11 @@ public class HighGrass {
freezeTrample = false;
GameScene.updateMap( pos );
CellEmitter.get( pos ).burst( LeafParticle.LEVEL_SPECIFIC, 4 );
if (Dungeon.level.heroFOV[pos]) Dungeon.observe();
if (ShatteredPixelDungeon.scene() instanceof GameScene) {
GameScene.updateMap(pos);
CellEmitter.get(pos).burst(LeafParticle.LEVEL_SPECIFIC, 4);
if (Dungeon.level.heroFOV[pos]) Dungeon.observe();
}
}
}