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

v0.7.0: fixes:

Browse Source 
- fixed a crash when a game was loaded with magical sleep attached
- fixed further crashes caused by new bombs
- fixed unintentional debug logic left on city boss level
- fixed a couple typos
This commit is contained in:
Evan Debenham 2018-10-08 03:49:12 -04:00
parent 62a580869e
commit 4d3440a649
4 changed files with 6 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/buffs/MagicalSleep.java
View File

@ -37,7 +37,7 @@ public class MagicalSleep extends Buff {
if (!target.isImmune(Sleep.class) && super.attachTo( target )) { if (!target.isImmune(Sleep.class) && super.attachTo( target )) {
if (target instanceof Hero) if (target instanceof Hero)
if (target.HP == target.buff(Regeneration.class).regencap()) { if (target.HP == target.HT) {
GLog.i(Messages.get(this, "toohealthy")); GLog.i(Messages.get(this, "toohealthy"));
detach(); detach();
return true; return true;

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

@ -250,6 +250,8 @@ public class Heap implements Bundlable {
if (((Bomb) item).explodesDestructively()) { if (((Bomb) item).explodesDestructively()) {
//stop processing the burning, it will be replaced by the explosion. //stop processing the burning, it will be replaced by the explosion.
return; return;
} else {
burnt = true;
} }
} }
} }

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java
View File

@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.King; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.King;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
@ -166,7 +165,7 @@ public class CityBossLevel extends Level {
@Override @Override
protected void createItems() { protected void createItems() {
Item item = new Gold(10); Item item = Bones.get();
if (item != null) { if (item != null) {
int pos; int pos;
do { do {

4
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -591,7 +591,7 @@ items.potions.brews.wickedbrew.desc=This brew combines the properties of a toxic
###elixirs ###elixirs
items.potions.elixirs.elixirofaquaticrejuvenation.name=elixir of aquatic rejuvenation items.potions.elixirs.elixirofaquaticrejuvenation.name=elixir of aquatic rejuvenation
items.potions.elixirs.elixirofaquaticrejuvenation.desc=This elixir contains the remains of goo enhanced with a healing potion. While it will not provide immediate healing, it will slowly restore your health while you are standing in water. items.potions.elixirs.elixirofaquaticrejuvenation.desc=This elixir contains the remains of Goo enhanced with a healing potion. While it will not provide immediate healing, it will slowly restore your health while you are standing in water.
items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.name=Aquatic Healing items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.name=Aquatic Healing
items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.desc=You have temporarily gained restorative properties similar to that of Goo.\n\nWhile standing in water, you will recover a single point of health per turn.\n\nturns left: %d. items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.desc=You have temporarily gained restorative properties similar to that of Goo.\n\nWhile standing in water, you will recover a single point of health per turn.\n\nturns left: %d.
@ -795,7 +795,7 @@ items.scrolls.scrollofidentify.desc=This scroll permanently reveals all of the s
items.scrolls.scrolloflullaby.name=scroll of lullaby items.scrolls.scrolloflullaby.name=scroll of lullaby
items.scrolls.scrolloflullaby.sooth=The scroll utters a soothing melody. You feel very sleepy. items.scrolls.scrolloflullaby.sooth=The scroll utters a soothing melody. You feel very sleepy.
items.scrolls.scrolloflullaby.desc=Reading this scroll emits a soothing melody will lull all who hear it into a deep magical sleep. items.scrolls.scrolloflullaby.desc=Reading this scroll emits a soothing melody which will lull all who hear it into a deep magical sleep.
items.scrolls.scrollofmagicmapping.name=scroll of magic mapping items.scrolls.scrollofmagicmapping.name=scroll of magic mapping
items.scrolls.scrollofmagicmapping.layout=You are now aware of the level layout. items.scrolls.scrollofmagicmapping.layout=You are now aware of the level layout.