Remove tiers from dungeons names

assets/common/entity/dungeon/cultist/beastmaster.ron

@@ -3,10 +3,10 @@
     name: Name("Beastmaster"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.miniboss"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-5.beastmaster"),
+            inherit: Asset("common.loadout.dungeon.cultist.beastmaster"),
             active_hands: InHands((Choice([
                 (1, Item("common.items.weapons.axe.malachite_axe-0")),
                 (1, ModularWeapon(tool: Sword, material: Bloodsteel, hands: Two)),

assets/common/entity/dungeon/cultist/boss.ron

@@ -3,7 +3,7 @@
     name: Name("Mindflayer"),
     body: RandomWith("mindflayer"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.boss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.boss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/cultist/cultist.ron

@@ -3,10 +3,10 @@
     name: Name("Cultist"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-5.cultist"),
+            inherit: Asset("common.loadout.dungeon.cultist.cultist"),
             active_hands: InHands((Choice([
                 (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)),
                 (4, Item("common.items.weapons.sword.cultist")),

assets/common/entity/dungeon/cultist/hound.ron

@@ -3,7 +3,7 @@
     name: Name("Tamed Darkhound"),
     body: RandomWith("darkhound"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.minion"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/cultist/husk.ron

@@ -3,9 +3,9 @@
     name: Name("Cultist Husk"),
     body: RandomWith("husk"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.minion"),
     inventory: (
-        loadout: Asset("common.loadout.dungeon.tier-5.husk"),
+        loadout: Asset("common.loadout.dungeon.cultist.husk"),
     ),
     meta: [],
 )

assets/common/entity/dungeon/cultist/husk_brute.ron

@@ -3,7 +3,7 @@
     name: Name("Husk Brute"),
     body: RandomWith("husk_brute"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.miniboss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/cultist/warlock.ron

@@ -3,10 +3,10 @@
     name: Name("Cultist Warlock"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-5.warlock"),
+            inherit: Asset("common.loadout.dungeon.cultist.warlock"),
             active_hands: InHands((Choice([
                 (1, Item("common.items.npc_weapons.staff.bipedlarge-cultist")),
                 (1, Item("common.items.npc_weapons.bow.bipedlarge-velorite")),

assets/common/entity/dungeon/cultist/warlord.ron

@@ -3,10 +3,10 @@
     name: Name("Cultist Warlord"),
     body: RandomWith("cultist_warlord"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-5.warlord"),
+            inherit: Asset("common.loadout.dungeon.cultist.warlord"),
             active_hands: InHands((Choice([
                 (1, Item("common.items.npc_weapons.sword.bipedlarge-cultist")),
                 (1, Item("common.items.npc_weapons.hammer.bipedlarge-cultist")),

assets/common/entity/dungeon/dwarven_quarry/hoplite.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Hoplite"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.hoplite"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.hoplite"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.hoplite"), None)),
         )),
     ),

assets/common/entity/dungeon/dwarven_quarry/marksman.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Marksman"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.marksman"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.marksman"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
         )),
     ),

assets/common/entity/dungeon/dwarven_quarry/sniper.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Sniper"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.marksman"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.marksman"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
         )),
     ),

assets/common/entity/dungeon/dwarven_quarry/strategian.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Strategian"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.strategian"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.strategian"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.strategian"), None)),
         )),
     ),

assets/common/entity/dungeon/haniwa/archer.ron

@@ -3,10 +3,10 @@
     name: Name("Haniwa Archer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-3.archer"),
+            inherit: Asset("common.loadout.dungeon.haniwa.archer"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.archer"), None)),
         )),
     ),

assets/common/entity/dungeon/haniwa/boss.ron

@@ -3,7 +3,7 @@
     name: Name("Clay Golem"),
     body: RandomWith("claygolem"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-3.boss"),
+    loot: LootTable("common.loot_tables.dungeon.haniwa.boss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/haniwa/guard.ron

@@ -3,10 +3,10 @@
     name: Name("Haniwa Guard"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-3.guard"),
+            inherit: Asset("common.loadout.dungeon.haniwa.guard"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.guard"), None)),
         )),
     ),

assets/common/entity/dungeon/haniwa/soldier.ron

@@ -3,10 +3,10 @@
     name: Name("Haniwa Soldier"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-3.soldier"),
+            inherit: Asset("common.loadout.dungeon.haniwa.soldier"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.soldier"), None)),
         )),
     ),

assets/common/entity/dungeon/myrmidon/boss.ron

@@ -3,7 +3,7 @@
     name: Name("Minotaur"),
     body: RandomWith("minotaur"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.boss"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.boss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/myrmidon/hoplite.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Hoplite"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.hoplite"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.hoplite"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.hoplite"), None)),
         )),
     ),

assets/common/entity/dungeon/myrmidon/marksman.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Marksman"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.marksman"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.marksman"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
         )),
     ),

assets/common/entity/dungeon/myrmidon/miniboss.ron

@@ -3,7 +3,7 @@
     name: Automatic,
     body: RandomWith("cyclops"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.miniboss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/myrmidon/strategian.ron

@@ -3,10 +3,10 @@
     name: Name("Myrmidon Strategian"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-4.strategian"),
+            inherit: Asset("common.loadout.dungeon.myrmidon.strategian"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.strategian"), None)),
         )),
     ),

assets/common/entity/dungeon/sahagin/boss.ron

@@ -3,7 +3,7 @@
     name: Name("Tidal Warrior"),
     body: RandomWith("tidalwarrior"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-2.boss"),
+    loot: LootTable("common.loot_tables.dungeon.sahagin.boss"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/sahagin/sniper.ron

@@ -3,10 +3,10 @@
     name: Name("Sahagin Sniper"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.sahagin.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-2.sniper"),
+            inherit: Asset("common.loadout.dungeon.sahagin.sniper"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.sniper"), None)),
         )),
     ),

assets/common/entity/dungeon/sahagin/sorcerer.ron

@@ -3,10 +3,10 @@
     name: Name("Sahagin Sorcerer"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.sahagin.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-2.sorcerer"),
+            inherit: Asset("common.loadout.dungeon.sahagin.sorcerer"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.sorcerer"), None)),
         )),
     ),

assets/common/entity/dungeon/sahagin/spearman.ron

@@ -3,10 +3,10 @@
     name: Name("Sahagin Spearman"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.sahagin.enemy"),
     inventory: (
         loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.tier-2.spearman"),
+            inherit: Asset("common.loadout.dungeon.sahagin.spearman"),
             active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.spearman"), None)),
         )),
     ),

assets/common/entity/spot/gnome/spear.ron

@@ -3,7 +3,7 @@
     name: Name("Gnome"),
     body: RandomWith("gnome"),
     alignment: Alignment(Wild),
-    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.gnome"),

assets/common/entity/spot/wizard/adept.ron

@@ -3,7 +3,7 @@
     name: Name("Adept"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_low"),

assets/common/entity/spot/wizard/novice.ron

@@ -3,7 +3,7 @@
     name: Name("Novice"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_low"),

assets/common/entity/spot/wizard/overseer.ron

@@ -3,7 +3,7 @@
     name: Name("Overseer"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_overseer"),

assets/common/entity/spot/wizard/spellbinder.ron

@@ -3,7 +3,7 @@
     name: Name("Overseer"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.enemy"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_spellbinder"),

assets/common/entity/spot/wizard/wizard_argo.ron

@@ -4,7 +4,7 @@
     name: Name("Argo"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.miniboss"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_boss"),

assets/common/entity/spot/wizard/wizard_haku.ron

@@ -4,7 +4,7 @@
     name: Name("Haku"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.miniboss"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_boss"),

assets/common/entity/spot/wizard/wizard_trish.ron

@@ -4,7 +4,7 @@
     name: Name("Trish"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.cultist.miniboss"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.spots.wizard_tower.wizard_boss"),

assets/common/loot_tables/creature/biped_large/cyclops.ron

@@ -3,7 +3,7 @@
         Item("common.items.crafting_ing.animal_misc.grim_eyeball"),
         MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10),
         MultiDrop(Item("common.items.utility.coins"), 200, 500),
-        LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
+        LootTable("common.loot_tables.dungeon.myrmidon.miniboss"),
         ],
    )),
 ]

assets/common/loot_tables/creature/biped_large/dullahan.ron

@@ -1,7 +1,7 @@
 [
   (1, All([
         MultiDrop(Item("common.items.utility.coins"), 200, 500),
-        LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
+        LootTable("common.loot_tables.dungeon.myrmidon.miniboss"),
         MultiDrop(LootTable("common.loot_tables.gliders"), 0, 1),
         ],
    )),

assets/common/loot_tables/dungeon/dwarven_quarry/cyclops.ron

@@ -4,7 +4,7 @@
         LootTable("common.loot_tables.dungeon.dwarven_quarry.t4"),
         MultiDrop(LootTable("common.loot_tables.dungeon.dwarven_quarry.t4-mats"), 1, 3),
         MultiDrop(Item("common.items.utility.coins"), 200, 500),
-        LootTable("common.loot_tables.dungeon.tier-4.boss"),
+        LootTable("common.loot_tables.dungeon.myrmidon.boss"),
         ],
    )),
 ]

assets/common/loot_tables/dungeon/dwarven_quarry/minotaur.ron

@@ -4,7 +4,7 @@
         LootTable("common.loot_tables.dungeon.dwarven_quarry.t4"),
         MultiDrop(LootTable("common.loot_tables.dungeon.dwarven_quarry.t4-mats"), 1, 3),
         MultiDrop(Item("common.items.utility.coins"), 200, 500),
-        LootTable("common.loot_tables.dungeon.tier-4.boss"),
+        LootTable("common.loot_tables.dungeon.myrmidon.boss"),
         ],
    )),
 ]

common/src/comp/inventory/loadout_builder.rs

@@ -1049,7 +1049,7 @@ impl LoadoutBuilder {
         let rng = &mut rand::thread_rng();
         match preset {
             Preset::HuskSummon => {
-                self = self.with_asset_expect("common.loadout.dungeon.tier-5.husk", rng);
+                self = self.with_asset_expect("common.loadout.dungeon.cultist.husk", rng);
             },
             Preset::BorealSummon => {
                 self = self.with_asset_expect("common.loadout.world.boreal.boreal_warrior", rng);

common/src/comp/inventory/trade_pricing.rs

@@ -1172,7 +1172,7 @@ mod tests {
         assert!((lootsum3 - 1.0).abs() < 1e-5);
 
         // includes tier-5 modular weapons
-        let loot4 = expand_loot_table("common.loot_tables.dungeon.tier-4.boss");
+        let loot4 = expand_loot_table("common.loot_tables.dungeon.myrmidon.boss");
         let lootsum4 = loot4.iter().fold(0.0, |s, i| s + i.0);
         //tracing::trace!("{:?} {}", loot4, lootsum4);
         assert!((lootsum4 - 1.0).abs() < 1e-5);

common/src/terrain/sprite.rs

@@ -522,12 +522,12 @@ impl SpriteKind {
             SpriteKind::Bomb => item("common.items.utility.bomb"),
             SpriteKind::DungeonChest0 => table("common.loot_tables.dungeon.gnarling.chest"),
             SpriteKind::DungeonChest1 => table("common.loot_tables.dungeon.adlet.chest"),
-            SpriteKind::DungeonChest2 => table("common.loot_tables.dungeon.tier-2.chest"),
-            SpriteKind::DungeonChest3 => table("common.loot_tables.dungeon.tier-3.chest"),
-            SpriteKind::DungeonChest4 => table("common.loot_tables.dungeon.tier-4.chest"),
-            SpriteKind::DungeonChest5 => table("common.loot_tables.dungeon.tier-5.chest"),
+            SpriteKind::DungeonChest2 => table("common.loot_tables.dungeon.sahagin.chest"),
+            SpriteKind::DungeonChest3 => table("common.loot_tables.dungeon.haniwa.chest"),
+            SpriteKind::DungeonChest4 => table("common.loot_tables.dungeon.myrmidon.chest"),
+            SpriteKind::DungeonChest5 => table("common.loot_tables.dungeon.cultist.chest"),
             SpriteKind::Chest => table("common.loot_tables.sprite.chest"),
-            SpriteKind::CommonLockedChest => table("common.loot_tables.dungeon.tier-2.chest"),
+            SpriteKind::CommonLockedChest => table("common.loot_tables.dungeon.sahagin.chest"),
             SpriteKind::ChestBuried => table("common.loot_tables.sprite.chest-buried"),
             SpriteKind::CoralChest => table("common.loot_tables.dungeon.sea_chapel.chest_coral"),
             SpriteKind::Mud => table("common.loot_tables.sprite.mud"),

server/src/rtsim/tick.rs

@@ -49,7 +49,7 @@ fn humanoid_config(profession: &Profession) -> &'static str {
         Profession::Chef => "common.entity.village.chef",
         Profession::Alchemist => "common.entity.village.alchemist",
         Profession::Pirate => "common.entity.spot.pirate",
-        Profession::Cultist => "common.entity.dungeon.tier-5.cultist",
+        Profession::Cultist => "common.entity.dungeon.cultist.cultist",
     }
 }
 

world/src/layer/spot.rs

@@ -220,7 +220,7 @@ impl Spot {
         Self::generate_spots(
             Spot::GnarlingTotem,
             world,
-            2.0,
+            1.5,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -234,7 +234,7 @@ impl Spot {
         Self::generate_spots(
             Spot::FallenTree,
             world,
-            2.0,
+            1.5,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -601,9 +601,9 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
                 base_structures: Some("spots.myrmidon-temple"),
                 entity_radius: 10.0,
                 entities: &[
-                    (3..5, "common.entity.dungeon.tier-4.hoplite"),
-                    (3..5, "common.entity.dungeon.tier-4.strategian"),
-                    (2..3, "common.entity.dungeon.tier-4.marksman"),
+                    (3..5, "common.entity.dungeon.myrmidon.hoplite"),
+                    (3..5, "common.entity.dungeon.myrmidon.strategian"),
+                    (2..3, "common.entity.dungeon.myrmidon.marksman"),
                 ],
             },
             Spot::WitchHouse => SpotConfig {

world/src/site2/plot/dungeon.rs

@@ -673,9 +673,9 @@ fn enemy_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
         // TODO: give enemies health skills?
         let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
         match dynamic_rng.gen_range(0..=4) {
-            0 => entity.with_asset_expect("common.entity.dungeon.tier-2.sniper", dynamic_rng),
-            1 => entity.with_asset_expect("common.entity.dungeon.tier-2.sorcerer", dynamic_rng),
-            _ => entity.with_asset_expect("common.entity.dungeon.tier-2.spearman", dynamic_rng),
+            0 => entity.with_asset_expect("common.entity.dungeon.sahagin.sniper", dynamic_rng),
+            1 => entity.with_asset_expect("common.entity.dungeon.sahagin.sorcerer", dynamic_rng),
+            _ => entity.with_asset_expect("common.entity.dungeon.sahagin.spearman", dynamic_rng),
         }
     });
 
@@ -689,9 +689,9 @@ fn enemy_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
         // TODO: give enemies health skills?
         let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
         match dynamic_rng.gen_range(0..=4) {
-            0 => entity.with_asset_expect("common.entity.dungeon.tier-3.archer", dynamic_rng),
-            1 => entity.with_asset_expect("common.entity.dungeon.tier-3.soldier", dynamic_rng),
-            _ => entity.with_asset_expect("common.entity.dungeon.tier-3.guard", dynamic_rng),
+            0 => entity.with_asset_expect("common.entity.dungeon.haniwa.archer", dynamic_rng),
+            1 => entity.with_asset_expect("common.entity.dungeon.haniwa.soldier", dynamic_rng),
+            _ => entity.with_asset_expect("common.entity.dungeon.haniwa.guard", dynamic_rng),
         }
     });
 
@@ -705,9 +705,9 @@ fn enemy_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
         // TODO: give enemies health skills?
         let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
         match dynamic_rng.gen_range(0..=4) {
-            0 => entity.with_asset_expect("common.entity.dungeon.tier-4.marksman", dynamic_rng),
-            1 => entity.with_asset_expect("common.entity.dungeon.tier-4.strategian", dynamic_rng),
-            _ => entity.with_asset_expect("common.entity.dungeon.tier-4.hoplite", dynamic_rng),
+            0 => entity.with_asset_expect("common.entity.dungeon.myrmidon.marksman", dynamic_rng),
+            1 => entity.with_asset_expect("common.entity.dungeon.myrmidon.strategian", dynamic_rng),
+            _ => entity.with_asset_expect("common.entity.dungeon.myrmidon.hoplite", dynamic_rng),
         }
     });
 
@@ -721,9 +721,9 @@ fn enemy_5(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
         // TODO: give enemies health skills?
         let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
         match dynamic_rng.gen_range(0..=4) {
-            0 => entity.with_asset_expect("common.entity.dungeon.tier-5.warlock", dynamic_rng),
-            1 => entity.with_asset_expect("common.entity.dungeon.tier-5.warlord", dynamic_rng),
-            _ => entity.with_asset_expect("common.entity.dungeon.tier-5.cultist", dynamic_rng),
+            0 => entity.with_asset_expect("common.entity.dungeon.cultist.warlock", dynamic_rng),
+            1 => entity.with_asset_expect("common.entity.dungeon.cultist.warlord", dynamic_rng),
+            _ => entity.with_asset_expect("common.entity.dungeon.cultist.cultist", dynamic_rng),
         }
     });
 
@@ -742,24 +742,24 @@ fn enemy_fallback(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<En
 }
 
 fn turret_3(dynamic_rng: &mut impl Rng, pos: Vec3<f32>) -> EntityInfo {
-    EntityInfo::at(pos).with_asset_expect("common.entity.dungeon.tier-3.sentry", dynamic_rng)
+    EntityInfo::at(pos).with_asset_expect("common.entity.dungeon.haniwa.sentry", dynamic_rng)
 }
 
 fn turret_5(dynamic_rng: &mut impl Rng, pos: Vec3<f32>) -> EntityInfo {
-    EntityInfo::at(pos).with_asset_expect("common.entity.dungeon.tier-5.turret", dynamic_rng)
+    EntityInfo::at(pos).with_asset_expect("common.entity.dungeon.cultist.turret", dynamic_rng)
 }
 
 fn boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
     vec![
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-2.boss", dynamic_rng),
+            .with_asset_expect("common.entity.dungeon.sahagin.boss", dynamic_rng),
     ]
 }
 fn boss_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
     let mut entities = Vec::new();
     entities.resize_with(2, || {
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-3.boss", dynamic_rng)
+            .with_asset_expect("common.entity.dungeon.haniwa.boss", dynamic_rng)
     });
 
     entities
@@ -768,14 +768,14 @@ fn boss_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo
 fn boss_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
     vec![
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-4.boss", dynamic_rng),
+            .with_asset_expect("common.entity.dungeon.myrmidon.boss", dynamic_rng),
     ]
 }
 
 fn boss_5(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
     vec![
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-5.boss", dynamic_rng),
+            .with_asset_expect("common.entity.dungeon.cultist.boss", dynamic_rng),
     ]
 }
 
@@ -790,7 +790,7 @@ fn mini_boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Entit
     let mut entities = Vec::new();
     entities.resize_with(6, || {
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-2.hakulaq", dynamic_rng)
+            .with_asset_expect("common.entity.dungeon.sahagin.hakulaq", dynamic_rng)
     });
     entities
 }
@@ -799,7 +799,7 @@ fn mini_boss_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Entit
     let mut entities = Vec::new();
     entities.resize_with(3, || {
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-3.bonerattler", dynamic_rng)
+            .with_asset_expect("common.entity.dungeon.haniwa.bonerattler", dynamic_rng)
     });
     entities
 }
@@ -807,7 +807,7 @@ fn mini_boss_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Entit
 fn mini_boss_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
     vec![
         EntityInfo::at(tile_wcenter.map(|e| e as f32))
-            .with_asset_expect("common.entity.dungeon.tier-4.miniboss", dynamic_rng),
+            .with_asset_expect("common.entity.dungeon.myrmidon.miniboss", dynamic_rng),
     ]
 }
 
@@ -817,23 +817,23 @@ fn mini_boss_5(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Entit
         0 => {
             entities.push(
                 EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                    .with_asset_expect("common.entity.dungeon.tier-5.beastmaster", dynamic_rng),
+                    .with_asset_expect("common.entity.dungeon.cultist.beastmaster", dynamic_rng),
             );
             entities.resize_with(entities.len() + 4, || {
                 EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                    .with_asset_expect("common.entity.dungeon.tier-5.hound", dynamic_rng)
+                    .with_asset_expect("common.entity.dungeon.cultist.hound", dynamic_rng)
             });
         },
         1 => {
             entities.resize_with(2, || {
                 EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                    .with_asset_expect("common.entity.dungeon.tier-5.husk_brute", dynamic_rng)
+                    .with_asset_expect("common.entity.dungeon.cultist.husk_brute", dynamic_rng)
             });
         },
         _ => {
             entities.resize_with(10, || {
                 EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                    .with_asset_expect("common.entity.dungeon.tier-5.husk", dynamic_rng)
+                    .with_asset_expect("common.entity.dungeon.cultist.husk", dynamic_rng)
             });
         },
     }