6469 Commits

Author SHA1 Message Date
Sam
97153fc8e6 Changing main tool while in wield state moves character back to idle state. 2021-02-08 17:25:40 -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
a7e43b760f Extended what states inventory manipulations touching the loadout could affect. 2021-02-08 12:01:47 -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
Forest Anderson
f6a0360521 Merge branch 'angel/add-github-mirror-action' into 'master'
Added Action that will mirror the Gitlab repo to Github

See merge request veloren/veloren!1763
2021-02-08 15:50:50 +00:00
Forest Anderson
1bcdef613e Added Action that will mirror the Gitlab repo to Github 2021-02-08 09:55:43 -05:00
Samuel Keiffer
2abb4ac472 Merge branch 'swilliams/mindflayer-loot-table' into 'master'
Made Mindflayer drops exclusive to the Mindflayer.

See merge request veloren/veloren!1762
2021-02-07 19:04:20 +00:00
Scott Williams
0799d7fd1f Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops. 2021-02-07 19:04:20 +00:00
Samuel Keiffer
b9dc561199 Merge branch 'sam/fix-roll' into 'master'
Fixes roll being free

See merge request veloren/veloren!1757
2021-02-06 22:15:06 +00:00
Imbris
af7f21729f Merge branch 'trollderim/replace-magic-dr-number' into 'master'
Replace magic dr constant

Closes #915

See merge request veloren/veloren!1756
2021-02-06 20:28:40 +00:00
Sam
a4696e5c6f Roll is no longer free. 2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp
e56c6ecc6a Replace magic dr constant 2021-02-06 18:21:58 +01:00
Imbris
110f8f3b9b Merge branch 'james/agent-to-server' into 'master'
Move agent system to server

See merge request veloren/veloren!1750
2021-02-06 06:15:25 +00:00
James Melkonian
4d4c6d8b13 Move agent system to server 2021-02-06 06:15:25 +00:00
Imbris
500659504d Merge branch 'character_ability_refactor' into 'master'
rel: #938 - Replaces fields in CharacterAbility enum that are integers with a float

See merge request veloren/veloren!1752
2021-02-05 01:39:12 +00:00
Pascal Fuhrmann
7e99de8017 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
Imbris
c9713c1327 Merge branch 'imbris/fix-test-server' into 'master'
Fix test server

See merge request veloren/veloren!1754
2021-02-04 06:23:09 +00:00
Imbris
36f7ac900e fix test server 2021-02-04 00:18:46 -05:00
Samuel Keiffer
d3de145401 Merge branch 'azymohliad/update-uk' into 'master'
Update Ukrainian translation

See merge request veloren/veloren!1749
2021-02-03 16:18:50 +00:00
Andrii Zymohliad
66a1a5523d Update Ukrainian translation 2021-02-03 16:18:49 +00:00
Samuel Keiffer
cdec4dba72 Merge branch 'sam/fix-double-health-fetch' into 'master'
Fixed bombs panicing the server.

See merge request veloren/veloren!1753
2021-02-03 05:42:02 +00:00
Sam
14dfe5a30b Fixed bombs panicing the server. 2021-02-03 00:41:19 -05:00
Samuel Keiffer
4f866e5fc1 Merge branch 'sam/attack-effects' into 'master'
Centralized attack handling

Closes #818

See merge request veloren/veloren!1746
2021-02-02 22:27:43 +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
e92a059ab1 Changed knockback to be an effect on the overall attack, rather than a damage. 2021-02-02 13:07:07 -05:00
Sam
e5bc0d7edf Outcomes now correctly read if an attack had any healing components. 2021-02-02 13:07:06 -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
c1db9025b8 Attacks can now heal. 2021-02-02 13:07:04 -05:00
Sam
3d42e2812d Attacks can now deal poise damage. 2021-02-02 13:07:04 -05:00
Sam
34cf870cfa Lifesteal now functional on Attack. 2021-02-02 13:07:03 -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
419f3c62fd Attack effects can now have requirements. 2021-02-02 13:06:34 -05:00
Sam
54175e4710 Effects now work when not tied to a damage. 2021-02-02 13:06:34 -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
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
Samuel Keiffer
e4cc613b3d Merge branch 'Ambien/combat_issues' into 'master'
fixing #944 - LeapMelee fall damage fix & adjustments

Closes #944

See merge request veloren/veloren!1751
2021-02-02 16:51:04 +00:00