v0.9.0: fixed errors relating to changed challenges:
- class armor not respecting FiMA limitation on max DR - well fed lasts for its full duration in on diet - swarm and darkness having swapped menu entries
This commit is contained in:
@@ -44,8 +44,8 @@ public class Challenges {
|
|||||||
"no_armor",
|
"no_armor",
|
||||||
"no_healing",
|
"no_healing",
|
||||||
"no_herbalism",
|
"no_herbalism",
|
||||||
"darkness",
|
|
||||||
"swarm_intelligence",
|
"swarm_intelligence",
|
||||||
|
"darkness",
|
||||||
"no_scrolls"
|
"no_scrolls"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,8 @@
|
|||||||
|
|
||||||
package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
|
package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
|
||||||
|
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
|
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
|
||||||
import com.watabou.utils.Bundle;
|
import com.watabou.utils.Bundle;
|
||||||
@@ -52,6 +54,10 @@ public class WellFed extends Buff {
|
|||||||
//heals one HP every 18 turns for 450 turns
|
//heals one HP every 18 turns for 450 turns
|
||||||
//25 HP healed in total
|
//25 HP healed in total
|
||||||
left = (int)Hunger.STARVING;
|
left = (int)Hunger.STARVING;
|
||||||
|
if (Dungeon.isChallenged(Challenges.NO_FOOD)){
|
||||||
|
//150 turns if on diet is enabled
|
||||||
|
left /= 3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+6
@@ -21,6 +21,8 @@
|
|||||||
|
|
||||||
package com.shatteredpixel.shatteredpixeldungeon.items.armor;
|
package com.shatteredpixel.shatteredpixeldungeon.items.armor;
|
||||||
|
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
|
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||||
@@ -159,6 +161,10 @@ abstract public class ClassArmor extends Armor {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int DRMax(int lvl){
|
public int DRMax(int lvl){
|
||||||
|
if (Dungeon.isChallenged(Challenges.NO_ARMOR)){
|
||||||
|
return 1 + armorTier + lvl + augment.defenseFactor(lvl);
|
||||||
|
}
|
||||||
|
|
||||||
int max = armorTier * (2 + lvl) + augment.defenseFactor(lvl);
|
int max = armorTier * (2 + lvl) + augment.defenseFactor(lvl);
|
||||||
if (lvl > max){
|
if (lvl > max){
|
||||||
return ((lvl - max)+1)/2;
|
return ((lvl - max)+1)/2;
|
||||||
|
|||||||
Reference in New Issue
Block a user