ninefox
fc012b4989
Lantern color will now change when swapping lanterns while lantern is activated
2022-01-16 16:24:31 -08:00
terrarier2111
5da2850624
Fix loot forcing
2022-01-16 21:12:59 +00:00
Joshua Barretto
043016a433
Don't try to mount unmountable entities, clippy fixes and fmt
2022-01-16 17:53:14 +00:00
Joshua Barretto
5c37786185
Improved interpolation for riders
2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed
Overhauled mounting to make it more reliable
2022-01-16 17:53:13 +00:00
Sam
7ae8ed09f6
Addressed MR comments.
2022-01-15 21:50:27 -05:00
Sam
d0e487da8a
Ability sets now start with non-empty defaults.
2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0
Persistence of auxiliary abilities.
2022-01-15 21:42:34 -05:00
Sam
cf724bd76c
Initial UI work
2022-01-15 21:42:32 -05:00
Sam
e98edbcc7a
Conversion of poise damage to health damage now scales depending on the poise state the target is in.
...
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
2022-01-12 22:18:59 -05:00
Sam
d1e1de3b14
Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
...
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
Sam
0a9f3381f5
Skill points now attempt to be earned as experience is added.
2022-01-03 19:55:05 -05:00
Sam
6d2496b7de
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2022-01-03 19:55:04 -05:00
Sam
64c8321626
Made skill groups remain locked if skill to unlock them not acquired.
2022-01-03 19:55:03 -05:00
Sam
c44c10718b
Split skillset and skills into separate files.
2022-01-03 19:55:00 -05:00
Sam
fe45a158ed
Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp.
2022-01-03 19:55:00 -05:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Ben Wallis
022c1417b6
EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
...
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.
EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Joshua Barretto
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
Joshua Barretto
026a4a07bb
Made explosions bonk sprites
2021-11-13 17:12:17 +00:00
Joshua Barretto
edf9c59e7d
Added bomb sprites
2021-11-13 17:12:16 +00:00
Samuel Keiffer
6e57380735
Merge branch 'sam/ability-pool-and-hotbar' into 'master'
...
Ability pool
See merge request veloren/veloren!2996
2021-11-12 05:11:12 +00:00
Sam
a288f9ee43
Addressed further review.
2021-11-11 22:37:37 -05:00
Sam
d33ff9f17e
Ability pool updates after switching weapons now.
2021-11-09 19:51:06 -05:00
Socksonme
0a4df2b158
Temporary fix to the textures of dropped items
2021-11-09 06:12:16 +00:00
Sam
41effe61d0
Being knocked out of item use or sprite interact states forces a poise state.
2021-10-29 19:24:40 -04:00
Sam
aad2384622
Addressed review, changelog.
2021-10-29 17:57:00 -04:00
Sam
696da74c94
Fixed falloff calculations
2021-10-29 17:37:05 -04:00
Sam
2b447852fd
Added min fall off to explosions.
2021-10-29 17:37:02 -04:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Sam
e28ca15059
Salvaging now requires a salvaging station.
2021-10-27 17:02:33 -04:00
Sam
356057afc4
Added comments in areas that were lacking.
2021-10-27 17:02:31 -04:00
Sam
794b072d3e
Simple recipes now take a vec of slots to look in for the ingredients.
2021-10-27 17:02:30 -04:00
Sam
ed5cf8ebf9
Backend stuff for salvaging.
2021-10-27 17:02:29 -04:00
Kemper
b0b90744cf
Add a range limit to trading
...
Prevents initiating trades with client-side ghosts.
2021-10-25 00:47:45 +00:00
Q-I-U
64209967aa
Prevent lantern from turning off on death
2021-10-24 20:45:57 +02:00
Bryant Deters
b2bd43f4d3
Sneak with weapons drawn
2021-10-18 14:53:55 -05:00
Joshua Barretto
4be50b8c56
Merge branch 'ubruntu/group-loot-notifications' into 'master'
...
Groups can see what each member picks up
See merge request veloren/veloren!2906
2021-10-09 10:50:02 +00:00
ubruntu
5fbc0d3a06
Groups can see what each member picks up
2021-10-09 10:50:01 +00:00
Imbris
8987389e8a
Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain.
2021-10-08 16:17:31 -04:00
Imbris
396604f6d8
Merge branch 'ubruntu/trade-fix-part3' into 'master'
...
Trade fix (with hashmap awareness)
See merge request veloren/veloren!2877
2021-10-01 21:17:19 +00:00
ubruntu
ddd98de72f
Trade fix (with hashmap awareness)
2021-10-01 21:17:19 +00:00
juliancoffee
68aba856ec
Cleaning
2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209
Make ItemDrop component with Item again
2021-09-27 20:36:18 +03:00
Sam
56b17e7141
Format fixes.
2021-09-27 15:09:22 +03:00
juliancoffee
2475b97918
Move loot tables to entity configs
2021-09-27 15:09:22 +03:00
Sam
09dd9b4813
Changed ItemDrop to use LootSpec
2021-09-27 15:09:22 +03:00
Samuel Keiffer
ea2fa5f110
Merge branch 'sam/cr-weights' into 'master'
...
Changed weights of cr calculation and exp from cr formula.
See merge request veloren/veloren!2875
2021-09-26 18:21:56 +00:00
Sam
aa7c183862
Condense assignment of variables
2021-09-26 13:51:27 -04:00
Sam
c62162c2d3
Changed weights of cr calculation and exp from cr formula.
2021-09-25 21:52:20 -04:00
Sam
942376f88c
Made poise a float at interface of module.
2021-09-25 14:07:47 -04:00
Sam
0e5e2b46f2
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-23 14:11:09 -04:00
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
holychowders
f316f1da60
Make Guards Defend Villagers
2021-07-14 07:40:43 +00:00
Marcel Märtens
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
Joshua Barretto
9333afc6f1
Merge branch 'DixieDev/569-fix-inventory-and-lantern-usage-while-dead' into 'master'
...
Fix players having inventory and lantern control while dead
Closes #569
See merge request veloren/veloren!2569
2021-07-07 18:44:01 +00:00
DixiE
76fe63ed9a
Fix players having inventory and lantern control while dead
2021-07-07 13:18:24 +01:00
Avi Weinstock
1a60ebd5db
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
2021-07-06 16:52:12 -04:00
Knightress Paladin
2bcfa0df7a
Formatted code to omit continue keyword
2021-07-05 19:41:25 -07:00
Knightress Paladin
5c5b8ed94e
Added check for exploding lava and glowing blocks
2021-07-05 19:41:25 -07:00
Enrico Marconi
8106ac492a
Actually check if entity is alive
2021-07-05 16:09:39 +02:00
Enrico Marconi
7e97b9e495
Check if entity is alive before applying a buff
2021-07-05 16:09:39 +02:00
AldanTanneo
3804c3d032
Implemented trading stackable items with a full inventory
2021-07-05 10:34:03 +00:00
juliancoffee
d4c61ae2f3
(voxygen) Better support for multibuff items
...
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
2021-07-05 10:56:29 +03:00
Samuel Keiffer
dcdf1c83a3
Merge branch 'swrup/fix_combo_decay_on_death' into 'master'
...
fix combo not reset at respawn
See merge request veloren/veloren!2553
2021-07-05 03:56:24 +00:00
Swrup
971dd9059c
fix combo not reset at respawn
2021-07-04 17:28:11 +02:00
Avi Weinstock
836f10ae63
Remove allocation in SpriteKind::collectible_id.
2021-07-03 15:32:36 -04:00
DaforLynx
a757bf3dbd
Sfx fixes and new test
2021-06-30 11:43:00 +00:00
Samuel Keiffer
0151e5aeed
Merge branch 'potion-animations' into 'master'
...
Consumable Animations
See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
Sam
4cdf081a40
Removed potential for accessing OOB index and panicking in animations for combo melee.
...
Made only entities with a character state component emit a death outcome on death.
2021-06-29 06:20:26 -05:00
Sam
1978b590aa
Destringified consumables
2021-06-29 05:59:02 -05:00
Snowram
3ec5306ed0
Adds an outcome to death with SFX and VFX
2021-06-29 00:14:05 +02:00
Snowram
ef6d6563ea
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Snowram
8760b69345
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Christof Petig
79d7e79776
Accelerate econsim using arrays instead of hashmaps
2021-06-20 16:00:37 +00:00
Joshua Barretto
294b6e394a
Renamed command event
2021-06-18 11:31:06 +01:00
Joshua Barretto
96cbf60c3f
Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients
2021-06-17 19:55:21 +01:00
DaforLynx
9a5b95bc16
Added npc hurt sfx
2021-06-17 05:49:09 +00:00
Joshua Barretto
b8749dc219
Added more cow noises, prepare for merge
2021-06-16 17:23:54 +01:00
Joshua Barretto
0ef29a6989
VoiceKind for better sound effect specs
2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0
Chasing sounds
2021-06-16 17:23:22 +01:00
Snowram
8351aab25d
Addresses comments about roc AI
2021-06-15 09:50:23 +02:00
Snowram
3ba0500b90
Tornado summoning attack
2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4
Add troll variants and roc npcs
2021-06-15 09:49:13 +02:00
Avi Weinstock
9d4a65e8ac
Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.
2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa
icons and naming
2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de
Mining skill tree.
2021-06-13 14:34:42 -04:00
juliancoffee
6c11aa80e0
adjust staff firebomb
2021-06-11 15:41:38 +03:00
jshipsey
4deeb42155
cave adjustments
2021-06-07 11:02:34 +02:00
jshipsey
8acd3832e3
more loot tables, overworld ores, more items
2021-06-07 11:00:00 +02:00
jshipsey
1c17d8fe5e
cave changes
2021-06-07 10:59:44 +02:00
Sam
6790b71d53
Energy recovery stat functional.
2021-06-07 10:58:32 +02:00
jshipsey
1b575a5a04
crafting item partial re-organization, armor recipes, some specific animal drops
2021-06-07 10:56:35 +02:00
jshipsey
ffc9a0ae22
more drops, armors
2021-06-07 10:56:16 +02:00
jshipsey
ca907f1b87
added some meat
2021-06-07 10:55:34 +02:00
