diff --git a/assets/common/entity/spot/myrmidon/spear.ron b/assets/common/entity/spot/myrmidon/spear.ron deleted file mode 100644 index 829a25ce1f..0000000000 --- a/assets/common/entity/spot/myrmidon/spear.ron +++ /dev/null @@ -1,23 +0,0 @@ -( - name: Name("Myrmidon Hoplite"), - body: RandomWith("myrmidon"), - alignment: Alignment(Enemy), - loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.wooden_spear")), - base_asset: Loadout("common.loadout.dungeon.tier-4.myrmidon"), - inventory: [], - ), - loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), -<<<<<<< HEAD - meta: [], -) -======= - - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.hoplite")), - - meta: [ - LoadoutAsset("common.loadout.dungeon.tier-4.hoplite"), - - ], -) ->>>>>>> new mobs diff --git a/assets/common/loadout/test.ron b/assets/common/loadout/test.ron index 65f2cd68a9..6b6f1f0992 100644 --- a/assets/common/loadout/test.ron +++ b/assets/common/loadout/test.ron @@ -7,7 +7,7 @@ InactiveOffhand: Item("common.items.weapons.sword_1h.bloodsteel-0"), // Gear - Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.myrmidon"), + Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.hoplite"), Armor(Shoulders): Item("common.items.armor.twigsflowers.shoulder"), Armor(Chest): Item("common.items.armor.twigsflowers.chest"), Armor(Hands): Item("common.items.armor.twigsflowers.hand"), diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index abfff1c068..4c456a9cba 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -366,7 +366,7 @@ fn default_main_tool(body: &Body) -> Item { }, Body::BipedSmall(biped_small) => match (biped_small.species, biped_small.body_type) { (biped_small::Species::Gnome, _) => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.biped_small.adlet.gnoll_staff", + "common.items.npc_weapons.biped_small.adlet.tracker", )), (biped_small::Species::Husk, _) => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.husk", diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs index dacd75eb08..7b0783c00b 100644 --- a/world/src/layer/spot.rs +++ b/world/src/layer/spot.rs @@ -441,7 +441,11 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { Spot::MyrmidonTemple => SpotConfig { base_structures: Some("spots.myrmidon-temple"), entity_radius: 10.0, - entities: &[(8..10, "common.entity.spot.myrmidon.spear")], + 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"), + ], }, Spot::WitchHouse => SpotConfig { base_structures: Some("spots_general.witch_hut"),