Merge branch 'juliancoffee/asset_loadout' into 'master'

Move loadout creation to .ron files

See merge request veloren/veloren!2337

assets/common/loadouts/dungeon/tier-0/gnarling.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.gnarling"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.gnarling"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.gnarling"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.gnarling"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.gnarling"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.gnarling"),
+})

assets/common/loadouts/dungeon/tier-1/adlet_bow.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.adlet.head.adlet_bow"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.adlet.hand.adlet_bow"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.adlet.foot.adlet"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.adlet.chest.adlet_bow"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.adlet.pants.adlet_bow"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.adlet.tail.adlet"),
+})

assets/common/loadouts/dungeon/tier-1/adlet_spear.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.adlet.head.adlet_spear"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.adlet.hand.adlet_spear"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.adlet.foot.adlet"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.adlet.chest.adlet_spear"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.adlet.pants.adlet_spear"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.adlet.tail.adlet"),
+})

assets/common/loadouts/dungeon/tier-2/sahagin.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.sahagin.head.sahagin"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.sahagin.foot.sahagin"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.sahagin.hand.sahagin"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.sahagin.chest.sahagin"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.sahagin.pants.sahagin"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.sahagin.tail.sahagin"),
+})

assets/common/loadouts/dungeon/tier-3/haniwa.ron

@@ -0,0 +1,7 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.haniwa.head.haniwa"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.haniwa.foot.haniwa"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.haniwa.hand.haniwa"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.haniwa.chest.haniwa"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.haniwa.pants.haniwa"),
+})

assets/common/loadouts/dungeon/tier-4/myrmidon.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.myrmidon"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.myrmidon.foot.myrmidon"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.myrmidon.hand.myrmidon"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.myrmidon.chest.myrmidon"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.myrmidon.pants.myrmidon"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.myrmidon.tail.myrmidon"),
+})

assets/common/loadouts/dungeon/tier-5/beastmaster.ron

@@ -0,0 +1,17 @@
+({
+    Armor(Shoulders): Item("common.items.armor.ferocious.shoulder"),
+    Armor(Chest): Item("common.items.armor.ferocious.chest"),
+    Armor(Belt): Item("common.items.armor.ferocious.belt"),
+    Armor(Hands): Item("common.items.armor.ferocious.hand"),
+    Armor(Legs): Item("common.items.armor.ferocious.pants"),
+    Armor(Feet): Item("common.items.armor.ferocious.foot"),
+
+    Armor(Back): Item("common.items.armor.ferocious.back"),
+
+    Lantern: Choice([
+        (1.0, Some(Item("common.items.lantern.black_0"))),
+        (2.0, None),
+    ]),
+
+    Glider: Item("common.items.glider.glider_blue"),
+})

assets/common/loadouts/dungeon/tier-5/husk.ron

@@ -0,0 +1,7 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.husk.head.husk"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.husk.foot.husk"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.husk.hand.husk"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.husk.chest.husk"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.husk.pants.husk"),
+})

assets/common/loadouts/dungeon/tier-5/warlock.ron

@@ -0,0 +1,17 @@
+({
+    Armor(Shoulders): Item("common.items.armor.warlock.shoulder"),
+    Armor(Chest): Item("common.items.armor.warlock.chest"),
+    Armor(Belt): Item("common.items.armor.warlock.belt"),
+    Armor(Hands): Item("common.items.armor.warlock.hand"),
+    Armor(Legs): Item("common.items.armor.warlock.pants"),
+    Armor(Feet): Item("common.items.armor.warlock.foot"),
+
+    Armor(Back): Item("common.items.armor.warlock.back"),
+
+    Lantern: Choice([
+        (1.0, Some(Item("common.items.lantern.black_0"))),
+        (2.0, None),
+    ]),
+
+    Glider: Item("common.items.glider.glider_purp"),
+})

assets/common/loadouts/dungeon/tier-5/warlord.ron

@@ -0,0 +1,17 @@
+({
+    Armor(Shoulders): Item("common.items.armor.warlord.shoulder"),
+    Armor(Chest): Item("common.items.armor.warlord.chest"),
+    Armor(Belt): Item("common.items.armor.warlord.belt"),
+    Armor(Hands): Item("common.items.armor.warlord.hand"),
+    Armor(Legs): Item("common.items.armor.warlord.pants"),
+    Armor(Feet): Item("common.items.armor.warlord.foot"),
+
+    Armor(Back): Item("common.items.armor.warlord.back"),
+
+    Lantern: Choice([
+        (1.0, Some(Item("common.items.lantern.black_0"))),
+        (2.0, None),
+    ]),
+
+    Glider: Item("common.items.glider.glider_purp"),
+})

assets/common/loadouts/test.ron

@@ -0,0 +1,32 @@
+({
+    // Weapons
+    ActiveMainhand: Item("common.items.weapons.sword_1h.bloodsteel-0"),
+    ActiveOffhand: Item("common.items.weapons.sword_1h.bloodsteel-0"),
+
+    InactiveMainhand: Item("common.items.weapons.sword_1h.bloodsteel-0"),
+    InactiveOffhand: Item("common.items.weapons.sword_1h.bloodsteel-0"),
+    
+    // Gear
+    Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.myrmidon"),
+    Armor(Shoulders): Item("common.items.armor.twigsflowers.shoulder"),
+    Armor(Chest): Item("common.items.armor.twigsflowers.chest"),
+    Armor(Hands): Item("common.items.armor.twigsflowers.hand"),
+    Armor(Legs): Item("common.items.armor.twigsflowers.pants"),
+    Armor(Feet): Item("common.items.armor.twigsflowers.foot"),
+    Armor(Belt): Item("common.items.armor.twigsflowers.belt"),
+
+    // Biju
+    Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"),
+    Armor(Neck): Item("common.items.armor.misc.neck.plain_1"),
+    Armor(Ring1): Item("common.items.armor.misc.ring.gold"),
+    Armor(Ring2): Item("common.items.armor.misc.ring.gold"),
+    
+    // Misc
+    Lantern: Item("common.items.lantern.black_0"),
+    Armor(Tabard): Item("common.items.debug.admin"),
+    Glider: Item("common.items.glider.glider_basic_red"),
+    Armor(Bag1): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
+    Armor(Bag2): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
+    Armor(Bag3): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
+    Armor(Bag4): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
+})

assets/common/loadouts/village/guard.ron

@@ -0,0 +1,13 @@
+({
+    Armor(Shoulders): Item("common.items.armor.leather_plate.shoulder"),
+    Armor(Chest): Item("common.items.armor.leather_plate.chest"),
+    Armor(Belt): Item("common.items.armor.leather_plate.belt"),
+    Armor(Hands): Item("common.items.armor.leather_plate.hand"),
+    Armor(Legs): Item("common.items.armor.leather_plate.pants"),
+    Armor(Feet): Item("common.items.armor.leather_plate.foot"),
+
+    Lantern: Choice([
+        (1.0, Some(Item("common.items.lantern.black_0"))),
+        (2.0, None),
+    ]),
+})

assets/common/loadouts/village/merchant.ron

@@ -0,0 +1,13 @@
+({
+    Armor(Shoulders): Item("common.items.armor.twigsflowers.shoulder"),
+    Armor(Chest): Item("common.items.armor.twigsflowers.chest"),
+    Armor(Hands): Item("common.items.armor.twigsflowers.hand"),
+    Armor(Legs): Item("common.items.armor.twigsflowers.pants"),
+    Armor(Feet): Item("common.items.armor.twigsflowers.foot"),
+    Armor(Belt): Item("common.items.armor.twigsflowers.belt"),
+
+    Lantern: Item("common.items.lantern.black_0"),
+    Armor(Neck): Item("common.items.armor.misc.neck.plain_1"),
+    Armor(Ring1): Item("common.items.armor.misc.ring.gold"),
+    Armor(Ring2): Item("common.items.armor.misc.ring.gold"),
+})

assets/common/loadouts/village/villager.ron

@@ -0,0 +1,22 @@
+({
+    Armor(Chest): Choice([
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_green_0"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_green_1"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_red_0"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_red_1"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_purple_0"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_purple_1"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_yellow_0"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_yellow_1"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_0"))),
+        (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_1"))),
+    ]),
+
+    Armor(Belt): Item("common.items.armor.swift.belt"),
+    Armor(Legs): Item("common.items.armor.misc.pants.worker_blue"),
+
+    Armor(Feet): Choice([
+        (1.0, Some(Item("common.items.armor.swift.foot"))),
+        (1.0, Some(Item("common.items.armor.misc.foot.sandals"))),
+    ]),
+})

world/src/site/dungeon/mod.rs

@@ -584,7 +584,6 @@ impl Floor {
                         )
                         //.do_if(is_giant, |e| e.into_giant())
                         .with_alignment(comp::Alignment::Enemy)
-                        .with_loadout_config(loadout_builder::LoadoutConfig::CultistAcolyte)
                         .with_skillset_config(common::skillset_builder::SkillSetConfig::CultistAcolyte)
                         .with_loot_drop(chosen.read().choose().to_item())
                         .with_level(dynamic_rng.gen_range((room.difficulty as f32).powf(1.25) + 3.0..(room.difficulty as f32).powf(1.5) + 4.0).round() as u16);