Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,668 Commits 151 Branches 18 Tags 2.1 GiB
sharp/aim-hack
Commit Graph

2234 Commits

Author SHA1 Message Date
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
Marcel Märtens
e36eef99c8 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
2a82405df2 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02: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
Snowram
76d41aa340 Removes flame wyvern from RTsim pool until proper introduction 2021-09-22 20:59:04 +02: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
Snowram
5838a84568 Consolidates projectile offsets into utils 2021-09-22 03:05:57 +02: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
Samuel Keiffer
576f2a6e9f Merge branch 'wolfshaman/fixing_1328_set_waypoint_when_on_ground_and_not_going_down' into 'master' 
fixing_1328_set_waypoint_when_on_ground_and_not_going_down

See merge request veloren/veloren!2832
 2021-09-21 22:16:08 +00:00
Justin Shipsey
2c3640b527 Merge branch 'snowram/wyvern' into 'master' 
Snowram/wyvern

See merge request veloren/veloren!2847
 2021-09-21 14:20:33 +00:00
Marcel
daa93a6d16 Merge branch 'juliancoffee/aim_bombs' into 'master' 
Aimed bombs

See merge request veloren/veloren!2865
 2021-09-21 14:18:31 +00:00
Snowram
7a73e4240b Bird large beam offset hack 2021-09-21 15:31:43 +02:00
juliancoffee
6e2f9be13f Allow aiming bombs 2021-09-20 22:29:25 +03:00
Marcel Märtens
88685cc016 update crates 2021-09-20 14:39:01 +02:00
Ben Wallis
d665ce329d * Added new Admin Commands window to egui, including Give Items and Kits sections 
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
 2021-09-18 16:17:42 +01:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
juliancoffee
4e3fb87526 Adress review 
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
  magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
  resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
  with p0=p1=Vec2::zero())
 2021-09-17 13:28:34 +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
juliancoffee
eeb3bec8ad Refactor implementation of e2e collision 
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
  Capsule.
 2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678 Remove body::Shape enum, make npc use CapsulePrism 2021-09-17 13:28:34 +03:00
juliancoffee
3b308a3f6f Add CapsulePrism collider variant 
+ Add placeholder physics collision implementation as copy of cylinder
  Box collider.
+ Display it with debug hitboxes.
 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
wolfshaman
d321d1aad4 fixing_1328_set_waypoint_when_on_ground_and_not_going_down 2021-09-13 16:51:02 -04: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
Marcel Märtens
7913e6a9ba Change the version number to 0.11 2021-09-10 20:19:17 +02: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
78fce06b47 Allowed players to assist NPCs in fights without problems by tweaking aggro rules 2021-09-08 13:17:53 +01:00
Aleksandr Nariadchikov
3f31f07cc2 [#1251] Code style refactoring 2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
c22104ea56 [#1251] Mutable variables are removed. For killing checking non players without alignments as well as with it. 2021-09-06 19:31:12 +03:00
Aleksandr Nariadchikov
75bbe619fd [#1251] /kill_npcs admin command does not kill player's pets now without additional argument "--also-pets" 2021-09-06 18:21:32 +03:00
Xeriab Nabil
c9e2293a6c Server: Fix character deletion mentioned in #1327 2021-09-06 16:02:41 +03:00
jshipsey
3c623c6801 address comments, boost village pop, lower raid chance 2021-09-06 00:01:26 -04:00
Khalid Ali
cbc6cdfad1 Use unreachable instead of panic 2021-09-05 18:13:20 -05:00
Khalid Ali
a0b78ffd16 Add RepeaterRanged and fix scaling ChargedRange 2021-09-05 18:03:54 -05:00
Khalid Ali
871a1ccbfc Set direction using character state 2021-09-05 17:07:09 -05:00
Sam
9675d2b45a Cultists no longer attack the starting town. 2021-09-05 11:36:40 -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
Joshua Barretto
003b9f57ce Merge branch 'juliancoffee/pvp_command' into 'master' 
Implement /battlemode command and more

See merge request veloren/veloren!2787
 2021-09-04 18:37:01 +00:00
juliancoffee
670e29a286 Better formatting 2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0 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
Bryant Deters
f8c54cbd05 added a bipedsmall variant to loot fallback 2021-09-04 12:11:09 -05:00
Sam
261fd562dc Raiders raid less often, raid for less time, and sit at their home for longer. 2021-09-04 12:42:42 -04:00
Sam
f65b3a094d Cultists now properly raid villages. 2021-09-04 12:25:04 -04:00
Sam
f198349f61 Attempt at getting raiders to wander around village once they get there. 2021-09-04 01:10:57 -04:00
Sam
e75156e052 Hacky raid mechanics for cultist raiders. 2021-09-04 00:34:30 -04:00
Sam
57ba9a0300 Cultist enemies are now spawned by rtsim. 2021-09-04 00:05:48 -04:00
Sam
311fb251c1 Allowed specifying that rtsim entities spawn at a particular site. 2021-09-03 23:34:24 -04: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
844e93e67b Improve UX of /battlemode 2021-09-04 01:41:48 +03:00
juliancoffee
1baa9e9879 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
fbe745fe1e 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
85e8c50d35 Fix town detection 2021-09-03 17:28:34 +03:00
juliancoffee
1838d151f5 Make it compile without feature(worldgen) 
+ move settings check to toggling mode segment
 2021-09-03 17:28:34 +03:00
juliancoffee
68a4b269d2 Allow changing mode only with enabled settings 
- send warning in force mode
 2021-09-03 17:28:34 +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
2e79c61123 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
f01309dfc2 Add PerPlayer server flag for BattleMode 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
Joshua Barretto
643807e5ff Multiple color gradient options 2021-08-29 13:57:36 +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
Joshua Barretto
f9580a576c Fix warning agents not switching aggro on attack 2021-08-24 23:17:52 +01:00
ubruntu
20e33f5575 Split up iteration of rtsim entities each tick 2021-08-23 21:49:32 +00:00
Marcel
30c446f8ee Merge branch 'ubruntu/npcs-ignore-when-busy' into 'master' 
Prevent NPCs from being chat spammed

Closes #1301

See merge request veloren/veloren!2780
 2021-08-23 07:48:34 +00:00
Bryant Deters
5983c87120 Check for existing target before initiating interaction 2021-08-21 22:28:26 -05:00
Ben Wallis
08d8b01a2a Merge branch 'xvar/fix-add-admin-message' into 'master' 
Fixed the message shown when adding an admin or moderator to show the correct role

See merge request veloren/veloren!2777
 2021-08-21 15:40:27 +00:00
Ben Wallis
0c55b7b4b3 Fixed the message shown when adding an admin or moderator to show the correct role 2021-08-21 15:43:33 +01: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
Marcel Märtens
fc98213996 simd must be last till we have a propper vek crate update 2021-08-20 12:44:46 +02: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
09e8ee2b3f Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
e24cd2598d Implement /make_npc 2021-08-16 17:27:59 +03:00
juliancoffee
5941d6731c Refactor supplement evaluation to use NpcData 2021-08-16 17:27:59 +03:00
juliancoffee
e9dde3ecec Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
Imbris
1fd25c22dd Merge branch 'juliancoffee/explode_vines' into 'master' 
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
 2021-08-14 19:09:05 +00:00
Joshua Barretto
87851293c2 Improved aggro system to reduce hyper-focused enemies 2021-08-14 11:09:33 +01:00
Joshua Barretto
c2498d81c7 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00
Joshua Barretto
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
juliancoffee
86b9e2d8e6 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
juliancoffee
3ac74a8259 Implement /kit all and a bit of refactoring 
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
 2021-08-10 13:28:38 +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
f16f8182cd Add FIXME about Staff flamethrower 2021-08-08 00:41:39 +03:00
juliancoffee
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
juliancoffee
edd37ad491 Agent code TODO-s 2021-08-05 21:07:45 +03:00
Joshua Barretto
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +01:00
Joshua Barretto
8822c6409e Fix pets without agency 2021-08-04 00:22:03 +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
44916383c6 continue -> filter_map to handle new players 2021-08-03 16:43:56 +03:00
juliancoffee
d9e2d501cd Prettify server/sys/msg/register.rs 2021-08-03 16:43:56 +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
9300353c98 Use emitter.emit() in server/sys/msg/register 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
Knightress Paladin
b338abd761 Fix up comments relating to AI logic 2021-08-02 22:38:16 -07:00
Knightress Paladin
8dd2202e1a Restyle logic in Staff AI 2021-08-02 16:22:40 -07:00
Knightress Paladin
a6acdbbfa7 Used adjusted_by_skills to correctly calculate ability values 2021-08-02 16:22:40 -07:00
Knightress Paladin
e87bfae5cd Allowed staff AI to queue shockwave if occupied by animation 2021-08-02 16:22:40 -07:00
Knightress Paladin
38432cc880 Restructured logic for staff AI 2021-08-02 16:22:40 -07:00
Joshua Barretto
45f94b0bce Better Agent API 2021-08-02 13:08:39 +01:00
Ludvig Böklin
400734cc0a Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Joshua Barretto
da691cbf60 Merge branch 'imbris/small-fix' into 'master' 
Fix typo in log message and remove prefixed '_' from a few used variables

See merge request veloren/veloren!2703
 2021-07-31 21:54:25 +00:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
119c72f5d8 Fix typo in log message and remove prefixed '_' from a few used variables 2021-07-30 22:10:12 -04:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Joshua Barretto
aa3ede79c1 Prevented mountable pets 2021-07-29 19:04:07 +00:00
Marcel
680492cea6 Merge branch 'juliancoffee/entity_refactor' into 'master' 
Improve terms of EntityConfig and LoadoutBuilder

See merge request veloren/veloren!2688
 2021-07-28 23:19:04 +00: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
Tavo Annus
63be9297e7 Combine multiple inventory loading queries into single reccursive query 2021-07-28 21:11:57 +00:00
juliancoffee
14ac9a8b4e Improve terms of EntityConfig and LoadoutBuilder 
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
 2021-07-28 19:19:10 +03: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
Joshua Barretto
37077b5703 Merge branch 'Resolve-unused-clippy-supressions' into 'master' 
Resolve unused clippy supressions

See merge request veloren/veloren!2673
 2021-07-24 20:44:06 +00: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
Joshua Barretto
6fa3ac610b Merge branch 'aweinstock/fix-waypoint-2' into 'master' 
Further improve handling of underground waypoints:

See merge request veloren/veloren!2665
 2021-07-24 17:59:58 +00:00
Avi Weinstock
5dd56b724c Rename find_space_opt to try_find_space. 2021-07-24 13:09:10 -04:00
Joshua Barretto
c7f14d300f Merge branch 'zesterer/cmd' into 'master' 
Properly fixed command parsing

See merge request veloren/veloren!2666
 2021-07-24 15:15:58 +00:00
Joshua Barretto
4bfc92c65d Changed singleplayer map for a better default experience 2021-07-24 11:56:08 +01:00
Joshua Barretto
0cb524d8d6 Properly fixed command parsing 2021-07-23 17:33:31 +01:00
Samuel Keiffer
85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master' 
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request veloren/veloren!2613
 2021-07-23 14:56:36 +00:00
Avi Weinstock
ca10d89068 Further improve handling of underground waypoints: 
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
 2021-07-22 23:03:52 -04:00
Marcel
e9f6ae6b37 Merge branch 'xMAC94x/job_metrics' into 'master' 
implement slowjob metrics to measuere time in queue and execution time

See merge request veloren/veloren!2654
 2021-07-22 19:17:30 +00:00
Marcel Märtens
7d93d907f6 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
juliancoffee
a03992a236 Wake birds up 
* give large rtsim birds their default main tool which allows them to
use AI tactics
* force entities to fly on critical failing velocities to avoid suicide
 2021-07-22 18:00:22 +03:00
Knightress Paladin
a97546dbff Removed aimbot from ChargeMelee and cleaned up variable typing 2021-07-18 23:12:55 -07:00
Knightress Paladin
081c6e5362 Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07: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
Samuel Keiffer
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request veloren/veloren!2591
 2021-07-18 13:43:32 +00:00
Imbris
251c201604 Merge branch 'revert-eb08b6a1' into 'master' 
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant

See merge request veloren/veloren!2639
 2021-07-18 08:00:43 +00:00
Imbris
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
Dr. Dystopia
dd84c320a3 Resolve all '#[allow(clippy::needless_return)]' error supressions 2021-07-17 21:47:17 +02:00
Dr. Dystopia
a98edaace9 Resolve all '#[allow(clippy::useless_conversion)]' error supressions 2021-07-17 16:55:11 +02:00
juliancoffee
6654c9e372 Fix bug with ignoring second_tool in EntityInfo 2021-07-17 15:37:30 +03:00
Imbris
eb999b2821 Merge branch 'aweinstock/fix-waypoint' into 'master' 
Spawn players aboveground when using `/site` or when their waypoint is underground.

See merge request veloren/veloren!2612
 2021-07-16 23:18:33 +00:00
Avi Weinstock
a4d6f0f3c1 Address MR 2612 review comments. 2021-07-16 17:46:48 -04:00
Samuel Keiffer
f38cde9d40 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Avi Weinstock
c417e8c5b9 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
Marcel
0492b8dc87 Merge branch 'savalige/ai_spacing' into 'master' 
Issue #1153 - Improve combat AI spacing between Agents of the same Alignment

Closes #1153

See merge request veloren/veloren!2451
 2021-07-16 16:40:27 +00:00
Avi Weinstock
7555be0e25 Spawn players aboveground when using /site or when their waypoint is underground. 2021-07-15 17:54:29 -04:00
Avi Weinstock
9e9cbd290b cargo fmt 2021-07-15 15:52:10 -04:00
Knightress Paladin
0ded44d635 Cleaned up chunk-relative block setting math 2021-07-15 12:36:00 -07:00
Knightress Paladin
9864344cfe Implemented setting blocks with the wiring system 2021-07-15 12:36:00 -07:00
Savalige
171113ea74 Added a spacing_radius method to body to make it possible to sett different spacing for different entities 2021-07-15 13:33:51 -04:00
Savalige
1e3cc3442f Made the spacing also take the radius of the entity into account per @zesterer suggestion and added a baias variable to change how much priority should be given to separation vs target(1.0 being only focus on separating and 0.0 being only focus on target) 2021-07-15 13:33:51 -04:00
Savalige
2a5d4fa826 fixing issue #1153 - Improve combat AI spacing between Agents of the same Alignment 2021-07-15 13:33:51 -04:00
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Dr. Dystopia
2ff74f5cc9 Resolve all '#[allow(clippy::useless_format)]' error supressions 2021-07-15 13:46:53 +02:00
juliancoffee
aae3a159b8 Make all Ships constanly flying, not only rtsim 2021-07-14 23:23:35 +03:00
juliancoffee
d42c7be141 Teach AI how to interact in this evil world 2021-07-14 19:26:12 +03:00
juliancoffee
b6460f6c61 Teach AI how to forgive 2021-07-14 19:26:11 +03:00
juliancoffee
325acc9daf Teach AI how to heal again 2021-07-14 19:26:11 +03:00
juliancoffee
06e0303e8a Cleaning 2021-07-14 19:26:11 +03:00
juliancoffee
00a34da48b Teach AI how to leap again 
+ adjust hammer and axe AI timings
 2021-07-14 19:25:55 +03:00
juliancoffee
56ab92fd05 Teach AI how to glide again 2021-07-14 15:24:15 +03:00
juliancoffee
59e9fc6530 Agent code refactoring 
0) extracting code branches to closures
1) make RTSim remember target, even if they can't speak about it
2) make only RTSim Ships constantly flying (and not every flying RTSim)

You can tame RTSim Phoenix, yay
 2021-07-14 14:55:50 +03:00
holychowders
f316f1da60 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
Marcel Märtens
db8aedd363 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
Sam
be8b12845a Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
Knightress Paladin
42c3872528 Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
Knightress Paladin
b96bb6fc5d Added combo scaling to healing aura and allowed cultists to use it 2021-07-10 20:02:36 -07:00
Knightress Paladin
d0bb7004ab Added check to prevent sceptre AI from canceling its own ward 2021-07-07 20:01:00 -07:00
Knightress Paladin
65d67ef781 Clean up sceptre ai code before merge 2021-07-07 20:00:35 -07:00
Knightress Paladin
63c5d9f7df Fixed formatting 2021-07-07 20:00:35 -07:00
Knightress Paladin
ba35aaaf90 Add check to see if cultist already has ward buff 2021-07-07 20:00:35 -07:00
Knightress Paladin
35242c71e1 Added sceptre tactic and sceptre cultists 2021-07-07 20:00:01 -07: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
Samuel Keiffer
d97db508ff Merge branch 'juliancoffee/yeti_nerf' into 'master' 
Adjust Yeti difficulty

See merge request veloren/veloren!2550
 2021-07-05 03:46:42 +00:00
Swrup
971dd9059c fix combo not reset at respawn 2021-07-04 17:28:11 +02:00
juliancoffee
303f03dd3a Adjust Yeti difficulty 
Frost breath:
    - ori_rate reduced from 0.6 to 0.1
    - time of breath increased from 1 second to 2 seconds
    - buildup increased from 0.4 to 0.8
    - make it more gentle, with less damage per tick, but faster tick rate
    (50 * 1 to 10 * 5)
    - make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to
    apply debuff.
    - make him use it when closer range (10 and not 15)
Ice spikes:
    - increase recovery_duration from 0.3 to 1.0
    - make him slower while doing ice spikes, make ice spikes move
    slower
    - make him use it when closer range (15 and not 20)
Snowball:
    - increase recover_duration from 0.4 to 0.9
Strike:
    - increase buildup_duration fron 0.6 to 0.8
    - increase recover_duration from 0.5 to 1.0
    - increase knockback from 40.0 to 70.0
 2021-07-04 03:44:17 +03: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
Ben Wallis
9865b354f9 Merge branch 'xvar/fix-plugin-build-warnings' into 'master' 
Fixed build warnings for server-cli related to non-default plugin feature

See merge request veloren/veloren!2506
 2021-06-26 21:35:54 +00:00
Ben Wallis
a50ed6b50a Fixed build warnings for server-cli related to non-default plugin feature 2021-06-26 21:56:03 +01:00
Avi Weinstock
af22f56f9e Rename remove_warlock_warlord migration so it actually triggers. 2021-06-26 16:28:49 -04:00
Daan Vanoverloop
0076b8379c Fixing #1169 - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +02:00
Snowram
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +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
68c6a0a495 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
c162827f97 Harvester AI 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Marcel
b0574b4ddc Merge branch 'imbris/tracy' into 'master' 
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request veloren/veloren!2479
 2021-06-20 23:17:08 +00:00
Christof Petig
79d7e79776 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
Imbris
659b42e813 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
juliancoffee
573607c32a Nerf golem laser dmg and ori_rate, make it fire 
+ Make laser state duration lower
 2021-06-19 10:47:45 +03:00
juliancoffee
36fa8bf4f7 Use Golem Shockwave only after loosing 30% health 
+ Make shockwave buildup longer
 2021-06-18 22:32:43 +03: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
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
9510869870 Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +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
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +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
Marcel
4cafdb3bfd Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
b0702d792a Merge branch 'juliancoffee/asset_entity' into 'master' 
EntityInfo assetization.

See merge request veloren/veloren!2382
 2021-06-14 12:56:28 +00:00
Monty Marz
45f79059d0 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04: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
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Forest Anderson
f578c56db7 Merge branch 'juliancoffee/small_fixes' into 'master' 
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
 2021-06-11 17:46:56 +00:00
juliancoffee
6c11aa80e0 adjust staff firebomb 2021-06-11 15:41:38 +03:00
juliancoffee
5084548b53 Add warnings about non-existent items in /kit 2021-06-11 01:33:47 +03:00
Marcel Märtens
005f528e25 fix tracy-server compilation via cargo tracy-server 2021-06-09 17:17:37 +02:00
juliancoffee
0c9f05b8d1 Load skillsets from assets 
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
 2021-06-09 15:37:04 +03:00
juliancoffee
c3a120c551 Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
5f3eaddb70 Split LodoutBuilder::build_loadout 
LoadoutBuilder::build_loadout is a function which has four parameters
and 3 of them are Option<>, and although fourth (body) isn't Option<>,
it's optional too because it is used only in some combinations of
another arguments.

Because these combinations produces quirky code flow, it will be better
to split it to different methods.

So we did following changes to remove it and rewrite code that was using it
to use better methods.

* Introduce LoadoutPreset as new LoadoutConfig, currently it's only used
in Summon ability, because SummonInfo uses Copy and we can't specify
String for specifying asset path for loadout.
Everything else is rewritten to use asset path to create loadouts.

* More builder methods for LoadoutBuilder.
Namely:
    - from_default which is used in server/src/cmd.rs in "/spawn" command.
    - with_default_equipment, with_default_maintool to use default
    loadout for specific body
    - with_preset to use LoadoutPreset

* Add new make_loadout field with `fn (loadout_builder, trading_info) -> loadout_builder`
to EntityInfo which allows to lazily construct loadout without
modifying LoadoutBuilder code

* Fix Merchants not having trade site
We had heuristic that if something has Merchant LoadoutConfig - it's
merchant, which can be false, especially if we create Merchant loadout
lazily
As side note, we do same check for Guards and it fails too.

Too fix it, we introduce new agent::Mark, which explicitly specifies
kind of agent for entity

* `LoadoutBuilder::build_loadout` was written in a such way that depending
on main_tool you will have different loadout. Turns out it was this
way only for Adlets though and this behaviour is reproduced by specifying
different loadouts directly in world code.
 2021-06-09 15:37:04 +03:00
juliancoffee
aad65c6159 Move traveler loadout declaration to asset 
* New loadout/world/traveler.ron file to specify traveler loadout
* LoadoutBuilder::with_asset_expect now can use passed rng to choose
items
 2021-06-09 15:37:03 +03:00
Marcel
7e8bebdfa1 Merge branch 'xMAC94x/hashbrown' into 'master' 
switch to hashbrown 0.11 and specs 0.16.2

See merge request veloren/veloren!2390
 2021-06-07 14:31:58 +00:00
jshipsey
acf9111141 mig fix 2021-06-07 08:32:59 -04:00
Marcel Märtens
7185dcee68 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
Marcel
f2eedf81f4 Merge branch 'imbris/648-cleanup' into 'master' 
Make handling of shortcut keywords for commands clearer and revise a TODO...

Closes #648

See merge request veloren/veloren!2387
 2021-06-07 10:27:54 +00:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
5fdb2ac01d migration 2021-06-07 11:01:04 +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
18e9b5b890 recipes, re-organization, cleanup 2021-06-07 10:58:05 +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
Imbris
0b92c72096 Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes 2021-06-06 23:45:51 -04:00
Marcel
521e1eacf3 Merge branch 'aweinstock/add-models-20210603' into 'master' 
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
 2021-06-06 16:56:21 +00:00
Sam
acf7ad27f1 Balance tweaks. 2021-06-05 17:15:04 -05:00
Sam
74b7039219 Yeti AI 2021-06-05 13:25:47 -05:00
Sam
81f7e690fd Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
5bf99eac11 Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model. 2021-06-03 21:39:15 -05:00
Sam
ac2f097d80 Tidal warrior AI. 2021-06-03 21:39:14 -05:00
Avi Weinstock
05c699878f Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. 2021-06-03 19:24:34 -04: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
Marcel
f988584337 Merge branch 'revert-c6e200a3' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2318
 2021-06-02 14:27:13 +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
Imbris
48ebb10d50 Update toolchain 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
01f82314dc Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Sam
42c8c08145 Fixed bow AI 2021-05-26 20:53:29 -05:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
Jonathan Berglin
f5ed77184b Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
Avi Weinstock
624f8796bd Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04: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
f993f28eff Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
ca6266e780 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
1014ac45bf Made new skills for reworked bow. 
Created migration to reset bow skills.
 2021-05-22 12:33:21 -05:00
Samuel Keiffer
a0599ac046 Merge branch 'sam/extra-equip-slots' into 'master' 
Added Extra Loadout Slots

See merge request veloren/veloren!2295
 2021-05-21 20:28:53 +00:00
Marcel Märtens
cf3188b412 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
Marcel
99304ffddd Revert "Merge branch 'sharp/revert-quinn' into 'master'" 
This reverts merge request !2315
 2021-05-21 10:41:16 +02:00
James Melkonian
27885e00b2 Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
James Melkonian
b076fb7baa Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Joshua Yanovski
3679cb75bc Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'" 
This reverts commit 04d8ddf25e, reversing
changes made to 9dcf7a9d26.
 2021-05-17 08:32:12 -07:00
Marcel
04d8ddf25e Merge branch 'xMAC94x/quic_enablement' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
 2021-05-17 12:02:55 +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
Joshua Yanovski
3869cdf1d2 Don't remesh chunk vertex data on sprite update. 
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
 2021-05-11 12:58:15 -07:00
James Melkonian
f76b61ac17 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
58e5b1fdf5 AI tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Marcel Märtens
b443e4dd31 Add Quin support, as this is not yet very much tested it needs to be activated in the settings of SERVER and CLIENT. 
Server:
 provide a certificate file and key file via the settings. When provided it will then listen on TCP and QUIC, if not provided it will be TCP only.
 The certificate must be known by the client, so you might get problems with self-signed certificates.
 ```ron
 quic_files: Some((
     cert: "/home/user/veloren_cert.pem",
     key: "/home/user/veloren_key.key",
 )),
 ```

Client:
 activate the voxygen settin `use_quic: true` to try to connect to the quic backend of a server.
 2021-05-10 12:59:13 +02:00
Joshua Yanovski
0cf0f59fa7 Merge branch 'sharp/modtools' into 'master' 
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
 2021-05-10 04:54:06 +00: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
abcb6f34a3 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Avi Weinstock
1ae105125d Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
Avi Weinstock
1dfcdce1c0 Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
Illia Denysenko
1c22a2b3fd /skill_preset command 2021-05-08 15:47:09 +00:00
Samuel Keiffer
a2999ce96f Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00: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
James Melkonian
346eb48a27 Move weapon tactics to functions and take target body into attack radius consideration 2021-05-06 21:17:05 +00:00
Daniel Mizerski
3197bcd12a (Wiring) Logic - make wiring turing complete 2021-05-06 19:53:12 +02:00
Marcel
91f76d3b00 Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' 
instead of manually trying to sync disconnect metrics we now pass a Reason to...

See merge request veloren/veloren!2259
 2021-05-06 11:32:37 +00: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
Marcel
efed14ccf9 Merge branch 'duelsik/wiring-on-death' into 'master' 
(Wiring) OnDeath

See merge request veloren/veloren!2256
 2021-05-06 09:00:50 +00:00
Illia Denysenko
2c14f59a35 Don't drop Debug item with /dropall 2021-05-05 20:35:57 +00:00
Daniel Mizerski
b34704ea3f (Wiring) OnDeath 2021-05-05 19:08:18 +02:00
Daniel Mizerski
a2a0329440 (Wiring) Switch to using maybes 2021-05-05 16:59:17 +02:00
Marcel Märtens
6e3a74b476 rayon::join creates a global threadpool, which is only used in /world 
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
 2021-05-04 21:06:07 +02:00
Samuel Keiffer
fb940ad27a Merge branch 'sam/minotaur' into 'master' 
Overhauled Minotaur

See merge request veloren/veloren!2193
 2021-05-04 16:26:08 +00:00
Imbris
217502d516 Merge branch 'duelsik/wiring-sticky-trigger' into 'master' 
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)

See merge request veloren/veloren!2241
 2021-05-04 16:15:19 +00:00
Daniel Mizerski
f1681f465f (Wiring) Change Sticky to be handled by physics (but with disabled force on it) 2021-05-04 17:33:42 +02:00
Sam
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
Sam
811f1fadb2 Replaced action_timer with action_state so there are additional fields. 2021-05-04 08:45:09 -04:00
Marcel
3c16966721 Merge branch 'xMAC94x/quic' into 'master' 
Cleanup network, remove some unwraps, add experimental (disabled) Quic support

See merge request veloren/veloren!2221
 2021-05-04 00:16:05 +00:00
juliancoffee
88ac70c8c7 fmt 2021-05-03 22:17:59 +03:00
juliancoffee
4ba6d438ff Implement 'all' command 2021-05-03 22:07:12 +03:00
juliancoffee
b81981f805 Draft implementation 2021-05-03 22:07:09 +03:00
Marcel
f5c7f99846 Merge branch 'xvar/persistence-fixes' into 'master' 
Fixed a rare server crash when creating a character

See merge request veloren/veloren!2237
 2021-05-03 18:09:59 +00:00
Samuel Keiffer
610c529c42 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
b15913560b Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c199d12f2d Address MR 2207 review comments. 
- Add metrics for which branch of the compression heuristic was taken.
- Reduce the threshold for the heuristic.
- Deduplicate code for dealing with lazy messages.
- Make jpeg dependency only scoped to the compression benchmark.
- Remove commented code.
 2021-05-03 00:09:24 -04:00
Avi Weinstock
30cae40b82 Add a bandwidth-based heuristic for chunk compression. 2021-05-03 00:09:24 -04:00
Avi Weinstock
cdc2eccda8 Improve quadpng by adding WidePacking, which makes a wider image, which is faster due to PNG compressing by row. Heuristically switch between quadpng and deflate based on chunk height to reduce variance. 2021-05-03 00:09:24 -04:00
Avi Weinstock
f81539cb00 Get PngPngPngJpeg terrain working in the actual game. 2021-05-03 00:09:24 -04:00
Daniel Mizerski
7faa0d3cd9 Add fundamentals for wiring system. 2021-05-02 22:38:44 +02:00
Ben Wallis
d7582efad0 Moved character creation to use character_updater instead of character_loader. Changed character_loader to use a read-only database connection. 2021-05-02 16:08:39 +01:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Joshua Barretto
b29e2b0017 Fixed admin physics check exemption 2021-04-30 14:06:07 +01:00
Samuel Keiffer
4f5f15979a Merge branch 'sam/deduplicate-items' into 'master' 
Sam/deduplicate items

See merge request veloren/veloren!2225
 2021-04-29 20:11:43 +00:00
Sam
7870109856 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Sam
91bb6392bb Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Ben Wallis
e2d6326615 Made admins exempt from the server-side position and velocity checks 2021-04-29 17:46:40 +01:00
Marcel Märtens
760c382ed9 protocoladdr change for listen and connect 
(remove a loop in quic protocol which wasnt a actual loop)
 2021-04-29 15:58:34 +02:00
Ben Wallis
c16bf51ab2 Merge branch 'xvar/reduce-timeofday-sync-frequency' into 'master' 
Reduced frequency of TimeOfDay message being sent to clients

See merge request veloren/veloren!2218
 2021-04-29 13:50:08 +00:00
Ben Wallis
3c20e8ed4e Reduced sync of TimeOfDay to once per 100 ticks 2021-04-29 12:34:27 +01:00
James Melkonian
2fafcded93 Set bird default to not flying and give non-strafing NPCs a larger attack angle 2021-04-28 02:31:51 +00:00
James Melkonian
24095187c7 Partially fixes wolf AI 2021-04-27 17:57:31 +00:00
Ludvig Böklin
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
Sam
1a7779beb3 Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
Sam
9084e93f8b Added an angle check to all agent attacks. 2021-04-25 22:02:31 -04:00
Marcel
991ccf0033 Merge branch 'aweinstock/deflate-downgrade-20210425' into 'master' 
Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's...

See merge request veloren/veloren!2199
 2021-04-25 23:35:43 +00:00
Samuel Keiffer
add895764b Merge branch 'holychowders/fix_villagers_spamming_messages_in_safezones' into 'master' 
Prevent safezoned villagers from spamming messages upon seeing an enemy

See merge request veloren/veloren!2190
 2021-04-25 21:24:06 +00:00
holychowders
5488f9f525 Prevent safezoned villagers from spamming messages upon seeing an enemy 2021-04-25 21:24:06 +00:00
Marcel
35584d0344 Merge branch 'xMAC94x/reduce_deps' into 'master' 
remove some unused deps Yuri found

See merge request veloren/veloren!2197
 2021-04-25 20:22:31 +00:00
Avi Weinstock
57aee57d82 Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's worst-case encoding time. 2021-04-25 16:18:57 -04:00
Marcel
ecb176158c Merge branch 'tormeh/rtsim-first' into 'master' 
Tormeh/rtsim first

See merge request veloren/veloren!2053
 2021-04-25 18:53:39 +00:00
Marcel Märtens
1842b2d6eb remove some unused deps Yuri found 2021-04-25 20:18:20 +02: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
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Avi Weinstock
95d32b40bb Remove redundant terrain message per MR 2166 comment. 2021-04-20 23:48:15 -04:00
Avi Weinstock
308ad4d81e Cleanup errors introduced in rebase. 2021-04-20 23:34:17 -04:00
Avi Weinstock
15e32e5655 Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream. 2021-04-20 23:24:24 -04:00
Avi Weinstock
6d9de520f3 Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4. 2021-04-20 23:23:53 -04:00
Imbris
e17477979f Remove extra chunk cloning and parallelize serialization in the server terrain sys 2021-04-20 15:25:05 -04:00
Imbris
9e0fbd392d Remove some of the spans in the agent system 2021-04-20 15:25:05 -04:00
Imbris
110165de3a Add more profiling spans to the agent system and add timing notes 2021-04-20 15:25:04 -04:00
Imbris
e750c9d570 Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle 2021-04-20 15:25:04 -04:00
Imbris
26222a0a2d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -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
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02: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