From 14b4e42ef651493f86858bd4b64cfa92eff4af50 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 6 Mar 2020 17:47:46 -0500 Subject: [PATCH] v0.8.0: fixed the following bugs: - Glowing from Shattered's banner getting cut off by one pixel - Imp shopkeeper spawning after items (should be before) - items spawning ontop of characters in the level when they shouldn't - various minor text errors --- .../shatteredpixeldungeon/effects/BannerSprites.java | 2 +- .../shatteredpixeldungeon/levels/RegularLevel.java | 2 +- .../levels/rooms/standard/ImpShopRoom.java | 2 +- .../shatteredpixeldungeon/messages/actors/actors.properties | 1 + .../shatteredpixeldungeon/messages/items/items.properties | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java index b94bb4535..174aaa48f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java @@ -50,7 +50,7 @@ public class BannerSprites { icon.frame( icon.texture.uvRect( 0, 160, 128, 181 ) ); break; case PIXEL_DUNGEON_SIGNS: - icon.frame( icon.texture.uvRect( 133, 0, 255, 90 ) ); + icon.frame( icon.texture.uvRect( 132, 0, 256, 90 ) ); break; } return icon; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index d1dec9a99..78ebaa394 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -451,7 +451,7 @@ public abstract class RegularLevel extends Level { if (passable[pos] && pos != exit && heaps.get(pos) == null - && Actor.findChar(pos) == null) { + && findMob(pos) == null) { Trap t = traps.get(pos); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ImpShopRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ImpShopRoom.java index 7dc910740..34101c43a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ImpShopRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ImpShopRoom.java @@ -94,8 +94,8 @@ public class ImpShopRoom extends ShopRoom { public void spawnShop(Level level){ impSpawned = true; - placeItems(level); placeShopkeeper(level); + placeItems(level); } private static final String IMP = "imp_spawned"; diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties index 3459901f2..b586696d9 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties @@ -530,6 +530,7 @@ actors.mobs.dwarfking.wave_3=Useless! KILL THEM NOW! actors.mobs.dwarfking.enraged=You cannot kill me %s. I. AM. IMMORTAL! actors.mobs.dwarfking.losing=No! You can't do this... you have no idea what lies below... actors.mobs.dwarfking.defeated=You've... Doomed us all... +actors.mobs.dwarfking.rankings_desc=Fell Before the King of Dwarves actors.mobs.dwarfking.desc=Many years ago one of the highest wizards in the dwarven court uncovered secrets which gave him tremendous power over life and death. He soon put this power to use, subjugating and corrupting his peers, his king, and eventually every dwarven citizen. Now he is king, ruler over a legion of undead subjects.\n\nThe King of Dwarves is an aggressive foe, who will attempt to surround and overwhelm his enemies with his horde of undead minions. actors.mobs.elemental$fire.name=fire elemental diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index a616226d4..532c2d38c 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -673,7 +673,7 @@ items.potions.elixirs.elixirofarcanearmor.desc=This elixir will grant the drinke 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 steadily restore a greater amount of health while you are standing in water. 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 small amount of health per turn. The effect is paused when you are at full health or are out of water.\n\nhealing 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 small amount of health per turn. The effect is paused when you are at full health or are out of water.\n\nHealing left: %d. items.potions.elixirs.elixirofdragonsblood.name=elixir of dragon's blood items.potions.elixirs.elixirofdragonsblood.desc=When consumed, this elixir will send fiery power coursing through the drinker's veins. This effect will make the drinker immune to fire, and allow them to set enemies aflame with physical attacks. @@ -689,7 +689,7 @@ items.potions.elixirs.elixirofmight.msg_1=+1 str, +%d hp items.potions.elixirs.elixirofmight.msg_2=Newfound strength surges through your body. items.potions.elixirs.elixirofmight.desc=This powerful liquid will course through your muscles, permanently increasing your strength by one point and temporarily increasing maximum health by %d points. The health boost scales with your maximum health, but will slowly wear off as you gain levels. items.potions.elixirs.elixirofmight$htboost.name=Max Health Boost -items.potions.elixirs.elixirofmight$htboost.desc=Your body feels unnaturally strong and healthy.\n\nYour maximum health is boosted for an extended period of time. As you gain levels, the boost will steadily fade.\n\nCurrent boost amount: %d\nLevels remaining: %d +items.potions.elixirs.elixirofmight$htboost.desc=Your body feels unnaturally strong and healthy.\n\nYour maximum health is boosted for an extended period of time. As you gain levels, the boost will steadily fade.\n\nCurrent boost amount: %d.\nLevels remaining: %d. items.potions.elixirs.elixiroftoxicessence.name=elixir of toxic essence items.potions.elixirs.elixiroftoxicessence.desc=When consumed, this elixir will imbue the drinker with toxic energy. The drinker will be immune to toxic gas and poison, and will continuously spread toxic gas as they move.