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

v0.6.2: fixed some very old and buggy code in blandfruit

Browse Source
This commit is contained in:
Evan Debenham 2017-10-11 23:40:19 -04:00
parent 939c000a22
commit 450894893f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.food; package com.shatteredpixel.shatteredpixeldungeon.items.food;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.EarthImbue; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.EarthImbue;
@ -41,6 +42,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfParalyticG
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfPurity; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfPurity;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfToxicGas; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfToxicGas;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@ -178,21 +180,25 @@ public class Blandfruit extends Food {
} }
public static final String POTIONATTRIB = "potionattrib"; public static final String POTIONATTRIB = "potionattrib";
@Override @Override
public void cast( final Hero user, int dst ) { protected void onThrow(int cell) {
if (potionAttrib instanceof PotionOfLiquidFlame || if (Dungeon.level.map[cell] == Terrain.WELL || Dungeon.level.pit[cell]) {
super.onThrow( cell );
} else if (potionAttrib instanceof PotionOfLiquidFlame ||
potionAttrib instanceof PotionOfToxicGas || potionAttrib instanceof PotionOfToxicGas ||
potionAttrib instanceof PotionOfParalyticGas || potionAttrib instanceof PotionOfParalyticGas ||
potionAttrib instanceof PotionOfFrost || potionAttrib instanceof PotionOfFrost ||
potionAttrib instanceof PotionOfLevitation || potionAttrib instanceof PotionOfLevitation ||
potionAttrib instanceof PotionOfPurity) { potionAttrib instanceof PotionOfPurity) {
potionAttrib.cast(user, dst);
detach( user.belongings.backpack ); Dungeon.level.press( cell, null );
potionAttrib.shatter( cell );
} else { } else {
super.cast(user, dst); super.onThrow( cell );
} }
} }
@Override @Override