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

icons and naming

Browse Source
This commit is contained in:
Monty Marz 2021-06-09 21:07:34 +02:00 committed by Avi Weinstock
parent 43b6780c98
commit 01a04a80fa
17 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/voxygen/element/weapons/pickaxe.png → assets/voxygen/element/skills/pickaxe.png
View File

BIN
assets/voxygen/element/weapons/axe.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/weapons/bow.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/weapons/daggers.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/weapons/hammer.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/weapons/mining.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/weapons/staff.png (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

1
assets/voxygen/i18n/en/common.ron
View File

@ -78,6 +78,7 @@ Is the client up to date?"#,
"common.tool.debug": "Debug", "common.tool.debug": "Debug",
"common.tool.faming": "Farming Tool", "common.tool.faming": "Farming Tool",
"common.tool.pick": "Pickaxe", "common.tool.pick": "Pickaxe",
"common.tool.mining": "Mining",
"common.kind.modular_component": "Modular Component", "common.kind.modular_component": "Modular Component",
"common.kind.glider": "Glider", "common.kind.glider": "Glider",
"common.kind.consumable": "Consumable", "common.kind.consumable": "Consumable",

3
assets/voxygen/i18n/en/skills.ron
View File

@ -238,7 +238,8 @@
"hud.skill.axe_leap_cost": "Decreases cost of leap by 25%{SP}", "hud.skill.axe_leap_cost": "Decreases cost of leap by 25%{SP}",
"hud.skill.axe_leap_distance_title": "Leap Distance", "hud.skill.axe_leap_distance_title": "Leap Distance",
"hud.skill.axe_leap_distance": "Increases distance of leap by 20%{SP}", "hud.skill.axe_leap_distance": "Increases distance of leap by 20%{SP}",
// Pick // Mining
"hud.skill.mining_title": "Mining",
"hud.skill.pick_strike_title": "Pickaxe Strike", "hud.skill.pick_strike_title": "Pickaxe Strike",
"hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore and gems and experience", "hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore and gems and experience",
"hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed", "hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed",

2
common/src/comp/ability.rs
View File

@ -1175,7 +1175,7 @@ impl CharacterAbility {
} }
}, },
Some(ToolKind::Pick) => { Some(ToolKind::Pick) => {
use skills::PickSkill::*; use skills::MiningSkill::*;
if let BasicMelee { if let BasicMelee {
ref mut buildup_duration, ref mut buildup_duration,
ref mut swing_duration, ref mut swing_duration,

4
common/src/comp/skills.rs
View File

@ -107,7 +107,7 @@ pub enum Skill {
Roll(RollSkill), Roll(RollSkill),
Climb(ClimbSkill), Climb(ClimbSkill),
Swim(SwimSkill), Swim(SwimSkill),
Pick(PickSkill), Pick(MiningSkill),
} }
pub enum SkillError { pub enum SkillError {
@ -265,7 +265,7 @@ pub enum SwimSkill {
} }
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
pub enum PickSkill { pub enum MiningSkill {
Speed, Speed,
OreGain, OreGain,
GemGain, GemGain,

6
server/src/events/interaction.rs
View File

@ -334,13 +334,13 @@ pub fn handle_mine_block(
exp: *exp_reward, exp: *exp_reward,
}); });
} }
use common::comp::skills::{PickSkill, Skill}; use common::comp::skills::{MiningSkill, Skill};
use rand::Rng; use rand::Rng;
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
if item.item_definition_id().contains("mineral.ore.") if item.item_definition_id().contains("mineral.ore.")
&& rng.gen_bool( && rng.gen_bool(
0.05 * skillset 0.05 * skillset
.skill_level(Skill::Pick(PickSkill::OreGain)) .skill_level(Skill::Pick(MiningSkill::OreGain))
.ok() .ok()
.flatten() .flatten()
.unwrap_or(0) as f64, .unwrap_or(0) as f64,
@ -351,7 +351,7 @@ pub fn handle_mine_block(
if item.item_definition_id().contains("mineral.gem.") if item.item_definition_id().contains("mineral.gem.")
&& rng.gen_bool( && rng.gen_bool(
0.05 * skillset 0.05 * skillset
.skill_level(Skill::Pick(PickSkill::GemGain)) .skill_level(Skill::Pick(MiningSkill::GemGain))
.ok() .ok()
.flatten() .flatten()
.unwrap_or(0) as f64, .unwrap_or(0) as f64,

16
server/src/persistence/json_models.rs
View File

@ -40,7 +40,7 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String {
use comp::{ use comp::{
item::tool::ToolKind, item::tool::ToolKind,
skills::{ skills::{
AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill,
SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill,
}, },
}; };
@ -135,9 +135,9 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String {
Climb(ClimbSkill::Cost) => "Climb Cost", Climb(ClimbSkill::Cost) => "Climb Cost",
Climb(ClimbSkill::Speed) => "Climb Speed", Climb(ClimbSkill::Speed) => "Climb Speed",
Swim(SwimSkill::Speed) => "Swim Speed", Swim(SwimSkill::Speed) => "Swim Speed",
Pick(PickSkill::Speed) => "Pick Speed", Pick(MiningSkill::Speed) => "Pick Speed",
Pick(PickSkill::OreGain) => "Pick OreGain", Pick(MiningSkill::OreGain) => "Pick OreGain",
Pick(PickSkill::GemGain) => "Pick GemGain", Pick(MiningSkill::GemGain) => "Pick GemGain",
UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)) => "Unlock Weapon Sword", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)) => "Unlock Weapon Sword",
UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)) => "Unlock Weapon Axe", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)) => "Unlock Weapon Axe",
UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)) => "Unlock Weapon Hammer", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)) => "Unlock Weapon Hammer",
@ -163,7 +163,7 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill {
use comp::{ use comp::{
item::tool::ToolKind, item::tool::ToolKind,
skills::{ skills::{
AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill,
SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill,
}, },
}; };
@ -258,9 +258,9 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill {
"Climb Cost" => Climb(ClimbSkill::Cost), "Climb Cost" => Climb(ClimbSkill::Cost),
"Climb Speed" => Climb(ClimbSkill::Speed), "Climb Speed" => Climb(ClimbSkill::Speed),
"Swim Speed" => Swim(SwimSkill::Speed), "Swim Speed" => Swim(SwimSkill::Speed),
"Pick Speed" => Pick(PickSkill::Speed), "Pick Speed" => Pick(MiningSkill::Speed),
"Pick GemGain" => Pick(PickSkill::GemGain), "Pick GemGain" => Pick(MiningSkill::GemGain),
"Pick OreGain" => Pick(PickSkill::OreGain), "Pick OreGain" => Pick(MiningSkill::OreGain),
"Unlock Weapon Sword" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)), "Unlock Weapon Sword" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)),
"Unlock Weapon Axe" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)), "Unlock Weapon Axe" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)),
"Unlock Weapon Hammer" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)), "Unlock Weapon Hammer" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)),

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

@ -240,7 +240,7 @@ const TREES: [&str; 8] = [
"Sceptre", "Sceptre",
"Bow", "Bow",
"Fire Staff", "Fire Staff",
"Pickaxe", "Mining",
]; ];
pub enum Event { pub enum Event {
@ -359,7 +359,7 @@ impl<'a> Widget for Diary<'a> {
"Sceptre" => self.imgs.sceptre, "Sceptre" => self.imgs.sceptre,
"Bow" => self.imgs.bow, "Bow" => self.imgs.bow,
"Fire Staff" => self.imgs.staff, "Fire Staff" => self.imgs.staff,
"Pickaxe" => self.imgs.pickaxe, "Mining" => self.imgs.mining,
_ => self.imgs.nothing, _ => self.imgs.nothing,
}); });
@ -508,7 +508,7 @@ impl<'a> Widget for Diary<'a> {
self.localized_strings.get("common.weapons.staff") self.localized_strings.get("common.weapons.staff")
}, },
SelectedSkillTree::Weapon(ToolKind::Pick) => { SelectedSkillTree::Weapon(ToolKind::Pick) => {
self.localized_strings.get("common.tool.pick") self.localized_strings.get("common.tool.mining")
}, },
_ => "Unknown", _ => "Unknown",
}; };
@ -1988,8 +1988,8 @@ impl<'a> Widget for Diary<'a> {
); );
}, },
SelectedSkillTree::Weapon(ToolKind::Pick) => { SelectedSkillTree::Weapon(ToolKind::Pick) => {
use skills::PickSkill::*; use skills::MiningSkill::*;
// Pick // Mining
Image::new(animate_by_pulse( Image::new(animate_by_pulse(
&self &self
.item_imgs .item_imgs
@ -2104,7 +2104,7 @@ fn skill_tree_from_str(string: &str) -> Option<SelectedSkillTree> {
"Sceptre" => Some(SelectedSkillTree::Weapon(ToolKind::Sceptre)), "Sceptre" => Some(SelectedSkillTree::Weapon(ToolKind::Sceptre)),
"Bow" => Some(SelectedSkillTree::Weapon(ToolKind::Bow)), "Bow" => Some(SelectedSkillTree::Weapon(ToolKind::Bow)),
"Fire Staff" => Some(SelectedSkillTree::Weapon(ToolKind::Staff)), "Fire Staff" => Some(SelectedSkillTree::Weapon(ToolKind::Staff)),
"Pickaxe" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)), "Mining" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)),
_ => None, _ => None,
} }
} }

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

@ -78,7 +78,8 @@ image_ids! {
hammer: "voxygen.element.weapons.hammer", hammer: "voxygen.element.weapons.hammer",
bow: "voxygen.element.weapons.bow", bow: "voxygen.element.weapons.bow",
staff: "voxygen.element.weapons.staff", staff: "voxygen.element.weapons.staff",
pickaxe: "voxygen.element.weapons.pickaxe", mining: "voxygen.element.weapons.mining",
pickaxe: "voxygen.element.skills.pickaxe",
lock: "voxygen.element.ui.diary.buttons.lock", lock: "voxygen.element.ui.diary.buttons.lock",
wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills", wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills",
wpn_icon_border: "voxygen.element.ui.generic.buttons.border", wpn_icon_border: "voxygen.element.ui.generic.buttons.border",

3
voxygen/src/hud/mod.rs
View File

@ -1353,7 +1353,7 @@ impl Hud {
Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"), Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"),
Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"), Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"),
Weapon(ToolKind::Staff) => &i18n.get("common.weapons.staff"), Weapon(ToolKind::Staff) => &i18n.get("common.weapons.staff"),
Weapon(ToolKind::Pick) => &i18n.get("common.tool.pick"), Weapon(ToolKind::Pick) => &i18n.get("common.tool.mining"),
_ => "Unknown", _ => "Unknown",
}; };
Text::new(skill) Text::new(skill)
@ -1378,6 +1378,7 @@ impl Hud {
Weapon(ToolKind::Sceptre) => self.imgs.sceptre, Weapon(ToolKind::Sceptre) => self.imgs.sceptre,
Weapon(ToolKind::Bow) => self.imgs.bow, Weapon(ToolKind::Bow) => self.imgs.bow,
Weapon(ToolKind::Staff) => self.imgs.staff, Weapon(ToolKind::Staff) => self.imgs.staff,
Weapon(ToolKind::Pick) => self.imgs.mining,
_ => self.imgs.swords_crossed, _ => self.imgs.swords_crossed,
}) })
.w_h(20.0, 20.0) .w_h(20.0, 20.0)