Commit Graph

3144 Commits

Author SHA1 Message Date
juliancoffee
134699e1db Adress review:
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
  plant fields, which is kinda meh)
- better error displaying
2021-09-04 20:38:53 +03:00
juliancoffee
182d3c4815 Workaround of bug with global Player component
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
2021-09-04 02:29:02 +03:00
juliancoffee
91539a3b67 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
df066f364a Cooldowns
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
2021-09-04 01:41:48 +03:00
juliancoffee
7be1c4d14a Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
1cedaa4417 Implement /battlemode_force command
+ add placeholder for /battlemode command (currently can only show your
  battle mode)
2021-09-03 17:28:34 +03:00
juliancoffee
4709855465 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Sam
a9be3b77db Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00
Sam
c9746240ff Recover section no longer has 0 movement. 2021-09-02 19:27:07 -04:00
juliancoffee
29d91cdd6a Add support for override asset folder
- ASSETS_OVERRIDE environment variable with asset path which has higher
  priority.
2021-09-02 20:24:23 +03:00
Marcel
a7e08abec6 Merge branch 'juliancoffee/skill_boost_rework' into 'master'
ECS & Diary info synchronization

See merge request veloren/veloren!2771
2021-09-02 16:04:23 +00:00
Samuel Keiffer
36c59fcc31 Merge branch 'ubruntu/sometimes-drop-nothing' into 'master'
NPCs can drop nothing

See merge request veloren/veloren!2794
2021-09-01 23:17:36 +00:00
ubruntu
5072708123 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Sam
99b5631d9d Turn towards center of sprite instead of corner. 2021-09-01 17:24:09 -04:00
Joshua Barretto
418b9928bd Merge branch 'zesterer/tiny-fixes' into 'master'
Worldgen hotfix

See merge request veloren/veloren!2797
2021-09-01 12:47:50 +00:00
Joshua Barretto
4b7fc1f4bb Made ore streams mineable 2021-09-01 12:05:00 +01:00
Knightress Paladin
ae0be40dd5 Make parrying refund the block stamina cost and cancel the recover animation 2021-08-31 23:46:33 -07:00
Sam
8bc237142a Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite. 2021-08-31 13:57:17 -04:00
Sam
f1a9f5cfed Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement. 2021-08-31 13:37:57 -04:00
Sam
689c69b8fc Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection. 2021-08-31 13:37:56 -04:00
Sam
6d27b6eeea No longer send collect inventory event if interactable sprite kind cannot be found. 2021-08-31 13:37:56 -04:00
Sam
878bea8091 Fixed interaction to work underwater. 2021-08-31 13:37:55 -04:00
Sam
0d87e00956 Changelog and added arm length (body radius) to sprite pickup range. 2021-08-31 13:37:53 -04:00
Sam
e8636a8350 Sprite interaction now uses pathfinding to check that it can be picked up. 2021-08-31 13:37:36 -04:00
Sam
21f75f31a2 Added simple distance check for sprite interaction. 2021-08-31 13:37:36 -04:00
Sam
018f9ae53f Entities will now attempt to orient towards the sprite they are interacting with. 2021-08-31 13:37:36 -04:00
Sam
ac6f00cbae Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Sam
984e39f1a2 Sprites now go through a character state to be picked up. 2021-08-31 13:36:04 -04:00
Joshua Barretto
03f852542b Make arrows 'bonk' hanging sprites 2021-08-31 13:31:27 +01:00
Joshua Barretto
fe09ddfd67 Merge branch 'zesterer/spots' into 'master'
Spots

See merge request veloren/veloren!2695
2021-08-31 12:03:47 +00:00
Monty Marz
2e5414d3e0 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
bfbcb8bb57 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
51d8b14790 Added spot loot 2021-08-29 12:50:35 +01:00
Sam
42e9548806 Renamed variable to make more explicit what it does. 2021-08-28 18:31:44 -04:00
Monty Marz
f3b56796ed witch stuff 2021-08-28 14:53:30 +01:00
Monty Marz
599aa8135a taiga and savannah definitions 2021-08-28 14:53:30 +01:00
Joshua Barretto
ddb1104fe4 Added index customisation for world structure models 2021-08-28 14:53:30 +01:00
Joshua Barretto
7b5b2e632c sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
a66f1922aa More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Sam
126f4e406a Fixed arrows dealing damage to entities if entity walked near arrow that stuck to terrain several seconds prior. 2021-08-26 19:00:28 -04:00
juliancoffee
f5dde393d3 Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
6839bffd29 Move to one SKILL_MODIFIERS constant 2021-08-26 14:49:52 +03:00
juliancoffee
76a7b61cd2 SkillTreeModifiers data structs 2021-08-26 14:49:52 +03:00
juliancoffee
97a47900de Remove unused SkillBoost functions 2021-08-26 14:49:52 +03:00
juliancoffee
33d8c86f29 Split adjusted_by_skills by toolkind 2021-08-26 14:49:51 +03:00
Sam
ae17cc5358 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Imbris
93d7fd697d Merge branch 'imbris/some-tweaks' into 'master'
Add comment on tuple bool field meaning in pathing

Closes #758

See merge request veloren/veloren!2778
2021-08-21 16:56:01 +00:00
Ben Wallis
b82341d8af Merge branch 'xvar/book-doc-gen' into 'master'
Added cargo cmd-doc-gen to auto-generate the table of commands in the book

See merge request veloren/veloren!2776
2021-08-21 16:14:42 +00:00
Imbris
02e5cb85b6 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
3dd3e5d5ea Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00