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

Various tweaks to entities' EHP

Browse Source
This commit is contained in:
Uniior 2024-05-09 22:03:01 +00:00 committed by crabman
parent 999b09f9d4
commit d7d2e69d7d
31 changed files with 281 additions and 654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Hammer skill tree overhaul
- Recipe for orichalcum ingots changed to use new alchemical ingredients
- Refresh of voxel models for orichalcum armour
- Toned down the health of most wild entities.
### Removed

77
assets/common/item_i18n_manifest.ron
View File

@ -18,27 +18,6 @@
Simple(
"common.items.npc_armor.quadruped_low.dagon",
): "common-items-npc_armor-quadruped_low-dagon",
Simple(
"common.items.npc_armor.quadruped_low.generic",
): "common-items-npc_armor-quadruped_low-generic",
Simple(
"common.items.npc_armor.quadruped_low.shell",
): "common-items-npc_armor-quadruped_low-shell",
Simple(
"common.items.npc_armor.quadruped_low.basilisk",
): "common-items-npc_armor-quadruped_low-basilisk",
Simple(
"common.items.npc_armor.quadruped_low.crocodylia",
): "common-items-npc_armor-quadruped_low-crocodylia",
Simple(
"common.items.npc_armor.quadruped_low.drake",
): "common-items-npc_armor-quadruped_low-drake",
Simple(
"common.items.npc_armor.quadruped_low.sandshark",
): "common-items-npc_armor-quadruped_low-sandshark",
Simple(
"common.items.npc_armor.quadruped_low.snapper",
): "common-items-npc_armor-quadruped_low-snapper",
Simple(
"common.items.npc_armor.bird_large.phoenix",
): "common-items-npc_armor-bird_large-phoenix",
@ -570,63 +549,15 @@
Simple(
"common.items.npc_armor.chest.plate_red",
): "common-items-npc_armor-chest-plate_red",
Simple(
"common.items.npc_armor.arthropod.generic",
): "common-items-npc_armor-arthropod-generic",
Simple(
"common.items.npc_armor.arthropod.leafbeetle",
): "common-items-npc_armor-arthropod-leafbeetle",
Simple(
"common.items.npc_armor.arthropod.weevil",
): "common-items-npc_armor-arthropod-weevil",
Simple(
"common.items.npc_armor.quadruped_medium.frostfang",
): "common-items-npc_armor-quadruped_medium-frostfang",
Simple(
"common.items.npc_armor.quadruped_medium.roshwalr",
): "common-items-npc_armor-quadruped_medium-roshwalr",
Simple(
"common.items.npc_armor.quadruped_medium.claysteed",
): "common-items-npc_armor-quadruped_medium-claysteed",
Simple(
"common.items.npc_armor.quadruped_medium.bonerattler",
): "common-items-npc_armor-quadruped_medium-bonerattler",
"common.items.npc_armor.generic",
): "common-items-npc_armor-generic",
Simple(
"common.items.npc_armor.quadruped_medium.broad",
): "common-items-npc_armor-quadruped_medium-broad",
Simple(
"common.items.npc_armor.quadruped_medium.catoblepas",
): "common-items-npc_armor-quadruped_medium-catoblepas",
Simple(
"common.items.npc_armor.quadruped_medium.dreadhorn",
): "common-items-npc_armor-quadruped_medium-dreadhorn",
Simple(
"common.items.npc_armor.quadruped_medium.equus",
): "common-items-npc_armor-quadruped_medium-equus",
Simple(
"common.items.npc_armor.quadruped_medium.hirdrasil",
): "common-items-npc_armor-quadruped_medium-hirdrasil",
Simple(
"common.items.npc_armor.quadruped_medium.wolf",
): "common-items-npc_armor-quadruped_medium-wolf",
Simple(
"common.items.npc_armor.quadruped_small.boar",
): "common-items-npc_armor-quadruped_small-boar",
Simple(
"common.items.npc_armor.quadruped_small.hyena",
): "common-items-npc_armor-quadruped_small-hyena",
Simple(
"common.items.npc_armor.quadruped_small.mossysnail",
): "common-items-npc_armor-quadruped_small-mossysnail",
Simple(
"common.items.npc_armor.theropod.rugged",
): "common-items-npc_armor-theropod-rugged",
Simple(
"common.items.npc_armor.theropod.raptor",
): "common-items-npc_armor-theropod-raptor",
Simple(
"common.items.npc_armor.theropod.yale",
): "common-items-npc_armor-theropod-yale",
"common.items.npc_armor.generic_high",
): "common-items-npc_armor-generic_high",
Simple(
"common.items.npc_armor.back.backpack_blue",
): "armor-misc-back-backpack",

13
assets/common/items/npc_armor/arthropod/generic.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Arthropod Armor",
legacy_description: "Worn by arthropods.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(83.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: Legendary,
tags: [],
)

13
assets/common/items/npc_armor/arthropod/leafbeetle.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Leafbeetle Armor",
legacy_description: "Worn by arthropods.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(62.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Common,
tags: [],
)

13
assets/common/items/npc_armor/arthropod/weevil.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Weevil Armor",
legacy_description: "Worn by arthropods.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(40.0)),
poise_resilience: Some(Normal(5.0)),
)),
)),
quality: Common,
tags: [],
)

6
assets/common/items/npc_armor/quadruped_medium/hirdrasil.ron → assets/common/items/npc_armor/generic.ron
View File

@ -1,14 +1,12 @@
ItemDef(
legacy_name: "Hirdrasil's Blessing",
legacy_name: "NPC Generic",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(30.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(100),
)),
)),
quality: High,
quality: Common,
tags: [],
)

6
assets/common/items/npc_armor/quadruped_medium/frostfang.ron → assets/common/items/npc_armor/generic_high.ron
View File

@ -1,14 +1,12 @@
ItemDef(
legacy_name: "Frostfang's Thick Skin",
legacy_name: "NPC Generic High",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(60.0)),
poise_resilience: Some(Normal(2.0)),
energy_max: Some(10),
)),
)),
quality: Epic,
quality: Common,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/basilisk.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Basilisk Armor",
legacy_description: "Made up of heavy and thick plates.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(52.0)),
poise_resilience: Some(Normal(30.0)),
)),
)),
quality: Epic,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/crocodylia.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Crocodylia Armor",
legacy_description: "Scaly.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(36.0)),
poise_resilience: Some(Normal(15.0)),
)),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/drake.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Drake Armor",
legacy_description: "Adaptive to temperature.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(111.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/generic.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Quad Low Generic",
legacy_description: "Scaly.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(40.0)),
poise_resilience: Some(Normal(0.0)),
)),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/sandshark.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Sand Shark Armor",
legacy_description: "How is it on land?",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(44.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/shell.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Quad Low Shell",
legacy_description: "Shell.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(260.0)),
poise_resilience: Some(Normal(25.0)),
)),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_low/snapper.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Snapper Shell",
legacy_description: "'Tis but a shell.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(126.0)),
poise_resilience: Some(Normal(40.0)),
)),
)),
quality: High,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_medium/bonerattler.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Bonerattler Armor",
legacy_description: "Made out of its prey's bones to protect its supple hide.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(80.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Moderate,
tags: [],
)

14
assets/common/items/npc_armor/quadruped_medium/broad.ron
View File

@ -1,14 +0,0 @@
ItemDef(
legacy_name: "Quadruped Medium Generalised Armor",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(48.0)),
poise_resilience: Some(Normal(15.0)),
energy_max: Some(10),
)),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_medium/catoblepas.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Catoblepas Armor",
legacy_description: "Thick and rigid.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(166.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_medium/dreadhorn.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Dreadhorn Armor",
legacy_description: "Thick and rigid.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(52.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

14
assets/common/items/npc_armor/quadruped_medium/equus.ron
View File

@ -1,14 +0,0 @@
ItemDef(
legacy_name: "Horse Armor",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(20.0)),
poise_resilience: Some(Normal(5.0)),
energy_max: Some(10),
)),
)),
quality: Common,
tags: [],
)

14
assets/common/items/npc_armor/quadruped_medium/roshwalr.ron
View File

@ -1,14 +0,0 @@
ItemDef(
legacy_name: "Roshwalr's Thick Skin",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(75.0)),
poise_resilience: Some(Normal(2.0)),
energy_max: Some(10),
)),
)),
quality: Epic,
tags: [],
)

14
assets/common/items/npc_armor/quadruped_medium/wolf.ron
View File

@ -1,14 +0,0 @@
ItemDef(
legacy_name: "Wolf Armor",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(16.0)),
poise_resilience: Some(Normal(15.0)),
energy_max: Some(10),
)),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_small/boar.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Boar Armor",
legacy_description: "Worn by small beasties.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(20.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Common,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_small/hyena.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Hyena Armor",
legacy_description: "Worn by small beasties.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(48.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Common,
tags: [],
)

13
assets/common/items/npc_armor/quadruped_small/mossysnail.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Mossy Shell",
legacy_description: "The sturdy home of a lil fella.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(90.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Common,
tags: [],
)

13
assets/common/items/npc_armor/theropod/raptor.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Raptor Hide",
legacy_description: "stronk.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(49.0)),
poise_resilience: Some(Normal(15.0)),
)),
)),
quality: High,
tags: [],
)

13
assets/common/items/npc_armor/theropod/rugged.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Theropod Rugged",
legacy_description: "For big scary dinos.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(92.0)),
poise_resilience: Some(Normal(30.0)),
)),
)),
quality: Epic,
tags: [],
)

13
assets/common/items/npc_armor/theropod/yale.ron
View File

@ -1,13 +0,0 @@
ItemDef(
legacy_name: "Yale Armor",
legacy_description: "Floofy to to fend off the cold.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(5.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

69
assets/voxygen/i18n/en/item/armor/npc.ftl
View File

@ -535,86 +535,35 @@ common-items-npc_armor-biped_small-shamanic_spirit-hand-shamanic_spirit = Shaman
common-items-npc_armor-chest-plate_red = Iron Chestplate
.desc = A chestplate forged from iron.
common-items-npc_armor-arthropod-generic = Arthropod Armor
.desc = Worn by arthropods.
common-items-npc_armor-arthropod-leafbeetle = Leafbeetle Armor
.desc = Worn by arthropods.
common-items-npc_armor-arthropod-weevil = Weevil Armor
.desc = Worn by arthropods.
common-items-npc_armor-quadruped_low-basilisk = Basilisk Armor
.desc = Made up of heavy and thick plates.
common-items-npc_armor-quadruped_low-crocodylia = Crocodylia Armor
.desc = Scaly.
common-items-npc_armor-quadruped_low-dagon = Dagon's Scales
.desc = Rigid enough to withstand the pressure of the deep ocean.
common-items-npc_armor-quadruped_low-drake = Drake Armor
.desc = Adaptive to temperature.
common-items-npc_armor-quadruped_low-generic = Quad Low Generic
.desc = Scaly.
common-items-npc_armor-quadruped_low-sandshark = Sand Shark Armor
.desc = How is it on land?
common-items-npc_armor-quadruped_low-shell = Quad Low Shell
.desc = Shell.
common-items-npc_armor-quadruped_low-snapper = Snapper Shell
.desc = 'Tis but a shell.
common-items-npc_armor-quadruped_medium-bonerattler = Bonerattler Armor
.desc = Made out of its prey's bones to protect its supple hide.
common-items-npc_armor-quadruped_medium-tarasque = Tarasque Armor
.desc = testing123
common-items-npc_armor-quadruped_medium-broad = Quadruped Medium Generalised Armor
.desc = Testing123.
common-items-npc_armor-quadruped_medium-claysteed = Clay Steed's Thick Fur
.desc = testing123
common-items-npc_armor-quadruped_medium-catoblepas = Catoblepas Armor
.desc = Thick and rigid.
common-items-npc_armor-generic = NPC Generic
.desc = testing123
common-items-npc_armor-quadruped_medium-claysteed = Claysteeds's Thick Skin
.desc = Testing123.
common-items-npc_armor-quadruped_medium-dreadhorn = Dreadhorn Armor
.desc = Thick and rigid.
common-items-npc_armor-quadruped_medium-equus = Horse Armor
.desc = Testing123.
common-items-npc_armor-quadruped_medium-frostfang = Frostfang's Thick Skin
.desc = Testing123.
common-items-npc_armor-quadruped_medium-hirdrasil = Hirdrasil's Blessing
.desc = Testing123.
common-items-npc_armor-quadruped_medium-roshwalr = Roshwalr's Thick Skin
.desc = Testing123.
common-items-npc_armor-quadruped_medium-wolf = Wolf Armor
.desc = Testing123.
common-items-npc_armor-quadruped_small-boar = Boar Armor
.desc = Worn by small beasties.
common-items-npc_armor-quadruped_small-hyena = Hyena Armor
.desc = Worn by small beasties.
common-items-npc_armor-quadruped_small-mossysnail = Mossy Shell
.desc = The sturdy home of a lil fella.
common-items-npc_armor-theropod-raptor = Raptor Hide
.desc = Stronk.
common-items-npc_armor-generic_high = NPC Generic High
.desc = testing123
common-items-npc_armor-theropod-rugged = Theropod Rugged
.desc = Stronk.
common-items-npc_armor-theropod-yale = Yale Armor
.desc = Floofy to to fend off the cold.
.desc = For big scary dinos.
common-items-npc_armor-biped_large-cyclops = Cyclops Armor
.desc = Made of mysteries.

296
common/src/comp/body.rs
View File

@ -820,121 +820,142 @@ impl Body {
Body::Humanoid(_) => 100,
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
// T1
quadruped_small::Species::Boar => 60,
quadruped_small::Species::Holladon => 80,
quadruped_small::Species::MossySnail => 85,
quadruped_small::Species::Porcupine => 55,
quadruped_small::Species::Truffler => 130,
quadruped_small::Species::Batfox => 40,
quadruped_small::Species::Boar => 55,
quadruped_small::Species::Fox => 25,
quadruped_small::Species::Goat => 30,
quadruped_small::Species::Hare => 20,
quadruped_small::Species::Holladon => 25,
quadruped_small::Species::Jackalope => 30,
quadruped_small::Species::MossySnail => 15,
quadruped_small::Species::Porcupine => 25,
quadruped_small::Species::Sheep => 30,
quadruped_small::Species::TreantSapling => 20,
quadruped_small::Species::Truffler => 70,
// T2
quadruped_small::Species::Hyena => 90,
quadruped_small::Species::Hyena => 85,
// T0
quadruped_small::Species::Batfox => 15,
quadruped_small::Species::Beaver => 25,
quadruped_small::Species::Beaver => 20,
quadruped_small::Species::Cat => 25,
quadruped_small::Species::Dog => 30,
quadruped_small::Species::Fox => 15,
quadruped_small::Species::Goat => 15,
quadruped_small::Species::Hare => 15,
quadruped_small::Species::Jackalope => 30,
quadruped_small::Species::Pig => 15,
quadruped_small::Species::Quokka => 10,
quadruped_small::Species::Rabbit => 10,
quadruped_small::Species::Raccoon => 15,
quadruped_small::Species::Seal => 15,
quadruped_small::Species::TreantSapling => 55,
quadruped_small::Species::Sheep => 30,
quadruped_small::Species::Squirrel => 10,
quadruped_small::Species::Fungome => 15,
quadruped_small::Species::Pig => 25,
quadruped_small::Species::Quokka => 15,
quadruped_small::Species::Rabbit => 15,
quadruped_small::Species::Raccoon => 20,
quadruped_small::Species::Rat => 10,
quadruped_small::Species::Seal => 20,
quadruped_small::Species::Skunk => 20,
quadruped_small::Species::Turtle => 10,
_ => 5,
},
Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
// T1
quadruped_medium::Species::Antelope => 90,
quadruped_medium::Species::Donkey => 110,
quadruped_medium::Species::Horse => 100,
quadruped_medium::Species::Mouflon => 80,
quadruped_medium::Species::Zebra => 120,
quadruped_medium::Species::Alpaca => 55,
quadruped_medium::Species::Antelope => 70,
quadruped_medium::Species::Camel => 100,
quadruped_medium::Species::Cattle => 90,
quadruped_medium::Species::Deer => 55,
quadruped_medium::Species::Donkey => 65,
quadruped_medium::Species::Horse => 75,
quadruped_medium::Species::Llama => 65,
quadruped_medium::Species::Mouflon => 75,
quadruped_medium::Species::Zebra => 90,
// T2
quadruped_medium::Species::Barghest => 120,
quadruped_medium::Species::Bear => 210,
quadruped_medium::Species::Bristleback => 340,
quadruped_medium::Species::Bonerattler => 90,
quadruped_medium::Species::Cattle => 240,
quadruped_medium::Species::Frostfang => 110,
quadruped_medium::Species::Highland => 240,
quadruped_medium::Species::Kelpie => 155,
quadruped_medium::Species::Lion => 150,
quadruped_medium::Species::Moose => 160,
quadruped_medium::Species::Panda => 180,
quadruped_medium::Species::Saber => 150,
quadruped_medium::Species::Tarasque => 200,
quadruped_medium::Species::Tiger => 170,
quadruped_medium::Species::Tuskram => 200,
quadruped_medium::Species::Wolf => 95,
quadruped_medium::Species::Yak => 270,
quadruped_medium::Species::Bear => 240,
quadruped_medium::Species::Bristleback => 175,
quadruped_medium::Species::Bonerattler => 100,
quadruped_medium::Species::Frostfang => 185,
quadruped_medium::Species::Highland => 205,
quadruped_medium::Species::Kelpie => 150,
quadruped_medium::Species::Lion => 175,
quadruped_medium::Species::Moose => 265,
quadruped_medium::Species::Panda => 215,
quadruped_medium::Species::Saber => 210,
quadruped_medium::Species::Snowleopard => 175,
quadruped_medium::Species::Tiger => 205,
quadruped_medium::Species::Tuskram => 175,
quadruped_medium::Species::Wolf => 110,
quadruped_medium::Species::Yak => 215,
// T3A
quadruped_medium::Species::Akhlut => 520,
quadruped_medium::Species::Catoblepas => 350,
quadruped_medium::Species::Akhlut => 720,
quadruped_medium::Species::Catoblepas => 720,
quadruped_medium::Species::ClaySteed => 400,
quadruped_medium::Species::Dreadhorn => 570,
quadruped_medium::Species::Grolgar => 320,
quadruped_medium::Species::Hirdrasil => 850,
quadruped_medium::Species::Mammoth => 740,
quadruped_medium::Species::Ngoubou => 450,
quadruped_medium::Species::Roshwalr => 500,
quadruped_medium::Species::Dreadhorn => 690,
quadruped_medium::Species::Grolgar => 450,
quadruped_medium::Species::Hirdrasil => 480,
quadruped_medium::Species::Mammoth => 880,
quadruped_medium::Species::Ngoubou => 590,
quadruped_medium::Species::Roshwalr => 640,
quadruped_medium::Species::Tarasque => 370,
_ => 100,
},
Body::FishMedium(_) => 15,
Body::FishMedium(fish_medium) => match fish_medium.species {
// T2
fish_medium::Species::Marlin => 50,
fish_medium::Species::Icepike => 90,
},
Body::Dragon(_) => 500,
Body::BirdLarge(bird_large) => match bird_large.species {
bird_large::Species::Roc => 280,
// T3A
bird_large::Species::Cockatrice => 540,
bird_large::Species::Roc => 450,
// T3B
bird_large::Species::FlameWyvern
| bird_large::Species::CloudWyvern
| bird_large::Species::FrostWyvern
| bird_large::Species::SeaWyvern
| bird_large::Species::WealdWyvern => 1000,
bird_large::Species::Phoenix => 2000,
_ => 300,
},
Body::BirdMedium(bird_medium) => match bird_medium.species {
bird_medium::Species::SnowyOwl => 45,
bird_medium::Species::HornedOwl => 45,
bird_medium::Species::Duck => 10,
bird_medium::Species::Cockatiel => 10,
// T0
bird_medium::Species::Bat => 10,
bird_medium::Species::Chicken => 10,
bird_medium::Species::Bat => 20,
bird_medium::Species::Goose => 30,
bird_medium::Species::Peacock => 35,
bird_medium::Species::Penguin => 35,
bird_medium::Species::Eagle => 45,
bird_medium::Species::Parrot => 20,
bird_medium::Species::Crow => 20,
bird_medium::Species::Cockatiel => 10,
bird_medium::Species::Dodo => 20,
bird_medium::Species::Parakeet => 20,
bird_medium::Species::Duck => 10,
bird_medium::Species::Parakeet => 10,
bird_medium::Species::Peacock => 20,
bird_medium::Species::Penguin => 10,
bird_medium::Species::Puffin => 20,
bird_medium::Species::Toucan => 20,
// T1
bird_medium::Species::Crow => 15,
bird_medium::Species::Eagle => 35,
bird_medium::Species::Goose => 25,
bird_medium::Species::HornedOwl => 35,
bird_medium::Species::Parrot => 15,
bird_medium::Species::SnowyOwl => 35,
bird_medium::Species::Toucan => 15,
},
Body::FishSmall(fish_small) => match fish_small.species {
// T0
fish_small::Species::Clownfish => 5,
// T1
fish_small::Species::Piranha => 10,
},
Body::FishSmall(_) => 3,
Body::BipedLarge(biped_large) => match biped_large.species {
biped_large::Species::Ogre => 380,
biped_large::Species::Ogre => 320,
biped_large::Species::Cyclops => 1000,
biped_large::Species::Wendigo => 300,
biped_large::Species::Cavetroll => 340,
biped_large::Species::Mountaintroll => 340,
biped_large::Species::Swamptroll => 340,
biped_large::Species::Wendigo => 280,
biped_large::Species::Cavetroll => 240,
biped_large::Species::Mountaintroll => 240,
biped_large::Species::Swamptroll => 240,
biped_large::Species::Dullahan => 600,
biped_large::Species::Mindflayer => 1250,
biped_large::Species::Tidalwarrior => 1600,
biped_large::Species::Yeti => 1800,
biped_large::Species::Minotaur => 3000,
biped_large::Species::Harvester => 1500,
biped_large::Species::Blueoni => 340,
biped_large::Species::Redoni => 340,
biped_large::Species::Blueoni => 240,
biped_large::Species::Redoni => 240,
biped_large::Species::Huskbrute => 800,
biped_large::Species::Cultistwarlord => 250,
biped_large::Species::Cultistwarlock => 250,
biped_large::Species::Gigasfrost => 30000,
biped_large::Species::AdletElder => 1500,
biped_large::Species::Tursus => 320,
biped_large::Species::Tursus => 300,
biped_large::Species::SeaBishop => 550,
biped_large::Species::HaniwaGeneral => 600,
biped_large::Species::TerracottaBesieger
@ -986,65 +1007,66 @@ impl Body {
},
Body::Theropod(theropod) => match theropod.species {
// T1
theropod::Species::Dodarock => 85,
theropod::Species::Dodarock => 20,
// T2
theropod::Species::Axebeak => 275,
theropod::Species::Sunlizard => 210,
theropod::Species::Sandraptor => 110,
theropod::Species::Snowraptor => 110,
theropod::Species::Sunlizard => 110,
theropod::Species::Woodraptor => 110,
// T3A
theropod::Species::Yale => 680,
theropod::Species::Yale => 610,
// T3B
theropod::Species::Archaeos => 950,
theropod::Species::Ntouka => 1150,
theropod::Species::Odonto => 1350,
_ => 240,
theropod::Species::Archaeos => 880,
theropod::Species::Ntouka => 880,
theropod::Species::Odonto => 1320,
},
Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
// T1
quadruped_low::Species::Driggle => 40,
quadruped_low::Species::Pangolin => 40,
quadruped_low::Species::Driggle => 50,
quadruped_low::Species::Pangolin => 20,
quadruped_low::Species::Tortoise => 45,
// T2
quadruped_low::Species::Alligator => 420,
quadruped_low::Species::Asp => 330,
quadruped_low::Species::Crocodile => 380,
quadruped_low::Species::Deadwood => 220,
quadruped_low::Species::Elbst => 240,
quadruped_low::Species::Hakulaq => 330,
quadruped_low::Species::Monitor => 285,
quadruped_low::Species::SeaCrocodile => 450,
quadruped_low::Species::Tortoise => 120,
quadruped_low::Species::Alligator => 130,
quadruped_low::Species::Asp => 175,
quadruped_low::Species::Crocodile => 145,
quadruped_low::Species::Deadwood => 85,
quadruped_low::Species::Elbst => 145,
quadruped_low::Species::Hakulaq => 155,
quadruped_low::Species::Monitor => 95,
quadruped_low::Species::Salamander => 210,
quadruped_low::Species::SeaCrocodile => 180,
// T3A
quadruped_low::Species::Dagon => 1200,
quadruped_low::Species::Icedrake => 640,
quadruped_low::Species::Lavadrake => 460,
quadruped_low::Species::Maneater => 800,
quadruped_low::Species::Mossdrake => 720,
quadruped_low::Species::Rocksnapper => 380,
quadruped_low::Species::Reefsnapper => 390,
quadruped_low::Species::Icedrake => 340,
quadruped_low::Species::Lavadrake => 340,
quadruped_low::Species::Maneater => 510,
quadruped_low::Species::Mossdrake => 340,
quadruped_low::Species::Rocksnapper => 400,
quadruped_low::Species::Reefsnapper => 400,
quadruped_low::Species::Rootsnapper => 400,
quadruped_low::Species::Sandshark => 550,
quadruped_low::Species::Sandshark => 540,
// T3B
quadruped_low::Species::Basilisk => 1300,
quadruped_low::Species::Basilisk => 660,
quadruped_low::Species::Snaretongue => 1500,
_ => 70,
},
Body::Arthropod(arthropod) => match arthropod.species {
// T0
arthropod::Species::Emberfly => 10,
// T1
arthropod::Species::Dagonite => 70,
arthropod::Species::Leafbeetle => 125,
arthropod::Species::Weevil => 110,
arthropod::Species::Emberfly => 20,
arthropod::Species::Leafbeetle => 40,
arthropod::Species::Weevil => 40,
// T2
arthropod::Species::Cavespider => 320,
arthropod::Species::Tarantula => 440,
arthropod::Species::Cavespider => 170,
arthropod::Species::Hornbeetle => 170,
arthropod::Species::Moltencrawler => 145,
arthropod::Species::Mosscrawler => 145,
arthropod::Species::Sandcrawler => 145,
arthropod::Species::Stagbeetle => 170,
arthropod::Species::Tarantula => 155,
// T3A
arthropod::Species::Antlion => 540,
arthropod::Species::Blackwidow => 420,
arthropod::Species::Hornbeetle => 480,
arthropod::Species::Moltencrawler => 400,
arthropod::Species::Mosscrawler => 600,
arthropod::Species::Sandcrawler => 500,
arthropod::Species::Stagbeetle => 440,
arthropod::Species::Antlion => 480,
arthropod::Species::Blackwidow => 370,
},
Body::Ship(_) => 1000,
Body::Crustacean(_) => 40,
@ -1241,14 +1263,14 @@ impl Body {
match self {
Body::Humanoid(_) => 100,
Body::BipedLarge(biped_large) => match biped_large.species {
biped_large::Species::Mindflayer => 320,
biped_large::Species::Minotaur => 280,
biped_large::Species::Forgemaster => 250,
biped_large::Species::Gigasfrost => 800,
_ => 250,
biped_large::Species::Mindflayer => 390,
biped_large::Species::Minotaur => 340,
biped_large::Species::Forgemaster => 300,
biped_large::Species::Gigasfrost => 990,
_ => 300,
},
Body::BipedSmall(b) => match b.species {
biped_small::Species::IronDwarf | biped_small::Species::Flamekeeper => 250,
biped_small::Species::IronDwarf | biped_small::Species::Flamekeeper => 300,
_ => 100,
},
Body::BirdLarge(b) => match b.species {
@ -1256,12 +1278,12 @@ impl Body {
| bird_large::Species::FrostWyvern
| bird_large::Species::CloudWyvern
| bird_large::Species::SeaWyvern
| bird_large::Species::WealdWyvern => 185,
_ => 140,
| bird_large::Species::WealdWyvern => 220,
_ => 165,
},
Body::Golem(_) => 300,
Body::Golem(_) => 365,
Body::QuadrupedMedium(b) => match b.species {
quadruped_medium::Species::Bear | quadruped_medium::Species::Grolgar => 165,
quadruped_medium::Species::Bear | quadruped_medium::Species::Grolgar => 195,
quadruped_medium::Species::Cattle
| quadruped_medium::Species::Llama
| quadruped_medium::Species::Alpaca
@ -1273,8 +1295,8 @@ impl Body {
| quadruped_medium::Species::Horse
| quadruped_medium::Species::Kelpie
| quadruped_medium::Species::Hirdrasil
| quadruped_medium::Species::Antelope => 140,
quadruped_medium::Species::Deer => 120,
| quadruped_medium::Species::Antelope => 165,
quadruped_medium::Species::Deer => 140,
quadruped_medium::Species::Wolf
| quadruped_medium::Species::Tiger
| quadruped_medium::Species::Barghest
@ -1285,8 +1307,8 @@ impl Body {
| quadruped_medium::Species::Akhlut
| quadruped_medium::Species::Bristleback
| quadruped_medium::Species::Catoblepas
| quadruped_medium::Species::Lion => 160,
quadruped_medium::Species::Panda => 130,
| quadruped_medium::Species::Lion => 190,
quadruped_medium::Species::Panda => 150,
quadruped_medium::Species::Saber
| quadruped_medium::Species::Yak
| quadruped_medium::Species::Frostfang
@ -1294,18 +1316,18 @@ impl Body {
| quadruped_medium::Species::Tuskram
| quadruped_medium::Species::Mouflon
| quadruped_medium::Species::Roshwalr
| quadruped_medium::Species::Dreadhorn => 175,
quadruped_medium::Species::Mammoth | quadruped_medium::Species::Ngoubou => 195,
| quadruped_medium::Species::Dreadhorn => 205,
quadruped_medium::Species::Mammoth | quadruped_medium::Species::Ngoubou => 230,
},
Body::QuadrupedLow(b) => match b.species {
quadruped_low::Species::Dagon => 225,
quadruped_low::Species::Dagon => 270,
quadruped_low::Species::Crocodile
| quadruped_low::Species::Deadwood
| quadruped_low::Species::SeaCrocodile
| quadruped_low::Species::Alligator
| quadruped_low::Species::Sandshark
| quadruped_low::Species::Snaretongue
| quadruped_low::Species::Asp => 160,
| quadruped_low::Species::Asp => 190,
quadruped_low::Species::Tortoise
| quadruped_low::Species::Rocksnapper
| quadruped_low::Species::Rootsnapper
@ -1315,19 +1337,19 @@ impl Body {
| quadruped_low::Species::Lavadrake
| quadruped_low::Species::Icedrake
| quadruped_low::Species::Basilisk
| quadruped_low::Species::Mossdrake => 175,
| quadruped_low::Species::Mossdrake => 205,
quadruped_low::Species::Elbst
| quadruped_low::Species::Salamander
| quadruped_low::Species::Monitor
| quadruped_low::Species::Pangolin
| quadruped_low::Species::Driggle => 115,
| quadruped_low::Species::Driggle => 130,
},
Body::Theropod(b) => match b.species {
theropod::Species::Archaeos
| theropod::Species::Ntouka
| theropod::Species::Odonto => 200,
theropod::Species::Yale => 185,
_ => 165,
| theropod::Species::Odonto => 240,
theropod::Species::Yale => 220,
_ => 195,
},
_ => 100,
}

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

@ -1153,96 +1153,52 @@ impl LoadoutBuilder {
_ => None,
},
Body::QuadrupedLow(body) => match body.species {
quadruped_low::Species::Basilisk => {
Some("common.items.npc_armor.quadruped_low.basilisk")
},
quadruped_low::Species::Alligator
quadruped_low::Species::Sandshark
| quadruped_low::Species::Alligator
| quadruped_low::Species::Crocodile
| quadruped_low::Species::SeaCrocodile => {
Some("common.items.npc_armor.quadruped_low.crocodylia")
},
quadruped_low::Species::Sandshark => {
Some("common.items.npc_armor.quadruped_low.sandshark")
},
| quadruped_low::Species::SeaCrocodile
| quadruped_low::Species::Icedrake
| quadruped_low::Species::Lavadrake
| quadruped_low::Species::Mossdrake => Some("common.items.npc_armor.generic"),
quadruped_low::Species::Reefsnapper
| quadruped_low::Species::Rocksnapper
| quadruped_low::Species::Rootsnapper => {
Some("common.items.npc_armor.quadruped_low.snapper")
},
quadruped_low::Species::Icedrake
| quadruped_low::Species::Lavadrake
| quadruped_low::Species::Mossdrake => {
Some("common.items.npc_armor.quadruped_low.drake")
},
| quadruped_low::Species::Rootsnapper
| quadruped_low::Species::Tortoise
| quadruped_low::Species::Basilisk => Some("common.items.npc_armor.generic_high"),
quadruped_low::Species::Dagon => Some("common.items.npc_armor.quadruped_low.dagon"),
quadruped_low::Species::Tortoise => {
Some("common.items.npc_armor.quadruped_low.shell")
},
_ => Some("common.items.npc_armor.quadruped_low.generic"),
_ => None,
},
Body::QuadrupedMedium(body) => match body.species {
quadruped_medium::Species::Frostfang => {
Some("common.items.npc_armor.quadruped_medium.frostfang")
},
quadruped_medium::Species::Roshwalr => {
Some("common.items.npc_armor.quadruped_medium.roshwalr")
},
quadruped_medium::Species::Bonerattler => Some("common.items.npc_armor.generic"),
quadruped_medium::Species::Tarasque => Some("common.items.npc_armor.generic_high"),
quadruped_medium::Species::ClaySteed => {
Some("common.items.npc_armor.quadruped_medium.claysteed")
},
quadruped_medium::Species::Hirdrasil | quadruped_medium::Species::Akhlut => {
Some("common.items.npc_armor.quadruped_medium.hirdrasil")
},
quadruped_medium::Species::Catoblepas | quadruped_medium::Species::Ngoubou => {
Some("common.items.npc_armor.quadruped_medium.catoblepas")
},
quadruped_medium::Species::Dreadhorn | quadruped_medium::Species::Mammoth => {
Some("common.items.npc_armor.quadruped_medium.dreadhorn")
},
quadruped_medium::Species::Bonerattler | quadruped_medium::Species::Grolgar => {
Some("common.items.npc_armor.quadruped_medium.bonerattler")
},
quadruped_medium::Species::Antelope
| quadruped_medium::Species::Donkey
| quadruped_medium::Species::Deer
| quadruped_medium::Species::Horse
| quadruped_medium::Species::Kelpie
| quadruped_medium::Species::Zebra => {
Some("common.items.npc_armor.quadruped_medium.equus")
},
quadruped_medium::Species::Wolf => {
Some("common.items.npc_armor.quadruped_medium.wolf")
},
_ => Some("common.items.npc_armor.quadruped_medium.broad"),
_ => None,
},
Body::Theropod(body) => match body.species {
theropod::Species::Archaeos
| theropod::Species::Ntouka
| theropod::Species::Odonto => Some("common.items.npc_armor.theropod.rugged"),
theropod::Species::Yale => Some("common.items.npc_armor.theropod.yale"),
_ => Some("common.items.npc_armor.theropod.raptor"),
theropod::Species::Archaeos | theropod::Species::Ntouka => {
Some("common.items.npc_armor.generic")
},
theropod::Species::Dodarock => Some("common.items.npc_armor.generic_high"),
_ => None,
},
// TODO: Check over
Body::Arthropod(body) => match body.species {
arthropod::Species::Leafbeetle | arthropod::Species::Cavespider => {
Some("common.items.npc_armor.arthropod.leafbeetle")
},
arthropod::Species::Weevil => Some("common.items.npc_armor.arthropod.weevil"),
arthropod::Species::Moltencrawler
arthropod::Species::Blackwidow
| arthropod::Species::Cavespider
| arthropod::Species::Emberfly
| arthropod::Species::Moltencrawler
| arthropod::Species::Mosscrawler
| arthropod::Species::Sandcrawler => None,
_ => Some("common.items.npc_armor.arthropod.generic"),
| arthropod::Species::Sandcrawler
| arthropod::Species::Tarantula => None,
_ => Some("common.items.npc_armor.generic"),
},
Body::QuadrupedSmall(body) => match body.species {
quadruped_small::Species::Boar | quadruped_small::Species::Truffler => {
Some("common.items.npc_armor.quadruped_small.boar")
},
quadruped_small::Species::Hyena => {
Some("common.items.npc_armor.quadruped_small.hyena")
},
quadruped_small::Species::MossySnail => {
Some("common.items.npc_armor.quadruped_small.mossysnail")
},
quadruped_small::Species::Turtle
| quadruped_small::Species::Holladon
| quadruped_small::Species::TreantSapling
| quadruped_small::Species::MossySnail => Some("common.items.npc_armor.generic"),
_ => None,
},
_ => None,

75
server/src/migrations/V58__npc_armor.sql Normal file
View File

@ -0,0 +1,75 @@
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.arthropod.generic';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.arthropod.leafbeetle';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.arthropod.weevil';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.generic';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.crocodylia';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.sandshark';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.basilisk';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.drake';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.snapper';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_low.shell';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.bonerattler';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.broad';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.catoblepas';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.dreadhorn';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.hirdrasil';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.roshwalr';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.wolf';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.equus';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_medium.frostfang';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_small.boar';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_small.hyena';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.quadruped_small.mossysnail';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.theropod.raptor';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic_high'
WHERE item_definition_id = 'common.items.npc_armor.theropod.yale';
UPDATE item
SET item_definition_id = 'common.items.npc_armor.generic'
WHERE item_definition_id = 'common.items.npc_armor.theropod.rugged';