Commit Graph

11706 Commits

Author SHA1 Message Date
IsseW
9abbb0e928 naming behind feature and fix addition overflow 2022-05-10 08:03:40 +02:00
holychowders
fc2095803d Use inline conditional to simplify assignment. 2022-05-09 22:23:08 -05:00
Marcel
4ce05099a6 Merge branch 'angel/change-outcomes-to-eventbus' into 'master'
Change outcomes to eventbus

See merge request veloren/veloren!3360
2022-05-09 19:58:13 +00:00
Forest Anderson
cea55143ce Change outcomes to eventbus 2022-05-09 19:58:13 +00:00
Marcel
04c4b832ca Merge branch 'isse/net-avoid-clone' into 'master'
Avoid clone in Stream::send

See merge request veloren/veloren!3362
2022-05-09 14:48:16 +00:00
Isse
06f0239130 Avoid clone in Stream::send 2022-05-09 14:48:13 +00:00
Joshua Barretto
6b69fbe9c5 Merge branch 'zesterer/ice-spawning' into 'master'
Added SpawnMode to allow for ice and water column spawning of wildlife

See merge request veloren/veloren!3358
2022-05-08 23:09:19 +00:00
Marcel
dc3bb02cb2 Merge branch 'xMAC94x/partial_buff_parallize' into 'master'
partial buff parallelization

See merge request veloren/veloren!3356
2022-05-08 20:38:58 +00:00
markobekko
8011866012 updated the italian translation 2022-05-08 21:34:10 +02:00
Marcel Märtens
3fcf95061e before buff was around 5ms - 6ms on 100 players 2022-05-08 19:49:21 +02:00
Joshua Barretto
30e73735de Added SpawnMode to allow for ice and water column spawning of wildlife 2022-05-08 12:37:29 +01:00
holychowders
4c76e9314d Use sum instead of fold. 2022-05-06 19:27:30 -05:00
holychowders
1ebbf335e1 Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve. 2022-05-06 19:25:03 -05:00
holychowders
4890ac99da Update changelog. 2022-05-06 13:15:46 -05:00
holychowders
dc9dbc30b4 - Adjust Stats Diary UI to show stealth as a percentage from armor items.
- `(Max)` is also shown when stealth from items is maxed out (currently
  30%).

Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
  - In addition, the current max stealth sum from armor is `0.3`, beyond which no stealth effect is caused.
2022-05-06 13:15:46 -05:00
holychowders
e473c47bcf Distinguish stealth from armor and stealth from sneaking. Also fixes #1525.
- Armor and sneaking have exclusive effects on overall stealth, rather
  than armor taking effect only while sneaking.

Gameplay:
- Agents factor in stealth from armor in all cases, not only when sneaking.
- Max stealth takes place when sneaking (final multiplier of `0.7`) and with stealth from armor up to `0.7` (`0.3` multiplier), resulting in a max distance modifier of about `0.5`, approximately what it was previously.
- Min stealth score from armor is now 0 instead of 2.

Internals:
- Stealth getter accounts for sneaking in final calculation, not just
  armor.
- Prevents potential division by zero.
- Stealth getter returns value that should be multiplied instead of divided.
- Legitimized stealth as a score between 0 and 1.

Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
  - Armor stealths seem to be valued between `0.0` and `1.0`, and I've reinforced this in the code. However, it is possible, particularly for the `Dragonscale` armors, to cumulatively reach a value of `2.0`.
2022-05-06 13:15:46 -05:00
Marcel
e5a840534b Merge branch 'treeco/improve-mapgen-ux' into 'master'
Improve water.rs usability

See merge request veloren/veloren!3355
2022-05-06 12:51:59 +00:00
Treeco
66fe458623 Improve water.rs usability
Will have an accompanying book update
2022-05-06 13:12:11 +01:00
Marcel
005b69edc5 Merge branch 'holychowders/fix_agents_not_responding_to_sound' into 'master'
Fix agents not hearing sounds due to reduced `listen_dist`, caused by commit `a6955e5af`.

See merge request veloren/veloren!3353
2022-05-05 09:20:13 +00:00
Marcel
5f149af1ee Merge branch 'aerialfiddle/be_BY' into 'master'
Belarusian translation: minor fixes

See merge request veloren/veloren!3350
2022-05-05 07:12:15 +00:00
holychowders
9c68fbbeed Fix agents not hearing sounds due to reduced listen_dist, caused by commit a6955e5af.
- `listen_dist` has been restored to normal and the behavior intended by
  the trouble commit has been much more properly encoded.
2022-05-04 21:22:19 -05:00
Anton Katsuba
cca14ff4a3 Minor orthography fixes 2022-05-04 16:54:21 +03:00
Marcel
84ab219cf3 Merge branch 'xMAC94x/update-toolchain' into 'master'
update toolchain to `nightly-2022-04-25`

See merge request veloren/veloren!3343
2022-05-03 14:07:49 +00:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Samuel Keiffer
3abba05fb8 Merge branch 'holychowders/improve_perception_system' into 'master'
Agent: Use FOV when scanning for hostile targets and refactor `choose_target()`.

See merge request veloren/veloren!3307
2022-05-02 22:45:14 +00:00
Marcel
0fec62a590 Merge branch 'tygyh/Deduplication' into 'master'
Extract 'calculate_projection_and_collision_dist' function

See merge request veloren/veloren!3050
2022-05-02 09:14:18 +00:00
Jonathan Berglin
144d6d41f7 Extract 'calculate_projection_and_collision_dist' function 2022-05-02 09:14:17 +00:00
Marcel
593d8fa4b5 Merge branch 'xMAC94x/update_vek' into 'master'
switch to upstream vek again

See merge request veloren/veloren!3342
2022-05-02 08:34:21 +00:00
holychowders
eab010b8c4 Change can_see_entity() parameter ordering to be consistent with other action nodes.
- Moved `agent` and `controller` to front.
2022-05-01 19:18:44 -05:00
holychowders
f2b5ea600e Revert parameter re-ordering of flee() (included in commit 9b6616fc0) to be consistent with other action nodes. 2022-05-01 19:18:44 -05:00
holychowders
a6955e5afb Re-add listen_dist check in choose_target() and add randomness to simulate agents detecting entities directly behind them. 2022-05-01 19:18:43 -05:00
holychowders
17f7353083 Move more expensive perception check below validity check in filter; Reduce number of component fetches. 2022-05-01 19:18:42 -05:00
holychowders
5d78294141 Pass positions and bodies into entities_have_line_of_sight() instead of fetching within. 2022-05-01 19:18:42 -05:00
holychowders
706ec91e69 Fix: Add alignment passivity check in is_enemy(). 2022-05-01 19:18:25 -05:00
holychowders
97e0e39887 Reduce function names and remove unnecessary component fetch from function. 2022-05-01 19:05:28 -05:00
holychowders
455cab0ee7 Address code review. 2022-05-01 18:44:10 -05:00
holychowders
995504be26 Have line-of-sight checks explicitly account for eye-height for entities. 2022-05-01 18:23:27 -05:00
holychowders
dda85e4bc3 Address code review. 2022-05-01 18:23:23 -05:00
Isse
37974fccf2 Merge branch 'devrique/catalan-language-changes' into 'master'
Catalan language improvements

See merge request veloren/veloren!3347
2022-05-01 23:14:25 +00:00
Enrique AM
132fda804e Catalan language improvements 2022-05-01 23:14:25 +00:00
holychowders
3a3e7d3055 Update changelog. 2022-05-01 17:31:10 -05:00
holychowders
645bbf7b0d Refactor: re-order function signature to make more sense. 2022-05-01 17:30:23 -05:00
holychowders
d3873e357e Agent: Use FOV when scanning for hostile targets and refactor choose_target().
- Refactors `choose_target()`, renaming it and extracting functions with more meaningful names and more correct behavior.
- Adds FOV for agents scanning for hostile targets.
2022-05-01 17:29:45 -05:00
holychowders
0fd20ba00e .gitignore: Ignore **/*.vim, notes.txt, notes.md, and todo.md.
These are added for completeness.
2022-05-01 14:36:02 -05:00
Marcel
e30845c68f Merge branch 'christof/shredded_economy3' into 'master'
Economic debugging and documentation

See merge request veloren/veloren!3309
2022-05-01 18:26:29 +00:00
Isse
8de3b83199 Merge branch 'fix_villagers_seeing_enemies_through_objects' into 'master'
Fix villagers seeing cultists and familiar enemies through objects.

See merge request veloren/veloren!3336
2022-05-01 15:06:43 +00:00
holychowders
914b44c714 Fix villagers seeing cultists and familiar enemies through objects. 2022-05-01 15:06:43 +00:00
Marcel
a22f035638 Merge branch 'xMAC94x/cleanup_old' into 'master'
remove unused file

See merge request veloren/veloren!3346
2022-04-28 11:09:11 +00:00
Marcel
3163f593ce Merge branch 'xMAC94x/fix_ci' into 'master'
accidently checked for SCHEDULE_CADENCE to be empty

See merge request veloren/veloren!3345
2022-04-28 10:25:51 +00:00
Marcel Märtens
d70c8dd160 remove unused file 2022-04-28 12:23:55 +02:00