Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

myrmidon fix

Browse Source
This commit is contained in:
jshipsey 2022-01-30 01:21:28 -05:00
parent 7827797106
commit 7cac4b4001
4 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/common/entity/spot/myrmidon/spear.ron
View File

@ -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

2
assets/common/loadout/test.ron
View File

@ -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"),

2
common/src/comp/inventory/loadout_builder.rs
View File

@ -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",

6
world/src/layer/spot.rs
View File

@ -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"),