Commit Graph

12001 Commits

Author SHA1 Message Date
socksonme
0e84794217 change font size formula to not use crit_mult + use ints for change by check 2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894 Revert some changes 2022-06-29 17:31:43 +03:00
socksonme
559d5ca804 Some changes to DamageSources + various code qual changes 2022-06-29 17:31:43 +03:00
socksonme
762b726d21 basic i18n for english + code touchups
Getting Invalid Probability error when attacking a lot of enemies - needs to be checked out
2022-06-29 17:31:42 +03:00
socksonme
ddf0ba6dd6 Small UI changes + fix hurt animation 2022-06-29 17:31:41 +03:00
socksonme
5533d139bc Slider for accumulated damage duration 2022-06-29 17:31:41 +03:00
socksonme
5360a7c93e Tons of code quality changes, added damage rounding option 2022-06-29 17:31:37 +03:00
socksonme
64f0f05608 Fixed bug with healing above 5.0 and preparing for options 2022-06-29 17:31:10 +03:00
socksonme
db16e6147c Instance inside projectile constructor is now a variable 2022-06-29 17:31:09 +03:00
socksonme
202d558246 Instance number generated inside projectile constructor, remove crit field 2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8 Code quality changes and comments 2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e Instance numbers are now based on the AttackDamage struct 2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42 Instance numbers for HpChanges 2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a tweaks to damage floaters
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
socksonme
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
socksonme
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
socksonme
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
socksonme
634a3095d6 Handling crits (very bad color choice+naming) 2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4 Remove dbgs and temporary? 0.0 damage fix 2022-06-29 17:24:05 +03:00
socksonme
aee7888a92 HpFloaters are now created by Outcomes, touched up Damage Outcome 2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d Changed Damage Outcome to store more data 2022-06-29 17:24:05 +03:00
Joshua Yanovski
9c4b03482d Fixing compression benchmarks. 2022-06-28 21:28:26 -07:00
Joshua Yanovski
29189119a8 Speed up chunk deserialization by another 80%. 2022-06-28 19:53:08 -07:00
Joshua Yanovski
50070e738b Somewhat zoomier serde. 2022-06-28 17:45:32 -07:00
Joshua Yanovski
a3b7127de9 Evven zoomier WorldGen, lots of things broken! 2022-06-28 00:24:46 -07:00
Imbris
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
juliancoffee
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
juliancoffee
3d1b2735a2 Clean i18n lifetimes 2022-06-26 00:44:55 +03:00
juliancoffee
27e67e79ec (uk_UA) Add abilities translation 2022-06-25 18:19:36 +03:00
juliancoffee
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
juliancoffee
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
Samuel Keiffer
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
Joshua Yanovski
a973155597 Zoomy worldgen WIP, please do not complain things are broken. 2022-06-24 02:48:09 -07:00
runrobdog
7a40ae2db7 tweak entity stats adlet/tracker.ron 2022-06-23 17:48:28 +02:00
runrobdog
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
Marcel
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
Marcel Märtens
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
Marcel
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
Brandon Dyer
d1c80f0b25 #1455 | Sprites now only spawn on designated block types 2022-06-20 19:24:51 +00:00
runrobdog
8c1d4359a8 tweak stats quadmedquick, blackwidow and throped 2022-06-20 14:12:04 +02:00
Ben Wallis
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
runrobdog
1dc89fbc58 tweak stats theropodbasic 2022-06-19 19:04:30 +02:00
Ben Wallis
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
runrobdog
37137a040f fix pathing mammoth 2022-06-19 11:25:59 +02:00
runrobdog
25eed55ca9 stat tweaks to theropod, arthropods and basilisk 2022-06-19 01:35:18 +02:00
Sam
1f60bdd452 Removed sticky thread requirement from bow limbs. 2022-06-18 15:19:37 -04:00
Isse
479affe127 Merge branch 'fix-command-tab' into 'master'
fix

See merge request veloren/veloren!3439
2022-06-18 14:09:25 +00:00
IsseW
c7a6955565 fix 2022-06-18 15:25:55 +02:00
runrobdog
10023b0759 tweak entity stats 2022-06-18 12:33:19 +02:00
Sam
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