64f0f05608
Fixed bug with healing above 5.0 and preparing for options
2022-06-29 17:31:10 +03:00
db16e6147c
Instance inside projectile constructor is now a variable
2022-06-29 17:31:09 +03:00
202d558246
Instance number generated inside projectile constructor, remove crit field
2022-06-29 17:31:07 +03:00
6c75ad6ef8
Code quality changes and comments
2022-06-29 17:30:54 +03:00
c0e78d869e
Instance numbers are now based on the AttackDamage struct
2022-06-29 17:30:53 +03:00
ac5bf53c42
Instance numbers for HpChanges
2022-06-29 17:30:50 +03:00
f8924d6c1a
tweaks to damage floaters
...
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
7a1e19d42c
Crits now only glob with eachother, now show up like healing
...
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
2022-06-29 17:30:29 +03:00
ce95680df9
Addressed comments, health and damage floaters are now separated
...
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
2022-06-29 17:29:59 +03:00
94f193fbe0
Damage outcomes are now emitted with health change events
...
Being healed and damaged at the same time still leads to issues - needs to be sorted out
2022-06-29 17:29:19 +03:00
634a3095d6
Handling crits (very bad color choice+naming)
2022-06-29 17:24:05 +03:00
93d3ce18b4
Remove dbgs and temporary? 0.0 damage fix
2022-06-29 17:24:05 +03:00
aee7888a92
HpFloaters are now created by Outcomes, touched up Damage Outcome
2022-06-29 17:24:05 +03:00
bf6c6fb33d
Changed Damage Outcome to store more data
2022-06-29 17:24:05 +03:00
10bbea89e2
Merge branch 'juliancoffee/add_ability_i18n' into 'master'
...
Add i18n keys to abilities and smol fix
Closes #1253
See merge request veloren/veloren!3446
2022-06-26 19:50:04 +00:00
3e73fba165
Better naming for shortened key functions
...
* Old display_shortened that returned Option is now called try_shortened
* What was called try_shortened is now just display_shortest, because if
shortened version isn't available, it means that regular version is
already shortened.
2022-06-26 21:59:36 +03:00
3d1b2735a2
Clean i18n lifetimes
2022-06-26 00:44:55 +03:00
27e67e79ec
(uk_UA) Add abilities translation
2022-06-25 18:19:36 +03:00
9d928261cb
Try to display shortened version of key in diary
...
* Make try_shortened method that tries shortened version of key or
regular version if shortened one isn't available
* Use it in most places where display_shortened + display_string were
used
* Use it for diary skilbar
2022-06-25 18:17:37 +03:00
8c837da561
Add i18n keys to abilities
...
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
of how i18n worked (returning key if string wasn't found), it was
impossible to do because it leads to UB in case string is missed.
To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
f4d9cca89b
Merge branch 'sam/small-fixes' into 'master'
...
Poise damage now only conditionally converted to health damage
See merge request veloren/veloren!3438
2022-06-25 01:59:00 +00:00
7a40ae2db7
tweak entity stats adlet/tracker.ron
2022-06-23 17:48:28 +02:00
16d5ea1e3c
Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats
2022-06-23 06:45:22 +02:00
80cad63633
Merge branch 'xMAC94x/tcp_read_buf' into 'master'
...
switch from `read` to `read_buf` in tcp sink. also always reserve 4 times 1500...
See merge request veloren/veloren!3445
2022-06-21 21:07:02 +00:00
3da053c8b4
switch from read to read_buf in tcp sink. also always reserve 4 times 1500 as soon as we are under 1500 bytes in order to have less allocations when sending many small msg.
...
Note: maybe upgrading tokio helps against the connection issues, there is some mio related stuff: https://github.com/tokio-rs/tokio/releases/tag/tokio-1.18.0
Note: quick also still has the old read, but its more complicated, thus i only want to change it if its tested
2022-06-21 21:24:09 +02:00
4e6e754494
Merge branch 'bd/1455' into 'master'
...
#1455 | Sprites now only spawn on designated block types
See merge request veloren/veloren!3434
2022-06-20 19:24:52 +00:00
d1c80f0b25
#1455 | Sprites now only spawn on designated block types
2022-06-20 19:24:51 +00:00
8c1d4359a8
tweak stats quadmedquick, blackwidow and throped
2022-06-20 14:12:04 +02:00
ce9ea8ba04
Merge branch 'xvar/fix-title-fps-cap' into 'master'
...
Fixed title screen FPS cap not being applied correctly when background FPS limit is greater than the title screen cap
See merge request veloren/veloren!3442
2022-06-19 20:04:14 +00:00
1dc89fbc58
tweak stats theropodbasic
2022-06-19 19:04:30 +02:00
be02e3ced0
Fixed title screen FPS cap not being applied correctly when background FPS is set to unlimited
2022-06-19 14:04:36 +01:00
37137a040f
fix pathing mammoth
2022-06-19 11:25:59 +02:00
25eed55ca9
stat tweaks to theropod, arthropods and basilisk
2022-06-19 01:35:18 +02:00
1f60bdd452
Removed sticky thread requirement from bow limbs.
2022-06-18 15:19:37 -04:00
479affe127
Merge branch 'fix-command-tab' into 'master'
...
fix
See merge request veloren/veloren!3439
2022-06-18 14:09:25 +00:00
c7a6955565
fix
2022-06-18 15:25:55 +02:00
10023b0759
tweak entity stats
2022-06-18 12:33:19 +02:00
4a5ef6dce3
Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
...
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
1e289e6335
tweaks entity stats
2022-06-17 21:48:09 +02:00
1e19f5541b
tweak entity stats
2022-06-17 21:41:04 +02:00
95148a9968
tweaks entity stats
2022-06-17 12:35:06 +02:00
33014225be
Merge branch 'imbris/remove-uneeded-tick-counter' into 'master'
...
Remove tick_count since we can already get a count of ticks via `tick_time_hist_count`
See merge request veloren/veloren!3436
2022-06-17 07:20:08 +00:00
cd503a210e
Remove tick_count since we can already get a count of ticks via
...
`tick_time_hist_count`.
2022-06-16 22:08:54 -04:00
11e71529d5
Merge branch 'imbris/event-metrics' into 'master'
...
Add metrics for counting server events
See merge request veloren/veloren!3435
2022-06-16 02:08:38 +00:00
d5718fd410
Switch to counter of events and add tick counter
2022-06-15 19:25:00 -04:00
950723dd0d
Add metrics for counting server events
2022-06-15 00:40:58 -04:00
2404f111f1
Merge branch 'maveth/client_side_mute' into 'master'
...
Add a client-side mutelist
See merge request veloren/veloren!3349
2022-06-14 20:35:01 +00:00
57ab1c5767
Add a client-side mutelist
2022-06-14 20:35:01 +00:00
0ad359f3c8
Merge branch 'zesterer/server-gameplay-settings' into 'master'
...
Added server gameplay settings, ability to toggle explosion burns off
See merge request veloren/veloren!3433
2022-06-14 15:07:20 +00:00
b555381677
Added server gameplay settings, ability to toggle explosion burns off
2022-06-14 14:24:08 +01:00
