From 4fbd3027a1555494633adf05b5c60b078c353049 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 28 Jan 2022 02:32:59 -0500 Subject: [PATCH] new mobs --- .../dungeon/tier-1/{staff.ron => hunter.ron} | 6 +- .../tier-1/{spear.ron => icepicker.ron} | 12 +- .../dungeon/tier-1/{bow.ron => tracker.ron} | 4 +- .../dungeon/tier-2/{bow.ron => sniper.ron} | 4 +- .../tier-2/{staff.ron => sorcerer.ron} | 4 +- .../tier-2/{spear.ron => spearman.ron} | 10 +- .../dungeon/tier-3/{bow.ron => archer.ron} | 4 +- .../dungeon/tier-3/{staff.ron => guard.ron} | 6 +- .../dungeon/tier-3/{spear.ron => soldier.ron} | 10 +- .../dungeon/tier-4/{spear.ron => hoplite.ron} | 8 +- .../dungeon/tier-4/{bow.ron => marksman.ron} | 4 +- .../tier-4/{staff.ron => strategian.ron} | 10 +- assets/common/entity/spot/gnome/spear.ron | 4 +- assets/common/entity/spot/myrmidon/spear.ron | 13 ++- .../chest/{adlet_spear.ron => hunter.ron} | 4 +- .../biped_small/adlet/chest/icepicker.ron | 16 +++ .../chest/{adlet_bow.ron => tracker.ron} | 4 +- .../adlet/foot/{adlet.ron => hunter.ron} | 4 +- .../biped_small/adlet/foot/icepicker.ron | 16 +++ .../biped_small/adlet/foot/tracker.ron | 16 +++ .../hand/{adlet_spear.ron => hunter.ron} | 4 +- .../biped_small/adlet/hand/icepicker.ron | 14 +++ .../adlet/hand/{adlet_bow.ron => tracker.ron} | 4 +- .../head/{adlet_spear.ron => hunter.ron} | 4 +- .../biped_small/adlet/head/icepicker.ron | 14 +++ .../adlet/head/{adlet_bow.ron => tracker.ron} | 4 +- .../pants/{adlet_spear.ron => hunter.ron} | 4 +- .../biped_small/adlet/pants/icepicker.ron | 14 +++ .../pants/{adlet_bow.ron => tracker.ron} | 4 +- .../adlet/tail/{adlet.ron => hunter.ron} | 4 +- .../biped_small/adlet/tail/icepicker.ron | 16 +++ .../biped_small/adlet/tail/tracker.ron | 16 +++ .../haniwa.ron => gnoll/chest/rogue.ron} | 4 +- .../biped_small/gnoll/chest/shaman.ron | 16 +++ .../biped_small/gnoll/chest/trapper.ron | 16 +++ .../foot/haniwa.ron => gnoll/foot/rogue.ron} | 4 +- .../biped_small/gnoll/foot/shaman.ron | 16 +++ .../biped_small/gnoll/foot/trapper.ron | 16 +++ .../hand/haniwa.ron => gnoll/hand/rogue.ron} | 4 +- .../biped_small/gnoll/hand/shaman.ron | 16 +++ .../biped_small/gnoll/hand/trapper.ron | 16 +++ .../head/haniwa.ron => gnoll/head/rogue.ron} | 4 +- .../biped_small/gnoll/head/shaman.ron | 16 +++ .../biped_small/gnoll/head/trapper.ron | 16 +++ .../biped_small/gnoll/pants/rogue.ron | 16 +++ .../biped_small/gnoll/pants/shaman.ron | 16 +++ .../biped_small/gnoll/pants/trapper.ron | 16 +++ .../pants/haniwa.ron => gnoll/tail/rogue.ron} | 4 +- .../biped_small/gnoll/tail/shaman.ron | 16 +++ .../biped_small/gnoll/tail/trapper.ron | 16 +++ .../biped_small/haniwa/chest/archer.ron | 16 +++ .../biped_small/haniwa/chest/guard.ron | 16 +++ .../biped_small/haniwa/chest/soldier.ron | 16 +++ .../biped_small/haniwa/foot/archer.ron | 16 +++ .../biped_small/haniwa/foot/guard.ron | 16 +++ .../biped_small/haniwa/foot/soldier.ron | 16 +++ .../biped_small/haniwa/hand/archer.ron | 16 +++ .../biped_small/haniwa/hand/guard.ron | 16 +++ .../biped_small/haniwa/hand/soldier.ron | 16 +++ .../biped_small/haniwa/head/archer.ron | 16 +++ .../biped_small/haniwa/head/guard.ron | 16 +++ .../biped_small/haniwa/head/soldier.ron | 16 +++ .../biped_small/haniwa/pants/archer.ron | 16 +++ .../biped_small/haniwa/pants/guard.ron | 16 +++ .../biped_small/haniwa/pants/soldier.ron | 16 +++ .../chest/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/chest/marksman.ron | 17 +++ .../biped_small/myrmidon/chest/strategian.ron | 17 +++ .../foot/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/foot/marksman.ron | 17 +++ .../biped_small/myrmidon/foot/strategian.ron | 17 +++ .../hand/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/hand/marksman.ron | 17 +++ .../biped_small/myrmidon/hand/strategian.ron | 17 +++ .../head/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/head/marksman.ron | 17 +++ .../biped_small/myrmidon/head/strategian.ron | 17 +++ .../pants/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/pants/marksman.ron | 17 +++ .../biped_small/myrmidon/pants/strategian.ron | 17 +++ .../tail/{myrmidon.ron => hoplite.ron} | 4 +- .../biped_small/myrmidon/tail/marksman.ron | 17 +++ .../biped_small/myrmidon/tail/strategian.ron | 17 +++ .../sahagin/chest/{sahagin.ron => sniper.ron} | 4 +- .../biped_small/sahagin/chest/sorcerer.ron | 16 +++ .../biped_small/sahagin/chest/spearman.ron | 16 +++ .../{hand/sahagin.ron => foot/sniper.ron} | 4 +- .../biped_small/sahagin/foot/sorcerer.ron | 16 +++ .../biped_small/sahagin/foot/spearman.ron | 16 +++ .../{foot/sahagin.ron => hand/sniper.ron} | 4 +- .../biped_small/sahagin/hand/sorcerer.ron | 16 +++ .../biped_small/sahagin/hand/spearman.ron | 16 +++ .../sahagin/head/{sahagin.ron => sniper.ron} | 4 +- .../biped_small/sahagin/head/sorcerer.ron | 16 +++ .../biped_small/sahagin/head/spearman.ron | 16 +++ .../sahagin/pants/{sahagin.ron => sniper.ron} | 4 +- .../biped_small/sahagin/pants/sorcerer.ron | 16 +++ .../biped_small/sahagin/pants/spearman.ron | 16 +++ .../sahagin/tail/{sahagin.ron => sniper.ron} | 4 +- .../biped_small/sahagin/tail/sorcerer.ron | 16 +++ .../biped_small/sahagin/tail/spearman.ron | 16 +++ .../adlet/{wooden_spear.ron => hunter.ron} | 2 +- .../adlet/{gnoll_staff.ron => icepicker.ron} | 2 +- .../adlet/{adlet_bow.ron => tracker.ron} | 0 .../haniwa/{adlet_bow.ron => archer.ron} | 0 .../haniwa/{wooden_spear.ron => guard.ron} | 0 .../haniwa/{gnoll_staff.ron => soldier.ron} | 4 +- .../{wooden_spear.ron => hoplite.ron} | 0 .../myrmidon/{adlet_bow.ron => marksman.ron} | 0 .../{gnoll_staff.ron => strategian.ron} | 4 +- .../sahagin/{adlet_bow.ron => sniper.ron} | 0 .../sahagin/{gnoll_staff.ron => sorcerer.ron} | 0 .../{wooden_spear.ron => spearman.ron} | 0 .../tier-1/{adlet_bow.ron => hunter.ron} | 12 +- .../tier-1/{adlet_spear.ron => icepicker.ron} | 12 +- .../common/loadout/dungeon/tier-1/tracker.ron | 8 ++ .../tier-2/{sahagin.ron => sniper.ron} | 12 +- .../loadout/dungeon/tier-2/sorcerer.ron | 8 ++ .../loadout/dungeon/tier-2/spearman.ron | 8 ++ .../dungeon/tier-3/{haniwa.ron => archer.ron} | 10 +- .../common/loadout/dungeon/tier-3/guard.ron | 7 ++ .../common/loadout/dungeon/tier-3/soldier.ron | 7 ++ .../tier-4/{myrmidon.ron => hoplite.ron} | 12 +- .../loadout/dungeon/tier-4/marksman.ron | 8 ++ .../loadout/dungeon/tier-4/strategian.ron | 8 ++ .../biped_small_armor_chest_manifest.ron | 51 ++++++-- .../voxel/biped_small_armor_foot_manifest.ron | 110 +++++++++++++++--- .../voxel/biped_small_armor_hand_manifest.ron | 108 ++++++++++++++--- .../voxel/biped_small_armor_head_manifest.ron | 53 ++++++--- .../biped_small_armor_pants_manifest.ron | 51 ++++++-- .../voxel/biped_small_armor_tail_manifest.ron | 40 +++++-- .../voxygen/voxel/biped_weapon_manifest.ron | 72 ++++++------ .../voxygen/voxel/npc/adlet/hunter/chest.vox | 3 + .../voxygen/voxel/npc/adlet/hunter/foot_r.vox | 3 + .../voxygen/voxel/npc/adlet/hunter/hand_r.vox | 3 + .../voxygen/voxel/npc/adlet/hunter/head.vox | 3 + .../voxygen/voxel/npc/adlet/hunter/pants.vox | 3 + .../voxygen/voxel/npc/adlet/hunter/tail.vox | 3 + .../voxel/npc/adlet/icepicker/chest.vox | 3 + .../voxel/npc/adlet/icepicker/foot_r.vox | 3 + .../voxel/npc/adlet/icepicker/hand_r.vox | 3 + .../voxel/npc/adlet/icepicker/head.vox | 3 + .../voxel/npc/adlet/icepicker/pants.vox | 3 + .../voxel/npc/adlet/icepicker/tail.vox | 3 + .../voxygen/voxel/npc/adlet/tracker/chest.vox | 3 + .../voxel/npc/adlet/tracker/foot_r.vox | 3 + .../voxel/npc/adlet/tracker/hand_r.vox | 3 + .../voxygen/voxel/npc/adlet/tracker/head.vox | 3 + .../voxygen/voxel/npc/adlet/tracker/pants.vox | 3 + .../voxygen/voxel/npc/adlet/tracker/tail.vox | 3 + .../voxygen/voxel/npc/gnoll/rogue/chest.vox | 3 + .../voxygen/voxel/npc/gnoll/rogue/foot_r.vox | 3 + .../voxygen/voxel/npc/gnoll/rogue/hand_r.vox | 3 + assets/voxygen/voxel/npc/gnoll/rogue/head.vox | 3 + .../voxygen/voxel/npc/gnoll/rogue/pants.vox | 3 + assets/voxygen/voxel/npc/gnoll/rogue/tail.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/chest.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/foot_r.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/hand_r.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/head.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/pants.vox | 3 + .../voxygen/voxel/npc/gnoll/shaman/tail.vox | 3 + .../voxygen/voxel/npc/gnoll/trapper/chest.vox | 3 + .../voxel/npc/gnoll/trapper/foot_r.vox | 3 + .../voxel/npc/gnoll/trapper/hand_r.vox | 3 + .../voxygen/voxel/npc/gnoll/trapper/head.vox | 3 + .../voxygen/voxel/npc/gnoll/trapper/pants.vox | 3 + .../voxygen/voxel/npc/gnoll/trapper/tail.vox | 3 + .../voxygen/voxel/npc/haniwa/archer/chest.vox | 3 + .../voxel/npc/haniwa/archer/foot_r.vox | 3 + .../voxel/npc/haniwa/archer/hand_r.vox | 3 + .../voxygen/voxel/npc/haniwa/archer/head.vox | 3 + .../voxygen/voxel/npc/haniwa/archer/pants.vox | 3 + .../voxygen/voxel/npc/haniwa/guard/chest.vox | 3 + .../voxygen/voxel/npc/haniwa/guard/foot_r.vox | 3 + .../voxygen/voxel/npc/haniwa/guard/hand_r.vox | 3 + .../voxygen/voxel/npc/haniwa/guard/head.vox | 3 + .../voxygen/voxel/npc/haniwa/guard/pants.vox | 3 + .../voxel/npc/haniwa/soldier/chest.vox | 3 + .../voxel/npc/haniwa/soldier/foot_r.vox | 3 + .../voxel/npc/haniwa/soldier/hand_r.vox | 3 + .../voxygen/voxel/npc/haniwa/soldier/head.vox | 3 + .../voxel/npc/haniwa/soldier/pants.vox | 3 + .../voxel/npc/myrmidon/hoplite/chest.vox | 3 + .../voxel/npc/myrmidon/hoplite/foot_r.vox | 3 + .../voxel/npc/myrmidon/hoplite/hand_r.vox | 3 + .../voxel/npc/myrmidon/hoplite/head.vox | 3 + .../voxel/npc/myrmidon/hoplite/pants.vox | 3 + .../voxel/npc/myrmidon/hoplite/tail.vox | 3 + .../voxel/npc/myrmidon/marksman/chest.vox | 3 + .../voxel/npc/myrmidon/marksman/foot_r.vox | 3 + .../voxel/npc/myrmidon/marksman/hand_r.vox | 3 + .../voxel/npc/myrmidon/marksman/head.vox | 3 + .../voxel/npc/myrmidon/marksman/pants.vox | 3 + .../voxel/npc/myrmidon/marksman/tail.vox | 3 + .../voxel/npc/myrmidon/strategian/chest.vox | 3 + .../voxel/npc/myrmidon/strategian/foot_r.vox | 3 + .../voxel/npc/myrmidon/strategian/hand_r.vox | 3 + .../voxel/npc/myrmidon/strategian/head.vox | 3 + .../voxel/npc/myrmidon/strategian/pants.vox | 3 + .../voxel/npc/myrmidon/strategian/tail.vox | 3 + .../voxel/npc/sahagin/sniper/chest.vox | 3 + .../voxel/npc/sahagin/sniper/foot_r.vox | 3 + .../voxel/npc/sahagin/sniper/hand_r.vox | 3 + .../voxygen/voxel/npc/sahagin/sniper/head.vox | 3 + .../voxel/npc/sahagin/sniper/pants.vox | 3 + .../voxygen/voxel/npc/sahagin/sniper/tail.vox | 3 + .../voxel/npc/sahagin/sorcerer/chest.vox | 3 + .../voxel/npc/sahagin/sorcerer/foot_r.vox | 3 + .../voxel/npc/sahagin/sorcerer/hand_r.vox | 3 + .../voxel/npc/sahagin/sorcerer/head.vox | 3 + .../voxel/npc/sahagin/sorcerer/pants.vox | 3 + .../voxel/npc/sahagin/sorcerer/tail.vox | 3 + .../voxel/npc/sahagin/spearman/chest.vox | 3 + .../voxel/npc/sahagin/spearman/foot_r.vox | 3 + .../voxel/npc/sahagin/spearman/hand_r.vox | 3 + .../voxel/npc/sahagin/spearman/head.vox | 3 + .../voxel/npc/sahagin/spearman/pants.vox | 3 + .../voxel/npc/sahagin/spearman/tail.vox | 3 + .../weapon/biped_small/axe/icepicker.vox | 3 + .../biped_small/axe/{axe.vox => logger.vox} | 0 .../weapon/biped_small/axe/strategian.vox | 3 + .../{blowgun.vox => blowgun/stalker.vox} | 0 .../weapon/biped_small/blowgun/trapper.vox | 3 + .../bow/{haniwa.vox => archer.vox} | 0 .../bow/{myrmidon.vox => marksman.vox} | 0 .../bow/{sahagin.vox => sniper.vox} | 0 .../bow/{adlet.vox => tracker.vox} | 0 .../{dagger.vox => dagger/mugger.vox} | 0 .../voxel/weapon/biped_small/dagger/rogue.vox | 3 + .../weapon/biped_small/dagger/soldier.vox | 3 + .../spear/{haniwa.vox => guard.vox} | 0 .../spear/{myrmidon.vox => hoplite.vox} | 0 .../spear/{adlet.vox => hunter.vox} | 0 .../spear/{sahagin.vox => spearman.vox} | 0 .../{chieftain_staff.vox => chieftain.vox} | 0 .../staff/{gnoll.vox => shaman.vox} | 0 .../weapon/biped_small/staff/sorcerer.vox | 3 + common/src/comp/inventory/loadout_builder.rs | 2 +- world/src/layer/spot.rs | 6 +- world/src/site2/plot/dungeon.rs | 24 ++++ 241 files changed, 1847 insertions(+), 246 deletions(-) rename assets/common/entity/dungeon/tier-1/{staff.ron => hunter.ron} (71%) rename assets/common/entity/dungeon/tier-1/{spear.ron => icepicker.ron} (53%) rename assets/common/entity/dungeon/tier-1/{bow.ron => tracker.ron} (78%) rename assets/common/entity/dungeon/tier-2/{bow.ron => sniper.ron} (79%) rename assets/common/entity/dungeon/tier-2/{staff.ron => sorcerer.ron} (78%) rename assets/common/entity/dungeon/tier-2/{spear.ron => spearman.ron} (61%) rename assets/common/entity/dungeon/tier-3/{bow.ron => archer.ron} (79%) rename assets/common/entity/dungeon/tier-3/{staff.ron => guard.ron} (71%) rename assets/common/entity/dungeon/tier-3/{spear.ron => soldier.ron} (53%) rename assets/common/entity/dungeon/tier-4/{spear.ron => hoplite.ron} (61%) rename assets/common/entity/dungeon/tier-4/{bow.ron => marksman.ron} (78%) rename assets/common/entity/dungeon/tier-4/{staff.ron => strategian.ron} (52%) rename assets/common/items/npc_armor/biped_small/adlet/chest/{adlet_spear.ron => hunter.ron} (81%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron rename assets/common/items/npc_armor/biped_small/adlet/chest/{adlet_bow.ron => tracker.ron} (84%) rename assets/common/items/npc_armor/biped_small/adlet/foot/{adlet.ron => hunter.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron create mode 100644 assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron rename assets/common/items/npc_armor/biped_small/adlet/hand/{adlet_spear.ron => hunter.ron} (81%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron rename assets/common/items/npc_armor/biped_small/adlet/hand/{adlet_bow.ron => tracker.ron} (84%) rename assets/common/items/npc_armor/biped_small/adlet/head/{adlet_spear.ron => hunter.ron} (81%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron rename assets/common/items/npc_armor/biped_small/adlet/head/{adlet_bow.ron => tracker.ron} (84%) rename assets/common/items/npc_armor/biped_small/adlet/pants/{adlet_spear.ron => hunter.ron} (81%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron rename assets/common/items/npc_armor/biped_small/adlet/pants/{adlet_bow.ron => tracker.ron} (84%) rename assets/common/items/npc_armor/biped_small/adlet/tail/{adlet.ron => hunter.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron create mode 100644 assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron rename assets/common/items/npc_armor/biped_small/{haniwa/chest/haniwa.ron => gnoll/chest/rogue.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron rename assets/common/items/npc_armor/biped_small/{haniwa/foot/haniwa.ron => gnoll/foot/rogue.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron rename assets/common/items/npc_armor/biped_small/{haniwa/hand/haniwa.ron => gnoll/hand/rogue.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron rename assets/common/items/npc_armor/biped_small/{haniwa/head/haniwa.ron => gnoll/head/rogue.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron rename assets/common/items/npc_armor/biped_small/{haniwa/pants/haniwa.ron => gnoll/tail/rogue.ron} (85%) create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron create mode 100644 assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron create mode 100644 assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron rename assets/common/items/npc_armor/biped_small/myrmidon/chest/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron rename assets/common/items/npc_armor/biped_small/myrmidon/foot/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron rename assets/common/items/npc_armor/biped_small/myrmidon/hand/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron rename assets/common/items/npc_armor/biped_small/myrmidon/head/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron rename assets/common/items/npc_armor/biped_small/myrmidon/pants/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron rename assets/common/items/npc_armor/biped_small/myrmidon/tail/{myrmidon.ron => hoplite.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron create mode 100644 assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron rename assets/common/items/npc_armor/biped_small/sahagin/chest/{sahagin.ron => sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron rename assets/common/items/npc_armor/biped_small/sahagin/{hand/sahagin.ron => foot/sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron rename assets/common/items/npc_armor/biped_small/sahagin/{foot/sahagin.ron => hand/sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron rename assets/common/items/npc_armor/biped_small/sahagin/head/{sahagin.ron => sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron rename assets/common/items/npc_armor/biped_small/sahagin/pants/{sahagin.ron => sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron rename assets/common/items/npc_armor/biped_small/sahagin/tail/{sahagin.ron => sniper.ron} (84%) create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron create mode 100644 assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron rename assets/common/items/npc_weapons/biped_small/adlet/{wooden_spear.ron => hunter.ron} (95%) rename assets/common/items/npc_weapons/biped_small/adlet/{gnoll_staff.ron => icepicker.ron} (90%) rename assets/common/items/npc_weapons/biped_small/adlet/{adlet_bow.ron => tracker.ron} (100%) rename assets/common/items/npc_weapons/biped_small/haniwa/{adlet_bow.ron => archer.ron} (100%) rename assets/common/items/npc_weapons/biped_small/haniwa/{wooden_spear.ron => guard.ron} (100%) rename assets/common/items/npc_weapons/biped_small/haniwa/{gnoll_staff.ron => soldier.ron} (85%) rename assets/common/items/npc_weapons/biped_small/myrmidon/{wooden_spear.ron => hoplite.ron} (100%) rename assets/common/items/npc_weapons/biped_small/myrmidon/{adlet_bow.ron => marksman.ron} (100%) rename assets/common/items/npc_weapons/biped_small/myrmidon/{gnoll_staff.ron => strategian.ron} (85%) rename assets/common/items/npc_weapons/biped_small/sahagin/{adlet_bow.ron => sniper.ron} (100%) rename assets/common/items/npc_weapons/biped_small/sahagin/{gnoll_staff.ron => sorcerer.ron} (100%) rename assets/common/items/npc_weapons/biped_small/sahagin/{wooden_spear.ron => spearman.ron} (100%) rename assets/common/loadout/dungeon/tier-1/{adlet_bow.ron => hunter.ron} (78%) rename assets/common/loadout/dungeon/tier-1/{adlet_spear.ron => icepicker.ron} (77%) create mode 100644 assets/common/loadout/dungeon/tier-1/tracker.ron rename assets/common/loadout/dungeon/tier-2/{sahagin.ron => sniper.ron} (77%) create mode 100644 assets/common/loadout/dungeon/tier-2/sorcerer.ron create mode 100644 assets/common/loadout/dungeon/tier-2/spearman.ron rename assets/common/loadout/dungeon/tier-3/{haniwa.ron => archer.ron} (79%) create mode 100644 assets/common/loadout/dungeon/tier-3/guard.ron create mode 100644 assets/common/loadout/dungeon/tier-3/soldier.ron rename assets/common/loadout/dungeon/tier-4/{myrmidon.ron => hoplite.ron} (75%) create mode 100644 assets/common/loadout/dungeon/tier-4/marksman.ron create mode 100644 assets/common/loadout/dungeon/tier-4/strategian.ron create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/chest.vox create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/head.vox create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/pants.vox create mode 100644 assets/voxygen/voxel/npc/adlet/hunter/tail.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/chest.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/head.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/pants.vox create mode 100644 assets/voxygen/voxel/npc/adlet/icepicker/tail.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/chest.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/head.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/pants.vox create mode 100644 assets/voxygen/voxel/npc/adlet/tracker/tail.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/chest.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/head.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/pants.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/rogue/tail.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/chest.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/head.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/pants.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/shaman/tail.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/chest.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/head.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/pants.vox create mode 100644 assets/voxygen/voxel/npc/gnoll/trapper/tail.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/archer/chest.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/archer/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/archer/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/archer/head.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/archer/pants.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/guard/chest.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/guard/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/guard/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/guard/head.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/guard/pants.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/soldier/chest.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/soldier/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/soldier/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/soldier/head.vox create mode 100644 assets/voxygen/voxel/npc/haniwa/soldier/pants.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/chest.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/head.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/pants.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/hoplite/tail.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/chest.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/head.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/pants.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/marksman/tail.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/chest.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/head.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/pants.vox create mode 100644 assets/voxygen/voxel/npc/myrmidon/strategian/tail.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/chest.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/head.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/pants.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sniper/tail.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/chest.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/head.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/pants.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/sorcerer/tail.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/chest.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/head.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/pants.vox create mode 100644 assets/voxygen/voxel/npc/sahagin/spearman/tail.vox create mode 100644 assets/voxygen/voxel/weapon/biped_small/axe/icepicker.vox rename assets/voxygen/voxel/weapon/biped_small/axe/{axe.vox => logger.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/biped_small/axe/strategian.vox rename assets/voxygen/voxel/weapon/biped_small/{blowgun.vox => blowgun/stalker.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/biped_small/blowgun/trapper.vox rename assets/voxygen/voxel/weapon/biped_small/bow/{haniwa.vox => archer.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/bow/{myrmidon.vox => marksman.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/bow/{sahagin.vox => sniper.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/bow/{adlet.vox => tracker.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/{dagger.vox => dagger/mugger.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox create mode 100644 assets/voxygen/voxel/weapon/biped_small/dagger/soldier.vox rename assets/voxygen/voxel/weapon/biped_small/spear/{haniwa.vox => guard.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/spear/{myrmidon.vox => hoplite.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/spear/{adlet.vox => hunter.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/spear/{sahagin.vox => spearman.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/staff/{chieftain_staff.vox => chieftain.vox} (100%) rename assets/voxygen/voxel/weapon/biped_small/staff/{gnoll.vox => shaman.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/biped_small/staff/sorcerer.vox diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/hunter.ron similarity index 71% rename from assets/common/entity/dungeon/tier-1/staff.ron rename to assets/common/entity/dungeon/tier-1/hunter.ron index 749dd9b462..8ed226ee6e 100644 --- a/assets/common/entity/dungeon/tier-1/staff.ron +++ b/assets/common/entity/dungeon/tier-1/hunter.ron @@ -1,10 +1,10 @@ ( - name: Name("Adlet Shaman"), + name: Name("Adlet Hunter"), body: RandomWith("adlet"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.gnoll_staff")), - base_asset: Loadout("common.loadout.dungeon.tier-1.adlet_spear"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.hunter")), + base_asset: Loadout("common.loadout.dungeon.tier-1.hunter"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"), diff --git a/assets/common/entity/dungeon/tier-1/spear.ron b/assets/common/entity/dungeon/tier-1/icepicker.ron similarity index 53% rename from assets/common/entity/dungeon/tier-1/spear.ron rename to assets/common/entity/dungeon/tier-1/icepicker.ron index 09d0b9eeff..8e0b6e94ac 100644 --- a/assets/common/entity/dungeon/tier-1/spear.ron +++ b/assets/common/entity/dungeon/tier-1/icepicker.ron @@ -1,12 +1,14 @@ ( - name: Name("Adlet Hunter"), + name: Name("Adlet Icepicker"), body: RandomWith("adlet"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.wooden_spear")), - base_asset: Loadout("common.loadout.dungeon.tier-1.adlet_spear"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.icepicker")), + base_asset: Loadout("common.loadout.dungeon.tier-1.icepicker"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"), - meta: [], -) \ No newline at end of file + meta: [ + SkillSetAsset("common.skillset.preset.rank1.fullskill"), + ], +) diff --git a/assets/common/entity/dungeon/tier-1/bow.ron b/assets/common/entity/dungeon/tier-1/tracker.ron similarity index 78% rename from assets/common/entity/dungeon/tier-1/bow.ron rename to assets/common/entity/dungeon/tier-1/tracker.ron index 94fa59cc46..00dbd4c274 100644 --- a/assets/common/entity/dungeon/tier-1/bow.ron +++ b/assets/common/entity/dungeon/tier-1/tracker.ron @@ -3,8 +3,8 @@ body: RandomWith("adlet"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.adlet_bow")), - base_asset: Loadout("common.loadout.dungeon.tier-1.adlet_bow"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.tracker")), + base_asset: Loadout("common.loadout.dungeon.tier-1.tracker"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"), diff --git a/assets/common/entity/dungeon/tier-2/bow.ron b/assets/common/entity/dungeon/tier-2/sniper.ron similarity index 79% rename from assets/common/entity/dungeon/tier-2/bow.ron rename to assets/common/entity/dungeon/tier-2/sniper.ron index 8abc652219..b03376a4df 100644 --- a/assets/common/entity/dungeon/tier-2/bow.ron +++ b/assets/common/entity/dungeon/tier-2/sniper.ron @@ -3,8 +3,8 @@ body: RandomWith("sahagin"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.adlet_bow")), - base_asset: Loadout("common.loadout.dungeon.tier-2.sahagin"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.sniper")), + base_asset: Loadout("common.loadout.dungeon.tier-2.sniper"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"), diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/sorcerer.ron similarity index 78% rename from assets/common/entity/dungeon/tier-2/staff.ron rename to assets/common/entity/dungeon/tier-2/sorcerer.ron index 01ec64d744..9c37fe969a 100644 --- a/assets/common/entity/dungeon/tier-2/staff.ron +++ b/assets/common/entity/dungeon/tier-2/sorcerer.ron @@ -3,8 +3,8 @@ body: RandomWith("sahagin"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.gnoll_staff")), - base_asset: Loadout("common.loadout.dungeon.tier-2.sahagin"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.sorcerer")), + base_asset: Loadout("common.loadout.dungeon.tier-2.sorcerer"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"), diff --git a/assets/common/entity/dungeon/tier-2/spear.ron b/assets/common/entity/dungeon/tier-2/spearman.ron similarity index 61% rename from assets/common/entity/dungeon/tier-2/spear.ron rename to assets/common/entity/dungeon/tier-2/spearman.ron index 9467d7fee4..619953a6af 100644 --- a/assets/common/entity/dungeon/tier-2/spear.ron +++ b/assets/common/entity/dungeon/tier-2/spearman.ron @@ -3,10 +3,12 @@ body: RandomWith("sahagin"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.wooden_spear")), - base_asset: Loadout("common.loadout.dungeon.tier-2.sahagin"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.spearman")), + base_asset: Loadout("common.loadout.dungeon.tier-2.spearman"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"), - meta: [], -) \ No newline at end of file + meta: [ + SkillSetAsset("common.skillset.preset.rank2.fullskill"), + ], +) diff --git a/assets/common/entity/dungeon/tier-3/bow.ron b/assets/common/entity/dungeon/tier-3/archer.ron similarity index 79% rename from assets/common/entity/dungeon/tier-3/bow.ron rename to assets/common/entity/dungeon/tier-3/archer.ron index 932c758abd..6c71dbc77a 100644 --- a/assets/common/entity/dungeon/tier-3/bow.ron +++ b/assets/common/entity/dungeon/tier-3/archer.ron @@ -3,8 +3,8 @@ body: RandomWith("haniwa"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.adlet_bow")), - base_asset: Loadout("common.loadout.dungeon.tier-3.haniwa"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.archer")), + base_asset: Loadout("common.loadout.dungeon.tier-3.archer"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"), diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/guard.ron similarity index 71% rename from assets/common/entity/dungeon/tier-3/staff.ron rename to assets/common/entity/dungeon/tier-3/guard.ron index 06bdce4004..92e403da4a 100644 --- a/assets/common/entity/dungeon/tier-3/staff.ron +++ b/assets/common/entity/dungeon/tier-3/guard.ron @@ -1,10 +1,10 @@ ( - name: Name("Haniwa Sorcerer"), + name: Name("Haniwa Guard"), body: RandomWith("haniwa"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.gnoll_staff")), - base_asset: Loadout("common.loadout.dungeon.tier-3.haniwa"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.guard")), + base_asset: Loadout("common.loadout.dungeon.tier-3.guard"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"), diff --git a/assets/common/entity/dungeon/tier-3/spear.ron b/assets/common/entity/dungeon/tier-3/soldier.ron similarity index 53% rename from assets/common/entity/dungeon/tier-3/spear.ron rename to assets/common/entity/dungeon/tier-3/soldier.ron index a1d0cf4588..688c4c5603 100644 --- a/assets/common/entity/dungeon/tier-3/spear.ron +++ b/assets/common/entity/dungeon/tier-3/soldier.ron @@ -1,12 +1,14 @@ ( - name: Name("Haniwa Guard"), + name: Name("Haniwa Soldier"), body: RandomWith("haniwa"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.wooden_spear")), - base_asset: Loadout("common.loadout.dungeon.tier-3.haniwa"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.soldier")), + base_asset: Loadout("common.loadout.dungeon.tier-3.soldier"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"), - meta: [], + meta: [ + SkillSetAsset("common.skillset.preset.rank3.fullskill"), + ], ) \ No newline at end of file diff --git a/assets/common/entity/dungeon/tier-4/spear.ron b/assets/common/entity/dungeon/tier-4/hoplite.ron similarity index 61% rename from assets/common/entity/dungeon/tier-4/spear.ron rename to assets/common/entity/dungeon/tier-4/hoplite.ron index a84232a838..ead8017cfe 100644 --- a/assets/common/entity/dungeon/tier-4/spear.ron +++ b/assets/common/entity/dungeon/tier-4/hoplite.ron @@ -3,10 +3,12 @@ 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"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.hoplite")), + base_asset: Loadout("common.loadout.dungeon.tier-4.hoplite"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), - meta: [], + meta: [ + SkillSetAsset("common.skillset.preset.rank4.fullskill"), + ], ) \ No newline at end of file diff --git a/assets/common/entity/dungeon/tier-4/bow.ron b/assets/common/entity/dungeon/tier-4/marksman.ron similarity index 78% rename from assets/common/entity/dungeon/tier-4/bow.ron rename to assets/common/entity/dungeon/tier-4/marksman.ron index 6f784b84c6..94e36b7da6 100644 --- a/assets/common/entity/dungeon/tier-4/bow.ron +++ b/assets/common/entity/dungeon/tier-4/marksman.ron @@ -3,8 +3,8 @@ body: RandomWith("myrmidon"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.adlet_bow")), - base_asset: Loadout("common.loadout.dungeon.tier-4.myrmidon"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.marksman")), + base_asset: Loadout("common.loadout.dungeon.tier-4.marksman"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), diff --git a/assets/common/entity/dungeon/tier-4/staff.ron b/assets/common/entity/dungeon/tier-4/strategian.ron similarity index 52% rename from assets/common/entity/dungeon/tier-4/staff.ron rename to assets/common/entity/dungeon/tier-4/strategian.ron index fb9147836c..b5a44fd7e3 100644 --- a/assets/common/entity/dungeon/tier-4/staff.ron +++ b/assets/common/entity/dungeon/tier-4/strategian.ron @@ -1,12 +1,14 @@ ( - name: Name("Myrmidon Wizard"), + name: Name("Myrmidon Strategian"), body: RandomWith("myrmidon"), alignment: Alignment(Enemy), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.gnoll_staff")), - base_asset: Loadout("common.loadout.dungeon.tier-4.myrmidon"), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.strategian")), + base_asset: Loadout("common.loadout.dungeon.tier-4.strategian"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), - meta: [], + meta: [ + SkillSetAsset("common.skillset.preset.rank4.fullskill"), + ], ) \ No newline at end of file diff --git a/assets/common/entity/spot/gnome/spear.ron b/assets/common/entity/spot/gnome/spear.ron index f847474bdb..b5b7ceec3c 100644 --- a/assets/common/entity/spot/gnome/spear.ron +++ b/assets/common/entity/spot/gnome/spear.ron @@ -3,10 +3,10 @@ body: RandomWith("gnome"), alignment: Alignment(Wild), loadout: Extended( - hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.wooden_spear")), + hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.hoplite")), base_asset: Loadout("common.loadout.spots.gnome"), inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), meta: [], -) \ No newline at end of file +) diff --git a/assets/common/entity/spot/myrmidon/spear.ron b/assets/common/entity/spot/myrmidon/spear.ron index a84232a838..829a25ce1f 100644 --- a/assets/common/entity/spot/myrmidon/spear.ron +++ b/assets/common/entity/spot/myrmidon/spear.ron @@ -8,5 +8,16 @@ inventory: [], ), loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"), +<<<<<<< HEAD meta: [], -) \ No newline at end of file +) +======= + + 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/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron similarity index 81% rename from assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron rename to assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron index 03a01336bf..777e016d6a 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("AdletSpear"), + kind: Chest("AdletHunter"), stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron new file mode 100644 index 0000000000..21af4e8623 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("AdletIcepicker"), + stats: ( + protection: Some(Normal(14.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(4.4), + energy_reward: Some(0.054), + crit_power: Some(0.05), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron rename to assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron index a463028625..adcb17c66e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("AdletBow"), + kind: Chest("AdletTracker"), stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron rename to assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron index 4119d14ff0..fc18c89f7a 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("Adlet"), + kind: Foot("AdletHunter"), stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron new file mode 100644 index 0000000000..900a2c27e7 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Foot("AdletIcepicker"), + stats: ( + protection: Some(Normal(4.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(1.8), + energy_reward: Some(0.018), + crit_power: Some(0.016), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron new file mode 100644 index 0000000000..9f1e42093b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Adlet Tracker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Foot("AdletTracker"), + stats: ( + protection: Some(Normal(4.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(1.8), + energy_reward: Some(0.018), + crit_power: Some(0.016), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron similarity index 81% rename from assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron rename to assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron index f67bd9dd88..8b863c1fd3 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("AdletSpear"), + kind: Hand("AdletHunter"), stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron new file mode 100644 index 0000000000..8349e550e4 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("AdletIcepicker"), + stats: ( + protection: Some(Normal(6.0)), + poise_resilience: Some(Normal(3.0)), + crit_power: Some(0.016), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron rename to assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron index 185f3b0994..298713e2c8 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Tracker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("AdletBow"), + kind: Hand("AdletTracker"), stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron similarity index 81% rename from assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron rename to assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron index db824669f8..4d11bad1ea 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("AdletSpear"), + kind: Head("AdletHunter"), stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron new file mode 100644 index 0000000000..037dc2325d --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("AdletIcepicker"), + stats: ( + protection: Some(Normal(9.0)), + poise_resilience: Some(Normal(3.0)), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron rename to assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron index 9f8355ed10..3988e10da3 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("AdletBow"), + kind: Head("AdletTracker"), stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron similarity index 81% rename from assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron rename to assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron index 356d4e71be..2afd5fe438 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("AdletSpear"), + kind: Pants("AdletHunter"), stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron new file mode 100644 index 0000000000..f88a7e376d --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("AdletIcepicker"), + stats: ( + protection: Some(Normal(9.0)), + poise_resilience: Some(Normal(3.0)), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron rename to assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron index f75f82b31b..27eb242799 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Tracker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("AdletBow"), + kind: Pants("AdletTracker"), stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron rename to assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron index 7dde428be9..db67f5145a 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Adlet", + name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("Adlet"), + kind: Belt("AdletHunter"), stats: ( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron new file mode 100644 index 0000000000..10e01fcdee --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Adlet Icepicker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Belt("AdletIcepicker"), + stats: ( + protection: Some(Normal(3.0)), + poise_resilience: Some(Normal(3.0)), + energy_max: Some(0.8), + energy_reward: Some(0.01), + crit_power: Some(0.008), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron new file mode 100644 index 0000000000..f175d4f1bf --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Adlet Tracker", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Belt("AdletTracker"), + stats: ( + protection: Some(Normal(3.0)), + poise_resilience: Some(Normal(3.0)), + energy_max: Some(0.8), + energy_reward: Some(0.01), + crit_power: Some(0.008), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron rename to assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron index d3d814cbd6..3bdf0fb947 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Haniwa", + name: "Gnoll Rogue", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Haniwa"), + kind: Chest("GnollRogue"), stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron new file mode 100644 index 0000000000..9b8dc0b866 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("GnollShaman"), + stats: ( + protection: Some(Normal(38.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.108), + crit_power: Some(0.1), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron new file mode 100644 index 0000000000..8a7613de0e --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("GnollTrapper"), + stats: ( + protection: Some(Normal(38.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.108), + crit_power: Some(0.1), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron rename to assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron index 39a1bc86b5..8645198598 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Haniwa", + name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("Haniwa"), + kind: Foot("GnollRogue"), stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron new file mode 100644 index 0000000000..70e912d463 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("GnollShaman"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron new file mode 100644 index 0000000000..6b44ba046b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("GnollTrapper"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron rename to assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron index 3f9149784b..cc9bbd4362 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Haniwa", + name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Haniwa"), + kind: Hand("GnollRogue"), stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron new file mode 100644 index 0000000000..8ad6f39a09 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("GnollShaman"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron new file mode 100644 index 0000000000..367d2d2e1f --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("GnollTrapper"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron rename to assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron index 179a23e7de..177a91728e 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Haniwa", + name: "Gnoll Rogue", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Haniwa"), + kind: Head("GnollRogue"), stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron new file mode 100644 index 0000000000..a58ac27b9b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("GnollShaman"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron new file mode 100644 index 0000000000..d3567dd7ce --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("GnollTrapper"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron new file mode 100644 index 0000000000..a7e90590f4 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Rogue", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("GnollRogue"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron new file mode 100644 index 0000000000..f178eac495 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("GnollShaman"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron new file mode 100644 index 0000000000..592d8ff757 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("GnollTrapper"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron similarity index 85% rename from assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron rename to assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron index 57a7de6fd4..13c4344c72 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Haniwa", + name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Haniwa"), + kind: Belt("GnollRogue"), stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron new file mode 100644 index 0000000000..6791fbb867 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Shaman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("GnollShaman"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron new file mode 100644 index 0000000000..1fe212f49f --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gnoll Trapper", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("GnollTrapper"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron new file mode 100644 index 0000000000..70c0646bed --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Archer", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("HaniwaArcher"), + stats: ( + protection: Some(Normal(38.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.108), + crit_power: Some(0.1), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron new file mode 100644 index 0000000000..4b9b02a100 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Guard", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("HaniwaGuard"), + stats: ( + protection: Some(Normal(38.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.108), + crit_power: Some(0.1), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron new file mode 100644 index 0000000000..f528d0c996 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Soldier", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("HaniwaSoldier"), + stats: ( + protection: Some(Normal(38.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.108), + crit_power: Some(0.1), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron new file mode 100644 index 0000000000..9566812bbe --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Archer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("HaniwaArcher"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron new file mode 100644 index 0000000000..62f058b19f --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Guard", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("HaniwaGuard"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron new file mode 100644 index 0000000000..9c96451721 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Soldier", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("HaniwaSoldier"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron new file mode 100644 index 0000000000..5ab38fdd9d --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Archer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("HaniwaArcher"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron new file mode 100644 index 0000000000..06dc1cbd73 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Guard", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("HaniwaGuard"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron new file mode 100644 index 0000000000..b86e72a951 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Soldier", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("HaniwaSoldier"), + stats: ( + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.036), + crit_power: Some(0.032), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron new file mode 100644 index 0000000000..6608999c84 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Archer", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("HaniwaArcher"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron new file mode 100644 index 0000000000..d5de63c1aa --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Guard", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("HaniwaGuard"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron new file mode 100644 index 0000000000..9b44cd0eaa --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Soldier", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("HaniwaSoldier"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron new file mode 100644 index 0000000000..8d5820b527 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Archer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("HaniwaArcher"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron new file mode 100644 index 0000000000..2f925fbe23 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Guard", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("HaniwaGuard"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron new file mode 100644 index 0000000000..a720c04d42 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Haniwa Soldier", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("HaniwaSoldier"), + stats: ( + protection: Some(Normal(19.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(5.0), + energy_reward: Some(0.08), + crit_power: Some(0.064), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron index 64a7ce8d07..8f084a7283 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Myrmidon"), + kind: Chest("MyrmidonHoplite"), stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron new file mode 100644 index 0000000000..96b5e888b4 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(48.0)), + poise_resilience: Some(Normal(6.0)), + energy_max: Some(13.5), + energy_reward: Some(0.135), + crit_power: Some(0.125), + stealth: Some(0.125), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron new file mode 100644 index 0000000000..20e1db8a8b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(48.0)), + poise_resilience: Some(Normal(6.0)), + energy_max: Some(13.5), + energy_reward: Some(0.135), + crit_power: Some(0.125), + stealth: Some(0.125), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron index 98a03d6431..241df6552e 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("Myrmidon"), + kind: Foot("MyrmidonHoplite"), stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron new file mode 100644 index 0000000000..5ac421ea47 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(16.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(4.5), + energy_reward: Some(0.045), + crit_power: Some(0.04), + stealth: Some(0.04), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron new file mode 100644 index 0000000000..5a1f4e5141 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(16.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(4.5), + energy_reward: Some(0.045), + crit_power: Some(0.04), + stealth: Some(0.04), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron index d82e8d2b0a..a4288c682d 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Myrmidon"), + kind: Hand("MyrmidonHoplite"), stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron new file mode 100644 index 0000000000..b6de403e14 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(16.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(4.5), + energy_reward: Some(0.045), + crit_power: Some(0.04), + stealth: Some(0.04), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron new file mode 100644 index 0000000000..7783017101 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(16.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(4.5), + energy_reward: Some(0.045), + crit_power: Some(0.04), + stealth: Some(0.04), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron index 2bd96f3328..c2f200ed60 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Myrmidon"), + kind: Head("MyrmidonHoplite"), stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron new file mode 100644 index 0000000000..115c9c483a --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(32.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(9.0), + energy_reward: Some(0.1), + crit_power: Some(0.08), + stealth: Some(0.08), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron new file mode 100644 index 0000000000..0d56b94a68 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(32.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(9.0), + energy_reward: Some(0.1), + crit_power: Some(0.08), + stealth: Some(0.08), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron index ba596002a9..fc0bcc1b5a 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Myrmidon"), + kind: Pants("MyrmidonHoplite"), stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron new file mode 100644 index 0000000000..1ac2cd3293 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(32.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(9.0), + energy_reward: Some(0.1), + crit_power: Some(0.08), + stealth: Some(0.08), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron new file mode 100644 index 0000000000..41982d0a8d --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(32.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(9.0), + energy_reward: Some(0.1), + crit_power: Some(0.08), + stealth: Some(0.08), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron rename to assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron index 3552182720..e1ba3d5dd7 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Myrmidon", + name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("Myrmidon"), + kind: Belt("MyrmidonHoplite"), stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron new file mode 100644 index 0000000000..6e7916239f --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Marksman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("MyrmidonMarksman"), + stats: ( + protection: Some(Normal(8.0)), + poise_resilience: Some(Normal(1.0)), + energy_max: Some(2.0), + energy_reward: Some(0.025), + crit_power: Some(0.02), + stealth: Some(0.02), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron new file mode 100644 index 0000000000..5d00a67f39 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Myrmidon Strategian", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("MyrmidonStrategian"), + stats: ( + protection: Some(Normal(8.0)), + poise_resilience: Some(Normal(1.0)), + energy_max: Some(2.0), + energy_reward: Some(0.025), + crit_power: Some(0.02), + stealth: Some(0.02), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron index 564b98cd9d..52b189de5b 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Sahagin"), + kind: Chest("SahaginSniper"), stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron new file mode 100644 index 0000000000..9b6e173673 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("SahaginSorcerer"), + stats: ( + protection: Some(Normal(26.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + crit_power: Some(0.075), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron new file mode 100644 index 0000000000..29541f67a1 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Chest("SahaginSpearman"), + stats: ( + protection: Some(Normal(26.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + crit_power: Some(0.075), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron index 41fbdd8aaf..e84cf54719 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Sahagin"), + kind: Foot("SahaginSniper"), stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron new file mode 100644 index 0000000000..accab58b8b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("SahaginSorcerer"), + stats: ( + protection: Some(Normal(7.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.027), + crit_power: Some(0.024), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron new file mode 100644 index 0000000000..fa28d964e7 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("SahaginSpearman"), + stats: ( + protection: Some(Normal(7.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.027), + crit_power: Some(0.024), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron index 2c1d5f481c..7ec1c8c781 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("Sahagin"), + kind: Hand("SahaginSniper"), stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron new file mode 100644 index 0000000000..90fb5c6538 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("SahaginSorcerer"), + stats: ( + protection: Some(Normal(7.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.027), + crit_power: Some(0.024), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron new file mode 100644 index 0000000000..433652f025 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("SahaginSpearman"), + stats: ( + protection: Some(Normal(7.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.027), + crit_power: Some(0.024), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron index 1067ca75b5..b62e87e189 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Sahagin"), + kind: Head("SahaginSniper"), stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron new file mode 100644 index 0000000000..4afff7f3d7 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("SahaginSorcerer"), + stats: ( + protection: Some(Normal(13.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.06), + crit_power: Some(0.048), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron new file mode 100644 index 0000000000..8ebb88ba5b --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("SahaginSpearman"), + stats: ( + protection: Some(Normal(13.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.06), + crit_power: Some(0.048), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron index 470d0276df..84133dc260 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Sahagin"), + kind: Pants("SahaginSniper"), stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron new file mode 100644 index 0000000000..04a8bfc7f0 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("SahaginSorcerer"), + stats: ( + protection: Some(Normal(13.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.06), + crit_power: Some(0.048), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron new file mode 100644 index 0000000000..5fd66d22d8 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("SahaginSpearman"), + stats: ( + protection: Some(Normal(13.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.06), + crit_power: Some(0.048), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron similarity index 84% rename from assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron rename to assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron index b5be2d217a..ab9d29bf48 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Sahagin", + name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("Sahagin"), + kind: Belt("SahaginSniper"), stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron new file mode 100644 index 0000000000..e046d635c0 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Sorcerer", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("SahaginSorcerer"), + stats: ( + protection: Some(Normal(5.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.015), + crit_power: Some(0.012), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron new file mode 100644 index 0000000000..39ccc407d1 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sahagin Spearman", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Belt("SahaginSpearman"), + stats: ( + protection: Some(Normal(5.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.015), + crit_power: Some(0.012), + ), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron similarity index 95% rename from assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron rename to assets/common/items/npc_weapons/biped_small/adlet/hunter.ron index 7ea0f637f2..ec469ee143 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Wooden Spear", description: "Testing", kind: Tool(( - kind: Spear, + kind: Axe, hands: Two, stats: Direct(( equip_time_secs: 0.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron similarity index 90% rename from assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron rename to assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron index f3e2191a33..f36ae75786 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron @@ -17,5 +17,5 @@ ItemDef( )), quality: Low, tags: [], - ability_spec: Some(Custom("Staff Simple")), + ability_spec: Some(Custom("Axe Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron rename to assets/common/items/npc_weapons/biped_small/adlet/tracker.ron diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron rename to assets/common/items/npc_weapons/biped_small/haniwa/archer.ron diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron rename to assets/common/items/npc_weapons/biped_small/haniwa/guard.ron diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron similarity index 85% rename from assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron rename to assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron index 5a2c62c527..ecf8ebdaed 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", kind: Tool(( - kind: Staff, + kind: Dagger, hands: Two, stats: Direct(( equip_time_secs: 0.0, @@ -17,5 +17,5 @@ ItemDef( )), quality: Low, tags: [], - ability_spec: Some(Custom("Staff Simple")), + ability_spec: Some(Custom("Dagger Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron rename to assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron rename to assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron similarity index 85% rename from assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron rename to assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron index ecbf99b510..2810ea6589 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", kind: Tool(( - kind: Staff, + kind: Axe, hands: Two, stats: Direct(( equip_time_secs: 0.0, @@ -17,5 +17,5 @@ ItemDef( )), quality: Low, tags: [], - ability_spec: Some(Custom("Staff Simple")), + ability_spec: Some(Custom("Axe Simple")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron rename to assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron rename to assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron similarity index 100% rename from assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron rename to assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron diff --git a/assets/common/loadout/dungeon/tier-1/adlet_bow.ron b/assets/common/loadout/dungeon/tier-1/hunter.ron similarity index 78% rename from assets/common/loadout/dungeon/tier-1/adlet_bow.ron rename to assets/common/loadout/dungeon/tier-1/hunter.ron index 6e41a40ee7..34685f84f4 100644 --- a/assets/common/loadout/dungeon/tier-1/adlet_bow.ron +++ b/assets/common/loadout/dungeon/tier-1/hunter.ron @@ -1,8 +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"), + Armor(Head): Item("common.items.npc_armor.biped_small.adlet.head.hunter"), + Armor(Hands): Item("common.items.npc_armor.biped_small.adlet.hand.hunter"), + Armor(Feet): Item("common.items.npc_armor.biped_small.adlet.foot.hunter"), + Armor(Chest): Item("common.items.npc_armor.biped_small.adlet.chest.hunter"), + Armor(Legs): Item("common.items.npc_armor.biped_small.adlet.pants.hunter"), + Armor(Belt): Item("common.items.npc_armor.biped_small.adlet.tail.hunter"), }) diff --git a/assets/common/loadout/dungeon/tier-1/adlet_spear.ron b/assets/common/loadout/dungeon/tier-1/icepicker.ron similarity index 77% rename from assets/common/loadout/dungeon/tier-1/adlet_spear.ron rename to assets/common/loadout/dungeon/tier-1/icepicker.ron index 3cc2d10f4d..6b9f6156c4 100644 --- a/assets/common/loadout/dungeon/tier-1/adlet_spear.ron +++ b/assets/common/loadout/dungeon/tier-1/icepicker.ron @@ -1,8 +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"), + Armor(Head): Item("common.items.npc_armor.biped_small.adlet.head.icepicker"), + Armor(Hands): Item("common.items.npc_armor.biped_small.adlet.hand.icepicker"), + Armor(Feet): Item("common.items.npc_armor.biped_small.adlet.foot.icepicker"), + Armor(Chest): Item("common.items.npc_armor.biped_small.adlet.chest.icepicker"), + Armor(Legs): Item("common.items.npc_armor.biped_small.adlet.pants.icepicker"), + Armor(Belt): Item("common.items.npc_armor.biped_small.adlet.tail.icepicker"), }) diff --git a/assets/common/loadout/dungeon/tier-1/tracker.ron b/assets/common/loadout/dungeon/tier-1/tracker.ron new file mode 100644 index 0000000000..1f09cede4c --- /dev/null +++ b/assets/common/loadout/dungeon/tier-1/tracker.ron @@ -0,0 +1,8 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.adlet.head.tracker"), + Armor(Hands): Item("common.items.npc_armor.biped_small.adlet.hand.tracker"), + Armor(Feet): Item("common.items.npc_armor.biped_small.adlet.foot.tracker"), + Armor(Chest): Item("common.items.npc_armor.biped_small.adlet.chest.tracker"), + Armor(Legs): Item("common.items.npc_armor.biped_small.adlet.pants.tracker"), + Armor(Belt): Item("common.items.npc_armor.biped_small.adlet.tail.tracker"), +}) diff --git a/assets/common/loadout/dungeon/tier-2/sahagin.ron b/assets/common/loadout/dungeon/tier-2/sniper.ron similarity index 77% rename from assets/common/loadout/dungeon/tier-2/sahagin.ron rename to assets/common/loadout/dungeon/tier-2/sniper.ron index e7be4c0458..be2521b3a5 100644 --- a/assets/common/loadout/dungeon/tier-2/sahagin.ron +++ b/assets/common/loadout/dungeon/tier-2/sniper.ron @@ -1,8 +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"), + Armor(Head): Item("common.items.npc_armor.biped_small.sahagin.head.sniper"), + Armor(Feet): Item("common.items.npc_armor.biped_small.sahagin.foot.sniper"), + Armor(Hands): Item("common.items.npc_armor.biped_small.sahagin.hand.sniper"), + Armor(Chest): Item("common.items.npc_armor.biped_small.sahagin.chest.sniper"), + Armor(Legs): Item("common.items.npc_armor.biped_small.sahagin.pants.sniper"), + Armor(Belt): Item("common.items.npc_armor.biped_small.sahagin.tail.sniper"), }) diff --git a/assets/common/loadout/dungeon/tier-2/sorcerer.ron b/assets/common/loadout/dungeon/tier-2/sorcerer.ron new file mode 100644 index 0000000000..b427efb016 --- /dev/null +++ b/assets/common/loadout/dungeon/tier-2/sorcerer.ron @@ -0,0 +1,8 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.sahagin.head.sorcerer"), + Armor(Feet): Item("common.items.npc_armor.biped_small.sahagin.foot.sorcerer"), + Armor(Hands): Item("common.items.npc_armor.biped_small.sahagin.hand.sorcerer"), + Armor(Chest): Item("common.items.npc_armor.biped_small.sahagin.chest.sorcerer"), + Armor(Legs): Item("common.items.npc_armor.biped_small.sahagin.pants.sorcerer"), + Armor(Belt): Item("common.items.npc_armor.biped_small.sahagin.tail.sorcerer"), +}) diff --git a/assets/common/loadout/dungeon/tier-2/spearman.ron b/assets/common/loadout/dungeon/tier-2/spearman.ron new file mode 100644 index 0000000000..71094e0166 --- /dev/null +++ b/assets/common/loadout/dungeon/tier-2/spearman.ron @@ -0,0 +1,8 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.sahagin.head.spearman"), + Armor(Feet): Item("common.items.npc_armor.biped_small.sahagin.foot.spearman"), + Armor(Hands): Item("common.items.npc_armor.biped_small.sahagin.hand.spearman"), + Armor(Chest): Item("common.items.npc_armor.biped_small.sahagin.chest.spearman"), + Armor(Legs): Item("common.items.npc_armor.biped_small.sahagin.pants.spearman"), + Armor(Belt): Item("common.items.npc_armor.biped_small.sahagin.tail.spearman"), +}) diff --git a/assets/common/loadout/dungeon/tier-3/haniwa.ron b/assets/common/loadout/dungeon/tier-3/archer.ron similarity index 79% rename from assets/common/loadout/dungeon/tier-3/haniwa.ron rename to assets/common/loadout/dungeon/tier-3/archer.ron index 92c9e142a5..1588d16f96 100644 --- a/assets/common/loadout/dungeon/tier-3/haniwa.ron +++ b/assets/common/loadout/dungeon/tier-3/archer.ron @@ -1,7 +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"), + Armor(Head): Item("common.items.npc_armor.biped_small.haniwa.head.archer"), + Armor(Feet): Item("common.items.npc_armor.biped_small.haniwa.foot.archer"), + Armor(Hands): Item("common.items.npc_armor.biped_small.haniwa.hand.archer"), + Armor(Chest): Item("common.items.npc_armor.biped_small.haniwa.chest.archer"), + Armor(Legs): Item("common.items.npc_armor.biped_small.haniwa.pants.archer"), }) diff --git a/assets/common/loadout/dungeon/tier-3/guard.ron b/assets/common/loadout/dungeon/tier-3/guard.ron new file mode 100644 index 0000000000..6c2cf1b4dd --- /dev/null +++ b/assets/common/loadout/dungeon/tier-3/guard.ron @@ -0,0 +1,7 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.haniwa.head.guard"), + Armor(Feet): Item("common.items.npc_armor.biped_small.haniwa.foot.guard"), + Armor(Hands): Item("common.items.npc_armor.biped_small.haniwa.hand.guard"), + Armor(Chest): Item("common.items.npc_armor.biped_small.haniwa.chest.guard"), + Armor(Legs): Item("common.items.npc_armor.biped_small.haniwa.pants.guard"), +}) diff --git a/assets/common/loadout/dungeon/tier-3/soldier.ron b/assets/common/loadout/dungeon/tier-3/soldier.ron new file mode 100644 index 0000000000..da1970fe21 --- /dev/null +++ b/assets/common/loadout/dungeon/tier-3/soldier.ron @@ -0,0 +1,7 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.haniwa.head.soldier"), + Armor(Feet): Item("common.items.npc_armor.biped_small.haniwa.foot.soldier"), + Armor(Hands): Item("common.items.npc_armor.biped_small.haniwa.hand.soldier"), + Armor(Chest): Item("common.items.npc_armor.biped_small.haniwa.chest.soldier"), + Armor(Legs): Item("common.items.npc_armor.biped_small.haniwa.pants.soldier"), +}) diff --git a/assets/common/loadout/dungeon/tier-4/myrmidon.ron b/assets/common/loadout/dungeon/tier-4/hoplite.ron similarity index 75% rename from assets/common/loadout/dungeon/tier-4/myrmidon.ron rename to assets/common/loadout/dungeon/tier-4/hoplite.ron index fb4867b283..e0bb0ed906 100644 --- a/assets/common/loadout/dungeon/tier-4/myrmidon.ron +++ b/assets/common/loadout/dungeon/tier-4/hoplite.ron @@ -1,8 +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"), + Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.hoplite"), + Armor(Feet): Item("common.items.npc_armor.biped_small.myrmidon.foot.hoplite"), + Armor(Hands): Item("common.items.npc_armor.biped_small.myrmidon.hand.hoplite"), + Armor(Chest): Item("common.items.npc_armor.biped_small.myrmidon.chest.hoplite"), + Armor(Legs): Item("common.items.npc_armor.biped_small.myrmidon.pants.hoplite"), + Armor(Belt): Item("common.items.npc_armor.biped_small.myrmidon.tail.hoplite"), }) diff --git a/assets/common/loadout/dungeon/tier-4/marksman.ron b/assets/common/loadout/dungeon/tier-4/marksman.ron new file mode 100644 index 0000000000..93562d36d3 --- /dev/null +++ b/assets/common/loadout/dungeon/tier-4/marksman.ron @@ -0,0 +1,8 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.marksman"), + Armor(Feet): Item("common.items.npc_armor.biped_small.myrmidon.foot.marksman"), + Armor(Hands): Item("common.items.npc_armor.biped_small.myrmidon.hand.marksman"), + Armor(Chest): Item("common.items.npc_armor.biped_small.myrmidon.chest.marksman"), + Armor(Legs): Item("common.items.npc_armor.biped_small.myrmidon.pants.marksman"), + Armor(Belt): Item("common.items.npc_armor.biped_small.myrmidon.tail.marksman"), +}) diff --git a/assets/common/loadout/dungeon/tier-4/strategian.ron b/assets/common/loadout/dungeon/tier-4/strategian.ron new file mode 100644 index 0000000000..404dae3120 --- /dev/null +++ b/assets/common/loadout/dungeon/tier-4/strategian.ron @@ -0,0 +1,8 @@ +({ + Armor(Head): Item("common.items.npc_armor.biped_small.myrmidon.head.strategian"), + Armor(Feet): Item("common.items.npc_armor.biped_small.myrmidon.foot.strategian"), + Armor(Hands): Item("common.items.npc_armor.biped_small.myrmidon.hand.strategian"), + Armor(Chest): Item("common.items.npc_armor.biped_small.myrmidon.chest.strategian"), + Armor(Legs): Item("common.items.npc_armor.biped_small.myrmidon.pants.strategian"), + Armor(Belt): Item("common.items.npc_armor.biped_small.myrmidon.tail.strategian"), +}) diff --git a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron index 33dcc23a11..01c2dffca8 100644 --- a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron @@ -6,14 +6,23 @@ "Gnome": ( vox_spec: ("npc.gnome.male.chest", (-5.0, -3.0, -2.5)), ), - "Sahagin": ( - vox_spec: ("npc.sahagin.male.chest", (-4.5, -8.0, -8.0)), + "SahaginSpearman": ( + vox_spec: ("npc.sahagin.spearman.chest", (-4.5, -8.0, -8.0)), ), - "AdletSpear": ( - vox_spec: ("npc.adlet.male.spear.chest", (-5.0, -3.5, -2.0)), + "SahaginSorcerer": ( + vox_spec: ("npc.sahagin.sorcerer.chest", (-4.5, -8.0, -8.0)), ), - "AdletBow": ( - vox_spec: ("npc.adlet.male.bow.chest", (-5.0, -3.5, -2.0)), + "SahaginSniper": ( + vox_spec: ("npc.sahagin.sniper.chest", (-4.5, -8.0, -8.0)), + ), + "AdletHunter": ( + vox_spec: ("npc.adlet.hunter.chest", (-5.0, -3.5, -2.0)), + ), + "AdletIcepicker": ( + vox_spec: ("npc.adlet.icepicker.chest", (-5.0, -3.5, -2.0)), + ), + "AdletTracker": ( + vox_spec: ("npc.adlet.tracker.chest", (-5.0, -3.5, -2.0)), ), "GnarlingMugger": ( vox_spec: ("npc.gnarling.mugger.chest", (-4.5, -3.5, -2.5)), @@ -36,14 +45,32 @@ "Cactid": ( vox_spec: ("npc.cactid.male.chest", (-3.0, -3.0, -2.5)), ), - "Gnoll": ( - vox_spec: ("npc.gnoll.male.chest", (-5.0, -4.5, -6.0)), + "GnollShaman": ( + vox_spec: ("npc.gnoll.shaman.chest", (-5.0, -4.5, -6.0)), ), - "Haniwa": ( - vox_spec: ("npc.haniwa.male.chest", (-6.5, -4.0, -3.0)), + "GnollRogue": ( + vox_spec: ("npc.gnoll.rogue.chest", (-5.0, -4.5, -6.0)), ), - "Myrmidon": ( - vox_spec: ("npc.myrmidon.male.chest", (-5.5, -4.0, -3.0)), + "GnollTrapper": ( + vox_spec: ("npc.gnoll.trapper.chest", (-5.0, -4.5, -6.0)), + ), + "HaniwaGuard": ( + vox_spec: ("npc.haniwa.guard.chest", (-6.5, -4.0, -3.0)), + ), + "HaniwaArcher": ( + 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)), + ), + "MyrmidonHoplite": ( + vox_spec: ("npc.myrmidon.hoplite.chest", (-5.5, -4.0, -3.0)), + ), + "MyrmidonStrategian": ( + vox_spec: ("npc.myrmidon.strategian.chest", (-5.5, -4.0, -3.0)), + ), + "MyrmidonMarksman": ( + vox_spec: ("npc.myrmidon.marksman.chest", (-5.5, -4.0, -3.0)), ), "Husk": ( vox_spec: ("npc.husk.male.chest", (-6.0, -4.5, -4.0)), diff --git a/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron b/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron index 218da8e0a2..66324f4d89 100644 --- a/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron @@ -16,20 +16,52 @@ vox_spec: ("npc.gnome.male.foot_r", (-1.5, -2.0, -4.0)), ) ), - "Sahagin": ( + "SahaginSpearman": ( left: ( - vox_spec: ("npc.sahagin.male.foot_r", (-2.5, -2.0, -8.0)), + vox_spec: ("npc.sahagin.spearman.foot_r", (-2.5, -2.0, -8.0)), ), right: ( - vox_spec: ("npc.sahagin.male.foot_r", (-2.5, -2.0, -8.0)), + vox_spec: ("npc.sahagin.spearman.foot_r", (-2.5, -2.0, -8.0)), ) ), - "Adlet": ( + "SahaginSorcerer": ( left: ( - vox_spec: ("npc.adlet.male.foot_r", (-1.5, -3.0, -7.0)), + vox_spec: ("npc.sahagin.sorcerer.foot_r", (-2.5, -2.0, -8.0)), ), right: ( - vox_spec: ("npc.adlet.male.foot_r", (-1.5, -3.0, -7.0)), + vox_spec: ("npc.sahagin.sorcerer.foot_r", (-2.5, -2.0, -8.0)), + ) + ), + "SahaginSniper": ( + left: ( + vox_spec: ("npc.sahagin.sniper.foot_r", (-2.5, -2.0, -8.0)), + ), + right: ( + vox_spec: ("npc.sahagin.sniper.foot_r", (-2.5, -2.0, -8.0)), + ) + ), + "AdletHunter": ( + left: ( + vox_spec: ("npc.adlet.hunter.foot_r", (-1.5, -3.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.hunter.foot_r", (-1.5, -3.0, -7.0)), + ) + ), + "AdletTracker": ( + left: ( + vox_spec: ("npc.adlet.tracker.foot_r", (-1.5, -3.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.tracker.foot_r", (-1.5, -3.0, -7.0)), + ) + ), + "AdletIcepicker": ( + left: ( + vox_spec: ("npc.adlet.icepicker.foot_r", (-1.5, -3.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.icepicker.foot_r", (-1.5, -3.0, -7.0)), ) ), "GnarlingMugger": ( @@ -88,28 +120,76 @@ vox_spec: ("npc.cactid.male.foot_r", (-1.5, -2.0, -5.0)), ) ), - "Gnoll": ( + "GnollRogue": ( left: ( - vox_spec: ("npc.gnoll.male.foot_r", (-1.5, -3.0, -7.0)), + vox_spec: ("npc.gnoll.rogue.foot_r", (-1.5, -3.0, -7.0)), ), right: ( - vox_spec: ("npc.gnoll.male.foot_r", (-1.5, -3.0, -7.0)), + vox_spec: ("npc.gnoll.rogue.foot_r", (-1.5, -3.0, -7.0)), ) ), - "Haniwa": ( + "GnollTrapper": ( left: ( - vox_spec: ("npc.haniwa.male.foot_r", (-2.0, -2.5, -8.0)), + vox_spec: ("npc.gnoll.trapper.foot_r", (-1.5, -3.0, -7.0)), ), right: ( - vox_spec: ("npc.haniwa.male.foot_r", (-2.0, -2.5, -8.0)), + vox_spec: ("npc.gnoll.trapper.foot_r", (-1.5, -3.0, -7.0)), ) ), - "Myrmidon": ( + "GnollShaman": ( left: ( - vox_spec: ("npc.myrmidon.male.foot_r", (-1.5, -2.5, -7.0)), + vox_spec: ("npc.gnoll.shaman.foot_r", (-1.5, -3.0, -7.0)), ), right: ( - vox_spec: ("npc.myrmidon.male.foot_r", (-1.5, -2.5, -7.0)), + vox_spec: ("npc.gnoll.shaman.foot_r", (-1.5, -3.0, -7.0)), + ) + ), + "HaniwaGuard": ( + left: ( + vox_spec: ("npc.haniwa.guard.foot_r", (-2.0, -2.5, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.guard.foot_r", (-2.0, -2.5, -8.0)), + ) + ), + "HaniwaArcher": ( + left: ( + vox_spec: ("npc.haniwa.archer.foot_r", (-2.0, -2.5, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.archer.foot_r", (-2.0, -2.5, -8.0)), + ) + ), + "HaniwaSoldier": ( + left: ( + vox_spec: ("npc.haniwa.soldier.foot_r", (-2.0, -2.5, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.soldier.foot_r", (-2.0, -2.5, -8.0)), + ) + ), + "MyrmidonHoplite": ( + left: ( + vox_spec: ("npc.myrmidon.hoplite.foot_r", (-1.5, -2.5, -7.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.hoplite.foot_r", (-1.5, -2.5, -7.0)), + ) + ), + "MyrmidonMarksman": ( + left: ( + vox_spec: ("npc.myrmidon.marksman.foot_r", (-1.5, -2.5, -7.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.marksman.foot_r", (-1.5, -2.5, -7.0)), + ) + ), + "MyrmidonStrategian": ( + left: ( + vox_spec: ("npc.myrmidon.strategian.foot_r", (-1.5, -2.5, -7.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.strategian.foot_r", (-1.5, -2.5, -7.0)), ) ), "Husk": ( diff --git a/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron b/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron index da9f239510..9b1f543ff4 100644 --- a/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron @@ -16,28 +16,52 @@ vox_spec: ("npc.gnome.male.hand_r", (0.0, -2.0, -5.0)), ) ), - "Sahagin": ( + "SahaginSpearman": ( left: ( - vox_spec: ("npc.sahagin.male.hand_r", (-7.0, -4.0, -13.0)), + vox_spec: ("npc.sahagin.spearman.hand_r", (-7.0, -4.0, -13.0)), ), right: ( - vox_spec: ("npc.sahagin.male.hand_r", (0.0, -4.0, -13.0)), + vox_spec: ("npc.sahagin.spearman.hand_r", (0.0, -4.0, -13.0)), ) ), - "AdletSpear": ( + "SahaginSorcerer": ( left: ( - vox_spec: ("npc.adlet.male.spear.hand_r", (-4.0, -2.0, -7.0)), + vox_spec: ("npc.sahagin.sorcerer.hand_r", (-7.0, -4.0, -13.0)), ), right: ( - vox_spec: ("npc.adlet.male.spear.hand_r", (0.0, -2.0, -7.0)), + vox_spec: ("npc.sahagin.sorcerer.hand_r", (0.0, -4.0, -13.0)), ) ), - "AdletBow": ( + "SahaginSniper": ( left: ( - vox_spec: ("npc.adlet.male.bow.hand_r", (-4.0, -2.0, -7.0)), + vox_spec: ("npc.sahagin.sniper.hand_r", (-7.0, -4.0, -13.0)), ), right: ( - vox_spec: ("npc.adlet.male.bow.hand_r", (0.0, -2.0, -7.0)), + vox_spec: ("npc.sahagin.sniper.hand_r", (0.0, -4.0, -13.0)), + ) + ), + "AdletTracker": ( + left: ( + vox_spec: ("npc.adlet.tracker.hand_r", (-4.0, -2.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.tracker.hand_r", (0.0, -2.0, -7.0)), + ) + ), + "AdletHunter": ( + left: ( + vox_spec: ("npc.adlet.hunter.hand_r", (-4.0, -2.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.hunter.hand_r", (0.0, -2.0, -7.0)), + ) + ), + "AdletIcepicker": ( + left: ( + vox_spec: ("npc.adlet.icepicker.hand_r", (-4.0, -2.0, -7.0)), + ), + right: ( + vox_spec: ("npc.adlet.icepicker.hand_r", (0.0, -2.0, -7.0)), ) ), "GnarlingMugger": ( @@ -96,28 +120,76 @@ vox_spec: ("npc.cactid.male.hand_r", (0.0, -1.5, -2.5)), ) ), - "Gnoll": ( + "GnollRogue": ( left: ( - vox_spec: ("npc.gnoll.male.hand_r", (-6.0, -2.0, -9.0)), + vox_spec: ("npc.gnoll.rogue.hand_r", (-6.0, -2.0, -9.0)), ), right: ( - vox_spec: ("npc.gnoll.male.hand_r", (0.0, -2.0, -9.0)), + vox_spec: ("npc.gnoll.rogue.hand_r", (0.0, -2.0, -9.0)), ) ), - "Haniwa": ( + "GnollTrapper": ( left: ( - vox_spec: ("npc.haniwa.male.hand_r", (-4.0, -2.0, -8.0)), + vox_spec: ("npc.gnoll.trapper.hand_r", (-6.0, -2.0, -9.0)), ), right: ( - vox_spec: ("npc.haniwa.male.hand_r", (0.0, -2.0, -8.0)), + vox_spec: ("npc.gnoll.trapper.hand_r", (0.0, -2.0, -9.0)), ) ), - "Myrmidon": ( + "GnollShaman": ( left: ( - vox_spec: ("npc.myrmidon.male.hand_r", (-5.0, -2.0, -9.0)), + vox_spec: ("npc.gnoll.shaman.hand_r", (-6.0, -2.0, -9.0)), ), right: ( - vox_spec: ("npc.myrmidon.male.hand_r", (0.0, -2.0, -9.0)), + vox_spec: ("npc.gnoll.shaman.hand_r", (0.0, -2.0, -9.0)), + ) + ), + "HaniwaGuard": ( + left: ( + vox_spec: ("npc.haniwa.guard.hand_r", (-4.0, -2.0, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.guard.hand_r", (0.0, -2.0, -8.0)), + ) + ), + "HaniwaArcher": ( + left: ( + vox_spec: ("npc.haniwa.archer.hand_r", (-4.0, -2.0, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.archer.hand_r", (0.0, -2.0, -8.0)), + ) + ), + "HaniwaSoldier": ( + left: ( + vox_spec: ("npc.haniwa.soldier.hand_r", (-4.0, -2.0, -8.0)), + ), + right: ( + vox_spec: ("npc.haniwa.soldier.hand_r", (0.0, -2.0, -8.0)), + ) + ), + "MyrmidonHoplite": ( + left: ( + vox_spec: ("npc.myrmidon.hoplite.hand_r", (-5.0, -2.0, -9.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.hoplite.hand_r", (0.0, -2.0, -9.0)), + ) + ), + "MyrmidonMarksman": ( + left: ( + vox_spec: ("npc.myrmidon.marksman.hand_r", (-5.0, -2.0, -9.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.marksman.hand_r", (0.0, -2.0, -9.0)), + ) + ), + "MyrmidonStrategian": ( + left: ( + vox_spec: ("npc.myrmidon.strategian.hand_r", (-5.0, -2.0, -9.0)), + ), + right: ( + vox_spec: ("npc.myrmidon.strategian.hand_r", (0.0, -2.0, -9.0)), ) ), "Husk": ( diff --git a/assets/voxygen/voxel/biped_small_armor_head_manifest.ron b/assets/voxygen/voxel/biped_small_armor_head_manifest.ron index 053019375b..83b0f13b4f 100644 --- a/assets/voxygen/voxel/biped_small_armor_head_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_head_manifest.ron @@ -1,4 +1,4 @@ -(( + (( default: ( vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), ), @@ -6,14 +6,23 @@ "Gnome": ( vox_spec: ("npc.gnome.male.head", (-8.0, -6.5, -12.0)), ), - "Sahagin": ( - vox_spec: ("npc.sahagin.male.head", (-2.5, 0.0, -4.5)), + "SahaginSpearman": ( + vox_spec: ("npc.sahagin.spearman.head", (-2.5, 0.0, -4.5)), ), - "AdletSpear": ( - vox_spec: ("npc.adlet.male.spear.head", (-7.0, -4.5, -6.0)), + "SahaginSorcerer": ( + vox_spec: ("npc.sahagin.sorcerer.head", (-2.5, 0.0, -4.5)), ), - "AdletBow": ( - vox_spec: ("npc.adlet.male.bow.head", (-7.0, -4.5, -6.0)), + "SahaginSniper": ( + vox_spec: ("npc.sahagin.sniper.head", (-2.5, 0.0, -4.5)), + ), + "AdletHunter": ( + vox_spec: ("npc.adlet.hunter.head", (-7.0, -4.5, -6.0)), + ), + "AdletTracker": ( + vox_spec: ("npc.adlet.tracker.head", (-7.0, -4.5, -6.0)), + ), + "AdletIcepicker": ( + vox_spec: ("npc.adlet.icepicker.head", (-7.0, -4.5, -6.0)), ), "GnarlingMugger": ( vox_spec: ("npc.gnarling.mugger.head", (-6.5, -5.5, -4.5)), @@ -36,14 +45,32 @@ "Cactid": ( vox_spec: ("npc.cactid.male.head", (-8.0, -4.0, -7.5)), ), - "Gnoll": ( - vox_spec: ("npc.gnoll.male.head", (-4.0, -1.5, -3.0)), + "GnollRogue": ( + vox_spec: ("npc.gnoll.rogue.head", (-4.0, -1.5, -3.0)), ), - "Haniwa": ( - vox_spec: ("npc.haniwa.male.head", (-5.5, -5.5, -5.5)), + "GnollShaman": ( + vox_spec: ("npc.gnoll.shaman.head", (-4.0, -1.5, -3.0)), ), - "Myrmidon": ( - vox_spec: ("npc.myrmidon.male.head", (-4.5, -7.0, -6.5)), + "GnollTrapper": ( + vox_spec: ("npc.gnoll.trapper.head", (-4.0, -1.5, -3.0)), + ), + "HaniwaGuard": ( + vox_spec: ("npc.haniwa.guard.head", (-5.5, -5.5, -5.5)), + ), + "HaniwaArcher": ( + vox_spec: ("npc.haniwa.archer.head", (-5.5, -5.5, -5.5)), + ), + "HaniwaSoldier": ( + vox_spec: ("npc.haniwa.soldier.head", (-5.5, -5.5, -5.5)), + ), + "MyrmidonHoplite": ( + vox_spec: ("npc.myrmidon.hoplite.head", (-4.5, -7.0, -6.5)), + ), + "MyrmidonMarksman": ( + vox_spec: ("npc.myrmidon.marksman.head", (-4.5, -7.0, -6.5)), + ), + "MyrmidonStrategian": ( + vox_spec: ("npc.myrmidon.strategian.head", (-4.5, -7.0, -6.5)), ), "Husk": ( vox_spec: ("npc.husk.male.head", (-6.0, -6.0, -5.5)), diff --git a/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron b/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron index be8229dcbb..911ed93a92 100644 --- a/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron @@ -6,14 +6,23 @@ "Gnome": ( vox_spec: ("npc.gnome.male.pants", (-4.0, -3.5, -2.5)), ), - "Sahagin": ( - vox_spec: ("npc.sahagin.male.pants", (-2.5, -3.5, -2.0)), + "SahaginSpearman": ( + vox_spec: ("npc.sahagin.spearman.pants", (-2.5, -3.5, -2.0)), ), - "AdletSpear": ( - vox_spec: ("npc.adlet.male.spear.pants", (-5.0, -4.5, -3.0)), + "SahaginSorcerer": ( + vox_spec: ("npc.sahagin.sorcerer.pants", (-2.5, -3.5, -2.0)), ), - "AdletBow": ( - vox_spec: ("npc.adlet.male.bow.pants", (-5.0, -4.5, -3.0)), + "SahaginSniper": ( + vox_spec: ("npc.sahagin.sniper.pants", (-2.5, -3.5, -2.0)), + ), + "AdletHunter": ( + vox_spec: ("npc.adlet.hunter.pants", (-5.0, -4.5, -3.0)), + ), + "AdletTracker": ( + vox_spec: ("npc.adlet.tracker.pants", (-5.0, -4.5, -3.0)), + ), + "AdletIcepicker": ( + vox_spec: ("npc.adlet.icepicker.pants", (-5.0, -4.5, -3.0)), ), "GnarlingMugger": ( vox_spec: ("npc.gnarling.mugger.pants", (-3.5, -3.0, -2.5)), @@ -36,14 +45,32 @@ "Cactid": ( vox_spec: ("npc.cactid.male.pants", (-3.0, -2.0, -1.0)), ), - "Gnoll": ( - vox_spec: ("npc.gnoll.male.pants", (-5.0, -4.0, -3.0)), + "GnollRogue": ( + vox_spec: ("npc.gnoll.rogue.pants", (-5.0, -4.0, -3.0)), ), - "Haniwa": ( - vox_spec: ("npc.haniwa.male.pants", (-4.5, -4.5, -1.5)), + "GnollShaman": ( + vox_spec: ("npc.gnoll.shaman.pants", (-5.0, -4.0, -3.0)), ), - "Myrmidon": ( - vox_spec: ("npc.myrmidon.male.pants", (-2.5, -4.5, -1.5)), + "GnollTrapper": ( + vox_spec: ("npc.gnoll.trapper.pants", (-5.0, -4.0, -3.0)), + ), + "HaniwaGuard": ( + vox_spec: ("npc.haniwa.guard.pants", (-4.5, -4.5, -1.5)), + ), + "HaniwaArcher": ( + vox_spec: ("npc.haniwa.archer.pants", (-4.5, -4.5, -1.5)), + ), + "HaniwaSoldier": ( + vox_spec: ("npc.haniwa.soldier.pants", (-4.5, -4.5, -1.5)), + ), + "MyrmidonHoplite": ( + vox_spec: ("npc.myrmidon.hoplite.pants", (-2.5, -4.5, -1.5)), + ), + "MyrmidonMarksman": ( + vox_spec: ("npc.myrmidon.marksman.pants", (-2.5, -4.5, -1.5)), + ), + "MyrmidonStrategian": ( + vox_spec: ("npc.myrmidon.strategian.pants", (-2.5, -4.5, -1.5)), ), "Husk": ( vox_spec: ("npc.husk.male.pants", (-5.0, -4.5, -6.0)), diff --git a/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron b/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron index 1a4f56d496..73a64c39ec 100644 --- a/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron @@ -3,11 +3,23 @@ vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), ), map: { - "Sahagin": ( - vox_spec: ("npc.sahagin.male.tail", (-1.5, -13.0, -5.0)), + "SahaginSpearman": ( + vox_spec: ("npc.sahagin.spearman.tail", (-1.5, -13.0, -5.0)), ), - "Adlet": ( - vox_spec: ("npc.adlet.male.tail", (-1.0, -5.0, -1.0)), + "SahaginSorcerer": ( + vox_spec: ("npc.sahagin.sorcerer.tail", (-1.5, -13.0, -5.0)), + ), + "SahaginSniper": ( + vox_spec: ("npc.sahagin.sniper.tail", (-1.5, -13.0, -5.0)), + ), + "AdletHunter": ( + vox_spec: ("npc.adlet.hunter.tail", (-1.0, -5.0, -1.0)), + ), + "AdletTracker": ( + vox_spec: ("npc.adlet.tracker.tail", (-1.0, -5.0, -1.0)), + ), + "AdletIcepicker": ( + vox_spec: ("npc.adlet.icepicker.tail", (-1.0, -5.0, -1.0)), ), "GnarlingMugger": ( vox_spec: ("npc.gnarling.mugger.tail", (-1.5, -13.0, -3.0)), @@ -24,11 +36,23 @@ "Kappa": ( vox_spec: ("npc.kappa.male.tail", (-2.5, -10.0, -5.0)), ), - "Gnoll": ( - vox_spec: ("npc.gnoll.male.tail", (-1.0, -11.0, -1.0)), + "GnollRogue": ( + vox_spec: ("npc.gnoll.rogue.tail", (-1.0, -11.0, -1.0)), ), - "Myrmidon": ( - vox_spec: ("npc.myrmidon.male.tail", (-2.5, -7.0, -2.5)), + "GnollShaman": ( + vox_spec: ("npc.gnoll.shaman.tail", (-1.0, -11.0, -1.0)), + ), + "GnollTrapper": ( + vox_spec: ("npc.gnoll.trapper.tail", (-1.0, -11.0, -1.0)), + ), + "MyrmidonHoplite": ( + vox_spec: ("npc.myrmidon.hoplite.tail", (-2.5, -7.0, -2.5)), + ), + "MyrmidonMarksman": ( + vox_spec: ("npc.myrmidon.marksman.tail", (-2.5, -7.0, -2.5)), + ), + "MyrmidonStrategian": ( + vox_spec: ("npc.myrmidon.strategian.tail", (-2.5, -7.0, -2.5)), ), }, )) diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index c9a5e1f242..e01293f35e 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1103,80 +1103,80 @@ color: None ), //BIPEDSMALL - "common.items.npc_weapons.biped_small.adlet.adlet_bow": ( - vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)), - color: None - ), "common.items.npc_weapons.biped_small.gnarling.chieftain_staff": ( - vox_spec: ("weapon.biped_small.staff.chieftain_staff", (-0.5, -4.0, -4.0)), + vox_spec: ("weapon.biped_small.staff.chieftain", (-0.5, -4.0, -4.0)), color: None ), "common.items.npc_weapons.biped_small.gnarling.blowgun": ( - vox_spec: ("weapon.biped_small.blowgun", (-2.5, -2.5, -1.5)), + vox_spec: ("weapon.biped_small.blowgun.stalker", (-2.5, -2.5, -1.5)), color: None ), "common.items.npc_weapons.biped_small.gnarling.axe": ( - vox_spec: ("weapon.biped_small.axe.axe", (-0.5, -3.0, -4.0)), + 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", (-0.5, -4.5, -0.0)), + vox_spec: ("weapon.biped_small.dagger.dagger", (-0.5, -4.5, -0.0)), color: None ), - "common.items.npc_weapons.biped_small.adlet.gnoll_staff": ( - vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.adlet.hunter": ( + vox_spec: ("weapon.biped_small.spear.hunter", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.adlet.wooden_spear": ( - vox_spec: ("weapon.biped_small.spear.adlet", (-0.5, -3.0, -4.0)), + "common.items.npc_weapons.biped_small.adlet.icepicker": ( + vox_spec: ("weapon.biped_small.axe.icepicker", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.adlet_bow": ( - vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)), + "common.items.npc_weapons.biped_small.adlet.tracker": ( + vox_spec: ("weapon.biped_small.bow.tracker", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.gnoll_staff": ( - vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.gnoll.rogue": ( + vox_spec: ("weapon.biped_small.dagger.rogue", (-0.5, -4.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.gnarling.wooden_spear": ( - vox_spec: ("weapon.biped_small.spear.adlet", (-0.5, -3.0, -4.0)), + "common.items.npc_weapons.biped_small.gnoll.trapper": ( + vox_spec: ("weapon.biped_small.blowgun.trapper", (-0.5, -4.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.sahagin.adlet_bow": ( - vox_spec: ("weapon.biped_small.bow.sahagin", (-0.5, -5.5, -9.5)), + "common.items.npc_weapons.biped_small.gnoll.shaman": ( + vox_spec: ("weapon.biped_small.staff.shaman", (-0.5, -4.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.sahagin.gnoll_staff": ( - vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.sahagin.sniper": ( + vox_spec: ("weapon.biped_small.bow.sniper", (-0.5, -5.5, -9.5)), color: None ), - "common.items.npc_weapons.biped_small.sahagin.wooden_spear": ( - vox_spec: ("weapon.biped_small.spear.sahagin", (-0.5, -3.0, -4.0)), + "common.items.npc_weapons.biped_small.sahagin.sorcerer": ( + vox_spec: ("weapon.biped_small.staff.sorcerer", (-0.5, -4.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.haniwa.adlet_bow": ( - vox_spec: ("weapon.biped_small.bow.haniwa", (-0.5, -4.5, -10.5)), + "common.items.npc_weapons.biped_small.sahagin.spearman": ( + vox_spec: ("weapon.biped_small.spear.spearman", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.haniwa.gnoll_staff": ( - vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.haniwa.guard": ( + vox_spec: ("weapon.biped_small.spear.guard", (-0.5, -4.5, -10.5)), color: None ), - "common.items.npc_weapons.biped_small.haniwa.wooden_spear": ( - vox_spec: ("weapon.biped_small.spear.haniwa", (-0.5, -3.0, -4.0)), + "common.items.npc_weapons.biped_small.haniwa.soldier": ( + vox_spec: ("weapon.biped_small.dagger.soldier", (-0.5, -4.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.myrmidon.adlet_bow": ( - vox_spec: ("weapon.biped_small.bow.myrmidon", (-0.5, -5.0, -10.5)), + "common.items.npc_weapons.biped_small.haniwa.archer": ( + vox_spec: ("weapon.biped_small.bow.archer", (-0.5, -3.0, -4.0)), color: None ), - "common.items.npc_weapons.biped_small.myrmidon.gnoll_staff": ( - vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)), + "common.items.npc_weapons.biped_small.myrmidon.hoplite": ( + vox_spec: ("weapon.biped_small.spear.hoplite", (-0.5, -5.0, -10.5)), color: None ), - "common.items.npc_weapons.biped_small.myrmidon.wooden_spear": ( - vox_spec: ("weapon.biped_small.spear.myrmidon", (-0.5, -2.0, -4.0)), + "common.items.npc_weapons.biped_small.myrmidon.marksman": ( + vox_spec: ("weapon.biped_small.bow.marksman", (-0.5, -4.0, -4.0)), + color: None + ), + "common.items.npc_weapons.biped_small.myrmidon.strategian": ( + vox_spec: ("weapon.biped_small.axe.strategian", (-0.5, -2.0, -4.0)), color: None ), }) diff --git a/assets/voxygen/voxel/npc/adlet/hunter/chest.vox b/assets/voxygen/voxel/npc/adlet/hunter/chest.vox new file mode 100644 index 0000000000..5ba90ecd91 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed21307a67cc28e6aafa5bf2ce6ee4a4752008e60fbc8548440f4e6a97490490 +size 1688 diff --git a/assets/voxygen/voxel/npc/adlet/hunter/foot_r.vox b/assets/voxygen/voxel/npc/adlet/hunter/foot_r.vox new file mode 100644 index 0000000000..85761ae8bd --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:140005613af492f2512948842affbdfa290897e525d2234f2f1d2ca6e51221ab +size 1304 diff --git a/assets/voxygen/voxel/npc/adlet/hunter/hand_r.vox b/assets/voxygen/voxel/npc/adlet/hunter/hand_r.vox new file mode 100644 index 0000000000..78e8318248 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6a41f635f670b40d4f4d002c4a7cbf31f20b57d426ea4a275153529ef5cdd8d +size 1420 diff --git a/assets/voxygen/voxel/npc/adlet/hunter/head.vox b/assets/voxygen/voxel/npc/adlet/hunter/head.vox new file mode 100644 index 0000000000..26a71c9cec --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a936f5a25ab1b9dcc72f7824b00b743ae7866822cfc4764238bfa9419a5d9a0f +size 3336 diff --git a/assets/voxygen/voxel/npc/adlet/hunter/pants.vox b/assets/voxygen/voxel/npc/adlet/hunter/pants.vox new file mode 100644 index 0000000000..8cbfbfde97 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45ad1cf02069507286e9e45ae1a3f9a5739653b86ba40cd2327cfc833c1e9b7a +size 1904 diff --git a/assets/voxygen/voxel/npc/adlet/hunter/tail.vox b/assets/voxygen/voxel/npc/adlet/hunter/tail.vox new file mode 100644 index 0000000000..f4cf97a571 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/hunter/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:558e995b6496a667225c1b6083a986c1d975c71afed60fe52c88b95d33f5839d +size 1232 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/chest.vox b/assets/voxygen/voxel/npc/adlet/icepicker/chest.vox new file mode 100644 index 0000000000..fa3a803a9f --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7f3281106c0dc76552fa7408718b21916f61ee240a91962f58e9c0c67519da0 +size 1696 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/foot_r.vox b/assets/voxygen/voxel/npc/adlet/icepicker/foot_r.vox new file mode 100644 index 0000000000..41f63eda33 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:032378687f6327294054e504d32d6ddbdc1ff612ae7ef51735ae7891e53d6cc5 +size 1304 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/hand_r.vox b/assets/voxygen/voxel/npc/adlet/icepicker/hand_r.vox new file mode 100644 index 0000000000..13bc8eadef --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:920105066ee7cbe1e115d8cd7050d60b9ad494f6c9e5f46427dcd9cdd7545a55 +size 1420 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/head.vox b/assets/voxygen/voxel/npc/adlet/icepicker/head.vox new file mode 100644 index 0000000000..27b195e698 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28b559740fa5ea08c4fe2b61c8049ac70295433f25f4ed631b31442557747f60 +size 3328 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/pants.vox b/assets/voxygen/voxel/npc/adlet/icepicker/pants.vox new file mode 100644 index 0000000000..d83cb655d2 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d64743b82de2f8ffa8900ac226f48a623f96c3528ea78cb7adaa28efc81e7f2e +size 1896 diff --git a/assets/voxygen/voxel/npc/adlet/icepicker/tail.vox b/assets/voxygen/voxel/npc/adlet/icepicker/tail.vox new file mode 100644 index 0000000000..6588edda6f --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/icepicker/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddaae63b6539b83669ccbbc69cb08e53ef03dff7831b61984a1b1a7721303b14 +size 1232 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/chest.vox b/assets/voxygen/voxel/npc/adlet/tracker/chest.vox new file mode 100644 index 0000000000..27c9b3135d --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a4bfa627e7e6029ffe07381dc6cf1e988a48ce1ab2d8573e621600582ce4575 +size 1696 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/foot_r.vox b/assets/voxygen/voxel/npc/adlet/tracker/foot_r.vox new file mode 100644 index 0000000000..863135e5ef --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc2b6a0d80a1da420803bafd1595eddb5e18338d45d0c779e18df5ec386c7257 +size 1304 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/hand_r.vox b/assets/voxygen/voxel/npc/adlet/tracker/hand_r.vox new file mode 100644 index 0000000000..4061bb6228 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:078af24a2889ed8b7aab36687bae8149eaf71bbbaaec2154cf3a19ddb0030f7f +size 1420 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/head.vox b/assets/voxygen/voxel/npc/adlet/tracker/head.vox new file mode 100644 index 0000000000..d4e4579cf3 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38ab461be8fc63fd4dd334bf9a8b4613a779e9d4f910594c2a12b56ef0410578 +size 3384 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/pants.vox b/assets/voxygen/voxel/npc/adlet/tracker/pants.vox new file mode 100644 index 0000000000..f432762f32 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf54b7e40ab08b25f57dd934917d958e815f09fd02c5f627a212e705dece20e +size 1888 diff --git a/assets/voxygen/voxel/npc/adlet/tracker/tail.vox b/assets/voxygen/voxel/npc/adlet/tracker/tail.vox new file mode 100644 index 0000000000..2cdd320364 --- /dev/null +++ b/assets/voxygen/voxel/npc/adlet/tracker/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db142f6872bc74571bea9d591e36ff55d6850ac574bd14e8e9c1e9eb37b00ef0 +size 1232 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/chest.vox b/assets/voxygen/voxel/npc/gnoll/rogue/chest.vox new file mode 100644 index 0000000000..f3d99f28dd --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bc93f99f0ad1597498252ac7b2623ee0f08d6128e5ef0e5653f83f148af8fb8 +size 2772 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/foot_r.vox b/assets/voxygen/voxel/npc/gnoll/rogue/foot_r.vox new file mode 100644 index 0000000000..b7d4b68b6f --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa71305c032f22b836572ba73ac87f4c857ff6c86d7f3122208a7722816d3b81 +size 1304 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/hand_r.vox b/assets/voxygen/voxel/npc/gnoll/rogue/hand_r.vox new file mode 100644 index 0000000000..f6932b6a2f --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1917fae62d8a33173edba356ce4fa5512a87240b2f38180de81b4d3e0c35f1e7 +size 1628 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/head.vox b/assets/voxygen/voxel/npc/gnoll/rogue/head.vox new file mode 100644 index 0000000000..91b78bda1e --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c4193e010c234508884fdead8d7bb993a559a283e472b86e0a19208ad5146b2 +size 2048 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/pants.vox b/assets/voxygen/voxel/npc/gnoll/rogue/pants.vox new file mode 100644 index 0000000000..02dd6f48f5 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acbf81cd61ea17cdce3e10ab247fa10c5842738c52d064a817c4576453645518 +size 1776 diff --git a/assets/voxygen/voxel/npc/gnoll/rogue/tail.vox b/assets/voxygen/voxel/npc/gnoll/rogue/tail.vox new file mode 100644 index 0000000000..af80427304 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/rogue/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bcd1ea75f947526403c093b3c6d934db754ed214ee6e0c79b90ef0391f36939 +size 1308 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/chest.vox b/assets/voxygen/voxel/npc/gnoll/shaman/chest.vox new file mode 100644 index 0000000000..011328d74c --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7163208413705957344f4233b56aa72510fa662160e258e09083c01e8949cde +size 2772 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/foot_r.vox b/assets/voxygen/voxel/npc/gnoll/shaman/foot_r.vox new file mode 100644 index 0000000000..86afd9549c --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f390baf7a3aa02071801a26663437623cad95df274af6d9b412efe941ee86643 +size 1304 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/hand_r.vox b/assets/voxygen/voxel/npc/gnoll/shaman/hand_r.vox new file mode 100644 index 0000000000..dddd207c52 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:630ea50105b1ecbd46a5b6ae1bd4d727469378cd109e239c9e768be6e1d2740c +size 1628 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/head.vox b/assets/voxygen/voxel/npc/gnoll/shaman/head.vox new file mode 100644 index 0000000000..0a013fc6f6 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4af702f3b87606c966e366228feddd69a026eb1b08edbb9766ff4b51f0b58c0f +size 2048 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/pants.vox b/assets/voxygen/voxel/npc/gnoll/shaman/pants.vox new file mode 100644 index 0000000000..8c4ec9ffb8 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b409340dd18336240d3dc63b2032bb8af55bcb2771c4923ca87d8bdda4a5a5be +size 1776 diff --git a/assets/voxygen/voxel/npc/gnoll/shaman/tail.vox b/assets/voxygen/voxel/npc/gnoll/shaman/tail.vox new file mode 100644 index 0000000000..4a4c46f62f --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/shaman/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aa4826e7eedf264769fb28631a166ce826e150e2c21114bd011d8c4c55a843c +size 1308 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/chest.vox b/assets/voxygen/voxel/npc/gnoll/trapper/chest.vox new file mode 100644 index 0000000000..5342849cb5 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2b1af710605f037b22f9e597d3ba50011a56ddd37ef07e9568649fa22654fb +size 2772 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/foot_r.vox b/assets/voxygen/voxel/npc/gnoll/trapper/foot_r.vox new file mode 100644 index 0000000000..19787187b1 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a408d332e253d71c9f8c5d868565a543d2b029557eeec49bda63d4c2458b4eba +size 1304 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/hand_r.vox b/assets/voxygen/voxel/npc/gnoll/trapper/hand_r.vox new file mode 100644 index 0000000000..ac34af441c --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b04c8f1dae70593d409774cfa9c73b085e3443e6fc5807bd65e04f200151bec +size 1628 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/head.vox b/assets/voxygen/voxel/npc/gnoll/trapper/head.vox new file mode 100644 index 0000000000..203a96df4a --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6120578726c8cd3c6f5cdf761ccc804965a6f5b5cddb6c338530da327073d9da +size 2048 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/pants.vox b/assets/voxygen/voxel/npc/gnoll/trapper/pants.vox new file mode 100644 index 0000000000..c8a0ad97f4 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:751f583a7f983b9719f32102c82631a2bd7830efaf10361b6590cb8e5fc3531c +size 1776 diff --git a/assets/voxygen/voxel/npc/gnoll/trapper/tail.vox b/assets/voxygen/voxel/npc/gnoll/trapper/tail.vox new file mode 100644 index 0000000000..7db3f8054b --- /dev/null +++ b/assets/voxygen/voxel/npc/gnoll/trapper/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ac5db145f991089f5092b12d314fa8e2afbc9c98386e51124b4e0a259a369f6 +size 1308 diff --git a/assets/voxygen/voxel/npc/haniwa/archer/chest.vox b/assets/voxygen/voxel/npc/haniwa/archer/chest.vox new file mode 100644 index 0000000000..10f82dbcbc --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/archer/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5528c5c9a706235209bbc291922760c27d9f792d1a66af075261fe95a8663b36 +size 2292 diff --git a/assets/voxygen/voxel/npc/haniwa/archer/foot_r.vox b/assets/voxygen/voxel/npc/haniwa/archer/foot_r.vox new file mode 100644 index 0000000000..4d53ae3059 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/archer/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c29002945ee6f77445db847c2506f2bcf86aa5f28aa95874b2463d7e78d39e3c +size 1384 diff --git a/assets/voxygen/voxel/npc/haniwa/archer/hand_r.vox b/assets/voxygen/voxel/npc/haniwa/archer/hand_r.vox new file mode 100644 index 0000000000..44dcab944e --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/archer/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8995eaa4d9d35670d658a980ea6008110b001dbfddf8da1f2af22c5d59cf4715 +size 1400 diff --git a/assets/voxygen/voxel/npc/haniwa/archer/head.vox b/assets/voxygen/voxel/npc/haniwa/archer/head.vox new file mode 100644 index 0000000000..14ac6689d2 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/archer/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c07724a18b70d9f84ac4ea2c8d2cce645d27c1896caa56c2c932b4b42a870f +size 3436 diff --git a/assets/voxygen/voxel/npc/haniwa/archer/pants.vox b/assets/voxygen/voxel/npc/haniwa/archer/pants.vox new file mode 100644 index 0000000000..35cfc7d487 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/archer/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c169da5c16ee3ff2780232468b81d883fe278ae007f27d32c75e715a2aba879 +size 1624 diff --git a/assets/voxygen/voxel/npc/haniwa/guard/chest.vox b/assets/voxygen/voxel/npc/haniwa/guard/chest.vox new file mode 100644 index 0000000000..536c899da9 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/guard/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b434661180cc6cd400db64bc7537e4fcb08c25f40dbaa08040389a078d65d3 +size 2276 diff --git a/assets/voxygen/voxel/npc/haniwa/guard/foot_r.vox b/assets/voxygen/voxel/npc/haniwa/guard/foot_r.vox new file mode 100644 index 0000000000..8cf22819a3 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/guard/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee8a1ad5076858da808af18bb9c751b24710f5042b8cfb173f1adc6c2fb7d99f +size 1384 diff --git a/assets/voxygen/voxel/npc/haniwa/guard/hand_r.vox b/assets/voxygen/voxel/npc/haniwa/guard/hand_r.vox new file mode 100644 index 0000000000..b85deb405f --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/guard/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1316646c3f84bc05b9ed616bd285ea2c95a0c2d5e4fa60bfa2c0d99a845ea98 +size 1368 diff --git a/assets/voxygen/voxel/npc/haniwa/guard/head.vox b/assets/voxygen/voxel/npc/haniwa/guard/head.vox new file mode 100644 index 0000000000..9d9a377624 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/guard/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b92b013a7f9d5224793dd6c2c10baccb6e383701878d7594cd55d1386771b96 +size 3156 diff --git a/assets/voxygen/voxel/npc/haniwa/guard/pants.vox b/assets/voxygen/voxel/npc/haniwa/guard/pants.vox new file mode 100644 index 0000000000..7dee4665ab --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/guard/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d4192ce647fdfe801a5352569dbd40fd5a6a7230cd870e84dfe8c9ba055b91c +size 1628 diff --git a/assets/voxygen/voxel/npc/haniwa/soldier/chest.vox b/assets/voxygen/voxel/npc/haniwa/soldier/chest.vox new file mode 100644 index 0000000000..13ec26aa57 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/soldier/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1aa05137c55826c831c7b092254c253b03ac77c2cb9204959653417ba57770 +size 2292 diff --git a/assets/voxygen/voxel/npc/haniwa/soldier/foot_r.vox b/assets/voxygen/voxel/npc/haniwa/soldier/foot_r.vox new file mode 100644 index 0000000000..4d53ae3059 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/soldier/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c29002945ee6f77445db847c2506f2bcf86aa5f28aa95874b2463d7e78d39e3c +size 1384 diff --git a/assets/voxygen/voxel/npc/haniwa/soldier/hand_r.vox b/assets/voxygen/voxel/npc/haniwa/soldier/hand_r.vox new file mode 100644 index 0000000000..01188d0e2a --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/soldier/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:248fa0e40b774906bc0f69e47cf55537e64d4dbd57cdfd52535cf56bb79e15eb +size 1400 diff --git a/assets/voxygen/voxel/npc/haniwa/soldier/head.vox b/assets/voxygen/voxel/npc/haniwa/soldier/head.vox new file mode 100644 index 0000000000..e1453f386f --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/soldier/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1f2e6a09034e521633e280bb031e9b81186190579f33dd36aef31c84c973c3 +size 3236 diff --git a/assets/voxygen/voxel/npc/haniwa/soldier/pants.vox b/assets/voxygen/voxel/npc/haniwa/soldier/pants.vox new file mode 100644 index 0000000000..0fc2d885f7 --- /dev/null +++ b/assets/voxygen/voxel/npc/haniwa/soldier/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70c668356c06c2f9cf80d61dcbffe6add47fd650025bc9e79153677c6268cc02 +size 1624 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/chest.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/chest.vox new file mode 100644 index 0000000000..b3a55d706b --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:586350398255e5e3d7a987b89f583dade64592bacecaea0cd4b21b4255219c30 +size 1900 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/foot_r.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/foot_r.vox new file mode 100644 index 0000000000..a22d381b03 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40feed9186513be13e5c26346636c68468690f62630d71982cc8d65f3762a126 +size 1236 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/hand_r.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/hand_r.vox new file mode 100644 index 0000000000..bf25ad8fe8 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aba210266ebb33197ed4657417124b5a1908e5dad6bade7cd3d67e7276cdb6ec +size 1316 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/head.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/head.vox new file mode 100644 index 0000000000..1ab83b7662 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b86f09f66caacb3c39b7ef876cea97a260e77e34137207b93a36afb412a48333 +size 2312 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/pants.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/pants.vox new file mode 100644 index 0000000000..720d2e92f8 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68acd47455295149faba0562705a70323e75425ffd3c007c5041595409f8815c +size 1356 diff --git a/assets/voxygen/voxel/npc/myrmidon/hoplite/tail.vox b/assets/voxygen/voxel/npc/myrmidon/hoplite/tail.vox new file mode 100644 index 0000000000..2c09eae063 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/hoplite/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4283f17d89cc17bce78a261f79ead38232bdb2e81fbe9cb7059dc8967119df1c +size 1408 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/chest.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/chest.vox new file mode 100644 index 0000000000..27fb9e9145 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c39495d6a46eae12ac2d0d2bb2d21b74e76143e327f88bfd8155da1151cf5f4c +size 1900 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/foot_r.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/foot_r.vox new file mode 100644 index 0000000000..8c97769caf --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b67e1c37c7da0eb7c8376bc40b6a641ac4f8f6580de02b6010f94d5f6600a44 +size 1236 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/hand_r.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/hand_r.vox new file mode 100644 index 0000000000..b6077507d4 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a72ce2ad716eea20e5171ceebdc205b97eb6001b5d9b7702cb9a44349ada8f46 +size 1316 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/head.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/head.vox new file mode 100644 index 0000000000..b087196c16 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:605ac1a1c4fd128c8298b54aeeb520535c7d50c36eb7a0e2f1a75a566282a57d +size 2304 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/pants.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/pants.vox new file mode 100644 index 0000000000..06c4a49c50 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c23ff49682b8f57a6f574be501f87dd9f8821d6343e77bda042a4257ad7ba1d1 +size 1356 diff --git a/assets/voxygen/voxel/npc/myrmidon/marksman/tail.vox b/assets/voxygen/voxel/npc/myrmidon/marksman/tail.vox new file mode 100644 index 0000000000..e709a1a771 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/marksman/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c04a258aa2c512050dbe5a4cfd1981dfb688cf0b49dcf6bd2d13f4f6c372e47 +size 1408 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/chest.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/chest.vox new file mode 100644 index 0000000000..c67586bcef --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09a696cf1661786c799d127f419d709628be545008de44d3b11391018ea857ab +size 1900 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/foot_r.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/foot_r.vox new file mode 100644 index 0000000000..bba389a7f9 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bf63c7e95f3f5d6914149b8973f31817963a703198114342341cdead89ac566 +size 1236 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/hand_r.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/hand_r.vox new file mode 100644 index 0000000000..ecaf48b7de --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d458c6f82a3e38efdddaac100466f1ea8c29139496193734c858563149b4957b +size 1316 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/head.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/head.vox new file mode 100644 index 0000000000..092924db4f --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e793a45acbc02e04457f5f3d0ae4f6424c2d53627e2d57f2a8ae79ec09124cd6 +size 2284 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/pants.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/pants.vox new file mode 100644 index 0000000000..281a1f0bbf --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:926a653b2763dabef9b1a8fb9c7288406c53fbaaa50e4e3f420e7f13464819a5 +size 1356 diff --git a/assets/voxygen/voxel/npc/myrmidon/strategian/tail.vox b/assets/voxygen/voxel/npc/myrmidon/strategian/tail.vox new file mode 100644 index 0000000000..45838adbb6 --- /dev/null +++ b/assets/voxygen/voxel/npc/myrmidon/strategian/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3b5e06ca39f451174da33ad35772e21162cae2166f6b1be28908d42ad826a2b +size 1408 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/chest.vox b/assets/voxygen/voxel/npc/sahagin/sniper/chest.vox new file mode 100644 index 0000000000..c122d43bb3 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ded58526cf3d4082c53cd2aa98c5137a77295f1b85c7f04f85b8d40089363b27 +size 2940 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/foot_r.vox b/assets/voxygen/voxel/npc/sahagin/sniper/foot_r.vox new file mode 100644 index 0000000000..8b7ccddcde --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d0bab0a5c3b428847b94a0e055e02eb6d56318e492b8e0337e19b2a17e2c2a1 +size 1308 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/hand_r.vox b/assets/voxygen/voxel/npc/sahagin/sniper/hand_r.vox new file mode 100644 index 0000000000..5001243a1f --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f29a7a0df317ac8ff6c3bc65027890e3a524d3fc6753ed437e7c51e4d1fbebca +size 1476 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/head.vox b/assets/voxygen/voxel/npc/sahagin/sniper/head.vox new file mode 100644 index 0000000000..35e9510775 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12030b485489368dd57522e50ee734895e3dc28fd10d04b602fc72f5c9c15632 +size 1944 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/pants.vox b/assets/voxygen/voxel/npc/sahagin/sniper/pants.vox new file mode 100644 index 0000000000..a8af58fded --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e01fda91394fcf6ec7bc03481c4b98a40840baec6942b0143847ce12c8d6188 +size 1432 diff --git a/assets/voxygen/voxel/npc/sahagin/sniper/tail.vox b/assets/voxygen/voxel/npc/sahagin/sniper/tail.vox new file mode 100644 index 0000000000..9818b8c5a3 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sniper/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:702f04ac7ae54050192d8149a1bd41b8e4ef1fa5064df6753e75cd77fc0a61b1 +size 1400 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/chest.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/chest.vox new file mode 100644 index 0000000000..f954378023 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0784e64f7481bc801e2900164fe6c8dc00ddaf233a7cce41054a0c743ebb31a4 +size 2940 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/foot_r.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/foot_r.vox new file mode 100644 index 0000000000..ec2ba8cdc2 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf0c20772eecab5514586104c574749a0f500682d5d9e1bb0f634fede0ff12d1 +size 1308 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/hand_r.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/hand_r.vox new file mode 100644 index 0000000000..81c75fa1a1 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:620310c9ffe9be41bb3974ba71adcdcb5095e7b4262cb9ce5817326ddddcc9ee +size 1476 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/head.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/head.vox new file mode 100644 index 0000000000..f2f6f9550d --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045b6c06617c23dba5df0346fceac8eecc4fa9e71de0040724d30550ca9d5724 +size 1944 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/pants.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/pants.vox new file mode 100644 index 0000000000..803d84bd1f --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f018acf9096da73feff34df9f773b62abe0b8228e5dd4d29767f1c8d55abcc4 +size 1432 diff --git a/assets/voxygen/voxel/npc/sahagin/sorcerer/tail.vox b/assets/voxygen/voxel/npc/sahagin/sorcerer/tail.vox new file mode 100644 index 0000000000..e54730fdc7 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/sorcerer/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9ab092c4b6903e23d1e470fab7c90dc4cd4acb876503b944e240ec5686ad0a7 +size 1400 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/chest.vox b/assets/voxygen/voxel/npc/sahagin/spearman/chest.vox new file mode 100644 index 0000000000..357523d8bd --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc352e09cf8794c2bba919f140cca1f7cca2711185007967f7f0be15edc064d3 +size 2940 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/foot_r.vox b/assets/voxygen/voxel/npc/sahagin/spearman/foot_r.vox new file mode 100644 index 0000000000..d2d47e9093 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1efd97c277678acb0e88b8089f76212595dd90f57d82a634a3e3e527de77ff4c +size 1308 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox b/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox new file mode 100644 index 0000000000..d2d47e9093 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1efd97c277678acb0e88b8089f76212595dd90f57d82a634a3e3e527de77ff4c +size 1308 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/head.vox b/assets/voxygen/voxel/npc/sahagin/spearman/head.vox new file mode 100644 index 0000000000..fb70cb3805 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8835ff006584716a723a4a3b9b660a14999f18ae6e403bcdc780e4bf8adba6b +size 1880 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/pants.vox b/assets/voxygen/voxel/npc/sahagin/spearman/pants.vox new file mode 100644 index 0000000000..a48214f36f --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5720aee2e2d8cd40f6cd3014cd557f02f6050fbad180288f4088fe1aa62f9643 +size 1432 diff --git a/assets/voxygen/voxel/npc/sahagin/spearman/tail.vox b/assets/voxygen/voxel/npc/sahagin/spearman/tail.vox new file mode 100644 index 0000000000..882c6aed76 --- /dev/null +++ b/assets/voxygen/voxel/npc/sahagin/spearman/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6de1a8e65358dc9787a3c5b73cebf42f30abaf540f8e54eb5cde03eab48b90b +size 1400 diff --git a/assets/voxygen/voxel/weapon/biped_small/axe/icepicker.vox b/assets/voxygen/voxel/weapon/biped_small/axe/icepicker.vox new file mode 100644 index 0000000000..6fed643e50 --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/axe/icepicker.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb608e2296d37425fe92fd5b5c073bce575586620525354d2f00bbef7ca425d6 +size 1344 diff --git a/assets/voxygen/voxel/weapon/biped_small/axe/axe.vox b/assets/voxygen/voxel/weapon/biped_small/axe/logger.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/axe/axe.vox rename to assets/voxygen/voxel/weapon/biped_small/axe/logger.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/axe/strategian.vox b/assets/voxygen/voxel/weapon/biped_small/axe/strategian.vox new file mode 100644 index 0000000000..6e87d80b5e --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/axe/strategian.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93182b0287d4ae5bcba0986c60124b320ee05985a9e7c6022df238853390c086 +size 1488 diff --git a/assets/voxygen/voxel/weapon/biped_small/blowgun.vox b/assets/voxygen/voxel/weapon/biped_small/blowgun/stalker.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/blowgun.vox rename to assets/voxygen/voxel/weapon/biped_small/blowgun/stalker.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/blowgun/trapper.vox b/assets/voxygen/voxel/weapon/biped_small/blowgun/trapper.vox new file mode 100644 index 0000000000..817656132a --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/blowgun/trapper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ce214deb6984e2c12cbad79ffdb6263d6653597ec7c28e2dbe239eed59b08b4 +size 1304 diff --git a/assets/voxygen/voxel/weapon/biped_small/bow/haniwa.vox b/assets/voxygen/voxel/weapon/biped_small/bow/archer.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/bow/haniwa.vox rename to assets/voxygen/voxel/weapon/biped_small/bow/archer.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/bow/myrmidon.vox b/assets/voxygen/voxel/weapon/biped_small/bow/marksman.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/bow/myrmidon.vox rename to assets/voxygen/voxel/weapon/biped_small/bow/marksman.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/bow/sahagin.vox b/assets/voxygen/voxel/weapon/biped_small/bow/sniper.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/bow/sahagin.vox rename to assets/voxygen/voxel/weapon/biped_small/bow/sniper.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/bow/adlet.vox b/assets/voxygen/voxel/weapon/biped_small/bow/tracker.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/bow/adlet.vox rename to assets/voxygen/voxel/weapon/biped_small/bow/tracker.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/dagger.vox b/assets/voxygen/voxel/weapon/biped_small/dagger/mugger.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/dagger.vox rename to assets/voxygen/voxel/weapon/biped_small/dagger/mugger.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox b/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox new file mode 100644 index 0000000000..785f1254be --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c023704a29de12478f09dbb30a97342323fddcae8d8ccd8571ad28af9ee769a +size 1252 diff --git a/assets/voxygen/voxel/weapon/biped_small/dagger/soldier.vox b/assets/voxygen/voxel/weapon/biped_small/dagger/soldier.vox new file mode 100644 index 0000000000..3c8ad47644 --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/dagger/soldier.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e949a487b4cc4e07deea544b2e727ed26c461b19eaf31efbb5648a2b96049753 +size 1376 diff --git a/assets/voxygen/voxel/weapon/biped_small/spear/haniwa.vox b/assets/voxygen/voxel/weapon/biped_small/spear/guard.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/spear/haniwa.vox rename to assets/voxygen/voxel/weapon/biped_small/spear/guard.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/spear/myrmidon.vox b/assets/voxygen/voxel/weapon/biped_small/spear/hoplite.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/spear/myrmidon.vox rename to assets/voxygen/voxel/weapon/biped_small/spear/hoplite.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/spear/adlet.vox b/assets/voxygen/voxel/weapon/biped_small/spear/hunter.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/spear/adlet.vox rename to assets/voxygen/voxel/weapon/biped_small/spear/hunter.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/spear/sahagin.vox b/assets/voxygen/voxel/weapon/biped_small/spear/spearman.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/spear/sahagin.vox rename to assets/voxygen/voxel/weapon/biped_small/spear/spearman.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/staff/chieftain_staff.vox b/assets/voxygen/voxel/weapon/biped_small/staff/chieftain.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/staff/chieftain_staff.vox rename to assets/voxygen/voxel/weapon/biped_small/staff/chieftain.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/staff/gnoll.vox b/assets/voxygen/voxel/weapon/biped_small/staff/shaman.vox similarity index 100% rename from assets/voxygen/voxel/weapon/biped_small/staff/gnoll.vox rename to assets/voxygen/voxel/weapon/biped_small/staff/shaman.vox diff --git a/assets/voxygen/voxel/weapon/biped_small/staff/sorcerer.vox b/assets/voxygen/voxel/weapon/biped_small/staff/sorcerer.vox new file mode 100644 index 0000000000..e199af25bc --- /dev/null +++ b/assets/voxygen/voxel/weapon/biped_small/staff/sorcerer.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a51c5047f072c87dc8fb1eef31de43b3ea6b0d74ff0bd1e1faff83de59dfc94 +size 1332 diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 5058467fd8..abfff1c068 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -372,7 +372,7 @@ fn default_main_tool(body: &Body) -> Item { "common.items.npc_weapons.unique.husk", )), _ => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.biped_small.adlet.wooden_spear", + "common.items.npc_weapons.biped_small.adlet.hunter", )), }, Body::BirdLarge(bird_large) => match (bird_large.species, bird_large.body_type) { diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs index 42f5f534bd..dacd75eb08 100644 --- a/world/src/layer/spot.rs +++ b/world/src/layer/spot.rs @@ -456,9 +456,9 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { base_structures: Some("spots_general.igloo"), entity_radius: 2.0, entities: &[ - (3..5, "common.entity.dungeon.tier-1.spear"), - (3..5, "common.entity.dungeon.tier-1.bow"), - (2..3, "common.entity.dungeon.tier-1.staff"), + (3..5, "common.entity.dungeon.tier-1.hunter"), + (3..5, "common.entity.dungeon.tier-1.icepicker"), + (2..3, "common.entity.dungeon.tier-1.tracker"), ], }, Spot::PirateHideout => SpotConfig { diff --git a/world/src/site2/plot/dungeon.rs b/world/src/site2/plot/dungeon.rs index 571bade09e..9483cb87bf 100644 --- a/world/src/site2/plot/dungeon.rs +++ b/world/src/site2/plot/dungeon.rs @@ -697,9 +697,15 @@ 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 } }); @@ -713,9 +719,15 @@ 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 } }); @@ -729,9 +741,15 @@ 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 } }); @@ -745,9 +763,15 @@ 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 } });