Commit Graph

7690 Commits

Author SHA1 Message Date
5cbdf1850c Fix travellers stuck in town
There was an off by one error in the code that negates the progress
along paths that are reversed.
2021-04-08 05:10:04 -06:00
126b7efa92 Tries to implement npcs only travelling by paths
Unfortunately, there's a degenerate case where npcs can get stuck in a
town. Not sure why
2021-04-08 04:19:02 -06:00
29a3fda7ef Refine airship pathing 2021-04-08 04:19:02 -06:00
be67ba1e63 Add CustomPath to Travel enum
Defines a custom path to follow, instead of using one from the World.
Airships use this to slightly adjust their course to reduce collisions.
2021-04-08 04:19:02 -06:00
7f9ec9e19b Convert rtsim pathfinding logic to a FSM 2021-04-08 04:19:02 -06:00
99c6e57c1f Resolve comments 2021-04-08 04:19:02 -06:00
3c7898fe8e Expect instead of unwrap 2021-04-08 04:19:02 -06:00
58274db3e3 Make rtsim entities ensure sanity of track 2021-04-08 04:19:02 -06:00
c281fb32cc First pass at rtsim following paths 2021-04-08 04:19:02 -06:00
103a757d17 Merge branch 'holychowders/fix_issue_#1061_combat_rating_affected_by_buffs' into 'master'
Fix issue #1061 - Combat Rating is Affected by Buffs

Closes #1061

See merge request veloren/veloren!2084
2021-04-08 02:51:21 +00:00
54d0c0f098 Update the changelog 2021-04-07 17:38:09 -07:00
a4b00a3b97 Fix issue #1061 - Combat Rating is Affected by Buffs
Replaced `stats` with `None` into the calculation for damage reduction
2021-04-07 17:09:51 -07:00
ea5a02d7cd change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have it moved/or taken effects from other threads.
some id increases are kept Relaxed, SeqCst shouldn't be necessary there.
Not sure about the bool checks in api.rs
2021-04-07 23:17:09 +02:00
fd77966293 Merge branch 'hqurve/crafting-ui' into 'master'
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window

See merge request veloren/veloren!2081
2021-04-07 20:24:23 +00:00
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
a30cbaf735 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
dbee13f9be Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
45fb9f3211 Address comments
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
2021-04-07 22:02:42 +02:00
993ae8fff7 address mutability comment 2021-04-07 17:39:12 +02:00
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
114715908a fix tag removing 2021-04-07 17:26:54 +02:00
b1718cf578 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
51ef3547a1 cleanup old code 2021-04-07 17:26:27 +02:00
a483817fc2 Change check for trading NPC 2021-04-07 17:26:19 +02:00
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
41314e9098 Create Behavior component 2021-04-07 17:21:53 +02:00
60efd682e2 Merge branch 'vfoulon80/l18n-fr-missing' into 'master'
Add missing translations + Add "enemy_killed" text for villagers

See merge request veloren/veloren!2079
2021-04-07 14:42:32 +00:00
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
45b4349bc7 Merge branch 'james/topo-map' into 'master'
Adds topographic map option and allows for map layers

See merge request veloren/veloren!2074
2021-04-07 09:34:13 +00:00
7d75eaedd1 Merge branch 'aweinstock/small-fix-20210406' into 'master'
Fix loadout_builder panic.

See merge request veloren/veloren!2075
2021-04-06 16:37:19 +00:00
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
f2ebbb7f7f Map icon scaling 2021-04-06 08:42:09 -07:00
8ee1fc4a0f Add layers to minimap 2021-04-06 08:42:08 -07:00
bacda06dba Added map layers 2021-04-06 08:42:07 -07:00
70ede7f34d Topographic map 2021-04-06 08:42:06 -07:00
2c4612bff1 Fix loadout_builder panic. 2021-04-06 10:34:13 -04:00
187a85e056 Merge branch 'renamenorsk_norskbokmål' into 'master'
Rename Norsk to Norsk bokmål

See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
2380f9e8c2 Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
2ed85a2dc0 Merge branch 'tonyvu0605/VietTranslation' into 'master'
Started Vietnamese Translation

See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
f0cabf1add Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
3c50321a80 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
1648d6f7e9 Merge branch 'autoglide' into 'master'
Change to auto walk/glide.

See merge request veloren/veloren!2070
2021-04-06 01:53:28 +00:00
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
4dde9f84b0 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00