From 6ca138de23f8eb5d80d8d0331395654a4e24f087 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 7 May 2020 21:29:41 -0400 Subject: [PATCH] v0.8.1: refactored the location of all asset files --- .../android/AndroidLauncher.java | 2 +- .../android/AndroidPlatformSupport.java | 2 +- .../android/windows/WndAndroidTextInput.java | 2 +- .../src/main/assets/{ => effects}/effects.png | Bin .../main/assets/{ => effects}/fireball.png | Bin core/src/main/assets/{ => effects}/specks.png | Bin .../main/assets/{ => effects}/spell_icons.png | Bin .../custom_tiles/caves_boss.png | Bin .../custom_tiles/city_boss.png | Bin .../custom_tiles/halls_special.png | Bin .../custom_tiles/prison_exit_new.png | Bin .../custom_tiles/prison_exit_old.png | Bin .../custom_tiles/prison_quests.png | Bin .../custom_tiles/sewer_boss.png | Bin .../custom_tiles/weak_floor.png | Bin .../{ => environment}/terrain_features.png | Bin .../assets/{ => environment}/tiles_caves.png | Bin .../assets/{ => environment}/tiles_city.png | Bin .../assets/{ => environment}/tiles_halls.png | Bin .../assets/{ => environment}/tiles_prison.png | Bin .../assets/{ => environment}/tiles_sewers.png | Bin .../assets/{ => environment}/visual_grid.png | Bin .../{ => environment}/wall_blocking.png | Bin .../main/assets/{ => environment}/water0.png | Bin .../main/assets/{ => environment}/water1.png | Bin .../main/assets/{ => environment}/water2.png | Bin .../main/assets/{ => environment}/water3.png | Bin .../main/assets/{ => environment}/water4.png | Bin .../main/assets/{ => fonts}/pixel_font.png | Bin .../main/assets/{ => fonts}/pixel_font.ttf | Bin .../main/assets/{ => interfaces}/arcs1.png | Bin .../main/assets/{ => interfaces}/arcs2.png | Bin .../main/assets/{ => interfaces}/badges.png | Bin .../main/assets/{ => interfaces}/banners.png | Bin .../main/assets/{ => interfaces}/boss_hp.png | Bin .../main/assets/{ => interfaces}/buffs.png | Bin .../main/assets/{ => interfaces}/chrome.png | Bin .../{ => interfaces}/consumable_icons.png | Bin .../main/assets/{ => interfaces}/exp_bar.png | Bin .../main/assets/{ => interfaces}/hp_bar.png | Bin .../main/assets/{ => interfaces}/icons.png | Bin .../assets/{ => interfaces}/large_buffs.png | Bin .../assets/{ => interfaces}/loading_caves.png | Bin .../assets/{ => interfaces}/loading_city.png | Bin .../assets/{ => interfaces}/loading_halls.png | Bin .../{ => interfaces}/loading_prison.png | Bin .../{ => interfaces}/loading_sewers.png | Bin .../assets/{ => interfaces}/locked_badge.png | Bin .../assets/{ => interfaces}/menu_button.png | Bin .../main/assets/{ => interfaces}/shadow.png | Bin .../assets/{ => interfaces}/shield_bar.png | Bin .../assets/{ => interfaces}/status_pane.png | Bin .../main/assets/{ => interfaces}/surface.png | Bin .../main/assets/{ => interfaces}/toolbar.png | Bin .../messages/actors/actors.properties | 2 +- .../messages/actors/actors_ca.properties | 0 .../messages/actors/actors_cs.properties | 0 .../messages/actors/actors_de.properties | 0 .../messages/actors/actors_eo.properties | 0 .../messages/actors/actors_es.properties | 0 .../messages/actors/actors_eu.properties | 0 .../messages/actors/actors_fi.properties | 0 .../messages/actors/actors_fr.properties | 0 .../messages/actors/actors_hu.properties | 0 .../messages/actors/actors_in.properties | 0 .../messages/actors/actors_it.properties | 0 .../messages/actors/actors_ja.properties | 0 .../messages/actors/actors_ko.properties | 0 .../messages/actors/actors_pl.properties | 0 .../messages/actors/actors_pt.properties | 0 .../messages/actors/actors_ru.properties | 0 .../messages/actors/actors_tr.properties | 0 .../messages/actors/actors_zh.properties | 0 .../messages/items/items.properties | 0 .../messages/items/items_ca.properties | 0 .../messages/items/items_cs.properties | 0 .../messages/items/items_de.properties | 0 .../messages/items/items_eo.properties | 0 .../messages/items/items_es.properties | 0 .../messages/items/items_eu.properties | 0 .../messages/items/items_fi.properties | 0 .../messages/items/items_fr.properties | 0 .../messages/items/items_hu.properties | 0 .../messages/items/items_in.properties | 0 .../messages/items/items_it.properties | 0 .../messages/items/items_ja.properties | 0 .../messages/items/items_ko.properties | 0 .../messages/items/items_pl.properties | 0 .../messages/items/items_pt.properties | 0 .../messages/items/items_ru.properties | 0 .../messages/items/items_tr.properties | 0 .../messages/items/items_zh.properties | 0 .../messages/journal/journal.properties | 0 .../messages/journal/journal_ca.properties | 0 .../messages/journal/journal_cs.properties | 0 .../messages/journal/journal_de.properties | 0 .../messages/journal/journal_eo.properties | 0 .../messages/journal/journal_es.properties | 0 .../messages/journal/journal_eu.properties | 0 .../messages/journal/journal_fi.properties | 0 .../messages/journal/journal_fr.properties | 0 .../messages/journal/journal_hu.properties | 0 .../messages/journal/journal_in.properties | 0 .../messages/journal/journal_it.properties | 0 .../messages/journal/journal_ja.properties | 0 .../messages/journal/journal_ko.properties | 0 .../messages/journal/journal_pl.properties | 0 .../messages/journal/journal_pt.properties | 0 .../messages/journal/journal_ru.properties | 0 .../messages/journal/journal_tr.properties | 0 .../messages/journal/journal_zh.properties | 0 .../messages/levels/levels.properties | 0 .../messages/levels/levels_ca.properties | 0 .../messages/levels/levels_cs.properties | 0 .../messages/levels/levels_de.properties | 0 .../messages/levels/levels_eo.properties | 0 .../messages/levels/levels_es.properties | 0 .../messages/levels/levels_eu.properties | 0 .../messages/levels/levels_fi.properties | 0 .../messages/levels/levels_fr.properties | 0 .../messages/levels/levels_hu.properties | 0 .../messages/levels/levels_in.properties | 0 .../messages/levels/levels_it.properties | 0 .../messages/levels/levels_ja.properties | 0 .../messages/levels/levels_ko.properties | 0 .../messages/levels/levels_pl.properties | 0 .../messages/levels/levels_pt.properties | 0 .../messages/levels/levels_ru.properties | 0 .../messages/levels/levels_tr.properties | 0 .../messages/levels/levels_zh.properties | 0 .../messages/misc/misc.properties | 0 .../messages/misc/misc_ca.properties | 0 .../messages/misc/misc_cs.properties | 0 .../messages/misc/misc_de.properties | 0 .../messages/misc/misc_eo.properties | 0 .../messages/misc/misc_es.properties | 0 .../messages/misc/misc_eu.properties | 0 .../messages/misc/misc_fi.properties | 0 .../messages/misc/misc_fr.properties | 0 .../messages/misc/misc_hu.properties | 0 .../messages/misc/misc_in.properties | 0 .../messages/misc/misc_it.properties | 0 .../messages/misc/misc_ja.properties | 0 .../messages/misc/misc_ko.properties | 0 .../messages/misc/misc_pl.properties | 0 .../messages/misc/misc_pt.properties | 0 .../messages/misc/misc_ru.properties | 0 .../messages/misc/misc_tr.properties | 0 .../messages/misc/misc_zh.properties | 0 .../messages/plants/plants.properties | 0 .../messages/plants/plants_ca.properties | 0 .../messages/plants/plants_cs.properties | 0 .../messages/plants/plants_de.properties | 0 .../messages/plants/plants_eo.properties | 0 .../messages/plants/plants_es.properties | 0 .../messages/plants/plants_eu.properties | 0 .../messages/plants/plants_fi.properties | 0 .../messages/plants/plants_fr.properties | 0 .../messages/plants/plants_hu.properties | 0 .../messages/plants/plants_in.properties | 0 .../messages/plants/plants_it.properties | 0 .../messages/plants/plants_ja.properties | 0 .../messages/plants/plants_ko.properties | 0 .../messages/plants/plants_pl.properties | 0 .../messages/plants/plants_pt.properties | 0 .../messages/plants/plants_ru.properties | 0 .../messages/plants/plants_tr.properties | 0 .../messages/plants/plants_zh.properties | 0 .../messages/scenes/scenes.properties | 0 .../messages/scenes/scenes_ca.properties | 0 .../messages/scenes/scenes_cs.properties | 0 .../messages/scenes/scenes_de.properties | 0 .../messages/scenes/scenes_eo.properties | 0 .../messages/scenes/scenes_es.properties | 0 .../messages/scenes/scenes_eu.properties | 0 .../messages/scenes/scenes_fi.properties | 0 .../messages/scenes/scenes_fr.properties | 0 .../messages/scenes/scenes_hu.properties | 0 .../messages/scenes/scenes_in.properties | 0 .../messages/scenes/scenes_it.properties | 0 .../messages/scenes/scenes_ja.properties | 0 .../messages/scenes/scenes_ko.properties | 0 .../messages/scenes/scenes_pl.properties | 0 .../messages/scenes/scenes_pt.properties | 0 .../messages/scenes/scenes_ru.properties | 0 .../messages/scenes/scenes_tr.properties | 0 .../messages/scenes/scenes_zh.properties | 0 .../messages/ui/ui.properties | 0 .../messages/ui/ui_ca.properties | 0 .../messages/ui/ui_cs.properties | 0 .../messages/ui/ui_de.properties | 0 .../messages/ui/ui_eo.properties | 0 .../messages/ui/ui_es.properties | 0 .../messages/ui/ui_eu.properties | 0 .../messages/ui/ui_fi.properties | 0 .../messages/ui/ui_fr.properties | 0 .../messages/ui/ui_hu.properties | 0 .../messages/ui/ui_in.properties | 0 .../messages/ui/ui_it.properties | 0 .../messages/ui/ui_ja.properties | 0 .../messages/ui/ui_ko.properties | 0 .../messages/ui/ui_pl.properties | 0 .../messages/ui/ui_pt.properties | 0 .../messages/ui/ui_ru.properties | 0 .../messages/ui/ui_tr.properties | 0 .../messages/ui/ui_zh.properties | 0 .../messages/windows/windows.properties | 0 .../messages/windows/windows_ca.properties | 0 .../messages/windows/windows_cs.properties | 0 .../messages/windows/windows_de.properties | 0 .../messages/windows/windows_eo.properties | 0 .../messages/windows/windows_es.properties | 0 .../messages/windows/windows_eu.properties | 0 .../messages/windows/windows_fi.properties | 0 .../messages/windows/windows_fr.properties | 0 .../messages/windows/windows_hu.properties | 0 .../messages/windows/windows_in.properties | 0 .../messages/windows/windows_it.properties | 0 .../messages/windows/windows_ja.properties | 0 .../messages/windows/windows_ko.properties | 0 .../messages/windows/windows_pl.properties | 0 .../messages/windows/windows_pt.properties | 0 .../messages/windows/windows_ru.properties | 0 .../messages/windows/windows_tr.properties | 0 .../messages/windows/windows_zh.properties | 0 core/src/main/assets/{ => music}/game.ogg | Bin core/src/main/assets/{ => music}/surface.ogg | Bin core/src/main/assets/{ => music}/theme.ogg | Bin .../main/assets/{ => sounds}/snd_alert.mp3 | Bin .../main/assets/{ => sounds}/snd_badge.mp3 | Bin .../main/assets/{ => sounds}/snd_beacon.mp3 | Bin core/src/main/assets/{ => sounds}/snd_bee.mp3 | Bin .../main/assets/{ => sounds}/snd_blast.mp3 | Bin .../main/assets/{ => sounds}/snd_bones.mp3 | Bin .../src/main/assets/{ => sounds}/snd_boss.mp3 | Bin .../main/assets/{ => sounds}/snd_burning.mp3 | Bin .../assets/{ => sounds}/snd_challenge.mp3 | Bin .../main/assets/{ => sounds}/snd_charms.mp3 | Bin .../main/assets/{ => sounds}/snd_click.mp3 | Bin .../main/assets/{ => sounds}/snd_cursed.mp3 | Bin .../main/assets/{ => sounds}/snd_death.mp3 | Bin .../main/assets/{ => sounds}/snd_degrade.mp3 | Bin .../main/assets/{ => sounds}/snd_descend.mp3 | Bin .../main/assets/{ => sounds}/snd_dewdrop.mp3 | Bin .../assets/{ => sounds}/snd_door_open.mp3 | Bin .../main/assets/{ => sounds}/snd_drink.mp3 | Bin core/src/main/assets/{ => sounds}/snd_eat.mp3 | Bin .../main/assets/{ => sounds}/snd_evoke.mp3 | Bin .../main/assets/{ => sounds}/snd_falling.mp3 | Bin .../main/assets/{ => sounds}/snd_ghost.mp3 | Bin .../src/main/assets/{ => sounds}/snd_gold.mp3 | Bin core/src/main/assets/{ => sounds}/snd_hit.mp3 | Bin .../src/main/assets/{ => sounds}/snd_item.mp3 | Bin .../main/assets/{ => sounds}/snd_levelup.mp3 | Bin .../assets/{ => sounds}/snd_lightning.mp3 | Bin .../main/assets/{ => sounds}/snd_lullaby.mp3 | Bin .../main/assets/{ => sounds}/snd_mastery.mp3 | Bin .../src/main/assets/{ => sounds}/snd_meld.mp3 | Bin .../main/assets/{ => sounds}/snd_mimic.mp3 | Bin .../src/main/assets/{ => sounds}/snd_miss.mp3 | Bin .../main/assets/{ => sounds}/snd_plant.mp3 | Bin .../src/main/assets/{ => sounds}/snd_puff.mp3 | Bin core/src/main/assets/{ => sounds}/snd_ray.mp3 | Bin .../src/main/assets/{ => sounds}/snd_read.mp3 | Bin .../main/assets/{ => sounds}/snd_rocks.mp3 | Bin .../main/assets/{ => sounds}/snd_secret.mp3 | Bin .../main/assets/{ => sounds}/snd_shatter.mp3 | Bin .../src/main/assets/{ => sounds}/snd_step.mp3 | Bin .../main/assets/{ => sounds}/snd_teleport.mp3 | Bin .../src/main/assets/{ => sounds}/snd_tomb.mp3 | Bin .../src/main/assets/{ => sounds}/snd_trap.mp3 | Bin .../main/assets/{ => sounds}/snd_unlock.mp3 | Bin .../main/assets/{ => sounds}/snd_water.mp3 | Bin core/src/main/assets/{ => sounds}/snd_zap.mp3 | Bin core/src/main/assets/{ => sprites}/amulet.png | Bin .../src/main/assets/{ => sprites}/avatars.png | Bin core/src/main/assets/{ => sprites}/bat.png | Bin core/src/main/assets/{ => sprites}/bee.png | Bin .../main/assets/{ => sprites}/blacksmith.png | Bin core/src/main/assets/{ => sprites}/brute.png | Bin core/src/main/assets/{ => sprites}/crab.png | Bin core/src/main/assets/{ => sprites}/demon.png | Bin core/src/main/assets/{ => sprites}/dm100.png | Bin core/src/main/assets/{ => sprites}/dm200.png | Bin core/src/main/assets/{ => sprites}/dm300.png | Bin .../main/assets/{ => sprites}/elemental.png | Bin core/src/main/assets/{ => sprites}/eye.png | Bin core/src/main/assets/{ => sprites}/ghost.png | Bin core/src/main/assets/{ => sprites}/ghoul.png | Bin core/src/main/assets/{ => sprites}/gnoll.png | Bin core/src/main/assets/{ => sprites}/golem.png | Bin core/src/main/assets/{ => sprites}/goo.png | Bin core/src/main/assets/{ => sprites}/guard.png | Bin .../main/assets/{ => sprites}/guardian.png | Bin .../main/assets/{ => sprites}/huntress.png | Bin core/src/main/assets/{ => sprites}/items.png | Bin core/src/main/assets/{ => sprites}/king.png | Bin core/src/main/assets/{ => sprites}/larva.png | Bin core/src/main/assets/{ => sprites}/mage.png | Bin core/src/main/assets/{ => sprites}/mimic.png | Bin core/src/main/assets/{ => sprites}/monk.png | Bin .../main/assets/{ => sprites}/necromancer.png | Bin core/src/main/assets/{ => sprites}/pet.png | Bin .../src/main/assets/{ => sprites}/piranha.png | Bin core/src/main/assets/{ => sprites}/pylon.png | Bin core/src/main/assets/{ => sprites}/rat.png | Bin .../src/main/assets/{ => sprites}/ratking.png | Bin core/src/main/assets/{ => sprites}/ripper.png | Bin core/src/main/assets/{ => sprites}/rogue.png | Bin .../main/assets/{ => sprites}/rot_heart.png | Bin .../main/assets/{ => sprites}/rot_lasher.png | Bin .../src/main/assets/{ => sprites}/scorpio.png | Bin core/src/main/assets/{ => sprites}/shaman.png | Bin core/src/main/assets/{ => sprites}/sheep.png | Bin .../main/assets/{ => sprites}/shopkeeper.png | Bin .../main/assets/{ => sprites}/skeleton.png | Bin core/src/main/assets/{ => sprites}/slime.png | Bin core/src/main/assets/{ => sprites}/snake.png | Bin .../src/main/assets/{ => sprites}/spawner.png | Bin .../src/main/assets/{ => sprites}/spinner.png | Bin core/src/main/assets/{ => sprites}/statue.png | Bin .../main/assets/{ => sprites}/succubus.png | Bin core/src/main/assets/{ => sprites}/swarm.png | Bin core/src/main/assets/{ => sprites}/tengu.png | Bin core/src/main/assets/{ => sprites}/thief.png | Bin core/src/main/assets/{ => sprites}/undead.png | Bin .../main/assets/{ => sprites}/wandmaker.png | Bin core/src/main/assets/{ => sprites}/wards.png | Bin .../src/main/assets/{ => sprites}/warlock.png | Bin .../src/main/assets/{ => sprites}/warrior.png | Bin core/src/main/assets/{ => sprites}/wraith.png | Bin core/src/main/assets/{ => sprites}/yog.png | Bin .../main/assets/{ => sprites}/yog_fists.png | Bin .../shatteredpixeldungeon/Assets.java | 372 ++++++++++-------- .../shatteredpixeldungeon/Chrome.java | 2 +- .../ShatteredPixelDungeon.java | 92 ++--- .../shatteredpixeldungeon/actors/Char.java | 6 +- .../actors/blobs/WaterOfAwareness.java | 4 +- .../actors/blobs/WaterOfHealth.java | 8 +- .../actors/buffs/Berserk.java | 2 +- .../actors/buffs/Combo.java | 6 +- .../actors/buffs/Preparation.java | 2 +- .../actors/buffs/Shadows.java | 2 +- .../actors/hero/Hero.java | 20 +- .../actors/hero/HeroClass.java | 50 ++- .../actors/mobs/CrystalMimic.java | 2 +- .../actors/mobs/DwarfKing.java | 14 +- .../actors/mobs/Elemental.java | 2 +- .../actors/mobs/GoldenMimic.java | 2 +- .../actors/mobs/Goo.java | 2 +- .../actors/mobs/King.java | 4 +- .../actors/mobs/Mimic.java | 4 +- .../actors/mobs/Necromancer.java | 2 +- .../actors/mobs/NewDM300.java | 12 +- .../actors/mobs/NewTengu.java | 14 +- .../actors/mobs/OldDM300.java | 2 +- .../actors/mobs/OldTengu.java | 2 +- .../actors/mobs/Pylon.java | 2 +- .../actors/mobs/RipperDemon.java | 2 +- .../actors/mobs/Skeleton.java | 2 +- .../actors/mobs/Succubus.java | 4 +- .../actors/mobs/Warlock.java | 2 +- .../actors/mobs/npcs/Blacksmith.java | 2 +- .../actors/mobs/npcs/Ghost.java | 6 +- .../actors/mobs/npcs/PrismaticImage.java | 2 +- .../effects/BadgeBanner.java | 6 +- .../effects/BannerSprites.java | 2 +- .../shatteredpixeldungeon/effects/Beam.java | 2 +- .../effects/Effects.java | 2 +- .../effects/Fireball.java | 6 +- .../effects/IceBlock.java | 2 +- .../effects/ShadowBox.java | 2 +- .../shatteredpixeldungeon/effects/Speck.java | 2 +- .../effects/SpellSprite.java | 2 +- .../shatteredpixeldungeon/effects/Swap.java | 2 +- .../shatteredpixeldungeon/items/Ankh.java | 2 +- .../shatteredpixeldungeon/items/ArmorKit.java | 2 +- .../items/BrokenSeal.java | 2 +- .../shatteredpixeldungeon/items/DewVial.java | 2 +- .../shatteredpixeldungeon/items/Dewdrop.java | 2 +- .../items/EquipableItem.java | 2 +- .../shatteredpixeldungeon/items/Gold.java | 2 +- .../shatteredpixeldungeon/items/Heap.java | 4 +- .../shatteredpixeldungeon/items/Honeypot.java | 4 +- .../shatteredpixeldungeon/items/Item.java | 4 +- .../items/MerchantsBeacon.java | 2 +- .../shatteredpixeldungeon/items/Stylus.java | 2 +- .../items/TomeOfMastery.java | 2 +- .../items/armor/MageArmor.java | 6 +- .../items/armor/RogueArmor.java | 2 +- .../items/armor/glyphs/Camouflage.java | 2 +- .../items/artifacts/ChaliceOfBlood.java | 2 +- .../items/artifacts/CloakOfShadows.java | 2 +- .../items/artifacts/DriedRose.java | 18 +- .../items/artifacts/HornOfPlenty.java | 2 +- .../items/artifacts/LloydsBeacon.java | 4 +- .../items/artifacts/SandalsOfNature.java | 2 +- .../items/artifacts/TalismanOfForesight.java | 2 +- .../items/artifacts/TimekeepersHourglass.java | 6 +- .../items/artifacts/UnstableSpellbook.java | 2 +- .../items/bombs/Bomb.java | 2 +- .../items/bombs/Firebomb.java | 2 +- .../items/bombs/HolyBomb.java | 2 +- .../items/bombs/Noisemaker.java | 4 +- .../items/bombs/ShockBomb.java | 2 +- .../items/bombs/WoollyBomb.java | 2 +- .../items/food/Food.java | 2 +- .../items/journal/DocumentPage.java | 2 +- .../shatteredpixeldungeon/items/keys/Key.java | 2 +- .../items/potions/Potion.java | 4 +- .../items/potions/PotionOfFrost.java | 2 +- .../items/potions/PotionOfInvisibility.java | 2 +- .../items/potions/PotionOfLevitation.java | 2 +- .../items/potions/PotionOfLiquidFlame.java | 2 +- .../items/potions/PotionOfParalyticGas.java | 2 +- .../items/potions/PotionOfPurity.java | 2 +- .../items/potions/PotionOfToxicGas.java | 2 +- .../items/potions/brews/BlizzardBrew.java | 2 +- .../items/potions/brews/CausticBrew.java | 2 +- .../items/potions/brews/InfernalBrew.java | 2 +- .../items/potions/brews/ShockingBrew.java | 4 +- .../potions/elixirs/ElixirOfDragonsBlood.java | 2 +- .../elixirs/ElixirOfHoneyedHealing.java | 2 +- .../potions/exotic/PotionOfCleansing.java | 2 +- .../potions/exotic/PotionOfCorrosiveGas.java | 2 +- .../potions/exotic/PotionOfDragonsBreath.java | 2 +- .../potions/exotic/PotionOfShroudingFog.java | 2 +- .../potions/exotic/PotionOfSnapFreeze.java | 2 +- .../potions/exotic/PotionOfStormClouds.java | 2 +- .../items/quest/CeremonialCandle.java | 2 +- .../items/quest/CorpseDust.java | 2 +- .../items/quest/Pickaxe.java | 2 +- .../items/scrolls/InventoryScroll.java | 2 +- .../items/scrolls/ScrollOfIdentify.java | 2 +- .../items/scrolls/ScrollOfLullaby.java | 2 +- .../items/scrolls/ScrollOfMagicMapping.java | 4 +- .../items/scrolls/ScrollOfMirrorImage.java | 4 +- .../items/scrolls/ScrollOfRage.java | 4 +- .../items/scrolls/ScrollOfRecharging.java | 2 +- .../items/scrolls/ScrollOfRemoveCurse.java | 2 +- .../items/scrolls/ScrollOfRetribution.java | 4 +- .../items/scrolls/ScrollOfTeleportation.java | 6 +- .../items/scrolls/ScrollOfTerror.java | 2 +- .../scrolls/exotic/ScrollOfAffection.java | 2 +- .../scrolls/exotic/ScrollOfConfusion.java | 2 +- .../scrolls/exotic/ScrollOfDivination.java | 2 +- .../scrolls/exotic/ScrollOfEnchantment.java | 4 +- .../scrolls/exotic/ScrollOfForesight.java | 2 +- .../exotic/ScrollOfMysticalEnergy.java | 2 +- .../scrolls/exotic/ScrollOfPetrification.java | 2 +- .../scrolls/exotic/ScrollOfPolymorph.java | 2 +- .../exotic/ScrollOfPrismaticImage.java | 2 +- .../scrolls/exotic/ScrollOfPsionicBlast.java | 2 +- .../items/spells/BeaconOfReturning.java | 2 +- .../items/spells/CurseInfusion.java | 2 +- .../items/spells/FeatherFall.java | 2 +- .../items/spells/InventorySpell.java | 2 +- .../items/spells/ReclaimTrap.java | 2 +- .../items/spells/TargetedSpell.java | 2 +- .../items/stones/InventoryStone.java | 2 +- .../items/stones/StoneOfAffection.java | 2 +- .../items/stones/StoneOfAggression.java | 2 +- .../items/stones/StoneOfClairvoyance.java | 4 +- .../items/stones/StoneOfDeepenedSleep.java | 2 +- .../items/stones/StoneOfDisarming.java | 2 +- .../items/stones/StoneOfFlock.java | 2 +- .../items/stones/StoneOfIntuition.java | 2 +- .../items/stones/StoneOfShock.java | 4 +- .../items/wands/CursedWand.java | 10 +- .../items/wands/Wand.java | 2 +- .../items/wands/WandOfBlastWave.java | 4 +- .../items/wands/WandOfCorrosion.java | 2 +- .../items/wands/WandOfCorruption.java | 2 +- .../items/wands/WandOfFireblast.java | 2 +- .../items/wands/WandOfFrost.java | 2 +- .../items/wands/WandOfLightning.java | 2 +- .../items/wands/WandOfLivingEarth.java | 2 +- .../items/wands/WandOfPrismaticLight.java | 4 +- .../items/wands/WandOfRegrowth.java | 2 +- .../items/wands/WandOfTransfusion.java | 2 +- .../items/wands/WandOfWarding.java | 2 +- .../items/weapon/SpiritBow.java | 2 +- .../items/weapon/curses/Annoying.java | 2 +- .../items/weapon/enchantments/Shocking.java | 2 +- .../items/weapon/melee/MagesStaff.java | 2 +- .../items/weapon/missiles/ForceCube.java | 2 +- .../weapon/missiles/darts/ShockingDart.java | 2 +- .../levels/CavesLevel.java | 4 +- .../levels/CityLevel.java | 4 +- .../levels/DeadEndLevel.java | 4 +- .../levels/HallsLevel.java | 4 +- .../levels/LastLevel.java | 10 +- .../levels/LastShopLevel.java | 4 +- .../shatteredpixeldungeon/levels/Level.java | 4 +- .../levels/NewCavesBossLevel.java | 14 +- .../levels/NewCityBossLevel.java | 8 +- .../levels/NewHallsBossLevel.java | 8 +- .../levels/NewPrisonBossLevel.java | 18 +- .../levels/OldCavesBossLevel.java | 6 +- .../levels/OldCityBossLevel.java | 4 +- .../levels/OldHallsBossLevel.java | 4 +- .../levels/OldPrisonBossLevel.java | 14 +- .../levels/PrisonLevel.java | 4 +- .../levels/SewerLevel.java | 4 +- .../levels/features/Chasm.java | 2 +- .../levels/features/Door.java | 2 +- .../levels/rooms/sewerboss/GooBossRoom.java | 2 +- .../rooms/sewerboss/SewerBossExitRoom.java | 4 +- .../rooms/special/DemonSpawnerRoom.java | 2 +- .../levels/rooms/special/MassGraveRoom.java | 2 +- .../levels/rooms/special/WeakFloorRoom.java | 2 +- .../levels/rooms/standard/RitualSiteRoom.java | 2 +- .../levels/traps/AlarmTrap.java | 2 +- .../levels/traps/BlazingTrap.java | 2 +- .../levels/traps/ChillingTrap.java | 2 +- .../levels/traps/CursingTrap.java | 2 +- .../levels/traps/DisarmingTrap.java | 4 +- .../levels/traps/DisintegrationTrap.java | 2 +- .../levels/traps/FlashingTrap.java | 4 +- .../levels/traps/FlockTrap.java | 2 +- .../levels/traps/FrostTrap.java | 2 +- .../levels/traps/GrimTrap.java | 6 +- .../levels/traps/GrippingTrap.java | 2 +- .../levels/traps/GuardianTrap.java | 2 +- .../levels/traps/PoisonDartTrap.java | 2 +- .../levels/traps/RockfallTrap.java | 2 +- .../levels/traps/ShockingTrap.java | 2 +- .../levels/traps/StormTrap.java | 2 +- .../levels/traps/TeleportationTrap.java | 2 +- .../levels/traps/Trap.java | 2 +- .../levels/traps/WarpingTrap.java | 2 +- .../levels/traps/WornDartTrap.java | 2 +- .../messages/Messages.java | 23 +- .../shatteredpixeldungeon/plants/Plant.java | 2 +- .../scenes/AlchemyScene.java | 4 +- .../scenes/AmuletScene.java | 2 +- .../scenes/BadgesScene.java | 6 +- .../scenes/ChangesScene.java | 2 +- .../scenes/GameScene.java | 8 +- .../scenes/InterlevelScene.java | 14 +- .../scenes/PixelScene.java | 2 +- .../scenes/RankingsScene.java | 2 +- .../scenes/SurfaceScene.java | 10 +- .../scenes/TitleScene.java | 2 +- .../sprites/AcidicSprite.java | 2 +- .../sprites/AlbinoSprite.java | 2 +- .../sprites/BanditSprite.java | 2 +- .../sprites/BatSprite.java | 2 +- .../sprites/BeeSprite.java | 2 +- .../sprites/BlacksmithSprite.java | 4 +- .../sprites/BruteSprite.java | 2 +- .../sprites/CausticSlimeSprite.java | 2 +- .../sprites/CharSprite.java | 2 +- .../sprites/CrabSprite.java | 2 +- .../sprites/DM100Sprite.java | 4 +- .../sprites/DM200Sprite.java | 4 +- .../sprites/DM201Sprite.java | 6 +- .../sprites/DM300Sprite.java | 8 +- .../sprites/EarthGuardianSprite.java | 2 +- .../sprites/ElementalSprite.java | 6 +- .../sprites/EyeSprite.java | 2 +- .../sprites/FetidRatSprite.java | 2 +- .../sprites/FistSprite.java | 4 +- .../sprites/GhostSprite.java | 2 +- .../sprites/GhoulSprite.java | 2 +- .../sprites/GnollSprite.java | 2 +- .../sprites/GnollTricksterSprite.java | 2 +- .../sprites/GolemSprite.java | 4 +- .../sprites/GooSprite.java | 2 +- .../sprites/GreatCrabSprite.java | 2 +- .../sprites/GuardSprite.java | 2 +- .../sprites/HeroSprite.java | 3 +- .../sprites/ImpSprite.java | 2 +- .../sprites/ItemSprite.java | 12 +- .../sprites/ItemSpriteSheet.java | 2 +- .../sprites/KingSprite.java | 2 +- .../sprites/LarvaSprite.java | 2 +- .../sprites/MimicSprite.java | 2 +- .../sprites/MonkSprite.java | 2 +- .../sprites/NecromancerSprite.java | 2 +- .../sprites/NewbornElementalSprite.java | 2 +- .../sprites/PiranhaSprite.java | 2 +- .../sprites/PylonSprite.java | 4 +- .../sprites/RatKingSprite.java | 2 +- .../sprites/RatSprite.java | 2 +- .../sprites/RipperSprite.java | 2 +- .../sprites/RotHeartSprite.java | 2 +- .../sprites/RotLasherSprite.java | 2 +- .../sprites/ScorpioSprite.java | 2 +- .../sprites/SeniorSprite.java | 2 +- .../sprites/ShamanSprite.java | 4 +- .../sprites/SheepSprite.java | 2 +- .../sprites/ShieldedSprite.java | 2 +- .../sprites/ShopkeeperSprite.java | 2 +- .../sprites/SkeletonSprite.java | 2 +- .../sprites/SlimeSprite.java | 2 +- .../sprites/SnakeSprite.java | 2 +- .../sprites/SpawnerSprite.java | 2 +- .../sprites/SpinnerSprite.java | 4 +- .../sprites/StatueSprite.java | 2 +- .../sprites/SuccubusSprite.java | 2 +- .../sprites/SwarmSprite.java | 2 +- .../sprites/TenguSprite.java | 2 +- .../sprites/ThiefSprite.java | 2 +- .../sprites/UndeadSprite.java | 2 +- .../sprites/WandmakerSprite.java | 4 +- .../sprites/WardSprite.java | 2 +- .../sprites/WarlockSprite.java | 4 +- .../sprites/WraithSprite.java | 2 +- .../sprites/YogSprite.java | 2 +- .../tiles/GridTileMap.java | 3 +- .../tiles/TerrainFeaturesTilemap.java | 2 +- .../tiles/WallBlockingTilemap.java | 3 +- .../shatteredpixeldungeon/ui/Archs.java | 4 +- .../shatteredpixeldungeon/ui/BadgesList.java | 2 +- .../ui/BossHealthBar.java | 2 +- .../ui/BuffIndicator.java | 2 +- .../shatteredpixeldungeon/ui/ExitButton.java | 2 +- .../shatteredpixeldungeon/ui/IconButton.java | 2 +- .../shatteredpixeldungeon/ui/Icons.java | 2 +- .../shatteredpixeldungeon/ui/ItemSlot.java | 2 +- .../shatteredpixeldungeon/ui/KeyDisplay.java | 2 +- .../ui/LanguageButton.java | 2 +- .../shatteredpixeldungeon/ui/PrefsButton.java | 2 +- .../shatteredpixeldungeon/ui/StatusPane.java | 20 +- .../ui/StyledButton.java | 2 +- .../shatteredpixeldungeon/ui/Toolbar.java | 2 +- .../ui/changelist/v0_2_X_Changes.java | 6 +- .../ui/changelist/v0_3_X_Changes.java | 12 +- .../ui/changelist/v0_6_X_Changes.java | 42 +- .../ui/changelist/v0_7_X_Changes.java | 44 +-- .../ui/changelist/v0_8_X_Changes.java | 13 +- .../shatteredpixeldungeon/windows/WndBag.java | 2 +- .../windows/WndBlacksmith.java | 2 +- .../windows/WndHero.java | 2 +- .../windows/WndInfoBuff.java | 2 +- .../windows/WndRanking.java | 4 +- .../windows/WndSettings.java | 2 +- .../windows/WndStartGame.java | 4 +- .../windows/WndTabbed.java | 2 +- .../droid_sans.ttf} | Bin .../src/main/assets/{ => icons}/icon_128.png | Bin .../src/main/assets/{ => icons}/icon_16.png | Bin .../src/main/assets/{ => icons}/icon_256.png | Bin .../src/main/assets/{ => icons}/icon_32.png | Bin .../src/main/assets/{ => icons}/icon_64.png | Bin .../desktop/DesktopLauncher.java | 3 +- .../desktop/DesktopPlatformSupport.java | 6 +- docs/recommended-changes.md | 2 +- 649 files changed, 847 insertions(+), 773 deletions(-) rename core/src/main/assets/{ => effects}/effects.png (100%) rename core/src/main/assets/{ => effects}/fireball.png (100%) rename core/src/main/assets/{ => effects}/specks.png (100%) rename core/src/main/assets/{ => effects}/spell_icons.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/caves_boss.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/city_boss.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/halls_special.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/prison_exit_new.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/prison_exit_old.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/prison_quests.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/sewer_boss.png (100%) rename core/src/main/assets/{ => environment}/custom_tiles/weak_floor.png (100%) rename core/src/main/assets/{ => environment}/terrain_features.png (100%) rename core/src/main/assets/{ => environment}/tiles_caves.png (100%) rename core/src/main/assets/{ => environment}/tiles_city.png (100%) rename core/src/main/assets/{ => environment}/tiles_halls.png (100%) rename core/src/main/assets/{ => environment}/tiles_prison.png (100%) rename core/src/main/assets/{ => environment}/tiles_sewers.png (100%) rename core/src/main/assets/{ => environment}/visual_grid.png (100%) rename core/src/main/assets/{ => environment}/wall_blocking.png (100%) rename core/src/main/assets/{ => environment}/water0.png (100%) rename core/src/main/assets/{ => environment}/water1.png (100%) rename core/src/main/assets/{ => environment}/water2.png (100%) rename core/src/main/assets/{ => environment}/water3.png (100%) rename core/src/main/assets/{ => environment}/water4.png (100%) rename core/src/main/assets/{ => fonts}/pixel_font.png (100%) rename core/src/main/assets/{ => fonts}/pixel_font.ttf (100%) rename core/src/main/assets/{ => interfaces}/arcs1.png (100%) rename core/src/main/assets/{ => interfaces}/arcs2.png (100%) rename core/src/main/assets/{ => interfaces}/badges.png (100%) rename core/src/main/assets/{ => interfaces}/banners.png (100%) rename core/src/main/assets/{ => interfaces}/boss_hp.png (100%) rename core/src/main/assets/{ => interfaces}/buffs.png (100%) rename core/src/main/assets/{ => interfaces}/chrome.png (100%) rename core/src/main/assets/{ => interfaces}/consumable_icons.png (100%) rename core/src/main/assets/{ => interfaces}/exp_bar.png (100%) rename core/src/main/assets/{ => interfaces}/hp_bar.png (100%) rename core/src/main/assets/{ => interfaces}/icons.png (100%) rename core/src/main/assets/{ => interfaces}/large_buffs.png (100%) rename core/src/main/assets/{ => interfaces}/loading_caves.png (100%) rename core/src/main/assets/{ => interfaces}/loading_city.png (100%) rename core/src/main/assets/{ => interfaces}/loading_halls.png (100%) rename core/src/main/assets/{ => interfaces}/loading_prison.png (100%) rename core/src/main/assets/{ => interfaces}/loading_sewers.png (100%) rename core/src/main/assets/{ => interfaces}/locked_badge.png (100%) rename core/src/main/assets/{ => interfaces}/menu_button.png (100%) rename core/src/main/assets/{ => interfaces}/shadow.png (100%) rename core/src/main/assets/{ => interfaces}/shield_bar.png (100%) rename core/src/main/assets/{ => interfaces}/status_pane.png (100%) rename core/src/main/assets/{ => interfaces}/surface.png (100%) rename core/src/main/assets/{ => interfaces}/toolbar.png (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors.properties (99%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/actors/actors_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/items/items_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/journal/journal_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/levels/levels_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/misc/misc_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/plants/plants_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/scenes/scenes_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/ui/ui_zh.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_ca.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_cs.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_de.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_eo.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_es.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_eu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_fi.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_fr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_hu.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_in.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_it.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_ja.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_ko.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_pl.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_pt.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_ru.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_tr.properties (100%) rename core/src/main/{resources/com/shatteredpixel/shatteredpixeldungeon => assets}/messages/windows/windows_zh.properties (100%) rename core/src/main/assets/{ => music}/game.ogg (100%) rename core/src/main/assets/{ => music}/surface.ogg (100%) rename core/src/main/assets/{ => music}/theme.ogg (100%) rename core/src/main/assets/{ => sounds}/snd_alert.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_badge.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_beacon.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_bee.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_blast.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_bones.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_boss.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_burning.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_challenge.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_charms.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_click.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_cursed.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_death.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_degrade.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_descend.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_dewdrop.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_door_open.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_drink.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_eat.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_evoke.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_falling.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_ghost.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_gold.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_hit.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_item.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_levelup.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_lightning.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_lullaby.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_mastery.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_meld.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_mimic.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_miss.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_plant.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_puff.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_ray.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_read.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_rocks.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_secret.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_shatter.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_step.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_teleport.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_tomb.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_trap.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_unlock.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_water.mp3 (100%) rename core/src/main/assets/{ => sounds}/snd_zap.mp3 (100%) rename core/src/main/assets/{ => sprites}/amulet.png (100%) rename core/src/main/assets/{ => sprites}/avatars.png (100%) rename core/src/main/assets/{ => sprites}/bat.png (100%) rename core/src/main/assets/{ => sprites}/bee.png (100%) rename core/src/main/assets/{ => sprites}/blacksmith.png (100%) rename core/src/main/assets/{ => sprites}/brute.png (100%) rename core/src/main/assets/{ => sprites}/crab.png (100%) rename core/src/main/assets/{ => sprites}/demon.png (100%) rename core/src/main/assets/{ => sprites}/dm100.png (100%) rename core/src/main/assets/{ => sprites}/dm200.png (100%) rename core/src/main/assets/{ => sprites}/dm300.png (100%) rename core/src/main/assets/{ => sprites}/elemental.png (100%) rename core/src/main/assets/{ => sprites}/eye.png (100%) rename core/src/main/assets/{ => sprites}/ghost.png (100%) rename core/src/main/assets/{ => sprites}/ghoul.png (100%) rename core/src/main/assets/{ => sprites}/gnoll.png (100%) rename core/src/main/assets/{ => sprites}/golem.png (100%) rename core/src/main/assets/{ => sprites}/goo.png (100%) rename core/src/main/assets/{ => sprites}/guard.png (100%) rename core/src/main/assets/{ => sprites}/guardian.png (100%) rename core/src/main/assets/{ => sprites}/huntress.png (100%) rename core/src/main/assets/{ => sprites}/items.png (100%) rename core/src/main/assets/{ => sprites}/king.png (100%) rename core/src/main/assets/{ => sprites}/larva.png (100%) rename core/src/main/assets/{ => sprites}/mage.png (100%) rename core/src/main/assets/{ => sprites}/mimic.png (100%) rename core/src/main/assets/{ => sprites}/monk.png (100%) rename core/src/main/assets/{ => sprites}/necromancer.png (100%) rename core/src/main/assets/{ => sprites}/pet.png (100%) rename core/src/main/assets/{ => sprites}/piranha.png (100%) rename core/src/main/assets/{ => sprites}/pylon.png (100%) rename core/src/main/assets/{ => sprites}/rat.png (100%) rename core/src/main/assets/{ => sprites}/ratking.png (100%) rename core/src/main/assets/{ => sprites}/ripper.png (100%) rename core/src/main/assets/{ => sprites}/rogue.png (100%) rename core/src/main/assets/{ => sprites}/rot_heart.png (100%) rename core/src/main/assets/{ => sprites}/rot_lasher.png (100%) rename core/src/main/assets/{ => sprites}/scorpio.png (100%) rename core/src/main/assets/{ => sprites}/shaman.png (100%) rename core/src/main/assets/{ => sprites}/sheep.png (100%) rename core/src/main/assets/{ => sprites}/shopkeeper.png (100%) rename core/src/main/assets/{ => sprites}/skeleton.png (100%) rename core/src/main/assets/{ => sprites}/slime.png (100%) rename core/src/main/assets/{ => sprites}/snake.png (100%) rename core/src/main/assets/{ => sprites}/spawner.png (100%) rename core/src/main/assets/{ => sprites}/spinner.png (100%) rename core/src/main/assets/{ => sprites}/statue.png (100%) rename core/src/main/assets/{ => sprites}/succubus.png (100%) rename core/src/main/assets/{ => sprites}/swarm.png (100%) rename core/src/main/assets/{ => sprites}/tengu.png (100%) rename core/src/main/assets/{ => sprites}/thief.png (100%) rename core/src/main/assets/{ => sprites}/undead.png (100%) rename core/src/main/assets/{ => sprites}/wandmaker.png (100%) rename core/src/main/assets/{ => sprites}/wards.png (100%) rename core/src/main/assets/{ => sprites}/warlock.png (100%) rename core/src/main/assets/{ => sprites}/warrior.png (100%) rename core/src/main/assets/{ => sprites}/wraith.png (100%) rename core/src/main/assets/{ => sprites}/yog.png (100%) rename core/src/main/assets/{ => sprites}/yog_fists.png (100%) rename desktop/src/main/assets/{DroidSansFallback.ttf => fonts/droid_sans.ttf} (100%) rename desktop/src/main/assets/{ => icons}/icon_128.png (100%) rename desktop/src/main/assets/{ => icons}/icon_16.png (100%) rename desktop/src/main/assets/{ => icons}/icon_256.png (100%) rename desktop/src/main/assets/{ => icons}/icon_32.png (100%) rename desktop/src/main/assets/{ => icons}/icon_64.png (100%) diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java index e8f62e5c6..de5ffc69e 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java @@ -54,7 +54,7 @@ public class AndroidLauncher extends Activity { e.getMessage()); text.setTextSize(16); text.setTextColor(0xFFFFFFFF); - text.setTypeface(Typeface.createFromAsset(getAssets(), "pixel_font.ttf")); + text.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/pixel_font.ttf")); text.setGravity(Gravity.CENTER_VERTICAL); text.setPadding(10, 10, 10, 10); setContentView(text); diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java index 1f7f1f243..76778b86d 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java @@ -240,7 +240,7 @@ public class AndroidPlatformSupport extends PlatformSupport { } else if (systemfont && Gdx.files.absolute("/system/fonts/DroidSans.ttf").exists()){ basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSans.ttf")); } else { - basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); + basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel_font.ttf")); } //android 7.0+. all asian fonts are nicely contained in one spot diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java index 12f5ebe77..80c3c859c 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java @@ -120,7 +120,7 @@ public class WndAndroidTextInput extends Window { textInput = new EditText((AndroidApplication)Gdx.app); textInput.setText( initialValue ); if (!SPDSettings.systemFont()){ - textInput.setTypeface( Typeface.createFromAsset(AndroidGame.instance.getAssets(), "pixel_font.ttf") ); + textInput.setTypeface( Typeface.createFromAsset(AndroidGame.instance.getAssets(), "fonts/pixel_font.ttf") ); } textInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)}); textInput.setInputType( InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES ); diff --git a/core/src/main/assets/effects.png b/core/src/main/assets/effects/effects.png similarity index 100% rename from core/src/main/assets/effects.png rename to core/src/main/assets/effects/effects.png diff --git a/core/src/main/assets/fireball.png b/core/src/main/assets/effects/fireball.png similarity index 100% rename from core/src/main/assets/fireball.png rename to core/src/main/assets/effects/fireball.png diff --git a/core/src/main/assets/specks.png b/core/src/main/assets/effects/specks.png similarity index 100% rename from core/src/main/assets/specks.png rename to core/src/main/assets/effects/specks.png diff --git a/core/src/main/assets/spell_icons.png b/core/src/main/assets/effects/spell_icons.png similarity index 100% rename from core/src/main/assets/spell_icons.png rename to core/src/main/assets/effects/spell_icons.png diff --git a/core/src/main/assets/custom_tiles/caves_boss.png b/core/src/main/assets/environment/custom_tiles/caves_boss.png similarity index 100% rename from core/src/main/assets/custom_tiles/caves_boss.png rename to core/src/main/assets/environment/custom_tiles/caves_boss.png diff --git a/core/src/main/assets/custom_tiles/city_boss.png b/core/src/main/assets/environment/custom_tiles/city_boss.png similarity index 100% rename from core/src/main/assets/custom_tiles/city_boss.png rename to core/src/main/assets/environment/custom_tiles/city_boss.png diff --git a/core/src/main/assets/custom_tiles/halls_special.png b/core/src/main/assets/environment/custom_tiles/halls_special.png similarity index 100% rename from core/src/main/assets/custom_tiles/halls_special.png rename to core/src/main/assets/environment/custom_tiles/halls_special.png diff --git a/core/src/main/assets/custom_tiles/prison_exit_new.png b/core/src/main/assets/environment/custom_tiles/prison_exit_new.png similarity index 100% rename from core/src/main/assets/custom_tiles/prison_exit_new.png rename to core/src/main/assets/environment/custom_tiles/prison_exit_new.png diff --git a/core/src/main/assets/custom_tiles/prison_exit_old.png b/core/src/main/assets/environment/custom_tiles/prison_exit_old.png similarity index 100% rename from core/src/main/assets/custom_tiles/prison_exit_old.png rename to core/src/main/assets/environment/custom_tiles/prison_exit_old.png diff --git a/core/src/main/assets/custom_tiles/prison_quests.png b/core/src/main/assets/environment/custom_tiles/prison_quests.png similarity index 100% rename from core/src/main/assets/custom_tiles/prison_quests.png rename to core/src/main/assets/environment/custom_tiles/prison_quests.png diff --git a/core/src/main/assets/custom_tiles/sewer_boss.png b/core/src/main/assets/environment/custom_tiles/sewer_boss.png similarity index 100% rename from core/src/main/assets/custom_tiles/sewer_boss.png rename to core/src/main/assets/environment/custom_tiles/sewer_boss.png diff --git a/core/src/main/assets/custom_tiles/weak_floor.png b/core/src/main/assets/environment/custom_tiles/weak_floor.png similarity index 100% rename from core/src/main/assets/custom_tiles/weak_floor.png rename to core/src/main/assets/environment/custom_tiles/weak_floor.png diff --git a/core/src/main/assets/terrain_features.png b/core/src/main/assets/environment/terrain_features.png similarity index 100% rename from core/src/main/assets/terrain_features.png rename to core/src/main/assets/environment/terrain_features.png diff --git a/core/src/main/assets/tiles_caves.png b/core/src/main/assets/environment/tiles_caves.png similarity index 100% rename from core/src/main/assets/tiles_caves.png rename to core/src/main/assets/environment/tiles_caves.png diff --git a/core/src/main/assets/tiles_city.png b/core/src/main/assets/environment/tiles_city.png similarity index 100% rename from core/src/main/assets/tiles_city.png rename to core/src/main/assets/environment/tiles_city.png diff --git a/core/src/main/assets/tiles_halls.png b/core/src/main/assets/environment/tiles_halls.png similarity index 100% rename from core/src/main/assets/tiles_halls.png rename to core/src/main/assets/environment/tiles_halls.png diff --git a/core/src/main/assets/tiles_prison.png b/core/src/main/assets/environment/tiles_prison.png similarity index 100% rename from core/src/main/assets/tiles_prison.png rename to core/src/main/assets/environment/tiles_prison.png diff --git a/core/src/main/assets/tiles_sewers.png b/core/src/main/assets/environment/tiles_sewers.png similarity index 100% rename from core/src/main/assets/tiles_sewers.png rename to core/src/main/assets/environment/tiles_sewers.png diff --git a/core/src/main/assets/visual_grid.png b/core/src/main/assets/environment/visual_grid.png similarity index 100% rename from core/src/main/assets/visual_grid.png rename to core/src/main/assets/environment/visual_grid.png diff --git a/core/src/main/assets/wall_blocking.png b/core/src/main/assets/environment/wall_blocking.png similarity index 100% rename from core/src/main/assets/wall_blocking.png rename to core/src/main/assets/environment/wall_blocking.png diff --git a/core/src/main/assets/water0.png b/core/src/main/assets/environment/water0.png similarity index 100% rename from core/src/main/assets/water0.png rename to core/src/main/assets/environment/water0.png diff --git a/core/src/main/assets/water1.png b/core/src/main/assets/environment/water1.png similarity index 100% rename from core/src/main/assets/water1.png rename to core/src/main/assets/environment/water1.png diff --git a/core/src/main/assets/water2.png b/core/src/main/assets/environment/water2.png similarity index 100% rename from core/src/main/assets/water2.png rename to core/src/main/assets/environment/water2.png diff --git a/core/src/main/assets/water3.png b/core/src/main/assets/environment/water3.png similarity index 100% rename from core/src/main/assets/water3.png rename to core/src/main/assets/environment/water3.png diff --git a/core/src/main/assets/water4.png b/core/src/main/assets/environment/water4.png similarity index 100% rename from core/src/main/assets/water4.png rename to core/src/main/assets/environment/water4.png diff --git a/core/src/main/assets/pixel_font.png b/core/src/main/assets/fonts/pixel_font.png similarity index 100% rename from core/src/main/assets/pixel_font.png rename to core/src/main/assets/fonts/pixel_font.png diff --git a/core/src/main/assets/pixel_font.ttf b/core/src/main/assets/fonts/pixel_font.ttf similarity index 100% rename from core/src/main/assets/pixel_font.ttf rename to core/src/main/assets/fonts/pixel_font.ttf diff --git a/core/src/main/assets/arcs1.png b/core/src/main/assets/interfaces/arcs1.png similarity index 100% rename from core/src/main/assets/arcs1.png rename to core/src/main/assets/interfaces/arcs1.png diff --git a/core/src/main/assets/arcs2.png b/core/src/main/assets/interfaces/arcs2.png similarity index 100% rename from core/src/main/assets/arcs2.png rename to core/src/main/assets/interfaces/arcs2.png diff --git a/core/src/main/assets/badges.png b/core/src/main/assets/interfaces/badges.png similarity index 100% rename from core/src/main/assets/badges.png rename to core/src/main/assets/interfaces/badges.png diff --git a/core/src/main/assets/banners.png b/core/src/main/assets/interfaces/banners.png similarity index 100% rename from core/src/main/assets/banners.png rename to core/src/main/assets/interfaces/banners.png diff --git a/core/src/main/assets/boss_hp.png b/core/src/main/assets/interfaces/boss_hp.png similarity index 100% rename from core/src/main/assets/boss_hp.png rename to core/src/main/assets/interfaces/boss_hp.png diff --git a/core/src/main/assets/buffs.png b/core/src/main/assets/interfaces/buffs.png similarity index 100% rename from core/src/main/assets/buffs.png rename to core/src/main/assets/interfaces/buffs.png diff --git a/core/src/main/assets/chrome.png b/core/src/main/assets/interfaces/chrome.png similarity index 100% rename from core/src/main/assets/chrome.png rename to core/src/main/assets/interfaces/chrome.png diff --git a/core/src/main/assets/consumable_icons.png b/core/src/main/assets/interfaces/consumable_icons.png similarity index 100% rename from core/src/main/assets/consumable_icons.png rename to core/src/main/assets/interfaces/consumable_icons.png diff --git a/core/src/main/assets/exp_bar.png b/core/src/main/assets/interfaces/exp_bar.png similarity index 100% rename from core/src/main/assets/exp_bar.png rename to core/src/main/assets/interfaces/exp_bar.png diff --git a/core/src/main/assets/hp_bar.png b/core/src/main/assets/interfaces/hp_bar.png similarity index 100% rename from core/src/main/assets/hp_bar.png rename to core/src/main/assets/interfaces/hp_bar.png diff --git a/core/src/main/assets/icons.png b/core/src/main/assets/interfaces/icons.png similarity index 100% rename from core/src/main/assets/icons.png rename to core/src/main/assets/interfaces/icons.png diff --git a/core/src/main/assets/large_buffs.png b/core/src/main/assets/interfaces/large_buffs.png similarity index 100% rename from core/src/main/assets/large_buffs.png rename to core/src/main/assets/interfaces/large_buffs.png diff --git a/core/src/main/assets/loading_caves.png b/core/src/main/assets/interfaces/loading_caves.png similarity index 100% rename from core/src/main/assets/loading_caves.png rename to core/src/main/assets/interfaces/loading_caves.png diff --git a/core/src/main/assets/loading_city.png b/core/src/main/assets/interfaces/loading_city.png similarity index 100% rename from core/src/main/assets/loading_city.png rename to core/src/main/assets/interfaces/loading_city.png diff --git a/core/src/main/assets/loading_halls.png b/core/src/main/assets/interfaces/loading_halls.png similarity index 100% rename from core/src/main/assets/loading_halls.png rename to core/src/main/assets/interfaces/loading_halls.png diff --git a/core/src/main/assets/loading_prison.png b/core/src/main/assets/interfaces/loading_prison.png similarity index 100% rename from core/src/main/assets/loading_prison.png rename to core/src/main/assets/interfaces/loading_prison.png diff --git a/core/src/main/assets/loading_sewers.png b/core/src/main/assets/interfaces/loading_sewers.png similarity index 100% rename from core/src/main/assets/loading_sewers.png rename to core/src/main/assets/interfaces/loading_sewers.png diff --git a/core/src/main/assets/locked_badge.png b/core/src/main/assets/interfaces/locked_badge.png similarity index 100% rename from core/src/main/assets/locked_badge.png rename to core/src/main/assets/interfaces/locked_badge.png diff --git a/core/src/main/assets/menu_button.png b/core/src/main/assets/interfaces/menu_button.png similarity index 100% rename from core/src/main/assets/menu_button.png rename to core/src/main/assets/interfaces/menu_button.png diff --git a/core/src/main/assets/shadow.png b/core/src/main/assets/interfaces/shadow.png similarity index 100% rename from core/src/main/assets/shadow.png rename to core/src/main/assets/interfaces/shadow.png diff --git a/core/src/main/assets/shield_bar.png b/core/src/main/assets/interfaces/shield_bar.png similarity index 100% rename from core/src/main/assets/shield_bar.png rename to core/src/main/assets/interfaces/shield_bar.png diff --git a/core/src/main/assets/status_pane.png b/core/src/main/assets/interfaces/status_pane.png similarity index 100% rename from core/src/main/assets/status_pane.png rename to core/src/main/assets/interfaces/status_pane.png diff --git a/core/src/main/assets/surface.png b/core/src/main/assets/interfaces/surface.png similarity index 100% rename from core/src/main/assets/surface.png rename to core/src/main/assets/interfaces/surface.png diff --git a/core/src/main/assets/toolbar.png b/core/src/main/assets/interfaces/toolbar.png similarity index 100% rename from core/src/main/assets/toolbar.png rename to core/src/main/assets/interfaces/toolbar.png diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties similarity index 99% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties rename to core/src/main/assets/messages/actors/actors.properties index 9441a38d6..9bffdb528 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -770,7 +770,7 @@ actors.mobs.yogfist$burningfist.desc=This fist is formed out of chaotic fiery ma actors.mobs.yogfist$soiledfist.name=soiled fist actors.mobs.yogfist$soiledfist.desc=This fist is formed out of chaotic earthen magic. As it moves it will constantly cause vegetation to sprout around it. It can also shoot concentrated earthen blasts that will ensnare its target in rapidly growing vines and roots!\n\nThe fist derives power from this plant life, and will resist damage based on the amount of tall or furrowed vegetation near it! actors.mobs.yogfist$rottingfist.name=rotting fist -actors.mobs.yogfist$rottingfist.desc=This fist is formed out of living corruption. It is a towering mass of decaying flesh that can spread caustic ooze in melee and toxic gas at range. Even worse, the fist's great mass causes it to bleed instead of taking damage directly.\n\nWater can be used to wash the ooze off, but the fist is also capable of adsorbing water to heal itself! Additionally, damaging the fist while it is bleeding will cause the bleed to refresh, but not stack! +actors.mobs.yogfist$rottingfist.desc=This fist is formed out of living corruption. It is a towering mass of decaying flesh that can spread caustic ooze in melee and toxic gas at range. Even worse, the fist's great mass causes it to bleed instead of taking damage directly.\n\nWater can be used to wash the ooze off, but the fist is also capable of absorbing water to heal itself! Additionally, damaging the fist while it is bleeding will cause the bleed to refresh, but not stack! actors.mobs.yogfist$rustedfist.name=rusted fist actors.mobs.yogfist$rustedfist.desc=This fist is formed out of living metal. It is a towering mass of shifting metal that has powerful melee attacks, and can cripple its targets at range. Because of its tremendous mass, the fist will take any damage dealt to it over time, instead of immediately.\n\nThe fist is inflexible however, and cannot move into tight passageways. Additionally, while it may take damage slowly, the deferred damage will continue to increase if the fist is hit multiple times. actors.mobs.yogfist$brightfist.name=bright fist diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ca.properties b/core/src/main/assets/messages/actors/actors_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ca.properties rename to core/src/main/assets/messages/actors/actors_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_cs.properties b/core/src/main/assets/messages/actors/actors_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_cs.properties rename to core/src/main/assets/messages/actors/actors_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_de.properties b/core/src/main/assets/messages/actors/actors_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_de.properties rename to core/src/main/assets/messages/actors/actors_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_eo.properties b/core/src/main/assets/messages/actors/actors_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_eo.properties rename to core/src/main/assets/messages/actors/actors_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_es.properties b/core/src/main/assets/messages/actors/actors_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_es.properties rename to core/src/main/assets/messages/actors/actors_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_eu.properties b/core/src/main/assets/messages/actors/actors_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_eu.properties rename to core/src/main/assets/messages/actors/actors_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_fi.properties b/core/src/main/assets/messages/actors/actors_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_fi.properties rename to core/src/main/assets/messages/actors/actors_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_fr.properties b/core/src/main/assets/messages/actors/actors_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_fr.properties rename to core/src/main/assets/messages/actors/actors_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_hu.properties b/core/src/main/assets/messages/actors/actors_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_hu.properties rename to core/src/main/assets/messages/actors/actors_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_in.properties b/core/src/main/assets/messages/actors/actors_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_in.properties rename to core/src/main/assets/messages/actors/actors_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_it.properties b/core/src/main/assets/messages/actors/actors_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_it.properties rename to core/src/main/assets/messages/actors/actors_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ja.properties b/core/src/main/assets/messages/actors/actors_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ja.properties rename to core/src/main/assets/messages/actors/actors_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ko.properties b/core/src/main/assets/messages/actors/actors_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ko.properties rename to core/src/main/assets/messages/actors/actors_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_pl.properties b/core/src/main/assets/messages/actors/actors_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_pl.properties rename to core/src/main/assets/messages/actors/actors_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_pt.properties b/core/src/main/assets/messages/actors/actors_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_pt.properties rename to core/src/main/assets/messages/actors/actors_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ru.properties b/core/src/main/assets/messages/actors/actors_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_ru.properties rename to core/src/main/assets/messages/actors/actors_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_tr.properties b/core/src/main/assets/messages/actors/actors_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_tr.properties rename to core/src/main/assets/messages/actors/actors_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_zh.properties b/core/src/main/assets/messages/actors/actors_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors_zh.properties rename to core/src/main/assets/messages/actors/actors_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties rename to core/src/main/assets/messages/items/items.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ca.properties b/core/src/main/assets/messages/items/items_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ca.properties rename to core/src/main/assets/messages/items/items_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_cs.properties b/core/src/main/assets/messages/items/items_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_cs.properties rename to core/src/main/assets/messages/items/items_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_de.properties b/core/src/main/assets/messages/items/items_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_de.properties rename to core/src/main/assets/messages/items/items_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_eo.properties b/core/src/main/assets/messages/items/items_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_eo.properties rename to core/src/main/assets/messages/items/items_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_es.properties b/core/src/main/assets/messages/items/items_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_es.properties rename to core/src/main/assets/messages/items/items_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_eu.properties b/core/src/main/assets/messages/items/items_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_eu.properties rename to core/src/main/assets/messages/items/items_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_fi.properties b/core/src/main/assets/messages/items/items_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_fi.properties rename to core/src/main/assets/messages/items/items_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_fr.properties b/core/src/main/assets/messages/items/items_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_fr.properties rename to core/src/main/assets/messages/items/items_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_hu.properties b/core/src/main/assets/messages/items/items_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_hu.properties rename to core/src/main/assets/messages/items/items_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_in.properties b/core/src/main/assets/messages/items/items_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_in.properties rename to core/src/main/assets/messages/items/items_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_it.properties b/core/src/main/assets/messages/items/items_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_it.properties rename to core/src/main/assets/messages/items/items_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ja.properties b/core/src/main/assets/messages/items/items_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ja.properties rename to core/src/main/assets/messages/items/items_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ko.properties b/core/src/main/assets/messages/items/items_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ko.properties rename to core/src/main/assets/messages/items/items_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_pl.properties b/core/src/main/assets/messages/items/items_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_pl.properties rename to core/src/main/assets/messages/items/items_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_pt.properties b/core/src/main/assets/messages/items/items_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_pt.properties rename to core/src/main/assets/messages/items/items_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ru.properties b/core/src/main/assets/messages/items/items_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_ru.properties rename to core/src/main/assets/messages/items/items_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_tr.properties b/core/src/main/assets/messages/items/items_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_tr.properties rename to core/src/main/assets/messages/items/items_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_zh.properties b/core/src/main/assets/messages/items/items_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items_zh.properties rename to core/src/main/assets/messages/items/items_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal.properties b/core/src/main/assets/messages/journal/journal.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal.properties rename to core/src/main/assets/messages/journal/journal.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ca.properties b/core/src/main/assets/messages/journal/journal_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ca.properties rename to core/src/main/assets/messages/journal/journal_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_cs.properties b/core/src/main/assets/messages/journal/journal_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_cs.properties rename to core/src/main/assets/messages/journal/journal_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_de.properties b/core/src/main/assets/messages/journal/journal_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_de.properties rename to core/src/main/assets/messages/journal/journal_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_eo.properties b/core/src/main/assets/messages/journal/journal_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_eo.properties rename to core/src/main/assets/messages/journal/journal_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_es.properties b/core/src/main/assets/messages/journal/journal_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_es.properties rename to core/src/main/assets/messages/journal/journal_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_eu.properties b/core/src/main/assets/messages/journal/journal_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_eu.properties rename to core/src/main/assets/messages/journal/journal_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_fi.properties b/core/src/main/assets/messages/journal/journal_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_fi.properties rename to core/src/main/assets/messages/journal/journal_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_fr.properties b/core/src/main/assets/messages/journal/journal_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_fr.properties rename to core/src/main/assets/messages/journal/journal_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_hu.properties b/core/src/main/assets/messages/journal/journal_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_hu.properties rename to core/src/main/assets/messages/journal/journal_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_in.properties b/core/src/main/assets/messages/journal/journal_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_in.properties rename to core/src/main/assets/messages/journal/journal_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_it.properties b/core/src/main/assets/messages/journal/journal_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_it.properties rename to core/src/main/assets/messages/journal/journal_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ja.properties b/core/src/main/assets/messages/journal/journal_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ja.properties rename to core/src/main/assets/messages/journal/journal_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ko.properties b/core/src/main/assets/messages/journal/journal_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ko.properties rename to core/src/main/assets/messages/journal/journal_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_pl.properties b/core/src/main/assets/messages/journal/journal_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_pl.properties rename to core/src/main/assets/messages/journal/journal_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_pt.properties b/core/src/main/assets/messages/journal/journal_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_pt.properties rename to core/src/main/assets/messages/journal/journal_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ru.properties b/core/src/main/assets/messages/journal/journal_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_ru.properties rename to core/src/main/assets/messages/journal/journal_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_tr.properties b/core/src/main/assets/messages/journal/journal_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_tr.properties rename to core/src/main/assets/messages/journal/journal_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_zh.properties b/core/src/main/assets/messages/journal/journal_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal_zh.properties rename to core/src/main/assets/messages/journal/journal_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels.properties b/core/src/main/assets/messages/levels/levels.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels.properties rename to core/src/main/assets/messages/levels/levels.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ca.properties b/core/src/main/assets/messages/levels/levels_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ca.properties rename to core/src/main/assets/messages/levels/levels_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_cs.properties b/core/src/main/assets/messages/levels/levels_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_cs.properties rename to core/src/main/assets/messages/levels/levels_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_de.properties b/core/src/main/assets/messages/levels/levels_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_de.properties rename to core/src/main/assets/messages/levels/levels_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_eo.properties b/core/src/main/assets/messages/levels/levels_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_eo.properties rename to core/src/main/assets/messages/levels/levels_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_es.properties b/core/src/main/assets/messages/levels/levels_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_es.properties rename to core/src/main/assets/messages/levels/levels_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_eu.properties b/core/src/main/assets/messages/levels/levels_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_eu.properties rename to core/src/main/assets/messages/levels/levels_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_fi.properties b/core/src/main/assets/messages/levels/levels_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_fi.properties rename to core/src/main/assets/messages/levels/levels_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_fr.properties b/core/src/main/assets/messages/levels/levels_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_fr.properties rename to core/src/main/assets/messages/levels/levels_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_hu.properties b/core/src/main/assets/messages/levels/levels_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_hu.properties rename to core/src/main/assets/messages/levels/levels_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_in.properties b/core/src/main/assets/messages/levels/levels_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_in.properties rename to core/src/main/assets/messages/levels/levels_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_it.properties b/core/src/main/assets/messages/levels/levels_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_it.properties rename to core/src/main/assets/messages/levels/levels_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ja.properties b/core/src/main/assets/messages/levels/levels_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ja.properties rename to core/src/main/assets/messages/levels/levels_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ko.properties b/core/src/main/assets/messages/levels/levels_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ko.properties rename to core/src/main/assets/messages/levels/levels_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_pl.properties b/core/src/main/assets/messages/levels/levels_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_pl.properties rename to core/src/main/assets/messages/levels/levels_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_pt.properties b/core/src/main/assets/messages/levels/levels_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_pt.properties rename to core/src/main/assets/messages/levels/levels_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ru.properties b/core/src/main/assets/messages/levels/levels_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_ru.properties rename to core/src/main/assets/messages/levels/levels_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_tr.properties b/core/src/main/assets/messages/levels/levels_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_tr.properties rename to core/src/main/assets/messages/levels/levels_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_zh.properties b/core/src/main/assets/messages/levels/levels_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels_zh.properties rename to core/src/main/assets/messages/levels/levels_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties b/core/src/main/assets/messages/misc/misc.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties rename to core/src/main/assets/messages/misc/misc.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ca.properties b/core/src/main/assets/messages/misc/misc_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ca.properties rename to core/src/main/assets/messages/misc/misc_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_cs.properties b/core/src/main/assets/messages/misc/misc_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_cs.properties rename to core/src/main/assets/messages/misc/misc_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_de.properties b/core/src/main/assets/messages/misc/misc_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_de.properties rename to core/src/main/assets/messages/misc/misc_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_eo.properties b/core/src/main/assets/messages/misc/misc_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_eo.properties rename to core/src/main/assets/messages/misc/misc_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_es.properties b/core/src/main/assets/messages/misc/misc_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_es.properties rename to core/src/main/assets/messages/misc/misc_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_eu.properties b/core/src/main/assets/messages/misc/misc_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_eu.properties rename to core/src/main/assets/messages/misc/misc_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_fi.properties b/core/src/main/assets/messages/misc/misc_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_fi.properties rename to core/src/main/assets/messages/misc/misc_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_fr.properties b/core/src/main/assets/messages/misc/misc_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_fr.properties rename to core/src/main/assets/messages/misc/misc_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_hu.properties b/core/src/main/assets/messages/misc/misc_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_hu.properties rename to core/src/main/assets/messages/misc/misc_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_in.properties b/core/src/main/assets/messages/misc/misc_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_in.properties rename to core/src/main/assets/messages/misc/misc_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_it.properties b/core/src/main/assets/messages/misc/misc_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_it.properties rename to core/src/main/assets/messages/misc/misc_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ja.properties b/core/src/main/assets/messages/misc/misc_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ja.properties rename to core/src/main/assets/messages/misc/misc_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ko.properties b/core/src/main/assets/messages/misc/misc_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ko.properties rename to core/src/main/assets/messages/misc/misc_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_pl.properties b/core/src/main/assets/messages/misc/misc_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_pl.properties rename to core/src/main/assets/messages/misc/misc_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_pt.properties b/core/src/main/assets/messages/misc/misc_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_pt.properties rename to core/src/main/assets/messages/misc/misc_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ru.properties b/core/src/main/assets/messages/misc/misc_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_ru.properties rename to core/src/main/assets/messages/misc/misc_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_tr.properties b/core/src/main/assets/messages/misc/misc_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_tr.properties rename to core/src/main/assets/messages/misc/misc_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_zh.properties b/core/src/main/assets/messages/misc/misc_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc_zh.properties rename to core/src/main/assets/messages/misc/misc_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants.properties b/core/src/main/assets/messages/plants/plants.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants.properties rename to core/src/main/assets/messages/plants/plants.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ca.properties b/core/src/main/assets/messages/plants/plants_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ca.properties rename to core/src/main/assets/messages/plants/plants_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_cs.properties b/core/src/main/assets/messages/plants/plants_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_cs.properties rename to core/src/main/assets/messages/plants/plants_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_de.properties b/core/src/main/assets/messages/plants/plants_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_de.properties rename to core/src/main/assets/messages/plants/plants_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_eo.properties b/core/src/main/assets/messages/plants/plants_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_eo.properties rename to core/src/main/assets/messages/plants/plants_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_es.properties b/core/src/main/assets/messages/plants/plants_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_es.properties rename to core/src/main/assets/messages/plants/plants_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_eu.properties b/core/src/main/assets/messages/plants/plants_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_eu.properties rename to core/src/main/assets/messages/plants/plants_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_fi.properties b/core/src/main/assets/messages/plants/plants_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_fi.properties rename to core/src/main/assets/messages/plants/plants_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_fr.properties b/core/src/main/assets/messages/plants/plants_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_fr.properties rename to core/src/main/assets/messages/plants/plants_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_hu.properties b/core/src/main/assets/messages/plants/plants_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_hu.properties rename to core/src/main/assets/messages/plants/plants_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_in.properties b/core/src/main/assets/messages/plants/plants_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_in.properties rename to core/src/main/assets/messages/plants/plants_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_it.properties b/core/src/main/assets/messages/plants/plants_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_it.properties rename to core/src/main/assets/messages/plants/plants_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ja.properties b/core/src/main/assets/messages/plants/plants_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ja.properties rename to core/src/main/assets/messages/plants/plants_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ko.properties b/core/src/main/assets/messages/plants/plants_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ko.properties rename to core/src/main/assets/messages/plants/plants_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_pl.properties b/core/src/main/assets/messages/plants/plants_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_pl.properties rename to core/src/main/assets/messages/plants/plants_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_pt.properties b/core/src/main/assets/messages/plants/plants_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_pt.properties rename to core/src/main/assets/messages/plants/plants_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ru.properties b/core/src/main/assets/messages/plants/plants_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_ru.properties rename to core/src/main/assets/messages/plants/plants_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_tr.properties b/core/src/main/assets/messages/plants/plants_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_tr.properties rename to core/src/main/assets/messages/plants/plants_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_zh.properties b/core/src/main/assets/messages/plants/plants_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants_zh.properties rename to core/src/main/assets/messages/plants/plants_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties b/core/src/main/assets/messages/scenes/scenes.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties rename to core/src/main/assets/messages/scenes/scenes.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ca.properties b/core/src/main/assets/messages/scenes/scenes_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ca.properties rename to core/src/main/assets/messages/scenes/scenes_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_cs.properties b/core/src/main/assets/messages/scenes/scenes_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_cs.properties rename to core/src/main/assets/messages/scenes/scenes_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_de.properties b/core/src/main/assets/messages/scenes/scenes_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_de.properties rename to core/src/main/assets/messages/scenes/scenes_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_eo.properties b/core/src/main/assets/messages/scenes/scenes_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_eo.properties rename to core/src/main/assets/messages/scenes/scenes_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_es.properties b/core/src/main/assets/messages/scenes/scenes_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_es.properties rename to core/src/main/assets/messages/scenes/scenes_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_eu.properties b/core/src/main/assets/messages/scenes/scenes_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_eu.properties rename to core/src/main/assets/messages/scenes/scenes_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_fi.properties b/core/src/main/assets/messages/scenes/scenes_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_fi.properties rename to core/src/main/assets/messages/scenes/scenes_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_fr.properties b/core/src/main/assets/messages/scenes/scenes_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_fr.properties rename to core/src/main/assets/messages/scenes/scenes_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_hu.properties b/core/src/main/assets/messages/scenes/scenes_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_hu.properties rename to core/src/main/assets/messages/scenes/scenes_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_in.properties b/core/src/main/assets/messages/scenes/scenes_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_in.properties rename to core/src/main/assets/messages/scenes/scenes_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_it.properties b/core/src/main/assets/messages/scenes/scenes_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_it.properties rename to core/src/main/assets/messages/scenes/scenes_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ja.properties b/core/src/main/assets/messages/scenes/scenes_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ja.properties rename to core/src/main/assets/messages/scenes/scenes_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ko.properties b/core/src/main/assets/messages/scenes/scenes_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ko.properties rename to core/src/main/assets/messages/scenes/scenes_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_pl.properties b/core/src/main/assets/messages/scenes/scenes_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_pl.properties rename to core/src/main/assets/messages/scenes/scenes_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_pt.properties b/core/src/main/assets/messages/scenes/scenes_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_pt.properties rename to core/src/main/assets/messages/scenes/scenes_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ru.properties b/core/src/main/assets/messages/scenes/scenes_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_ru.properties rename to core/src/main/assets/messages/scenes/scenes_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_tr.properties b/core/src/main/assets/messages/scenes/scenes_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_tr.properties rename to core/src/main/assets/messages/scenes/scenes_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_zh.properties b/core/src/main/assets/messages/scenes/scenes_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes_zh.properties rename to core/src/main/assets/messages/scenes/scenes_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui.properties b/core/src/main/assets/messages/ui/ui.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui.properties rename to core/src/main/assets/messages/ui/ui.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ca.properties b/core/src/main/assets/messages/ui/ui_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ca.properties rename to core/src/main/assets/messages/ui/ui_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_cs.properties b/core/src/main/assets/messages/ui/ui_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_cs.properties rename to core/src/main/assets/messages/ui/ui_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_de.properties b/core/src/main/assets/messages/ui/ui_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_de.properties rename to core/src/main/assets/messages/ui/ui_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_eo.properties b/core/src/main/assets/messages/ui/ui_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_eo.properties rename to core/src/main/assets/messages/ui/ui_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_es.properties b/core/src/main/assets/messages/ui/ui_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_es.properties rename to core/src/main/assets/messages/ui/ui_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_eu.properties b/core/src/main/assets/messages/ui/ui_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_eu.properties rename to core/src/main/assets/messages/ui/ui_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_fi.properties b/core/src/main/assets/messages/ui/ui_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_fi.properties rename to core/src/main/assets/messages/ui/ui_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_fr.properties b/core/src/main/assets/messages/ui/ui_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_fr.properties rename to core/src/main/assets/messages/ui/ui_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_hu.properties b/core/src/main/assets/messages/ui/ui_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_hu.properties rename to core/src/main/assets/messages/ui/ui_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_in.properties b/core/src/main/assets/messages/ui/ui_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_in.properties rename to core/src/main/assets/messages/ui/ui_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_it.properties b/core/src/main/assets/messages/ui/ui_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_it.properties rename to core/src/main/assets/messages/ui/ui_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ja.properties b/core/src/main/assets/messages/ui/ui_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ja.properties rename to core/src/main/assets/messages/ui/ui_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ko.properties b/core/src/main/assets/messages/ui/ui_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ko.properties rename to core/src/main/assets/messages/ui/ui_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_pl.properties b/core/src/main/assets/messages/ui/ui_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_pl.properties rename to core/src/main/assets/messages/ui/ui_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_pt.properties b/core/src/main/assets/messages/ui/ui_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_pt.properties rename to core/src/main/assets/messages/ui/ui_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ru.properties b/core/src/main/assets/messages/ui/ui_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_ru.properties rename to core/src/main/assets/messages/ui/ui_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_tr.properties b/core/src/main/assets/messages/ui/ui_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_tr.properties rename to core/src/main/assets/messages/ui/ui_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_zh.properties b/core/src/main/assets/messages/ui/ui_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui_zh.properties rename to core/src/main/assets/messages/ui/ui_zh.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties rename to core/src/main/assets/messages/windows/windows.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ca.properties b/core/src/main/assets/messages/windows/windows_ca.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ca.properties rename to core/src/main/assets/messages/windows/windows_ca.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_cs.properties b/core/src/main/assets/messages/windows/windows_cs.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_cs.properties rename to core/src/main/assets/messages/windows/windows_cs.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_de.properties b/core/src/main/assets/messages/windows/windows_de.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_de.properties rename to core/src/main/assets/messages/windows/windows_de.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_eo.properties b/core/src/main/assets/messages/windows/windows_eo.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_eo.properties rename to core/src/main/assets/messages/windows/windows_eo.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_es.properties b/core/src/main/assets/messages/windows/windows_es.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_es.properties rename to core/src/main/assets/messages/windows/windows_es.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_eu.properties b/core/src/main/assets/messages/windows/windows_eu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_eu.properties rename to core/src/main/assets/messages/windows/windows_eu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_fi.properties b/core/src/main/assets/messages/windows/windows_fi.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_fi.properties rename to core/src/main/assets/messages/windows/windows_fi.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_fr.properties b/core/src/main/assets/messages/windows/windows_fr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_fr.properties rename to core/src/main/assets/messages/windows/windows_fr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_hu.properties b/core/src/main/assets/messages/windows/windows_hu.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_hu.properties rename to core/src/main/assets/messages/windows/windows_hu.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_in.properties b/core/src/main/assets/messages/windows/windows_in.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_in.properties rename to core/src/main/assets/messages/windows/windows_in.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_it.properties b/core/src/main/assets/messages/windows/windows_it.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_it.properties rename to core/src/main/assets/messages/windows/windows_it.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ja.properties b/core/src/main/assets/messages/windows/windows_ja.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ja.properties rename to core/src/main/assets/messages/windows/windows_ja.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ko.properties b/core/src/main/assets/messages/windows/windows_ko.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ko.properties rename to core/src/main/assets/messages/windows/windows_ko.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_pl.properties b/core/src/main/assets/messages/windows/windows_pl.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_pl.properties rename to core/src/main/assets/messages/windows/windows_pl.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_pt.properties b/core/src/main/assets/messages/windows/windows_pt.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_pt.properties rename to core/src/main/assets/messages/windows/windows_pt.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ru.properties b/core/src/main/assets/messages/windows/windows_ru.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_ru.properties rename to core/src/main/assets/messages/windows/windows_ru.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_tr.properties b/core/src/main/assets/messages/windows/windows_tr.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_tr.properties rename to core/src/main/assets/messages/windows/windows_tr.properties diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_zh.properties b/core/src/main/assets/messages/windows/windows_zh.properties similarity index 100% rename from core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows_zh.properties rename to core/src/main/assets/messages/windows/windows_zh.properties diff --git a/core/src/main/assets/game.ogg b/core/src/main/assets/music/game.ogg similarity index 100% rename from core/src/main/assets/game.ogg rename to core/src/main/assets/music/game.ogg diff --git a/core/src/main/assets/surface.ogg b/core/src/main/assets/music/surface.ogg similarity index 100% rename from core/src/main/assets/surface.ogg rename to core/src/main/assets/music/surface.ogg diff --git a/core/src/main/assets/theme.ogg b/core/src/main/assets/music/theme.ogg similarity index 100% rename from core/src/main/assets/theme.ogg rename to core/src/main/assets/music/theme.ogg diff --git a/core/src/main/assets/snd_alert.mp3 b/core/src/main/assets/sounds/snd_alert.mp3 similarity index 100% rename from core/src/main/assets/snd_alert.mp3 rename to core/src/main/assets/sounds/snd_alert.mp3 diff --git a/core/src/main/assets/snd_badge.mp3 b/core/src/main/assets/sounds/snd_badge.mp3 similarity index 100% rename from core/src/main/assets/snd_badge.mp3 rename to core/src/main/assets/sounds/snd_badge.mp3 diff --git a/core/src/main/assets/snd_beacon.mp3 b/core/src/main/assets/sounds/snd_beacon.mp3 similarity index 100% rename from core/src/main/assets/snd_beacon.mp3 rename to core/src/main/assets/sounds/snd_beacon.mp3 diff --git a/core/src/main/assets/snd_bee.mp3 b/core/src/main/assets/sounds/snd_bee.mp3 similarity index 100% rename from core/src/main/assets/snd_bee.mp3 rename to core/src/main/assets/sounds/snd_bee.mp3 diff --git a/core/src/main/assets/snd_blast.mp3 b/core/src/main/assets/sounds/snd_blast.mp3 similarity index 100% rename from core/src/main/assets/snd_blast.mp3 rename to core/src/main/assets/sounds/snd_blast.mp3 diff --git a/core/src/main/assets/snd_bones.mp3 b/core/src/main/assets/sounds/snd_bones.mp3 similarity index 100% rename from core/src/main/assets/snd_bones.mp3 rename to core/src/main/assets/sounds/snd_bones.mp3 diff --git a/core/src/main/assets/snd_boss.mp3 b/core/src/main/assets/sounds/snd_boss.mp3 similarity index 100% rename from core/src/main/assets/snd_boss.mp3 rename to core/src/main/assets/sounds/snd_boss.mp3 diff --git a/core/src/main/assets/snd_burning.mp3 b/core/src/main/assets/sounds/snd_burning.mp3 similarity index 100% rename from core/src/main/assets/snd_burning.mp3 rename to core/src/main/assets/sounds/snd_burning.mp3 diff --git a/core/src/main/assets/snd_challenge.mp3 b/core/src/main/assets/sounds/snd_challenge.mp3 similarity index 100% rename from core/src/main/assets/snd_challenge.mp3 rename to core/src/main/assets/sounds/snd_challenge.mp3 diff --git a/core/src/main/assets/snd_charms.mp3 b/core/src/main/assets/sounds/snd_charms.mp3 similarity index 100% rename from core/src/main/assets/snd_charms.mp3 rename to core/src/main/assets/sounds/snd_charms.mp3 diff --git a/core/src/main/assets/snd_click.mp3 b/core/src/main/assets/sounds/snd_click.mp3 similarity index 100% rename from core/src/main/assets/snd_click.mp3 rename to core/src/main/assets/sounds/snd_click.mp3 diff --git a/core/src/main/assets/snd_cursed.mp3 b/core/src/main/assets/sounds/snd_cursed.mp3 similarity index 100% rename from core/src/main/assets/snd_cursed.mp3 rename to core/src/main/assets/sounds/snd_cursed.mp3 diff --git a/core/src/main/assets/snd_death.mp3 b/core/src/main/assets/sounds/snd_death.mp3 similarity index 100% rename from core/src/main/assets/snd_death.mp3 rename to core/src/main/assets/sounds/snd_death.mp3 diff --git a/core/src/main/assets/snd_degrade.mp3 b/core/src/main/assets/sounds/snd_degrade.mp3 similarity index 100% rename from core/src/main/assets/snd_degrade.mp3 rename to core/src/main/assets/sounds/snd_degrade.mp3 diff --git a/core/src/main/assets/snd_descend.mp3 b/core/src/main/assets/sounds/snd_descend.mp3 similarity index 100% rename from core/src/main/assets/snd_descend.mp3 rename to core/src/main/assets/sounds/snd_descend.mp3 diff --git a/core/src/main/assets/snd_dewdrop.mp3 b/core/src/main/assets/sounds/snd_dewdrop.mp3 similarity index 100% rename from core/src/main/assets/snd_dewdrop.mp3 rename to core/src/main/assets/sounds/snd_dewdrop.mp3 diff --git a/core/src/main/assets/snd_door_open.mp3 b/core/src/main/assets/sounds/snd_door_open.mp3 similarity index 100% rename from core/src/main/assets/snd_door_open.mp3 rename to core/src/main/assets/sounds/snd_door_open.mp3 diff --git a/core/src/main/assets/snd_drink.mp3 b/core/src/main/assets/sounds/snd_drink.mp3 similarity index 100% rename from core/src/main/assets/snd_drink.mp3 rename to core/src/main/assets/sounds/snd_drink.mp3 diff --git a/core/src/main/assets/snd_eat.mp3 b/core/src/main/assets/sounds/snd_eat.mp3 similarity index 100% rename from core/src/main/assets/snd_eat.mp3 rename to core/src/main/assets/sounds/snd_eat.mp3 diff --git a/core/src/main/assets/snd_evoke.mp3 b/core/src/main/assets/sounds/snd_evoke.mp3 similarity index 100% rename from core/src/main/assets/snd_evoke.mp3 rename to core/src/main/assets/sounds/snd_evoke.mp3 diff --git a/core/src/main/assets/snd_falling.mp3 b/core/src/main/assets/sounds/snd_falling.mp3 similarity index 100% rename from core/src/main/assets/snd_falling.mp3 rename to core/src/main/assets/sounds/snd_falling.mp3 diff --git a/core/src/main/assets/snd_ghost.mp3 b/core/src/main/assets/sounds/snd_ghost.mp3 similarity index 100% rename from core/src/main/assets/snd_ghost.mp3 rename to core/src/main/assets/sounds/snd_ghost.mp3 diff --git a/core/src/main/assets/snd_gold.mp3 b/core/src/main/assets/sounds/snd_gold.mp3 similarity index 100% rename from core/src/main/assets/snd_gold.mp3 rename to core/src/main/assets/sounds/snd_gold.mp3 diff --git a/core/src/main/assets/snd_hit.mp3 b/core/src/main/assets/sounds/snd_hit.mp3 similarity index 100% rename from core/src/main/assets/snd_hit.mp3 rename to core/src/main/assets/sounds/snd_hit.mp3 diff --git a/core/src/main/assets/snd_item.mp3 b/core/src/main/assets/sounds/snd_item.mp3 similarity index 100% rename from core/src/main/assets/snd_item.mp3 rename to core/src/main/assets/sounds/snd_item.mp3 diff --git a/core/src/main/assets/snd_levelup.mp3 b/core/src/main/assets/sounds/snd_levelup.mp3 similarity index 100% rename from core/src/main/assets/snd_levelup.mp3 rename to core/src/main/assets/sounds/snd_levelup.mp3 diff --git a/core/src/main/assets/snd_lightning.mp3 b/core/src/main/assets/sounds/snd_lightning.mp3 similarity index 100% rename from core/src/main/assets/snd_lightning.mp3 rename to core/src/main/assets/sounds/snd_lightning.mp3 diff --git a/core/src/main/assets/snd_lullaby.mp3 b/core/src/main/assets/sounds/snd_lullaby.mp3 similarity index 100% rename from core/src/main/assets/snd_lullaby.mp3 rename to core/src/main/assets/sounds/snd_lullaby.mp3 diff --git a/core/src/main/assets/snd_mastery.mp3 b/core/src/main/assets/sounds/snd_mastery.mp3 similarity index 100% rename from core/src/main/assets/snd_mastery.mp3 rename to core/src/main/assets/sounds/snd_mastery.mp3 diff --git a/core/src/main/assets/snd_meld.mp3 b/core/src/main/assets/sounds/snd_meld.mp3 similarity index 100% rename from core/src/main/assets/snd_meld.mp3 rename to core/src/main/assets/sounds/snd_meld.mp3 diff --git a/core/src/main/assets/snd_mimic.mp3 b/core/src/main/assets/sounds/snd_mimic.mp3 similarity index 100% rename from core/src/main/assets/snd_mimic.mp3 rename to core/src/main/assets/sounds/snd_mimic.mp3 diff --git a/core/src/main/assets/snd_miss.mp3 b/core/src/main/assets/sounds/snd_miss.mp3 similarity index 100% rename from core/src/main/assets/snd_miss.mp3 rename to core/src/main/assets/sounds/snd_miss.mp3 diff --git a/core/src/main/assets/snd_plant.mp3 b/core/src/main/assets/sounds/snd_plant.mp3 similarity index 100% rename from core/src/main/assets/snd_plant.mp3 rename to core/src/main/assets/sounds/snd_plant.mp3 diff --git a/core/src/main/assets/snd_puff.mp3 b/core/src/main/assets/sounds/snd_puff.mp3 similarity index 100% rename from core/src/main/assets/snd_puff.mp3 rename to core/src/main/assets/sounds/snd_puff.mp3 diff --git a/core/src/main/assets/snd_ray.mp3 b/core/src/main/assets/sounds/snd_ray.mp3 similarity index 100% rename from core/src/main/assets/snd_ray.mp3 rename to core/src/main/assets/sounds/snd_ray.mp3 diff --git a/core/src/main/assets/snd_read.mp3 b/core/src/main/assets/sounds/snd_read.mp3 similarity index 100% rename from core/src/main/assets/snd_read.mp3 rename to core/src/main/assets/sounds/snd_read.mp3 diff --git a/core/src/main/assets/snd_rocks.mp3 b/core/src/main/assets/sounds/snd_rocks.mp3 similarity index 100% rename from core/src/main/assets/snd_rocks.mp3 rename to core/src/main/assets/sounds/snd_rocks.mp3 diff --git a/core/src/main/assets/snd_secret.mp3 b/core/src/main/assets/sounds/snd_secret.mp3 similarity index 100% rename from core/src/main/assets/snd_secret.mp3 rename to core/src/main/assets/sounds/snd_secret.mp3 diff --git a/core/src/main/assets/snd_shatter.mp3 b/core/src/main/assets/sounds/snd_shatter.mp3 similarity index 100% rename from core/src/main/assets/snd_shatter.mp3 rename to core/src/main/assets/sounds/snd_shatter.mp3 diff --git a/core/src/main/assets/snd_step.mp3 b/core/src/main/assets/sounds/snd_step.mp3 similarity index 100% rename from core/src/main/assets/snd_step.mp3 rename to core/src/main/assets/sounds/snd_step.mp3 diff --git a/core/src/main/assets/snd_teleport.mp3 b/core/src/main/assets/sounds/snd_teleport.mp3 similarity index 100% rename from core/src/main/assets/snd_teleport.mp3 rename to core/src/main/assets/sounds/snd_teleport.mp3 diff --git a/core/src/main/assets/snd_tomb.mp3 b/core/src/main/assets/sounds/snd_tomb.mp3 similarity index 100% rename from core/src/main/assets/snd_tomb.mp3 rename to core/src/main/assets/sounds/snd_tomb.mp3 diff --git a/core/src/main/assets/snd_trap.mp3 b/core/src/main/assets/sounds/snd_trap.mp3 similarity index 100% rename from core/src/main/assets/snd_trap.mp3 rename to core/src/main/assets/sounds/snd_trap.mp3 diff --git a/core/src/main/assets/snd_unlock.mp3 b/core/src/main/assets/sounds/snd_unlock.mp3 similarity index 100% rename from core/src/main/assets/snd_unlock.mp3 rename to core/src/main/assets/sounds/snd_unlock.mp3 diff --git a/core/src/main/assets/snd_water.mp3 b/core/src/main/assets/sounds/snd_water.mp3 similarity index 100% rename from core/src/main/assets/snd_water.mp3 rename to core/src/main/assets/sounds/snd_water.mp3 diff --git a/core/src/main/assets/snd_zap.mp3 b/core/src/main/assets/sounds/snd_zap.mp3 similarity index 100% rename from core/src/main/assets/snd_zap.mp3 rename to core/src/main/assets/sounds/snd_zap.mp3 diff --git a/core/src/main/assets/amulet.png b/core/src/main/assets/sprites/amulet.png similarity index 100% rename from core/src/main/assets/amulet.png rename to core/src/main/assets/sprites/amulet.png diff --git a/core/src/main/assets/avatars.png b/core/src/main/assets/sprites/avatars.png similarity index 100% rename from core/src/main/assets/avatars.png rename to core/src/main/assets/sprites/avatars.png diff --git a/core/src/main/assets/bat.png b/core/src/main/assets/sprites/bat.png similarity index 100% rename from core/src/main/assets/bat.png rename to core/src/main/assets/sprites/bat.png diff --git a/core/src/main/assets/bee.png b/core/src/main/assets/sprites/bee.png similarity index 100% rename from core/src/main/assets/bee.png rename to core/src/main/assets/sprites/bee.png diff --git a/core/src/main/assets/blacksmith.png b/core/src/main/assets/sprites/blacksmith.png similarity index 100% rename from core/src/main/assets/blacksmith.png rename to core/src/main/assets/sprites/blacksmith.png diff --git a/core/src/main/assets/brute.png b/core/src/main/assets/sprites/brute.png similarity index 100% rename from core/src/main/assets/brute.png rename to core/src/main/assets/sprites/brute.png diff --git a/core/src/main/assets/crab.png b/core/src/main/assets/sprites/crab.png similarity index 100% rename from core/src/main/assets/crab.png rename to core/src/main/assets/sprites/crab.png diff --git a/core/src/main/assets/demon.png b/core/src/main/assets/sprites/demon.png similarity index 100% rename from core/src/main/assets/demon.png rename to core/src/main/assets/sprites/demon.png diff --git a/core/src/main/assets/dm100.png b/core/src/main/assets/sprites/dm100.png similarity index 100% rename from core/src/main/assets/dm100.png rename to core/src/main/assets/sprites/dm100.png diff --git a/core/src/main/assets/dm200.png b/core/src/main/assets/sprites/dm200.png similarity index 100% rename from core/src/main/assets/dm200.png rename to core/src/main/assets/sprites/dm200.png diff --git a/core/src/main/assets/dm300.png b/core/src/main/assets/sprites/dm300.png similarity index 100% rename from core/src/main/assets/dm300.png rename to core/src/main/assets/sprites/dm300.png diff --git a/core/src/main/assets/elemental.png b/core/src/main/assets/sprites/elemental.png similarity index 100% rename from core/src/main/assets/elemental.png rename to core/src/main/assets/sprites/elemental.png diff --git a/core/src/main/assets/eye.png b/core/src/main/assets/sprites/eye.png similarity index 100% rename from core/src/main/assets/eye.png rename to core/src/main/assets/sprites/eye.png diff --git a/core/src/main/assets/ghost.png b/core/src/main/assets/sprites/ghost.png similarity index 100% rename from core/src/main/assets/ghost.png rename to core/src/main/assets/sprites/ghost.png diff --git a/core/src/main/assets/ghoul.png b/core/src/main/assets/sprites/ghoul.png similarity index 100% rename from core/src/main/assets/ghoul.png rename to core/src/main/assets/sprites/ghoul.png diff --git a/core/src/main/assets/gnoll.png b/core/src/main/assets/sprites/gnoll.png similarity index 100% rename from core/src/main/assets/gnoll.png rename to core/src/main/assets/sprites/gnoll.png diff --git a/core/src/main/assets/golem.png b/core/src/main/assets/sprites/golem.png similarity index 100% rename from core/src/main/assets/golem.png rename to core/src/main/assets/sprites/golem.png diff --git a/core/src/main/assets/goo.png b/core/src/main/assets/sprites/goo.png similarity index 100% rename from core/src/main/assets/goo.png rename to core/src/main/assets/sprites/goo.png diff --git a/core/src/main/assets/guard.png b/core/src/main/assets/sprites/guard.png similarity index 100% rename from core/src/main/assets/guard.png rename to core/src/main/assets/sprites/guard.png diff --git a/core/src/main/assets/guardian.png b/core/src/main/assets/sprites/guardian.png similarity index 100% rename from core/src/main/assets/guardian.png rename to core/src/main/assets/sprites/guardian.png diff --git a/core/src/main/assets/huntress.png b/core/src/main/assets/sprites/huntress.png similarity index 100% rename from core/src/main/assets/huntress.png rename to core/src/main/assets/sprites/huntress.png diff --git a/core/src/main/assets/items.png b/core/src/main/assets/sprites/items.png similarity index 100% rename from core/src/main/assets/items.png rename to core/src/main/assets/sprites/items.png diff --git a/core/src/main/assets/king.png b/core/src/main/assets/sprites/king.png similarity index 100% rename from core/src/main/assets/king.png rename to core/src/main/assets/sprites/king.png diff --git a/core/src/main/assets/larva.png b/core/src/main/assets/sprites/larva.png similarity index 100% rename from core/src/main/assets/larva.png rename to core/src/main/assets/sprites/larva.png diff --git a/core/src/main/assets/mage.png b/core/src/main/assets/sprites/mage.png similarity index 100% rename from core/src/main/assets/mage.png rename to core/src/main/assets/sprites/mage.png diff --git a/core/src/main/assets/mimic.png b/core/src/main/assets/sprites/mimic.png similarity index 100% rename from core/src/main/assets/mimic.png rename to core/src/main/assets/sprites/mimic.png diff --git a/core/src/main/assets/monk.png b/core/src/main/assets/sprites/monk.png similarity index 100% rename from core/src/main/assets/monk.png rename to core/src/main/assets/sprites/monk.png diff --git a/core/src/main/assets/necromancer.png b/core/src/main/assets/sprites/necromancer.png similarity index 100% rename from core/src/main/assets/necromancer.png rename to core/src/main/assets/sprites/necromancer.png diff --git a/core/src/main/assets/pet.png b/core/src/main/assets/sprites/pet.png similarity index 100% rename from core/src/main/assets/pet.png rename to core/src/main/assets/sprites/pet.png diff --git a/core/src/main/assets/piranha.png b/core/src/main/assets/sprites/piranha.png similarity index 100% rename from core/src/main/assets/piranha.png rename to core/src/main/assets/sprites/piranha.png diff --git a/core/src/main/assets/pylon.png b/core/src/main/assets/sprites/pylon.png similarity index 100% rename from core/src/main/assets/pylon.png rename to core/src/main/assets/sprites/pylon.png diff --git a/core/src/main/assets/rat.png b/core/src/main/assets/sprites/rat.png similarity index 100% rename from core/src/main/assets/rat.png rename to core/src/main/assets/sprites/rat.png diff --git a/core/src/main/assets/ratking.png b/core/src/main/assets/sprites/ratking.png similarity index 100% rename from core/src/main/assets/ratking.png rename to core/src/main/assets/sprites/ratking.png diff --git a/core/src/main/assets/ripper.png b/core/src/main/assets/sprites/ripper.png similarity index 100% rename from core/src/main/assets/ripper.png rename to core/src/main/assets/sprites/ripper.png diff --git a/core/src/main/assets/rogue.png b/core/src/main/assets/sprites/rogue.png similarity index 100% rename from core/src/main/assets/rogue.png rename to core/src/main/assets/sprites/rogue.png diff --git a/core/src/main/assets/rot_heart.png b/core/src/main/assets/sprites/rot_heart.png similarity index 100% rename from core/src/main/assets/rot_heart.png rename to core/src/main/assets/sprites/rot_heart.png diff --git a/core/src/main/assets/rot_lasher.png b/core/src/main/assets/sprites/rot_lasher.png similarity index 100% rename from core/src/main/assets/rot_lasher.png rename to core/src/main/assets/sprites/rot_lasher.png diff --git a/core/src/main/assets/scorpio.png b/core/src/main/assets/sprites/scorpio.png similarity index 100% rename from core/src/main/assets/scorpio.png rename to core/src/main/assets/sprites/scorpio.png diff --git a/core/src/main/assets/shaman.png b/core/src/main/assets/sprites/shaman.png similarity index 100% rename from core/src/main/assets/shaman.png rename to core/src/main/assets/sprites/shaman.png diff --git a/core/src/main/assets/sheep.png b/core/src/main/assets/sprites/sheep.png similarity index 100% rename from core/src/main/assets/sheep.png rename to core/src/main/assets/sprites/sheep.png diff --git a/core/src/main/assets/shopkeeper.png b/core/src/main/assets/sprites/shopkeeper.png similarity index 100% rename from core/src/main/assets/shopkeeper.png rename to core/src/main/assets/sprites/shopkeeper.png diff --git a/core/src/main/assets/skeleton.png b/core/src/main/assets/sprites/skeleton.png similarity index 100% rename from core/src/main/assets/skeleton.png rename to core/src/main/assets/sprites/skeleton.png diff --git a/core/src/main/assets/slime.png b/core/src/main/assets/sprites/slime.png similarity index 100% rename from core/src/main/assets/slime.png rename to core/src/main/assets/sprites/slime.png diff --git a/core/src/main/assets/snake.png b/core/src/main/assets/sprites/snake.png similarity index 100% rename from core/src/main/assets/snake.png rename to core/src/main/assets/sprites/snake.png diff --git a/core/src/main/assets/spawner.png b/core/src/main/assets/sprites/spawner.png similarity index 100% rename from core/src/main/assets/spawner.png rename to core/src/main/assets/sprites/spawner.png diff --git a/core/src/main/assets/spinner.png b/core/src/main/assets/sprites/spinner.png similarity index 100% rename from core/src/main/assets/spinner.png rename to core/src/main/assets/sprites/spinner.png diff --git a/core/src/main/assets/statue.png b/core/src/main/assets/sprites/statue.png similarity index 100% rename from core/src/main/assets/statue.png rename to core/src/main/assets/sprites/statue.png diff --git a/core/src/main/assets/succubus.png b/core/src/main/assets/sprites/succubus.png similarity index 100% rename from core/src/main/assets/succubus.png rename to core/src/main/assets/sprites/succubus.png diff --git a/core/src/main/assets/swarm.png b/core/src/main/assets/sprites/swarm.png similarity index 100% rename from core/src/main/assets/swarm.png rename to core/src/main/assets/sprites/swarm.png diff --git a/core/src/main/assets/tengu.png b/core/src/main/assets/sprites/tengu.png similarity index 100% rename from core/src/main/assets/tengu.png rename to core/src/main/assets/sprites/tengu.png diff --git a/core/src/main/assets/thief.png b/core/src/main/assets/sprites/thief.png similarity index 100% rename from core/src/main/assets/thief.png rename to core/src/main/assets/sprites/thief.png diff --git a/core/src/main/assets/undead.png b/core/src/main/assets/sprites/undead.png similarity index 100% rename from core/src/main/assets/undead.png rename to core/src/main/assets/sprites/undead.png diff --git a/core/src/main/assets/wandmaker.png b/core/src/main/assets/sprites/wandmaker.png similarity index 100% rename from core/src/main/assets/wandmaker.png rename to core/src/main/assets/sprites/wandmaker.png diff --git a/core/src/main/assets/wards.png b/core/src/main/assets/sprites/wards.png similarity index 100% rename from core/src/main/assets/wards.png rename to core/src/main/assets/sprites/wards.png diff --git a/core/src/main/assets/warlock.png b/core/src/main/assets/sprites/warlock.png similarity index 100% rename from core/src/main/assets/warlock.png rename to core/src/main/assets/sprites/warlock.png diff --git a/core/src/main/assets/warrior.png b/core/src/main/assets/sprites/warrior.png similarity index 100% rename from core/src/main/assets/warrior.png rename to core/src/main/assets/sprites/warrior.png diff --git a/core/src/main/assets/wraith.png b/core/src/main/assets/sprites/wraith.png similarity index 100% rename from core/src/main/assets/wraith.png rename to core/src/main/assets/sprites/wraith.png diff --git a/core/src/main/assets/yog.png b/core/src/main/assets/sprites/yog.png similarity index 100% rename from core/src/main/assets/yog.png rename to core/src/main/assets/sprites/yog.png diff --git a/core/src/main/assets/yog_fists.png b/core/src/main/assets/sprites/yog_fists.png similarity index 100% rename from core/src/main/assets/yog_fists.png rename to core/src/main/assets/sprites/yog_fists.png diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index 82e35edfe..ec4be8f9e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -23,179 +23,209 @@ package com.shatteredpixel.shatteredpixeldungeon; public class Assets { - public static final String ARCS_BG = "arcs1.png"; - public static final String ARCS_FG = "arcs2.png"; - public static final String DASHBOARD = "dashboard.png"; - - public static final String BANNERS = "banners.png"; - public static final String BADGES = "badges.png"; - public static final String LOCKED = "locked_badge.png"; - public static final String AMULET = "amulet.png"; - - public static final String CHROME = "chrome.png"; - public static final String ICONS = "icons.png"; - public static final String STATUS = "status_pane.png"; - public static final String MENU = "menu_button.png"; - public static final String HP_BAR = "hp_bar.png"; - public static final String SHLD_BAR = "shield_bar.png"; - public static final String XP_BAR = "exp_bar.png"; - public static final String TOOLBAR = "toolbar.png"; - public static final String SHADOW = "shadow.png"; - public static final String BOSSHP = "boss_hp.png"; + 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 WARRIOR = "warrior.png"; - public static final String MAGE = "mage.png"; - public static final String ROGUE = "rogue.png"; - public static final String HUNTRESS = "huntress.png"; - public static final String AVATARS = "avatars.png"; - public static final String PET = "pet.png"; - - public static final String SURFACE = "surface.png"; - - public static final String FIREBALL = "fireball.png"; - public static final String SPECKS = "specks.png"; - public static final String EFFECTS = "effects.png"; - - public static final String RAT = "rat.png"; - public static final String GNOLL = "gnoll.png"; - public static final String CRAB = "crab.png"; - public static final String GOO = "goo.png"; - public static final String SWARM = "swarm.png"; - public static final String SKELETON = "skeleton.png"; - public static final String SHAMAN = "shaman.png"; - public static final String THIEF = "thief.png"; - public static final String TENGU = "tengu.png"; - public static final String SHEEP = "sheep.png"; - public static final String KEEPER = "shopkeeper.png"; - public static final String BAT = "bat.png"; - public static final String BRUTE = "brute.png"; - public static final String SPINNER = "spinner.png"; - public static final String DM300 = "dm300.png"; - public static final String WRAITH = "wraith.png"; - public static final String ELEMENTAL= "elemental.png"; - public static final String MONK = "monk.png"; - public static final String WARLOCK = "warlock.png"; - public static final String GOLEM = "golem.png"; - public static final String UNDEAD = "undead.png"; - public static final String KING = "king.png"; - public static final String STATUE = "statue.png"; - public static final String PIRANHA = "piranha.png"; - public static final String EYE = "eye.png"; - public static final String SUCCUBUS = "succubus.png"; - public static final String SCORPIO = "scorpio.png"; - public static final String FISTS = "yog_fists.png"; - public static final String YOG = "yog.png"; - public static final String LARVA = "larva.png"; - public static final String GHOST = "ghost.png"; - public static final String MAKER = "wandmaker.png"; - public static final String TROLL = "blacksmith.png"; - public static final String IMP = "demon.png"; - public static final String RATKING = "ratking.png"; - public static final String BEE = "bee.png"; - public static final String MIMIC = "mimic.png"; - public static final String ROT_LASH = "rot_lasher.png"; - public static final String ROT_HEART= "rot_heart.png"; - public static final String GUARD = "guard.png"; - public static final String WARDS = "wards.png"; - public static final String GUARDIAN = "guardian.png"; - public static final String SLIME = "slime.png"; - public static final String SNAKE = "snake.png"; - public static final String NECRO = "necromancer.png"; - public static final String GHOUL = "ghoul.png"; - public static final String RIPPER = "ripper.png"; - public static final String SPAWNER = "spawner.png"; - public static final String DM100 = "dm100.png"; - public static final String PYLON = "pylon.png"; - public static final String DM200 = "dm200.png"; + public static class Environment { + public static final String TERRAIN_FEATURES = "environment/terrain_features.png"; - public static final String ITEMS = "items.png"; - public static final String TERRAIN_FEATURES = "terrain_features.png"; - - public static final String TILES_SEWERS = "tiles_sewers.png"; - public static final String TILES_PRISON = "tiles_prison.png"; - public static final String TILES_CAVES = "tiles_caves.png"; - public static final String TILES_CITY = "tiles_city.png"; - public static final String TILES_HALLS = "tiles_halls.png"; - - public static final String WATER_SEWERS = "water0.png"; - public static final String WATER_PRISON = "water1.png"; - public static final String WATER_CAVES = "water2.png"; - public static final String WATER_CITY = "water3.png"; - public static final String WATER_HALLS = "water4.png"; - - public static final String LOADING_SEWERS = "loading_sewers.png"; - public static final String LOADING_PRISON = "loading_prison.png"; - public static final String LOADING_CAVES = "loading_caves.png"; - public static final String LOADING_CITY = "loading_city.png"; - public static final String LOADING_HALLS = "loading_halls.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 WEAK_FLOOR = "custom_tiles/weak_floor.png"; - public static final String SEWER_BOSS = "custom_tiles/sewer_boss.png"; - public static final String PRISON_QUEST = "custom_tiles/prison_quests.png"; - public static final String PRISON_EXIT_OLD = "custom_tiles/prison_exit_old.png"; - public static final String PRISON_EXIT_NEW = "custom_tiles/prison_exit_new.png"; - public static final String CAVES_BOSS = "custom_tiles/caves_boss.png"; - public static final String CITY_BOSS = "custom_tiles/city_boss.png"; - public static final String HALLS_SP = "custom_tiles/halls_special.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 WEAK_FLOOR = "environment/custom_tiles/weak_floor.png"; + public static final String SEWER_BOSS = "environment/custom_tiles/sewer_boss.png"; + public static final String PRISON_QUEST = "environment/custom_tiles/prison_quests.png"; + public static final String PRISON_EXIT_OLD = "environment/custom_tiles/prison_exit_old.png"; + public static final String PRISON_EXIT_NEW = "environment/custom_tiles/prison_exit_new.png"; + public static final String CAVES_BOSS = "environment/custom_tiles/caves_boss.png"; + public static final String CITY_BOSS = "environment/custom_tiles/city_boss.png"; + public static final String HALLS_SP = "environment/custom_tiles/halls_special.png"; + } - public static final String BUFFS_SMALL = "buffs.png"; - public static final String BUFFS_LARGE = "large_buffs.png"; - public static final String SPELL_ICONS = "spell_icons.png"; - public static final String CONS_ICONS = "consumable_icons.png"; - - public static final String PIXELFONT = "pixel_font.png"; - public static final String FONT1X = "font1x.png"; - public static final String FONT2X = "font2x.png"; - - public static final String THEME = "theme.ogg"; - public static final String TUNE = "game.ogg"; - public static final String HAPPY = "surface.ogg"; - - public static final String SND_CLICK = "snd_click.mp3"; - public static final String SND_BADGE = "snd_badge.mp3"; - public static final String SND_GOLD = "snd_gold.mp3"; - - public static final String SND_OPEN = "snd_door_open.mp3"; - public static final String SND_UNLOCK = "snd_unlock.mp3"; - public static final String SND_ITEM = "snd_item.mp3"; - public static final String SND_DEWDROP = "snd_dewdrop.mp3"; - public static final String SND_HIT = "snd_hit.mp3"; - public static final String SND_MISS = "snd_miss.mp3"; - public static final String SND_STEP = "snd_step.mp3"; - public static final String SND_WATER = "snd_water.mp3"; - public static final String SND_DESCEND = "snd_descend.mp3"; - public static final String SND_EAT = "snd_eat.mp3"; - public static final String SND_READ = "snd_read.mp3"; - public static final String SND_LULLABY = "snd_lullaby.mp3"; - public static final String SND_DRINK = "snd_drink.mp3"; - public static final String SND_SHATTER = "snd_shatter.mp3"; - public static final String SND_ZAP = "snd_zap.mp3"; - public static final String SND_LIGHTNING= "snd_lightning.mp3"; - public static final String SND_LEVELUP = "snd_levelup.mp3"; - public static final String SND_DEATH = "snd_death.mp3"; - public static final String SND_CHALLENGE= "snd_challenge.mp3"; - public static final String SND_CURSED = "snd_cursed.mp3"; - public static final String SND_TRAP = "snd_trap.mp3"; - public static final String SND_EVOKE = "snd_evoke.mp3"; - public static final String SND_TOMB = "snd_tomb.mp3"; - public static final String SND_ALERT = "snd_alert.mp3"; - public static final String SND_MELD = "snd_meld.mp3"; - public static final String SND_BOSS = "snd_boss.mp3"; - public static final String SND_BLAST = "snd_blast.mp3"; - public static final String SND_PLANT = "snd_plant.mp3"; - public static final String SND_RAY = "snd_ray.mp3"; - public static final String SND_BEACON = "snd_beacon.mp3"; - public static final String SND_TELEPORT = "snd_teleport.mp3"; - public static final String SND_CHARMS = "snd_charms.mp3"; - public static final String SND_MASTERY = "snd_mastery.mp3"; - public static final String SND_PUFF = "snd_puff.mp3"; - public static final String SND_ROCKS = "snd_rocks.mp3"; - public static final String SND_BURNING = "snd_burning.mp3"; - public static final String SND_FALLING = "snd_falling.mp3"; - public static final String SND_GHOST = "snd_ghost.mp3"; - public static final String SND_SECRET = "snd_secret.mp3"; - public static final String SND_BONES = "snd_bones.mp3"; - public static final String SND_BEE = "snd_bee.mp3"; - public static final String SND_DEGRADE = "snd_degrade.mp3"; - public static final String SND_MIMIC = "snd_mimic.mp3"; + //TODO include other font assets here? Some are platform specific though... + public static class Fonts { + public static final String PIXELFONT= "fonts/pixel_font.png"; + } + + public static class Interfaces { + 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 AMULET = "interfaces/amulet.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_button.png"; + public static final String HP_BAR = "interfaces/hp_bar.png"; + public static final String SHLD_BAR = "interfaces/shield_bar.png"; + public static final String XP_BAR = "interfaces/exp_bar.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 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 CONS_ICONS = "interfaces/consumable_icons.png"; + } + + //these points to resource bundles, not raw asset files + public static class Messages { + public static final String ACTORS = "messages/actors/actors"; + public static final String ITEMS = "messages/items/items"; + public static final String JOURNAL = "messages/journal/journal"; + public static final String LEVELS = "messages/levels/levels"; + public static final String MISC = "messages/misc/misc"; + public static final String PLANTS = "messages/plants/plants"; + public static final String SCENES = "messages/scenes/scenes"; + public static final String UI = "messages/ui/ui"; + public static final String WINDOWS = "messages/windows/windows"; + } + + public static class Music { + public static final String GAME = "music/game.ogg"; + public static final String SURFACE = "music/surface.ogg"; + public static final String THEME = "music/theme.ogg"; + } + + public static class Sounds { + public static final String CLICK = "sounds/snd_click.mp3"; + public static final String BADGE = "sounds/snd_badge.mp3"; + public static final String GOLD = "sounds/snd_gold.mp3"; + + public static final String OPEN = "sounds/snd_door_open.mp3"; + public static final String UNLOCK = "sounds/snd_unlock.mp3"; + public static final String ITEM = "sounds/snd_item.mp3"; + public static final String DEWDROP = "sounds/snd_dewdrop.mp3"; + public static final String HIT = "sounds/snd_hit.mp3"; + public static final String MISS = "sounds/snd_miss.mp3"; + public static final String STEP = "sounds/snd_step.mp3"; + public static final String WATER = "sounds/snd_water.mp3"; + public static final String DESCEND = "sounds/snd_descend.mp3"; + public static final String EAT = "sounds/snd_eat.mp3"; + public static final String READ = "sounds/snd_read.mp3"; + public static final String LULLABY = "sounds/snd_lullaby.mp3"; + public static final String DRINK = "sounds/snd_drink.mp3"; + public static final String SHATTER = "sounds/snd_shatter.mp3"; + public static final String ZAP = "sounds/snd_zap.mp3"; + public static final String LIGHTNING= "sounds/snd_lightning.mp3"; + public static final String LEVELUP = "sounds/snd_levelup.mp3"; + public static final String DEATH = "sounds/snd_death.mp3"; + public static final String CHALLENGE= "sounds/snd_challenge.mp3"; + public static final String CURSED = "sounds/snd_cursed.mp3"; + public static final String TRAP = "sounds/snd_trap.mp3"; + public static final String EVOKE = "sounds/snd_evoke.mp3"; + public static final String TOMB = "sounds/snd_tomb.mp3"; + public static final String ALERT = "sounds/snd_alert.mp3"; + public static final String MELD = "sounds/snd_meld.mp3"; + public static final String BOSS = "sounds/snd_boss.mp3"; + public static final String BLAST = "sounds/snd_blast.mp3"; + public static final String PLANT = "sounds/snd_plant.mp3"; + public static final String RAY = "sounds/snd_ray.mp3"; + public static final String BEACON = "sounds/snd_beacon.mp3"; + public static final String TELEPORT = "sounds/snd_teleport.mp3"; + public static final String CHARMS = "sounds/snd_charms.mp3"; + public static final String MASTERY = "sounds/snd_mastery.mp3"; + public static final String PUFF = "sounds/snd_puff.mp3"; + public static final String ROCKS = "sounds/snd_rocks.mp3"; + public static final String BURNING = "sounds/snd_burning.mp3"; + public static final String FALLING = "sounds/snd_falling.mp3"; + public static final String GHOST = "sounds/snd_ghost.mp3"; + public static final String SECRET = "sounds/snd_secret.mp3"; + public static final String BONES = "sounds/snd_bones.mp3"; + public static final String BEE = "sounds/snd_bee.mp3"; + public static final String DEGRADE = "sounds/snd_degrade.mp3"; + public static final String MIMIC = "sounds/snd_mimic.mp3"; + } + + public static class Sprites { + + public static final String ITEMS = "sprites/items.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 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 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"; + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java index 869b6708d..943723ff4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java @@ -41,7 +41,7 @@ public class Chrome { } public static NinePatch get( Type type ) { - String Asset = Assets.CHROME; + String Asset = Assets.Interfaces.CHROME; switch (type) { case WINDOW: return new NinePatch( Asset, 0, 0, 20, 20, 6 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index a039ce0d0..1cf997c88 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -154,54 +154,54 @@ public class ShatteredPixelDungeon extends Game { Sample.INSTANCE.volume( SPDSettings.SFXVol()/10f ); Sample.INSTANCE.load( - Assets.SND_CLICK, - Assets.SND_BADGE, - Assets.SND_GOLD, + Assets.Sounds.CLICK, + Assets.Sounds.BADGE, + Assets.Sounds.GOLD, - Assets.SND_STEP, - Assets.SND_WATER, - Assets.SND_OPEN, - Assets.SND_UNLOCK, - Assets.SND_ITEM, - Assets.SND_DEWDROP, - Assets.SND_HIT, - Assets.SND_MISS, + Assets.Sounds.STEP, + Assets.Sounds.WATER, + Assets.Sounds.OPEN, + Assets.Sounds.UNLOCK, + Assets.Sounds.ITEM, + Assets.Sounds.DEWDROP, + Assets.Sounds.HIT, + Assets.Sounds.MISS, - Assets.SND_DESCEND, - Assets.SND_EAT, - Assets.SND_READ, - Assets.SND_LULLABY, - Assets.SND_DRINK, - Assets.SND_SHATTER, - Assets.SND_ZAP, - Assets.SND_LIGHTNING, - Assets.SND_LEVELUP, - Assets.SND_DEATH, - Assets.SND_CHALLENGE, - Assets.SND_CURSED, - Assets.SND_EVOKE, - Assets.SND_TRAP, - Assets.SND_TOMB, - Assets.SND_ALERT, - Assets.SND_MELD, - Assets.SND_BOSS, - Assets.SND_BLAST, - Assets.SND_PLANT, - Assets.SND_RAY, - Assets.SND_BEACON, - Assets.SND_TELEPORT, - Assets.SND_CHARMS, - Assets.SND_MASTERY, - Assets.SND_PUFF, - Assets.SND_ROCKS, - Assets.SND_BURNING, - Assets.SND_FALLING, - Assets.SND_GHOST, - Assets.SND_SECRET, - Assets.SND_BONES, - Assets.SND_BEE, - Assets.SND_DEGRADE, - Assets.SND_MIMIC ); + Assets.Sounds.DESCEND, + Assets.Sounds.EAT, + Assets.Sounds.READ, + Assets.Sounds.LULLABY, + Assets.Sounds.DRINK, + Assets.Sounds.SHATTER, + Assets.Sounds.ZAP, + Assets.Sounds.LIGHTNING, + Assets.Sounds.LEVELUP, + Assets.Sounds.DEATH, + Assets.Sounds.CHALLENGE, + Assets.Sounds.CURSED, + Assets.Sounds.EVOKE, + Assets.Sounds.TRAP, + Assets.Sounds.TOMB, + Assets.Sounds.ALERT, + Assets.Sounds.MELD, + Assets.Sounds.BOSS, + Assets.Sounds.BLAST, + Assets.Sounds.PLANT, + Assets.Sounds.RAY, + Assets.Sounds.BEACON, + Assets.Sounds.TELEPORT, + Assets.Sounds.CHARMS, + Assets.Sounds.MASTERY, + Assets.Sounds.PUFF, + Assets.Sounds.ROCKS, + Assets.Sounds.BURNING, + Assets.Sounds.FALLING, + Assets.Sounds.GHOST, + Assets.Sounds.SECRET, + Assets.Sounds.BONES, + Assets.Sounds.BEE, + Assets.Sounds.DEGRADE, + Assets.Sounds.MIMIC ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 0bd7232af..fdc8289c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -244,7 +244,7 @@ public abstract class Char extends Actor { if (visibleFight) { enemy.sprite.showStatus( CharSprite.POSITIVE, Messages.get(this, "invulnerable") ); - Sample.INSTANCE.play(Assets.SND_MISS); + Sample.INSTANCE.play(Assets.Sounds.MISS); } return false; @@ -280,7 +280,7 @@ public abstract class Char extends Actor { effectiveDamage = attackProc( enemy, effectiveDamage ); if (visibleFight) { - Sample.INSTANCE.play( Assets.SND_HIT, 1, 1, Random.Float( 0.8f, 1.25f ) ); + Sample.INSTANCE.play( Assets.Sounds.HIT, 1, 1, Random.Float( 0.8f, 1.25f ) ); } // If the enemy is already dead, interrupt the attack. @@ -324,7 +324,7 @@ public abstract class Char extends Actor { String defense = enemy.defenseVerb(); enemy.sprite.showStatus( CharSprite.NEUTRAL, defense ); - Sample.INSTANCE.play(Assets.SND_MISS); + Sample.INSTANCE.play(Assets.Sounds.MISS); } return false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java index 1b87cb5bc..e8351e37b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java @@ -44,7 +44,7 @@ public class WaterOfAwareness extends WellWater { @Override protected boolean affectHero( Hero hero ) { - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); emitter.parent.add( new Identification( hero.sprite.center() ) ); hero.belongings.observe(); @@ -80,7 +80,7 @@ public class WaterOfAwareness extends WellWater { item.identify(); Badges.validateItemLevelAquired( item ); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); emitter.parent.add( new Identification( DungeonTilemap.tileCenterToWorld( pos ) ) ); return item; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java index 44caf4db2..e06383f4d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java @@ -47,7 +47,7 @@ public class WaterOfHealth extends WellWater { if (!hero.isAlive()) return false; - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); hero.HP = hero.HT; hero.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.4f, 4 ); @@ -70,18 +70,18 @@ public class WaterOfHealth extends WellWater { if (item instanceof DewVial && !((DewVial)item).isFull()) { ((DewVial)item).fill(); CellEmitter.get( pos ).start( Speck.factory( Speck.HEALING ), 0.4f, 4 ); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); return item; } else if ( item instanceof Ankh && !(((Ankh) item).isBlessed())){ ((Ankh) item).bless(); CellEmitter.get( pos ).start(Speck.factory(Speck.LIGHT), 0.2f, 3); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); return item; } else if (ScrollOfRemoveCurse.uncursable(item)) { if (ScrollOfRemoveCurse.uncurse( null, item )){ CellEmitter.get( pos ).start( ShadowParticle.UP, 0.05f, 10 ); } - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); return item; } return null; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java index d67bc4de1..d959ccff2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java @@ -124,7 +124,7 @@ public class Berserk extends Buff { shield.supercharge(shield.maxShield() * 10); SpellSprite.show(target, SpellSprite.BERSERK); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); GameScene.flash(0xFF0000); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 5c3bb8a3d..bdc528c85 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -208,14 +208,14 @@ public class Combo extends Buff implements ActionIndicator.Action { if (enemy.defenseSkill(target) >= Char.INFINITE_EVASION){ enemy.sprite.showStatus( CharSprite.NEUTRAL, enemy.defenseVerb() ); - Sample.INSTANCE.play(Assets.SND_MISS); + Sample.INSTANCE.play(Assets.Sounds.MISS); detach(); ActionIndicator.clearAction(Combo.this); ((Hero)target).spendAndNext(((Hero)target).attackDelay()); return; } else if (enemy.isInvulnerable(target.getClass())){ enemy.sprite.showStatus( CharSprite.POSITIVE, Messages.get(Char.class, "invulnerable") ); - Sample.INSTANCE.play(Assets.SND_MISS); + Sample.INSTANCE.play(Assets.Sounds.MISS); detach(); ActionIndicator.clearAction(Combo.this); ((Hero)target).spendAndNext(((Hero)target).attackDelay()); @@ -302,7 +302,7 @@ public class Combo extends Buff implements ActionIndicator.Action { if (target.buff(FrostImbue.class) != null) target.buff(FrostImbue.class).proc(enemy); - Sample.INSTANCE.play( Assets.SND_HIT, 1, 1, Random.Float( 0.8f, 1.25f ) ); + Sample.INSTANCE.play( Assets.Sounds.HIT, 1, 1, Random.Float( 0.8f, 1.25f ) ); enemy.sprite.bloodBurstA( target.sprite.center(), dmg ); enemy.sprite.flash(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java index ee32f53a4..8cb758768 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java @@ -280,7 +280,7 @@ public class Preparation extends Buff implements ActionIndicator.Action { Dungeon.hero.sprite.place( Dungeon.hero.pos ); Dungeon.hero.sprite.turnTo( Dungeon.hero.pos, cell); CellEmitter.get( Dungeon.hero.pos ).burst( Speck.factory( Speck.WOOL ), 6 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); Dungeon.hero.curAction = new HeroAction.Attack( enemy ); Dungeon.hero.next(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java index 8176598a9..dd0afc669 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java @@ -56,7 +56,7 @@ public class Shadows extends Invisibility { @Override public boolean attachTo( Char target ) { if (super.attachTo( target )) { - Sample.INSTANCE.play( Assets.SND_MELD ); + Sample.INSTANCE.play( Assets.Sounds.MELD ); if (Dungeon.level != null) Dungeon.observe(); return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 5a44043a7..3cb51e703 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -787,14 +787,14 @@ public class Hero extends Char { switch (heap.type) { case TOMB: - Sample.INSTANCE.play( Assets.SND_TOMB ); + Sample.INSTANCE.play( Assets.Sounds.TOMB ); Camera.main.shake( 1, 0.5f ); break; case SKELETON: case REMAINS: break; default: - Sample.INSTANCE.play( Assets.SND_UNLOCK ); + Sample.INSTANCE.play( Assets.Sounds.UNLOCK ); } sprite.operate( dst ); @@ -838,7 +838,7 @@ public class Hero extends Char { sprite.operate( doorCell ); - Sample.INSTANCE.play( Assets.SND_UNLOCK ); + Sample.INSTANCE.play( Assets.Sounds.UNLOCK ); } else { GLog.w( Messages.get(this, "locked_door") ); @@ -1344,7 +1344,7 @@ public class Hero extends Char { GLog.newLine(); GLog.p( Messages.get(this, "level_cap")); - Sample.INSTANCE.play( Assets.SND_LEVELUP ); + Sample.INSTANCE.play( Assets.Sounds.LEVELUP ); } } @@ -1355,7 +1355,7 @@ public class Hero extends Char { GLog.newLine(); GLog.p( Messages.get(this, "new_level"), lvl ); sprite.showStatus( CharSprite.POSITIVE, Messages.get(Hero.class, "level_up") ); - Sample.INSTANCE.play( Assets.SND_LEVELUP ); + Sample.INSTANCE.play( Assets.Sounds.LEVELUP ); } Item.updateQuickslot(); @@ -1446,7 +1446,7 @@ public class Hero extends Char { ankh.detach(belongings.backpack); - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); GLog.w( Messages.get(this, "revive") ); Statistics.ankhsUsed++; @@ -1562,9 +1562,9 @@ public class Hero extends Char { if (!flying) { if (Dungeon.level.water[pos]) { - Sample.INSTANCE.play( Assets.SND_WATER, 1, 1, Random.Float( 0.8f, 1.25f ) ); + Sample.INSTANCE.play( Assets.Sounds.WATER, 1, 1, Random.Float( 0.8f, 1.25f ) ); } else { - Sample.INSTANCE.play( Assets.SND_STEP ); + Sample.INSTANCE.play( Assets.Sounds.STEP ); } } } @@ -1631,7 +1631,7 @@ public class Hero extends Char { if (Dungeon.level.distance(pos, heap.pos) <= 1){ boolean hasKey = true; if (heap.type == Type.SKELETON || heap.type == Type.REMAINS) { - Sample.INSTANCE.play( Assets.SND_BONES ); + Sample.INSTANCE.play( Assets.Sounds.BONES ); } else if (heap.type == Type.LOCKED_CHEST){ hasKey = Notes.remove(new GoldenKey(Dungeon.depth)); } else if (heap.type == Type.CRYSTAL_CHEST){ @@ -1772,7 +1772,7 @@ public class Hero extends Char { if (smthFound) { GLog.w( Messages.get(this, "noticed_smth") ); - Sample.INSTANCE.play( Assets.SND_SECRET ); + Sample.INSTANCE.play( Assets.Sounds.SECRET ); interrupt(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index f161539d8..9472639ca 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -27,31 +27,45 @@ import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal; import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery; +import com.shatteredpixel.shatteredpixeldungeon.items.Torch; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Affection; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier; import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; import com.shatteredpixel.shatteredpixeldungeon.items.bags.VelvetPouch; import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; import com.shatteredpixel.shatteredpixeldungeon.items.food.SmallRation; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfFrost; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMindVision; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfAquaticRejuvenation; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfDragonsBlood; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfHolyFuror; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfMagicalSight; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRage; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFrost; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPrismaticLight; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blocking; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Gloves; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WornShortsword; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingKnife; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingStone; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; +import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom; import com.watabou.utils.Bundle; import com.watabou.utils.DeviceCompat; @@ -109,6 +123,33 @@ public enum HeroClass { new ScrollOfIdentify().identify(); + //hero.earnExp(2500, null); + new WandOfFireblast().upgrade(50).collect(); + + new TomeOfMastery().collect(); + new WandOfFrost().upgrade(5).collect(); + + new PotionOfLiquidFlame().collect(); + + new Firebloom.Seed().collect(); + new ElixirOfDragonsBlood().collect(); + + new PotionOfHolyFuror().collect(); + + new Torch().quantity(30).collect(); + new ScrollOfUpgrade().quantity(5).collect(); + new WandOfPrismaticLight().identify().collect(); + + new PotionOfMindVision().collect(); + + new PotionOfMagicalSight().collect(); + + new ElixirOfAquaticRejuvenation().collect(); + + new PotionOfFrost().collect(); + + hero.belongings.armor.inscribe(new Affection()); + } public Badges.Badge masteryBadge() { @@ -127,6 +168,7 @@ public enum HeroClass { private static void initWarrior( Hero hero ) { (hero.belongings.weapon = new WornShortsword()).identify(); + ((MeleeWeapon)hero.belongings.weapon).enchant(new Blocking()); ThrowingStone stones = new ThrowingStone(); stones.quantity(3).collect(); Dungeon.quickslot.setSlot(0, stones); @@ -205,13 +247,13 @@ public enum HeroClass { public String spritesheet() { switch (this) { case WARRIOR: default: - return Assets.WARRIOR; + return Assets.Sprites.WARRIOR; case MAGE: - return Assets.MAGE; + return Assets.Sprites.MAGE; case ROGUE: - return Assets.ROGUE; + return Assets.Sprites.ROGUE; case HUNTRESS: - return Assets.HUNTRESS; + return Assets.Sprites.HUNTRESS; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java index a86f1945a..010998b80 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalMimic.java @@ -118,7 +118,7 @@ public class CrystalMimic extends Mimic { enemySeen = true; GLog.w(Messages.get(this, "reveal") ); CellEmitter.get(pos).burst(Speck.factory(Speck.STAR), 10); - Sample.INSTANCE.play(Assets.SND_MIMIC, 1, 1.25f); + Sample.INSTANCE.play(Assets.Sounds.MIMIC, 1, 1.25f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java index ee155b333..4464446b0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java @@ -182,7 +182,7 @@ public class DwarfKing extends Mob { if (summonsMade < 4){ if (summonsMade == 0){ sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.4f, 2 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); yell(Messages.get(this, "wave_1")); } summonSubject(3, DKGhoul.class); @@ -192,7 +192,7 @@ public class DwarfKing extends Mob { } else if (shielding() <= 200 && summonsMade < 8){ if (summonsMade == 4){ sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.4f, 2 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); yell(Messages.get(this, "wave_2")); } if (summonsMade == 7){ @@ -205,7 +205,7 @@ public class DwarfKing extends Mob { return true; } else if (shielding() <= 100 && summonsMade < 12) { sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.4f, 2 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); yell(Messages.get(this, "wave_3")); summonSubject(4, DKWarlock.class); summonSubject(4, DKMonk.class); @@ -402,7 +402,7 @@ public class DwarfKing extends Mob { phase = 3; summonsMade = 1; //monk/warlock on 3rd summon sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.4f, 2 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); yell( Messages.get(this, "enraged", Dungeon.hero.name()) ); } else if (phase == 3 && preHP > 20 && HP < 20){ yell( Messages.get(this, "losing") ); @@ -503,13 +503,13 @@ public class DwarfKing extends Mob { if (summon == DKWarlock.class){ particles.burst(ShadowParticle.CURSE, 10); - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); } else if (summon == DKMonk.class){ particles.burst(ElmoParticle.FACTORY, 10); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } else { particles.burst(Speck.factory(Speck.BONE), 10); - Sample.INSTANCE.play(Assets.SND_BONES); + Sample.INSTANCE.play(Assets.Sounds.BONES); } particles = null; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index 58dc65534..3b459ab94 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -282,7 +282,7 @@ public abstract class Elemental extends Mob { } sprite.parent.addToFront( new Lightning( arcs, null ) ); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java index f545b4662..5191d394f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GoldenMimic.java @@ -71,7 +71,7 @@ public class GoldenMimic extends Mimic { enemySeen = true; GLog.w(Messages.get(this, "reveal") ); CellEmitter.get(pos).burst(Speck.factory(Speck.STAR), 10); - Sample.INSTANCE.play(Assets.SND_MIMIC, 1, 0.85f); + Sample.INSTANCE.play(Assets.Sounds.MIMIC, 1, 0.85f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index b4547a456..02327fae3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -76,7 +76,7 @@ public class Goo extends Mob { if (PathFinder.distance[i] < Integer.MAX_VALUE) CellEmitter.get(i).burst(ElmoParticle.FACTORY, 10); } - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); return Random.NormalIntRange( min*3, max*3 ); } else { return Random.NormalIntRange( min, max ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java index c4f161614..6831caff9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java @@ -185,7 +185,7 @@ public class King extends Mob { nextPedestal = !nextPedestal; sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.4f, 2 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); boolean[] passable = Dungeon.level.passable.clone(); for (Char c : Actor.chars()) { @@ -315,7 +315,7 @@ public class King extends Mob { super.die( cause ); if (Dungeon.level.heroFOV[pos]) { - Sample.INSTANCE.play( Assets.SND_BONES ); + Sample.INSTANCE.play( Assets.Sounds.BONES ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java index b2a09c09d..3d9d1c086 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java @@ -127,7 +127,7 @@ public class Mimic extends Mob { alignment = Alignment.ENEMY; GLog.w(Messages.get(this, "reveal") ); CellEmitter.get(pos).burst(Speck.factory(Speck.STAR), 10); - Sample.INSTANCE.play(Assets.SND_MIMIC); + Sample.INSTANCE.play(Assets.Sounds.MIMIC); } return super.act(); } @@ -186,7 +186,7 @@ public class Mimic extends Mob { enemySeen = true; GLog.w(Messages.get(this, "reveal") ); CellEmitter.get(pos).burst(Speck.factory(Speck.STAR), 10); - Sample.INSTANCE.play(Assets.SND_MIMIC); + Sample.INSTANCE.play(Assets.Sounds.MIMIC); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java index 62405e07e..576182be3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java @@ -228,7 +228,7 @@ public class Necromancer extends Mob { mySkeleton.pos = summoningPos; GameScene.add( mySkeleton ); Dungeon.level.occupyCell( mySkeleton ); - Sample.INSTANCE.play(Assets.SND_BONES); + Sample.INSTANCE.play(Assets.Sounds.BONES); summoningEmitter.burst( Speck.factory( Speck.RATTLE ), 5 ); sprite.idle(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java index 3fe36fcfc..98c6c73f7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java @@ -202,7 +202,7 @@ public class NewDM300 extends Mob { return false; } else { ventGas(enemy); - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); return true; } @@ -237,7 +237,7 @@ public class NewDM300 extends Mob { return false; } else { ventGas(enemy); - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); return true; } } else { @@ -247,7 +247,7 @@ public class NewDM300 extends Mob { return false; } else { dropRocks(enemy); - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); return true; } } @@ -298,7 +298,7 @@ public class NewDM300 extends Mob { if (buff(Barrier.class) == null) { GLog.w(Messages.get(this, "shield")); } - Sample.INSTANCE.play(Assets.SND_LIGHTNING); + Sample.INSTANCE.play(Assets.Sounds.LIGHTNING); sprite.emitter().start(SparkParticle.STATIC, 0.05f, 20); } @@ -542,7 +542,7 @@ public class NewDM300 extends Mob { } } if (bestpos != pos){ - Sample.INSTANCE.play( Assets.SND_ROCKS ); + Sample.INSTANCE.play( Assets.Sounds.ROCKS ); for (int i : PathFinder.NEIGHBOURS9){ if (Dungeon.level.map[pos+i] == Terrain.WALL || Dungeon.level.map[pos+i] == Terrain.WALL_DECO){ @@ -632,7 +632,7 @@ public class NewDM300 extends Mob { if (rocksFell){ Camera.main.shake( 3, 0.7f ); - Sample.INSTANCE.play(Assets.SND_ROCKS); + Sample.INSTANCE.play(Assets.Sounds.ROCKS); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java index 6913dc13f..bd447bf3c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java @@ -247,7 +247,7 @@ public class NewTengu extends Mob { move( newPos ); if (level.heroFOV[newPos]) CellEmitter.get( newPos ).burst( Speck.factory( Speck.WOOL ), 6 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); float fill = 0.9f - 0.5f*((HP-80)/80f); level.placeTrapsInTenguCell(fill); @@ -273,7 +273,7 @@ public class NewTengu extends Mob { if (arenaJumps < 4) arenaJumps++; if (level.heroFOV[newPos]) CellEmitter.get( newPos ).burst( Speck.factory( Speck.WOOL ), 6 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); } @@ -289,7 +289,7 @@ public class NewTengu extends Mob { move( newPos ); if (level.heroFOV[newPos]) CellEmitter.get( newPos ).burst( Speck.factory( Speck.WOOL ), 6 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); } @@ -643,7 +643,7 @@ public class NewTengu extends Mob { } if (exploded){ - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); } } @@ -847,7 +847,7 @@ public class NewTengu extends Mob { } if (burned){ - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } } @@ -931,7 +931,7 @@ public class NewTengu extends Mob { target.sprite.parent.add(new Lightning(shockerPos - 1 + Dungeon.level.width(), shockerPos + 1 - Dungeon.level.width(), null)); if (Dungeon.level.distance(Dungeon.hero.pos, shockerPos) <= 1){ - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } shockingOrdinals = false; @@ -942,7 +942,7 @@ public class NewTengu extends Mob { target.sprite.parent.add(new Lightning(shockerPos - 1, shockerPos + 1, null)); if (Dungeon.level.distance(Dungeon.hero.pos, shockerPos) <= 1){ - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } shockingOrdinals = true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldDM300.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldDM300.java index ed386789e..e4646f3d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldDM300.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldDM300.java @@ -115,7 +115,7 @@ public class OldDM300 extends Mob { if (Dungeon.level.heroFOV[cell]) { CellEmitter.get( cell ).start( Speck.factory( Speck.ROCK ), 0.07f, 10 ); Camera.main.shake( 3, 0.7f ); - Sample.INSTANCE.play( Assets.SND_ROCKS ); + Sample.INSTANCE.play( Assets.Sounds.ROCKS ); if (Dungeon.level.water[cell]) { GameScene.ripple( cell ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldTengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldTengu.java index 4b75f5c7b..ce2459a10 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldTengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldTengu.java @@ -236,7 +236,7 @@ public class OldTengu extends Mob { move( newPos ); if (level.heroFOV[newPos]) CellEmitter.get( newPos ).burst( Speck.factory( Speck.WOOL ), 6 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); spend( 1 / speed() ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java index ea297b181..226d9a93c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java @@ -94,7 +94,7 @@ public class Pylon extends Mob { DungeonTilemap.raisedTileCenterToWorld(cell2), null)); CellEmitter.get(cell1).burst(SparkParticle.FACTORY, 3); CellEmitter.get(cell2).burst(SparkParticle.FACTORY, 3); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } shockChar(Actor.findChar(cell1)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java index 03317279f..af3ed3e72 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java @@ -146,7 +146,7 @@ public class RipperDemon extends Mob { if (alignment != ch.alignment){ Buff.affect(ch, Bleeding.class).set(0.75f*damageRoll()); ch.sprite.flash(); - Sample.INSTANCE.play(Assets.SND_HIT); + Sample.INSTANCE.play(Assets.Sounds.HIT); } //bounce to a random safe pos(if possible) int bouncepos = -1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java index 44f373c18..a0f716452 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java @@ -79,7 +79,7 @@ public class Skeleton extends Mob { } if (Dungeon.level.heroFOV[pos]) { - Sample.INSTANCE.play( Assets.SND_BONES ); + Sample.INSTANCE.play( Assets.Sounds.BONES ); } if (heroKilled) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java index 60638eccb..21205329f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java @@ -84,12 +84,12 @@ public class Succubus extends Mob { HP += 5 + damage; } sprite.emitter().burst( Speck.factory( Speck.HEALING ), 2 ); - Sample.INSTANCE.play( Assets.SND_CHARMS ); + Sample.INSTANCE.play( Assets.Sounds.CHARMS ); } else if (Random.Int( 3 ) == 0) { //attack will reduce by 5 turns, so effectively DURATION-5 turns Buff.affect( enemy, Charm.class, Charm.DURATION ).object = id(); enemy.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 ); - Sample.INSTANCE.play( Assets.SND_CHARMS ); + Sample.INSTANCE.play( Assets.Sounds.CHARMS ); } return damage; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index 52792295a..46485b92a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -106,7 +106,7 @@ public class Warlock extends Mob implements Callback { //TODO would be nice for this to work on ghost/statues too if (enemy == Dungeon.hero && Random.Int( 2 ) == 0) { if (enemy.buff( Degrade.class ) == null){ - Sample.INSTANCE.play( Assets.SND_DEGRADE ); + Sample.INSTANCE.play( Assets.Sounds.DEGRADE ); } Buff.prolong( enemy, Degrade.class, Degrade.DURATION ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index d5ebed50f..438c43947 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -211,7 +211,7 @@ public class Blacksmith extends NPC { second = item2; } - Sample.INSTANCE.play( Assets.SND_EVOKE ); + Sample.INSTANCE.play( Assets.Sounds.EVOKE ); ScrollOfUpgrade.upgrade( Dungeon.hero ); Item.evoke( Dungeon.hero ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index 30f30d7b8..d4523182b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -69,7 +69,7 @@ public class Ghost extends NPC { public Ghost() { super(); - Sample.INSTANCE.load( Assets.SND_GHOST ); + Sample.INSTANCE.load( Assets.Sounds.GHOST ); } @Override @@ -111,7 +111,7 @@ public class Ghost extends NPC { public boolean interact(Char c) { sprite.turnTo( pos, c.pos ); - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); if (c != Dungeon.hero){ return super.interact(c); @@ -333,7 +333,7 @@ public class Ghost extends NPC { public static void process() { if (spawned && given && !processed && (depth == Dungeon.depth)) { GLog.n( Messages.get(Ghost.class, "find_me") ); - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); processed = true; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java index 959b107b1..53d717c98 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java @@ -253,7 +253,7 @@ public class PrismaticImage extends NPC { destroy(); CellEmitter.get(pos).start( Speck.factory(Speck.LIGHT), 0.2f, 3 ); sprite.die(); - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); return true; } else { return super.act(enemyInFOV, justAlerted); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java index 5e7922c5b..df471dc4f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java @@ -50,7 +50,7 @@ public class BadgeBanner extends Image { private BadgeBanner( int index ) { - super( Assets.BADGES ); + super( Assets.Interfaces.BADGES ); if (atlas == null) { atlas = new TextureFilm( texture, 16, 16 ); @@ -67,7 +67,7 @@ public class BadgeBanner extends Image { state = State.FADE_IN; time = FADE_IN_TIME; - Sample.INSTANCE.play( Assets.SND_BADGE ); + Sample.INSTANCE.play( Assets.Sounds.BADGE ); } @Override @@ -281,7 +281,7 @@ public class BadgeBanner extends Image { } public static Image image( int index ) { - Image image = new Image( Assets.BADGES ); + Image image = new Image( Assets.Interfaces.BADGES ); if (atlas == null) { atlas = new TextureFilm( image.texture, 16, 16 ); } 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 174aaa48f..843870a8b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java @@ -35,7 +35,7 @@ public class BannerSprites { } public static Image get( Type type ) { - Image icon = new Image( Assets.BANNERS ); + Image icon = new Image( Assets.Interfaces.BANNERS ); switch (type) { case PIXEL_DUNGEON: icon.frame( icon.texture.uvRect( 0, 0, 132, 90 ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java index 992ab0c12..c0bf3d878 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java @@ -49,7 +49,7 @@ public class Beam extends Image { angle = (float)(Math.atan2( dy, dx ) * A); scale.x = (float)Math.sqrt( dx * dx + dy * dy ) / width; - Sample.INSTANCE.play( Assets.SND_RAY ); + Sample.INSTANCE.play( Assets.Sounds.RAY ); timeLeft = this.duration = duration; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java index 162544776..231764189 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java @@ -38,7 +38,7 @@ public class Effects { } public static Image get( Type type ) { - Image icon = new Image( Assets.EFFECTS ); + Image icon = new Image( Assets.Effects.EFFECTS ); switch (type) { case RIPPLE: icon.frame(icon.texture.uvRect(0, 0, 16, 16)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java index 1aa0296d3..6e3a43c07 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java @@ -54,7 +54,7 @@ public class Fireball extends Component { sparks = new Group(); add( sparks ); - bLight = new Image( Assets.FIREBALL ); + bLight = new Image( Assets.Effects.FIREBALL ); bLight.frame( BLIGHT ); bLight.origin.set( bLight.width / 2 ); bLight.angularSpeed = -90; @@ -73,7 +73,7 @@ public class Fireball extends Component { }, 0.1f ); add( emitter ); - fLight = new Image( Assets.FIREBALL ); + fLight = new Image( Assets.Effects.FIREBALL ); fLight.frame( FLIGHT ); fLight.origin.set( fLight.width / 2 ); fLight.angularSpeed = 360; @@ -133,7 +133,7 @@ public class Fireball extends Component { public Flame() { - super( Assets.FIREBALL ); + super( Assets.Effects.FIREBALL ); frame( Random.Int( 2 ) == 0 ? FLAME1 : FLAME2 ); origin.set( width / 2, height / 2 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java index 8885fdb34..145514fbe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java @@ -58,7 +58,7 @@ public class IceBlock extends Gizmo { if (visible) { Splash.at( target.center(), 0xFFB2D6FF, 5 ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShadowBox.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShadowBox.java index 8c6accfeb..a293adb94 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShadowBox.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShadowBox.java @@ -30,7 +30,7 @@ public class ShadowBox extends NinePatch { public static final float SIZE = 16; public ShadowBox() { - super( Assets.SHADOW, 1 ); + super( Assets.Interfaces.SHADOW, 1 ); //If this is the first time the texture is generated, set the filtering if (texture.id == -1) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java index abf20ac40..7d9fc2dd8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java @@ -82,7 +82,7 @@ public class Speck extends Image { public Speck() { super(); - texture( Assets.SPECKS ); + texture( Assets.Effects.SPECKS ); if (film == null) { film = new TextureFilm( texture, SIZE, SIZE ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java index ddd022206..1d9537b40 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java @@ -59,7 +59,7 @@ public class SpellSprite extends Image { private static HashMap all = new HashMap<>(); public SpellSprite() { - super( Assets.SPELL_ICONS ); + super( Assets.Effects.SPELL_ICONS ); if (film == null) { film = new TextureFilm( texture, SIZE ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Swap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Swap.java index a739e695b..ead952d36 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Swap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Swap.java @@ -51,7 +51,7 @@ public class Swap extends Actor { eff1 = new Effect( ch1.sprite, ch1.pos, ch2.pos ); eff2 = new Effect( ch2.sprite, ch2.pos, ch1.pos ); - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java index 54401d692..159bf75a0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java @@ -83,7 +83,7 @@ public class Ankh extends Item { hero.busy(); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); CellEmitter.get(hero.pos).start(Speck.factory(Speck.LIGHT), 0.2f, 3); hero.sprite.operate( hero.pos ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java index 120d50cf3..7122444c5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java @@ -105,7 +105,7 @@ public class ArmorKit extends Item { } curUser.sprite.operate( curUser.pos ); - Sample.INSTANCE.play( Assets.SND_EVOKE ); + Sample.INSTANCE.play( Assets.Sounds.EVOKE ); } private final WndBag.Listener itemSelector = new WndBag.Listener() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java index 8d2feee90..eb1e4c392 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java @@ -91,7 +91,7 @@ public class BrokenSeal extends Item { } else { GLog.p(Messages.get(BrokenSeal.class, "affix")); Dungeon.hero.sprite.operate(Dungeon.hero.pos); - Sample.INSTANCE.play(Assets.SND_UNLOCK); + Sample.INSTANCE.play(Assets.Sounds.UNLOCK); armor.affixSeal((BrokenSeal)curItem); curItem.detach(Dungeon.hero.belongings.backpack); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java index c45ac6246..8095d8271 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java @@ -107,7 +107,7 @@ public class DewVial extends Item { hero.spend( TIME_TO_DRINK ); hero.busy(); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); hero.sprite.operate( hero.pos ); updateQuickslot(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java index d1ac8ab56..152c129dc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java @@ -65,7 +65,7 @@ public class Dewdrop extends Item { } - Sample.INSTANCE.play( Assets.SND_DEWDROP ); + Sample.INSTANCE.play( Assets.Sounds.DEWDROP ); hero.spendAndNext( TIME_TO_PICK_UP ); return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java index 7cfccad77..e99c7e349 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java @@ -89,7 +89,7 @@ public abstract class EquipableItem extends Item { public static void equipCursed( Hero hero ) { hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 ); - Sample.INSTANCE.play( Assets.SND_CURSED ); + Sample.INSTANCE.play( Assets.Sounds.CURSED ); } protected float time2equip( Hero hero ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java index 5eae509c5..c90d9ad3c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java @@ -73,7 +73,7 @@ public class Gold extends Item { hero.sprite.showStatus( CharSprite.NEUTRAL, TXT_VALUE, quantity ); hero.spendAndNext( TIME_TO_PICK_UP ); - Sample.INSTANCE.play( Assets.SND_GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) ); + Sample.INSTANCE.play( Assets.Sounds.GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) ); return true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 49df2364f..b9acae7ae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -104,7 +104,7 @@ public class Heap implements Bundlable { hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 ); hero.damage( hero.HP / 2, this ); } - Sample.INSTANCE.play( Assets.SND_CURSED ); + Sample.INSTANCE.play( Assets.Sounds.CURSED ); } if (type != Type.MIMIC) { @@ -334,7 +334,7 @@ public class Heap implements Bundlable { public static void burnFX( int pos ) { CellEmitter.get( pos ).burst( ElmoParticle.FACTORY, 6 ); - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); } public static void evaporateFX( int pos ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java index e2277335b..dc08af733 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java @@ -94,7 +94,7 @@ public class Honeypot extends Item { public Item shatter( Char owner, int pos ) { if (Dungeon.level.heroFOV[pos]) { - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); Splash.at( pos, 0xffd500, 5 ); } @@ -126,7 +126,7 @@ public class Honeypot extends Item { bee.sprite.alpha( 0 ); bee.sprite.parent.add( new AlphaTweener( bee.sprite, 1, 0.15f ) ); - Sample.INSTANCE.play( Assets.SND_BEE ); + Sample.INSTANCE.play( Assets.Sounds.BEE ); return new ShatteredPot(); } else { return this; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 78c55565b..dd4ae1db4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -103,7 +103,7 @@ public class Item implements Bundlable { if (collect( hero.belongings.backpack )) { GameScene.pickUp( this, hero.pos ); - Sample.INSTANCE.play( Assets.SND_ITEM ); + Sample.INSTANCE.play( Assets.Sounds.ITEM ); hero.spendAndNext( TIME_TO_PICK_UP ); return true; @@ -516,7 +516,7 @@ public class Item implements Bundlable { user.sprite.zap( cell ); user.busy(); - Sample.INSTANCE.play( Assets.SND_MISS, 0.6f, 0.6f, 1.5f ); + Sample.INSTANCE.play( Assets.Sounds.MISS, 0.6f, 0.6f, 1.5f ); Char enemy = Actor.findChar( cell ); QuickSlotButton.target(enemy); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java index d91f2712e..ef6744038 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java @@ -58,7 +58,7 @@ public class MerchantsBeacon extends Item { if (action.equals(AC_USE)) { detach( hero.belongings.backpack ); Shopkeeper.sell(); - Sample.INSTANCE.play( Assets.SND_BEACON ); + Sample.INSTANCE.play( Assets.Sounds.BEACON ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java index 965391645..411716435 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java @@ -98,7 +98,7 @@ public class Stylus extends Item { curUser.sprite.operate(curUser.pos); curUser.sprite.centerEmitter().start(PurpleParticle.BURST, 0.05f, 10); Enchanting.show(curUser, armor); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); curUser.spend(TIME_TO_INSCRIBE); curUser.busy(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java index 8c39cad08..3de49a27f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java @@ -116,7 +116,7 @@ public class TomeOfMastery extends Item { curUser.subClass = way; curUser.sprite.operate( curUser.pos ); - Sample.INSTANCE.play( Assets.SND_MASTERY ); + Sample.INSTANCE.play( Assets.Sounds.MASTERY ); SpellSprite.show( curUser, SpellSprite.MASTERY ); curUser.sprite.emitter().burst( Speck.factory( Speck.MASTERY ), 12 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java index 21617dba9..b709846f2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java @@ -62,9 +62,9 @@ public class MageArmor extends ClassArmor { curUser.busy(); curUser.sprite.emitter().start( ElmoParticle.FACTORY, 0.025f, 20 ); - Sample.INSTANCE.play( Assets.SND_BURNING ); - Sample.INSTANCE.play( Assets.SND_BURNING ); - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); } } \ No newline at end of file diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java index be3c0aa62..3ba91a9b5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java @@ -82,7 +82,7 @@ public class RogueArmor extends ClassArmor { CellEmitter.get( curUser.pos ).burst( Speck.factory( Speck.WOOL ), 10 ); ScrollOfTeleportation.appear( curUser, target ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); Dungeon.level.occupyCell(curUser ); Dungeon.observe(); GameScene.updateFog(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java index 9e6bbd0d2..1ebe22433 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java @@ -68,7 +68,7 @@ public class Camouflage extends Armor.Glyph { public void set(int time){ left = time; pos = target.pos; - Sample.INSTANCE.play( Assets.SND_MELD ); + Sample.INSTANCE.play( Assets.Sounds.MELD ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index b2b28dd2b..a07ba196c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -107,7 +107,7 @@ public class ChaliceOfBlood extends Artifact { if (damage <= 0){ damage = 1; } else { - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); hero.sprite.emitter().burst( ShadowParticle.CURSE, 4+(damage/10) ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index d8b939d46..645e0399d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -86,7 +86,7 @@ public class CloakOfShadows extends Artifact { stealthed = true; hero.spend( 1f ); hero.busy(); - Sample.INSTANCE.play(Assets.SND_MELD); + Sample.INSTANCE.play(Assets.Sounds.MELD); activeBuff = activeBuff(); activeBuff.attachTo(hero); if (hero.sprite.parent != null) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 43c8cd1b1..62ce1c816 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -158,7 +158,7 @@ public class DriedRose extends Artifact { if (!firstSummon) { ghost.yell( Messages.get(GhostHero.class, "hello", Dungeon.hero.name()) ); - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); firstSummon = true; } else { @@ -399,7 +399,7 @@ public class DriedRose extends Artifact { if (spawnPoints.size() > 0) { Wraith.spawnAt(Random.element(spawnPoints)); - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); } } @@ -416,7 +416,7 @@ public class DriedRose extends Artifact { public void onSelect(Integer cell) { if (cell == null) return; - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); if (!Dungeon.level.heroFOV[cell] || Actor.findChar(cell) == null @@ -484,7 +484,7 @@ public class DriedRose extends Artifact { } else GLog.i( Messages.get(this, "levelup") ); - Sample.INSTANCE.play( Assets.SND_DEWDROP ); + Sample.INSTANCE.play( Assets.Sounds.DEWDROP ); hero.spendAndNext(TIME_TO_PICK_UP); return true; @@ -773,7 +773,7 @@ public class DriedRose extends Artifact { break; } if (ShatteredPixelDungeon.scene() instanceof GameScene) { - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); } } @@ -797,7 +797,7 @@ public class DriedRose extends Artifact { yell( Messages.get( this, "seen_yog_" + Random.IntRange(1, 3) )); break; } - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); } public void sayDefeated(){ @@ -806,7 +806,7 @@ public class DriedRose extends Artifact { } else { yell( Messages.get( this, "defeated_by_enemy_" + Random.IntRange(1, 3) )); } - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); } public void sayHeroKilled(){ @@ -815,12 +815,12 @@ public class DriedRose extends Artifact { } else { yell( Messages.get( this, "hero_killed_" + Random.IntRange(1, 3) )); } - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); } public void sayAnhk(){ yell( Messages.get( this, "blessed_ankh_" + Random.IntRange(1, 3) )); - Sample.INSTANCE.play( Assets.SND_GHOST ); + Sample.INSTANCE.play( Assets.Sounds.GHOST ); } private static final String DEFEND_POS = "defend_pos"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 9558ef1b6..23562e105 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -99,7 +99,7 @@ public class HornOfPlenty extends Artifact { hero.sprite.operate(hero.pos); hero.busy(); SpellSprite.show(hero, SpellSprite.FOOD); - Sample.INSTANCE.play(Assets.SND_EAT); + Sample.INSTANCE.play(Assets.Sounds.EAT); GLog.i( Messages.get(this, "eat") ); hero.spend(Food.TIME_TO_EAT); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index 957043fe2..ebe07e34c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -152,7 +152,7 @@ public class LloydsBeacon extends Artifact { hero.busy(); hero.sprite.operate( hero.pos ); - Sample.INSTANCE.play( Assets.SND_BEACON ); + Sample.INSTANCE.play( Assets.Sounds.BEACON ); GLog.i( Messages.get(this, "return") ); @@ -214,7 +214,7 @@ public class LloydsBeacon extends Artifact { ScrollOfTeleportation.teleportHero(curUser); curUser.spendAndNext( 1f ); } else { - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); curUser.sprite.zap(bolt.collisionPos); curUser.busy(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index 5ce4f3429..2cbba35d9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -179,7 +179,7 @@ public class SandalsOfNature extends Artifact { Hero hero = Dungeon.hero; hero.sprite.operate( hero.pos ); - Sample.INSTANCE.play( Assets.SND_PLANT ); + Sample.INSTANCE.play( Assets.Sounds.PLANT ); hero.busy(); hero.spend( 2f ); if (seeds.size() >= 3+(level()*3)){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index cb9f6b66a..487cdac40 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -74,7 +74,7 @@ public class TalismanOfForesight extends Artifact { else { hero.sprite.operate(hero.pos); hero.busy(); - Sample.INSTANCE.play(Assets.SND_BEACON); + Sample.INSTANCE.play(Assets.Sounds.BEACON); charge = 0; for (int i = 0; i < Dungeon.level.length(); i++) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 0d6a73fd1..a934b4c2a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -95,14 +95,14 @@ public class TimekeepersHourglass extends Artifact { if (index == 0) { GLog.i( Messages.get(TimekeepersHourglass.class, "onstasis") ); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); activeBuff = new timeStasis(); activeBuff.attachTo(Dungeon.hero); } else if (index == 1) { GLog.i( Messages.get(TimekeepersHourglass.class, "onfreeze") ); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); activeBuff = new timeFreeze(); activeBuff.attachTo(Dungeon.hero); @@ -394,7 +394,7 @@ public class TimekeepersHourglass extends Artifact { TimekeepersHourglass hourglass = hero.belongings.getItem( TimekeepersHourglass.class ); if (hourglass != null && !hourglass.cursed) { hourglass.upgrade(); - Sample.INSTANCE.play( Assets.SND_DEWDROP ); + Sample.INSTANCE.play( Assets.Sounds.DEWDROP ); if (hourglass.level() == hourglass.levelCap) GLog.p( Messages.get(this, "maxlevel") ); else diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index e2f6afb6a..505c3689b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -307,7 +307,7 @@ public class UnstableSpellbook extends Artifact { hero.sprite.operate( hero.pos ); hero.busy(); hero.spend( 2f ); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); hero.sprite.emitter().burst( ElmoParticle.FACTORY, 12 ); scrolls.remove(i); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java index 5f520fe09..09c01fe0e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java @@ -135,7 +135,7 @@ public class Bomb extends Item { //We're blowing up, so no need for a fuse anymore. this.fuse = null; - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); if (explodesDestructively()) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java index 1b29d52d7..03b901f17 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java @@ -53,7 +53,7 @@ public class Firebomb extends Bomb { CellEmitter.get(i).burst(FlameParticle.FACTORY, 5); } } - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java index 016b2a2ee..549a4bfda 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java @@ -73,7 +73,7 @@ public class HolyBomb extends Bomb { } } - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java index e4038f498..073dfb799 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java @@ -46,7 +46,7 @@ public class Noisemaker extends Bomb { Buff.affect(Dungeon.hero, Trigger.class).set(cell); CellEmitter.center( cell ).start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_ALERT ); + Sample.INSTANCE.play( Assets.Sounds.ALERT ); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { mob.beckon( cell ); @@ -106,7 +106,7 @@ public class Noisemaker extends Bomb { if (left <= 0){ CellEmitter.center( cell ).start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_ALERT ); + Sample.INSTANCE.play( Assets.Sounds.ALERT ); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { mob.beckon( cell ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java index 567a0be20..81345a292 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java @@ -80,7 +80,7 @@ public class ShockBomb extends Bomb { CellEmitter.center(cell).burst(SparkParticle.FACTORY, 20); Dungeon.hero.sprite.parent.addToFront(new Lightning(arcs, null)); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java index ef7c8a7a2..a500e651c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java @@ -60,7 +60,7 @@ public class WoollyBomb extends Bomb { } } - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java index 65309f9f8..3f53ab8a8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java @@ -79,7 +79,7 @@ public class Food extends Item { hero.sprite.operate( hero.pos ); hero.busy(); SpellSprite.show( hero, SpellSprite.FOOD ); - Sample.INSTANCE.play( Assets.SND_EAT ); + Sample.INSTANCE.play( Assets.Sounds.EAT ); hero.spend( TIME_TO_EAT ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/journal/DocumentPage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/journal/DocumentPage.java index 700e3ea3e..a910b1438 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/journal/DocumentPage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/journal/DocumentPage.java @@ -59,7 +59,7 @@ public abstract class DocumentPage extends Item { WndJournal.last_index = 0; } document().addPage(page); - Sample.INSTANCE.play( Assets.SND_ITEM ); + Sample.INSTANCE.play( Assets.Sounds.ITEM ); hero.spendAndNext( TIME_TO_PICK_UP ); return true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java index 949fddd20..53d156337 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java @@ -51,7 +51,7 @@ public abstract class Key extends Item { GameScene.pickUpJournal(this, hero.pos); WndJournal.last_index = 2; Notes.add(this); - Sample.INSTANCE.play( Assets.SND_ITEM ); + Sample.INSTANCE.play( Assets.Sounds.ITEM ); hero.spendAndNext( TIME_TO_PICK_UP ); GameScene.updateKeyDisplay(); return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index bdd96f75d..4e4ac3a6c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -307,7 +307,7 @@ public class Potion extends Item { hero.busy(); apply( hero ); - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); hero.sprite.operate( hero.pos ); } @@ -333,7 +333,7 @@ public class Potion extends Item { public void shatter( int cell ) { if (Dungeon.level.heroFOV[cell]) { GLog.i( Messages.get(Potion.class, "shatter") ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); splash( cell ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index 7f21eead4..36f38acd3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -42,7 +42,7 @@ public class PotionOfFrost extends Potion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } for (int offset : PathFinder.NEIGHBOURS9){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java index c18e2f6d0..c1fbaa610 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java @@ -40,7 +40,7 @@ public class PotionOfInvisibility extends Potion { setKnown(); Buff.affect( hero, Invisibility.class, Invisibility.DURATION ); GLog.i( Messages.get(this, "invisible") ); - Sample.INSTANCE.play( Assets.SND_MELD ); + Sample.INSTANCE.play( Assets.Sounds.MELD ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index 81b6cfca6..91c052145 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -46,7 +46,7 @@ public class PotionOfLevitation extends Potion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, ConfusionGas.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index 97bf40b2e..73f5449d1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -42,7 +42,7 @@ public class PotionOfLiquidFlame extends Potion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } for (int offset : PathFinder.NEIGHBOURS9){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java index 45dff5ea0..f1ecbf151 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java @@ -41,7 +41,7 @@ public class PotionOfParalyticGas extends Potion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, ParalyticGas.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index 0d9b09ff2..0d6749e3d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -88,7 +88,7 @@ public class PotionOfPurity extends Potion { if (Dungeon.level.heroFOV[cell]) { splash(cell); - Sample.INSTANCE.play(Assets.SND_SHATTER); + Sample.INSTANCE.play(Assets.Sounds.SHATTER); setKnown(); GLog.i(Messages.get(this, "freshness")); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index ec05aa7d2..7ef6c3e47 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -41,7 +41,7 @@ public class PotionOfToxicGas extends Potion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, ToxicGas.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java index e763610e9..5c9983a37 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java @@ -41,7 +41,7 @@ public class BlizzardBrew extends Brew { public void shatter(int cell) { if (Dungeon.level.heroFOV[cell]) { splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, Blizzard.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java index 0669eb613..997e36532 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java @@ -47,7 +47,7 @@ public class CausticBrew extends Brew { if (Dungeon.level.heroFOV[cell]) { splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 3 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java index a7448ca7a..bec30e54c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java @@ -44,7 +44,7 @@ public class InfernalBrew extends Brew { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, Inferno.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java index 09b46cd23..318953ea4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java @@ -43,7 +43,7 @@ public class ShockingBrew extends Brew { public void shatter(int cell) { if (Dungeon.level.heroFOV[cell]) { splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 2 ); for (int i = 0; i < PathFinder.distance.length; i++) { @@ -51,7 +51,7 @@ public class ShockingBrew extends Brew { GameScene.add(Blob.seed(i, 20, Electricity.class)); } } - Sample.INSTANCE.play(Assets.SND_LIGHTNING); + Sample.INSTANCE.play(Assets.Sounds.LIGHTNING); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java index e341e1630..b9fd50daa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java @@ -41,7 +41,7 @@ public class ElixirOfDragonsBlood extends Elixir { @Override public void apply(Hero hero) { Buff.affect(hero, FireImbue.class).set(FireImbue.DURATION); - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); hero.sprite.emitter().burst(FlameParticle.FACTORY, 10); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java index 02ca889e6..656d1aadf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java @@ -51,7 +51,7 @@ public class ElixirOfHoneyedHealing extends Elixir { @Override public void shatter(int cell) { if (Dungeon.level.heroFOV[cell]) { - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); splash( cell ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java index e9d3bfa9d..8592cc59c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java @@ -50,7 +50,7 @@ public class PotionOfCleansing extends ExoticPotion { super.shatter(cell); } else { if (Dungeon.level.heroFOV[cell]) { - Sample.INSTANCE.play(Assets.SND_SHATTER); + Sample.INSTANCE.play(Assets.Sounds.SHATTER); splash(cell); setKnown(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java index 7315ceef0..d616de336 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java @@ -41,7 +41,7 @@ public class PotionOfCorrosiveGas extends ExoticPotion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 200, CorrosiveGas.class ).setStrength( 1 + Dungeon.depth/5)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java index da22e919c..c88ecbb95 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java @@ -73,7 +73,7 @@ public class PotionOfDragonsBreath extends ExoticPotion { //TODO if this can ever be found un-IDed, need logic for that curItem.collect(); } else { - Sample.INSTANCE.play( Assets.SND_DRINK ); + Sample.INSTANCE.play( Assets.Sounds.DRINK ); curUser.sprite.operate(curUser.pos, new Callback() { @Override public void call() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java index 0531f4e12..2aad49cf4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java @@ -41,7 +41,7 @@ public class PotionOfShroudingFog extends ExoticPotion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, SmokeScreen.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java index eb21cfb59..04819f172 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java @@ -45,7 +45,7 @@ public class PotionOfSnapFreeze extends ExoticPotion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } Fire fire = (Fire)Dungeon.level.blobs.get( Fire.class ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java index 18b0b26bb..3fa38c33c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java @@ -41,7 +41,7 @@ public class PotionOfStormClouds extends ExoticPotion { setKnown(); splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } GameScene.add( Blob.seed( cell, 1000, StormCloud.class ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java index 03ca6a1dd..b01d148d3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java @@ -121,7 +121,7 @@ public class CeremonialCandle extends Item { for (int i : PathFinder.NEIGHBOURS9){ CellEmitter.get(ritualPos+i).burst(ElmoParticle.FACTORY, 10); } - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java index 8b9f1f0f2..f77f295dc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java @@ -108,7 +108,7 @@ public class CorpseDust extends Item { } while (tries > 0 && (!Dungeon.level.heroFOV[pos] || !Dungeon.level.passable[pos] || Actor.findChar( pos ) != null)); if (tries > 0) { Wraith.spawnAt(pos); - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index 28b505d50..9bfe5d308 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -111,7 +111,7 @@ public class Pickaxe extends Weapon { public void call() { CellEmitter.center( pos ).burst( Speck.factory( Speck.STAR ), 7 ); - Sample.INSTANCE.play( Assets.SND_EVOKE ); + Sample.INSTANCE.play( Assets.Sounds.EVOKE ); Level.set( pos, Terrain.WALL ); GameScene.updateMap( pos ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java index 31d6de24f..cbe638c82 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java @@ -85,7 +85,7 @@ public abstract class InventoryScroll extends Scroll { ((InventoryScroll)curItem).onItemSelected( item ); ((InventoryScroll)curItem).readAnimation(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); } else if (identifiedByUse && !((Scroll)curItem).anonymous) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java index a786e7f87..e53c3f6cc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java @@ -54,7 +54,7 @@ public class ScrollOfIdentify extends InventoryScroll { if (unIDed.size() > 1) { Random.element(unIDed).identify(); - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); } doRead(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index 84b4b47e5..078f770a6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -42,7 +42,7 @@ public class ScrollOfLullaby extends Scroll { public void doRead() { curUser.sprite.centerEmitter().start( Speck.factory( Speck.NOTE ), 0.3f, 5 ); - Sample.INSTANCE.play( Assets.SND_LULLABY ); + Sample.INSTANCE.play( Assets.Sounds.LULLABY ); Invisibility.dispel(); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index 8e274e768..ee6ef75da 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -76,11 +76,11 @@ public class ScrollOfMagicMapping extends Scroll { GLog.i( Messages.get(this, "layout") ); if (noticed) { - Sample.INSTANCE.play( Assets.SND_SECRET ); + Sample.INSTANCE.play( Assets.Sounds.SECRET ); } SpellSprite.show( curUser, SpellSprite.MAP ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); setKnown(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index 3bf069a93..88d7fa294 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -53,7 +53,7 @@ public class ScrollOfMirrorImage extends Scroll { setKnown(); } - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); readAnimation(); @@ -66,7 +66,7 @@ public class ScrollOfMirrorImage extends Scroll { setKnown(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); readAnimation(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index 9a8794146..6741f406c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -55,7 +55,7 @@ public class ScrollOfRage extends Scroll { setKnown(); curUser.sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_CHALLENGE ); + Sample.INSTANCE.play( Assets.Sounds.CHALLENGE ); Invisibility.dispel(); readAnimation(); @@ -72,7 +72,7 @@ public class ScrollOfRage extends Scroll { setKnown(); curUser.sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); readAnimation(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index 16aab2116..a839f5df7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java @@ -45,7 +45,7 @@ public class ScrollOfRecharging extends Scroll { Buff.affect(curUser, Recharging.class, Recharging.DURATION); charge(curUser); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); GLog.i( Messages.get(this, "surge") ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index db0d84b0f..300a8580a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -51,7 +51,7 @@ public class ScrollOfRemoveCurse extends InventoryScroll { item.cursedKnown = true; } } - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); doRead(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java index 3fa27f623..7e3c038f4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java @@ -46,7 +46,7 @@ public class ScrollOfRetribution extends Scroll { float hpPercent = (curUser.HT - curUser.HP)/(float)(curUser.HT); float power = Math.min( 4f, 4.45f*hpPercent); - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); Invisibility.dispel(); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { @@ -73,7 +73,7 @@ public class ScrollOfRetribution extends Scroll { public void empoweredRead() { GameScene.flash( 0xFFFFFF ); - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); Invisibility.dispel(); //scales from 3x to 5x power, maxing at ~20% HP diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 1a53e648a..277358122 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -56,7 +56,7 @@ public class ScrollOfTeleportation extends Scroll { @Override public void doRead() { - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); teleportPreferringUnseen( curUser ); @@ -206,7 +206,7 @@ public class ScrollOfTeleportation extends Scroll { appear( hero, pos ); Dungeon.level.occupyCell(hero ); if (secretDoor && level.map[doorPos] == Terrain.SECRET_DOOR){ - Sample.INSTANCE.play( Assets.SND_SECRET ); + Sample.INSTANCE.play( Assets.Sounds.SECRET ); int oldValue = Dungeon.level.map[doorPos]; GameScene.discoverTile( doorPos, oldValue ); Dungeon.level.discover( doorPos ); @@ -223,7 +223,7 @@ public class ScrollOfTeleportation extends Scroll { ch.sprite.interruptMotion(); if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[ch.pos]){ - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); } ch.move( pos ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index 57a7590c7..a09f34793 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -44,7 +44,7 @@ public class ScrollOfTerror extends Scroll { public void doRead() { new Flare( 5, 32 ).color( 0xFF0000, true ).show( curUser.sprite, 2f ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); int count = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java index ae54a6f0c..f6c385694 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java @@ -40,7 +40,7 @@ public class ScrollOfAffection extends ExoticScroll { public void doRead() { curUser.sprite.centerEmitter().start( Speck.factory( Speck.HEART ), 0.2f, 5 ); - Sample.INSTANCE.play( Assets.SND_CHARMS ); + Sample.INSTANCE.play( Assets.Sounds.CHARMS ); Invisibility.dispel(); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java index 77e0e2590..e37672a73 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java @@ -50,7 +50,7 @@ public class ScrollOfConfusion extends ExoticScroll { setKnown(); curUser.sprite.centerEmitter().start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); readAnimation(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java index 415956b09..64d854a8d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java @@ -57,7 +57,7 @@ public class ScrollOfDivination extends ExoticScroll { readAnimation(); setKnown(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); HashSet> potions = Potion.getUnknown(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java index 3de26295e..f16223cca 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java @@ -77,7 +77,7 @@ public class ScrollOfEnchantment extends ExoticScroll { GLog.p(Messages.get(StoneOfEnchantment.class, "weapon")); ((ScrollOfEnchantment)curItem).readAnimation(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); Enchanting.show(curUser, item); } @@ -114,7 +114,7 @@ public class ScrollOfEnchantment extends ExoticScroll { GLog.p(Messages.get(StoneOfEnchantment.class, "armor")); ((ScrollOfEnchantment)curItem).readAnimation(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); Enchanting.show(curUser, item); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java index e52097bca..1db1627d6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java @@ -37,7 +37,7 @@ public class ScrollOfForesight extends ExoticScroll { @Override public void doRead() { SpellSprite.show( curUser, SpellSprite.MAP ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); Buff.affect(curUser, Foresight.class, Foresight.DURATION); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java index 62566b5eb..60da46c83 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java @@ -41,7 +41,7 @@ public class ScrollOfMysticalEnergy extends ExoticScroll { //append buff Buff.affect(curUser, ArtifactRecharge.class).set( 30 ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); SpellSprite.show( curUser, SpellSprite.CHARGE ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java index abc55c5bc..e1167813d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java @@ -40,7 +40,7 @@ public class ScrollOfPetrification extends ExoticScroll { @Override public void doRead() { new Flare( 5, 32 ).color( 0xFF0000, true ).show( curUser.sprite, 2f ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java index 5f9de787d..174ce7d8e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java @@ -45,7 +45,7 @@ public class ScrollOfPolymorph extends ExoticScroll { public void doRead() { new Flare( 5, 32 ).color( 0xFFFFFF, true ).show( curUser.sprite, 2f ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPrismaticImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPrismaticImage.java index 2f8db07ba..5283e16a2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPrismaticImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPrismaticImage.java @@ -55,7 +55,7 @@ public class ScrollOfPrismaticImage extends ExoticScroll { setKnown(); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); readAnimation(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java index 8d1c58320..a18c7be2e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java @@ -44,7 +44,7 @@ public class ScrollOfPsionicBlast extends ExoticScroll { GameScene.flash( 0xFFFFFF ); - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); Invisibility.dispel(); int targets = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java index f6fd8051d..58bfb2e9f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java @@ -101,7 +101,7 @@ public class BeaconOfReturning extends Spell { GLog.i( Messages.get(this, "set") ); hero.sprite.operate( hero.pos ); - Sample.INSTANCE.play( Assets.SND_BEACON ); + Sample.INSTANCE.play( Assets.Sounds.BEACON ); updateQuickslot(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java index ec1e3b967..58adf7ab9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java @@ -48,7 +48,7 @@ public class CurseInfusion extends InventorySpell { protected void onItemSelected(Item item) { CellEmitter.get(curUser.pos).burst(ShadowParticle.UP, 5); - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); item.cursed = true; if (item instanceof MeleeWeapon || item instanceof SpiritBow) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java index 9562a06ab..9787b75a4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java @@ -42,7 +42,7 @@ public class FeatherFall extends Spell { protected void onCast(Hero hero) { Buff.append(hero, FeatherBuff.class, 30f); hero.sprite.operate(hero.pos); - Sample.INSTANCE.play(Assets.SND_READ ); + Sample.INSTANCE.play(Assets.Sounds.READ ); hero.sprite.emitter().burst( Speck.factory( Speck.JET ), 20); GLog.p(Messages.get(this, "light")); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/InventorySpell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/InventorySpell.java index 1faf4a5d2..0373cd5be 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/InventorySpell.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/InventorySpell.java @@ -60,7 +60,7 @@ public abstract class InventorySpell extends Spell { curUser.busy(); (curUser.sprite).operate( curUser.pos ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java index a30401027..1fa7064c9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java @@ -53,7 +53,7 @@ public class ReclaimTrap extends TargetedSpell { if (t != null && t.active && t.visible) { t.disarm(); - Sample.INSTANCE.play(Assets.SND_LIGHTNING); + Sample.INSTANCE.play(Assets.Sounds.LIGHTNING); ScrollOfRecharging.charge(hero); storedTrap = t.getClass(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TargetedSpell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TargetedSpell.java index 16f119e43..49d2ab0eb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TargetedSpell.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TargetedSpell.java @@ -51,7 +51,7 @@ public abstract class TargetedSpell extends Spell { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } private static CellSelector.Listener targeter = new CellSelector.Listener(){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java index e3400c590..ca5753007 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java @@ -69,7 +69,7 @@ public abstract class InventoryStone extends Runestone { curUser.busy(); curUser.sprite.operate(curUser.pos); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); Invisibility.dispel(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAffection.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAffection.java index d3253496e..007443254 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAffection.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAffection.java @@ -53,7 +53,7 @@ public class StoneOfAffection extends Runestone { } } - Sample.INSTANCE.play( Assets.SND_CHARMS ); + Sample.INSTANCE.play( Assets.Sounds.CHARMS ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java index 3be0fd5f1..724f4f1bd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java @@ -54,7 +54,7 @@ public class StoneOfAggression extends Runestone { Buff.prolong(ch, Aggression.class, Aggression.DURATION); } CellEmitter.center(cell).start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); - Sample.INSTANCE.play( Assets.SND_READ ); + Sample.INSTANCE.play( Assets.Sounds.READ ); } else { //Item.onThrow Heap heap = Dungeon.level.drop( this, cell ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java index 28049fe77..09f217707 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java @@ -79,10 +79,10 @@ public class StoneOfClairvoyance extends Runestone { } if (noticed) { - Sample.INSTANCE.play( Assets.SND_SECRET ); + Sample.INSTANCE.play( Assets.Sounds.SECRET ); } - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); GameScene.updateFog(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java index 39a665907..b48a9391e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java @@ -59,7 +59,7 @@ public class StoneOfDeepenedSleep extends Runestone { } } - Sample.INSTANCE.play( Assets.SND_LULLABY ); + Sample.INSTANCE.play( Assets.Sounds.LULLABY ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java index 429afa38c..70ad0fb5b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java @@ -99,6 +99,6 @@ public class StoneOfDisarming extends Runestone { CellEmitter.get(t.pos).burst(Speck.factory(Speck.STEAM), 6); } - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java index ca34e6fa2..1e6ef9ba2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java @@ -58,7 +58,7 @@ public class StoneOfFlock extends Runestone { } } CellEmitter.get(cell).burst(Speck.factory(Speck.WOOL), 4); - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java index 8aaf700ec..5f4081511 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java @@ -231,7 +231,7 @@ public class StoneOfIntuition extends InventoryStone { super.onClick(); } }; - Image im = new Image(Assets.CONS_ICONS, 7*i, row, 7, 8); + Image im = new Image(Assets.Interfaces.CONS_ICONS, 7*i, row, 7, 8); im.scale.set(2f); btn.icon(im); btn.setRect(left + placed*BTN_SIZE, top, BTN_SIZE, BTN_SIZE); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java index 046302b6b..6acb2b503 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java @@ -47,7 +47,7 @@ public class StoneOfShock extends Runestone { @Override protected void activate(int cell) { - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); ArrayList arcs = new ArrayList<>(); int hits = 0; @@ -69,7 +69,7 @@ public class StoneOfShock extends Runestone { if (hits > 0) { curUser.sprite.parent.addToFront( new Lightning( arcs, null ) ); curUser.sprite.centerEmitter().burst(EnergyParticle.FACTORY, 10); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); curUser.belongings.charge(1f + hits); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java index 4c450ea5c..93224a3d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java @@ -230,7 +230,7 @@ public class CursedWand { toDamage.sprite.emitter().start(ShadowParticle.UP, 0.05f, 10); if (toDamage == Dungeon.hero){ - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); if (!toDamage.isAlive()) { if (origin != null) { Dungeon.fail( origin.getClass() ); @@ -240,7 +240,7 @@ public class CursedWand { } } } else { - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } afterZap.call(); } @@ -360,7 +360,7 @@ public class CursedWand { GameScene.add(Blob.seed(Dungeon.level.randomDestination(null), 10, Fire.class)); } while (Random.Int(5) != 0); new Flare(8, 32).color(0xFFFF66, true).show(user.sprite, 2f); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); GLog.p(Messages.get(CursedWand.class, "grass")); GLog.w(Messages.get(CursedWand.class, "fire")); afterZap.call(); @@ -380,7 +380,7 @@ public class CursedWand { Generator.Category.RING, Generator.Category.WAND)); } while (reward.level() < 1); //play vfx/sfx manually as mimic isn't in the scene yet - Sample.INSTANCE.play(Assets.SND_MIMIC, 1, 0.85f); + Sample.INSTANCE.play(Assets.Sounds.MIMIC, 1, 0.85f); CellEmitter.get(mimic.pos).burst(Speck.factory(Speck.STAR), 10); mimic.items.clear(); mimic.items.add(reward); @@ -464,7 +464,7 @@ public class CursedWand { user.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 705f6c341..e2db0b2d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -295,7 +295,7 @@ public abstract class Wand extends Item { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } public void staffFx( MagesStaff.StaffParticle particle ){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java index 7495a88a4..ff8d087f8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java @@ -64,7 +64,7 @@ public class WandOfBlastWave extends DamageWand { @Override protected void onZap(Ballistica bolt) { - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); BlastWave.blast(bolt.collisionPos); //presses all tiles in the AOE first, with the exception of tengu dart traps @@ -182,7 +182,7 @@ public class WandOfBlastWave extends DamageWand { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play(Assets.SND_ZAP); + Sample.INSTANCE.play(Assets.Sounds.ZAP); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java index 5950e8ecd..b65dacd5e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java @@ -77,7 +77,7 @@ public class WandOfCorrosion extends Wand { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play(Assets.SND_ZAP); + Sample.INSTANCE.play(Assets.Sounds.ZAP); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 120d98cfa..c078300cd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -268,7 +268,7 @@ public class WandOfCorruption extends Wand { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index 3e579e634..685e4a14a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -184,7 +184,7 @@ public class WandOfFireblast extends DamageWand { curUser.sprite, bolt.path.get(dist/2), callback ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java index a72144728..dbafc4c0b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java @@ -98,7 +98,7 @@ public class WandOfFrost extends DamageWand { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play(Assets.SND_ZAP); + Sample.INSTANCE.play(Assets.Sounds.ZAP); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index 11115bb3d..d4f0c3751 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -136,7 +136,7 @@ public class WandOfLightning extends DamageWand { //don't want to wait for the effect before processing damage. curUser.sprite.parent.addToFront( new Lightning( arcs, null ) ); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); callback.call(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java index 9b45675ad..67f1fe68a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java @@ -178,7 +178,7 @@ public class WandOfLivingEarth extends DamageWand { curUser.sprite, bolt.collisionPos, callback); - Sample.INSTANCE.play(Assets.SND_ZAP); + Sample.INSTANCE.play(Assets.Sounds.ZAP); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java index a7a6caad0..b40bdc9e6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java @@ -94,7 +94,7 @@ public class WandOfPrismaticLight extends DamageWand { if (ch.properties().contains(Char.Property.DEMONIC) || ch.properties().contains(Char.Property.UNDEAD)){ ch.sprite.emitter().start( ShadowParticle.UP, 0.05f, 10+buffedLvl() ); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); ch.damage(Math.round(dmg*1.333f), this); } else { @@ -132,7 +132,7 @@ public class WandOfPrismaticLight extends DamageWand { CellEmitter.center(c).burst( RainbowParticle.BURST, Random.IntRange( 1, 2 ) ); } if (noticed) - Sample.INSTANCE.play( Assets.SND_SECRET ); + Sample.INSTANCE.play( Assets.Sounds.SECRET ); GameScene.updateFog(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index c4550dcb8..68cda5bea 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -241,7 +241,7 @@ public class WandOfRegrowth extends Wand { bolt.path.get(dist/2), callback ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java index a939db1ec..a00856fea 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java @@ -111,7 +111,7 @@ public class WandOfTransfusion extends Wand { } else { ch.damage(Random.NormalIntRange(3 + buffedLvl()/2, 6+buffedLvl()), this); ch.sprite.emitter().start(ShadowParticle.UP, 0.05f, 10 + buffedLvl()); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } //and grants a self shield diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java index bae278c4e..933778ca3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java @@ -120,7 +120,7 @@ public class WandOfWarding extends Wand { if (bolt.dist > 10){ m.setSpeed(bolt.dist*20); } - Sample.INSTANCE.play(Assets.SND_ZAP); + Sample.INSTANCE.play(Assets.Sounds.ZAP); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java index b3406f9cb..f9e0e3d72 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java @@ -298,7 +298,7 @@ public class SpiritBow extends Weapon { user.busy(); - Sample.INSTANCE.play( Assets.SND_MISS, 0.6f, 0.6f, 1.5f ); + Sample.INSTANCE.play( Assets.Sounds.MISS, 0.6f, 0.6f, 1.5f ); ((MissileSprite) user.sprite.parent.recycle(MissileSprite.class)). reset(user.sprite, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Annoying.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Annoying.java index dd6a77aa1..11887ec85 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Annoying.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Annoying.java @@ -46,7 +46,7 @@ public class Annoying extends Weapon.Enchantment { mob.beckon(attacker.pos); } attacker.sprite.centerEmitter().start(Speck.factory(Speck.SCREAM), 0.3f, 3); - Sample.INSTANCE.play(Assets.SND_MIMIC); + Sample.INSTANCE.play(Assets.Sounds.MIMIC); Invisibility.dispel(); GLog.n(Messages.get(this, "msg_" + (Random.Int(5)+1))); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java index fc3e58f5b..1a3c95e28 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java @@ -60,7 +60,7 @@ public class Shocking extends Weapon.Enchantment { } attacker.sprite.parent.addToFront( new Lightning( arcs, null ) ); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 59c994763..c9f5612c5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -346,7 +346,7 @@ public class MagesStaff extends MeleeWeapon { } private void applyWand(Wand wand){ - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); curUser.sprite.emitter().burst( ElmoParticle.FACTORY, 12 ); evoke(curUser); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java index 2e2e165fc..1f0253c58 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java @@ -74,6 +74,6 @@ public class ForceCube extends MissileWeapon { rangedHit( null, cell ); WandOfBlastWave.BlastWave.blast(cell); - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/ShockingDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/ShockingDart.java index efa1b8a98..b1e763d58 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/ShockingDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/ShockingDart.java @@ -49,7 +49,7 @@ public class ShockingDart extends TippedDart { arcs.add(new Lightning.Arc(new PointF(s.x, s.y + s.height / 2), new PointF(s.x + s.width, s.y + s.height / 2))); arcs.add(new Lightning.Arc(new PointF(s.x + s.width / 2, s.y), new PointF(s.x + s.width / 2, s.y + s.height))); s.parent.add(new Lightning(arcs, null)); - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } return super.proc(attacker, defender, damage); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java index bc2948c82..dc5b13c5d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java @@ -83,12 +83,12 @@ public class CavesLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_CAVES; + return Assets.Environment.TILES_CAVES; } @Override public String waterTex() { - return Assets.WATER_CAVES; + return Assets.Environment.WATER_CAVES; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index 9e6135550..16342c650 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -70,12 +70,12 @@ public class CityLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_CITY; + return Assets.Environment.TILES_CITY; } @Override public String waterTex() { - return Assets.WATER_CITY; + return Assets.Environment.WATER_CITY; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java index 8329cc0dc..b7b76b6d8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java @@ -37,12 +37,12 @@ public class DeadEndLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_CAVES; + return Assets.Environment.TILES_CAVES; } @Override public String waterTex() { - return Assets.WATER_HALLS; + return Assets.Environment.WATER_HALLS; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java index c0441d15c..6f26856a2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java @@ -109,12 +109,12 @@ public class HallsLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_HALLS; + return Assets.Environment.TILES_HALLS; } @Override public String waterTex() { - return Assets.WATER_HALLS; + return Assets.Environment.WATER_HALLS; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java index 397f0b022..98a364eef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java @@ -51,12 +51,12 @@ public class LastLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_HALLS; + return Assets.Environment.TILES_HALLS; } @Override public String waterTex() { - return Assets.WATER_HALLS; + return Assets.Environment.WATER_HALLS; } @Override @@ -227,7 +227,7 @@ public class LastLevel extends Level { public static class CustomFloor extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; } private static final int[] CANDLES = new int[]{ @@ -298,7 +298,7 @@ public class LastLevel extends Level { public static class CenterPieceVisuals extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; tileW = 16; tileH = 10; @@ -328,7 +328,7 @@ public class LastLevel extends Level { public static class CenterPieceWalls extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; tileW = 16; tileH = 9; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java index e64ee64e7..aaf9781d5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java @@ -50,12 +50,12 @@ public class LastShopLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_CITY; + return Assets.Environment.TILES_CITY; } @Override public String waterTex() { - return Assets.WATER_CITY; + return Assets.Environment.WATER_CITY; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index cc03fc160..386970b57 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -941,7 +941,7 @@ public abstract class Level implements Bundlable { if (bubble != null){ - Sample.INSTANCE.play(Assets.SND_TRAP); + Sample.INSTANCE.play(Assets.Sounds.TRAP); discover(cell); @@ -949,7 +949,7 @@ public abstract class Level implements Bundlable { } else if (timeFreeze != null){ - Sample.INSTANCE.play(Assets.SND_TRAP); + Sample.INSTANCE.play(Assets.Sounds.TRAP); discover(cell); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCavesBossLevel.java index a351728ab..37d90aa36 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCavesBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCavesBossLevel.java @@ -70,12 +70,12 @@ public class NewCavesBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_CAVES; + return Assets.Environment.TILES_CAVES; } @Override public String waterTex() { - return Assets.WATER_CAVES; + return Assets.Environment.WATER_CAVES; } private static int WIDTH = 33; @@ -231,7 +231,7 @@ public class NewCavesBossLevel extends Level { CellEmitter.get( entrance ).start( Speck.factory( Speck.ROCK ), 0.07f, 10 ); Camera.main.shake( 3, 0.7f ); - Sample.INSTANCE.play( Assets.SND_ROCKS ); + Sample.INSTANCE.play( Assets.Sounds.ROCKS ); NewDM300 boss = new NewDM300(); boss.state = boss.WANDERING; @@ -534,7 +534,7 @@ public class NewCavesBossLevel extends Level { public static class CityEntrance extends CustomTilemap{ { - texture = Assets.CAVES_BOSS; + texture = Assets.Environment.CAVES_BOSS; } private static short[] entryWay = new short[]{ @@ -582,7 +582,7 @@ public class NewCavesBossLevel extends Level { public static class EntranceOverhang extends CustomTilemap{ { - texture = Assets.CAVES_BOSS; + texture = Assets.Environment.CAVES_BOSS; } private static short[] entryWay = new short[]{ @@ -626,7 +626,7 @@ public class NewCavesBossLevel extends Level { public static class ArenaVisuals extends CustomTilemap { { - texture = Assets.CAVES_BOSS; + texture = Assets.Environment.CAVES_BOSS; } @Override @@ -737,7 +737,7 @@ public class NewCavesBossLevel extends Level { Char ch = Actor.findChar(cell); if (ch != null && !(ch instanceof NewDM300)) { - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); ch.damage( Random.NormalIntRange(6, 12), Electricity.class); ch.sprite.flash(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCityBossLevel.java index 42d380709..90d30840e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCityBossLevel.java @@ -82,12 +82,12 @@ public class NewCityBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_CITY; + return Assets.Environment.TILES_CITY; } @Override public String waterTex() { - return Assets.WATER_CITY; + return Assets.Environment.WATER_CITY; } private static final String IMP_SHOP = "imp_shop"; @@ -363,7 +363,7 @@ public class NewCityBossLevel extends Level { public static class CustomGroundVisuals extends CustomTilemap { { - texture = Assets.CITY_BOSS; + texture = Assets.Environment.CITY_BOSS; tileW = 15; tileH = 48; } @@ -546,7 +546,7 @@ public class NewCityBossLevel extends Level { public static class CustomWallVisuals extends CustomTilemap { { - texture = Assets.CITY_BOSS; + texture = Assets.Environment.CITY_BOSS; tileW = 15; tileH = 48; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewHallsBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewHallsBossLevel.java index c415891f6..d51e16e39 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewHallsBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewHallsBossLevel.java @@ -60,12 +60,12 @@ public class NewHallsBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_HALLS; + return Assets.Environment.TILES_HALLS; } @Override public String waterTex() { - return Assets.WATER_HALLS; + return Assets.Environment.WATER_HALLS; } @Override @@ -271,7 +271,7 @@ public class NewHallsBossLevel extends Level { public static class CenterPieceVisuals extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; tileW = 9; tileH = 8; @@ -310,7 +310,7 @@ public class NewHallsBossLevel extends Level { public static class CenterPieceWalls extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; tileW = 9; tileH = 9; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java index de6de4fe8..765d087f1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java @@ -89,12 +89,12 @@ public class NewPrisonBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_PRISON; + return Assets.Environment.TILES_PRISON; } @Override public String waterTex() { - return Assets.WATER_PRISON; + return Assets.Environment.WATER_PRISON; } private static final String STATE = "state"; @@ -441,7 +441,7 @@ public class NewPrisonBossLevel extends Level { tengu.sprite.kill(); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.TRAP_MAZES; break; @@ -461,7 +461,7 @@ public class NewPrisonBossLevel extends Level { tengu.notice(); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.FIGHT_ARENA; break; @@ -511,7 +511,7 @@ public class NewPrisonBossLevel extends Level { } GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.WON; break; @@ -578,7 +578,7 @@ public class NewPrisonBossLevel extends Level { GameScene.add(f, false); customTiles.add(f); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); int roomCenter = (mazeCells[i].left + mazeCells[i].right)/2 + (mazeCells[i].top + mazeCells[i].bottom)/2 * width(); Camera.main.panTo(DungeonTilemap.tileCenterToWorld(roomCenter), 5f); @@ -713,7 +713,7 @@ public class NewPrisonBossLevel extends Level { public static class FadingTraps extends CustomTilemap { { - texture = Assets.TERRAIN_FEATURES; + texture = Assets.Environment.TERRAIN_FEATURES; } Rect area; @@ -813,7 +813,7 @@ public class NewPrisonBossLevel extends Level { public static class exitVisual extends CustomTilemap { { - texture = Assets.PRISON_EXIT_NEW; + texture = Assets.Environment.PRISON_EXIT_NEW; tileW = 14; tileH = 11; @@ -859,7 +859,7 @@ public class NewPrisonBossLevel extends Level { public static class exitVisualWalls extends CustomTilemap { { - texture = Assets.PRISON_EXIT_NEW; + texture = Assets.Environment.PRISON_EXIT_NEW; tileW = 14; tileH = 22; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCavesBossLevel.java index f62d8b0a7..2a96dd5da 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCavesBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCavesBossLevel.java @@ -70,12 +70,12 @@ public class OldCavesBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_CAVES; + return Assets.Environment.TILES_CAVES; } @Override public String waterTex() { - return Assets.WATER_CAVES; + return Assets.Environment.WATER_CAVES; } private static final String DOOR = "door"; @@ -247,7 +247,7 @@ public class OldCavesBossLevel extends Level { CellEmitter.get( arenaDoor ).start( Speck.factory( Speck.ROCK ), 0.07f, 10 ); Camera.main.shake( 3, 0.7f ); - Sample.INSTANCE.play( Assets.SND_ROCKS ); + Sample.INSTANCE.play( Assets.Sounds.ROCKS ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCityBossLevel.java index aef0a808a..d7a735ffb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCityBossLevel.java @@ -64,12 +64,12 @@ public class OldCityBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_CITY; + return Assets.Environment.TILES_CITY; } @Override public String waterTex() { - return Assets.WATER_CITY; + return Assets.Environment.WATER_CITY; } private static final String DOOR = "door"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldHallsBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldHallsBossLevel.java index 283a7e39d..ddd6fa749 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldHallsBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldHallsBossLevel.java @@ -63,12 +63,12 @@ public class OldHallsBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_HALLS; + return Assets.Environment.TILES_HALLS; } @Override public String waterTex() { - return Assets.WATER_HALLS; + return Assets.Environment.WATER_HALLS; } private static final String STAIRS = "stairs"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java index 3817d5363..0e2229d73 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java @@ -86,12 +86,12 @@ public class OldPrisonBossLevel extends Level { @Override public String tilesTex() { - return Assets.TILES_PRISON; + return Assets.Environment.TILES_PRISON; } @Override public String waterTex() { - return Assets.WATER_PRISON; + return Assets.Environment.WATER_PRISON; } private static final String STATE = "state"; @@ -362,7 +362,7 @@ public class OldPrisonBossLevel extends Level { GameScene.resetMap(); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.MAZE; break; @@ -393,7 +393,7 @@ public class OldPrisonBossLevel extends Level { tengu.notice(); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.FIGHT_ARENA; break; @@ -447,7 +447,7 @@ public class OldPrisonBossLevel extends Level { drop(item, randomTenguArenaCell()); GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.WON; break; @@ -616,7 +616,7 @@ public class OldPrisonBossLevel extends Level { public static class exitVisual extends CustomTilemap { { - texture = Assets.PRISON_EXIT_OLD; + texture = Assets.Environment.PRISON_EXIT_OLD; tileW = 12; tileH = 14; @@ -659,7 +659,7 @@ public class OldPrisonBossLevel extends Level { public static class exitVisualWalls extends CustomTilemap { { - texture = Assets.PRISON_EXIT_OLD; + texture = Assets.Environment.PRISON_EXIT_OLD; tileW = 12; tileH = 14; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java index e799238a3..0becf9ed0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java @@ -84,12 +84,12 @@ public class PrisonLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_PRISON; + return Assets.Environment.TILES_PRISON; } @Override public String waterTex() { - return Assets.WATER_PRISON; + return Assets.Environment.WATER_PRISON; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java index e67095d6c..4533d5f0e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java @@ -78,12 +78,12 @@ public class SewerLevel extends RegularLevel { @Override public String tilesTex() { - return Assets.TILES_SEWERS; + return Assets.Environment.TILES_SEWERS; } @Override public String waterTex() { - return Assets.WATER_SEWERS; + return Assets.Environment.WATER_SEWERS; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java index 3426bbc0a..e58a474e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java @@ -77,7 +77,7 @@ public class Chasm { jumpConfirmed = false; - Sample.INSTANCE.play( Assets.SND_FALLING ); + Sample.INSTANCE.play( Assets.Sounds.FALLING ); Buff buff = Dungeon.hero.buff(TimekeepersHourglass.timeFreeze.class); if (buff != null) buff.detach(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java index b5400fca6..4f3ecbc2b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java @@ -38,7 +38,7 @@ public class Door { if (Dungeon.level.heroFOV[pos]) { Dungeon.observe(); - Sample.INSTANCE.play( Assets.SND_OPEN ); + Sample.INSTANCE.play( Assets.Sounds.OPEN ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/GooBossRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/GooBossRoom.java index 37f295c6e..8249434df 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/GooBossRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/GooBossRoom.java @@ -59,7 +59,7 @@ public abstract class GooBossRoom extends StandardRoom { public static class GooNest extends CustomTilemap { { - texture = Assets.SEWER_BOSS; + texture = Assets.Environment.SEWER_BOSS; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/SewerBossExitRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/SewerBossExitRoom.java index be9368f19..5fca6e2a4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/SewerBossExitRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/SewerBossExitRoom.java @@ -74,7 +74,7 @@ public class SewerBossExitRoom extends ExitRoom { public static class SewerExit extends CustomTilemap { { - texture = Assets.SEWER_BOSS; + texture = Assets.Environment.SEWER_BOSS; tileW = 3; tileH = 3; @@ -105,7 +105,7 @@ public class SewerBossExitRoom extends ExitRoom { public static class SewerExitOverhang extends CustomTilemap { { - texture = Assets.SEWER_BOSS; + texture = Assets.Environment.SEWER_BOSS; tileW = 3; tileH = 2; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/DemonSpawnerRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/DemonSpawnerRoom.java index acc5b174c..ec072c4f0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/DemonSpawnerRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/DemonSpawnerRoom.java @@ -83,7 +83,7 @@ public class DemonSpawnerRoom extends SpecialRoom { public static class CustomFloor extends CustomTilemap { { - texture = Assets.HALLS_SP; + texture = Assets.Environment.HALLS_SP; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java index 71c65b40d..3cf2774b8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java @@ -101,7 +101,7 @@ public class MassGraveRoom extends SpecialRoom { private static final int FLOOR = 7; { - texture = Assets.PRISON_QUEST; + texture = Assets.Environment.PRISON_QUEST; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/WeakFloorRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/WeakFloorRoom.java index caa2cbb71..dd527cf13 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/WeakFloorRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/WeakFloorRoom.java @@ -75,7 +75,7 @@ public class WeakFloorRoom extends SpecialRoom { public static class HiddenWell extends CustomTilemap { { - texture = Assets.WEAK_FLOOR; + texture = Assets.Environment.WEAK_FLOOR; tileW = tileH = 1; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RitualSiteRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RitualSiteRoom.java index 5fa26c41e..8f7f5e981 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RitualSiteRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RitualSiteRoom.java @@ -71,7 +71,7 @@ public class RitualSiteRoom extends StandardRoom { public static class RitualMarker extends CustomTilemap { { - texture = Assets.PRISON_QUEST; + texture = Assets.Environment.PRISON_QUEST; tileW = tileH = 3; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java index 126d79295..4414f8407 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java @@ -49,6 +49,6 @@ public class AlarmTrap extends Trap { CellEmitter.center( pos ).start( Speck.factory( Speck.SCREAM ), 0.3f, 3 ); } - Sample.INSTANCE.play( Assets.SND_ALERT ); + Sample.INSTANCE.play( Assets.Sounds.ALERT ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/BlazingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/BlazingTrap.java index 7b2066abe..c9b30503c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/BlazingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/BlazingTrap.java @@ -52,6 +52,6 @@ public class BlazingTrap extends Trap { CellEmitter.get(i).burst(FlameParticle.FACTORY, 5); } } - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ChillingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ChillingTrap.java index c883013e5..26261d2bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ChillingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ChillingTrap.java @@ -41,7 +41,7 @@ public class ChillingTrap extends Trap{ public void activate() { if (Dungeon.level.heroFOV[ pos ]){ Splash.at( pos, 0xFFB2D6FF, 5); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } for( int i : PathFinder.NEIGHBOURS9) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java index 11c9548b1..c061852a4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java @@ -52,7 +52,7 @@ public class CursingTrap extends Trap { public void activate() { if (Dungeon.level.heroFOV[ pos ]) { CellEmitter.get(pos).burst(ShadowParticle.UP, 5); - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); } Heap heap = Dungeon.level.heaps.get( pos ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java index c26dd6dfe..85f7becb5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java @@ -56,7 +56,7 @@ public class DisarmingTrap extends Trap{ Dungeon.level.visited[cell+i] = true; GameScene.updateFog(); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); CellEmitter.get(pos).burst(Speck.factory(Speck.LIGHT), 4); } } @@ -87,7 +87,7 @@ public class DisarmingTrap extends Trap{ GLog.w( Messages.get(this, "disarm") ); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); CellEmitter.get(pos).burst(Speck.factory(Speck.LIGHT), 4); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java index ae6704f6c..a532c0251 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java @@ -65,7 +65,7 @@ public class DisintegrationTrap extends Trap { if (target != null) { if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[target.pos]) { - Sample.INSTANCE.play(Assets.SND_RAY); + Sample.INSTANCE.play(Assets.Sounds.RAY); ShatteredPixelDungeon.scene().add(new Beam.DeathRay(DungeonTilemap.tileCenterToWorld(pos), target.sprite.center())); } target.damage( Random.NormalIntRange(30, 50) + Dungeon.depth, this ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java index 47393162a..c8887eec3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java @@ -45,7 +45,7 @@ public class FlashingTrap extends Trap { @Override public void trigger() { if (Dungeon.level.heroFOV[pos]){ - Sample.INSTANCE.play(Assets.SND_TRAP); + Sample.INSTANCE.play(Assets.Sounds.TRAP); } //this trap is not disarmed by being triggered reveal(); @@ -72,7 +72,7 @@ public class FlashingTrap extends Trap { if (Dungeon.level.heroFOV[pos]) { GameScene.flash(0xFFFFFF); - Sample.INSTANCE.play( Assets.SND_BLAST ); + Sample.INSTANCE.play( Assets.Sounds.BLAST ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java index 633a416ca..526a1329d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java @@ -72,7 +72,7 @@ public class FlockTrap extends Trap { } } } - Sample.INSTANCE.play(Assets.SND_PUFF); + Sample.INSTANCE.play(Assets.Sounds.PUFF); Actor.remove(this); return true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FrostTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FrostTrap.java index 90746bfc4..fe71204d8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FrostTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FrostTrap.java @@ -43,7 +43,7 @@ public class FrostTrap extends Trap { if (Dungeon.level.heroFOV[ pos ]){ Splash.at( pos, 0xFFB2D6FF, 5); - Sample.INSTANCE.play( Assets.SND_SHATTER ); + Sample.INSTANCE.play( Assets.Sounds.SHATTER ); } PathFinder.buildDistanceMap( pos, BArray.not( Dungeon.level.solid, null ), 2 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java index 3711fe5fd..d75a688cb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java @@ -93,13 +93,13 @@ public class GrimTrap extends Trap { public void call() { finalTarget.damage(finalDmg, trap); if (finalTarget == Dungeon.hero) { - Sample.INSTANCE.play(Assets.SND_CURSED); + Sample.INSTANCE.play(Assets.Sounds.CURSED); if (!finalTarget.isAlive()) { Dungeon.fail( GrimTrap.class ); GLog.n( Messages.get(GrimTrap.class, "ondeath") ); } } else { - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } finalTarget.sprite.emitter().burst(ShadowParticle.UP, 10); Actor.remove(toRemove); @@ -111,7 +111,7 @@ public class GrimTrap extends Trap { }); } else { CellEmitter.get(pos).burst(ShadowParticle.UP, 10); - Sample.INSTANCE.play(Assets.SND_BURNING); + Sample.INSTANCE.play(Assets.Sounds.BURNING); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java index c4f66a7a2..4d752ad3e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java @@ -43,7 +43,7 @@ public class GrippingTrap extends Trap { @Override public void trigger() { if (Dungeon.level.heroFOV[pos]){ - Sample.INSTANCE.play(Assets.SND_TRAP); + Sample.INSTANCE.play(Assets.Sounds.TRAP); } //this trap is not disarmed by being triggered reveal(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GuardianTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GuardianTrap.java index 2fd7fa113..9cbe0f471 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GuardianTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GuardianTrap.java @@ -52,7 +52,7 @@ public class GuardianTrap extends Trap { CellEmitter.center(pos).start( Speck.factory(Speck.SCREAM), 0.3f, 3 ); } - Sample.INSTANCE.play( Assets.SND_ALERT ); + Sample.INSTANCE.play( Assets.Sounds.ALERT ); for (int i = 0; i < (Dungeon.depth - 5)/5; i++){ Guardian guardian = new Guardian(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java index e5c04192a..71acd0a2a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java @@ -94,7 +94,7 @@ public class PoisonDartTrap extends Trap { Dungeon.fail( trap.getClass() ); } Buff.affect( finalTarget, Poison.class ).set( poisonAmount() ); - Sample.INSTANCE.play(Assets.SND_HIT, 1, 1, Random.Float(0.8f, 1.25f)); + Sample.INSTANCE.play(Assets.Sounds.HIT, 1, 1, Random.Float(0.8f, 1.25f)); finalTarget.sprite.bloodBurstA(finalTarget.sprite.center(), dmg); finalTarget.sprite.flash(); Actor.remove(toRemove); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/RockfallTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/RockfallTrap.java index 9aa07787e..9b3a2e657 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/RockfallTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/RockfallTrap.java @@ -105,7 +105,7 @@ public class RockfallTrap extends Trap { if (seen){ Camera.main.shake(3, 0.7f); - Sample.INSTANCE.play(Assets.SND_ROCKS); + Sample.INSTANCE.play(Assets.Sounds.ROCKS); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ShockingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ShockingTrap.java index cbded53d7..b729d84b1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ShockingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ShockingTrap.java @@ -40,7 +40,7 @@ public class ShockingTrap extends Trap { public void activate() { if (Dungeon.level.heroFOV[pos]){ - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } for( int i : PathFinder.NEIGHBOURS9) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/StormTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/StormTrap.java index 678275ac4..4a836d641 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/StormTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/StormTrap.java @@ -41,7 +41,7 @@ public class StormTrap extends Trap { public void activate() { if (Dungeon.level.heroFOV[pos]){ - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); } PathFinder.buildDistanceMap( pos, BArray.not( Dungeon.level.solid, null ), 2 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java index 331cb7b3f..343574688 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java @@ -47,7 +47,7 @@ public class TeleportationTrap extends Trap { public void activate() { CellEmitter.get(pos).start(Speck.factory(Speck.LIGHT), 0.2f, 3); - Sample.INSTANCE.play( Assets.SND_TELEPORT ); + Sample.INSTANCE.play( Assets.Sounds.TELEPORT ); Char ch = Actor.findChar( pos); if (ch != null && !ch.flying) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java index 5f31621ce..2ff0e2d5a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java @@ -88,7 +88,7 @@ public abstract class Trap implements Bundlable { public void trigger() { if (active) { if (Dungeon.level.heroFOV[pos]) { - Sample.INSTANCE.play(Assets.SND_TRAP); + Sample.INSTANCE.play(Assets.Sounds.TRAP); } disarm(); reveal(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java index 7197c1935..f4c621985 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java @@ -48,7 +48,7 @@ public class WarpingTrap extends Trap { @Override public void activate() { CellEmitter.get(pos).start(Speck.factory(Speck.LIGHT), 0.2f, 3); - Sample.INSTANCE.play(Assets.SND_TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); Char ch = Actor.findChar(pos); if (ch != null && !ch.flying) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java index 47fac73d6..84ede08a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java @@ -79,7 +79,7 @@ public class WornDartTrap extends Trap { if (finalTarget == Dungeon.hero && !finalTarget.isAlive()){ Dungeon.fail( trap.getClass() ); } - Sample.INSTANCE.play(Assets.SND_HIT, 1, 1, Random.Float(0.8f, 1.25f)); + Sample.INSTANCE.play(Assets.Sounds.HIT, 1, 1, Random.Float(0.8f, 1.25f)); finalTarget.sprite.bloodBurstA(finalTarget.sprite.center(), dmg); finalTarget.sprite.flash(); Actor.remove(toRemove); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java index 56b051245..107aaf7db 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java @@ -23,8 +23,10 @@ package com.shatteredpixel.shatteredpixeldungeon.messages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.I18NBundle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.watabou.utils.FileUtils; import java.util.ArrayList; import java.util.Arrays; @@ -54,17 +56,16 @@ public class Messages { * Setup Methods */ - //TODO probably want to move these to assets now private static String[] prop_files = new String[]{ - "com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors", - "com/shatteredpixel/shatteredpixeldungeon/messages/items/items", - "com/shatteredpixel/shatteredpixeldungeon/messages/journal/journal", - "com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels", - "com/shatteredpixel/shatteredpixeldungeon/messages/plants/plants", - "com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes", - "com/shatteredpixel/shatteredpixeldungeon/messages/ui/ui", - "com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows", - "com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc" + Assets.Messages.ACTORS, + Assets.Messages.ITEMS, + Assets.Messages.JOURNAL, + Assets.Messages.LEVELS, + Assets.Messages.MISC, + Assets.Messages.PLANTS, + Assets.Messages.SCENES, + Assets.Messages.UI, + Assets.Messages.WINDOWS }; static{ @@ -80,7 +81,7 @@ public class Messages { Locale locale = new Locale(lang.code()); for (String file : prop_files) { - bundles.add(I18NBundle.createBundle(Gdx.files.classpath(file), locale)); + bundles.add(I18NBundle.createBundle(Gdx.files.internal(file), locale)); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java index f7cf83ec5..787101757 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -151,7 +151,7 @@ public abstract class Plant implements Bundlable { public Plant couch( int pos, Level level ) { if (level != null && level.heroFOV != null && level.heroFOV[pos]) { - Sample.INSTANCE.play(Assets.SND_PLANT); + Sample.INSTANCE.play(Assets.Sounds.PLANT); } Plant plant = Reflection.newInstance(plantClass); plant.pos = pos; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java index ea45cc25f..d76ea2861 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java @@ -396,7 +396,7 @@ public class AlchemyScene extends PixelScene { if (result != null){ bubbleEmitter.start(Speck.factory( Speck.BUBBLE ), 0.01f, 100 ); smokeEmitter.burst(Speck.factory( Speck.WOOL ), 10 ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); output.item(result); if (!(result instanceof AlchemistsToolkit)) { @@ -507,7 +507,7 @@ public class AlchemyScene extends PixelScene { @Override protected void onPointerDown() { bg.brightness( 1.2f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override protected void onPointerUp() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java index df8897625..8174b3cb7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java @@ -57,7 +57,7 @@ public class AmuletScene extends PixelScene { add( text ); } - amulet = new Image( Assets.AMULET ); + amulet = new Image( Assets.Interfaces.AMULET ); add( amulet ); RedButton btnExit = new RedButton( Messages.get(this, "exit") ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java index 11e6a83f6..7166aad6e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java @@ -48,7 +48,7 @@ public class BadgesScene extends PixelScene { super.create(); - Music.INSTANCE.play( Assets.THEME, true ); + Music.INSTANCE.play( Assets.Music.THEME, true ); uiCamera.visible = false; @@ -134,7 +134,7 @@ public class BadgesScene extends PixelScene { this.badge = badge; active = (badge != null); - icon = active ? BadgeBanner.image(badge.image) : new Image( Assets.LOCKED ); + icon = active ? BadgeBanner.image(badge.image) : new Image( Assets.Interfaces.LOCKED ); add(icon); setSize( icon.width(), icon.height() ); @@ -159,7 +159,7 @@ public class BadgesScene extends PixelScene { @Override protected void onClick() { - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); Game.scene().add( new WndBadge( badge ) ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 705d41507..f570e6de2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -55,7 +55,7 @@ public class ChangesScene extends PixelScene { public void create() { super.create(); - Music.INSTANCE.play( Assets.THEME, true ); + Music.INSTANCE.play( Assets.Music.THEME, true ); int w = Camera.main.width; int h = Camera.main.height; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index f80e9196e..a75c1d572 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -173,7 +173,7 @@ public class GameScene extends PixelScene { return; } - Music.INSTANCE.play( Assets.TUNE, true ); + Music.INSTANCE.play( Assets.Music.GAME, true ); SPDSettings.lastClass(Dungeon.hero.heroClass.ordinal()); @@ -435,7 +435,7 @@ public class GameScene extends PixelScene { if (Dungeon.depth == Statistics.deepestFloor && (InterlevelScene.mode == InterlevelScene.Mode.DESCEND || InterlevelScene.mode == InterlevelScene.Mode.FALL)) { GLog.h(Messages.get(this, "descend"), Dungeon.depth); - Sample.INSTANCE.play(Assets.SND_DESCEND); + Sample.INSTANCE.play(Assets.Sounds.DESCEND); for (Char ch : Actor.chars()){ if (ch instanceof DriedRose.GhostHero){ @@ -962,7 +962,7 @@ public class GameScene extends PixelScene { gameOver.show( 0x000000, 1f ); scene.showBanner( gameOver ); - Sample.INSTANCE.play( Assets.SND_DEATH ); + Sample.INSTANCE.play( Assets.Sounds.DEATH ); } public static void bossSlain() { @@ -971,7 +971,7 @@ public class GameScene extends PixelScene { bossSlain.show( 0xFFFFFF, 0.3f, 5f ); scene.showBanner( bossSlain ); - Sample.INSTANCE.play( Assets.SND_BOSS ); + Sample.INSTANCE.play( Assets.Sounds.BOSS ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index 34bad14a2..5e4726466 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -132,12 +132,12 @@ public class InterlevelScene extends PixelScene { scrollSpeed = returnDepth > Dungeon.depth ? 15 : -15; break; } - if (loadingDepth <= 5) loadingAsset = Assets.LOADING_SEWERS; - else if (loadingDepth <= 10) loadingAsset = Assets.LOADING_PRISON; - else if (loadingDepth <= 15) loadingAsset = Assets.LOADING_CAVES; - else if (loadingDepth <= 20) loadingAsset = Assets.LOADING_CITY; - else if (loadingDepth <= 25) loadingAsset = Assets.LOADING_HALLS; - else loadingAsset = Assets.SHADOW; + if (loadingDepth <= 5) loadingAsset = Assets.Interfaces.LOADING_SEWERS; + else if (loadingDepth <= 10) loadingAsset = Assets.Interfaces.LOADING_PRISON; + else if (loadingDepth <= 15) loadingAsset = Assets.Interfaces.LOADING_CAVES; + else if (loadingDepth <= 20) loadingAsset = Assets.Interfaces.LOADING_CITY; + else if (loadingDepth <= 25) loadingAsset = Assets.Interfaces.LOADING_HALLS; + else loadingAsset = Assets.Interfaces.SHADOW; //speed up transition when debugging if (DeviceCompat.isDebug()){ @@ -231,7 +231,7 @@ public class InterlevelScene extends PixelScene { } if ((Dungeon.depth % 5) == 0) { - Sample.INSTANCE.load(Assets.SND_BOSS); + Sample.INSTANCE.load(Assets.Sounds.BOSS); } } catch (Exception e) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index afacd6e6e..27783871b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -109,7 +109,7 @@ public class PixelScene extends Scene { // 3x5 (6) pixelFont = Font.colorMarked( - BitmapCache.get( Assets.PIXELFONT), 0x00000000, BitmapText.Font.LATIN_FULL ); + BitmapCache.get( Assets.Fonts.PIXELFONT), 0x00000000, BitmapText.Font.LATIN_FULL ); pixelFont.baseLine = 6; pixelFont.tracking = -1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index 2c0c8550f..839999439 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -59,7 +59,7 @@ public class RankingsScene extends PixelScene { super.create(); - Music.INSTANCE.play( Assets.THEME, true ); + Music.INSTANCE.play( Assets.Music.THEME, true ); uiCamera.visible = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java index f42f16aab..576ed7c11 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java @@ -81,7 +81,7 @@ public class SurfaceScene extends PixelScene { super.create(); - Music.INSTANCE.play( Assets.HAPPY, true ); + Music.INSTANCE.play( Assets.Music.SURFACE, true ); uiCamera.visible = false; @@ -211,7 +211,7 @@ public class SurfaceScene extends PixelScene { window.add( patch ); } - Image frame = new Image( Assets.SURFACE ); + Image frame = new Image( Assets.Interfaces.SURFACE ); frame.frame( 0, 0, FRAME_WIDTH, FRAME_HEIGHT ); frame.x = vx - FRAME_MARGIN_X; @@ -319,7 +319,7 @@ public class SurfaceScene extends PixelScene { private static int lastIndex = -1; public Cloud( float y, boolean dayTime ) { - super( Assets.SURFACE ); + super( Assets.Interfaces.SURFACE ); int index; do { @@ -371,7 +371,7 @@ public class SurfaceScene extends PixelScene { private static final int HEIGHT = 32; public Avatar( HeroClass cl ) { - super( Assets.AVATARS ); + super( Assets.Sprites.AVATARS ); frame( new TextureFilm( texture, WIDTH, HEIGHT ).get( cl.ordinal() ) ); } } @@ -405,7 +405,7 @@ public class SurfaceScene extends PixelScene { public GrassPatch( float tx, float ty, boolean forward ) { - super( Assets.SURFACE ); + super( Assets.Interfaces.SURFACE ); frame( 88 + Random.Int( 4 ) * WIDTH, 60, WIDTH, HEIGHT ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 32d9a6bc1..54f78ae83 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -52,7 +52,7 @@ public class TitleScene extends PixelScene { super.create(); - Music.INSTANCE.play( Assets.THEME, true ); + Music.INSTANCE.play( Assets.Music.THEME, true ); uiCamera.visible = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java index 8c6fec82f..5b560b563 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java @@ -29,7 +29,7 @@ public class AcidicSprite extends ScorpioSprite { public AcidicSprite() { super(); - texture( Assets.SCORPIO ); + texture( Assets.Sprites.SCORPIO ); TextureFilm frames = new TextureFilm( texture, 18, 17 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java index 4e7760af8..b380ce807 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java @@ -29,7 +29,7 @@ public class AlbinoSprite extends MobSprite { public AlbinoSprite() { super(); - texture( Assets.RAT ); + texture( Assets.Sprites.RAT ); TextureFilm frames = new TextureFilm( texture, 16, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java index 5e55884c8..50a899f01 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java @@ -29,7 +29,7 @@ public class BanditSprite extends MobSprite { public BanditSprite() { super(); - texture( Assets.THIEF ); + texture( Assets.Sprites.THIEF ); TextureFilm film = new TextureFilm( texture, 12, 13 ); idle = new Animation( 1, true ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java index b944a8dbb..17785f519 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java @@ -29,7 +29,7 @@ public class BatSprite extends MobSprite { public BatSprite() { super(); - texture( Assets.BAT ); + texture( Assets.Sprites.BAT ); TextureFilm frames = new TextureFilm( texture, 15, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BeeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BeeSprite.java index 65ac441c9..422aae0b1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BeeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BeeSprite.java @@ -29,7 +29,7 @@ public class BeeSprite extends MobSprite { public BeeSprite() { super(); - texture( Assets.BEE ); + texture( Assets.Sprites.BEE ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java index d97c8581a..d5369ab78 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java @@ -36,7 +36,7 @@ public class BlacksmithSprite extends MobSprite { public BlacksmithSprite() { super(); - texture( Assets.TROLL ); + texture( Assets.Sprites.TROLL ); TextureFilm frames = new TextureFilm( texture, 13, 16 ); @@ -79,7 +79,7 @@ public class BlacksmithSprite extends MobSprite { if (visible && emitter != null && anim == idle && !paused) { emitter.burst( Speck.factory( Speck.FORGE ), 3 ); float volume = 0.2f / (Dungeon.level.distance( ch.pos, Dungeon.hero.pos )); - Sample.INSTANCE.play( Assets.SND_EVOKE, volume, volume, 0.8f ); + Sample.INSTANCE.play( Assets.Sounds.EVOKE, volume, volume, 0.8f ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java index d366e534a..707667f18 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java @@ -29,7 +29,7 @@ public class BruteSprite extends MobSprite { public BruteSprite() { super(); - texture( Assets.BRUTE ); + texture( Assets.Sprites.BRUTE ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java index 773250f2e..11eaa51c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java @@ -29,7 +29,7 @@ public class CausticSlimeSprite extends MobSprite { public CausticSlimeSprite() { super(); - texture( Assets.SLIME ); + texture( Assets.Sprites.SLIME ); TextureFilm frames = new TextureFilm( texture, 14, 12 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java index 0065d592a..edf3a3248 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java @@ -348,7 +348,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip burning = emitter(); burning.pour( FlameParticle.FACTORY, 0.06f ); if (visible) { - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); } break; case LEVITATING: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java index 13b7ba22b..17fd74997 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java @@ -29,7 +29,7 @@ public class CrabSprite extends MobSprite { public CrabSprite() { super(); - texture( Assets.CRAB ); + texture( Assets.Sprites.CRAB ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java index 1e13020bc..9c82659df 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java @@ -36,7 +36,7 @@ public class DM100Sprite extends MobSprite { public DM100Sprite () { super(); - texture( Assets.DM100 ); + texture( Assets.Sprites.DM100 ); TextureFilm frames = new TextureFilm( texture, 16, 14 ); @@ -76,7 +76,7 @@ public class DM100Sprite extends MobSprite { } else { parent.add(new Lightning(origin, pos, (DM100) ch)); } - Sample.INSTANCE.play( Assets.SND_LIGHTNING ); + Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); turnTo( ch.pos, pos ); flash(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java index 1b3dd65db..a3bc42b6b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java @@ -34,7 +34,7 @@ public class DM200Sprite extends MobSprite { public DM200Sprite () { super(); - texture( Assets.DM200 ); + texture( Assets.Sprites.DM200 ); TextureFilm frames = new TextureFilm( texture, 21, 18 ); @@ -71,7 +71,7 @@ public class DM200Sprite extends MobSprite { ((DM200)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java index ce044c431..9dc5825fb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java @@ -34,7 +34,7 @@ public class DM201Sprite extends MobSprite { public DM201Sprite () { super(); - texture( Assets.DM200 ); + texture( Assets.Sprites.DM200 ); TextureFilm frames = new TextureFilm( texture, 21, 18 ); @@ -81,11 +81,11 @@ public class DM201Sprite extends MobSprite { new Callback() { @Override public void call() { - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); ((DM201)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_MISS, 0.6f, 0.6f, 1.5f ); + Sample.INSTANCE.play( Assets.Sounds.MISS, 0.6f, 0.6f, 1.5f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java index 6ef5f3634..9a3c46eef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java @@ -43,7 +43,7 @@ public class DM300Sprite extends MobSprite { public DM300Sprite() { super(); - texture( Assets.DM300 ); + texture( Assets.Sprites.DM300 ); setAnimations(false); } @@ -95,7 +95,7 @@ public class DM300Sprite extends MobSprite { ((NewDM300)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_PUFF ); + Sample.INSTANCE.play( Assets.Sounds.PUFF ); } public void charge(){ @@ -105,7 +105,7 @@ public class DM300Sprite extends MobSprite { public void slam( int cell ){ turnTo( ch.pos , cell ); play( slam ); - Sample.INSTANCE.play( Assets.SND_ROCKS ); + Sample.INSTANCE.play( Assets.Sounds.ROCKS ); Camera.main.shake( 3, 0.7f ); } @@ -126,7 +126,7 @@ public class DM300Sprite extends MobSprite { if (anim == die && !exploded) { exploded = true; - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); emitter().burst( BlastParticle.FACTORY, 100 ); killAndErase(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EarthGuardianSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EarthGuardianSprite.java index 32d5d4893..ba298cacf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EarthGuardianSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EarthGuardianSprite.java @@ -8,7 +8,7 @@ public class EarthGuardianSprite extends MobSprite { public EarthGuardianSprite() { super(); - texture( Assets.GUARDIAN ); + texture( Assets.Sprites.GUARDIAN ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java index 386530b89..ce483bba2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java @@ -50,7 +50,7 @@ public abstract class ElementalSprite extends MobSprite { int c = texOffset(); - texture( Assets.ELEMENTAL ); + texture( Assets.Sprites.ELEMENTAL ); TextureFilm frames = new TextureFilm( texture, 12, 14 ); @@ -120,7 +120,7 @@ public abstract class ElementalSprite extends MobSprite { ((Elemental)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override @@ -242,7 +242,7 @@ public abstract class ElementalSprite extends MobSprite { play( zap ); ((Elemental)ch).onZapComplete(); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java index 5791a1252..a89d1687d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java @@ -41,7 +41,7 @@ public class EyeSprite extends MobSprite { public EyeSprite() { super(); - texture( Assets.EYE ); + texture( Assets.Sprites.EYE ); TextureFilm frames = new TextureFilm( texture, 16, 18 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java index bdf0dcc91..8b19f4fef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java @@ -34,7 +34,7 @@ public class FetidRatSprite extends MobSprite { public FetidRatSprite() { super(); - texture( Assets.RAT ); + texture( Assets.Sprites.RAT ); TextureFilm frames = new TextureFilm( texture, 16, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java index 22568da23..88e2021ba 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java @@ -56,7 +56,7 @@ public abstract class FistSprite extends MobSprite { int c = texOffset(); - texture( Assets.FISTS ); + texture( Assets.Sprites.FISTS ); TextureFilm frames = new TextureFilm( texture, 24, 17 ); @@ -139,7 +139,7 @@ public abstract class FistSprite extends MobSprite { } } } ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java index 180ef173a..c6e13f117 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java @@ -32,7 +32,7 @@ public class GhostSprite extends MobSprite { public GhostSprite() { super(); - texture( Assets.GHOST ); + texture( Assets.Sprites.GHOST ); TextureFilm frames = new TextureFilm( texture, 14, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java index e345f72a6..1e3ddd109 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java @@ -31,7 +31,7 @@ public class GhoulSprite extends MobSprite { public GhoulSprite() { super(); - texture( Assets.GHOUL ); + texture( Assets.Sprites.GHOUL ); TextureFilm frames = new TextureFilm( texture, 12, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java index 1ae4d5145..5228bb092 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java @@ -29,7 +29,7 @@ public class GnollSprite extends MobSprite { public GnollSprite() { super(); - texture( Assets.GNOLL ); + texture( Assets.Sprites.GNOLL ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java index 05d1d9639..f6066aac1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java @@ -35,7 +35,7 @@ public class GnollTricksterSprite extends MobSprite { public GnollTricksterSprite() { super(); - texture( Assets.GNOLL ); + texture( Assets.Sprites.GNOLL ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java index d01df9503..1f2aed06a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java @@ -38,7 +38,7 @@ public class GolemSprite extends MobSprite { public GolemSprite() { super(); - texture( Assets.GOLEM ); + texture( Assets.Sprites.GOLEM ); TextureFilm frames = new TextureFilm( texture, 17, 19 ); @@ -117,7 +117,7 @@ public class GolemSprite extends MobSprite { ((Golem)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java index deb797ed9..aacf2bb31 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java @@ -40,7 +40,7 @@ public class GooSprite extends MobSprite { public GooSprite() { super(); - texture( Assets.GOO ); + texture( Assets.Sprites.GOO ); TextureFilm frames = new TextureFilm( texture, 20, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GreatCrabSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GreatCrabSprite.java index e3fc9d5ec..519ddeaed 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GreatCrabSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GreatCrabSprite.java @@ -30,7 +30,7 @@ public class GreatCrabSprite extends MobSprite { public GreatCrabSprite() { super(); - texture( Assets.CRAB ); + texture( Assets.Sprites.CRAB ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GuardSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GuardSprite.java index 33ee376ac..74a68246a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GuardSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GuardSprite.java @@ -31,7 +31,7 @@ public class GuardSprite extends MobSprite { public GuardSprite() { super(); - texture( Assets.GUARD ); + texture( Assets.Sprites.GUARD ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java index dc51993c6..2f129de20 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; -import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.gltextures.SmartTexture; import com.watabou.gltextures.TextureCache; import com.watabou.noosa.Camera; @@ -151,7 +150,7 @@ public class HeroSprite extends CharSprite { public static TextureFilm tiers() { if (tiers == null) { - SmartTexture texture = TextureCache.get( Assets.ROGUE ); + SmartTexture texture = TextureCache.get( Assets.Sprites.ROGUE ); tiers = new TextureFilm( texture, texture.width, FRAME_HEIGHT ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java index 6bb0f804d..64fcf5266 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java @@ -32,7 +32,7 @@ public class ImpSprite extends MobSprite { public ImpSprite() { super(); - texture( Assets.IMP ); + texture( Assets.Sprites.IMP ); TextureFilm frames = new TextureFilm( texture, 12, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java index 5bf639ab3..2ee11557d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java @@ -75,12 +75,12 @@ public class ItemSprite extends MovieClip { } public ItemSprite( Heap heap ){ - super(Assets.ITEMS); + super(Assets.Sprites.ITEMS); view( heap ); } public ItemSprite( Item item ) { - super(Assets.ITEMS); + super(Assets.Sprites.ITEMS); view( item ); } @@ -89,7 +89,7 @@ public class ItemSprite extends MovieClip { } public ItemSprite( int image, Glowing glowing ) { - super( Assets.ITEMS ); + super( Assets.Sprites.ITEMS ); view(image, glowing); } @@ -166,7 +166,7 @@ public class ItemSprite extends MovieClip { if (heap != null && heap.seen && heap.peek() instanceof Gold) { CellEmitter.center( heap.pos ).burst( Speck.factory( Speck.COIN ), 5 ); - Sample.INSTANCE.play( Assets.SND_GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) ); + Sample.INSTANCE.play( Assets.Sounds.GOLD, 1, 1, Random.Float( 0.9f, 1.1f ) ); } } @@ -328,7 +328,7 @@ public class ItemSprite extends MovieClip { } if (!(heap.peek() instanceof Gold)) { - Sample.INSTANCE.play(water ? Assets.SND_WATER : Assets.SND_STEP, 0.8f, 0.8f, 1.2f); + Sample.INSTANCE.play(water ? Assets.Sounds.WATER : Assets.Sounds.STEP, 0.8f, 0.8f, 1.2f); } } } @@ -357,7 +357,7 @@ public class ItemSprite extends MovieClip { } public static int pick( int index, int x, int y ) { - SmartTexture tx = TextureCache.get( Assets.ITEMS ); + SmartTexture tx = TextureCache.get( Assets.Sprites.ITEMS ); int rows = tx.width / SIZE; int row = index / rows; int col = index % rows; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 35f55e062..9c121880f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -28,7 +28,7 @@ public class ItemSpriteSheet { private static final int WIDTH = 16; - public static TextureFilm film = new TextureFilm( Assets.ITEMS, 16, 16 ); + public static TextureFilm film = new TextureFilm( Assets.Sprites.ITEMS, 16, 16 ); private static int xy(int x, int y){ x -= 1; y -= 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java index ee12d9632..1f4879a6f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java @@ -29,7 +29,7 @@ public class KingSprite extends MobSprite { public KingSprite() { super(); - texture( Assets.KING ); + texture( Assets.Sprites.KING ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java index 266018703..0b0dc6d82 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java @@ -30,7 +30,7 @@ public class LarvaSprite extends MobSprite { public LarvaSprite() { super(); - texture( Assets.LARVA ); + texture( Assets.Sprites.LARVA ); TextureFilm frames = new TextureFilm( texture, 12, 8 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MimicSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MimicSprite.java index 6d891f9fc..0f3c992e2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MimicSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MimicSprite.java @@ -45,7 +45,7 @@ public class MimicSprite extends MobSprite { int c = texOffset(); - texture( Assets.MIMIC ); + texture( Assets.Sprites.MIMIC ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java index aada8b83a..8d45ada27 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java @@ -32,7 +32,7 @@ public class MonkSprite extends MobSprite { public MonkSprite() { super(); - texture( Assets.MONK ); + texture( Assets.Sprites.MONK ); TextureFilm frames = new TextureFilm( texture, 15, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java index ee657b136..87bd58511 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java @@ -32,7 +32,7 @@ public class NecromancerSprite extends MobSprite { public NecromancerSprite(){ super(); - texture( Assets.NECRO ); + texture( Assets.Sprites.NECRO ); TextureFilm film = new TextureFilm( texture, 16, 16 ); idle = new Animation( 1, true ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NewbornElementalSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NewbornElementalSprite.java index ffa376cdc..46e7e87de 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NewbornElementalSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NewbornElementalSprite.java @@ -32,7 +32,7 @@ public class NewbornElementalSprite extends MobSprite{ public NewbornElementalSprite() { super(); - texture( Assets.ELEMENTAL ); + texture( Assets.Sprites.ELEMENTAL ); int ofs = 21; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java index 4b528b79f..477ef221d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java @@ -34,7 +34,7 @@ public class PiranhaSprite extends MobSprite { renderShadow = false; perspectiveRaise = 0.2f; - texture( Assets.PIRANHA ); + texture( Assets.Sprites.PIRANHA ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PylonSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PylonSprite.java index 61f7e499b..0f8cd29f9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PylonSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PylonSprite.java @@ -38,7 +38,7 @@ public class PylonSprite extends MobSprite { perspectiveRaise = 5/16f; //1 pixel less renderShadow = false; - texture( Assets.PYLON ); + texture( Assets.Sprites.PYLON ); TextureFilm frames = new TextureFilm( texture, 10, 20 ); @@ -83,7 +83,7 @@ public class PylonSprite extends MobSprite { if (anim == die){ turnTo(ch.pos, ch.pos+1); //always face right to merge with custom tiles emitter().burst(BlastParticle.FACTORY, 20); - Sample.INSTANCE.play(Assets.SND_BLAST); + Sample.INSTANCE.play(Assets.Sounds.BLAST); } super.play(anim); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java index f913b9f19..84e28e529 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java @@ -40,7 +40,7 @@ public class RatKingSprite extends MobSprite { final int c = festive ? 8 : 0; - texture( Assets.RATKING ); + texture( Assets.Sprites.RATKING ); TextureFilm frames = new TextureFilm( texture, 16, 17 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java index e51210891..29f0c9a96 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java @@ -29,7 +29,7 @@ public class RatSprite extends MobSprite { public RatSprite() { super(); - texture( Assets.RAT ); + texture( Assets.Sprites.RAT ); TextureFilm frames = new TextureFilm( texture, 16, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RipperSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RipperSprite.java index 525de9aa3..646efa9b4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RipperSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RipperSprite.java @@ -37,7 +37,7 @@ public class RipperSprite extends MobSprite { public RipperSprite() { super(); - texture( Assets.RIPPER ); + texture( Assets.Sprites.RIPPER ); TextureFilm frames = new TextureFilm( texture, 15, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java index f5e435795..d7981a086 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java @@ -37,7 +37,7 @@ public class RotHeartSprite extends MobSprite { perspectiveRaise = 0.2f; - texture( Assets.ROT_HEART ); + texture( Assets.Sprites.ROT_HEART ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotLasherSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotLasherSprite.java index 7b75f4e8d..0fd4438a0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotLasherSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotLasherSprite.java @@ -29,7 +29,7 @@ public class RotLasherSprite extends MobSprite { public RotLasherSprite() { super(); - texture( Assets.ROT_LASH ); + texture( Assets.Sprites.ROT_LASH ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java index 28a1576b0..9ce32721d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java @@ -34,7 +34,7 @@ public class ScorpioSprite extends MobSprite { public ScorpioSprite() { super(); - texture( Assets.SCORPIO ); + texture( Assets.Sprites.SCORPIO ); TextureFilm frames = new TextureFilm( texture, 18, 17 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java index c65552ed1..d8778dff2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java @@ -32,7 +32,7 @@ public class SeniorSprite extends MobSprite { public SeniorSprite() { super(); - texture( Assets.MONK ); + texture( Assets.Sprites.MONK ); TextureFilm frames = new TextureFilm( texture, 15, 14 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java index ec1f1bbe7..459db929e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java @@ -39,7 +39,7 @@ public abstract class ShamanSprite extends MobSprite { int c = texOffset(); - texture( Assets.SHAMAN ); + texture( Assets.Sprites.SHAMAN ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); @@ -75,7 +75,7 @@ public abstract class ShamanSprite extends MobSprite { ((Shaman)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java index cc12d1950..4fedcacd7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java @@ -30,7 +30,7 @@ public class SheepSprite extends MobSprite { public SheepSprite() { super(); - texture( Assets.SHEEP ); + texture( Assets.Sprites.SHEEP ); TextureFilm frames = new TextureFilm( texture, 16, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java index 30491bde0..41a726b04 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java @@ -29,7 +29,7 @@ public class ShieldedSprite extends MobSprite { public ShieldedSprite() { super(); - texture( Assets.BRUTE ); + texture( Assets.Sprites.BRUTE ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java index adcdc6667..974d69fed 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java @@ -32,7 +32,7 @@ public class ShopkeeperSprite extends MobSprite { public ShopkeeperSprite() { super(); - texture( Assets.KEEPER ); + texture( Assets.Sprites.KEEPER ); TextureFilm film = new TextureFilm( texture, 14, 14 ); idle = new Animation( 10, true ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java index abfeb6efc..5c0782e71 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java @@ -31,7 +31,7 @@ public class SkeletonSprite extends MobSprite { public SkeletonSprite() { super(); - texture( Assets.SKELETON ); + texture( Assets.Sprites.SKELETON ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SlimeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SlimeSprite.java index ad72efcf8..9b6757667 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SlimeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SlimeSprite.java @@ -29,7 +29,7 @@ public class SlimeSprite extends MobSprite { public SlimeSprite() { super(); - texture( Assets.SLIME ); + texture( Assets.Sprites.SLIME ); TextureFilm frames = new TextureFilm( texture, 14, 12 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SnakeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SnakeSprite.java index 6e73c2f48..490b544dc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SnakeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SnakeSprite.java @@ -29,7 +29,7 @@ public class SnakeSprite extends MobSprite { public SnakeSprite() { super(); - texture( Assets.SNAKE ); + texture( Assets.Sprites.SNAKE ); TextureFilm frames = new TextureFilm( texture, 12, 11 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java index 5774f7586..2c3eb9a4f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java @@ -32,7 +32,7 @@ public class SpawnerSprite extends MobSprite { public SpawnerSprite() { super(); - texture( Assets.SPAWNER ); + texture( Assets.Sprites.SPAWNER ); perspectiveRaise = 8 / 16f; shadowOffset = 1.25f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java index 8ccdc9243..ec4924b69 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java @@ -37,7 +37,7 @@ public class SpinnerSprite extends MobSprite { perspectiveRaise = 0f; - texture( Assets.SPINNER ); + texture( Assets.Sprites.SPINNER ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); @@ -80,7 +80,7 @@ public class SpinnerSprite extends MobSprite { ((Spinner)ch).shootWeb(); } } ); - Sample.INSTANCE.play( Assets.SND_MISS ); + Sample.INSTANCE.play( Assets.Sounds.MISS ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java index 1c347a782..c93983b5a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java @@ -30,7 +30,7 @@ public class StatueSprite extends MobSprite { public StatueSprite() { super(); - texture( Assets.STATUE ); + texture( Assets.Sprites.STATUE ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java index 9104d7b2f..e740eef39 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java @@ -31,7 +31,7 @@ public class SuccubusSprite extends MobSprite { public SuccubusSprite() { super(); - texture( Assets.SUCCUBUS ); + texture( Assets.Sprites.SUCCUBUS ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java index b97dd8ed2..33e2a463b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java @@ -29,7 +29,7 @@ public class SwarmSprite extends MobSprite { public SwarmSprite() { super(); - texture( Assets.SWARM ); + texture( Assets.Sprites.SWARM ); TextureFilm frames = new TextureFilm( texture, 16, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java index ae603c33a..379f3db3d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java @@ -33,7 +33,7 @@ public class TenguSprite extends MobSprite { public TenguSprite() { super(); - texture( Assets.TENGU ); + texture( Assets.Sprites.TENGU ); TextureFilm frames = new TextureFilm( texture, 14, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java index 7c09b05df..7f430f252 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java @@ -29,7 +29,7 @@ public class ThiefSprite extends MobSprite { public ThiefSprite() { super(); - texture( Assets.THIEF ); + texture( Assets.Sprites.THIEF ); TextureFilm film = new TextureFilm( texture, 12, 13 ); idle = new Animation( 1, true ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java index c84279a00..55fcf4d13 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java @@ -31,7 +31,7 @@ public class UndeadSprite extends MobSprite { public UndeadSprite() { super(); - texture( Assets.UNDEAD ); + texture( Assets.Sprites.UNDEAD ); TextureFilm frames = new TextureFilm( texture, 12, 16 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java index 35f85d12c..1e0fdf2e1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java @@ -35,7 +35,7 @@ public class WandmakerSprite extends MobSprite { public WandmakerSprite() { super(); - texture( Assets.MAKER ); + texture( Assets.Sprites.MAKER ); TextureFilm frames = new TextureFilm( texture, 12, 14 ); @@ -65,7 +65,7 @@ public class WandmakerSprite extends MobSprite { emitter().start( ElmoParticle.FACTORY, 0.03f, 60 ); if (visible) { - Sample.INSTANCE.play( Assets.SND_BURNING ); + Sample.INSTANCE.play( Assets.Sounds.BURNING ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WardSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WardSprite.java index 25dbcb79c..0a2c50cef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WardSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WardSprite.java @@ -17,7 +17,7 @@ public class WardSprite extends MobSprite { public WardSprite(){ super(); - texture(Assets.WARDS); + texture(Assets.Sprites.WARDS); tierIdles[1] = new Animation( 1, true ); tierIdles[1].frames(texture.uvRect(0, 0, 9, 10)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java index 41da39dda..b53e1f8c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java @@ -33,7 +33,7 @@ public class WarlockSprite extends MobSprite { public WarlockSprite() { super(); - texture( Assets.WARLOCK ); + texture( Assets.Sprites.WARLOCK ); TextureFilm frames = new TextureFilm( texture, 12, 15 ); @@ -69,7 +69,7 @@ public class WarlockSprite extends MobSprite { ((Warlock)ch).onZapComplete(); } } ); - Sample.INSTANCE.play( Assets.SND_ZAP ); + Sample.INSTANCE.play( Assets.Sounds.ZAP ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java index 39fcf0e81..ed3a8c4b4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java @@ -29,7 +29,7 @@ public class WraithSprite extends MobSprite { public WraithSprite() { super(); - texture( Assets.WRAITH ); + texture( Assets.Sprites.WRAITH ); TextureFilm frames = new TextureFilm( texture, 14, 15 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java index 2e07fbc8e..0a40d5679 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java @@ -33,7 +33,7 @@ public class YogSprite extends MobSprite { perspectiveRaise = 5 / 16f; - texture( Assets.YOG ); + texture( Assets.Sprites.YOG ); TextureFilm frames = new TextureFilm( texture, 20, 19 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/GridTileMap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/GridTileMap.java index 71b0f0b56..cbde38a4d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/GridTileMap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/GridTileMap.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.tiles; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; @@ -28,7 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; public class GridTileMap extends DungeonTilemap { public GridTileMap() { - super("visual_grid.png"); + super( Assets.Environment.VISUAL_GRID ); map( Dungeon.level.map, Dungeon.level.width() ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java index fc506df2e..19ec6edd4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java @@ -42,7 +42,7 @@ public class TerrainFeaturesTilemap extends DungeonTilemap { private SparseArray traps; public TerrainFeaturesTilemap(SparseArray plants, SparseArray traps) { - super(Assets.TERRAIN_FEATURES); + super(Assets.Environment.TERRAIN_FEATURES); this.plants = plants; this.traps = traps; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/WallBlockingTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/WallBlockingTilemap.java index 6000f3af9..add9bc177 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/WallBlockingTilemap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/WallBlockingTilemap.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.tiles; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.levels.NewHallsBossLevel; import com.watabou.noosa.TextureFilm; @@ -39,7 +40,7 @@ public class WallBlockingTilemap extends Tilemap { private static final int BLOCK_BELOW = 3; public WallBlockingTilemap() { - super("wall_blocking.png", new TextureFilm( "wall_blocking.png", SIZE, SIZE ) ); + super(Assets.Environment.WALL_BLOCKING, new TextureFilm( Assets.Environment.WALL_BLOCKING, SIZE, SIZE ) ); map( new int[Dungeon.level.length()], Dungeon.level.width()); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java index 9f949851f..a10f3efad 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java @@ -46,7 +46,7 @@ public class Archs extends Component { @Override protected void createChildren() { - arcsBg = new SkinnedBlock( 1, 1, Assets.ARCS_BG ){ + arcsBg = new SkinnedBlock( 1, 1, Assets.Interfaces.ARCS_BG ){ @Override protected NoosaScript script() { return NoosaScriptNoLighting.get(); @@ -64,7 +64,7 @@ public class Archs extends Component { arcsBg.offsetTo( 0, offsB ); add( arcsBg ); - arcsFg = new SkinnedBlock( 1, 1, Assets.ARCS_FG ){ + arcsFg = new SkinnedBlock( 1, 1, Assets.Interfaces.ARCS_FG ){ @Override protected NoosaScript script() { return NoosaScriptNoLighting.get(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java index b40fd6483..e9f25f9cf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java @@ -119,7 +119,7 @@ public class BadgesList extends ScrollPane { public boolean onClick( float x, float y ) { if (inside( x, y )) { - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); Game.scene().add( new WndBadge( badge ) ); return true; } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java index 37c744b03..c352e0cc0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java @@ -42,7 +42,7 @@ public class BossHealthBar extends Component { private Image skull; private Emitter blood; - private static String asset = Assets.BOSSHP; + private static String asset = Assets.Interfaces.BOSSHP; private static BossHealthBar instance; private static boolean bleeding; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index b2b9537e6..22c51421b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -126,7 +126,7 @@ public class BuffIndicator extends Component { @Override protected void createChildren() { - texture = TextureCache.get( Assets.BUFFS_SMALL ); + texture = TextureCache.get( Assets.Interfaces.BUFFS_SMALL ); film = new TextureFilm( texture, SIZE, SIZE ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java index 91337f749..b54f12db6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java @@ -61,7 +61,7 @@ public class ExitButton extends Button { @Override protected void onPointerDown() { image.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/IconButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/IconButton.java index 1e6398d44..78416f028 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/IconButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/IconButton.java @@ -54,7 +54,7 @@ public class IconButton extends Button { @Override protected void onPointerDown() { if (icon != null) icon.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index 315f5f0b9..4e404bda4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -78,7 +78,7 @@ public enum Icons { } public static Image get( Icons type ) { - Image icon = new Image( Assets.ICONS ); + Image icon = new Image( Assets.Interfaces.ICONS ); switch (type) { case CHECKED: icon.frame( icon.texture.uvRect( 0, 0, 12, 12 ) ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index 0d0e23a8d..c2030ef75 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -254,7 +254,7 @@ public class ItemSlot extends Button { iconInt = ((Potion) item).initials(); } if (iconInt != null && iconVisible) { - bottomRightIcon = new Image(Assets.CONS_ICONS); + bottomRightIcon = new Image(Assets.Interfaces.CONS_ICONS); int left = iconInt*7; int top; if (item instanceof Potion){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/KeyDisplay.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/KeyDisplay.java index f7f6d294e..8fd78b034 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/KeyDisplay.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/KeyDisplay.java @@ -46,7 +46,7 @@ public class KeyDisplay extends Visual { private FloatBuffer quads; private Vertexbuffer buffer; - private SmartTexture tx = TextureCache.get(Assets.MENU); + private SmartTexture tx = TextureCache.get(Assets.Interfaces.MENU); private boolean dirty = true; private int[] keys; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LanguageButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LanguageButton.java index 508954958..0e704d9b7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LanguageButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LanguageButton.java @@ -85,7 +85,7 @@ public class LanguageButton extends Button { @Override protected void onPointerDown() { image.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java index 376c2d820..782707525 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java @@ -52,7 +52,7 @@ public class PrefsButton extends Button { @Override protected void onPointerDown() { image.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index d9ae42831..7f7640850 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -79,7 +79,7 @@ public class StatusPane extends Component { @Override protected void createChildren() { - bg = new NinePatch( Assets.STATUS, 0, 0, 128, 36, 85, 0, 45, 0 ); + bg = new NinePatch( Assets.Interfaces.STATUS, 0, 0, 128, 36, 85, 0, 45, 0 ); add( bg ); add( new Button(){ @@ -107,17 +107,17 @@ public class StatusPane extends Component { compass = new Compass( Statistics.amuletObtained ? Dungeon.level.entrance : Dungeon.level.exit ); add( compass ); - rawShielding = new Image( Assets.SHLD_BAR ); + rawShielding = new Image( Assets.Interfaces.SHLD_BAR ); rawShielding.alpha(0.5f); add(rawShielding); - shieldedHP = new Image( Assets.SHLD_BAR ); + shieldedHP = new Image( Assets.Interfaces.SHLD_BAR ); add(shieldedHP); - hp = new Image( Assets.HP_BAR ); + hp = new Image( Assets.Interfaces.HP_BAR ); add( hp ); - exp = new Image( Assets.XP_BAR ); + exp = new Image( Assets.Interfaces.XP_BAR ); add( exp ); bossHP = new BossHealthBar(); @@ -273,10 +273,10 @@ public class StatusPane extends Component { protected void createChildren() { super.createChildren(); - bg = new Image( Assets.MENU, 2, 2, 13, 11 ); + bg = new Image( Assets.Interfaces.MENU, 2, 2, 13, 11 ); add( bg ); - journalIcon = new Image( Assets.MENU, 31, 0, 11, 7); + journalIcon = new Image( Assets.Interfaces.MENU, 31, 0, 11, 7); add( journalIcon ); keyIcon = new KeyDisplay(); @@ -331,7 +331,7 @@ public class StatusPane extends Component { @Override protected void onPointerDown() { bg.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override @@ -368,7 +368,7 @@ public class StatusPane extends Component { protected void createChildren() { super.createChildren(); - image = new Image( Assets.MENU, 17, 2, 12, 11 ); + image = new Image( Assets.Interfaces.MENU, 17, 2, 12, 11 ); add( image ); } @@ -383,7 +383,7 @@ public class StatusPane extends Component { @Override protected void onPointerDown() { image.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java index 726602a98..33ddd3902 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java @@ -87,7 +87,7 @@ public class StyledButton extends Button { @Override protected void onPointerDown() { bg.brightness( 1.2f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java index 7bd3da8f8..1216985f2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java @@ -311,7 +311,7 @@ public class Toolbar extends Component { protected void createChildren() { super.createChildren(); - base = new Image( Assets.TOOLBAR ); + base = new Image( Assets.Interfaces.TOOLBAR ); add( base ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_2_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_2_X_Changes.java index f2dceb335..d78caff36 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_2_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_2_X_Changes.java @@ -151,7 +151,7 @@ public class v0_2_X_Changes { "_-_ Key ring and unstackable keys\n" + "_-_ Blindweed has not been removed")); - changes.addButton( new ChangeButton(new Image(Assets.TERRAIN_FEATURES, 112, 112, 16, 16), "New Plants", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TERRAIN_FEATURES, 112, 112, 16, 16), "New Plants", "Added two new plants:\n" + "_-_ Stormvine, which brews into levitation\n" + "_-_ Dreamfoil, which brews into purity\n\n" + @@ -181,13 +181,13 @@ public class v0_2_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.GHOST, 0, 0, 14, 15), "New Sewer Quests", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.GHOST, 0, 0, 14, 15), "New Sewer Quests", "_-_ Removed the dried rose quest (the rose will return...)\n\n" + "_-_ Tweaked the mechanics of the fetid rat quest\n\n" + "_-_ Added a gnoll trickster quest\n\n" + "_-_ Added a great crab quest")); - changes.addButton( new ChangeButton(new Image(Assets.GOO, 43, 3, 14, 11), "Goo Changes", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.GOO, 43, 3, 14, 11), "Goo Changes", "Goo's animations have been overhauled, including a particle effect for the area of its pumped up attack.\n\n" + "Goo's arena has been updated to give more room to maneuver, and to be more variable.")); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_3_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_3_X_Changes.java index 35753f22c..4a4f734e3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_3_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_3_X_Changes.java @@ -59,7 +59,7 @@ public class v0_3_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.WARRIOR, 0, 15, 12, 15), "Warrior Rework!", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.WARRIOR, 0, 15, 12, 15), "Warrior Rework!", "Warrior Rework:\n" + "_-_ Starting STR down to 10, from 11\n" + "_-_ Short sword dmg down to 1-10, from 1-12\n" + @@ -69,7 +69,7 @@ public class v0_3_X_Changes { "_-_ Seal grants shielding ontop of health\n" + "_-_ Seal allows for one upgrade transfer")); - changes.addButton( new ChangeButton(new Image(Assets.WARRIOR, 0, 90, 12, 15), "Warrior Subclass Rework!", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.WARRIOR, 0, 90, 12, 15), "Warrior Subclass Rework!", "Berserker Rework:\n" + "_-_ Bonus damage now scales with lost HP, instead of a flat 50% at 50% hp\n" + "_-_ Berserker can now endure through death for a short time, with caveats\n" + @@ -172,7 +172,7 @@ public class v0_3_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.TENGU, 0, 0, 14, 16), "Prison Rework", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.TENGU, 0, 0, 14, 16), "Prison Rework", "_-_ Tengu boss fight completely redone\n" + "_-_ Corpse dust quest overhauled\n" + "_-_ Rotberry quest overhauled\n" + @@ -225,13 +225,13 @@ public class v0_3_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.TERRAIN_FEATURES, 112, 96, 16, 16), "Trap Overhaul", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TERRAIN_FEATURES, 112, 96, 16, 16), "Trap Overhaul", "_-_ Over 20 new traps + tweaks to existing ones\n" + "_-_ Trap visuals overhauled\n" + "_-_ Traps now get trickier deeper in the dungeon\n" + "_-_ Trap room reworked to make use of new traps")); - changes.addButton( new ChangeButton(new Image(Assets.MENU, 15, 0, 16, 15), "Interface Improvements", + changes.addButton( new ChangeButton(new Image(Assets.Interfaces.MENU, 15, 0, 16, 15), "Interface Improvements", "_-_ Adjusted display scaling\n" + "_-_ Search and Examine merged into one button (double tap to search)\n" + "_-_ New max of 4 Quickslots!\n" + @@ -270,7 +270,7 @@ public class v0_3_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.MAGE, 0, 15, 12, 15), "Mage Rework!", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.MAGE, 0, 15, 12, 15), "Mage Rework!", "_-_ No longer starts with knuckledusters or a wand\n" + "_-_ Can no longer equip wands\n" + "_-_ Now starts with a unique mages staff, empowered with magic missile to start.\n\n" + diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_6_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_6_X_Changes.java index 495586fb3..fa15ec1dc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_6_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_6_X_Changes.java @@ -106,7 +106,7 @@ public class v0_6_X_Changes { "_-_ 'Death by glyph' badge is now 'death by deferred damage'.\n\n" + "_-_ Removed rare monster slayer badge.")); - changes.addButton( new ChangeButton(new Image(Assets.WARRIOR, 0, 90, 12, 15), "Berserker", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.WARRIOR, 0, 90, 12, 15), "Berserker", "Even with recent nerfs the berserker is still much stronger than other subclasses. Rather than continually nerfing his existing mechanics, which makes the subclass unfun, I have instead opted to give him a small rework.\n\n" + "These changes focus on giving the berserker some of his old power back, but making it more difficult to access that power.\n\n" + "_-_ Rage is built by taking physical damage\n" + @@ -139,7 +139,7 @@ public class v0_6_X_Changes { "_-_ Loading screen transitions are now faster in many cases\n\n" + "_-_ Improved the layout of translator credits in landscape")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various rare crash bugs\n" + "_-_ Antimagic applying to elemental damage\n" + @@ -169,13 +169,13 @@ public class v0_6_X_Changes { "_-_ Base chance to deal 2x damage reduced to 50% from 60%\n" + "_-_ Each time 0x damage is dealt, the next hit will be much more likely to deal 2x damage")); - changes.addButton( new ChangeButton(new Image(Assets.MAGE, 0, 90, 12, 15), "Warlock", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.MAGE, 0, 90, 12, 15), "Warlock", "Soul mark chance changed. Now has a 10% chance to activate per wand level, stacking multiplicatively, with a base of 10% at +0.\n" + "e.g. +0 is 10%, +1 is 19%, +2 is 27%, etc.\n\n" + "Previous soul mark chance was 9% at base plus 6% per level, stacking linearly.\n\n" + "This substantially increases soul mark chance at wand levels +1 to +5")); - changes.addButton( new ChangeButton( new Image(Assets.HUNTRESS, 0, 15, 12, 15), "Huntress", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.HUNTRESS, 0, 15, 12, 15), "Huntress", "Huntress ranged weapon durability boost now stacks with magical holster durability boost, for a total of 180% durability.")); changes = new ChangeInfo(Messages.get(ChangesScene.class, "nerfs"), false, null); @@ -186,7 +186,7 @@ public class v0_6_X_Changes { "Wayward's accuracy penalty was very extreme, often making it impossible to win fights without doors. Wayward should punish non-guaranteed attacks, but this extent of this has been lessened.\n\n" + "_-_ Reduced wayward accuracy penalty by 50%")); - changes.addButton( new ChangeButton(new Image(Assets.SKELETON, 0, 0, 12, 15), "Skeletons", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SKELETON, 0, 0, 12, 15), "Skeletons", "Skeletons have been adjusted to be more counterable with armor, and to give less inventory-clogging loot.\n\n" + "_-_ Bone explosion damage up to 6-12 from 2-10\n" + "_-_ Armor is now 2x effective against bone explosion, up from 0.5x\n\n" + @@ -273,7 +273,7 @@ public class v0_6_X_Changes { "\n" + "_-_ Made adjustments to sending gameplay data. Data use should be slightly reduced.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Crashes involving corrupted mimics\n" + "_-_ Various rare crash bugs\n" + @@ -309,14 +309,14 @@ public class v0_6_X_Changes { changes.hardlight( CharSprite.NEGATIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.BUFFS_LARGE, 64, 0, 16, 16), "Paralysis changes", + changes.addButton( new ChangeButton(new Image(Assets.Interfaces.BUFFS_LARGE, 64, 0, 16, 16), "Paralysis changes", "Paralysis is an extremely powerful debuff, and its ability to completely immobilize the player or an enemy while they are killed needs to be adjusted.\n" + "\n" + "Chance to resist paralysis is now based on all recent damage taken while paralyzed, instead of each specific instance of damage separately.\n" + "\n" + "This means that after taking around half current HP in damage, breaking from paralysis becomes very likely, and immediately re-applying paralysis will not reset this resist chance.")); - changes.addButton( new ChangeButton(new Image(Assets.TILES_SEWERS, 48, 48, 16, 16), "Chasm changes", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TILES_SEWERS, 48, 48, 16, 16), "Chasm changes", "Dropping enemies into chasms is a very fun way to deal with enemies, but killing an enemy instantly and getting almost the full reward is simply too strong. This change should keep killing via chasms fun and useful, without it being as strong.\n" + "\n" + "_-_ Enemies killed via chasms now only award 50% exp")); @@ -363,7 +363,7 @@ public class v0_6_X_Changes { "_-_ Existing ranged weapons reworked, 5 new ranged weapons added.\n\n" + "_-_ Warrior now starts with throwing stones, rogue starts with throwing knives")); - changes.addButton( new ChangeButton( new Image(Assets.HUNTRESS, 0, 15, 12, 15), "Huntress", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.HUNTRESS, 0, 15, 12, 15), "Huntress", "Huntress adjusted due to ranged weapon changes (note that this is not a full class rework):\n\n" + "_-_ Huntress no longer has a chance to reclaim a single ranged weapon.\n\n" + "_-_ Missile weapons now have 50% greater durability when used by the huntress.\n\n" + @@ -388,7 +388,7 @@ public class v0_6_X_Changes { changes.hardlight( CharSprite.WARNING ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.BUFFS_LARGE, 32, 0, 16, 16), "Changes to debuffs and resistances", + changes.addButton( new ChangeButton(new Image(Assets.Interfaces.BUFFS_LARGE, 32, 0, 16, 16), "Changes to debuffs and resistances", "The game's resistance system has been totally overhauled, to allow for more flexibility and consistency.\n\n" + "Previously, if a character was resistant to something, its effect would be reduced by a random amount between 0% and 100%.\n\n" + "Now, resistances are much less random, applying a specific reduction to harmful effects. Currently all resistances are 50%.\n\n" + @@ -412,7 +412,7 @@ public class v0_6_X_Changes { "_-_ Starting weapons can no longer appear in hero's remains\n\n" + "_-_ The ghost hero is no longer unaffected by all buffs, and is also immune to corruption")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various crash bugs\n" + "_-_ Serious memory leaks on android 8.0+\n" + @@ -440,7 +440,7 @@ public class v0_6_X_Changes { "_-_ Rather than granting a chance to resist elemental/magic damage, ring now grants a set percentage resistance to these effects, which increases each level.\n\n" + "_-_ Ring now applies to more elemental/magical effects than before.")); - changes.addButton( new ChangeButton(new Image(Assets.MAGE, 0, 90, 12, 15), "Warlock", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.MAGE, 0, 90, 12, 15), "Warlock", "The warlock is underperforming relative to the battlemage at the moment, and so he is getting an adjustment to his ability.\n\n" + "This should hopefully both increase his power, and further encourage investing upgrades in wands.\n\n" + "_-_ Reduced the base soul mark chance by 40%\n" + @@ -470,7 +470,7 @@ public class v0_6_X_Changes { changes.hardlight( CharSprite.NEGATIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.WARRIOR, 0, 90, 12, 15), "Berserker", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.WARRIOR, 0, 90, 12, 15), "Berserker", "The previous berserker nerf from 0.6.2 had little effect on his overall winrate, so I'm trying again with a different approach, based around having a permanent penalty for each use of berserk.\n\n" + "_-_ Reverted exhaustion nerf from 0.6.2\n\n" + "_-_ Decreased lvls to recover rage to 2 from 3\n" + @@ -508,7 +508,7 @@ public class v0_6_X_Changes { "_-_ Searching now consumes 6 turns of hunger, up from 2.\n\n" + "This is a big adjustment to how secrets work in the dungeon. The goal is to make secrets more interesting, harder to find, and also more optional.")); - changes.addButton( new ChangeButton( new Image(Assets.ROGUE, 0, 15, 12, 15), "Rogue Rework!", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.ROGUE, 0, 15, 12, 15), "Rogue Rework!", "The rogue has been reworked! His abilities have received a number of changes to make his strengths more pronounced and focused.\n\n" + "These abilities have been _removed:_\n" + "_-_ Gains evasion from excess strength on armor\n" + @@ -520,7 +520,7 @@ public class v0_6_X_Changes { "_-_ Is able to find more secrets in the dungeon\n\n" + "Make sure to check out the Cloak of Shadows and Dagger changes as well.")); - changes.addButton( new ChangeButton( new Image(Assets.ROGUE, 0, 90, 12, 15), "Rogue Subclasses Rework!", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.ROGUE, 0, 90, 12, 15), "Rogue Subclasses Rework!", "Both of the rogue's subclasses has been reworked, with an emphasis on more powerful abilities that need more interaction from the player.\n\n" + "_The Assassin:_\n" + "_-_ No longer gains a free +25% damage on surprise attacks\n" + @@ -532,7 +532,7 @@ public class v0_6_X_Changes { "_-_ Momentum is rapidly lost when standing still.\n" + "_-_ Evasion gained from momentum scales with excess strength on armor.")); - changes.addButton( new ChangeButton( new Image(Assets.TERRAIN_FEATURES, 16, 0, 16, 16), "Trap Overhaul!", + changes.addButton( new ChangeButton( new Image(Assets.Environment.TERRAIN_FEATURES, 16, 0, 16, 16), "Trap Overhaul!", "Most of the game's traps have received changes, some have been overhauled entirely!\n\n" + "_-_ Removed Spear and Paralytic Gas Traps\n" + "_-_ Lightning Trap is now Shocking and Storm traps\n" + @@ -567,7 +567,7 @@ public class v0_6_X_Changes { "_-_ Corrupted enemies award exp immediately as they are corrupted.\n\n" + "These changes are aimed at making the wand more powerful, and also less of an all-in wand. Wand of Corruption is now useful even if it doesn't corrupt an enemy.")); - changes.addButton( new ChangeButton( new Image(Assets.STATUE, 0, 0, 12, 15), "AI and Enemy Changes", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.STATUE, 0, 0, 12, 15), "AI and Enemy Changes", "_-_ Characters now have an internal alignment and choose enemies based on that. Friendly characters should now never attack eachother.\n\n" + "_-_ Injured characters will now always have a persistent health bar, even if they aren't being targeted.\n\n" + "_-_ Improved enemy emote visuals, they now appear more frequently and there is now one for losing a target.\n\n" + @@ -587,7 +587,7 @@ public class v0_6_X_Changes { "_-_ Improved older updates in the changes list.\n" + "_-_ Game now mutes during phone calls on android 6.0+")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various crash bugs\n" + "_-_ Various exploits players could use to determine map shape\n" + @@ -656,7 +656,7 @@ public class v0_6_X_Changes { changes.hardlight( CharSprite.NEGATIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.WARRIOR, 0, 90, 12, 15), "Berserker", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.WARRIOR, 0, 90, 12, 15), "Berserker", "The Berserker's survivability and power have been reduced to help bring him into line with the other subclasses:\n\n" + "_-_ Bonus damage from low health reduced significantly when below 50% HP. 2x damage while berserking is unchanged.\n\n" + "_-_ Turns of exhaustion after berserking increased to 60 from 40. Damage reduction from exhaustion stays higher for longer.")); @@ -745,11 +745,11 @@ public class v0_6_X_Changes { "_-_ Dew will always be collected into an available vial, even if the hero is below full HP.\n\n" + "_-_ When drinking from the vial, the hero will now only drink as many drops as they need to reach full HP.")); - changes.addButton( new ChangeButton( new Image(Assets.STATUE, 0, 0, 12, 15), "AI Changes", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.STATUE, 0, 0, 12, 15), "AI Changes", "_-_ Improvements to pathfinding. Characters are now more prone to take efficient paths to their targets, and will prefer to wait instead of taking a very inefficient path.\n\n" + "_-_ Characters will now more consistently decide who to attack based on distance and who they are being attacked by.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Issues with Android 7.0+ multi-window\n" + "_-_ Rare stability issues on certain devices\n" + diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java index 3001fbc35..c71026263 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java @@ -81,14 +81,14 @@ public class v0_7_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.SNAKE, 12, 0, 12, 11), "Sewer Enemies", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SNAKE, 12, 0, 12, 11), "Sewer Enemies", "Two new enemies have been added to the sewers!\n\n" + "_- Snakes_ are an evasive enemy which mainly shows up on early floors, they help teach the importance of surprise attacks.\n" + "_- Slimes_ primarily appear on floor 4, and are an enemy type which rewards defense over damage.\n\n" + "Goo's level has also received significant changes. It now uses a new unique level layout pattern, and Goo itself always spawns in a new unique room type.\n\n" + "I have also made slight balance changes to the Goo fight itself. 1x1 pillars have been mostly removed from Goo's arena to reduce surprise-attack spam, but Goo's damage has been reduced by 20% to compensate.")); - changes.addButton( new ChangeButton(new Image(Assets.TENGU, 0, 0, 14, 16), "Prison Enemies", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.TENGU, 0, 0, 14, 16), "Prison Enemies", "_Necromancers_ have been added to the prison! These powerful enemies fight by summoning and buffing undead.\n\n" + "The _Tengu_ boss fight has been totally reworked! The fight still takes place over 3 stages, and has a similar core theme, but I have totally ditched the tedious maze and chasing mechanics from stages 2&3, and have given Tengu several new abilities. Watch your step!\n\n" + "As a part of this rework, Tengu's stats have also been adjusted:\n" + @@ -105,7 +105,7 @@ public class v0_7_X_Changes { changes.hardlight( CharSprite.WARNING ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.RAT, 0, 15, 16, 15), "Enemy Changes", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.RAT, 0, 15, 16, 15), "Enemy Changes", "_-_ Significantly improved the consistency of enemy spawns (large numbers of the same enemy and large enemy groups should be less common)\n\n" + "_-_ Adjusted enemy spawn chances on floors 1-10 to make room for new enemies\n\n" + "_-_ Skeletons no longer rarely appear on floor 4\n\n" + @@ -121,7 +121,7 @@ public class v0_7_X_Changes { "_-_ Various improvements to wording on the supporter menu for Google Play users.\n\n" + "_-_ Various internal code improvements")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various stability issues caused by the LibGDX conversion\n" + "_-_ Bolts from wand of lightning not spreading in many cases where they should\n" + @@ -230,7 +230,7 @@ public class v0_7_X_Changes { "_-_ Shattered Pixel Dungeon now requires Android 2.3+ to run, up from Android 2.2+.\n" + "_-_ Google Play Games and sharing gameplay data now requires android 4.1+, up from 4.0+.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Talisman of foresight warn effect not being saved/loaded\n" + "_-_ Level visuals (e.g. prison torches) rarely bugging out\n" + @@ -286,7 +286,7 @@ public class v0_7_X_Changes { changes.hardlight( CharSprite.NEGATIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton( new Image(Assets.MAGE, 0, 90, 12, 15), "Subclass Adjustments", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.MAGE, 0, 90, 12, 15), "Subclass Adjustments", "The Warlock is intended to require a source of physical damage in addition to a wand to be successful. Upgradeable ally wands are problematic for warlock as you can get magical power and physical damage in one item, which makes his abilities absurdly useful with them. The warlock should synergize with allies, but I have scaled the amount down to more reasonable levels:\n\n" + "_-_ Soul mark healing increased to 40% of damage from 33%\n" + "_-_ Soul mark is now 2/5 as effective when the damage-dealer isn't the hero.\n\n" + @@ -359,7 +359,7 @@ public class v0_7_X_Changes { "_-_ Scrolls of transmutation can now be used on thrown weapons.\n\n" + "_-_ Improved the coloration of crystal keys. They should now be more distinct from iron keys.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Prismatic images causing errors when falling into pits\n" + "_-_ Secret rooms never spawning in the earlier parts of a region\n" + @@ -379,7 +379,7 @@ public class v0_7_X_Changes { changes.hardlight( CharSprite.POSITIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton( new Image(Assets.WARRIOR, 0, 90, 12, 15), "Berserker & Gladiator", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.WARRIOR, 0, 90, 12, 15), "Berserker & Gladiator", "Because of nerfs I have made to the scaling of the warrior's shield regen, I have some power budget to give to his subclasses!\n\n" + "Berserker rate of rage loss decreased by 50%. It should now be easier to hold onto rage at higher health, but being injured will still help to retain it longer.\n\n" + "Gladiator is now significantly more flexible:\n" + @@ -415,11 +415,11 @@ public class v0_7_X_Changes { "_-_ Tomahawk damage scaling increased to 2-4 per level, up from 2-2\n" + "_-_ Tomahawk bleed damage now starts at 60% of damage, down from 100%")); - changes.addButton( new ChangeButton( new Image(Assets.WARRIOR, 0, 15, 12, 15), "Warrior Nerfs", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.WARRIOR, 0, 15, 12, 15), "Warrior Nerfs", "Warrior shielding regeneration scaling reduced. It is now a flat 1 shield every 30 turns. This is a very slight buff to the earlygame, and a significant nerf to the lategame.\n\n" + "I made this change as too much of the warrior's power was put into his base class, and into a passive ability that players tend to ignore. By removing this power, I can put more power into the warrior's subclasses, which should make the warrior feel more fun and interesting without significantly nerfing him overall.")); - changes.addButton( new ChangeButton( new Image(Assets.TERRAIN_FEATURES, 16, 0, 16, 16), "Trap Adjustments!", + changes.addButton( new ChangeButton( new Image(Assets.Environment.TERRAIN_FEATURES, 16, 0, 16, 16), "Trap Adjustments!", "Several traps have been slightly adjusted due to reclaim trap's new functionality:\n\n" + "_-_ Disintegration trap no longer deals damage based on target HP\n" + "_-_ Flock trap duration no longer scales with depth\n" + @@ -499,7 +499,7 @@ public class v0_7_X_Changes { "_-_ Meat Pie recipe cost reduced from 9 to 6, total healing reduced from 45 to 25\n\n" + "_-_ Added a privacy policy link to the Google Play edition of Shattered.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various rare crash bugs\n" + "_-_ Various minor visual bugs\n" + @@ -531,7 +531,7 @@ public class v0_7_X_Changes { "_-_ Improved how the game handles orientation changes and window resizing.\n" + "_-_ Shocking enchantment no longer visually arcs lightning to the hero.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed (existed before 0.7.2):\n" + "_-_ Cloak of Shadows very rarely consuming more charges than it should\n" + "_-_ Assassin's blink not working on enemies standing on traps\n" + @@ -607,14 +607,14 @@ public class v0_7_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton( new Image(Assets.HUNTRESS, 0, 15, 12, 15), "Huntress Reworked!", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.HUNTRESS, 0, 15, 12, 15), "Huntress Reworked!", "The Huntress has received a class overhaul!\n\n" + "Her boomerang has been replaced with a bow. The bow has infinite uses, like the boomerang, but cannot be upgraded directly, instead it will grow stronger as the huntress levels up.\n\n" + "Her knuckledusters have been replaced with studded gloves. This change is purely cosmetic.\n\n" + "Those with runs in progress will have their boomerang turn into a bow, and will regain most of the scrolls of upgrade spent on the boomerang.\n\n" + "The huntress can now also move through grass without trampling it (she 'furrows' it instead).")); - changes.addButton( new ChangeButton( new Image(Assets.HUNTRESS, 0, 90, 12, 15), "Huntress Subclasses Reworked!", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.HUNTRESS, 0, 90, 12, 15), "Huntress Subclasses Reworked!", "Huntress subclasses have also received overhauls:\n\n" + "The Sniper can now see 50% further, penetrates armor with ranged attacks, and can perform a special attack with her bow.\n\n" + "The Warden can now see through grass and gains a variety of bonuses to plant interaction.")); @@ -646,7 +646,7 @@ public class v0_7_X_Changes { "Added item stats to the item catalog.\n\n" + "Dropping an item now takes 1 turn, up from 0.5 turns.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ various crash bugs\n" + "_-_ various minor visual bugs\n" + @@ -673,7 +673,7 @@ public class v0_7_X_Changes { changes.hardlight( CharSprite.POSITIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton( new Image(Assets.ROGUE, 0, 15, 12, 15), "Hero Buffs", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.ROGUE, 0, 15, 12, 15), "Hero Buffs", "_-_ Rogue's cloak of shadows base charge speed increased by ~11%, scaling reduced to compensate.\n\n" + "_-_ Warlock's soul mark base chance increased to 15% from 10%, scaling reduced to compensate.\n\n" + "_-_ Warlock's soul mark hunger restoration increased by 100%, health restoration increased by 33%.")); @@ -694,7 +694,7 @@ public class v0_7_X_Changes { "_-_ glyph of potential wand charge bonus increased by 20%\n\n" + "_-_ glyph of stone evasion conversion efficiency increased to 75% from 60%")); - changes.addButton( new ChangeButton(new Image(Assets.KING, 1, 0, 14, 16), "Dwarf King", + changes.addButton( new ChangeButton(new Image(Assets.Sprites.KING, 1, 0, 14, 16), "Dwarf King", "While I would like to make more extensive changes to Dwarf King in the future, I've made a couple smaller tweaks for now to make him harder to cheese:\n\n" + "_-_ Dwarf King is now able to summon skeletons even if he cannot see the hero\n" + "_-_ Dwarf King is now resistant to fire and toxic gas")); @@ -703,7 +703,7 @@ public class v0_7_X_Changes { changes.hardlight( CharSprite.NEGATIVE ); changeInfos.add(changes); - changes.addButton( new ChangeButton( new Image(Assets.WARRIOR, 0, 15, 12, 15), "Warrior Nerfs", + changes.addButton( new ChangeButton( new Image(Assets.Sprites.WARRIOR, 0, 15, 12, 15), "Warrior Nerfs", "_-_ Warrior's shielding regen scaling reduced by ~15%. This is primarily a lategame nerf.")); changes.addButton( new ChangeButton( new ItemSprite(ItemSpriteSheet.RING_RUBY, null), "Ring Nerfs", @@ -740,7 +740,7 @@ public class v0_7_X_Changes { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new Image(Assets.TILES_SEWERS, 48, 96, 16, 16 ), "Alchemy Overhaul!", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TILES_SEWERS, 48, 96, 16, 16 ), "Alchemy Overhaul!", "The game's alchemy system has been entirely overhauled!\n\n" + "Alchemy is now a full consumable crafting system which lets you create all kinds of new items.\n\n" + "There is also a new resource: alchemical energy. Every alchemy pot has some energy within it. Some recipes require this energy, so make sure to use it wisely!\n\n" + @@ -750,7 +750,7 @@ public class v0_7_X_Changes { "The Alchemist's Toolkit returns!\n\n" + "The toolkit can be found like any other artifact, and acts as a sort of horn of plenty for the new alchemical energy resource.")); - changes.addButton( new ChangeButton(new Image(Assets.TERRAIN_FEATURES, 32, 112, 16, 16), "New Consumables", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TERRAIN_FEATURES, 32, 112, 16, 16), "New Consumables", "Added a new scroll, potion, and plant!\n\n" + "_-_ Scroll of transmutation is a rare scroll which allows the user to change an item into another one of the same type. Note that it cannot be used to make scrolls of magical infusion.\n\n" + "_-_ Potion of haste is an uncommon potion which grants a temporary burst of speed.\n\n" + @@ -827,7 +827,7 @@ public class v0_7_X_Changes { "_-_ Improved payment & sync functions on Google Play version.\n\n" + "_-_ Adjusted bone pile functionality to make it more clear that a spawning wraith means an item is cursed.")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various rare crash and freeze bugs\n" + "_-_ Various audio and visual bugs\n" + @@ -849,7 +849,7 @@ public class v0_7_X_Changes { "_-_ 'Faith is my armor' deleting class armors\n" + "_-_ Various cases where the player can be ontop of enemies")); - changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Various screen layout issues in power saver mode\n" + "_-_ Crashes when tengu is healed above 1/2 health\n" + diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java index bf7ff9352..2c8b4e310 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java @@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.ui.changelist; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing; -import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Golem; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.NewDM300; import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfAugmentation; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfCorruption; @@ -70,7 +69,7 @@ public class v0_8_X_Changes { "_-_ Yog-Dzewa's fists are now considered bosses, not minibosses.\n\n" + "_-_ Updated translations.")); - changes.addButton( new ChangeButton(new Image( Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image( Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed (caused by 0.8.0):\n" + "_-_ Various rare freezes when descending\n" + "_-_ Various rare crash bugs\n" + @@ -109,7 +108,7 @@ public class v0_8_X_Changes { "_-_ Decreased the minimum window size for desktop users.\n\n" + "_-_ Updated translations.")); - changes.addButton( new ChangeButton(new Image( Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image( Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed (caused by 0.8.0):\n" + "_-_ Various errors/crashed caused by new imp shop\n" + "_-_ Several cases where water could spread to tiles that it shouldn't spread to.\n" + @@ -196,7 +195,7 @@ public class v0_8_X_Changes { changes.hardlight( CharSprite.WARNING ); changeInfos.add(changes); - changes.addButton( new ChangeButton(new Image(Assets.TERRAIN_FEATURES, 64, 96, 16, 16), "Trap Adjustments", + changes.addButton( new ChangeButton(new Image(Assets.Environment.TERRAIN_FEATURES, 64, 96, 16, 16), "Trap Adjustments", "I've re-evaluated several lategame traps, and trap spawning frequency. My hope with these changes is to make traps less oppressive in the lategame, while still keeping their general effect wherever possible.\n\n" + "Traps now show up ~10% more in the sewers, scaling down to ~25% less in the demon halls.\n\n" + "_-_ Worn dart traps now deal more damage\n" + @@ -287,7 +286,7 @@ public class v0_8_X_Changes { "\n" + "_-_ Updated translations and translator credits")); - changes.addButton( new ChangeButton(new Image( Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image( Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Rare freeze bugs when enemies make ranged attacks\n" + "_-_ Loading screens very rarely freezing\n" + @@ -304,7 +303,7 @@ public class v0_8_X_Changes { "_-_ Wand of prismatic light rarely revealing areas it shouldn't\n" + "_-_ Upgraded wands not spawning fully charged")); - changes.addButton( new ChangeButton(new Image( Assets.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + changes.addButton( new ChangeButton(new Image( Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + "_-_ Invisibility not applying if the hero is also shadowmelded\n" + "_-_ Landscape/portrait modes working incorrectly in rare cases\n" + @@ -331,7 +330,7 @@ public class v0_8_X_Changes { "_-_ Doubled corruption resistance reduction from debuffs, as it was 50% weaker than intended. It is now as strong as listed in 0.7.5 changelog (50% for major debuffs, 25% for minor)\n\n" + "Additionally, corruption is getting access to two of the new debuffs added in 0.8.0: _Hex,_ and _Weakness._")); - changes.addButton( new ChangeButton(new Image(Assets.BUFFS_LARGE, 80, 32, 16, 16), "Bless changes", + changes.addButton( new ChangeButton(new Image(Assets.Interfaces.BUFFS_LARGE, 80, 32, 16, 16), "Bless changes", "Accuracy and evasion bonuses from blessed buff increased to 25% from 20%." )); changes.addButton( new ChangeButton(new StoneOfAugmentation(), diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java index eab369b99..24776d2e2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java @@ -422,7 +422,7 @@ public class WndBag extends WndTabbed { @Override protected void onPointerDown() { bg.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); } protected void onPointerUp() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java index 4ae23556c..299b803bd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java @@ -137,7 +137,7 @@ public class WndBlacksmith extends Window { @Override protected void onPointerDown() { bg.brightness( 1.2f ); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } @Override protected void onPointerUp() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java index b2156e837..6c6b0f1e4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java @@ -61,7 +61,7 @@ public class WndHero extends WndTabbed { resize( WIDTH, HEIGHT ); - icons = TextureCache.get( Assets.BUFFS_LARGE ); + icons = TextureCache.get( Assets.Interfaces.BUFFS_LARGE ); film = new TextureFilm( icons, 16, 16 ); stats = new StatsTab(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java index 609b0b420..585b45201 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java @@ -46,7 +46,7 @@ public class WndInfoBuff extends Window { IconTitle titlebar = new IconTitle(); - icons = TextureCache.get( Assets.BUFFS_LARGE ); + icons = TextureCache.get( Assets.Interfaces.BUFFS_LARGE ); film = new TextureFilm( icons, 16, 16 ); Image buffIcon = new Image( icons ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 3bb78345f..c0f561c71 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -350,7 +350,7 @@ public class WndRanking extends WndTabbed { @Override protected void onPointerDown() { bg.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); } protected void onPointerUp() { @@ -394,7 +394,7 @@ public class WndRanking extends WndTabbed { @Override protected void onPointerDown() { bg.brightness( 1.5f ); - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); } protected void onPointerUp() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index 3db98c228..18535027e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -362,7 +362,7 @@ public class WndSettings extends WndTabbed { protected void onClick() { super.onClick(); SPDSettings.soundFx(!checked()); - Sample.INSTANCE.play( Assets.SND_CLICK ); + Sample.INSTANCE.play( Assets.Sounds.CLICK ); } }; btnSound.setRect(0, SFXVol.bottom() + GAP_TINY, WIDTH, BTN_HEIGHT); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java index 306eac75e..4837e7931 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java @@ -227,7 +227,7 @@ public class WndStartGame extends Window { protected void createChildren() { super.createChildren(); - avatar = new Image(Assets.AVATARS); + avatar = new Image(Assets.Sprites.AVATARS); avatar.scale.set(2f); add(avatar); @@ -330,7 +330,7 @@ public class WndStartGame extends Window { case HUNTRESS: heroItem.icon(new ItemSprite(ItemSpriteSheet.SPIRIT_BOW, null)); heroLoadout.icon(new ItemSprite(ItemSpriteSheet.GLOVES, null)); - heroMisc.icon(new Image(Assets.TILES_SEWERS, 112, 96, 16, 16 )); + heroMisc.icon(new Image(Assets.Environment.TILES_SEWERS, 112, 96, 16, 16 )); break; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java index 6f7ca5bf5..61432fc86 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java @@ -189,7 +189,7 @@ public class WndTabbed extends Window { @Override protected void onClick() { - Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); WndTabbed.this.onClick( this ); } } diff --git a/desktop/src/main/assets/DroidSansFallback.ttf b/desktop/src/main/assets/fonts/droid_sans.ttf similarity index 100% rename from desktop/src/main/assets/DroidSansFallback.ttf rename to desktop/src/main/assets/fonts/droid_sans.ttf diff --git a/desktop/src/main/assets/icon_128.png b/desktop/src/main/assets/icons/icon_128.png similarity index 100% rename from desktop/src/main/assets/icon_128.png rename to desktop/src/main/assets/icons/icon_128.png diff --git a/desktop/src/main/assets/icon_16.png b/desktop/src/main/assets/icons/icon_16.png similarity index 100% rename from desktop/src/main/assets/icon_16.png rename to desktop/src/main/assets/icons/icon_16.png diff --git a/desktop/src/main/assets/icon_256.png b/desktop/src/main/assets/icons/icon_256.png similarity index 100% rename from desktop/src/main/assets/icon_256.png rename to desktop/src/main/assets/icons/icon_256.png diff --git a/desktop/src/main/assets/icon_32.png b/desktop/src/main/assets/icons/icon_32.png similarity index 100% rename from desktop/src/main/assets/icon_32.png rename to desktop/src/main/assets/icons/icon_32.png diff --git a/desktop/src/main/assets/icon_64.png b/desktop/src/main/assets/icons/icon_64.png similarity index 100% rename from desktop/src/main/assets/icon_64.png rename to desktop/src/main/assets/icons/icon_64.png diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java index de81b01da..6ed89e2d9 100644 --- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java +++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java @@ -135,7 +135,8 @@ public class DesktopLauncher { DesktopWindowListener listener = new DesktopWindowListener(); config.setWindowListener( listener ); - config.setWindowIcon( "icon_16.png", "icon_32.png", "icon_64.png", "icon_128.png", "icon_256.png" ); + config.setWindowIcon("icons/icon_16.png", "icons/icon_32.png", "icons/icon_64.png", + "icons/icon_128.png", "icons/icon_256.png"); new Lwjgl3Application(new ShatteredPixelDungeon(new DesktopPlatformSupport()), config); } diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java index e22136e1f..3e48a65b0 100644 --- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java +++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java @@ -121,10 +121,10 @@ public class DesktopPlatformSupport extends PlatformSupport { fonts = new HashMap<>(); if (systemfont) { - basicFontGenerator = asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("DroidSansFallback.ttf")); + basicFontGenerator = asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/droid_sans.ttf")); } else { - basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); - asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("DroidSansFallback.ttf")); + basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel_font.ttf")); + asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/droid_sans.ttf")); } fonts.put(basicFontGenerator, basicFonts); diff --git a/docs/recommended-changes.md b/docs/recommended-changes.md index c4140a649..3f60959cd 100644 --- a/docs/recommended-changes.md +++ b/docs/recommended-changes.md @@ -44,7 +44,7 @@ Shattered Pixel Dungeon supporters a number of languages which are translated vi If you plan to add new text to the game, maintaining these translations may be difficult or impossible, and so you may wish to remove them: - In [Languages.java](/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java) remove all of the enum constants except for ENGLISH. -- In the [language resource folders](/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages) remove all of the .properties files which include an underscore followed by a language code (e.g. remove actors_ru.properties, but not actors.properties) +- In the [messages resource folders](/core/src/main/assets/messages) remove all of the .properties files which include an underscore followed by a language code (e.g. remove actors_ru.properties, but not actors.properties) - Finally remove the language picker by commenting out the line `add( btnLang );` in [TitleScene.java](/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java) - Optionally, if you are multilingual or have translators and wish to retain some languages, do not comment out the language picker and only remove the enums/resources for the languages you won't be using.