From 431bc8a0692e2d5f4d73b92997a75acd208c2e81 Mon Sep 17 00:00:00 2001 From: timokoesters Date: Fri, 27 Mar 2020 17:07:19 +0100 Subject: [PATCH 1/6] Projectile hits regenerate energy --- common/src/comp/inventory/item.rs | 2 ++ common/src/comp/projectile.rs | 1 + common/src/sys/projectile.rs | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index 27ced5f27b..ce7d6e936d 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -106,6 +106,7 @@ impl ToolData { cause: HealthSource::Projectile { owner: None }, }), projectile::Effect::Knockback(10.0), + projectile::Effect::RewardEnergy(100), projectile::Effect::Vanish, ], time_left: Duration::from_secs(15), @@ -146,6 +147,7 @@ impl ToolData { amount: -1, cause: HealthSource::Projectile { owner: None }, }), + projectile::Effect::RewardEnergy(100), projectile::Effect::Vanish, ], time_left: Duration::from_secs(20), diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index a4dda1ac7c..8ff384a87a 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -7,6 +7,7 @@ use std::time::Duration; pub enum Effect { Damage(comp::HealthChange), Knockback(f32), + RewardEnergy(u32), Explode { power: f32 }, Vanish, Stick, diff --git a/common/src/sys/projectile.rs b/common/src/sys/projectile.rs index 3f0ee14a04..bf0fc1064d 100644 --- a/common/src/sys/projectile.rs +++ b/common/src/sys/projectile.rs @@ -1,5 +1,7 @@ use crate::{ - comp::{projectile, HealthSource, Ori, PhysicsState, Pos, Projectile, Vel}, + comp::{ + projectile, Energy, EnergySource, HealthSource, Ori, PhysicsState, Pos, Projectile, Vel, + }, event::{EventBus, LocalEvent, ServerEvent}, state::DeltaTime, sync::UidAllocator, @@ -22,6 +24,7 @@ impl<'a> System<'a> for Sys { ReadStorage<'a, Vel>, WriteStorage<'a, Ori>, WriteStorage<'a, Projectile>, + WriteStorage<'a, Energy>, ); fn run( @@ -37,6 +40,7 @@ impl<'a> System<'a> for Sys { velocities, mut orientations, mut projectiles, + mut energies, ): Self::SystemData, ) { let mut local_emitter = local_bus.emitter(); @@ -108,6 +112,15 @@ impl<'a> System<'a> for Sys { }); } }, + projectile::Effect::RewardEnergy(energy) => { + if let Some(energy_mut) = projectile + .owner + .and_then(|o| uid_allocator.retrieve_entity_internal(o.into())) + .and_then(|o| energies.get_mut(o)) + { + energy_mut.change_by(energy as i32, EnergySource::HitEnemy); + } + }, projectile::Effect::Explode { power } => { server_emitter.emit(ServerEvent::Explosion { pos: pos.0, From 369e58d8075477da3e58149e8580f0895de4bca7 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 27 Mar 2020 17:50:34 +0100 Subject: [PATCH 2/6] update help screen --- assets/voxygen/element/help.png | Bin 14939 -> 14794 bytes voxygen/src/settings.rs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/voxygen/element/help.png b/assets/voxygen/element/help.png index 604dab05f2dff4ba4173c1078a170ed40fccbf93..e93ca100b00745e34277362cd80a785f29822fd3 100644 GIT binary patch literal 14794 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 Date: Fri, 27 Mar 2020 17:50:45 +0100 Subject: [PATCH 3/6] Make apples great again --- assets/common/items/apple.ron | 4 ++-- world/src/block/mod.rs | 6 +++++- world/src/block/natural.rs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron index 0c44a094ce..7179502e22 100644 --- a/assets/common/items/apple.ron +++ b/assets/common/items/apple.ron @@ -2,11 +2,11 @@ Item( name: "Apple", description: "Red and juicy. -Restores 2 Health.", +Restores 20 Health.", kind: Consumable( kind: Apple, effect: Health(( - amount: 2, + amount: 20, cause: Item, )), ), diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs index 3c61e20936..a994baf712 100644 --- a/world/src/block/mod.rs +++ b/world/src/block/mod.rs @@ -628,7 +628,11 @@ pub fn block_from_structure( ) .map(|e| e as u8), )), - StructureBlock::Fruit => Some(Block::new(BlockKind::Apple, Rgb::new(194, 30, 37))), + StructureBlock::Fruit => Some(if field.get(pos + structure_pos) % 3 > 0 { + Block::empty() + } else { + Block::new(BlockKind::Apple, Rgb::new(194, 30, 37)) + }), StructureBlock::Chest => Some(if structure_seed % 10 < 7 { Block::empty() } else { diff --git a/world/src/block/natural.rs b/world/src/block/natural.rs index 8e472e53e6..c60d593d34 100644 --- a/world/src/block/natural.rs +++ b/world/src/block/natural.rs @@ -56,7 +56,7 @@ pub fn structure_gen<'a>( ForestKind::Palm => &PALMS, ForestKind::Savannah => &ACACIAS, ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 16 == 7 => &OAK_STUMPS, - ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 8 == 7 => &FRUIT_TREES, + ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 19 == 7 => &FRUIT_TREES, ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 14 == 7 => &BIRCHES, ForestKind::Oak => &OAKS, ForestKind::Pine => &PINES, From d32ec6ea40520171dab0f2b7fd586579d21be8bb Mon Sep 17 00:00:00 2001 From: timokoesters Date: Fri, 27 Mar 2020 18:17:41 +0100 Subject: [PATCH 4/6] Fix char selection not showing tools --- common/src/states/basic_ranged.rs | 2 +- voxygen/src/menu/char_selection/mod.rs | 2 +- voxygen/src/menu/char_selection/ui.rs | 28 +++++++++++++++++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/common/src/states/basic_ranged.rs b/common/src/states/basic_ranged.rs index 81f1485baf..3652c40e1e 100644 --- a/common/src/states/basic_ranged.rs +++ b/common/src/states/basic_ranged.rs @@ -28,7 +28,7 @@ impl CharacterBehavior for Data { fn behavior(&self, data: &JoinData) -> StateUpdate { let mut update = StateUpdate::from(data); - handle_move(data, &mut update, 0.2); + handle_move(data, &mut update, 0.3); handle_jump(data, &mut update); if self.prepare_timer < self.prepare_duration diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs index a8c767c9fc..3ca05435d4 100644 --- a/voxygen/src/menu/char_selection/mod.rs +++ b/voxygen/src/menu/char_selection/mod.rs @@ -117,7 +117,7 @@ impl PlayState for CharSelectionState { global_state.window.renderer_mut(), self.client.borrow().get_tick(), humanoid_body.clone(), - loadout, + loadout.as_ref(), ); // Draw the UI to the screen. diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index a1ff30d842..2c8d7ac104 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -333,9 +333,31 @@ impl CharSelectionUi { } } - pub fn get_loadout(&mut self) -> Option<&comp::Loadout> { + pub fn get_loadout(&mut self) -> Option { match &mut self.mode { - Mode::Select(_) => None, + Mode::Select(characterdata) => { + let loadout = comp::Loadout { + active_item: characterdata + .as_ref() + .and_then(|d| d.tool.as_ref()) + .map(|tool| comp::ItemConfig { + item: (*load_expect::(&tool)).clone(), + ability1: None, + ability2: None, + ability3: None, + block_ability: None, + dodge_ability: None, + }), + second_item: None, + shoulder: None, + chest: None, + belt: None, + hand: None, + pants: None, + foot: None, + }; + Some(loadout) + }, Mode::Create { loadout, tool, .. } => { loadout.active_item = tool.map(|tool| comp::ItemConfig { item: (*load_expect::(tool)).clone(), @@ -345,7 +367,7 @@ impl CharSelectionUi { block_ability: None, dodge_ability: None, }); - Some(loadout) + Some(loadout.clone()) }, } } From 38eae21adece06d427be1beab2f0b084e4974005 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 27 Mar 2020 18:31:45 +0100 Subject: [PATCH 5/6] fire bolt visuals --- .../voxel/weapon/projectile/fire-bolt-0.vox | Bin 0 -> 1804 bytes .../voxel/weapon/projectile/fire-bolt-1.vox | Bin 0 -> 5416 bytes .../voxel/weapon/projectile/fire-bolt-2.vox | Bin 56123 -> 0 bytes .../voxel/weapon/projectile/fire-bolt.vox | Bin 56287 -> 0 bytes .../voxygen/voxel/weapon/projectile/leaf.vox | Bin 55755 -> 1272 bytes .../voxel/weapon/projectile/nature-bolt.vox | Bin 56123 -> 1640 bytes .../voxel/weapon/projectile/simple-arrow.vox | Bin 55647 -> 1164 bytes .../voxel/weapon/projectile/snake-arrow.vox | Bin 55679 -> 1196 bytes common/src/comp/body/object.rs | 4 +++- common/src/comp/inventory/item.rs | 2 +- voxygen/src/scene/figure/load.rs | 3 ++- 11 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 assets/voxygen/voxel/weapon/projectile/fire-bolt-0.vox create mode 100644 assets/voxygen/voxel/weapon/projectile/fire-bolt-1.vox delete mode 100644 assets/voxygen/voxel/weapon/projectile/fire-bolt-2.vox delete mode 100644 assets/voxygen/voxel/weapon/projectile/fire-bolt.vox diff --git a/assets/voxygen/voxel/weapon/projectile/fire-bolt-0.vox b/assets/voxygen/voxel/weapon/projectile/fire-bolt-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..d1d3a2b69c575e62adfcd3506f0aa2d14061e5f9 GIT binary patch literal 1804 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 C^W|s& literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/projectile/fire-bolt-2.vox b/assets/voxygen/voxel/weapon/projectile/fire-bolt-2.vox deleted file mode 100644 index caee1ba7492a421796b95dd2e64152811ff8ea41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56123 zcmeI)X?Rpu83*ulm+3|o_XR}87DS;WcajW=X=@TpU`PpBAS{9QGRfSTOfs1nXC@@U z1*`~_qNojM(Hca+78k72QgLZTtsC09P?x$?>xx>px-YNqd+uaNLi+fne)&IM`e)8L z_bm5!&)oY^(x+=%*9Z42rCJ(Rtl|%~;9;d!ujp#JTq=BAG$HFZbgh_Y>SlElf0%}9 zusDXP8cdGGu{nmtb&kccrEGJVV=AM;;uwa}U~(*u&Ebi74sPRE9Ges1D2v-UCdcB~ zoB+qLxs79SY$*r0%rTV7YnY7|$L6v!OkRuII2Om|1USkx8x51&`P1UqTn_N3vbf#i zcK)b5_i(_*F9A#S(gJW_mo7*`7juGIt0QcqC98=l6wjD7Ho7d#B zVe^_cuV?dm+{Up?ZsPr`ZonvuqDcfA;q}Oz;dV&9SDgAD6iHe7mS7>T4xx@>4RZQ(AS9C$I%Bj8V>3UU7?Il-z!Cc{~z2q^zpx2VAy)K@vSGDx& zSiZDD$p!H-Yt}59J9jS4pFf`#E?h|E<>eF(hpD!A-;lG&VLyhYug7 zW5Sw7RaEHZ)#CnThGZl0mbr>n1^ zGwloLq5iArk)0trcW?|CWX| zD^E*-4|%7^9~JbwvoMnNF5!wBOUC1ac~4#^?vR&E^cJLFNM1s2E;E?ul^38>7Sf~g zS+B>hhxGudyV+ukymH)RCg)cxbv0Vh(>c=SCLC#7?39K5YRK(C?IR4k_}6E*Vo#?go!MKgLuqQDG%thF)Iw>l zhSFRErMVVL^KvLn9h9aXO49(PSqi0j1(c={O49_TSq7z94yB1eX;wgKnxQn;L1|V( zXP?|SEY2FN_*$bt43zX)q zP@1Nhij6!MlL233wY2FT{c?Xo{Rw&H@D9t;eH1C4a+yrk3+ zKxw`Sr8x_wc?e4LEhx>mp)}ut(tH<6^Dva=dr+G1Luq~hrTHP0<`F2(kDxR^hSEF= zrTGbz=BH4apFwGU4yE}8l;)REnsZQ^UqNYp4W;=Fl;$xg&2OPJzk|~J9!m2ED9s=1R{sg7@GnD2pP@2C&Y5oSK`8$;6A5fZqLTUa5rTI6MhM+XcQ0j6P1vqYDBtQ`W>Tb5!V#|c=SCLC#7?39K5YRK(C?IR4k_}xz?r4S8}TyCZ{CP zYkBD{x?vy_^Ge;5y0cQ^ncO{@j>{Zwvbe6U^v~d?if}ksjJ^%gbRy-+;II=6J9?IA z&Wp;TPMPCha4ebcFD+WlXXKEXCoejfPX6~rg}GQyFx?c%?vy`;EEm%9T*kl4GVow= zplt5swWEare^;X;Zp=qll^Xgl9PE@X3= zKHXp6xOirZOi>lSlz(@lSua-@%y~YfBCM~ZI~9$2Zd#9-&~W|>xvGee=}QP*h$mA6 zy5J3GGctj{TU(O;73)*c9xs3XdJ@qA*_ev53b{S&r<+;tOm`}i8PI}(bjhUrPEe zU0<9<29_4qg+wkn;rgXXFRgbmpN;k;(|RNPcb%Tr-+8A(ci~4mn~IL;-I2?^vAB?& zEG^_u<`oJ&*@WAsce`{EdJ0|h7Oen~|^xz&Zm68sj{{R9$ BKh*#L diff --git a/assets/voxygen/voxel/weapon/projectile/fire-bolt.vox b/assets/voxygen/voxel/weapon/projectile/fire-bolt.vox deleted file mode 100644 index 1dab743856232bd2a3800b54ead1990ec2b27d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56287 zcmeI)dz_S283*w5p7YMKfMqwkV8*5r1+vWSGAyndyUHr8BFkk37WHLz=bhPiW_I3b zW)^m-gp9C|q7p4BTO%-~3t1>e7tP8nDeZz?>|)u~%5HYQJU-8PhlPdp(?9ml@6(G9 zd(L^!InVi?Gw=I>T|Qp6WL3irN~y)|i!S9a>VZd;TE3{K<0Pr@RmU;8_I1_jo<;X- zX;tcW4&%Cc&0*?d1Ad6Wym6hpjwxQN!)23qcy1;0*J;kDIiKcyn)4aXXE>kXe1`KG&c}7mp*b85#SyDF zoR?#w8yXJH;YgWt8eW6TM%S>Da~aOBWeqXjD-M_44(C!FZk@xq9nS5r-{Jh4^J~tp zIlt!on)7p=b7>BTLvh6FHRspG*hCY$9EL+nXwCUKIER)zc8@uCo#Gs-;P8GJ-gC`i z_$*=*9M0!(K8N!;oX_EWT<5tphr^-dE6=SY50BRpJXSjJ=!jGQ;`h2e0yuTeZs=|FQBt~>RLb1D9OC?2CYpTl{1EQgV=6BYXu@2|r~ zhszF|9bS*-HqC9C+cdZ7Fedd$PRVdMlXOW>(nE&B<+3x$aNTg-a9zqS_j60d70WJt zsr^JB{mtPb)h;Q^RlI0f*K?wxI?^Uz<#CWXX4dZ29uH->E>lRe^gGhmtH!t%Z-_S} zipv*vy+H2sCEevZGPRU1X+>^mxF*V>zB`yh$?In#T^hzAxOO|*-ucqUB z$%;2rUauDEwd|tv+m$ScuPIZe(A23@ zY1*`DG-JjLnmv0qC6h^NZEdCb^XF4XM+bFwcG8k1OQ^fMn|gYB$n!i(r_+?nCx# zQRg&8-7^)fjVsC}6%Dp3+SI0KYlouiI~9#|Dcaku=#CymZA~-j!nw0)aceUzpWi~O z7o1CL7q(Gm@d7F=TS%3ai)nbxQrfh(o3{9?X<<*X+wc_ZK}{MTZZZG z>lGc|qv-KF`BQfv#{;JjJvfu-a2uU@;h8jZ#Y}4IZKAVFXH)xC?X+;)Lh9PtMJsPz zN&Y^cDhDbw^@59O+R`36%L}L}KSc9}uc7(Z+&~>W_Rz(<_EXPo2PwGy9vWfGVO~EK zCP%TYjnqEow0rQ}GGN)MLo{lg_5ckN_bzPIIc zI<#~;J)A#_9^I0l$8VlXPaZtSu366WX|E>^JngOj-+1PC;LxE%&-|qS!x`oIU);Xp zl6$4Vm%LNtk2Ch&SsgC<^<44NK_)X;@#S^mt@nd$e^vS=l!@+F7ya3~k2|KD% z^82EC(hiWiSE{whE5{4Ma#U@$)l}6^7ne3K8<)0O@y29SO+-ECMYZ)&t;HtF6b6T6 z9d?9QNSAHpSdF~BaWrDb(a165XygNlqmc(2MfXX=X!d;!v6dl%@$v(+s7V1EonqY34#{TA(!ZpfqPgXe{rFk`!WEU<{~J~LMY85C`~7n=3*$# zB~Y5hP#XEa+2H)7a0!&A3re#TO0x_~vm8pZ0!q^jrMV1Bvl2?P3QDsYO49?SSp%iH z97=Nql;%n(jR&P!3#CaxX?meFeNdV-l*WhBWS}%zC`~_Ntm+y<`PehQ`e8Iwmz!0*hHDa;E=4tj_?ZUvaOVtoZoo{x5}kC zMkO|vUtDJ!2Ew#I+C8wHl@ia`?m;mlb9g~5udU=Kb5m0?*-#6+4XI+b;LG4-ydfF4 zv!u#?N|MGK+;ds1P}vJ;FqMbKM_rjT?AD=&x9F3Z51 zYXjwQ$L3B|2clC=4SVSbJ!iBbKZ*O#Nj4B3q z(snf>&d1D9~SJECM3sswH#wUs&;IapZ;Rnrt1p}VOj9=;tlpc zo4WtVqi!dfUYkhvb95VIRUp*qYC5zB|V-;&i diff --git a/assets/voxygen/voxel/weapon/projectile/leaf.vox b/assets/voxygen/voxel/weapon/projectile/leaf.vox index 14062b39e6353f324ce79df9de6015bdc9d18a2e..f31aa3d90a1afbfa2bf8f9a78f3d8f059932a46e 100644 GIT binary patch delta 32 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 bw|7b{qHCI|cT)NUOZZE7?)8#MX%PGmlEOdV diff --git a/assets/voxygen/voxel/weapon/projectile/simple-arrow.vox b/assets/voxygen/voxel/weapon/projectile/simple-arrow.vox index c091ed4b520e68347668144a380d3ed46d748ddd..54a1c5f7f1536aa2dc83d125ff31869e925eb8a5 100644 GIT binary patch delta 32 mcmcb=iMfYUD9k@XVHyJigRi5fACO|GV3{bCx7nMChXnwUH3zW( literal 55647 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 diff --git a/assets/voxygen/voxel/weapon/projectile/snake-arrow.vox b/assets/voxygen/voxel/weapon/projectile/snake-arrow.vox index f394492038a9b5706615413ef1c69413034a08ba..cb00b5ab18c298bb04df436c8a48e6e7d699c2aa 100644 GIT binary patch delta 32 mcmeyriFpmDP?&#&!ZZd3246={KOn_0gJq&n-{x#49u@$bRR~c4 literal 55679 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 G!T$tP1S;78 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 514a191bf1..d179884062 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -55,6 +55,7 @@ pub enum Body { BoltFire = 49, ArrowSnake = 50, CampfireLit = 51, + BoltFireBig = 52, } impl Body { @@ -64,7 +65,7 @@ impl Body { } } -const ALL_OBJECTS: [Body; 51] = [ +const ALL_OBJECTS: [Body; 52] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -115,5 +116,6 @@ const ALL_OBJECTS: [Body; 51] = [ Body::CarpetHumanSquircle, Body::CraftingBench, Body::BoltFire, + Body::BoltFireBig, Body::ArrowSnake, ]; diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index ce7d6e936d..f29046354f 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -182,7 +182,7 @@ impl ToolData { time_left: Duration::from_secs(20), owner: None, }, - projectile_body: Body::Object(object::Body::BoltFire), + projectile_body: Body::Object(object::Body::BoltFireBig), projectile_light: Some(LightEmitter { col: (0.72, 0.11, 0.11).into(), ..Default::default() diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index a2e51c48ab..b9ea7bc49e 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -1869,7 +1869,8 @@ pub fn mesh_object(obj: object::Body) -> Mesh { Body::Pouch => ("object.pouch", Vec3::new(-5.5, -4.5, 0.0)), Body::CraftingBench => ("object.crafting_bench", Vec3::new(-9.5, -7.0, 0.0)), Body::ArrowSnake => ("weapon.projectile.snake-arrow", Vec3::new(-1.5, -6.5, 0.0)), - Body::BoltFire => ("weapon.projectile.fire-bolt", Vec3::new(-3.0, -5.5, -3.0)), + Body::BoltFire => ("weapon.projectile.fire-bolt-0", Vec3::new(-3.0, -5.5, -3.0)), + Body::BoltFireBig => ("weapon.projectile.fire-bolt-1", Vec3::new(-6.0, -6.0, -6.0)), }; load_mesh(name, offset) } From 14b3d8970a87887e7768e010915a2a8780e29ea9 Mon Sep 17 00:00:00 2001 From: timokoesters Date: Fri, 27 Mar 2020 18:38:01 +0100 Subject: [PATCH 6/6] Increase movement speed, make npcs slower than players --- common/src/comp/inventory/item.rs | 2 +- common/src/states/utils.rs | 4 ++-- server/src/events/entity_manipulation.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index f29046354f..f1b29b8a3f 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -165,7 +165,7 @@ impl ToolData { energy_cost: 400, holdable: false, prepare_duration: Duration::from_millis(800), - recover_duration: Duration::from_millis(300), + recover_duration: Duration::from_millis(50), projectile: Projectile { hit_ground: vec![ projectile::Effect::Explode { power: 1.4 }, diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 4c635cd68e..043468c0ae 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -9,8 +9,8 @@ use vek::vec::Vec2; pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0; const BASE_HUMANOID_ACCEL: f32 = 100.0; -const BASE_HUMANOID_SPEED: f32 = 150.0; -const NPC_HUMANOID_SPEED: f32 = 150.0; +const BASE_HUMANOID_SPEED: f32 = 170.0; +const NPC_HUMANOID_SPEED: f32 = 170.0; const BASE_HUMANOID_AIR_ACCEL: f32 = 15.0; const BASE_HUMANOID_AIR_SPEED: f32 = 8.0; const BASE_HUMANOID_WATER_ACCEL: f32 = 70.0; diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 714d35933d..17231b07f1 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -194,7 +194,7 @@ pub fn handle_respawn(server: &Server, entity: EcsEntity) { pub fn handle_explosion(server: &Server, pos: Vec3, power: f32, owner: Option) { // Go through all other entities - let hit_range = 2.0 * power; + let hit_range = 3.0 * power; let ecs = &server.state.ecs(); for (pos_b, ori_b, character_b, stats_b) in ( &ecs.read_storage::(),