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
Pascal Fuhrmann
77e1b5bf17
fixing #944 - LeapMelee fall damage fix & adjustments
2021-02-02 16:51:04 +00:00
Samuel Keiffer
22ee548dfd
Merge branch 'fix_projectile_explosion' into 'master'
...
Fix projectile explosion being triggered twice.
Closes #943
See merge request veloren/veloren!1745
2021-02-01 15:41:34 +00:00
Blob
3a71303aaf
Fix projectile explosion being triggered twice.
2021-02-01 15:41:34 +00:00
Joshua Barretto
9d1bbdb142
Merge branch 'james/npc-interaction' into 'master'
...
Add basic NPC interaction and fix NPC chat spamming
See merge request veloren/veloren!1726
2021-01-31 20:29:50 +00:00
James Melkonian
8951e427e4
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
Joshua Barretto
ebcf647105
Merge branch 'zesterer/snow' into 'master'
...
Added snow particles
See merge request veloren/veloren!1748
2021-01-31 16:26:21 +00:00
Joshua Barretto
60276ddcb5
Added snow particles
2021-01-31 15:15:17 +00:00
Imbris
04d75d6c15
Merge branch 'DaforLynx/cricket-fix' into 'master'
...
Lowered frequency of crickets by 5x
See merge request veloren/veloren!1747
2021-01-31 08:23:13 +00:00
DaforLynx
e01288b787
Aughihopethisworks
2021-01-30 22:27:12 -08:00
Samuel Keiffer
63e796496a
Merge branch 'james/poise-hotfix' into 'master'
...
Quick poise fix
See merge request veloren/veloren!1742
2021-01-30 01:37:31 +00:00
jiminycrick
76fd36130d
Quick poise fix
2021-01-29 15:52:40 -08:00
Samuel Keiffer
fcdc321f2e
Merge branch 'sam/readd-knockback' into 'master'
...
Restored knockback to hammer.
See merge request veloren/veloren!1741
2021-01-29 19:59:47 +00:00
Sam
59a25b0097
Restored knockback to hammer.
2021-01-29 13:46:23 -05:00
Samuel Keiffer
eb2c5e7c34
Merge branch 'fix-backpack' into 'master'
...
Fix traveller backpack having all its slots removed
See merge request veloren/veloren!1740
2021-01-29 14:07:53 +00:00
Treeco
dbf3c91c8b
Fix traveller backpack having all its slots removed
2021-01-29 12:47:30 +00:00
Marcel
afeb1621be
Merge branch 'DaforLynx/small-sound-fixes' into 'master'
...
Small audio fixes; addresses #939 and #940
Closes #940 and #939
See merge request veloren/veloren!1739
2021-01-29 11:37:10 +00:00
DaforLynx
1d6676fb98
Small audio fixes; addresses #939 and #940
2021-01-29 11:37:10 +00:00
Samuel Keiffer
ecf9d2ba14
Merge branch 'james/poise' into 'master'
...
Adding Poise to Combat
See merge request veloren/veloren!1646
2021-01-29 02:42:27 +00: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
jiminycrick
53b43e9812
Fix rebase and scrub poise from UI
2021-01-28 17:22:39 -08:00
jshipsey
1b0bf21775
animal stuns
...
Fix rebase
2021-01-28 17:22:39 -08:00
