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

Update sword_bg.png

Browse Source 
positioning, wording, more icons

positioning, first icons
This commit is contained in:
Monty Marz 2023-01-08 18:18:18 +01:00 committed by Sam
parent b3edc5f7c6
commit 6b5ae2b6fe
15 changed files with 78 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/skills/sword/basic_cross_cut.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/basic_double_slash.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/basic_mighty_strike.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/basic_thrust.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/cascade.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/crescent_slash.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/cross_cut.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/fell_strike.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/finisher.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/skewer.png (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

40
assets/voxygen/i18n/en/hud/ability.ftl
View File

@ -137,80 +137,80 @@ common-abilities-sword-cleaving_bladestorm = Bladestorm
common-abilities-sword-heavy_windmill_slash = Windmill Slash
.desc =
Double overhead swings that can heavily stagger
Use this ability to enter heavy stance
Enters heavy stance
common-abilities-sword-heavy_pommel_strike = Pommel Strike
.desc =
Concuss your foe with a blunt strike to the head
Use this ability to enter heavy stance
Enters heavy stance
common-abilities-sword-agile_quick_draw = Quick Draw
.desc =
Dash forward as you draw your blade for a quick attack
Use this ability to enter agile stance
Enters agile stance
common-abilities-sword-agile_feint = Feint
.desc =
Step to the side then back before striking
Use this ability to enter agile stance
Enters agile stance
common-abilities-sword-defensive_riposte = Riposte
.desc =
Parry a strike before instantly counter-attacking
Use this ability to enter defensive stance
Enters defensive stance
common-abilities-sword-defensive_disengage = Disengage
.desc =
Retreat backwards a step after striking
Use this ability to enter defensive stance
Enters defensive stance
common-abilities-sword-crippling_gouge = Gouge
.desc =
Inflict a lasting wound on your enemy that will continue to bleed
Use this ability to enter crippling stance
Enters crippling stance
common-abilities-sword-crippling_hamstring = Hamstring
.desc =
Injure the tendons of your foe, leaving them less maneuverable
Use this ability to enter crippling stance
Enters crippling stance
common-abilities-sword-cleaving_whirlwind_slice = Whirlwind Slice
.desc =
Strike all surrounding enemies with circular attacks
Use this ability to enter cleaving stance
Enters cleaving stance
common-abilities-sword-cleaving_earth_splitter = Earth Splitter
.desc =
Split the earth, if used while falling will have a much stronger impact
Use this ability to enter cleaving stance
Enters cleaving stance
common-abilities-sword-heavy_fortitude = Fortitude
.desc =
Increases stagger resistance and as you take more damage your attacks will be more staggering
Must be in heavy stance to use this ability
Requires heavy stance
common-abilities-sword-heavy_pillar_thrust = Pillar Thrust
.desc =
Stab your sword down through the enemy, all the way into the ground, is more powerful if used while falling
Must be in heavy stance to use this ability
Requires heavy stance
common-abilities-sword-agile_dancing_edge = Dancing Edge
.desc =
Move and attack more swiftly
Must be in agile stance to use this ability
Requires agile stance
common-abilities-sword-agile_flurry = Flurry
.desc =
Multiple rapid stabs
Must be in agile stance to use this ability
Requires agile stance
common-abilities-sword-defensive_stalwart_sword = Stalwart Sword
.desc =
Shrug off the brunt of attacks, incoming damage is reduced
Must be in defensive stance to use this ability
Requires defensive stance
common-abilities-sword-defensive_deflect = Deflect
.desc =
A swift enough maneuver to even block projectiles
Must be in defensive stance to use this ability
Requires defensive stance
common-abilities-sword-crippling_eviscerate = Eviscerate
.desc =
Shreds wounds further, deals more damage to crippled enemies
Must be in crippling stance to use this ability
Requires crippling stance
common-abilities-sword-crippling_bloody_gash = Bloody Gash
.desc =
Cruelly strike an already bleeding wound, does more damage to bleeding enemies
Must be in crippling stance to use this ability
Requires crippling stance
common-abilities-sword-cleaving_blade_fever = Blade Fever
.desc =
Attack more recklessly, increasing the power of your strikes while leaving yourself open to incoming attacks
Must be in cleaving stance to use this ability
Requires cleaving stance
common-abilities-sword-cleaving_sky_splitter = Sky Splitter
.desc =
A powerful strike that purportedly can even split the sky, but will split through enemies
Must be in cleaving stance to use this ability
Requires cleaving stance

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

@ -25,7 +25,6 @@ use conrod_core::{
};
use i18n::Localization;
use vek::*;
use client::{self, Client};
use common::{
combat,
@ -50,7 +49,6 @@ use common::{
consts::{ENERGY_PER_LEVEL, HP_PER_LEVEL},
};
use std::borrow::Cow;
const ART_SIZE: [f64; 2] = [320.0, 320.0];
widget_ids! {
@ -1152,7 +1150,7 @@ impl<'a> Widget for Diary<'a> {
Text::new(&ability_desc)
.top_left_with_margins_on(state.ids.abilities[id_index], 40.0, 110.0)
.font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(18))
.font_size(self.fonts.cyri.scale(13))
.color(TEXT_COLOR)
.w(text_width)
.graphics_for(state.ids.abilities[id_index])
@ -1591,142 +1589,143 @@ impl<'a> Diary<'a> {
// Sword
Image::new(self.imgs.sword_bg)
.wh([1350.0, 920.0])
.mid_top_with_margin_on(state.ids.content_align, 80.0)
.wh([933.0, 615.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.sword_bg, ui);
use PositionSpecifier::TopLeftWithMarginsOn;
let skill_buttons = &[
let skill_buttons
= &[
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CrescentSlash),
ability_id: "veloren.core.pseudo_abilities.sword.crescent_slash",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 760.0, 646.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 537.0, 429.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::FellStrike),
ability_id: "veloren.core.pseudo_abilities.sword.fell_strike",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 598.0, 820.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 527.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::Skewer),
ability_id: "veloren.core.pseudo_abilities.sword.skewer",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 460.0, 804.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 527.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::Cascade),
ability_id: "veloren.core.pseudo_abilities.sword.cascade",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 594.0, 490.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 332.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CrossCut),
ability_id: "veloren.core.pseudo_abilities.sword.cross_cut",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 454.0, 492.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 332.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::Finisher),
ability_id: "veloren.core.pseudo_abilities.sword.finisher",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 450.0, 644.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 263.0, 429.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::HeavyWindmillSlash),
ability_id: "common.abilities.sword.heavy_windmill_slash",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 656.0, 64.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 2.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::HeavyPommelStrike),
ability_id: "common.abilities.sword.heavy_pommel_strike",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 658.0, 222.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 91.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::AgileQuickDraw),
ability_id: "common.abilities.sword.agile_quick_draw",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 226.0, 564.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 384.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::AgileFeint),
ability_id: "common.abilities.sword.agile_feint",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 228.0, 696.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 472.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::DefensiveRiposte),
ability_id: "common.abilities.sword.defensive_riposte",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 594.0, 1062.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 766.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::DefensiveDisengage),
ability_id: "common.abilities.sword.defensive_disengage",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 592.0, 1194.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 457.0, 855.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CripplingGouge),
ability_id: "common.abilities.sword.crippling_gouge",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 162.0, 1050.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 766.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CripplingHamstring),
ability_id: "common.abilities.sword.crippling_hamstring",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 292.0, 1044.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 766.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CleavingWhirlwindSlice),
ability_id: "common.abilities.sword.cleaving_whirlwind_slice",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 166.0, 264.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 91.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CleavingEarthSplitter),
ability_id: "common.abilities.sword.cleaving_earth_splitter",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 320.0, 260.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 91.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::HeavyFortitude),
ability_id: "common.abilities.sword.heavy_fortitude",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 490.0, 60.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 2.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::HeavyPillarThrust),
ability_id: "common.abilities.sword.heavy_pillar_thrust",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 494.0, 230.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 91.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::AgileDancingEdge),
ability_id: "common.abilities.sword.agile_dancing_edge",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 100.0, 562.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 385.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::AgileFlurry),
ability_id: "common.abilities.sword.agile_flurry",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 106.0, 698.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 473.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::DefensiveStalwartSword),
ability_id: "common.abilities.sword.defensive_stalwart_sword",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 456.0, 1056.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 766.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::DefensiveDeflect),
ability_id: "common.abilities.sword.defensive_deflect",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 454.0, 1196.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 368.0, 855.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CripplingEviscerate),
ability_id: "common.abilities.sword.crippling_eviscerate",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 288.0, 1192.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 855.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CripplingBloodyGash),
ability_id: "common.abilities.sword.crippling_bloody_gash",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 158.0, 1190.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 855.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CleavingBladeFever),
ability_id: "common.abilities.sword.cleaving_blade_fever",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 160.0, 110.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 53.0, 2.0),
},
SkillIcon::Ability {
skill: Skill::Sword(SwordSkill::CleavingSkySplitter),
ability_id: "common.abilities.sword.cleaving_sky_splitter",
position: TopLeftWithMarginsOn(state.ids.sword_bg, 318.0, 110.0),
position: TopLeftWithMarginsOn(state.ids.sword_bg, 142.0, 2.0),
},
];

12
voxygen/src/hud/img_ids.rs
View File

@ -214,7 +214,7 @@ image_ids! {
sword_defensive_stance: "voxygen.element.skills.sword.defensive_stance",
sword_crippling_stance: "voxygen.element.skills.sword.crippling_stance",
sword_cleaving_stance: "voxygen.element.skills.sword.cleaving_stance",
sword_double_slash: "voxygen.element.skills.sword.double_slash",
sword_double_slash: "voxygen.element.skills.sword.basic_double_slash",
sword_basic_double_slash: "voxygen.element.skills.sword.basic_double_slash",
sword_heavy_double_slash: "voxygen.element.skills.sword.heavy_double_slash",
sword_agile_double_slash: "voxygen.element.skills.sword.agile_double_slash",
@ -229,35 +229,35 @@ image_ids! {
sword_crippling_deep_rend: "voxygen.element.skills.sword.crippling_deep_rend",
sword_cleaving_spiral_slash: "voxygen.element.skills.sword.cleaving_spiral_slash",
sword_crescent_slash: "voxygen.element.skills.sword.crescent_slash",
sword_basic_crescent_slash: "voxygen.element.skills.sword.basic_crescent_slash",
sword_basic_crescent_slash: "voxygen.element.skills.sword.crescent_slash",
sword_heavy_crescent_slash: "voxygen.element.skills.sword.heavy_crescent_slash",
sword_agile_crescent_slash: "voxygen.element.skills.sword.agile_crescent_slash",
sword_defensive_crescent_slash: "voxygen.element.skills.sword.defensive_crescent_slash",
sword_crippling_crescent_slash: "voxygen.element.skills.sword.crippling_crescent_slash",
sword_cleaving_crescent_slash: "voxygen.element.skills.sword.cleaving_crescent_slash",
sword_fell_strike: "voxygen.element.skills.sword.fell_strike",
sword_basic_fell_strike: "voxygen.element.skills.sword.basic_fell_strike",
sword_basic_fell_strike: "voxygen.element.skills.sword.fell_strike",
sword_heavy_fell_strike: "voxygen.element.skills.sword.heavy_fell_strike",
sword_agile_fell_strike: "voxygen.element.skills.sword.agile_fell_strike",
sword_defensive_fell_strike: "voxygen.element.skills.sword.defensive_fell_strike",
sword_crippling_fell_strike: "voxygen.element.skills.sword.crippling_fell_strike",
sword_cleaving_fell_strike: "voxygen.element.skills.sword.cleaving_fell_strike",
sword_skewer: "voxygen.element.skills.sword.skewer",
sword_basic_skewer: "voxygen.element.skills.sword.basic_skewer",
sword_basic_skewer: "voxygen.element.skills.sword.skewer",
sword_heavy_skewer: "voxygen.element.skills.sword.heavy_skewer",
sword_agile_skewer: "voxygen.element.skills.sword.agile_skewer",
sword_defensive_skewer: "voxygen.element.skills.sword.defensive_skewer",
sword_crippling_skewer: "voxygen.element.skills.sword.crippling_skewer",
sword_cleaving_skewer: "voxygen.element.skills.sword.cleaving_skewer",
sword_cascade: "voxygen.element.skills.sword.cascade",
sword_basic_cascade: "voxygen.element.skills.sword.basic_cascade",
sword_basic_cascade: "voxygen.element.skills.sword.cascade",
sword_heavy_cascade: "voxygen.element.skills.sword.heavy_cascade",
sword_agile_cascade: "voxygen.element.skills.sword.agile_cascade",
sword_defensive_cascade: "voxygen.element.skills.sword.defensive_cascade",
sword_crippling_cascade: "voxygen.element.skills.sword.crippling_cascade",
sword_cleaving_cascade: "voxygen.element.skills.sword.cleaving_cascade",
sword_cross_cut: "voxygen.element.skills.sword.cross_cut",
sword_basic_cross_cut: "voxygen.element.skills.sword.basic_cross_cut",
sword_basic_cross_cut: "voxygen.element.skills.sword.cross_cut",
sword_heavy_cross_cut: "voxygen.element.skills.sword.heavy_cross_cut",
sword_agile_cross_cut: "voxygen.element.skills.sword.agile_cross_cut",
sword_defensive_cross_cut: "voxygen.element.skills.sword.defensive_cross_cut",

2
voxygen/src/hud/skillbar.rs
View File

@ -932,7 +932,7 @@ impl<'a> Skillbar<'a> {
background_color: None,
content_size: ContentSize {
width_height_ratio: 1.0,
max_fraction: 0.8, /* Changes the item image size by setting a maximum fraction
max_fraction: 0.9, /* Changes the item image size by setting a maximum fraction
* of either the width or height */
},
selected_content_scale: 1.0,