From 0e394029de70651045419cb758f15e1bd4330c1d Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Wed, 9 Jun 2021 01:14:20 -0400 Subject: [PATCH 1/6] Mining skill tree. --- CHANGELOG.md | 1 + .../common/skill_trees/skill_max_levels.ron | 3 + .../skills_skill-groups_manifest.ron | 5 ++ .../resource_experience_manifest.ron | 19 +++++ .../element/skills/pickaxe_gemgain.png | 3 + .../element/skills/pickaxe_oregain.png | 3 + .../voxygen/element/skills/pickaxe_speed.png | 3 + assets/voxygen/element/weapons/pickaxe.png | 3 + assets/voxygen/i18n/en/skills.ron | 9 +++ assets/voxygen/item_image_manifest.ron | 4 + common/src/cmd.rs | 2 +- common/src/comp/ability.rs | 17 ++++ common/src/comp/inventory/item/tool.rs | 15 ++++ common/src/comp/skills.rs | 29 ++++--- common/src/event.rs | 1 + common/systems/src/melee.rs | 1 + server/src/cmd.rs | 1 + server/src/events/entity_manipulation.rs | 13 ++-- server/src/events/interaction.rs | 78 ++++++++++++++++++- server/src/events/mod.rs | 4 +- server/src/migrations/V41__mining_tree.sql | 7 ++ server/src/persistence/json_models.rs | 17 ++-- voxygen/src/hud/diary.rs | 73 ++++++++++++++++- voxygen/src/hud/img_ids.rs | 5 ++ voxygen/src/hud/mod.rs | 1 + 25 files changed, 290 insertions(+), 27 deletions(-) create mode 100644 assets/server/manifests/resource_experience_manifest.ron create mode 100644 assets/voxygen/element/skills/pickaxe_gemgain.png create mode 100644 assets/voxygen/element/skills/pickaxe_oregain.png create mode 100644 assets/voxygen/element/skills/pickaxe_speed.png create mode 100644 assets/voxygen/element/weapons/pickaxe.png create mode 100644 server/src/migrations/V41__mining_tree.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 4466ae1851..99fa93a4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,6 +85,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Meat drops from animals - New ores, plants and hides to be looted from the world and processed into craft ingredients - Added more crafting stations, loom, spinning wheel, tanning rack, forge +- Added a skill tree for mining, which gains xp from mining ores and gems. ### Changed diff --git a/assets/common/skill_trees/skill_max_levels.ron b/assets/common/skill_trees/skill_max_levels.ron index 275c23b15b..a319299903 100644 --- a/assets/common/skill_trees/skill_max_levels.ron +++ b/assets/common/skill_trees/skill_max_levels.ron @@ -76,4 +76,7 @@ Climb(Cost): Some(2), Climb(Speed): Some(2), Swim(Speed): Some(2), + Pick(Speed): Some(3), + Pick(OreGain): Some(3), + Pick(GemGain): Some(3), }) diff --git a/assets/common/skill_trees/skills_skill-groups_manifest.ron b/assets/common/skill_trees/skills_skill-groups_manifest.ron index 220f2b1e97..641ba74520 100644 --- a/assets/common/skill_trees/skills_skill-groups_manifest.ron +++ b/assets/common/skill_trees/skills_skill-groups_manifest.ron @@ -109,4 +109,9 @@ Sceptre(ARange), Sceptre(ACost), ], + Weapon(Pick): [ + Pick(Speed), + Pick(OreGain), + Pick(GemGain), + ], }) diff --git a/assets/server/manifests/resource_experience_manifest.ron b/assets/server/manifests/resource_experience_manifest.ron new file mode 100644 index 0000000000..6345e0d392 --- /dev/null +++ b/assets/server/manifests/resource_experience_manifest.ron @@ -0,0 +1,19 @@ +ResourceExperienceManifest({ + "common.items.mineral.gem.amethyst": 20, + "common.items.mineral.gem.sapphire": 50, + "common.items.mineral.gem.topaz": 20, + "common.items.mineral.gem.diamond": 100, + "common.items.mineral.gem.emerald": 50, + "common.items.mineral.gem.ruby": 75, + + "common.items.mineral.ore.coal": 25, + "common.items.mineral.ore.gold": 100, + "common.items.mineral.ore.iron": 20, + "common.items.mineral.ore.silver": 75, + "common.items.mineral.ore.velorite": 30, + "common.items.mineral.ore.veloritefrag": 20, + "common.items.mineral.ore.bloodstone": 100, + "common.items.mineral.ore.cobalt": 75, + "common.items.mineral.ore.copper": 10, + "common.items.mineral.ore.tin": 10, +}) diff --git a/assets/voxygen/element/skills/pickaxe_gemgain.png b/assets/voxygen/element/skills/pickaxe_gemgain.png new file mode 100644 index 0000000000..3615cd1d7d --- /dev/null +++ b/assets/voxygen/element/skills/pickaxe_gemgain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87cb3de9b1db989b909b5db2b4d4f0f91773f881df5caeac5e7b92644c52b955 +size 1780 diff --git a/assets/voxygen/element/skills/pickaxe_oregain.png b/assets/voxygen/element/skills/pickaxe_oregain.png new file mode 100644 index 0000000000..9d42b64f7d --- /dev/null +++ b/assets/voxygen/element/skills/pickaxe_oregain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b3de05de2d4ca7a76769aa93369c92bbd18fe98c2b337a412c380d726808e4e +size 1790 diff --git a/assets/voxygen/element/skills/pickaxe_speed.png b/assets/voxygen/element/skills/pickaxe_speed.png new file mode 100644 index 0000000000..7a462f3940 --- /dev/null +++ b/assets/voxygen/element/skills/pickaxe_speed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27f66e968c4f475123d726c096e80bb34c2ebea856c4c0bf1d20969ac4d01dbc +size 1734 diff --git a/assets/voxygen/element/weapons/pickaxe.png b/assets/voxygen/element/weapons/pickaxe.png new file mode 100644 index 0000000000..0f4ec67ac9 --- /dev/null +++ b/assets/voxygen/element/weapons/pickaxe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff8c3173b5d87c4bf00233d222d2b47045bbb3cf602afea5814d85167ce9f9da +size 1720 diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron index 93ae9ffb7e..66250941ff 100644 --- a/assets/voxygen/i18n/en/skills.ron +++ b/assets/voxygen/i18n/en/skills.ron @@ -238,6 +238,15 @@ "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": "Increases distance of leap by 20%{SP}", + // Pick + "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_speed_title": "Pickaxe Strike Speed", + "hud.skill.pick_strike_speed": "Mine rocks faster{SP}", + "hud.skill.pick_strike_oregain_title": "Pickaxe Strike Ore Yield", + "hud.skill.pick_strike_oregain": "Chance to gain extra ore (5% per level){SP}", + "hud.skill.pick_strike_gemgain_title": "Pickaxe Strike Gem Yield", + "hud.skill.pick_strike_gemgain": "Chance to gain extra gems (5% per level){SP}", }, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 5bb8796f1c..e0d711ad6a 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -65,6 +65,10 @@ "voxel.weapon.sceptre.wood-nature", (-1.0, 0.0, 0.0), (-90.0, 55.0, 0.0), 1.0, ), + Tool("example_pick"): VoxTrans( + "voxel.weapon.tool.pickaxe_green-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, + ), Tool("example_dagger"): VoxTrans( "voxel.weapon.dagger.dagger_basic-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, diff --git a/common/src/cmd.rs b/common/src/cmd.rs index e8f9054605..d8752cffd5 100644 --- a/common/src/cmd.rs +++ b/common/src/cmd.rs @@ -127,7 +127,7 @@ lazy_static! { .iter() .map(|s| s.to_string()) .collect(); - static ref SKILL_TREES: Vec = vec!["general", "sword", "axe", "hammer", "bow", "staff", "sceptre"] + static ref SKILL_TREES: Vec = vec!["general", "sword", "axe", "hammer", "bow", "staff", "sceptre", "pick"] .iter() .map(|s| s.to_string()) .collect(); diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index 8ab75b8928..bab3f56117 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -1174,6 +1174,23 @@ impl CharacterAbility { _ => {}, } }, + Some(ToolKind::Pick) => { + use skills::PickSkill::*; + if let BasicMelee { + ref mut buildup_duration, + ref mut swing_duration, + ref mut recover_duration, + .. + } = self + { + if let Ok(Some(level)) = skillset.skill_level(Pick(Speed)) { + let speed = 1.1_f32.powi(level.into()); + *buildup_duration /= speed; + *swing_duration /= speed; + *recover_duration /= speed; + } + } + }, None => { if let CharacterAbility::Roll { ref mut energy_cost, diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index e91b52c0de..c0f3ee2d03 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -50,6 +50,21 @@ impl ToolKind { ToolKind::Empty => "empty", } } + + pub fn gains_combat_xp(&self) -> bool { + matches!( + self, + ToolKind::Sword + | ToolKind::Axe + | ToolKind::Hammer + | ToolKind::Bow + | ToolKind::Dagger + | ToolKind::Staff + | ToolKind::Spear + | ToolKind::Sceptre + | ToolKind::Shield + ) + } } #[derive(Clone, Copy, Debug, Serialize, Deserialize)] diff --git a/common/src/comp/skills.rs b/common/src/comp/skills.rs index e1c113d8f2..c130b067c9 100644 --- a/common/src/comp/skills.rs +++ b/common/src/comp/skills.rs @@ -107,6 +107,7 @@ pub enum Skill { Roll(RollSkill), Climb(ClimbSkill), Swim(SwimSkill), + Pick(PickSkill), } pub enum SkillError { @@ -263,6 +264,13 @@ pub enum SwimSkill { Speed, } +#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] +pub enum PickSkill { + Speed, + OreGain, + GemGain, +} + #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] pub enum SkillGroupKind { General, @@ -344,7 +352,10 @@ impl Default for SkillSet { /// player fn default() -> Self { Self { - skill_groups: vec![SkillGroup::new(SkillGroupKind::General)], + skill_groups: vec![ + SkillGroup::new(SkillGroupKind::General), + SkillGroup::new(SkillGroupKind::Weapon(ToolKind::Pick)), + ], skills: HashMap::new(), modify_health: false, modify_energy: false, @@ -365,7 +376,7 @@ impl SkillSet { /// let mut skillset = SkillSet::default(); /// skillset.unlock_skill_group(SkillGroupKind::Weapon(ToolKind::Sword)); /// - /// assert_eq!(skillset.skill_groups.len(), 2); + /// assert_eq!(skillset.skill_groups.len(), 3); /// ``` pub fn unlock_skill_group(&mut self, skill_group_kind: SkillGroupKind) { if !self.contains_skill_group(skill_group_kind) { @@ -668,13 +679,13 @@ mod tests { skillset.add_skill_points(SkillGroupKind::Weapon(ToolKind::Axe), 1); skillset.unlock_skill(Skill::Axe(AxeSkill::UnlockLeap)); - assert_eq!(skillset.skill_groups[1].available_sp, 0); + assert_eq!(skillset.skill_groups[2].available_sp, 0); assert_eq!(skillset.skills.len(), 1); assert!(skillset.has_skill(Skill::Axe(AxeSkill::UnlockLeap))); skillset.refund_skill(Skill::Axe(AxeSkill::UnlockLeap)); - assert_eq!(skillset.skill_groups[1].available_sp, 1); + assert_eq!(skillset.skill_groups[2].available_sp, 1); assert_eq!(skillset.skills.get(&Skill::Axe(AxeSkill::UnlockLeap)), None); } @@ -683,9 +694,9 @@ mod tests { let mut skillset = SkillSet::default(); skillset.unlock_skill_group(SkillGroupKind::Weapon(ToolKind::Axe)); - assert_eq!(skillset.skill_groups.len(), 2); + assert_eq!(skillset.skill_groups.len(), 3); assert_eq!( - skillset.skill_groups[1], + skillset.skill_groups[2], SkillGroup::new(SkillGroupKind::Weapon(ToolKind::Axe)) ); } @@ -697,13 +708,13 @@ mod tests { skillset.unlock_skill_group(SkillGroupKind::Weapon(ToolKind::Axe)); skillset.add_skill_points(SkillGroupKind::Weapon(ToolKind::Axe), 1); - assert_eq!(skillset.skill_groups[1].available_sp, 1); + assert_eq!(skillset.skill_groups[2].available_sp, 1); assert_eq!(skillset.skills.len(), 0); // Try unlocking a skill with enough skill points skillset.unlock_skill(Skill::Axe(AxeSkill::UnlockLeap)); - assert_eq!(skillset.skill_groups[1].available_sp, 0); + assert_eq!(skillset.skill_groups[2].available_sp, 0); assert_eq!(skillset.skills.len(), 1); assert!(skillset.has_skill(Skill::Axe(AxeSkill::UnlockLeap))); @@ -720,6 +731,6 @@ mod tests { skillset.unlock_skill_group(SkillGroupKind::Weapon(ToolKind::Axe)); skillset.add_skill_points(SkillGroupKind::Weapon(ToolKind::Axe), 1); - assert_eq!(skillset.skill_groups[1].available_sp, 1); + assert_eq!(skillset.skill_groups[2].available_sp, 1); } } diff --git a/common/src/event.rs b/common/src/event.rs index 1c507d0876..d21eee05c5 100644 --- a/common/src/event.rs +++ b/common/src/event.rs @@ -164,6 +164,7 @@ pub enum ServerEvent { }, // Attempt to mine a block, turning it into an item MineBlock { + entity: EcsEntity, pos: Vec3, tool: Option, }, diff --git a/common/systems/src/melee.rs b/common/systems/src/melee.rs index 561b9a4b5b..46a3b004fd 100644 --- a/common/systems/src/melee.rs +++ b/common/systems/src/melee.rs @@ -86,6 +86,7 @@ impl<'a> System<'a> for Sys { < (rad + scale * melee_attack.range).powi(2) { server_emitter.emit(ServerEvent::MineBlock { + entity: attacker, pos: block_pos, tool, }); diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 926b439588..eb6af36349 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -2610,6 +2610,7 @@ fn parse_skill_tree(skill_tree: &str) -> CmdResult "bow" => Ok(SkillGroupKind::Weapon(ToolKind::Bow)), "staff" => Ok(SkillGroupKind::Weapon(ToolKind::Staff)), "sceptre" => Ok(SkillGroupKind::Weapon(ToolKind::Sceptre)), + "pick" => Ok(SkillGroupKind::Weapon(ToolKind::Pick)), _ => Err(format!("{} is not a skill group!", skill_tree)), } } diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 78b14d3517..c559ba19b6 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -992,13 +992,12 @@ fn handle_exp_gain( // Closure to add xp pool corresponding to weapon type equipped in a particular // EquipSlot let mut add_tool_from_slot = |equip_slot| { - let tool_kind = inventory.equipped(equip_slot).and_then(|i| { - if let ItemKind::Tool(tool) = &i.kind() { - Some(tool.kind) - } else { - None - } - }); + let tool_kind = inventory + .equipped(equip_slot) + .and_then(|i| match &i.kind() { + ItemKind::Tool(tool) if tool.kind.gains_combat_xp() => Some(tool.kind), + _ => None, + }); if let Some(weapon) = tool_kind { // Only adds to xp pools if entity has that skill group available if skill_set.contains_skill_group(SkillGroupKind::Weapon(weapon)) { diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index e8c4a5e0e9..3220a8a25b 100644 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -3,6 +3,7 @@ use tracing::error; use vek::*; use common::{ + assets, comp::{ self, agent::{AgentEvent, Sound, MAX_LISTEN_DIST}, @@ -11,7 +12,7 @@ use common::{ item, slot::Slot, tool::ToolKind, - Inventory, Pos, + Inventory, Pos, SkillGroupKind, }, consts::{MAX_MOUNT_RANGE, SOUND_TRAVEL_DIST_PER_VOLUME}, outcome::Outcome, @@ -27,6 +28,10 @@ use crate::{ Server, }; +use hashbrown::HashMap; +use lazy_static::lazy_static; +use serde::Deserialize; + pub fn handle_lantern(server: &mut Server, entity: EcsEntity, enable: bool) { let ecs = server.state_mut().ecs(); @@ -281,13 +286,80 @@ fn within_mounting_range(player_position: Option<&Pos>, mount_position: Option<& } } -pub fn handle_mine_block(server: &mut Server, pos: Vec3, tool: Option) { +#[derive(Deserialize)] +struct ResourceExperienceManifest(HashMap); + +impl assets::Asset for ResourceExperienceManifest { + type Loader = assets::RonLoader; + + const EXTENSION: &'static str = "ron"; +} + +lazy_static! { + static ref RESOURCE_EXPERIENCE_MANIFEST: assets::AssetHandle = + assets::AssetExt::load_expect("server.manifests.resource_experience_manifest"); +} + +pub fn handle_mine_block( + server: &mut Server, + entity: EcsEntity, + pos: Vec3, + tool: Option, +) { let state = server.state_mut(); if state.can_set_block(pos) { let block = state.terrain().get(pos).ok().copied(); if let Some(block) = block.filter(|b| b.mine_tool().map_or(false, |t| Some(t) == tool)) { // Drop item if one is recoverable from the block - if let Some(item) = comp::Item::try_reclaim_from_block(block) { + if let Some(mut item) = comp::Item::try_reclaim_from_block(block) { + if let Some(mut skillset) = state + .ecs() + .write_storage::() + .get_mut(entity) + { + if let (Some(tool), Some(uid), Some(exp_reward)) = ( + tool, + state.ecs().uid_from_entity(entity), + RESOURCE_EXPERIENCE_MANIFEST + .read() + .0 + .get(item.item_definition_id()), + ) { + skillset.change_experience(SkillGroupKind::Weapon(tool), *exp_reward); + state + .ecs() + .write_resource::>() + .push(Outcome::ExpChange { + uid, + exp: *exp_reward, + }); + } + use common::comp::skills::{PickSkill, Skill}; + use rand::Rng; + let mut rng = rand::thread_rng(); + if item.item_definition_id().contains("mineral.ore.") + && rng.gen_bool( + 0.05 * skillset + .skill_level(Skill::Pick(PickSkill::OreGain)) + .ok() + .flatten() + .unwrap_or(0) as f64, + ) + { + let _ = item.increase_amount(1); + } + if item.item_definition_id().contains("mineral.gem.") + && rng.gen_bool( + 0.05 * skillset + .skill_level(Skill::Pick(PickSkill::GemGain)) + .ok() + .flatten() + .unwrap_or(0) as f64, + ) + { + let _ = item.increase_amount(1); + } + } state .create_object(Default::default(), comp::object::Body::Pouch) .with(comp::Pos(pos.map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0))) diff --git a/server/src/events/mod.rs b/server/src/events/mod.rs index c808e8f28a..7079b3bda3 100644 --- a/server/src/events/mod.rs +++ b/server/src/events/mod.rs @@ -207,7 +207,9 @@ impl Server { handle_combo_change(&self, entity, change) }, ServerEvent::RequestSiteInfo { entity, id } => handle_site_info(&self, entity, id), - ServerEvent::MineBlock { pos, tool } => handle_mine_block(self, pos, tool), + ServerEvent::MineBlock { entity, pos, tool } => { + handle_mine_block(self, entity, pos, tool) + }, ServerEvent::TeleportTo { entity, target, diff --git a/server/src/migrations/V41__mining_tree.sql b/server/src/migrations/V41__mining_tree.sql new file mode 100644 index 0000000000..e4cd339df7 --- /dev/null +++ b/server/src/migrations/V41__mining_tree.sql @@ -0,0 +1,7 @@ +-- Every character should have the pick skilltree unlocked by default. +-- This is handled by `SkillSet::default()` for new characters (and their skill +-- sets serialize properly during character creation), but since the database +-- deserialization builds the SkillSet fields from empty Vecs/HashMaps, the skill +-- tree needs to manually be added to each character. +INSERT INTO skill_group (entity_id, skill_group_kind, exp, available_sp, earned_sp) + SELECT character_id, 'Weapon Pick', 0, 0, 0 FROM character; diff --git a/server/src/persistence/json_models.rs b/server/src/persistence/json_models.rs index 81d9531022..b74955ae46 100644 --- a/server/src/persistence/json_models.rs +++ b/server/src/persistence/json_models.rs @@ -40,8 +40,8 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String { use comp::{ item::tool::ToolKind, skills::{ - AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, RollSkill, SceptreSkill, - Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, + AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, + SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, }, }; let skill_string = match skill { @@ -135,6 +135,9 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String { Climb(ClimbSkill::Cost) => "Climb Cost", Climb(ClimbSkill::Speed) => "Climb Speed", Swim(SwimSkill::Speed) => "Swim Speed", + Pick(PickSkill::Speed) => "Pick Speed", + Pick(PickSkill::OreGain) => "Pick OreGain", + Pick(PickSkill::GemGain) => "Pick GemGain", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)) => "Unlock Weapon Sword", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)) => "Unlock Weapon Axe", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)) => "Unlock Weapon Hammer", @@ -160,8 +163,8 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill { use comp::{ item::tool::ToolKind, skills::{ - AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, RollSkill, SceptreSkill, - Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, + AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, + SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill, }, }; match skill_string { @@ -255,6 +258,9 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill { "Climb Cost" => Climb(ClimbSkill::Cost), "Climb Speed" => Climb(ClimbSkill::Speed), "Swim Speed" => Swim(SwimSkill::Speed), + "Pick Speed" => Pick(PickSkill::Speed), + "Pick GemGain" => Pick(PickSkill::GemGain), + "Pick OreGain" => Pick(PickSkill::OreGain), "Unlock Weapon Sword" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)), "Unlock Weapon Axe" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)), "Unlock Weapon Hammer" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)), @@ -280,12 +286,12 @@ pub fn skill_group_to_db_string(skill_group: comp::skills::SkillGroupKind) -> St Weapon(ToolKind::Bow) => "Weapon Bow", Weapon(ToolKind::Staff) => "Weapon Staff", Weapon(ToolKind::Sceptre) => "Weapon Sceptre", + Weapon(ToolKind::Pick) => "Weapon Pick", Weapon(ToolKind::Dagger) | Weapon(ToolKind::Shield) | Weapon(ToolKind::Spear) | Weapon(ToolKind::Debug) | Weapon(ToolKind::Farming) - | Weapon(ToolKind::Pick) | Weapon(ToolKind::Empty) | Weapon(ToolKind::Natural) => panic!( "Tried to add unsupported skill group to database: {:?}", @@ -305,6 +311,7 @@ pub fn db_string_to_skill_group(skill_group_string: &str) -> comp::skills::Skill "Weapon Bow" => Weapon(ToolKind::Bow), "Weapon Staff" => Weapon(ToolKind::Staff), "Weapon Sceptre" => Weapon(ToolKind::Sceptre), + "Weapon Pick" => Weapon(ToolKind::Pick), _ => panic!( "Tried to convert an unsupported string from the database: {}", skill_group_string diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 2e679c6362..48182bda38 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -149,6 +149,11 @@ widget_ids! { skill_sceptre_aura_2, skill_sceptre_aura_3, skill_sceptre_aura_4, + pick_render, + skill_pick_m1, + skill_pick_m1_0, + skill_pick_m1_1, + skill_pick_m1_2, general_combat_render_0, general_combat_render_1, skill_general_stat_0, @@ -227,7 +232,7 @@ impl<'a> Diary<'a> { pub type SelectedSkillTree = skills::SkillGroupKind; -const TREES: [&str; 7] = [ +const TREES: [&str; 8] = [ "General Combat", "Sword", "Hammer", @@ -235,6 +240,7 @@ const TREES: [&str; 7] = [ "Sceptre", "Bow", "Fire Staff", + "Pickaxe", ]; pub enum Event { @@ -353,6 +359,7 @@ impl<'a> Widget for Diary<'a> { "Sceptre" => self.imgs.sceptre, "Bow" => self.imgs.bow, "Fire Staff" => self.imgs.staff, + "Pickaxe" => self.imgs.pickaxe, _ => self.imgs.nothing, }); @@ -500,6 +507,9 @@ impl<'a> Widget for Diary<'a> { SelectedSkillTree::Weapon(ToolKind::Staff) => { self.localized_strings.get("common.weapons.staff") }, + SelectedSkillTree::Weapon(ToolKind::Pick) => { + self.localized_strings.get("common.tool.pick") + }, _ => "Unknown", }; self.create_new_text(&tree_title, state.content_align, 2.0, 34, TEXT_COLOR) @@ -531,6 +541,7 @@ impl<'a> Widget for Diary<'a> { SelectedSkillTree::Weapon(ToolKind::Bow) => 6, SelectedSkillTree::Weapon(ToolKind::Staff) => 4, SelectedSkillTree::Weapon(ToolKind::Sceptre) => 5, + SelectedSkillTree::Weapon(ToolKind::Pick) => 4, _ => 0, }; let skills_top_r = match sel_tab { @@ -1976,6 +1987,65 @@ impl<'a> Widget for Diary<'a> { &diary_tooltip, ); }, + SelectedSkillTree::Weapon(ToolKind::Pick) => { + use skills::PickSkill::*; + // Pick + Image::new(animate_by_pulse( + &self + .item_imgs + .img_ids_or_not_found_img(Tool("example_pick".to_string())), + self.pulse, + )) + .wh(art_size) + .middle_of(state.content_align) + .color(Some(Color::Rgba(1.0, 1.0, 1.0, 1.0))) + .set(state.pick_render, ui); + // Top Left skills + // 5 1 6 + // 3 0 4 + // 8 2 7 + Button::image(self.imgs.pickaxe) + .w_h(74.0, 74.0) + .mid_top_with_margin_on(state.skills_top_l[0], 3.0) + .with_tooltip( + self.tooltip_manager, + &self.localized_strings.get("hud.skill.pick_strike_title"), + &self.localized_strings.get("hud.skill.pick_strike"), + &diary_tooltip, + TEXT_COLOR, + ) + .set(state.skill_pick_m1, ui); + self.create_unlock_skill_button( + Skill::Pick(Speed), + self.imgs.pickaxe_speed_skill, + state.skills_top_l[1], + "pick_strike_speed", + state.skill_pick_m1_0, + ui, + &mut events, + &diary_tooltip, + ); + self.create_unlock_skill_button( + Skill::Pick(OreGain), + self.imgs.pickaxe_oregain_skill, + state.skills_top_l[2], + "pick_strike_oregain", + state.skill_pick_m1_1, + ui, + &mut events, + &diary_tooltip, + ); + self.create_unlock_skill_button( + Skill::Pick(GemGain), + self.imgs.pickaxe_gemgain_skill, + state.skills_top_l[3], + "pick_strike_gemgain", + state.skill_pick_m1_2, + ui, + &mut events, + &diary_tooltip, + ); + }, _ => {}, } @@ -2034,6 +2104,7 @@ fn skill_tree_from_str(string: &str) -> Option { "Sceptre" => Some(SelectedSkillTree::Weapon(ToolKind::Sceptre)), "Bow" => Some(SelectedSkillTree::Weapon(ToolKind::Bow)), "Fire Staff" => Some(SelectedSkillTree::Weapon(ToolKind::Staff)), + "Pickaxe" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)), _ => None, } } diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index f96bd8b610..e451dd3409 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -78,6 +78,7 @@ image_ids! { hammer: "voxygen.element.weapons.hammer", bow: "voxygen.element.weapons.bow", staff: "voxygen.element.weapons.staff", + pickaxe: "voxygen.element.weapons.pickaxe", lock: "voxygen.element.ui.diary.buttons.lock", wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills", wpn_icon_border: "voxygen.element.ui.generic.buttons.border", @@ -303,6 +304,10 @@ image_ids! { utility_speed_skill: "voxygen.element.skills.skilltree.utility_speed", utility_duration_skill: "voxygen.element.skills.skilltree.utility_duration", + pickaxe_speed_skill: "voxygen.element.skills.pickaxe_speed", + pickaxe_oregain_skill: "voxygen.element.skills.pickaxe_oregain", + pickaxe_gemgain_skill: "voxygen.element.skills.pickaxe_gemgain", + // Skillbar level_up: "voxygen.element.ui.skillbar.level_up", bar_content: "voxygen.element.ui.skillbar.bar_content", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 585361849d..90aef9563f 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1353,6 +1353,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"), Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"), Weapon(ToolKind::Staff) => &i18n.get("common.weapons.staff"), + Weapon(ToolKind::Pick) => &i18n.get("common.tool.pick"), _ => "Unknown", }; Text::new(skill) From 43b6780c98d39edc944e17d3fd09b4b1ce7f0a64 Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Wed, 9 Jun 2021 01:35:30 -0400 Subject: [PATCH 2/6] Address MR 2406 comments. - Tweak ore xp values per Slipped's advice. --- assets/server/manifests/resource_experience_manifest.ron | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/server/manifests/resource_experience_manifest.ron b/assets/server/manifests/resource_experience_manifest.ron index 6345e0d392..c597adef8f 100644 --- a/assets/server/manifests/resource_experience_manifest.ron +++ b/assets/server/manifests/resource_experience_manifest.ron @@ -9,11 +9,11 @@ ResourceExperienceManifest({ "common.items.mineral.ore.coal": 25, "common.items.mineral.ore.gold": 100, "common.items.mineral.ore.iron": 20, - "common.items.mineral.ore.silver": 75, + "common.items.mineral.ore.silver": 90, "common.items.mineral.ore.velorite": 30, "common.items.mineral.ore.veloritefrag": 20, - "common.items.mineral.ore.bloodstone": 100, - "common.items.mineral.ore.cobalt": 75, + "common.items.mineral.ore.bloodstone": 80, + "common.items.mineral.ore.cobalt": 60, "common.items.mineral.ore.copper": 10, "common.items.mineral.ore.tin": 10, }) From 01a04a80fa2699961f2831d48b8213766fbaabbe Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Wed, 9 Jun 2021 21:07:34 +0200 Subject: [PATCH 3/6] icons and naming --- .../element/{weapons => skills}/pickaxe.png | 0 assets/voxygen/element/weapons/axe.png | 4 ++-- assets/voxygen/element/weapons/bow.png | 4 ++-- assets/voxygen/element/weapons/daggers.png | 4 ++-- assets/voxygen/element/weapons/hammer.png | 4 ++-- assets/voxygen/element/weapons/mining.png | 3 +++ assets/voxygen/element/weapons/staff.png | 4 ++-- assets/voxygen/element/weapons/sword.png | 4 ++-- assets/voxygen/i18n/en/common.ron | 1 + assets/voxygen/i18n/en/skills.ron | 3 ++- common/src/comp/ability.rs | 2 +- common/src/comp/skills.rs | 4 ++-- server/src/events/interaction.rs | 6 +++--- server/src/persistence/json_models.rs | 16 ++++++++-------- voxygen/src/hud/diary.rs | 12 ++++++------ voxygen/src/hud/img_ids.rs | 3 ++- voxygen/src/hud/mod.rs | 3 ++- 17 files changed, 42 insertions(+), 35 deletions(-) rename assets/voxygen/element/{weapons => skills}/pickaxe.png (100%) create mode 100644 assets/voxygen/element/weapons/mining.png diff --git a/assets/voxygen/element/weapons/pickaxe.png b/assets/voxygen/element/skills/pickaxe.png similarity index 100% rename from assets/voxygen/element/weapons/pickaxe.png rename to assets/voxygen/element/skills/pickaxe.png diff --git a/assets/voxygen/element/weapons/axe.png b/assets/voxygen/element/weapons/axe.png index ee44e81671..79274d2f20 100644 --- a/assets/voxygen/element/weapons/axe.png +++ b/assets/voxygen/element/weapons/axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37844f6d3ad21e036df2e8dd43bbb05b96728e00295084179a4841585ecabfef -size 168 +oid sha256:ad4f860670fef14577606c9b39f393484ecf6568cdf79d7d36b384fbf439eb90 +size 285 diff --git a/assets/voxygen/element/weapons/bow.png b/assets/voxygen/element/weapons/bow.png index d147b3e33f..136bfa3d86 100644 --- a/assets/voxygen/element/weapons/bow.png +++ b/assets/voxygen/element/weapons/bow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a1380273d271639ff7d3016fe10331f5847e7e2339f6bbcb2eb7f9de1f714d1 -size 169 +oid sha256:8fb101f42ea28b599fdfab86ca06c59c46edd03fa4c854230465bd04f93a9d11 +size 294 diff --git a/assets/voxygen/element/weapons/daggers.png b/assets/voxygen/element/weapons/daggers.png index 2a5671b5c7..e2b5dd7c19 100644 --- a/assets/voxygen/element/weapons/daggers.png +++ b/assets/voxygen/element/weapons/daggers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7018ea3f92db46e0e2fde2e28b8c023156d52dd7445611bb189c996a067844dd -size 183 +oid sha256:ee65025e8edaafaf00d43fe4f0af74e15bd9263bd9f399f60ca8b87ba807aa9b +size 319 diff --git a/assets/voxygen/element/weapons/hammer.png b/assets/voxygen/element/weapons/hammer.png index c96bcd6a1a..16990f4088 100644 --- a/assets/voxygen/element/weapons/hammer.png +++ b/assets/voxygen/element/weapons/hammer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6244d3f8f071eff3a3ac3413bd4b20f4c0c555dc8e656574bc0de25d166fb741 -size 157 +oid sha256:c23362300e7b0cddf081fc664ec2cc2a8accf0a6af87129cf853020c238946de +size 276 diff --git a/assets/voxygen/element/weapons/mining.png b/assets/voxygen/element/weapons/mining.png new file mode 100644 index 0000000000..e6b4f1a2b2 --- /dev/null +++ b/assets/voxygen/element/weapons/mining.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d40df9df229492a46afaa7236177d6f0ba0536e9e1bae4c4a46063ee588187a +size 435 diff --git a/assets/voxygen/element/weapons/staff.png b/assets/voxygen/element/weapons/staff.png index 3455ac846a..4ca0d49763 100644 --- a/assets/voxygen/element/weapons/staff.png +++ b/assets/voxygen/element/weapons/staff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b7ee9205baca5c27bfa681ef0fe64ca49b2f326265777522df15f503a4b0b3d -size 149 +oid sha256:bda8b960270c230a49bb4e29f9f65598f08359672c8c5256b1efea8015811e8b +size 279 diff --git a/assets/voxygen/element/weapons/sword.png b/assets/voxygen/element/weapons/sword.png index d76d41b7e2..2ebd2b3293 100644 --- a/assets/voxygen/element/weapons/sword.png +++ b/assets/voxygen/element/weapons/sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46b2aaa0d65ad5e645c460ec76029cdc42aedf7ceb5b1840e2a9e8885b57c75d -size 158 +oid sha256:1c293dfb161fd9c99670913ac96c55103907fb0dd9e8812f81406a8acda51b59 +size 288 diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index 6694770192..1dd6bf2c10 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -78,6 +78,7 @@ Is the client up to date?"#, "common.tool.debug": "Debug", "common.tool.faming": "Farming Tool", "common.tool.pick": "Pickaxe", + "common.tool.mining": "Mining", "common.kind.modular_component": "Modular Component", "common.kind.glider": "Glider", "common.kind.consumable": "Consumable", diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron index 66250941ff..1a4d6ab3b8 100644 --- a/assets/voxygen/i18n/en/skills.ron +++ b/assets/voxygen/i18n/en/skills.ron @@ -238,7 +238,8 @@ "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": "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": "Hit rocks with the pickaxe to gain ore and gems and experience", "hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed", diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index bab3f56117..5fa8c3c112 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -1175,7 +1175,7 @@ impl CharacterAbility { } }, Some(ToolKind::Pick) => { - use skills::PickSkill::*; + use skills::MiningSkill::*; if let BasicMelee { ref mut buildup_duration, ref mut swing_duration, diff --git a/common/src/comp/skills.rs b/common/src/comp/skills.rs index c130b067c9..bd7e999f04 100644 --- a/common/src/comp/skills.rs +++ b/common/src/comp/skills.rs @@ -107,7 +107,7 @@ pub enum Skill { Roll(RollSkill), Climb(ClimbSkill), Swim(SwimSkill), - Pick(PickSkill), + Pick(MiningSkill), } pub enum SkillError { @@ -265,7 +265,7 @@ pub enum SwimSkill { } #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] -pub enum PickSkill { +pub enum MiningSkill { Speed, OreGain, GemGain, diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index 3220a8a25b..9653ef4fc1 100644 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -334,13 +334,13 @@ pub fn handle_mine_block( exp: *exp_reward, }); } - use common::comp::skills::{PickSkill, Skill}; + use common::comp::skills::{MiningSkill, Skill}; use rand::Rng; let mut rng = rand::thread_rng(); if item.item_definition_id().contains("mineral.ore.") && rng.gen_bool( 0.05 * skillset - .skill_level(Skill::Pick(PickSkill::OreGain)) + .skill_level(Skill::Pick(MiningSkill::OreGain)) .ok() .flatten() .unwrap_or(0) as f64, @@ -351,7 +351,7 @@ pub fn handle_mine_block( if item.item_definition_id().contains("mineral.gem.") && rng.gen_bool( 0.05 * skillset - .skill_level(Skill::Pick(PickSkill::GemGain)) + .skill_level(Skill::Pick(MiningSkill::GemGain)) .ok() .flatten() .unwrap_or(0) as f64, diff --git a/server/src/persistence/json_models.rs b/server/src/persistence/json_models.rs index b74955ae46..d359cc4672 100644 --- a/server/src/persistence/json_models.rs +++ b/server/src/persistence/json_models.rs @@ -40,7 +40,7 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String { use comp::{ item::tool::ToolKind, skills::{ - AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, + AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill, 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::Speed) => "Climb Speed", Swim(SwimSkill::Speed) => "Swim Speed", - Pick(PickSkill::Speed) => "Pick Speed", - Pick(PickSkill::OreGain) => "Pick OreGain", - Pick(PickSkill::GemGain) => "Pick GemGain", + Pick(MiningSkill::Speed) => "Pick Speed", + Pick(MiningSkill::OreGain) => "Pick OreGain", + Pick(MiningSkill::GemGain) => "Pick GemGain", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)) => "Unlock Weapon Sword", UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)) => "Unlock Weapon Axe", 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::{ item::tool::ToolKind, skills::{ - AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill, + AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill, 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 Speed" => Climb(ClimbSkill::Speed), "Swim Speed" => Swim(SwimSkill::Speed), - "Pick Speed" => Pick(PickSkill::Speed), - "Pick GemGain" => Pick(PickSkill::GemGain), - "Pick OreGain" => Pick(PickSkill::OreGain), + "Pick Speed" => Pick(MiningSkill::Speed), + "Pick GemGain" => Pick(MiningSkill::GemGain), + "Pick OreGain" => Pick(MiningSkill::OreGain), "Unlock Weapon Sword" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)), "Unlock Weapon Axe" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)), "Unlock Weapon Hammer" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)), diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 48182bda38..96a0cb6fc7 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -240,7 +240,7 @@ const TREES: [&str; 8] = [ "Sceptre", "Bow", "Fire Staff", - "Pickaxe", + "Mining", ]; pub enum Event { @@ -359,7 +359,7 @@ impl<'a> Widget for Diary<'a> { "Sceptre" => self.imgs.sceptre, "Bow" => self.imgs.bow, "Fire Staff" => self.imgs.staff, - "Pickaxe" => self.imgs.pickaxe, + "Mining" => self.imgs.mining, _ => self.imgs.nothing, }); @@ -508,7 +508,7 @@ impl<'a> Widget for Diary<'a> { self.localized_strings.get("common.weapons.staff") }, SelectedSkillTree::Weapon(ToolKind::Pick) => { - self.localized_strings.get("common.tool.pick") + self.localized_strings.get("common.tool.mining") }, _ => "Unknown", }; @@ -1988,8 +1988,8 @@ impl<'a> Widget for Diary<'a> { ); }, SelectedSkillTree::Weapon(ToolKind::Pick) => { - use skills::PickSkill::*; - // Pick + use skills::MiningSkill::*; + // Mining Image::new(animate_by_pulse( &self .item_imgs @@ -2104,7 +2104,7 @@ fn skill_tree_from_str(string: &str) -> Option { "Sceptre" => Some(SelectedSkillTree::Weapon(ToolKind::Sceptre)), "Bow" => Some(SelectedSkillTree::Weapon(ToolKind::Bow)), "Fire Staff" => Some(SelectedSkillTree::Weapon(ToolKind::Staff)), - "Pickaxe" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)), + "Mining" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)), _ => None, } } diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index e451dd3409..2a48f5e028 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -78,7 +78,8 @@ image_ids! { hammer: "voxygen.element.weapons.hammer", bow: "voxygen.element.weapons.bow", 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", wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills", wpn_icon_border: "voxygen.element.ui.generic.buttons.border", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 90aef9563f..605833dd5f 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1353,7 +1353,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"), Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"), 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", }; Text::new(skill) @@ -1378,6 +1378,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => self.imgs.sceptre, Weapon(ToolKind::Bow) => self.imgs.bow, Weapon(ToolKind::Staff) => self.imgs.staff, + Weapon(ToolKind::Pick) => self.imgs.mining, _ => self.imgs.swords_crossed, }) .w_h(20.0, 20.0) From 9d4a65e8ac0117a83fd8518785619575e09acd6d Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Wed, 9 Jun 2021 16:03:25 -0400 Subject: [PATCH 4/6] Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. --- .../resource_experience_manifest.ron | 32 +++++++++---------- common/src/outcome.rs | 4 ++- server/src/events/entity_manipulation.rs | 5 +-- server/src/events/interaction.rs | 4 ++- voxygen/src/hud/mod.rs | 9 ++++-- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/assets/server/manifests/resource_experience_manifest.ron b/assets/server/manifests/resource_experience_manifest.ron index c597adef8f..829cea21c8 100644 --- a/assets/server/manifests/resource_experience_manifest.ron +++ b/assets/server/manifests/resource_experience_manifest.ron @@ -1,19 +1,19 @@ ResourceExperienceManifest({ - "common.items.mineral.gem.amethyst": 20, - "common.items.mineral.gem.sapphire": 50, - "common.items.mineral.gem.topaz": 20, - "common.items.mineral.gem.diamond": 100, - "common.items.mineral.gem.emerald": 50, - "common.items.mineral.gem.ruby": 75, + "common.items.mineral.gem.amethyst": 4, + "common.items.mineral.gem.sapphire": 8, + "common.items.mineral.gem.topaz": 4, + "common.items.mineral.gem.diamond": 25, + "common.items.mineral.gem.emerald": 10, + "common.items.mineral.gem.ruby": 12, - "common.items.mineral.ore.coal": 25, - "common.items.mineral.ore.gold": 100, - "common.items.mineral.ore.iron": 20, - "common.items.mineral.ore.silver": 90, - "common.items.mineral.ore.velorite": 30, - "common.items.mineral.ore.veloritefrag": 20, - "common.items.mineral.ore.bloodstone": 80, - "common.items.mineral.ore.cobalt": 60, - "common.items.mineral.ore.copper": 10, - "common.items.mineral.ore.tin": 10, + "common.items.mineral.ore.coal": 6, + "common.items.mineral.ore.gold": 25, + "common.items.mineral.ore.iron": 4, + "common.items.mineral.ore.silver": 22, + "common.items.mineral.ore.velorite": 8, + "common.items.mineral.ore.veloritefrag": 4, + "common.items.mineral.ore.bloodstone": 20, + "common.items.mineral.ore.cobalt": 15, + "common.items.mineral.ore.copper": 3, + "common.items.mineral.ore.tin": 3, }) diff --git a/common/src/outcome.rs b/common/src/outcome.rs index 559139d23a..d1ec35e15c 100644 --- a/common/src/outcome.rs +++ b/common/src/outcome.rs @@ -1,5 +1,6 @@ use crate::{comp, uid::Uid}; -use comp::{beam, item::Reagent, poise::PoiseState}; +use comp::{beam, item::Reagent, poise::PoiseState, skills::SkillGroupKind}; +use hashbrown::HashSet; use serde::{Deserialize, Serialize}; use vek::*; @@ -36,6 +37,7 @@ pub enum Outcome { ExpChange { uid: Uid, exp: i32, + xp_pools: HashSet, }, SkillPointGain { uid: Uid, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index c559ba19b6..15dd48bae3 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -1011,12 +1011,13 @@ fn handle_exp_gain( add_tool_from_slot(EquipSlot::InactiveMainhand); add_tool_from_slot(EquipSlot::InactiveOffhand); let num_pools = xp_pools.len() as f32; - for pool in xp_pools { - skill_set.change_experience(pool, (exp_reward / num_pools).ceil() as i32); + for pool in xp_pools.iter() { + skill_set.change_experience(*pool, (exp_reward / num_pools).ceil() as i32); } outcomes.push(Outcome::ExpChange { uid: *uid, exp: exp_reward as i32, + xp_pools, }); } diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index 9653ef4fc1..03b5fe992a 100644 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -28,9 +28,10 @@ use crate::{ Server, }; -use hashbrown::HashMap; +use hashbrown::{HashMap, HashSet}; use lazy_static::lazy_static; use serde::Deserialize; +use std::iter::FromIterator; pub fn handle_lantern(server: &mut Server, entity: EcsEntity, enable: bool) { let ecs = server.state_mut().ecs(); @@ -332,6 +333,7 @@ pub fn handle_mine_block( .push(Outcome::ExpChange { uid, exp: *exp_reward, + xp_pools: HashSet::from_iter(vec![SkillGroupKind::Weapon(tool)]), }); } use common::comp::skills::{MiningSkill, Skill}; diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 605833dd5f..b2944c0f39 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1353,7 +1353,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"), Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"), Weapon(ToolKind::Staff) => &i18n.get("common.weapons.staff"), - Weapon(ToolKind::Pick) => &i18n.get("common.tool.mining"), + Weapon(ToolKind::Pick) => &i18n.get("common.tool.pick"), _ => "Unknown", }; Text::new(skill) @@ -1378,7 +1378,6 @@ impl Hud { Weapon(ToolKind::Sceptre) => self.imgs.sceptre, Weapon(ToolKind::Bow) => self.imgs.bow, Weapon(ToolKind::Staff) => self.imgs.staff, - Weapon(ToolKind::Pick) => self.imgs.mining, _ => self.imgs.swords_crossed, }) .w_h(20.0, 20.0) @@ -3659,7 +3658,11 @@ impl Hud { pub fn handle_outcome(&mut self, outcome: &Outcome) { match outcome { - Outcome::ExpChange { uid, exp } => self.floaters.exp_floaters.push(ExpFloater { + Outcome::ExpChange { + uid, + exp, + xp_pools: _, + } => self.floaters.exp_floaters.push(ExpFloater { owner: *uid, exp_change: *exp, timer: 4.0, From 45f79059d0c0623ebc37411491e11b7ab5f2a88f Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Thu, 10 Jun 2021 02:23:27 +0200 Subject: [PATCH 5/6] mining exp sct color and icon; add mining to skill_preset --- assets/server/manifests/presets.ron | 4 ++ assets/voxygen/element/weapons/pickaxe.png | 3 ++ server/src/cmd.rs | 2 +- voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/mod.rs | 48 +++++++++++++++------- 5 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 assets/voxygen/element/weapons/pickaxe.png diff --git a/assets/server/manifests/presets.ron b/assets/server/manifests/presets.ron index 615af7a8da..136ef46054 100644 --- a/assets/server/manifests/presets.ron +++ b/assets/server/manifests/presets.ron @@ -127,6 +127,10 @@ (Sceptre(ADuration), 2), (Sceptre(ARange), 2), (Sceptre(ACost), 2), + // Mining + (Pick(Speed), 3), + (Pick(OreGain), 3), + (Pick(GemGain), 3), ], // Just copypasta from max with random reductions "middle": [ diff --git a/assets/voxygen/element/weapons/pickaxe.png b/assets/voxygen/element/weapons/pickaxe.png new file mode 100644 index 0000000000..9346118046 --- /dev/null +++ b/assets/voxygen/element/weapons/pickaxe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a179c4898dabc76a0f0ebd660fb8c979f2548a9bd367c71b91a9eb06676ae23 +size 466 diff --git a/server/src/cmd.rs b/server/src/cmd.rs index eb6af36349..e2499761af 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -2610,7 +2610,7 @@ fn parse_skill_tree(skill_tree: &str) -> CmdResult "bow" => Ok(SkillGroupKind::Weapon(ToolKind::Bow)), "staff" => Ok(SkillGroupKind::Weapon(ToolKind::Staff)), "sceptre" => Ok(SkillGroupKind::Weapon(ToolKind::Sceptre)), - "pick" => Ok(SkillGroupKind::Weapon(ToolKind::Pick)), + "mining" => Ok(SkillGroupKind::Weapon(ToolKind::Pick)), _ => Err(format!("{} is not a skill group!", skill_tree)), } } diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 2a48f5e028..6b5b5cfec0 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -80,6 +80,7 @@ image_ids! { staff: "voxygen.element.weapons.staff", mining: "voxygen.element.weapons.mining", pickaxe: "voxygen.element.skills.pickaxe", + pickaxe_ico: "voxygen.element.weapons.pickaxe", lock: "voxygen.element.ui.diary.buttons.lock", wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills", wpn_icon_border: "voxygen.element.ui.generic.buttons.border", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index b2944c0f39..a1501f6a2c 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -98,7 +98,7 @@ use conrod_core::{ widget::{self, Button, Image, Text}, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, }; -use hashbrown::HashMap; +use hashbrown::{HashMap, HashSet}; use rand::Rng; use specs::{Entity as EcsEntity, Join, WorldExt}; use std::{ @@ -211,6 +211,7 @@ widget_ids! { player_rank_up_icon, sct_exp_bgs[], sct_exps[], + sct_exp_icons[], sct_lvl_bg, sct_lvl, hurt_bg, @@ -324,6 +325,7 @@ pub struct ExpFloater { pub exp_change: i32, pub timer: f32, pub rand_offset: (f32, f32), + pub xp_pools: HashSet, } pub struct SkillPointGain { @@ -1252,7 +1254,11 @@ impl Hud { &mut self.ids.player_scts, &mut ui_widgets.widget_id_generator(), ); - // Increase font size based on fraction of maximum health + let player_sct_icon_id = player_sct_id_walker.next( + &mut self.ids.player_scts, + &mut ui_widgets.widget_id_generator(), + ); + // Increase font size based on fraction of maximum Experience // "flashes" by having a larger size in the first 100ms let font_size_xp = 30 + ((floater.exp_change as f32 / 300.0).min(1.0) * 50.0) as u32; @@ -1266,6 +1272,7 @@ impl Hud { }; if floater.exp_change > 0 { + let xp_pool = &floater.xp_pools; // Don't show 0 Exp Text::new(&format!("{} Exp", floater.exp_change.max(1))) .font_size(font_size_xp) @@ -1280,12 +1287,25 @@ impl Hud { Text::new(&format!("{} Exp", floater.exp_change.max(1))) .font_size(font_size_xp) .font_id(self.fonts.cyri.conrod_id) - .color(Color::Rgba(0.59, 0.41, 0.67, fade)) + .color( + if xp_pool.contains(&SkillGroupKind::Weapon(ToolKind::Pick)) { + Color::Rgba(0.18, 0.32, 0.9, fade) + } else { + Color::Rgba(0.59, 0.41, 0.67, fade) + }, + ) .x_y( ui_widgets.win_w * (0.5 * floater.rand_offset.0 as f64 - 0.25), ui_widgets.win_h * (0.15 * floater.rand_offset.1 as f64) + y, ) .set(player_sct_id, ui_widgets); + // Exp Source Image + if xp_pool.contains(&SkillGroupKind::Weapon(ToolKind::Pick)) { + Image::new(self.imgs.pickaxe_ico) + .w_h(font_size_xp as f64, font_size_xp as f64) + .left_from(player_sct_id, 5.0) + .set(player_sct_icon_id, ui_widgets); + } } } } @@ -1353,7 +1373,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"), Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"), 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", }; Text::new(skill) @@ -1378,6 +1398,7 @@ impl Hud { Weapon(ToolKind::Sceptre) => self.imgs.sceptre, Weapon(ToolKind::Bow) => self.imgs.bow, Weapon(ToolKind::Staff) => self.imgs.staff, + Weapon(ToolKind::Pick) => self.imgs.mining, _ => self.imgs.swords_crossed, }) .w_h(20.0, 20.0) @@ -3658,16 +3679,15 @@ impl Hud { pub fn handle_outcome(&mut self, outcome: &Outcome) { match outcome { - Outcome::ExpChange { - uid, - exp, - xp_pools: _, - } => self.floaters.exp_floaters.push(ExpFloater { - owner: *uid, - exp_change: *exp, - timer: 4.0, - rand_offset: rand::thread_rng().gen::<(f32, f32)>(), - }), + Outcome::ExpChange { uid, exp, xp_pools } => { + self.floaters.exp_floaters.push(ExpFloater { + owner: *uid, + exp_change: *exp, + timer: 4.0, + rand_offset: rand::thread_rng().gen::<(f32, f32)>(), + xp_pools: xp_pools.clone(), + }) + }, Outcome::SkillPointGain { uid, skill_tree, From 104de523b7d9728f69b5ea376c474c242434447b Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Sun, 13 Jun 2021 14:35:44 -0400 Subject: [PATCH 6/6] Move changelog entry for mining to 0.10 section. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99fa93a4cc..d42eaa89b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Added a skill tree for mining, which gains xp from mining ores and gems. ### Changed @@ -85,7 +86,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Meat drops from animals - New ores, plants and hides to be looted from the world and processed into craft ingredients - Added more crafting stations, loom, spinning wheel, tanning rack, forge -- Added a skill tree for mining, which gains xp from mining ores and gems. ### Changed