From 7827797106b73cedbf95cb8a4897cf6f42f3e974 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 30 Jan 2022 01:10:13 -0500 Subject: [PATCH] weapon tweaks --- .../entity/dungeon/tier-0/chieftain.ron | 2 +- .../common/entity/dungeon/tier-0/logger.ron | 2 +- .../common/entity/dungeon/tier-0/mugger.ron | 2 +- .../common/entity/dungeon/tier-0/stalker.ron | 2 +- .../npc_weapons/biped_small/adlet/hunter.ron | 6 +-- .../biped_small/adlet/icepicker.ron | 6 +-- .../npc_weapons/biped_small/adlet/tracker.ron | 6 +-- .../{chieftain_staff.ron => chieftain.ron} | 2 +- .../gnarling/{axe.ron => logger.ron} | 4 +- .../gnarling/{dagger.ron => mugger.ron} | 4 +- .../gnarling/{blowgun.ron => stalker.ron} | 4 +- .../npc_weapons/biped_small/haniwa/archer.ron | 6 +-- .../npc_weapons/biped_small/haniwa/guard.ron | 4 +- .../biped_small/haniwa/soldier.ron | 4 +- .../biped_small/myrmidon/hoplite.ron | 4 +- .../biped_small/myrmidon/marksman.ron | 6 +-- .../biped_small/myrmidon/strategian.ron | 4 +- .../biped_small/sahagin/sniper.ron | 6 +-- .../biped_small/sahagin/sorcerer.ron | 4 +- .../biped_small/sahagin/spearman.ron | 4 +- .../biped_small_armor_chest_manifest.ron | 2 +- .../voxygen/voxel/biped_weapon_manifest.ron | 38 +++++++-------- .../npc/adlet/male/bow/bow_movelater.vox | 3 -- .../voxel/npc/adlet/male/bow/chest.vox | 3 -- .../voxel/npc/adlet/male/bow/hand_r.vox | 3 -- .../voxygen/voxel/npc/adlet/male/bow/head.vox | 3 -- .../voxel/npc/adlet/male/bow/pants.vox | 3 -- .../voxygen/voxel/npc/adlet/male/foot_r.vox | 3 -- .../voxel/npc/adlet/male/spear/chest.vox | 3 -- .../voxel/npc/adlet/male/spear/hand_r.vox | 3 -- .../voxel/npc/adlet/male/spear/head.vox | 3 -- .../voxel/npc/adlet/male/spear/pants.vox | 3 -- assets/voxygen/voxel/npc/adlet/male/tail.vox | 3 -- .../voxygen/voxel/npc/haniwa/male/chest.vox | 3 -- .../voxygen/voxel/npc/haniwa/male/foot_r.vox | 3 -- .../voxygen/voxel/npc/haniwa/male/hand_r.vox | 3 -- assets/voxygen/voxel/npc/haniwa/male/head.vox | 3 -- .../voxygen/voxel/npc/haniwa/male/pants.vox | 3 -- .../npc/myrmidon/male/MyrmidonHoplite-5.vox | 3 -- .../voxygen/voxel/npc/myrmidon/male/chest.vox | 3 -- .../voxel/npc/myrmidon/male/foot_r.vox | 3 -- .../voxel/npc/myrmidon/male/hand_r.vox | 3 -- .../voxygen/voxel/npc/myrmidon/male/head.vox | 3 -- .../voxygen/voxel/npc/myrmidon/male/pants.vox | 3 -- .../voxygen/voxel/npc/myrmidon/male/tail.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/chest.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/foot_r.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/hand_r.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/head.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/pants.vox | 3 -- .../voxygen/voxel/npc/sahagin/male/tail.vox | 3 -- .../voxel/npc/sahagin/spearman/hand_r.vox | 4 +- .../voxel/weapon/biped_small/dagger/rogue.vox | 2 +- .../weapon/biped_small/staff/sahagin.vox | 3 -- world/src/site2/plot/dungeon.rs | 48 +++++-------------- 55 files changed, 76 insertions(+), 190 deletions(-) rename assets/common/items/npc_weapons/biped_small/gnarling/{chieftain_staff.ron => chieftain.ron} (93%) rename assets/common/items/npc_weapons/biped_small/gnarling/{axe.ron => logger.ron} (87%) rename assets/common/items/npc_weapons/biped_small/gnarling/{dagger.ron => mugger.ron} (87%) rename assets/common/items/npc_weapons/biped_small/gnarling/{blowgun.ron => stalker.ron} (86%) delete mode 100644 assets/voxygen/voxel/npc/adlet/male/bow/bow_movelater.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/bow/chest.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/bow/hand_r.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/bow/head.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/bow/pants.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/foot_r.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/spear/chest.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/spear/hand_r.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/spear/head.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/spear/pants.vox delete mode 100644 assets/voxygen/voxel/npc/adlet/male/tail.vox delete mode 100644 assets/voxygen/voxel/npc/haniwa/male/chest.vox delete mode 100644 assets/voxygen/voxel/npc/haniwa/male/foot_r.vox delete mode 100644 assets/voxygen/voxel/npc/haniwa/male/hand_r.vox delete mode 100644 assets/voxygen/voxel/npc/haniwa/male/head.vox delete mode 100644 assets/voxygen/voxel/npc/haniwa/male/pants.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/MyrmidonHoplite-5.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/chest.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/foot_r.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/hand_r.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/head.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/pants.vox delete mode 100644 assets/voxygen/voxel/npc/myrmidon/male/tail.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/chest.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/foot_r.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/hand_r.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/head.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/pants.vox delete mode 100644 assets/voxygen/voxel/npc/sahagin/male/tail.vox delete mode 100644 assets/voxygen/voxel/weapon/biped_small/staff/sahagin.vox diff --git a/assets/common/entity/dungeon/tier-0/chieftain.ron b/assets/common/entity/dungeon/tier-0/chieftain.ron index 7db457841f..1a673878af 100644 --- a/assets/common/entity/dungeon/tier-0/chieftain.ron +++ b/assets/common/entity/dungeon/tier-0/chieftain.ron @@ -3,7 +3,7 @@ body: RandomWith("gnarling"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain_staff")), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain")), base_asset: Loadout("common.loadout.dungeon.tier-0.gnarling_chieftain"), inventory: [], ), diff --git a/assets/common/entity/dungeon/tier-0/logger.ron b/assets/common/entity/dungeon/tier-0/logger.ron index a75141d5b5..47c999b27f 100644 --- a/assets/common/entity/dungeon/tier-0/logger.ron +++ b/assets/common/entity/dungeon/tier-0/logger.ron @@ -3,7 +3,7 @@ body: RandomWith("gnarling"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.axe")), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.logger")), base_asset: Loadout("common.loadout.dungeon.tier-0.logger"), inventory: [], ), diff --git a/assets/common/entity/dungeon/tier-0/mugger.ron b/assets/common/entity/dungeon/tier-0/mugger.ron index 2728e3c0f9..26c5483858 100644 --- a/assets/common/entity/dungeon/tier-0/mugger.ron +++ b/assets/common/entity/dungeon/tier-0/mugger.ron @@ -3,7 +3,7 @@ body: RandomWith("gnarling"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.dagger")), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.mugger")), base_asset: Loadout("common.loadout.dungeon.tier-0.mugger"), inventory: [], ), diff --git a/assets/common/entity/dungeon/tier-0/stalker.ron b/assets/common/entity/dungeon/tier-0/stalker.ron index fecf3bcce1..dfb9b694d7 100644 --- a/assets/common/entity/dungeon/tier-0/stalker.ron +++ b/assets/common/entity/dungeon/tier-0/stalker.ron @@ -3,7 +3,7 @@ body: RandomWith("gnarling"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.blowgun")), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.stalker")), base_asset: Loadout("common.loadout.dungeon.tier-0.stalker"), inventory: [], ), diff --git a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron index ec469ee143..bd23647bac 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Wooden Spear", - description: "Testing", + name: "Hunter Spear", + description: "", kind: Tool(( - kind: Axe, + kind: Spear, hands: Two, stats: Direct(( equip_time_secs: 0.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron index f36ae75786..328ba587f6 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Gnoll Staff", - description: "eekum bokum", + name: "Icepicker Axe", + description: "", kind: Tool(( - kind: Staff, + kind: Axe, hands: Two, stats: Direct(( equip_time_secs: 0.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron index e560436fe9..9d6f02cad9 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", + name: "Tracker Bow", + description: "", kind: Tool(( kind: Bow, hands: Two, @@ -17,5 +17,5 @@ ItemDef( )), quality: Moderate, tags: [], - ability_spec: None, + ability_spec: Some(Custom("Bow Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron similarity index 93% rename from assets/common/items/npc_weapons/biped_small/gnarling/chieftain_staff.ron rename to assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron index ba7715df47..11fd044bac 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron @@ -1,6 +1,6 @@ ItemDef( name: "Chieftain Staff", - description: "eekum bokum", + description: "", kind: Tool(( kind: Staff, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/axe.ron b/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron similarity index 87% rename from assets/common/items/npc_weapons/biped_small/gnarling/axe.ron rename to assets/common/items/npc_weapons/biped_small/gnarling/logger.ron index d99e5fd64f..2582a28283 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/axe.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnarling Logger Axe", - description: "Testing", + name: "Logger Axe", + description: "", kind: Tool(( kind: Axe, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/dagger.ron b/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron similarity index 87% rename from assets/common/items/npc_weapons/biped_small/gnarling/dagger.ron rename to assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron index a9c759e1ce..64bef011da 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/dagger.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnarling Mugger Dagger", - description: "Testing", + name: "Mugger Dagger", + description: "", kind: Tool(( kind: Dagger, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/blowgun.ron b/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron similarity index 86% rename from assets/common/items/npc_weapons/biped_small/gnarling/blowgun.ron rename to assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron index 20c9e57a18..5557d3d600 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/blowgun.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnarling Blowgun", - description: "testing123", + name: "Stalker Blowgun", + description: "", kind: Tool(( kind: Blowgun, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron index 775f7bb67f..54b3f22bad 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", + name: "Archer Bow", + description: "", kind: Tool(( kind: Bow, hands: Two, @@ -17,5 +17,5 @@ ItemDef( )), quality: Moderate, tags: [], - ability_spec: None, + ability_spec: Some(Custom("Bow Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron index 6bbadb8173..cd086178cb 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Wooden Spear", - description: "Testing", + name: "Guard Spear", + description: "", kind: Tool(( kind: Spear, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron index ecf8ebdaed..fda1112770 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnoll Staff", - description: "eekum bokum", + name: "Soldier Sword", + description: "", kind: Tool(( kind: Dagger, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron index 0d797abeab..05dde879db 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Wooden Spear", - description: "Testing", + name: "Hoplite Spear", + description: "", kind: Tool(( kind: Spear, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron index 185f2d5f7e..e51db5461f 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", + name: "Marksman Bow", + description: "", kind: Tool(( kind: Bow, hands: Two, @@ -17,5 +17,5 @@ ItemDef( )), quality: Moderate, tags: [], - ability_spec: None, + ability_spec: Some(Custom("Bow Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron index 2810ea6589..ea0397af33 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnoll Staff", - description: "eekum bokum", + name: "Strategian Axe", + description: "", kind: Tool(( kind: Axe, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron index be326e45e2..8b8187b3c6 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", + name: "Sniper Bow", + description: "", kind: Tool(( kind: Bow, hands: Two, @@ -17,5 +17,5 @@ ItemDef( )), quality: Moderate, tags: [], - ability_spec: None, + ability_spec: Some(Custom("Bow Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron index fe69702d5a..ccdf070cd6 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Gnoll Staff", - description: "eekum bokum", + name: "Sorcerer Staff", + description: "", kind: Tool(( kind: Staff, hands: Two, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron index cfa87de675..8d0f268473 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Wooden Spear", - description: "Testing", + name: "Spearman Spear", + description: "", kind: Tool(( kind: Spear, hands: Two, diff --git a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron index 01c2dffca8..c201363619 100644 --- a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron @@ -61,7 +61,7 @@ vox_spec: ("npc.haniwa.archer.chest", (-6.5, -4.0, -3.0)), ), "HaniwaSoldier": ( - vox_spec: ("npc.haniwa.solier.chest", (-6.5, -4.0, -3.0)), + vox_spec: ("npc.haniwa.soldier.chest", (-6.5, -4.0, -3.0)), ), "MyrmidonHoplite": ( vox_spec: ("npc.myrmidon.hoplite.chest", (-5.5, -4.0, -3.0)), diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index e01293f35e..3b3143f875 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1103,44 +1103,44 @@ color: None ), //BIPEDSMALL - "common.items.npc_weapons.biped_small.gnarling.chieftain_staff": ( - vox_spec: ("weapon.biped_small.staff.chieftain", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.gnarling.chieftain": ( + vox_spec: ("weapon.biped_small.staff.chieftain", (-1.5, -4.5, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.blowgun": ( + "common.items.npc_weapons.biped_small.gnarling.stalker": ( vox_spec: ("weapon.biped_small.blowgun.stalker", (-2.5, -2.5, -1.5)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.axe": ( + "common.items.npc_weapons.biped_small.gnarling.logger": ( vox_spec: ("weapon.biped_small.axe.logger", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.dagger": ( - vox_spec: ("weapon.biped_small.dagger.dagger", (-0.5, -4.5, -0.0)), + "common.items.npc_weapons.biped_small.gnarling.mugger": ( + vox_spec: ("weapon.biped_small.dagger.mugger", (-0.5, -4.5, -1.0)), color: None ), "common.items.npc_weapons.biped_small.adlet.hunter": ( - vox_spec: ("weapon.biped_small.spear.hunter", (-0.5, -3.0, -4.0)), + vox_spec: ("weapon.biped_small.spear.hunter", (-0.5, -2.0, -5.0)), color: None ), "common.items.npc_weapons.biped_small.adlet.icepicker": ( - vox_spec: ("weapon.biped_small.axe.icepicker", (-0.5, -3.0, -4.0)), + vox_spec: ("weapon.biped_small.axe.icepicker", (-1.5, -6.5, -4.0)), color: None ), "common.items.npc_weapons.biped_small.adlet.tracker": ( - vox_spec: ("weapon.biped_small.bow.tracker", (-0.5, -3.0, -4.0)), + vox_spec: ("weapon.biped_small.bow.tracker", (-0.5, -5.5, -9.5)), color: None ), "common.items.npc_weapons.biped_small.gnoll.rogue": ( - vox_spec: ("weapon.biped_small.dagger.rogue", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.dagger.rogue", (-0.5, -3.0, -1.0)), color: None ), "common.items.npc_weapons.biped_small.gnoll.trapper": ( - vox_spec: ("weapon.biped_small.blowgun.trapper", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.blowgun.trapper", (-1.5, -1.5, -1.5)), color: None ), "common.items.npc_weapons.biped_small.gnoll.shaman": ( - vox_spec: ("weapon.biped_small.staff.shaman", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.staff.shaman", (-2.5, -3.0, -4.0)), color: None ), "common.items.npc_weapons.biped_small.sahagin.sniper": ( @@ -1152,31 +1152,31 @@ color: None ), "common.items.npc_weapons.biped_small.sahagin.spearman": ( - vox_spec: ("weapon.biped_small.spear.spearman", (-0.5, -3.0, -4.0)), + vox_spec: ("weapon.biped_small.spear.spearman", (-0.5, -3.0, -5.0)), color: None ), "common.items.npc_weapons.biped_small.haniwa.guard": ( - vox_spec: ("weapon.biped_small.spear.guard", (-0.5, -4.5, -10.5)), + vox_spec: ("weapon.biped_small.spear.guard", (-0.5, -3.0, -5.0)), color: None ), "common.items.npc_weapons.biped_small.haniwa.soldier": ( - vox_spec: ("weapon.biped_small.dagger.soldier", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.dagger.soldier", (-0.5, -3.0, -2.0)), color: None ), "common.items.npc_weapons.biped_small.haniwa.archer": ( - vox_spec: ("weapon.biped_small.bow.archer", (-0.5, -3.0, -4.0)), + vox_spec: ("weapon.biped_small.bow.archer", (-0.5, -4.5, -10.5)), color: None ), "common.items.npc_weapons.biped_small.myrmidon.hoplite": ( - vox_spec: ("weapon.biped_small.spear.hoplite", (-0.5, -5.0, -10.5)), + vox_spec: ("weapon.biped_small.spear.hoplite", (-0.5, -2.0, -5.0)), color: None ), "common.items.npc_weapons.biped_small.myrmidon.marksman": ( - vox_spec: ("weapon.biped_small.bow.marksman", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.bow.marksman", (-0.5, -5.0, -10.5)), color: None ), "common.items.npc_weapons.biped_small.myrmidon.strategian": ( - vox_spec: ("weapon.biped_small.axe.strategian", (-0.5, -2.0, -4.0)), + vox_spec: ("weapon.biped_small.axe.strategian", (-0.5, -6.0, -4.0)), color: None ), }) diff --git a/assets/voxygen/voxel/npc/adlet/male/bow/bow_movelater.vox b/assets/voxygen/voxel/npc/adlet/male/bow/bow_movelater.vox deleted file mode 100644 index 208e52cf49..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/bow/bow_movelater.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef2809ad85372e7662cb5bf787d6054e49b6b749eaf5c2157e12a15649dc3242 -size 1344 diff --git a/assets/voxygen/voxel/npc/adlet/male/bow/chest.vox b/assets/voxygen/voxel/npc/adlet/male/bow/chest.vox deleted file mode 100644 index 27c9b3135d..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/bow/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a4bfa627e7e6029ffe07381dc6cf1e988a48ce1ab2d8573e621600582ce4575 -size 1696 diff --git a/assets/voxygen/voxel/npc/adlet/male/bow/hand_r.vox b/assets/voxygen/voxel/npc/adlet/male/bow/hand_r.vox deleted file mode 100644 index 4061bb6228..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/bow/hand_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:078af24a2889ed8b7aab36687bae8149eaf71bbbaaec2154cf3a19ddb0030f7f -size 1420 diff --git a/assets/voxygen/voxel/npc/adlet/male/bow/head.vox b/assets/voxygen/voxel/npc/adlet/male/bow/head.vox deleted file mode 100644 index d4e4579cf3..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/bow/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38ab461be8fc63fd4dd334bf9a8b4613a779e9d4f910594c2a12b56ef0410578 -size 3384 diff --git a/assets/voxygen/voxel/npc/adlet/male/bow/pants.vox b/assets/voxygen/voxel/npc/adlet/male/bow/pants.vox deleted file mode 100644 index f432762f32..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/bow/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eaf54b7e40ab08b25f57dd934917d958e815f09fd02c5f627a212e705dece20e -size 1888 diff --git a/assets/voxygen/voxel/npc/adlet/male/foot_r.vox b/assets/voxygen/voxel/npc/adlet/male/foot_r.vox deleted file mode 100644 index fd9a64bc1d..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec5b001f718eeaba782262f84ddb375ead7a62fd2fe19b2bba3c1a39f3404a16 -size 1304 diff --git a/assets/voxygen/voxel/npc/adlet/male/spear/chest.vox b/assets/voxygen/voxel/npc/adlet/male/spear/chest.vox deleted file mode 100644 index 5ba90ecd91..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/spear/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed21307a67cc28e6aafa5bf2ce6ee4a4752008e60fbc8548440f4e6a97490490 -size 1688 diff --git a/assets/voxygen/voxel/npc/adlet/male/spear/hand_r.vox b/assets/voxygen/voxel/npc/adlet/male/spear/hand_r.vox deleted file mode 100644 index bff8a36769..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/spear/hand_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe3cee39cf25b7be4cbca9e6a6fa0d7f9629b71c91b1b393e8cc074555f5609b -size 1420 diff --git a/assets/voxygen/voxel/npc/adlet/male/spear/head.vox b/assets/voxygen/voxel/npc/adlet/male/spear/head.vox deleted file mode 100644 index 26a71c9cec..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/spear/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a936f5a25ab1b9dcc72f7824b00b743ae7866822cfc4764238bfa9419a5d9a0f -size 3336 diff --git a/assets/voxygen/voxel/npc/adlet/male/spear/pants.vox b/assets/voxygen/voxel/npc/adlet/male/spear/pants.vox deleted file mode 100644 index 8cbfbfde97..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/spear/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45ad1cf02069507286e9e45ae1a3f9a5739653b86ba40cd2327cfc833c1e9b7a -size 1904 diff --git a/assets/voxygen/voxel/npc/adlet/male/tail.vox b/assets/voxygen/voxel/npc/adlet/male/tail.vox deleted file mode 100644 index f4cf97a571..0000000000 --- a/assets/voxygen/voxel/npc/adlet/male/tail.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:558e995b6496a667225c1b6083a986c1d975c71afed60fe52c88b95d33f5839d -size 1232 diff --git a/assets/voxygen/voxel/npc/haniwa/male/chest.vox b/assets/voxygen/voxel/npc/haniwa/male/chest.vox deleted file mode 100644 index 536c899da9..0000000000 --- a/assets/voxygen/voxel/npc/haniwa/male/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1b434661180cc6cd400db64bc7537e4fcb08c25f40dbaa08040389a078d65d3 -size 2276 diff --git a/assets/voxygen/voxel/npc/haniwa/male/foot_r.vox b/assets/voxygen/voxel/npc/haniwa/male/foot_r.vox deleted file mode 100644 index fa8fecdf90..0000000000 --- a/assets/voxygen/voxel/npc/haniwa/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e9ca4fc385d5b1e2cc2b2d5bda16a0b18547c9ac72e5ccc94eca7aaa64c8e2a -size 1384 diff --git a/assets/voxygen/voxel/npc/haniwa/male/hand_r.vox b/assets/voxygen/voxel/npc/haniwa/male/hand_r.vox deleted file mode 100644 index b85deb405f..0000000000 --- a/assets/voxygen/voxel/npc/haniwa/male/hand_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1316646c3f84bc05b9ed616bd285ea2c95a0c2d5e4fa60bfa2c0d99a845ea98 -size 1368 diff --git a/assets/voxygen/voxel/npc/haniwa/male/head.vox b/assets/voxygen/voxel/npc/haniwa/male/head.vox deleted file mode 100644 index 9d9a377624..0000000000 --- a/assets/voxygen/voxel/npc/haniwa/male/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b92b013a7f9d5224793dd6c2c10baccb6e383701878d7594cd55d1386771b96 -size 3156 diff --git a/assets/voxygen/voxel/npc/haniwa/male/pants.vox b/assets/voxygen/voxel/npc/haniwa/male/pants.vox deleted file mode 100644 index 7dee4665ab..0000000000 --- a/assets/voxygen/voxel/npc/haniwa/male/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d4192ce647fdfe801a5352569dbd40fd5a6a7230cd870e84dfe8c9ba055b91c -size 1628 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/MyrmidonHoplite-5.vox b/assets/voxygen/voxel/npc/myrmidon/male/MyrmidonHoplite-5.vox deleted file mode 100644 index f33aa0ef48..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/MyrmidonHoplite-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3c906a2c6240593003108d6594ec6c3c564bb198009954a840b168518eb5380 -size 1340 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/chest.vox b/assets/voxygen/voxel/npc/myrmidon/male/chest.vox deleted file mode 100644 index b3a55d706b..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:586350398255e5e3d7a987b89f583dade64592bacecaea0cd4b21b4255219c30 -size 1900 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/foot_r.vox b/assets/voxygen/voxel/npc/myrmidon/male/foot_r.vox deleted file mode 100644 index a22d381b03..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40feed9186513be13e5c26346636c68468690f62630d71982cc8d65f3762a126 -size 1236 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/hand_r.vox b/assets/voxygen/voxel/npc/myrmidon/male/hand_r.vox deleted file mode 100644 index bf25ad8fe8..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/hand_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aba210266ebb33197ed4657417124b5a1908e5dad6bade7cd3d67e7276cdb6ec -size 1316 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/head.vox b/assets/voxygen/voxel/npc/myrmidon/male/head.vox deleted file mode 100644 index 1ab83b7662..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b86f09f66caacb3c39b7ef876cea97a260e77e34137207b93a36afb412a48333 -size 2312 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/pants.vox b/assets/voxygen/voxel/npc/myrmidon/male/pants.vox deleted file mode 100644 index 720d2e92f8..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68acd47455295149faba0562705a70323e75425ffd3c007c5041595409f8815c -size 1356 diff --git a/assets/voxygen/voxel/npc/myrmidon/male/tail.vox b/assets/voxygen/voxel/npc/myrmidon/male/tail.vox deleted file mode 100644 index 2c09eae063..0000000000 --- a/assets/voxygen/voxel/npc/myrmidon/male/tail.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4283f17d89cc17bce78a261f79ead38232bdb2e81fbe9cb7059dc8967119df1c -size 1408 diff --git a/assets/voxygen/voxel/npc/sahagin/male/chest.vox b/assets/voxygen/voxel/npc/sahagin/male/chest.vox deleted file mode 100644 index 357523d8bd..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc352e09cf8794c2bba919f140cca1f7cca2711185007967f7f0be15edc064d3 -size 2940 diff --git a/assets/voxygen/voxel/npc/sahagin/male/foot_r.vox b/assets/voxygen/voxel/npc/sahagin/male/foot_r.vox deleted file mode 100644 index 6e7a0d105a..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26c13cb8d7bfaa16392289306c9d756478842deb9a697f883162fc4a484738bb -size 1308 diff --git a/assets/voxygen/voxel/npc/sahagin/male/hand_r.vox b/assets/voxygen/voxel/npc/sahagin/male/hand_r.vox deleted file mode 100644 index 143f5acd6d..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/hand_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1467f658d9b07186a84b87a3a165653d8fc1f898fa28f4ee8582c25935df4a73 -size 1476 diff --git a/assets/voxygen/voxel/npc/sahagin/male/head.vox b/assets/voxygen/voxel/npc/sahagin/male/head.vox deleted file mode 100644 index 505ea421b7..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aad1c94c98c966d2c419dcda9b1bd071e678e3c6ad18e9f0772c08672846d14c -size 1880 diff --git a/assets/voxygen/voxel/npc/sahagin/male/pants.vox b/assets/voxygen/voxel/npc/sahagin/male/pants.vox deleted file mode 100644 index a48214f36f..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5720aee2e2d8cd40f6cd3014cd557f02f6050fbad180288f4088fe1aa62f9643 -size 1432 diff --git a/assets/voxygen/voxel/npc/sahagin/male/tail.vox b/assets/voxygen/voxel/npc/sahagin/male/tail.vox deleted file mode 100644 index 882c6aed76..0000000000 --- a/assets/voxygen/voxel/npc/sahagin/male/tail.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6de1a8e65358dc9787a3c5b73cebf42f30abaf540f8e54eb5cde03eab48b90b -size 1400 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox b/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox index d2d47e9093..143f5acd6d 100644 --- a/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox +++ b/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1efd97c277678acb0e88b8089f76212595dd90f57d82a634a3e3e527de77ff4c -size 1308 +oid sha256:1467f658d9b07186a84b87a3a165653d8fc1f898fa28f4ee8582c25935df4a73 +size 1476 diff --git a/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox b/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox index 785f1254be..d955571a01 100644 --- a/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox +++ b/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c023704a29de12478f09dbb30a97342323fddcae8d8ccd8571ad28af9ee769a +oid sha256:de97279cd080c841fe5ead334f6f66aadd1c272ff6e58db05034e5731e08bfd7 size 1252 diff --git a/assets/voxygen/voxel/weapon/biped_small/staff/sahagin.vox b/assets/voxygen/voxel/weapon/biped_small/staff/sahagin.vox deleted file mode 100644 index ea9227af42..0000000000 --- a/assets/voxygen/voxel/weapon/biped_small/staff/sahagin.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:148e3b6c9f16281d557663304e921b86ae9699917b163798b48f8bf5d2c6dc88 -size 1332 diff --git a/world/src/site2/plot/dungeon.rs b/world/src/site2/plot/dungeon.rs index 9483cb87bf..758afa1b9f 100644 --- a/world/src/site2/plot/dungeon.rs +++ b/world/src/site2/plot/dungeon.rs @@ -697,15 +697,9 @@ fn enemy_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec entity.with_asset_expect("common.entity.dungeon.tier-1.bow", dynamic_rng), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-1.staff", dynamic_rng), - _ => entity.with_asset_expect("common.entity.dungeon.tier-1.spear", dynamic_rng), -======= - 0 => entity.with_asset_expect("common.entity.dungeon.tier-1.tracker"), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-1.icepicker"), - _ => entity.with_asset_expect("common.entity.dungeon.tier-1.hunter"), ->>>>>>> new mobs + 0 => entity.with_asset_expect("common.entity.dungeon.tier-1.tracker", dynamic_rng), + 1 => entity.with_asset_expect("common.entity.dungeon.tier-1.icepicker", dynamic_rng), + _ => entity.with_asset_expect("common.entity.dungeon.tier-1.hunter", dynamic_rng), } }); @@ -719,15 +713,9 @@ fn enemy_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec entity.with_asset_expect("common.entity.dungeon.tier-2.bow", dynamic_rng), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-2.staff", dynamic_rng), - _ => entity.with_asset_expect("common.entity.dungeon.tier-2.spear", dynamic_rng), -======= - 0 => entity.with_asset_expect("common.entity.dungeon.tier-2.sniper"), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-2.sorcerer"), - _ => entity.with_asset_expect("common.entity.dungeon.tier-2.spearman"), ->>>>>>> new mobs + 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), } }); @@ -741,15 +729,9 @@ fn enemy_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec entity.with_asset_expect("common.entity.dungeon.tier-3.bow", dynamic_rng), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-3.staff", dynamic_rng), - _ => entity.with_asset_expect("common.entity.dungeon.tier-3.spear", dynamic_rng), -======= - 0 => entity.with_asset_expect("common.entity.dungeon.tier-3.archer"), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-3.soldier"), - _ => entity.with_asset_expect("common.entity.dungeon.tier-3.guard"), ->>>>>>> new mobs + 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), } }); @@ -763,15 +745,9 @@ fn enemy_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec entity.with_asset_expect("common.entity.dungeon.tier-4.bow", dynamic_rng), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-4.staff", dynamic_rng), - _ => entity.with_asset_expect("common.entity.dungeon.tier-4.spear", dynamic_rng), -======= - 0 => entity.with_asset_expect("common.entity.dungeon.tier-4.marksman"), - 1 => entity.with_asset_expect("common.entity.dungeon.tier-4.strategian"), - _ => entity.with_asset_expect("common.entity.dungeon.tier-4.hoplite"), ->>>>>>> new mobs + 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), } });