91 Commits

Author SHA1 Message Date
Avi Weinstock
b259acaa59 Trade implementation progress.
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
2021-02-12 18:43:09 -05:00
Avi Weinstock
94ef4a6917 Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Sam
7e3ec94207 Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead. 2021-02-08 13:55:50 -05:00
Sam
d6ffb1cea5 Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common. 2021-02-08 12:31:17 -05:00
Sam
7289ee89fa Server events directly emitted in states now. 2021-02-08 12:01:48 -05:00
Sam
45be7dd64d Eradicated clones 2021-02-08 12:01:48 -05:00
Sam
b7496b438f Inventory changes that modify the loadout now go through a control action instead of a control event. 2021-02-08 12:01:47 -05:00
James Melkonian
4d4c6d8b13 Move agent system to server 2021-02-06 06:15:25 +00:00
Sam
64868ad7a3 Addressed comments. 2021-02-02 16:08:09 -05:00
Sam
30f33a03b7 Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps. 2021-02-02 13:07:07 -05:00
Sam
1bc1b5f200 Added support for damage falloff with explosions. 2021-02-02 13:07:06 -05:00
Sam
486de732fc Explosions now use attacks. 2021-02-02 13:07:06 -05:00
Sam
7317599bed Shockwaves now use attacks. 2021-02-02 13:07:05 -05:00
Sam
f1f4251cb7 Effects on attacks can now require energy. 2021-02-02 13:07:05 -05:00
Sam
52dbf3f1a8 Beams now use Attack, with limited functionality in some cases. 2021-02-02 13:07:03 -05:00
Sam
9783fc8408 Projectiles now use attacks. 2021-02-02 13:06:57 -05:00
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
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
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
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
Scott Williams
c7700f4caf General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
Sam
1ee7cc4760 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05: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
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
Sam
83b2c588d9 Changed how it moved golem. 2021-01-20 17:22:24 -05:00
Sam
db59547de9 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00
jiminycrick
6ac42b3a61 Make only humanoid agents attempt to roll 2021-01-19 10:42:46 -08:00
Samuel Keiffer
f96489b66a Merge branch 'sam/combat-skill-trees' into 'master'
Sam/combat skill trees

See merge request veloren/veloren!1680
2021-01-19 14:18:07 +00:00
Monty Marz
88a8814fe7 Better visuals for skill button labels, don't show "0 EXP" in the SCT
Made functions that were called every frame significantly cheaper.

Final UI fixes.
2021-01-19 08:08:29 -05:00
Sam
467ed6d7d3 Skills are now factored into combat rating. New formula for exp scaling per SP.
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
2021-01-19 08:08:26 -05:00
jshipsey
2866091d7b keyframed axe spin
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Sam
1ea9335c40 Added level up sound to skill point gain. Fixed tests.
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
92b72d94ba Humanoid skill config and AI skill check
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00