Joshua Barretto
4e61e5a04f
Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"
...
This reverts merge request !2866
2021-09-22 11:45:54 +00:00
Samuel Keiffer
0b477ec9af
Merge branch 'snowram/projectile-offsets' into 'master'
...
Set projectile offsets in states instead of globally
See merge request veloren/veloren!2855
2021-09-22 01:55:39 +00:00
ubruntu
33526afe5a
Trade Fix III: Revolutions
2021-09-21 23:16:00 +00:00
Snowram
9c2ce83430
Set projectile offsets in states instead of globally
2021-09-22 01:07:09 +02:00
juliancoffee
6e2f9be13f
Allow aiming bombs
2021-09-20 22:29:25 +03:00
juliancoffee
c069a3523d
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
ubruntu
56f26dc3a8
Another trade fix
2021-09-16 22:06:30 +00:00
Sam
99981338bb
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
2021-09-15 08:32:44 -04:00
Sam
c4c4318ac0
Fixed fall damage and sceptre regen.
2021-09-14 06:53:01 -04:00
ubruntu
8eb61192fd
Fix trade/merchant bugs
2021-09-14 07:31:06 +00:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
896d9299e5
Merge branch 'ubruntu/fix-dungeon-loot-fallback' into 'master'
...
fix BipedSmall NPCs using fallback loot table
See merge request veloren/veloren!2809
2021-09-04 18:53:55 +00:00
Bryant Deters
f8c54cbd05
added a bipedsmall variant to loot fallback
2021-09-04 12:11:09 -05:00
juliancoffee
43d40c4efc
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
1baa9e9879
Add in-memory persistence for battlemode changes
2021-09-04 01:41:48 +03:00
juliancoffee
3fd573f1ec
Allow changing battle_mode only in towns
2021-09-03 17:28:34 +03:00
juliancoffee
338e81de10
Deduplicate pvp-checks
2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418
Don't forget about pets in PvP checks
2021-09-03 17:28:34 +03:00
Marcel
970d57f905
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
ubruntu
bbc366e1b3
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Knightress Paladin
f49dc2191d
Make parrying refund the block stamina cost and cancel the recover animation
2021-08-31 23:46:33 -07:00
Sam
156820cd5c
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
c66e1b3a56
Removed distance check from sprite colelction event handling as it is already checked when entering state.
2021-08-31 13:37:56 -04:00
Sam
44c3b0f153
Added attack hook event, attacks now cancel item use and sprite interaction.
2021-08-31 13:37:32 -04:00
Joshua Barretto
6f15233448
Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed
2021-08-31 13:31:52 +01:00
Joshua Barretto
0b1a820762
Make arrows 'bonk' hanging sprites
2021-08-31 13:31:27 +01:00
juliancoffee
9211b4a00a
Inline skills::Boost to voxygen code
2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52
Move to one SKILL_MODIFIERS constant
2021-08-26 14:49:52 +03:00
juliancoffee
b1bac83319
SkillTreeModifiers data structs
2021-08-26 14:49:52 +03:00
Bryant Deters
5983c87120
Check for existing target before initiating interaction
2021-08-21 22:28:26 -05:00
Samuel Keiffer
4d62b9b937
Merge branch 'ygor/combat-rating-all-stats' into 'master'
...
Use all armor stats to calculate combat rating
Closes #1285
See merge request veloren/veloren!2770
2021-08-20 21:16:05 +00:00
Ben Wallis
9e35f5ec33
Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town.
2021-08-20 09:00:55 +01:00
Ygor Souza
54c3adf9af
Use all armor stats to calculate combat rating
...
- Added terms to account for poise (stun resistance), max energy bonus,
energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
magnitude as the other terms.
2021-08-16 19:59:54 +02:00
juliancoffee
86b9e2d8e6
Make Fireballs explode EnsnaringVines
2021-08-12 01:25:55 +03:00
Ben Wallis
7039bf7a0c
Fixed issue caused by Uid component being removed too soon on logout
2021-08-08 14:59:11 +01:00
juliancoffee
4766450258
Avoid negative bounds in harm checks
...
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
2021-08-03 18:57:53 +03:00
juliancoffee
497a94cd7a
Post review refactoring
...
* inline `target_dodging` into struct declaration as they are named
anyway
* move `avoid_harm` check out of `Attack::apply_attack` so we don't need
to pass whole Player component.
* another cosmetic things
2021-08-03 16:43:55 +03:00
juliancoffee
c7fdb640ac
Cleaning
2021-08-03 16:42:58 +03:00
juliancoffee
7d4a8cbfa4
Add battle_mode server setting and player flag
2021-08-03 16:42:58 +03:00
Joshua Barretto
422e1c30f4
Added menacing, made agent code less hacky
2021-07-31 20:33:28 +01:00
Ben Wallis
01ca6911a9
* Pets are now saved on logout and spawned with the player on login
...
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
Sam
f164d6036e
Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs.
2021-07-25 18:30:17 -05:00
Dr. Dystopia
70d0840e96
Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions
2021-07-24 20:14:26 +02:00
Dr. Dystopia
1ac3d1b761
Resolve unused '#[allow(clippy::same_item_push)]' error supressions
2021-07-24 20:08:08 +02:00
Imbris
c16c83063f
Reduce duplicate storage fetching since it has overhead
2021-07-18 15:09:37 -04:00
Snowram
fafb344404
Adds a liveness check for mounting
2021-07-18 15:04:02 -04:00
Jonathan Berglin
b15f426ee5
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
