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

Changelog entry, better placeholder UI, remove test changes

Browse Source
This commit is contained in:
Sam 2024-04-28 19:34:59 -04:00
parent 06728c1865
commit 38df083e0c
8 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -1,6 +1,6 @@
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
rustflags = [ rustflags = [
"-C", "link-arg=-fuse-ld=mold", "-C", "link-arg=-fuse-ld=gold",
] ]
[target.x86_64-pc-windows-gnu] [target.x86_64-pc-windows-gnu]

3
.gitignore vendored
View File

@ -62,6 +62,9 @@ nix/result*
/result* /result*
/shell.nix /shell.nix
## KDE
.directory
# Programming and scripting languages # Programming and scripting languages
## Bash ## Bash

1
CHANGELOG.md
View File

@ -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). - Fireworks and bombs are (again) available from chests (Sahagin and above).
- Increased brinestone armor recipe cost and repair cost. - Increased brinestone armor recipe cost and repair cost.
- Hammer
### Removed ### Removed

2
assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron
View File

@ -15,4 +15,6 @@ Shockwave(
damage_kind: Crushing, damage_kind: Crushing,
specifier: Fire, specifier: Fire,
ori_rate: 1.0, ori_rate: 1.0,
timing: PostBuildup,
emit_outcome: true,
) )

2
assets/common/abilities/custom/irongolemfist/shockwave.ron
View File

@ -15,4 +15,6 @@ Shockwave(
damage_kind: Crushing, damage_kind: Crushing,
specifier: Fire, specifier: Fire,
ori_rate: 1.0, ori_rate: 1.0,
timing: PostBuildup,
emit_outcome: true,
) )

12
assets/common/entity/dungeon/cultist/cultist.ron
View File

@ -8,13 +8,13 @@
loadout: Inline(( loadout: Inline((
inherit: Asset("common.loadout.dungeon.cultist.cultist"), inherit: Asset("common.loadout.dungeon.cultist.cultist"),
active_hands: InHands((Choice([ active_hands: InHands((Choice([
// (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)), (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)),
// (4, Item("common.items.weapons.sword.cultist")), (4, Item("common.items.weapons.sword.cultist")),
// (2, Item("common.items.weapons.staff.cultist_staff")), (2, Item("common.items.weapons.staff.cultist_staff")),
(2, Item("common.items.weapons.hammer.cultist_purp_2h-0")), (2, Item("common.items.weapons.hammer.cultist_purp_2h-0")),
// (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: One)), (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: One)),
// (2, Item("common.items.weapons.bow.velorite")), (2, Item("common.items.weapons.bow.velorite")),
// (1, Item("common.items.weapons.sceptre.sceptre_velorite_0")), (1, Item("common.items.weapons.sceptre.sceptre_velorite_0")),
]), None)), ]), None)),
)), )),
items: [ items: [

BIN
assets/voxygen/element/ui/diary/hammer_bg.png (Stored with Git LFS)
View File

Binary file not shown.

40
voxygen/src/hud/diary.rs
View File

@ -1801,7 +1801,7 @@ impl<'a> Diary<'a> {
) -> Vec<Event> { ) -> Vec<Event> {
// Hammer // Hammer
Image::new(self.imgs.hammer_bg) 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) .mid_top_with_margin_on(state.ids.content_align, 65.0)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 1.0))) .color(Some(Color::Rgba(1.0, 1.0, 1.0, 1.0)))
.set(state.ids.hammer_bg, ui); .set(state.ids.hammer_bg, ui);
@ -1811,97 +1811,97 @@ impl<'a> Diary<'a> {
SkillIcon::Ability { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::ScornfulSwipe), skill: Skill::Hammer(HammerSkill::ScornfulSwipe),
ability_id: "common.abilities.hammer.scornful_swipe", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Tremor), skill: Skill::Hammer(HammerSkill::Tremor),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::VigorousBash), skill: Skill::Hammer(HammerSkill::VigorousBash),
ability_id: "common.abilities.hammer.vigorous_bash", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Retaliate), skill: Skill::Hammer(HammerSkill::Retaliate),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::SpineCracker), skill: Skill::Hammer(HammerSkill::SpineCracker),
ability_id: "common.abilities.hammer.spine_cracker", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Breach), skill: Skill::Hammer(HammerSkill::Breach),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::IronTempest), skill: Skill::Hammer(HammerSkill::IronTempest),
ability_id: "common.abilities.hammer.iron_tempest", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Upheaval), skill: Skill::Hammer(HammerSkill::Upheaval),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Thunderclap), skill: Skill::Hammer(HammerSkill::Thunderclap),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::SeismicShock), skill: Skill::Hammer(HammerSkill::SeismicShock),
ability_id: "common.abilities.hammer.seismic_shock", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::HeavyWhorl), skill: Skill::Hammer(HammerSkill::HeavyWhorl),
ability_id: "common.abilities.hammer.heavy_whorl", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Intercept), skill: Skill::Hammer(HammerSkill::Intercept),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::PileDriver), skill: Skill::Hammer(HammerSkill::PileDriver),
ability_id: "common.abilities.hammer.pile_driver", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::LungPummel), skill: Skill::Hammer(HammerSkill::LungPummel),
ability_id: "common.abilities.hammer.lung_pummel", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::HelmCrusher), skill: Skill::Hammer(HammerSkill::HelmCrusher),
ability_id: "common.abilities.hammer.helm_crusher", 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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Rampart), skill: Skill::Hammer(HammerSkill::Rampart),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Tenacity), skill: Skill::Hammer(HammerSkill::Tenacity),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Earthshaker), skill: Skill::Hammer(HammerSkill::Earthshaker),
ability_id: "common.abilities.hammer.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 { SkillIcon::Ability {
skill: Skill::Hammer(HammerSkill::Judgement), skill: Skill::Hammer(HammerSkill::Judgement),
ability_id: "common.abilities.hammer.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),
}, },
]; ];