From d761db0838b831ff33fc2783b95bc24bd63315fb Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 16 Mar 2022 12:19:11 -0400 Subject: [PATCH] v1.2.0: removed incorrect tabs in Assets.java --- .../shatteredpixeldungeon/Assets.java | 292 +++++++++--------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index e99d10e48..d90f8ff02 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -24,29 +24,29 @@ package com.shatteredpixel.shatteredpixeldungeon; public class Assets { public static class Effects { - public static final String EFFECTS = "effects/effects.png"; - public static final String FIREBALL = "effects/fireball.png"; - public static final String SPECKS = "effects/specks.png"; - public static final String SPELL_ICONS = "effects/spell_icons.png"; + public static final String EFFECTS = "effects/effects.png"; + public static final String FIREBALL = "effects/fireball.png"; + public static final String SPECKS = "effects/specks.png"; + public static final String SPELL_ICONS = "effects/spell_icons.png"; } public static class Environment { - public static final String TERRAIN_FEATURES = "environment/terrain_features.png"; + public static final String TERRAIN_FEATURES = "environment/terrain_features.png"; - public static final String VISUAL_GRID = "environment/visual_grid.png"; + public static final String VISUAL_GRID = "environment/visual_grid.png"; public static final String WALL_BLOCKING= "environment/wall_blocking.png"; - public static final String TILES_SEWERS = "environment/tiles_sewers.png"; - public static final String TILES_PRISON = "environment/tiles_prison.png"; - public static final String TILES_CAVES = "environment/tiles_caves.png"; - public static final String TILES_CITY = "environment/tiles_city.png"; - public static final String TILES_HALLS = "environment/tiles_halls.png"; + public static final String TILES_SEWERS = "environment/tiles_sewers.png"; + public static final String TILES_PRISON = "environment/tiles_prison.png"; + public static final String TILES_CAVES = "environment/tiles_caves.png"; + public static final String TILES_CITY = "environment/tiles_city.png"; + public static final String TILES_HALLS = "environment/tiles_halls.png"; - public static final String WATER_SEWERS = "environment/water0.png"; - public static final String WATER_PRISON = "environment/water1.png"; - public static final String WATER_CAVES = "environment/water2.png"; - public static final String WATER_CITY = "environment/water3.png"; - public static final String WATER_HALLS = "environment/water4.png"; + public static final String WATER_SEWERS = "environment/water0.png"; + public static final String WATER_PRISON = "environment/water1.png"; + public static final String WATER_CAVES = "environment/water2.png"; + public static final String WATER_CITY = "environment/water3.png"; + public static final String WATER_HALLS = "environment/water4.png"; public static final String WEAK_FLOOR = "environment/custom_tiles/weak_floor.png"; public static final String SEWER_BOSS = "environment/custom_tiles/sewer_boss.png"; @@ -66,34 +66,34 @@ public class Assets { public static final String ARCS_BG = "interfaces/arcs1.png"; public static final String ARCS_FG = "interfaces/arcs2.png"; - public static final String BANNERS = "interfaces/banners.png"; - public static final String BADGES = "interfaces/badges.png"; - public static final String LOCKED = "interfaces/locked_badge.png"; + public static final String BANNERS = "interfaces/banners.png"; + public static final String BADGES = "interfaces/badges.png"; + public static final String LOCKED = "interfaces/locked_badge.png"; - public static final String CHROME = "interfaces/chrome.png"; - public static final String ICONS = "interfaces/icons.png"; - public static final String STATUS = "interfaces/status_pane.png"; + public static final String CHROME = "interfaces/chrome.png"; + public static final String ICONS = "interfaces/icons.png"; + public static final String STATUS = "interfaces/status_pane.png"; public static final String MENU = "interfaces/menu_pane.png"; public static final String MENU_BTN = "interfaces/menu_button.png"; - public static final String TOOLBAR = "interfaces/toolbar.png"; + public static final String TOOLBAR = "interfaces/toolbar.png"; public static final String SHADOW = "interfaces/shadow.png"; public static final String BOSSHP = "interfaces/boss_hp.png"; - public static final String SURFACE = "interfaces/surface.png"; + public static final String SURFACE = "interfaces/surface.png"; - public static final String LOADING_SEWERS = "interfaces/loading_sewers.png"; - public static final String LOADING_PRISON = "interfaces/loading_prison.png"; - public static final String LOADING_CAVES = "interfaces/loading_caves.png"; - public static final String LOADING_CITY = "interfaces/loading_city.png"; - public static final String LOADING_HALLS = "interfaces/loading_halls.png"; + public static final String LOADING_SEWERS = "interfaces/loading_sewers.png"; + public static final String LOADING_PRISON = "interfaces/loading_prison.png"; + public static final String LOADING_CAVES = "interfaces/loading_caves.png"; + public static final String LOADING_CITY = "interfaces/loading_city.png"; + public static final String LOADING_HALLS = "interfaces/loading_halls.png"; - public static final String BUFFS_SMALL = "interfaces/buffs.png"; - public static final String BUFFS_LARGE = "interfaces/large_buffs.png"; + public static final String BUFFS_SMALL = "interfaces/buffs.png"; + public static final String BUFFS_LARGE = "interfaces/large_buffs.png"; - public static final String TALENT_ICONS = "interfaces/talent_icons.png"; + public static final String TALENT_ICONS = "interfaces/talent_icons.png"; public static final String TALENT_BUTTON = "interfaces/talent_button.png"; - public static final String HERO_ICONS = "interfaces/hero_icons.png"; + public static final String HERO_ICONS = "interfaces/hero_icons.png"; } //these points to resource bundles, not raw asset files @@ -110,42 +110,42 @@ public class Assets { } public static class Music { - public static final String THEME_1 = "music/theme_1.ogg"; - public static final String THEME_2 = "music/theme_2.ogg"; + public static final String THEME_1 = "music/theme_1.ogg"; + public static final String THEME_2 = "music/theme_2.ogg"; - public static final String SEWERS_1 = "music/sewers_1.ogg"; - public static final String SEWERS_2 = "music/sewers_2.ogg"; + public static final String SEWERS_1 = "music/sewers_1.ogg"; + public static final String SEWERS_2 = "music/sewers_2.ogg"; - public static final String PRISON_1 = "music/prison_1.ogg"; - public static final String PRISON_2 = "music/prison_2.ogg"; + public static final String PRISON_1 = "music/prison_1.ogg"; + public static final String PRISON_2 = "music/prison_2.ogg"; - public static final String CAVES_1 = "music/caves_1.ogg"; - public static final String CAVES_2 = "music/caves_2.ogg"; + public static final String CAVES_1 = "music/caves_1.ogg"; + public static final String CAVES_2 = "music/caves_2.ogg"; - public static final String CITY_1 = "music/city_1.ogg"; - public static final String CITY_2 = "music/city_2.ogg"; + public static final String CITY_1 = "music/city_1.ogg"; + public static final String CITY_2 = "music/city_2.ogg"; - public static final String HALLS_1 = "music/halls_1.ogg"; - public static final String HALLS_2 = "music/halls_2.ogg"; + public static final String HALLS_1 = "music/halls_1.ogg"; + public static final String HALLS_2 = "music/halls_2.ogg"; } public static class Sounds { - public static final String CLICK = "sounds/click.mp3"; - public static final String BADGE = "sounds/badge.mp3"; - public static final String GOLD = "sounds/gold.mp3"; + public static final String CLICK = "sounds/click.mp3"; + public static final String BADGE = "sounds/badge.mp3"; + public static final String GOLD = "sounds/gold.mp3"; - public static final String OPEN = "sounds/door_open.mp3"; - public static final String UNLOCK = "sounds/unlock.mp3"; - public static final String ITEM = "sounds/item.mp3"; - public static final String DEWDROP = "sounds/dewdrop.mp3"; - public static final String STEP = "sounds/step.mp3"; - public static final String WATER = "sounds/water.mp3"; - public static final String GRASS = "sounds/grass.mp3"; - public static final String TRAMPLE = "sounds/trample.mp3"; - public static final String STURDY = "sounds/sturdy.mp3"; + public static final String OPEN = "sounds/door_open.mp3"; + public static final String UNLOCK = "sounds/unlock.mp3"; + public static final String ITEM = "sounds/item.mp3"; + public static final String DEWDROP = "sounds/dewdrop.mp3"; + public static final String STEP = "sounds/step.mp3"; + public static final String WATER = "sounds/water.mp3"; + public static final String GRASS = "sounds/grass.mp3"; + public static final String TRAMPLE = "sounds/trample.mp3"; + public static final String STURDY = "sounds/sturdy.mp3"; - public static final String HIT = "sounds/hit.mp3"; - public static final String MISS = "sounds/miss.mp3"; + public static final String HIT = "sounds/hit.mp3"; + public static final String MISS = "sounds/miss.mp3"; public static final String HIT_SLASH = "sounds/hit_slash.mp3"; public static final String HIT_STAB = "sounds/hit_stab.mp3"; public static final String HIT_CRUSH = "sounds/hit_crush.mp3"; @@ -158,38 +158,38 @@ public class Assets { public static final String HEALTH_WARN = "sounds/health_warn.mp3"; public static final String HEALTH_CRITICAL = "sounds/health_critical.mp3"; - public static final String DESCEND = "sounds/descend.mp3"; - public static final String EAT = "sounds/eat.mp3"; - public static final String READ = "sounds/read.mp3"; - public static final String LULLABY = "sounds/lullaby.mp3"; - public static final String DRINK = "sounds/drink.mp3"; - public static final String SHATTER = "sounds/shatter.mp3"; - public static final String ZAP = "sounds/zap.mp3"; + public static final String DESCEND = "sounds/descend.mp3"; + public static final String EAT = "sounds/eat.mp3"; + public static final String READ = "sounds/read.mp3"; + public static final String LULLABY = "sounds/lullaby.mp3"; + public static final String DRINK = "sounds/drink.mp3"; + public static final String SHATTER = "sounds/shatter.mp3"; + public static final String ZAP = "sounds/zap.mp3"; public static final String LIGHTNING= "sounds/lightning.mp3"; - public static final String LEVELUP = "sounds/levelup.mp3"; - public static final String DEATH = "sounds/death.mp3"; + public static final String LEVELUP = "sounds/levelup.mp3"; + public static final String DEATH = "sounds/death.mp3"; public static final String CHALLENGE= "sounds/challenge.mp3"; - public static final String CURSED = "sounds/cursed.mp3"; - public static final String TRAP = "sounds/trap.mp3"; - public static final String EVOKE = "sounds/evoke.mp3"; - public static final String TOMB = "sounds/tomb.mp3"; - public static final String ALERT = "sounds/alert.mp3"; - public static final String MELD = "sounds/meld.mp3"; - public static final String BOSS = "sounds/boss.mp3"; - public static final String BLAST = "sounds/blast.mp3"; - public static final String PLANT = "sounds/plant.mp3"; - public static final String RAY = "sounds/ray.mp3"; - public static final String BEACON = "sounds/beacon.mp3"; - public static final String TELEPORT = "sounds/teleport.mp3"; - public static final String CHARMS = "sounds/charms.mp3"; - public static final String MASTERY = "sounds/mastery.mp3"; - public static final String PUFF = "sounds/puff.mp3"; - public static final String ROCKS = "sounds/rocks.mp3"; - public static final String BURNING = "sounds/burning.mp3"; - public static final String FALLING = "sounds/falling.mp3"; - public static final String GHOST = "sounds/ghost.mp3"; - public static final String SECRET = "sounds/secret.mp3"; - public static final String BONES = "sounds/bones.mp3"; + public static final String CURSED = "sounds/cursed.mp3"; + public static final String TRAP = "sounds/trap.mp3"; + public static final String EVOKE = "sounds/evoke.mp3"; + public static final String TOMB = "sounds/tomb.mp3"; + public static final String ALERT = "sounds/alert.mp3"; + public static final String MELD = "sounds/meld.mp3"; + public static final String BOSS = "sounds/boss.mp3"; + public static final String BLAST = "sounds/blast.mp3"; + public static final String PLANT = "sounds/plant.mp3"; + public static final String RAY = "sounds/ray.mp3"; + public static final String BEACON = "sounds/beacon.mp3"; + public static final String TELEPORT = "sounds/teleport.mp3"; + public static final String CHARMS = "sounds/charms.mp3"; + public static final String MASTERY = "sounds/mastery.mp3"; + public static final String PUFF = "sounds/puff.mp3"; + public static final String ROCKS = "sounds/rocks.mp3"; + public static final String BURNING = "sounds/burning.mp3"; + public static final String FALLING = "sounds/falling.mp3"; + public static final String GHOST = "sounds/ghost.mp3"; + public static final String SECRET = "sounds/secret.mp3"; + public static final String BONES = "sounds/bones.mp3"; public static final String BEE = "sounds/bee.mp3"; public static final String DEGRADE = "sounds/degrade.mp3"; public static final String MIMIC = "sounds/mimic.mp3"; @@ -216,76 +216,76 @@ public class Assets { } public static class Splashes { - public static final String WARRIOR = "splashes/warrior.jpg"; - public static final String MAGE = "splashes/mage.jpg"; - public static final String ROGUE = "splashes/rogue.jpg"; - public static final String HUNTRESS = "splashes/huntress.jpg"; + public static final String WARRIOR = "splashes/warrior.jpg"; + public static final String MAGE = "splashes/mage.jpg"; + public static final String ROGUE = "splashes/rogue.jpg"; + public static final String HUNTRESS = "splashes/huntress.jpg"; } public static class Sprites { - public static final String ITEMS = "sprites/items.png"; + public static final String ITEMS = "sprites/items.png"; public static final String ITEM_ICONS = "sprites/item_icons.png"; - public static final String WARRIOR = "sprites/warrior.png"; - public static final String MAGE = "sprites/mage.png"; - public static final String ROGUE = "sprites/rogue.png"; - public static final String HUNTRESS = "sprites/huntress.png"; - public static final String AVATARS = "sprites/avatars.png"; - public static final String PET = "sprites/pet.png"; - public static final String AMULET = "sprites/amulet.png"; + public static final String WARRIOR = "sprites/warrior.png"; + public static final String MAGE = "sprites/mage.png"; + public static final String ROGUE = "sprites/rogue.png"; + public static final String HUNTRESS = "sprites/huntress.png"; + public static final String AVATARS = "sprites/avatars.png"; + public static final String PET = "sprites/pet.png"; + public static final String AMULET = "sprites/amulet.png"; - public static final String RAT = "sprites/rat.png"; - public static final String BRUTE = "sprites/brute.png"; - public static final String SPINNER = "sprites/spinner.png"; - public static final String DM300 = "sprites/dm300.png"; - public static final String WRAITH = "sprites/wraith.png"; - public static final String UNDEAD = "sprites/undead.png"; - public static final String KING = "sprites/king.png"; - public static final String PIRANHA = "sprites/piranha.png"; - public static final String EYE = "sprites/eye.png"; - public static final String GNOLL = "sprites/gnoll.png"; - public static final String CRAB = "sprites/crab.png"; - public static final String GOO = "sprites/goo.png"; - public static final String SWARM = "sprites/swarm.png"; - public static final String SKELETON = "sprites/skeleton.png"; - public static final String SHAMAN = "sprites/shaman.png"; - public static final String THIEF = "sprites/thief.png"; - public static final String TENGU = "sprites/tengu.png"; - public static final String SHEEP = "sprites/sheep.png"; - public static final String KEEPER = "sprites/shopkeeper.png"; - public static final String BAT = "sprites/bat.png"; + public static final String RAT = "sprites/rat.png"; + public static final String BRUTE = "sprites/brute.png"; + public static final String SPINNER = "sprites/spinner.png"; + public static final String DM300 = "sprites/dm300.png"; + public static final String WRAITH = "sprites/wraith.png"; + public static final String UNDEAD = "sprites/undead.png"; + public static final String KING = "sprites/king.png"; + public static final String PIRANHA = "sprites/piranha.png"; + public static final String EYE = "sprites/eye.png"; + public static final String GNOLL = "sprites/gnoll.png"; + public static final String CRAB = "sprites/crab.png"; + public static final String GOO = "sprites/goo.png"; + public static final String SWARM = "sprites/swarm.png"; + public static final String SKELETON = "sprites/skeleton.png"; + public static final String SHAMAN = "sprites/shaman.png"; + public static final String THIEF = "sprites/thief.png"; + public static final String TENGU = "sprites/tengu.png"; + public static final String SHEEP = "sprites/sheep.png"; + public static final String KEEPER = "sprites/shopkeeper.png"; + public static final String BAT = "sprites/bat.png"; public static final String ELEMENTAL= "sprites/elemental.png"; - public static final String MONK = "sprites/monk.png"; - public static final String WARLOCK = "sprites/warlock.png"; - public static final String GOLEM = "sprites/golem.png"; - public static final String STATUE = "sprites/statue.png"; - public static final String SUCCUBUS = "sprites/succubus.png"; - public static final String SCORPIO = "sprites/scorpio.png"; - public static final String FISTS = "sprites/yog_fists.png"; - public static final String YOG = "sprites/yog.png"; - public static final String LARVA = "sprites/larva.png"; - public static final String GHOST = "sprites/ghost.png"; - public static final String MAKER = "sprites/wandmaker.png"; - public static final String TROLL = "sprites/blacksmith.png"; - public static final String IMP = "sprites/demon.png"; - public static final String RATKING = "sprites/ratking.png"; + public static final String MONK = "sprites/monk.png"; + public static final String WARLOCK = "sprites/warlock.png"; + public static final String GOLEM = "sprites/golem.png"; + public static final String STATUE = "sprites/statue.png"; + public static final String SUCCUBUS = "sprites/succubus.png"; + public static final String SCORPIO = "sprites/scorpio.png"; + public static final String FISTS = "sprites/yog_fists.png"; + public static final String YOG = "sprites/yog.png"; + public static final String LARVA = "sprites/larva.png"; + public static final String GHOST = "sprites/ghost.png"; + public static final String MAKER = "sprites/wandmaker.png"; + public static final String TROLL = "sprites/blacksmith.png"; + public static final String IMP = "sprites/demon.png"; + public static final String RATKING = "sprites/ratking.png"; public static final String BEE = "sprites/bee.png"; public static final String MIMIC = "sprites/mimic.png"; public static final String ROT_LASH = "sprites/rot_lasher.png"; public static final String ROT_HEART= "sprites/rot_heart.png"; public static final String GUARD = "sprites/guard.png"; public static final String WARDS = "sprites/wards.png"; - public static final String GUARDIAN = "sprites/guardian.png"; - public static final String SLIME = "sprites/slime.png"; - public static final String SNAKE = "sprites/snake.png"; - public static final String NECRO = "sprites/necromancer.png"; - public static final String GHOUL = "sprites/ghoul.png"; - public static final String RIPPER = "sprites/ripper.png"; - public static final String SPAWNER = "sprites/spawner.png"; - public static final String DM100 = "sprites/dm100.png"; - public static final String PYLON = "sprites/pylon.png"; - public static final String DM200 = "sprites/dm200.png"; - public static final String LOTUS = "sprites/lotus.png"; + public static final String GUARDIAN = "sprites/guardian.png"; + public static final String SLIME = "sprites/slime.png"; + public static final String SNAKE = "sprites/snake.png"; + public static final String NECRO = "sprites/necromancer.png"; + public static final String GHOUL = "sprites/ghoul.png"; + public static final String RIPPER = "sprites/ripper.png"; + public static final String SPAWNER = "sprites/spawner.png"; + public static final String DM100 = "sprites/dm100.png"; + public static final String PYLON = "sprites/pylon.png"; + public static final String DM200 = "sprites/dm200.png"; + public static final String LOTUS = "sprites/lotus.png"; public static final String NINJA_LOG= "sprites/ninja_log.png"; public static final String SPIRIT_HAWK= "sprites/spirit_hawk.png"; public static final String RED_SENTRY= "sprites/red_sentry.png";