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

v0.7.2: Fixed:

Browse Source 
- incorrect spritesheet values for icy and toxic elixirs
- wicked brew being craftable instead of caustic brew
- dwarf king summoning skeletons while stunned/frozen
This commit is contained in:
Evan Debenham 2019-01-26 16:33:46 -05:00
parent 1807814e81
commit a29672c7b3
3 changed files with 5 additions and 5 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/King.java
View File

@ -117,7 +117,7 @@ public class King extends Mob {
} }
private boolean canTryToSummon() { private boolean canTryToSummon() {
if (Undead.count < maxArmySize()) { if (paralysed <= 0 && Undead.count < maxArmySize()) {
Char ch = Actor.findChar( ((CityBossLevel)Dungeon.level).pedestal( nextPedestal ) ); Char ch = Actor.findChar( ((CityBossLevel)Dungeon.level).pedestal( nextPedestal ) );
return ch == this || ch == null; return ch == this || ch == null;
} else { } else {

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java
View File

@ -30,9 +30,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.food.StewedMeat;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst; import com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.CausticBrew;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.InfernalBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.InfernalBrew;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.ShockingBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.ShockingBrew;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.WickedBrew;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfAquaticRejuvenation; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfAquaticRejuvenation;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfDragonsBlood; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfDragonsBlood;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfHoneyedHealing; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfHoneyedHealing;
@ -188,7 +188,7 @@ public abstract class Recipe {
new BlizzardBrew.Recipe(), new BlizzardBrew.Recipe(),
new InfernalBrew.Recipe(), new InfernalBrew.Recipe(),
new ShockingBrew.Recipe(), new ShockingBrew.Recipe(),
new WickedBrew.Recipe(), new CausticBrew.Recipe(),
new Alchemize.Recipe(), new Alchemize.Recipe(),
new AquaBlast.Recipe(), new AquaBlast.Recipe(),
new BeaconOfReturning.Recipe(), new BeaconOfReturning.Recipe(),

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -557,8 +557,8 @@ public class ItemSpriteSheet {
public static final int ELIXIR_HONEY = ELIXIRS+1; public static final int ELIXIR_HONEY = ELIXIRS+1;
public static final int ELIXIR_MIGHT = ELIXIRS+2; public static final int ELIXIR_MIGHT = ELIXIRS+2;
public static final int ELIXIR_DRAGON = ELIXIRS+3; public static final int ELIXIR_DRAGON = ELIXIRS+3;
public static final int ELIXIR_ICY = ELIXIRS+4; public static final int ELIXIR_TOXIC = ELIXIRS+4;
public static final int ELIXIR_TOXIC = ELIXIRS+5; public static final int ELIXIR_ICY = ELIXIRS+5;
public static final int ELIXIR_RESTO = ELIXIRS+6; //discontinued public static final int ELIXIR_RESTO = ELIXIRS+6; //discontinued
public static final int ELIXIR_SURGE = ELIXIRS+7; //discontinued public static final int ELIXIR_SURGE = ELIXIRS+7; //discontinued
static{ static{