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

v0.6.2: Fixed "nothing interesting here" showing up more than intended

Browse Source
This commit is contained in:
Evan Debenham 2017-09-07 00:57:03 -04:00
parent 8fb8061ee1
commit c501b82997
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -1059,7 +1059,7 @@ public abstract class Level implements Bundlable {
case Terrain.EMPTY_WELL:
return Messages.get(Level.class, "empty_well_desc");
default:
return Messages.get(Level.class, "default_desc");
return "";
}
}
}

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
View File

@ -22,13 +22,14 @@
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTiledVisual;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTerrainTilemap;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTiledVisual;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTerrainTilemap;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextMultiline;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.watabou.noosa.Image;
@ -115,7 +116,7 @@ public class WndInfoCell extends Window {
}
}
info.text( desc );
info.text( desc.length() == 0 ? Messages.get(this, "nothing") : desc );
info.maxWidth(WIDTH);
info.setPos(titlebar.left(), titlebar.bottom() + GAP);

1
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels.properties
View File

@ -202,7 +202,6 @@ levels.level.inactive_trap_desc=The trap has been triggered before and it's not
levels.level.statue_desc=Someone wanted to adorn this place, but failed, obviously.
levels.level.alchemy_desc=Drop some seeds here to cook a potion.
levels.level.empty_well_desc=The well has run dry.
levels.level.default_desc=Nothing interesting here.
levels.prisonlevel.water_name=Dark cold water.
levels.prisonlevel.empty_deco_desc=There are old blood stains on the floor.

2
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties
View File

@ -37,6 +37,8 @@ windows.wndhero$statstab.depth=Maximum Depth
windows.wndimp.message=Oh yes! You are my hero!\nRegarding your reward, I don't have cash with me right now, but I have something better for you. This is my family heirloom ring: my granddad took it off a dead paladin's finger.
windows.wndimp.reward=Take the ring
windows.wndinfocell.nothing=Nothing interesting here.
windows.wndinfotrap.inactive=This trap is inactive, and can no longer be triggered.
windows.wndjournal.guide=Guide