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

v0.7.0c: bugfixes:

Browse Source 
- fixed reach weapons not working for non-heroes
- fixed stealth using integers rather than floats
- fixed magical sleep decrementing paralysis without incrementing it
This commit is contained in:
Evan Debenham 2018-11-10 21:17:59 -05:00
parent 7ae41e180a
commit 7424c5d5eb
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@ -491,7 +491,7 @@ public abstract class Char extends Actor {
}
}
public int stealth() {
public float stealth() {
return 0;
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java
View File

@ -36,18 +36,18 @@ public class MagicalSleep extends Buff {
public boolean attachTo( Char target ) {
if (!target.isImmune(Sleep.class) && super.attachTo( target )) {
if (target instanceof Hero)
target.paralysed++;
if (target instanceof Hero) {
if (target.HP == target.HT) {
GLog.i(Messages.get(this, "toohealthy"));
detach();
return true;
} else {
GLog.i(Messages.get(this, "fallasleep"));
}
else if (target instanceof Mob)
} else if (target instanceof Mob) {
((Mob) target).state = ((Mob) target).SLEEPING;
target.paralysed++;
}
return true;
} else {

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -1292,11 +1292,11 @@ public class Hero extends Char {
}
@Override
public int stealth() {
int stealth = super.stealth();
public float stealth() {
float stealth = super.stealth();
if (belongings.armor != null){
stealth = Math.round(belongings.armor.stealthFactor(this, stealth));
stealth = belongings.armor.stealthFactor(this, stealth);
}
return stealth;

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@ -691,7 +691,7 @@ public abstract class Mob extends Char {
@Override
public boolean act( boolean enemyInFOV, boolean justAlerted ) {
if (enemyInFOV && Random.Int( distance( enemy ) + enemy.stealth() + (enemy.flying ? 2 : 0) ) == 0) {
if (enemyInFOV && Random.Float( distance( enemy ) + enemy.stealth() + (enemy.flying ? 2 : 0) ) < 1) {
enemySeen = true;
@ -726,7 +726,7 @@ public abstract class Mob extends Char {
@Override
public boolean act( boolean enemyInFOV, boolean justAlerted ) {
if (enemyInFOV && (justAlerted || Random.Int( distance( enemy ) / 2 + enemy.stealth() ) == 0)) {
if (enemyInFOV && (justAlerted || Random.Float( distance( enemy ) / 2f + enemy.stealth() ) < 1)) {
enemySeen = true;

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
View File

@ -22,9 +22,9 @@
package com.shatteredpixel.shatteredpixeldungeon.items;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@ -114,8 +114,9 @@ abstract public class KindOfWeapon extends EquipableItem {
return false;
} else {
boolean[] passable = BArray.not(Dungeon.level.solid, null);
for (Mob m : Dungeon.level.mobs)
passable[m.pos] = false;
for (Char ch : Actor.chars()) {
if (ch != owner) passable[ch.pos] = false;
}
PathFinder.buildDistanceMap(target, passable, reachFactor(owner));

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -571,11 +571,11 @@ public class DriedRose extends Artifact {
}
@Override
public int stealth() {
int stealth = super.stealth();
public float stealth() {
float stealth = super.stealth();
if (rose != null && rose.armor != null){
stealth = Math.round(rose.armor.stealthFactor(this, stealth));
stealth = rose.armor.stealthFactor(this, stealth);
}
return stealth;