1950 Commits

Author SHA1 Message Date
Sam
f3d01b3160 Rolling now dodges melee attacks again. 2021-02-02 13:06:34 -05:00
Sam
fde961a498 Attacks can now inflict de/buffs. 2021-02-02 13:06:33 -05:00
Sam
26bcfeb66f Attacks can now reward energy. 2021-02-02 13:06:33 -05:00
Sam
c6012f5b00 Critical hits are now functional. 2021-02-02 13:06:32 -05:00
Sam
b78230275d Applied basic functionality of attack-effects system to melee. 2021-02-02 13:06:32 -05:00
Sam
95a6a637f1 Changed name of Attacking comp to MeleeAttack 2021-02-02 13:06:31 -05:00
Sam
7050398af0 Attack builder implemented. 2021-02-02 13:06:31 -05:00
Sam
5794faa761 Changed knockback from an enum to a struct. 2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
77e1b5bf17 fixing #944 - LeapMelee fall damage fix & adjustments 2021-02-02 16:51:04 +00:00
Blob
3a71303aaf Fix projectile explosion being triggered twice. 2021-02-01 15:41:34 +00:00
James Melkonian
8951e427e4 Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
jiminycrick
76fd36130d Quick poise fix 2021-01-29 15:52:40 -08:00
jiminycrick
ae8722794b Address some comments
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jiminycrick
b689226173 Add migration for starter gear 2021-01-28 17:22:39 -08:00
jshipsey
1b0bf21775 animal stuns
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
1fadcf51ba Some preliminary balancing
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
95c3af1123 starting stun anim
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
jiminycrick
27ad277051 Made stunned state invulnerable to poise damage
Fixing silly error for comp creation
2021-01-28 17:22:35 -08:00
jiminycrick
a2262c5c6b Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
221d4c8cdc Add knockback to poise 2021-01-28 17:22:35 -08:00
jiminycrick
df124a1eef Very basic functioning stun 2021-01-28 17:22:35 -08:00
jiminycrick
df4c9eff49 Initial broken implementation of poise
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
jiminycrick
64a3c16999 Update rand dependency 2021-01-26 20:35:08 -08:00
Sam
25632a733f Fixed base energy being 0. 2021-01-26 21:25:00 -05:00
Entropy9s
1c6851c5d1 StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Sam
b00f6ba8a1 Changed how beams determined the energy regen and energy cost. 2021-01-24 23:47:10 -05:00
Snowram
fd17d10f06 Merge branch 'swilliams/gems' into 'master'
Adds 6 different gems and removes shiny gem.

See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Samuel Keiffer
f183f52b91 Merge branch 'lboklin/glider-stamina' into 'master'
Glider stamina cost now only when first starting to glide based on fall speed

See merge request veloren/veloren!1727
2021-01-25 00:17:32 +00:00
Samuel Keiffer
a6271e94f7 Merge branch 'sam/speed-beam' into 'master'
Fixed how the speed stat was applied to beams.

See merge request veloren/veloren!1732
2021-01-24 23:23:53 +00:00
Sam
46d00e3d5e Fixed how the speed stat was applied to beams. 2021-01-24 16:01:38 -05:00
Sam
15f0ce1173 Nerfed bow M1 and M2, slightly buffed bow skillbar ability. 2021-01-24 14:24:59 -05:00
Scott Williams
95c67cbfbd Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Scott Williams
5ba5740305 Added 6 gems, removed shiny gem from cave, replaced with diamond. 2021-01-24 14:00:49 +00:00
Ludvig Böklin
ee2f0f55fa Glider deploy stamina cost value tweak 2021-01-24 12:06:23 +01:00
Ludvig Böklin
712baf9c33 Glider stamina only costs on deploy 2021-01-24 10:56:35 +01:00
Samuel Keiffer
fe536dda2f Merge branch 'swilliams/hitbox-adjustments' into 'master'
General NPC Hitbox Adjustments

See merge request veloren/veloren!1723
2021-01-24 04:00:57 +00:00
Scott Williams
c7700f4caf General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
Samuel Keiffer
17f358681b Merge branch 'lboklin/glider-stamina' into 'master'
Fix glider stamina drain

See merge request veloren/veloren!1718
2021-01-23 23:21:22 +00:00
Marcel
7c6ce75e6b Merge branch 'torvus-quick-fix' into 'master'
Fix torvus

See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
Samuel Keiffer
ac87cb7155 Merge branch 'sam/skill-balancing-1' into 'master'
Skill balancing

See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
Sam
1ee7cc4760 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
Ludvig Böklin
de1fcf8938 Fix glider stamina drain 2021-01-23 18:20:43 +01:00
Justin Shipsey
ceccdecb47 Merge branch 'Rotsuoy/SavannaGrass' into 'master'
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
Rotsuoy
212ee4b407 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Samuel Keiffer
957eb91397 Merge branch 'sam/fix-dash' into 'master'
Dash now ticks damage based off distance rather than duration.

See merge request veloren/veloren!1715
2021-01-23 04:42:56 +00:00
Sam
2a6f1236d4 Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
3a36408461 Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee. 2021-01-22 18:10:47 -05:00
Sam
020e4acba4 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Scott Williams
32eca9b0a5 Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
Justin Shipsey
9bc7ad453f Merge branch 'sam/lactose-tolerant-golems' into 'master'
Gives golems a spin attack

See merge request veloren/veloren!1709
2021-01-22 07:30:53 +00:00