Commit Graph

771 Commits

Author SHA1 Message Date
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
Samuel Keiffer
d235e98efe Merge branch 'aweinstock/agent-pid' into 'master'
Implement PID controllers and use them to stabilize Agent airship flight.

See merge request veloren/veloren!2356
2021-06-02 23:15:08 +00:00
Imbris
23eca4c3f6 Re-disable incremental just for common-systems, small fix in plugin
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Avi Weinstock
e09ae8ad83 Address MR 2356 comments. 2021-05-30 13:36:25 -04:00
Avi Weinstock
8b20175b6e Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Jonathan Berglin
f5ed77184b Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
hqurve
854930bc1a Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Ludvig Böklin
46d1bb5f18 Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
Sam
9173dca03f Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
holychowders
d5f3ba77d4 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
Marcel
7d5ca0e7bf Revert "Merge branch 'snowram/hacky-mount' into 'master'"
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
e4f3064b8a Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
James Melkonian
4d4bc132f4 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
Joshua Yanovski
e7587c4d9d Added non-admin moderators and timed bans.
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
2021-05-09 21:19:16 -07:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence.
- Tweak bow/staff M1 stats.
2021-05-06 17:39:06 -04:00
Marcel Märtens
8196fd8b35 instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect.
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
2021-05-06 11:43:10 +02:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Sam
372eff2a02 Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
288a6f3a82 Blocking now works if no weapon is equipped in main hand.
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
36e95e0c03 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Joshua Barretto
1a0f6f03ef Prevent crafting without station 2021-04-20 02:46:05 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel Märtens
5862920f32 seperate sys/state 2021-04-20 01:30:17 +02:00
Enrico Marconi
a941833ff1 fix issue #1077: show kill msg only to group members and nearby players if... 2021-04-18 20:46:16 +00:00
Samuel Keiffer
1892ec571d Merge branch 'sam/permanent-spawn-safezone' into 'master'
Safezone is now permanently in existence at spawn.

See merge request veloren/veloren!2144
2021-04-17 23:44:10 +00:00
Sam
c8d4c4ff84 Gated safe zone behind a server setting, removed unneeded function. 2021-04-17 17:54:11 -04:00
Sam
416fe5c2af Safezone is now permanently in existence at spawn. 2021-04-17 17:33:54 -04:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Ben Wallis
95d7a3d761 Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required 2021-04-15 19:07:46 +01:00
Monty
ed233efc53 Temporarily remove death messages 2021-04-14 20:31:34 +02:00
holychowders
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Ben Wallis
1de94a9979 * Replaced diesel with rusqlite and refinery
* Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table
* Removed all down migrations as refinery does not support down migrations
* Changed all diesel up migrations to refinery naming format
* Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling
* Added /disconnect_all_players admin command
* Added disconnectall CLI command
* Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
Samuel Keiffer
879b3e0133 Merge branch 'UMR1352/fix#1065' into 'master'
fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped

Closes #1065

See merge request veloren/veloren!2114
2021-04-13 05:55:36 +00:00
Rickey Chamblee
883977a42f Denies any active trades on exit to char select. 2021-04-12 23:00:38 +00:00
Enrico Marconi
bfd23a9828 fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped 2021-04-12 16:21:10 +02:00
Joshua Yanovski
90c3923119 Fix players being able to pick up other players. 2021-04-11 15:52:55 +02:00
Marcel
db8c167797 Merge branch 'UMR1352/fix#1059' into 'master'
fix issue #1059: Debug items should disappear when dropped

Closes #1059

See merge request veloren/veloren!2088
2021-04-10 17:41:43 +00:00
Joshua Yanovski
af94753ad9 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Enrico Marconi
4c5de60d0d fix issue #1059: Debug items should disappear when dropped 2021-04-09 13:46:43 +02:00
Vincent Foulon
bc1797a240 Address comments 2021-04-08 18:33:00 +02:00
Vincent Foulon
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
Vincent Foulon
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
Vincent Foulon
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
51ef3547a1 cleanup old code 2021-04-07 17:26:27 +02:00
Vincent Foulon
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
41314e9098 Create Behavior component 2021-04-07 17:21:53 +02:00
DaforLynx
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Sam
27f178286d Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
a2906168a6 Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
cb638180f8 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
31e69021cb Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
833f1f3309 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
96b354c178 Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
ab2fca21cf Fixed trading 2021-04-02 23:04:26 -04:00
Sam
cbca2a66b6 Support for creature specific materails and materials having a quantity. 2021-04-02 23:04:25 -04:00
Sam
247004d180 Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
Vincent Foulon
a35fa19409 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
f117a57083 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Sam
f9835e78da Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
a5b7477e96 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
30da614e89 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Marcel
da5c73c84b Merge branch 'refactor-login' into 'master'
refactor handling of duplicate login #1015

Closes #1015

See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
aljazerzen
0e71af92f1 cleanup login provider 2021-03-27 13:29:17 +01:00
Avi Weinstock
8d90548331 Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Avi Weinstock
19ea0c3f21 Fix expect-panic on failed UID lookups in inventory_manip. 2021-03-23 19:04:21 -04:00
Avi Weinstock
75f1b0f5e0 Remove level from create_ship and CreateShip. 2021-03-23 10:44:42 +01:00
Avi Weinstock
deb9358c3a Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships. 2021-03-23 10:44:37 +01:00
Avi Weinstock
49f39fb752 Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
Samuel Keiffer
1374900928 Merge branch 'sam/combat-fixes' into 'master'
Fixes gaining combo by shooting loot bag

See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
Joshua Barretto
7ae4230dc8 Merge branch 'zesterer/pick' into 'master'
Pickaxe

See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Joshua Barretto
b45df7fe10 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0 Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Avi Weinstock
1351b9515c Update fall damage calculations. 2021-03-20 18:46:34 -04:00
Sam
92c9e8c477 Fixed gaining combo by shooting loot bags 2021-03-20 16:26:10 -04:00
Marcel
ad49318a63 Merge branch 'sam/explosion-fix' into 'master'
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
2021-03-15 22:26:28 +00:00
Sam
461ad6e339 Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Sam
26f5d40bff Explosions now take into account hitbox of entity. 2021-03-14 23:45:55 -04:00
Avi Weinstock
9304ecab3d Address Imbris's MR 1888 comments, and add changelog entry.
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Avi Weinstock
aa56166c80 Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics. 2021-03-14 23:17:26 -04:00
Joshua Barretto
3496c356e2 More relative motion changes 2021-03-14 23:14:26 -04:00
Avi Weinstock
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Christof Petig
15b11d9154 Implement /price_list (work in progress), stub for /buy and /sell
remove outdated economic simulation code

remove old values, document

add natural resources to economy

Remove NaturalResources from Place (now in Economy)

find closest site to each chunk

implement natural resources (the distance scale is wrong)

cargo fmt

working distance calculation

this collection of natural resources seem to make sense, too much Wheat though

use natural resources and controlled area to replenish goods

increase the amount of chunks controlled by one guard to 50

add new professions and goods to the list

implement multiple products per worker

remove the old code and rename the new code to the previous name

correctly determine which goods guards will give you access to

correctly estimate the amount of natural resources controlled

adapt to new server API

instrument tooltips

Now I just need to figure out how to store a (reference to) a closure

closures for tooltip content generation

pass site/cave id to the client

Add economic information to the client structure
(not yet exchanged with the server)

Send SiteId to the client, prepare messages for economy request
Make client::sites a HashMap

Specialize the Crafter into Brewer,Bladesmith and Blacksmith

working server request for economic info from within tooltip

fully operational economic tooltips
I need to fix the id clash between caves and towns though

fix overlapping ids between caves and sites

display stock amount

correctly handle invalid (cave) ids in the request

some initial balancing, turn off most info logging

less intrusive way of implementing the dynamic tool tips in map

further tooltip cleanup

further cleanup, dynamic tooltip not fully working as intended

correctly working tooltip visibility logic

cleanup, display labor value

separate economy info request in a separate translation unit

display values as well

nicer display format for economy

add last_exports and coin to the new economy

do not allocate natural resources to Dungeons (making town so much larger)

balancing attempt

print town size statistics

cargo fmt (dead code)

resource tweaks, csv debugging

output a more interesting town (and then all sites)

fix the labor value logic (now we have meaningful prices)

load professions from ron (WIP)

use assets manager in economy

loading professions works

use professions from ron file

fix Labor debug logic

count chunks per type separately
(preparing for better resource control)

better structured resource data

traders, more professions (WIP)

fix exception when starting the simulation

fix replenish function
TODO:
- use area_ratio for resource usage (chunks should be added to stock, ratio on usage?)
- fix trading

documentation clean up

fix merge artifact

Revise trader mechanic

start Coin with a reasonable default

remove the outdated economy code

preserve documentation from removed old structure

output neighboring sites (preparation)

pass list of neighbors to economy

add trade structures

trading stub

Description of purpose by zesterer on Discord

remember prices (needed for planning)

avoid growing the order vector unboundedly

into_iter doesn't clear the Vec, so clear it manually

use drain to process Vecs, avoid clone

fix the test server

implement a test stub (I need to get it faster than 30 seconds to be more useful)

enable info output in test

debug missing and extra goods

use the same logging extension as water, activate feature

update dependencies

determine good prices, good exchange goods

a working set of revisions

a cozy world which economy tests in 2s

first order planning version

fun with package version

buy according to value/priority, not missing amount

introduce min price constant, fix order priority

in depth debugging

with a correct sign the trading plans start to make sense

move the trade planning to a separate function

rename new function

reorganize code into subroutines (much cleaner)

each trading step now has its own function

cut down the number of debugging output

introduce RoadSecurity and Transportation

transport capacity bookkeeping

only plan to pay with valuable goods, you can no longer stockpile unused options
(which interestingly shows a huge impact, to be investigated)

Coin is now listed as a payment (although not used)

proper transportation estimation (although 0)

remove more left overs uncovered by viewing the code in a merge request

use the old default values, handle non-pileable stocks directly before increasing it
(as economy is based on last year's products)

don't order the missing good multiple times
also it uses coin to buy things!

fix warnings and use the transportation from stock again

cargo fmt

prepare evaluation of trade

don't count transportation multiple times

fix merge artifact

operational trade planning
trade itself is still misleading

make clippy happy

clean up

correct labor ratio of merchants (no need to multiply with amount produced)

incomplete merchant labor_value computation

correct last commit

make economy of scale more explicit

make clippy happy (and code cleaner)

more merchant tweaks (more pop=better)

beginning of real trading code

revert the update of dependencies

remove stale comments/unused code

trading implementation complete (but untested)

something is still strange ...

fix sign in trading

another sign fix

some bugfixes and plenty of debugging code

another bug fixed, more to go

fix another invariant (rounding will lead to very small negative value)

introduce Terrain and Territory

fix merge mistakes
2021-03-14 03:18:32 +00:00
Marcel
93cab075f8 Merge branch 'xMAC94x/non_blocking_register' into 'master'
Auth requests are now done async, the register system is fetching it, via a PendingLogin component

See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Marcel Märtens
381bb5eef0 fix tracy 2021-03-11 17:05:17 +01:00
Sam
940b4b5de7 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Sam
c6a222340e Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05:00
Sam
18edc1092b Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal. 2021-03-09 17:59:33 -05:00
Marcel Märtens
4ebfbdde0f Move Specs code to own common_ecs create, put tracy and macros into common_base 2021-03-09 00:54:01 +01:00
Avi Weinstock
22fcc6417c Make fireworks recursively shoot more fireworks (95% average replication). 2021-03-06 14:05:51 -05:00
Sam
d02c61ad8a Item use is now goes through a control action rather than a control event. 2021-03-01 20:51:08 -05:00
Jesus Bracho
c0573cca44 Implement stacking and splitting 2021-03-02 00:08:46 +00:00
Samuel Keiffer
0497a437a4 Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Samuel Keiffer
537efdd47e Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
a88ad7b971 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Sam
f24433c8cf Added combo component 2021-02-27 14:55:06 -05:00
jshipsey
417f4638ed balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
Sam
53b0ba286a Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
Sam
45dd36be07 Auras now apply a buff only once, instead of applying a buff every second.
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
2021-02-26 17:57:01 -05:00
Avi Weinstock
7d2e8f72eb Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Avi Weinstock
78014d7d3b Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Marcel Märtens
3f5c64bec0 Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
Marcel Märtens
514d5db038 Update Network Protocol
- now last digit version is compatible 0.6.0 will connect to 0.6.1
 - the TCP DATA Frames no longer contain START field, as it's not needed
 - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field
 - MID is not Protocol internal

Update network
 - update API with Bandwidth

Update veloren
 - introduce better runtime and `async` things that are IO bound.
 - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking`
 - remove futures_execute from client and server use tokio::runtime::Runtime instead
 - give threads a Name
2021-02-22 17:34:55 +01:00
Snowram
f78170704a Allows some species to be immune to specific buffs 2021-02-20 14:03:15 +00:00
Sam
d5ccc33abc Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
341affdae2 Added hands field to all ron files of weapons.
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
2021-02-19 17:30:20 -05:00
TheThirdSpartan
f10f88081d Small chat message formatting changes and fixed missing player alias during admin entity possession 2021-02-17 02:15:45 +00:00
Joshua Barretto
4d19308612 Merge branch 'lboklin/quat-ori' into 'master'
Redefine Ori as a quaternion

See merge request veloren/veloren!1755
2021-02-16 22:39:11 +00:00
Avi Weinstock
c984035976 MR 1775 review fixes.
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
2021-02-14 11:13:56 -05:00