v0.6.5: bugfixes and misc changes:
- fixed timekeeper's hourglass not usable at 1 charge - expanded bag space to 20 each from 12 - fixed sungrass not interrupting rest when full hp is reached - adjusted manifest values to reduce rare crashes
This commit is contained in:
parent
28b4357044
commit
7d3622b3a9
|
@ -26,10 +26,10 @@
|
||||||
android:theme="@android:style/Theme.Black.NoTitleBar"
|
android:theme="@android:style/Theme.Black.NoTitleBar"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:fullBackupOnly="true"
|
android:fullBackupOnly="true"
|
||||||
android:backupAgent=".BackupHandler">
|
android:backupAgent="com.shatteredpixel.shatteredpixeldungeon.BackupHandler">
|
||||||
<activity
|
<activity
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:name=".ShatteredPixelDungeon"
|
android:name="com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon"
|
||||||
android:alwaysRetainTaskState="true"
|
android:alwaysRetainTaskState="true"
|
||||||
android:launchMode="singleInstance"
|
android:launchMode="singleInstance"
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
|
android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
|
||||||
|
|
|
@ -82,7 +82,7 @@ public class TimekeepersHourglass extends Artifact {
|
||||||
activeBuff.detach();
|
activeBuff.detach();
|
||||||
GLog.i( Messages.get(this, "deactivate") );
|
GLog.i( Messages.get(this, "deactivate") );
|
||||||
}
|
}
|
||||||
} else if (charge <= 1) GLog.i( Messages.get(this, "no_charge") );
|
} else if (charge <= 0) GLog.i( Messages.get(this, "no_charge") );
|
||||||
else if (cursed) GLog.i( Messages.get(this, "cursed") );
|
else if (cursed) GLog.i( Messages.get(this, "cursed") );
|
||||||
else GameScene.show(
|
else GameScene.show(
|
||||||
new WndOptions( Messages.get(this, "name"),
|
new WndOptions( Messages.get(this, "name"),
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class MagicalHolster extends Bag {
|
||||||
{
|
{
|
||||||
image = ItemSpriteSheet.HOLSTER;
|
image = ItemSpriteSheet.HOLSTER;
|
||||||
|
|
||||||
size = 12;
|
size = 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final float HOLSTER_SCALE_FACTOR = 0.85f;
|
public static final float HOLSTER_SCALE_FACTOR = 0.85f;
|
||||||
|
|
|
@ -30,7 +30,7 @@ public class PotionBandolier extends Bag {
|
||||||
{
|
{
|
||||||
image = ItemSpriteSheet.BANDOLIER;
|
image = ItemSpriteSheet.BANDOLIER;
|
||||||
|
|
||||||
size = 12;
|
size = 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,7 +30,7 @@ public class ScrollHolder extends Bag {
|
||||||
{
|
{
|
||||||
image = ItemSpriteSheet.HOLDER;
|
image = ItemSpriteSheet.HOLDER;
|
||||||
|
|
||||||
size = 12;
|
size = 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class VelvetPouch extends Bag {
|
||||||
{
|
{
|
||||||
image = ItemSpriteSheet.POUCH;
|
image = ItemSpriteSheet.POUCH;
|
||||||
|
|
||||||
size = 12;
|
size = 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
|
||||||
|
@ -93,7 +94,12 @@ public class Sungrass extends Plant {
|
||||||
partialHeal -= (int)partialHeal;
|
partialHeal -= (int)partialHeal;
|
||||||
target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
|
target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
|
||||||
|
|
||||||
if (target.HP > target.HT) target.HP = target.HT;
|
if (target.HP >= target.HT) {
|
||||||
|
target.HP = target.HT;
|
||||||
|
if (target instanceof Hero){
|
||||||
|
((Hero)target).resting = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (level <= 0) {
|
if (level <= 0) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user