diff --git a/.cargo/config b/.cargo/config index 89c3d55c3a..e78c87c91f 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,6 +1,6 @@ [target.x86_64-unknown-linux-gnu] rustflags = [ - "-C", "link-arg=-fuse-ld=mold", + "-C", "link-arg=-fuse-ld=gold", ] [target.x86_64-pc-windows-gnu] diff --git a/.gitignore b/.gitignore index c2123aca2b..3b7b529c2f 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,9 @@ nix/result* /result* /shell.nix +## KDE +.directory + # Programming and scripting languages ## Bash diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aa095e640..30378df87a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fireworks and bombs are (again) available from chests (Sahagin and above). - Increased brinestone armor recipe cost and repair cost. +- Hammer ### Removed diff --git a/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron b/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron index d63306dd5e..15c8d00237 100644 --- a/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron +++ b/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron @@ -15,4 +15,6 @@ Shockwave( damage_kind: Crushing, specifier: Fire, ori_rate: 1.0, + timing: PostBuildup, + emit_outcome: true, ) diff --git a/assets/common/abilities/custom/irongolemfist/shockwave.ron b/assets/common/abilities/custom/irongolemfist/shockwave.ron index 05d18a8c8f..4ff1901212 100644 --- a/assets/common/abilities/custom/irongolemfist/shockwave.ron +++ b/assets/common/abilities/custom/irongolemfist/shockwave.ron @@ -15,4 +15,6 @@ Shockwave( damage_kind: Crushing, specifier: Fire, ori_rate: 1.0, + timing: PostBuildup, + emit_outcome: true, ) diff --git a/assets/common/entity/dungeon/cultist/cultist.ron b/assets/common/entity/dungeon/cultist/cultist.ron index 2f042d911c..d011d4f444 100644 --- a/assets/common/entity/dungeon/cultist/cultist.ron +++ b/assets/common/entity/dungeon/cultist/cultist.ron @@ -8,13 +8,13 @@ loadout: Inline(( inherit: Asset("common.loadout.dungeon.cultist.cultist"), active_hands: InHands((Choice([ - // (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)), - // (4, Item("common.items.weapons.sword.cultist")), - // (2, Item("common.items.weapons.staff.cultist_staff")), + (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)), + (4, Item("common.items.weapons.sword.cultist")), + (2, Item("common.items.weapons.staff.cultist_staff")), (2, Item("common.items.weapons.hammer.cultist_purp_2h-0")), - // (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: One)), - // (2, Item("common.items.weapons.bow.velorite")), - // (1, Item("common.items.weapons.sceptre.sceptre_velorite_0")), + (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: One)), + (2, Item("common.items.weapons.bow.velorite")), + (1, Item("common.items.weapons.sceptre.sceptre_velorite_0")), ]), None)), )), items: [ diff --git a/assets/voxygen/element/ui/diary/hammer_bg.png b/assets/voxygen/element/ui/diary/hammer_bg.png index 0434dc4eec..21163ccf1f 100644 --- a/assets/voxygen/element/ui/diary/hammer_bg.png +++ b/assets/voxygen/element/ui/diary/hammer_bg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f5ab5dd7fd805d91eb2eca905a25aa7c757059fd559a39bb6513a4117f1ccd8 -size 4554 +oid sha256:6f7bdff4d178d7893e3074ee31e39dd40b1363c6c4c47467947e8db7c0c5e198 +size 5879 diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index f867830f8e..a2239b3d16 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -1801,7 +1801,7 @@ impl<'a> Diary<'a> { ) -> Vec { // Hammer Image::new(self.imgs.hammer_bg) - .wh([865.0, 600.0]) + .wh([924.0, 619.0]) .mid_top_with_margin_on(state.ids.content_align, 65.0) .color(Some(Color::Rgba(1.0, 1.0, 1.0, 1.0))) .set(state.ids.hammer_bg, ui); @@ -1811,97 +1811,97 @@ impl<'a> Diary<'a> { SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::ScornfulSwipe), ability_id: "common.abilities.hammer.scornful_swipe", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 492.0, 416.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 455.0, 424.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Tremor), ability_id: "common.abilities.hammer.tremor", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 418.0, 149.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 398.0, 172.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::VigorousBash), ability_id: "common.abilities.hammer.vigorous_bash", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 422.0, 282.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 398.0, 272.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Retaliate), ability_id: "common.abilities.hammer.retaliate", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 313.0, 87.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 122.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::SpineCracker), ability_id: "common.abilities.hammer.spine_cracker", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 311.0, 327.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 222.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Breach), ability_id: "common.abilities.hammer.breach", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 311.0, 214.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 322.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::IronTempest), ability_id: "common.abilities.hammer.iron_tempest", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 202.0, 216.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 170.0, 172.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Upheaval), ability_id: "common.abilities.hammer.upheaval", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 202.0, 343.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 170.0, 272.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Thunderclap), ability_id: "common.abilities.hammer.thunderclap", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 72.0, 218.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 56.0, 172.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::SeismicShock), ability_id: "common.abilities.hammer.seismic_shock", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 71.0, 336.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 56.0, 272.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::HeavyWhorl), ability_id: "common.abilities.hammer.heavy_whorl", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 417.0, 675.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 398.0, 576.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Intercept), ability_id: "common.abilities.hammer.intercept", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 421.0, 541.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 398.0, 676.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::PileDriver), ability_id: "common.abilities.hammer.pile_driver", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 312.0, 735.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 526.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::LungPummel), ability_id: "common.abilities.hammer.lung_pummel", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 310.0, 609.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 626.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::HelmCrusher), ability_id: "common.abilities.hammer.helm_crusher", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 310.0, 497.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 284.0, 726.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Rampart), ability_id: "common.abilities.hammer.rampart", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 201.0, 605.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 170.0, 576.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Tenacity), ability_id: "common.abilities.hammer.tenacity", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 201.0, 478.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 170.0, 676.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Earthshaker), ability_id: "common.abilities.hammer.earthshaker", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 71.0, 600.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 56.0, 576.0), }, SkillIcon::Ability { skill: Skill::Hammer(HammerSkill::Judgement), ability_id: "common.abilities.hammer.judgement", - position: TopLeftWithMarginsOn(state.ids.hammer_bg, 70.0, 481.0), + position: TopLeftWithMarginsOn(state.ids.hammer_bg, 56.0, 676.0), }, ];