From eaf87a53bb91675d00c2c75ee3ff09c654123e87 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 3 Jun 2021 21:38:39 -0500 Subject: [PATCH] Final tweaks. --- CHANGELOG.md | 1 + assets/common/items/npc_armor/biped_large/tidal_warrior.ron | 2 +- assets/voxygen/element/de_buffs/debuff_wet_0.png | 3 +++ common/src/comp/body.rs | 5 +++-- common/src/comp/body/object.rs | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 assets/voxygen/element/de_buffs/debuff_wet_0.png diff --git a/CHANGELOG.md b/CHANGELOG.md index b9459c0951..40a27cf9fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -119,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Reworked sprite rendering to vastly reduce the CPU work. Large sprite view distances are now much more performant. - Optimized rendering of quads (most of the graphics in the game) using an index buffer, decreasing the number of vertices that need to be processed by 33%. - Moved the rest of screenshot work into the background. Screenshoting no longer induces large pauses. +- Reworked tidal warrior to have unique attacks ### Removed diff --git a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron index 72e42d6cad..2e7980bbac 100644 --- a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron +++ b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Chest("Tidal Warrior"), stats: ( - protection: Normal(0.0), + protection: Normal(20.0), poise_resilience: Normal(0.0), ), )), diff --git a/assets/voxygen/element/de_buffs/debuff_wet_0.png b/assets/voxygen/element/de_buffs/debuff_wet_0.png new file mode 100644 index 0000000000..439b7b4476 --- /dev/null +++ b/assets/voxygen/element/de_buffs/debuff_wet_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f574db94ea127a30aae81f02d1ab1af8251ff35ce70fa47d745cb26e4c7c0882 +size 183 diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 6aaf2f7230..1a95d6c6d6 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -470,7 +470,7 @@ impl Body { biped_large::Species::Troll => 2400, biped_large::Species::Dullahan => 3000, biped_large::Species::Mindflayer => 12500, - biped_large::Species::Tidalwarrior => 2500, + biped_large::Species::Tidalwarrior => 16000, biped_large::Species::Yeti => 4000, biped_large::Species::Minotaur => 30000, biped_large::Species::Harvester => 3000, @@ -586,12 +586,12 @@ impl Body { biped_large::Species::Wendigo => 80, biped_large::Species::Troll => 60, biped_large::Species::Dullahan => 120, - biped_large::Species::Tidalwarrior => 90, biped_large::Species::Yeti => 80, biped_large::Species::Harvester => 80, // Boss enemies have their health set, not adjusted by level. biped_large::Species::Mindflayer => 0, biped_large::Species::Minotaur => 0, + biped_large::Species::Tidalwarrior => 0, _ => 100, }, Body::BipedSmall(_) => 10, @@ -649,6 +649,7 @@ impl Body { Body::BipedLarge(b) => match b.species { biped_large::Species::Mindflayer => 4.8, biped_large::Species::Minotaur => 3.2, + biped_large::Species::Tidalwarrior => 2.25, _ => 1.0, }, Body::Golem(g) => match g.species { diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 06c4e052e9..cf509fdc1c 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -353,6 +353,7 @@ impl Body { Body::BoltFire => Vec3::new(0.1, 0.1, 0.1), Body::Crossbow => Vec3::new(3.0, 3.0, 1.5), Body::HaniwaSentry => Vec3::new(0.8, 0.8, 1.4), + Body::SeaLantern => Vec3::new(0.5, 0.5, 1.0), _ => Vec3::broadcast(0.5), } }