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

v0.7.4: fixed vision oddities with wards, and typos in ghost commands

Browse Source
This commit is contained in:
Evan Debenham 2019-07-13 00:27:37 -04:00
parent 0534c6010c
commit a02a34feaf
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfWarding;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blocking; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blocking;
@ -1056,9 +1057,11 @@ public class Hero extends Char {
} }
} }
if (target != null && (QuickSlotButton.lastTarget == null || Char lastTarget = QuickSlotButton.lastTarget;
!QuickSlotButton.lastTarget.isAlive() || if (target != null && (lastTarget == null ||
!fieldOfView[QuickSlotButton.lastTarget.pos])){ !lastTarget.isAlive() ||
!fieldOfView[lastTarget.pos]) ||
(lastTarget instanceof WandOfWarding.Ward && mindVisionEnemies.contains(lastTarget))){
QuickSlotButton.target(target); QuickSlotButton.target(target);
} }

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
View File

@ -325,7 +325,13 @@ public class WandOfWarding extends Wand {
super.updateSpriteState(); super.updateSpriteState();
((WardSprite)sprite).updateTier(tier); ((WardSprite)sprite).updateTier(tier);
} }
@Override
public void destroy() {
super.destroy();
Dungeon.observe();
}
@Override @Override
public boolean canInteract(Hero h) { public boolean canInteract(Hero h) {
return true; return true;

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

@ -281,8 +281,8 @@ items.artifacts.driedrose$ghosthero.player_killed_2=I couldn't help them...
items.artifacts.driedrose$ghosthero.player_killed_3=Not like this... items.artifacts.driedrose$ghosthero.player_killed_3=Not like this...
items.artifacts.driedrose$ghosthero.direct_prompt=What should I do? items.artifacts.driedrose$ghosthero.direct_prompt=What should I do?
items.artifacts.driedrose$ghosthero.directed_follow_1=Okay, I'll follow you items.artifacts.driedrose$ghosthero.directed_follow_1=Okay, I'll follow you.
items.artifacts.driedrose$ghosthero.directed_follow_2=I'll fall in behind you items.artifacts.driedrose$ghosthero.directed_follow_2=I'll fall in behind you.
items.artifacts.driedrose$ghosthero.directed_follow_3=Following you... items.artifacts.driedrose$ghosthero.directed_follow_3=Following you...
items.artifacts.driedrose$ghosthero.directed_follow_4=Okay, let's go! items.artifacts.driedrose$ghosthero.directed_follow_4=Okay, let's go!
items.artifacts.driedrose$ghosthero.directed_follow_5=I've got your back. items.artifacts.driedrose$ghosthero.directed_follow_5=I've got your back.