diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java index a125e885b..e81e787ee 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ToxicTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Camera; import com.watabou.noosa.Group; import com.watabou.noosa.audio.Sample; @@ -279,30 +280,32 @@ public class CavesBossLevel extends Level { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.GRASS: - return "Fluorescent moss"; - case Terrain.HIGH_GRASS: - return "Fluorescent mushrooms"; - case Terrain.WATER: - return "Freezing cold water."; - default: - return super.tileName( tile ); + case Terrain.GRASS: + return Messages.get(CavesLevel.class, "grass_name"); + case Terrain.HIGH_GRASS: + return Messages.get(CavesLevel.class, "high_grass_name"); + case Terrain.WATER: + return Messages.get(CavesLevel.class, "water_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc( int tile ) { switch (tile) { - case Terrain.ENTRANCE: - return "The ladder leads up to the upper depth."; - case Terrain.EXIT: - return "The ladder leads down to the lower depth."; - case Terrain.HIGH_GRASS: - return "Huge mushrooms block the view."; - case Terrain.WALL_DECO: - return "A vein of some ore is visible on the wall. Gold?"; - default: - return super.tileDesc( tile ); + case Terrain.ENTRANCE: + return Messages.get(CavesLevel.class, "entrance_desc"); + case Terrain.EXIT: + return Messages.get(CavesLevel.class, "exit_desc"); + case Terrain.HIGH_GRASS: + return Messages.get(CavesLevel.class, "high_grass_desc"); + case Terrain.WALL_DECO: + return Messages.get(CavesLevel.class, "wall_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(CavesLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java index 266ab961f..0952fa3f8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.PixelParticle; @@ -205,32 +206,32 @@ public class CavesLevel extends RegularLevel { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.GRASS: - return "Fluorescent moss"; - case Terrain.HIGH_GRASS: - return "Fluorescent mushrooms"; - case Terrain.WATER: - return "Freezing cold water."; - default: - return super.tileName( tile ); + case Terrain.GRASS: + return Messages.get(CavesLevel.class, "grass_name"); + case Terrain.HIGH_GRASS: + return Messages.get(CavesLevel.class, "high_grass_name"); + case Terrain.WATER: + return Messages.get(CavesLevel.class, "water_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc( int tile ) { switch (tile) { - case Terrain.ENTRANCE: - return "The ladder leads up to the upper depth."; - case Terrain.EXIT: - return "The ladder leads down to the lower depth."; - case Terrain.HIGH_GRASS: - return "Huge mushrooms block the view."; - case Terrain.WALL_DECO: - return "A vein of some ore is visible on the wall. Gold?"; - case Terrain.BOOKSHELF: - return "Who would need a bookshelf in a cave?"; - default: - return super.tileDesc( tile ); + case Terrain.ENTRANCE: + return Messages.get(CavesLevel.class, "entrance_desc"); + case Terrain.EXIT: + return Messages.get(CavesLevel.class, "exit_desc"); + case Terrain.HIGH_GRASS: + return Messages.get(CavesLevel.class, "high_grass_desc"); + case Terrain.WALL_DECO: + return Messages.get(CavesLevel.class, "wall_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(CavesLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index 8453638e3..9eacae5d7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -20,6 +20,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.levels; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.watabou.noosa.tweeners.AlphaTweener; import com.shatteredpixel.shatteredpixeldungeon.Assets; @@ -232,34 +233,34 @@ public class CityBossLevel extends Level { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Suspiciously colored water"; - case Terrain.HIGH_GRASS: - return "High blooming flowers"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(CityLevel.class, "water_name"); + case Terrain.HIGH_GRASS: + return Messages.get(CityLevel.class, "high_grass_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.ENTRANCE: - return "A ramp leads up to the upper depth."; - case Terrain.EXIT: - return "A ramp leads down to the lower depth."; - case Terrain.WALL_DECO: - case Terrain.EMPTY_DECO: - return "Several tiles are missing here."; - case Terrain.EMPTY_SP: - return "Thick carpet covers the floor."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "The statue depicts some dwarf standing in a heroic stance."; - case Terrain.BOOKSHELF: - return "The rows of books on different disciplines fill the bookshelf."; - default: - return super.tileDesc( tile ); + case Terrain.ENTRANCE: + return Messages.get(CityLevel.class, "entrance_desc"); + case Terrain.EXIT: + return Messages.get(CityLevel.class, "exit_desc"); + case Terrain.WALL_DECO: + case Terrain.EMPTY_DECO: + return Messages.get(CityLevel.class, "deco_desc"); + case Terrain.EMPTY_SP: + return Messages.get(CityLevel.class, "sp_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(CityLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(CityLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index 2fdec8303..cdb1be492 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; @@ -110,34 +111,34 @@ public class CityLevel extends RegularLevel { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Suspiciously colored water"; - case Terrain.HIGH_GRASS: - return "High blooming flowers"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(CityLevel.class, "water_name"); + case Terrain.HIGH_GRASS: + return Messages.get(CityLevel.class, "high_grass_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.ENTRANCE: - return "A ramp leads up to the upper depth."; - case Terrain.EXIT: - return "A ramp leads down to the lower depth."; - case Terrain.WALL_DECO: - case Terrain.EMPTY_DECO: - return "Several tiles are missing here."; - case Terrain.EMPTY_SP: - return "Thick carpet covers the floor."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "The statue depicts some dwarf standing in a heroic stance."; - case Terrain.BOOKSHELF: - return "The rows of books on different disciplines fill the bookshelf."; - default: - return super.tileDesc( tile ); + case Terrain.ENTRANCE: + return Messages.get(CityLevel.class, "entrance_desc"); + case Terrain.EXIT: + return Messages.get(CityLevel.class, "exit_desc"); + case Terrain.WALL_DECO: + case Terrain.EMPTY_DECO: + return Messages.get(CityLevel.class, "deco_desc"); + case Terrain.EMPTY_SP: + return Messages.get(CityLevel.class, "sp_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(CityLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(CityLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java index d7c53c96c..f0d2769a2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java @@ -20,6 +20,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.levels; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Bones; @@ -227,30 +228,32 @@ public class HallsBossLevel extends Level { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Cold lava"; - case Terrain.GRASS: - return "Embermoss"; - case Terrain.HIGH_GRASS: - return "Emberfungi"; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "Pillar"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_name"); + case Terrain.GRASS: + return Messages.get(HallsLevel.class, "grass_name"); + case Terrain.HIGH_GRASS: + return Messages.get(HallsLevel.class, "high_grass_name"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.WATER: - return "It looks like lava, but it's cold and probably safe to touch."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "The pillar is made of real humanoid skulls. Awesome."; - default: - return super.tileDesc( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(HallsLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java index 94e7742af..75217d541 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java @@ -25,6 +25,7 @@ import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.PixelParticle; @@ -119,32 +120,32 @@ public class HallsLevel extends RegularLevel { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Cold lava"; - case Terrain.GRASS: - return "Embermoss"; - case Terrain.HIGH_GRASS: - return "Emberfungi"; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "Pillar"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_name"); + case Terrain.GRASS: + return Messages.get(HallsLevel.class, "grass_name"); + case Terrain.HIGH_GRASS: + return Messages.get(HallsLevel.class, "high_grass_name"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.WATER: - return "It looks like lava, but it's cold and probably safe to touch."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "The pillar is made of real humanoid skulls. Awesome."; - case Terrain.BOOKSHELF: - return "Books in ancient languages smoulder in the bookshelf."; - default: - return super.tileDesc( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(HallsLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java index 2e513ae5a..85faac7dd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.Arrays; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.items.Amulet; @@ -141,30 +142,32 @@ public class LastLevel extends Level { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Cold lava"; - case Terrain.GRASS: - return "Embermoss"; - case Terrain.HIGH_GRASS: - return "Emberfungi"; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "Pillar"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_name"); + case Terrain.GRASS: + return Messages.get(HallsLevel.class, "grass_name"); + case Terrain.HIGH_GRASS: + return Messages.get(HallsLevel.class, "high_grass_name"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.WATER: - return "It looks like lava, but it's cold and probably safe to touch."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "The pillar is made of real humanoid skulls. Awesome."; - default: - return super.tileDesc( tile ); + case Terrain.WATER: + return Messages.get(HallsLevel.class, "water_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(HallsLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(HallsLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java index 9565ea846..0e0c3bb6e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java @@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.watabou.utils.Graph; import com.watabou.utils.Random; @@ -182,29 +183,34 @@ public class LastShopLevel extends RegularLevel { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Suspiciously colored water"; - case Terrain.HIGH_GRASS: - return "High blooming flowers"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(CityLevel.class, "water_name"); + case Terrain.HIGH_GRASS: + return Messages.get(CityLevel.class, "high_grass_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.ENTRANCE: - return "A ramp leads up to the upper depth."; - case Terrain.EXIT: - return "A ramp leads down to the Inferno."; - case Terrain.WALL_DECO: - case Terrain.EMPTY_DECO: - return "Several tiles are missing here."; - case Terrain.EMPTY_SP: - return "Thick carpet covers the floor."; - default: - return super.tileDesc( tile ); + case Terrain.ENTRANCE: + return Messages.get(CityLevel.class, "entrance_desc"); + case Terrain.EXIT: + return Messages.get(CityLevel.class, "exit_desc"); + case Terrain.WALL_DECO: + case Terrain.EMPTY_DECO: + return Messages.get(CityLevel.class, "deco_desc"); + case Terrain.EMPTY_SP: + return Messages.get(CityLevel.class, "sp_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(CityLevel.class, "statue_desc"); + case Terrain.BOOKSHELF: + return Messages.get(CityLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index bf823cfbc..4c7074993 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -68,6 +68,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.features.HighGrass; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.plants.BlandfruitBush; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; @@ -121,8 +122,6 @@ public abstract class Level implements Bundlable { protected static final float TIME_TO_RESPAWN = 50; - private static final String TXT_HIDDEN_PLATE_CLICKS = "A hidden pressure plate clicks!"; - public static boolean resizingNeeded; public static int loadedMapSize; @@ -856,7 +855,7 @@ public abstract class Level implements Bundlable { switch (map[cell]) { case Terrain.SECRET_TRAP: - GLog.i( TXT_HIDDEN_PLATE_CLICKS ); + GLog.i( Messages.get(Level.class, "hidden_plate") ); case Terrain.TRAP: trap = traps.get( cell ); break; @@ -1059,104 +1058,104 @@ public abstract class Level implements Bundlable { } switch (tile) { - case Terrain.CHASM: - return "Chasm"; - case Terrain.EMPTY: - case Terrain.EMPTY_SP: - case Terrain.EMPTY_DECO: - case Terrain.SECRET_TRAP: - return "Floor"; - case Terrain.GRASS: - return "Grass"; - case Terrain.WATER: - return "Water"; - case Terrain.WALL: - case Terrain.WALL_DECO: - case Terrain.SECRET_DOOR: - return "Wall"; - case Terrain.DOOR: - return "Closed door"; - case Terrain.OPEN_DOOR: - return "Open door"; - case Terrain.ENTRANCE: - return "Depth entrance"; - case Terrain.EXIT: - return "Depth exit"; - case Terrain.EMBERS: - return "Embers"; - case Terrain.LOCKED_DOOR: - return "Locked door"; - case Terrain.PEDESTAL: - return "Pedestal"; - case Terrain.BARRICADE: - return "Barricade"; - case Terrain.HIGH_GRASS: - return "High grass"; - case Terrain.LOCKED_EXIT: - return "Locked depth exit"; - case Terrain.UNLOCKED_EXIT: - return "Unlocked depth exit"; - case Terrain.SIGN: - return "Sign"; - case Terrain.WELL: - return "Well"; - case Terrain.EMPTY_WELL: - return "Empty well"; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "Statue"; - case Terrain.INACTIVE_TRAP: - return "Triggered trap"; - case Terrain.BOOKSHELF: - return "Bookshelf"; - case Terrain.ALCHEMY: - return "Alchemy pot"; - default: - return "???"; + case Terrain.CHASM: + return Messages.get(Level.class, "chasm_name"); + case Terrain.EMPTY: + case Terrain.EMPTY_SP: + case Terrain.EMPTY_DECO: + case Terrain.SECRET_TRAP: + return Messages.get(Level.class, "floor_name"); + case Terrain.GRASS: + return Messages.get(Level.class, "grass_name"); + case Terrain.WATER: + return Messages.get(Level.class, "water_name"); + case Terrain.WALL: + case Terrain.WALL_DECO: + case Terrain.SECRET_DOOR: + return Messages.get(Level.class, "wall_name"); + case Terrain.DOOR: + return Messages.get(Level.class, "closed_door_name"); + case Terrain.OPEN_DOOR: + return Messages.get(Level.class, "open_door_name"); + case Terrain.ENTRANCE: + return Messages.get(Level.class, "entrace_name"); + case Terrain.EXIT: + return Messages.get(Level.class, "exit_name"); + case Terrain.EMBERS: + return Messages.get(Level.class, "embers_name"); + case Terrain.LOCKED_DOOR: + return Messages.get(Level.class, "locked_door_name"); + case Terrain.PEDESTAL: + return Messages.get(Level.class, "pedestal_name"); + case Terrain.BARRICADE: + return Messages.get(Level.class, "barricade_name"); + case Terrain.HIGH_GRASS: + return Messages.get(Level.class, "high_grass_name"); + case Terrain.LOCKED_EXIT: + return Messages.get(Level.class, "locked_exit_name"); + case Terrain.UNLOCKED_EXIT: + return Messages.get(Level.class, "unlocked_exit_name"); + case Terrain.SIGN: + return Messages.get(Level.class, "sign_name"); + case Terrain.WELL: + return Messages.get(Level.class, "well_name"); + case Terrain.EMPTY_WELL: + return Messages.get(Level.class, "empty_well_name"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(Level.class, "statue_name"); + case Terrain.INACTIVE_TRAP: + return Messages.get(Level.class, "inactive_trap_name"); + case Terrain.BOOKSHELF: + return Messages.get(Level.class, "bookshelf_name"); + case Terrain.ALCHEMY: + return Messages.get(Level.class, "alchemy_name"); + default: + return Messages.get(Level.class, "default_name"); } } public String tileDesc( int tile ) { switch (tile) { - case Terrain.CHASM: - return "You can't see the bottom."; - case Terrain.WATER: - return "In case of burning step into the water to extinguish the fire."; - case Terrain.ENTRANCE: - return "Stairs lead up to the upper depth."; - case Terrain.EXIT: - case Terrain.UNLOCKED_EXIT: - return "Stairs lead down to the lower depth."; - case Terrain.EMBERS: - return "Embers cover the floor."; - case Terrain.HIGH_GRASS: - return "Dense vegetation blocks the view."; - case Terrain.LOCKED_DOOR: - return "This door is locked, you need a matching key to unlock it."; - case Terrain.LOCKED_EXIT: - return "Heavy bars block the stairs leading down."; - case Terrain.BARRICADE: - return "The wooden barricade is firmly set but has dried over the years. Might it burn?"; - case Terrain.SIGN: - return "You can't read the text from here."; - case Terrain.INACTIVE_TRAP: - return "The trap has been triggered before and it's not dangerous anymore."; - case Terrain.STATUE: - case Terrain.STATUE_SP: - return "Someone wanted to adorn this place, but failed, obviously."; - case Terrain.ALCHEMY: - return "Drop some seeds here to cook a potion."; - case Terrain.EMPTY_WELL: - return "The well has run dry."; - default: - if (tile >= Terrain.WATER_TILES) { - return tileDesc( Terrain.WATER ); - } - if ((Terrain.flags[tile] & Terrain.PIT) != 0) { - return tileDesc( Terrain.CHASM ); - } - return ""; + case Terrain.CHASM: + return Messages.get(Level.class, "chasm_desc"); + case Terrain.WATER: + return Messages.get(Level.class, "water_desc"); + case Terrain.ENTRANCE: + return Messages.get(Level.class, "entrance_desc"); + case Terrain.EXIT: + case Terrain.UNLOCKED_EXIT: + return Messages.get(Level.class, "exit_desc"); + case Terrain.EMBERS: + return Messages.get(Level.class, "embers_desc"); + case Terrain.HIGH_GRASS: + return Messages.get(Level.class, "high_grass_desc"); + case Terrain.LOCKED_DOOR: + return Messages.get(Level.class, "locked_door_desc"); + case Terrain.LOCKED_EXIT: + return Messages.get(Level.class, "locked_exit_desc"); + case Terrain.BARRICADE: + return Messages.get(Level.class, "barricade_desc"); + case Terrain.SIGN: + return Messages.get(Level.class, "sign_desc"); + case Terrain.INACTIVE_TRAP: + return Messages.get(Level.class, "inactive_trap_desc"); + case Terrain.STATUE: + case Terrain.STATUE_SP: + return Messages.get(Level.class, "statue_desc"); + case Terrain.ALCHEMY: + return Messages.get(Level.class, "alchemy_desc"); + case Terrain.EMPTY_WELL: + return Messages.get(Level.class, "empty_well_desc"); + default: + if (tile >= Terrain.WATER_TILES) { + return tileDesc( Terrain.WATER ); + } + if ((Terrain.flags[tile] & Terrain.PIT) != 0) { + return tileDesc( Terrain.CHASM ); + } + return Messages.get(Level.class, "default_desc"); } } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index 572f18e39..852457244 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.MazePainter; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.SpearTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.ui.CustomTileVisual; import com.shatteredpixel.shatteredpixeldungeon.ui.HealthIndicator; @@ -192,20 +193,22 @@ public class PrisonBossLevel extends Level { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Dark cold water."; - default: - return super.tileName(tile); + case Terrain.WATER: + return Messages.get(PrisonLevel.class, "water_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.EMPTY_DECO: - return "There are old blood stains on the floor."; - default: - return super.tileDesc(tile); + case Terrain.EMPTY_DECO: + return Messages.get(PrisonLevel.class, "empty_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(PrisonLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java index 9b94fa51a..550c2f469 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; import com.shatteredpixel.shatteredpixeldungeon.Assets; @@ -132,26 +133,26 @@ public class PrisonLevel extends RegularLevel { placeSign(); } - + @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Dark cold water."; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(PrisonLevel.class, "water_name"); + default: + return super.tileName( tile ); } } - + @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.EMPTY_DECO: - return "There are old blood stains on the floor."; - case Terrain.BOOKSHELF: - return "This is probably a vestige of a prison library. Might it burn?"; - default: - return super.tileDesc(tile); + case Terrain.EMPTY_DECO: + return Messages.get(PrisonLevel.class, "empty_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(PrisonLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java index d63bfeeba..e1c49863b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java @@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.noosa.Group; import com.watabou.utils.Bundle; @@ -284,24 +285,26 @@ public class SewerBossLevel extends RegularLevel { stairs = bundle.getInt( STAIRS ); roomExit = roomEntrance; } - + @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Murky water"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(SewerLevel.class, "water_name"); + default: + return super.tileName( tile ); } } - + @Override - public String tileDesc( int tile ) { + public String tileDesc(int tile) { switch (tile) { - case Terrain.EMPTY_DECO: - return "Wet yellowish moss covers the floor."; - default: - return super.tileDesc( tile ); + case Terrain.EMPTY_DECO: + return Messages.get(SewerLevel.class, "empty_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(SewerLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java index b4fa26136..f3b846124 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; @@ -156,22 +157,22 @@ public class SewerLevel extends RegularLevel { @Override public String tileName( int tile ) { switch (tile) { - case Terrain.WATER: - return "Murky water"; - default: - return super.tileName( tile ); + case Terrain.WATER: + return Messages.get(SewerLevel.class, "water_name"); + default: + return super.tileName( tile ); } } @Override public String tileDesc(int tile) { switch (tile) { - case Terrain.EMPTY_DECO: - return "Wet yellowish moss covers the floor."; - case Terrain.BOOKSHELF: - return "The bookshelf is packed with cheap useless books. Might it burn?"; - default: - return super.tileDesc( tile ); + case Terrain.EMPTY_DECO: + return Messages.get(SewerLevel.class, "empty_deco_desc"); + case Terrain.BOOKSHELF: + return Messages.get(SewerLevel.class, "bookshelf_desc"); + default: + return super.tileDesc( tile ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties index b24578023..efdb3ce89 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties @@ -392,6 +392,12 @@ actors.char.smb_missed=%s %s %s's attack actors.char.out_of_paralysis=The pain snapped %s out of paralysis actors.char.def_verb=dodged + + +items.bags.bag.name=backpack + + + levels.features.alchemypot.select_seed=Select a seed to throw levels.features.alchemypot.pot=Alchemy Pot levels.features.alchemypot.fruit=Cook a Blandfruit @@ -513,4 +519,72 @@ levels.traps.worntrap.name=Worn out trap levels.traps.worntrap.nothing=nothing happens.. levels.traps.worntrap.desc=Due to age and possibly poor workmanship, it looks like this trap has worn to the point where it won't do anything when triggered. -items.bags.bag.name=backpack +levels.caveslevel.grass_name=Fluorescent moss +levels.caveslevel.high_grass_name=Fluorescent mushrooms +levels.caveslevel.water_name=Freezing cold water. +levels.caveslevel.entrance_desc=The ladder leads up to the upper depth. +levels.caveslevel.exit_desc=The ladder leads down to the lower depth. +levels.caveslevel.high_grass_desc=Huge mushrooms block the view. +levels.caveslevel.wall_deco_desc=A vein of some ore is visible on the wall. Gold? +levels.caveslevel.bookshelf_desc=Who would need a bookshelf in a cave? +levels.citylevel.water_name=Suspiciously colored water +levels.citylevel.high_grass_name=High blooming flowers +levels.citylevel.entrance_desc=A ramp leads up to the upper depth. +levels.citylevel.exit_desc=A ramp leads down to the lower depth. +levels.citylevel.deco_desc=Several tiles are missing here. +levels.citylevel.sp_desc=Thick carpet covers the floor. +levels.citylevel.statue_desc=The statue depicts some dwarf standing in a heroic stance. +levels.citylevel.bookshelf_desc=The rows of books on different disciplines fill the bookshelf. +levels.hallslevel.water_name=Cold lava +levels.hallslevel.grass_name=Embermoss +levels.hallslevel.high_grass_name=Emberfungi +levels.hallslevel.statue_name=Pillar +levels.hallslevel.water_desc=It looks like lava, but it's cold and probably safe to touch. +levels.hallslevel.statue_desc=The pillar is made of real humanoid skulls. Awesome. +levels.hallslevel.bookshelf_desc=Books in ancient languages smoulder in the bookshelf. +levels.level.hidden_plate=A hidden pressure plate clicks! +levels.level.chasm_name=Chasm +levels.level.floor_name=Floor +levels.level.grass_name=Grass +levels.level.water_name=Water +levels.level.wall_name=Wall +levels.level.closed_door_name=Closed door +levels.level.open_door_name=Open door +levels.level.entrace_name=Depth entrance +levels.level.exit_name=Depth exit +levels.level.embers_name=Embers +levels.level.locked_door_name=Locked door +levels.level.pedestal_name=Pedestal +levels.level.barricade_name=Barricade +levels.level.high_grass_name=High grass +levels.level.locked_exit_name=Locked depth exit +levels.level.unlocked_exit_name=Unlocked depth exit +levels.level.sign_name=Sign +levels.level.well_name=Well +levels.level.empty_well_name=Empty well +levels.level.statue_name=Statue +levels.level.inactive_trap_name=Triggered trap +levels.level.bookshelf_name=Bookshelf +levels.level.alchemy_name=Alchemy pot +levels.level.default_name=??? +levels.level.chasm_desc=You can't see the bottom. +levels.level.water_desc=In case of burning step into the water to extinguish the fire. +levels.level.entrance_desc=Stairs lead up to the upper depth. +levels.level.exit_desc=Stairs lead down to the lower depth. +levels.level.embers_desc=Embers cover the floor. +levels.level.high_grass_desc=Dense vegetation blocks the view. +levels.level.locked_door_desc=This door is locked, you need a matching key to unlock it. +levels.level.locked_exit_desc=Heavy bars block the stairs leading down. +levels.level.barricade_desc=The wooden barricade is firmly set but has dried over the years. Might it burn? +levels.level.sign_desc=You can't read the text from here. +levels.level.inactive_trap_desc=The trap has been triggered before and it's not dangerous anymore. +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. +levels.prisonlevel.bookshelf_desc=This is probably a vestige of a prison library. Might it burn? +levels.sewerlevel.water_name=Murky water +levels.sewerlevel.empty_deco_desc=Wet yellowish moss covers the floor. +levels.sewerlevel.bookshelf_desc=The bookshelf is packed with cheap useless books. Might it burn?