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,415 Commits 151 Branches 18 Tags 2.1 GiB
593d8fa4b5
Commit Graph

3217 Commits

Author SHA1 Message Date
Sam
57851b7df3 Fixed buff applied. 2021-10-29 17:37:10 -04:00
Sam
f339793911 Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
Sam
fbd742abdb Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure. 2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Sam
6ff7317e05 Added function that returns the output of salvaging an item when result just needs to be checked. 2021-10-27 17:02:32 -04:00
Sam
9fc3a9bf01 Fixed item path of leather items under hide folder. 2021-10-27 17:02:32 -04:00
Monty Marz
7aae35f286 bench 2021-10-27 17:02:31 -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
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Sam
cac3f00250 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Sam
4d4b7e846a Haha, nerfs go brr 2021-10-26 18:44:45 -04:00
Joshua Barretto
37056e75f9 Merge branch 'demonic/shrubs' into 'master' 
Added new Spots, Shrubs and Ships.

See merge request veloren/veloren!2953
 2021-10-26 10:06:14 +00:00
DemonicOnPc
a74af55c46 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -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
Justin Shipsey
434913b946 Merge branch 'kemper/sand-shark-hitbox' into 'master' 
Better sand shark hitbox

See merge request veloren/veloren!2956
 2021-10-24 22:03:08 +00:00
Kemper
b96c6c94ab Adjust sand shark hitbox 2021-10-24 21:04:46 +00:00
DemonicOnPc
b1476071b1 Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -04:00
ubruntu
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
c397bfa69f Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
Sam
c5c70f6945 Correctly took dot product, switched to square root of dot product 2021-10-15 22:41:53 -04:00
Sam
7b2ade34c4 Removed angle between with dot product in handle_orientation. 2021-10-15 17:26:10 -04:00
socksonme
c631341da9 Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Imbris
f61d742d29 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
e67c688c11 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00
Imbris
c412a96d6a Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well) 2021-10-15 03:20:40 -04:00
Imbris
aa1ffa9f61 Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans 2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45 Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion 2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64 Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new) 2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between 2021-10-15 01:23:00 -04:00
Imbris
d515b42eac Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir 2021-10-15 01:23:00 -04:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Sam
1e3b0dcd16 Fix block energy cost being multiplied by 10 and also slightly reduce it. 2021-10-13 10:02:28 -04:00
Imbris
4b2842da2f Merge branch 'imbris/opt-phys-2.0' into 'master' 
Make terrain physics faster with internal iteration

See merge request veloren/veloren!2915
 2021-10-11 14:52:46 +00:00
juliancoffee
b5d9e4e4a9 Fix Traveller names 
- Previously RtSim were created with automatic name for body generated
  from EntityConfig, not from RtSim body. Now RtSim body is set for
  EntityConfig.
 2021-10-11 15:06:43 +03:00
Samuel Keiffer
05b85a00e2 Merge branch 'sam/wiki-all-entities' into 'master' 
Csv export entity drops tool now has ability to export all entities at once.

See merge request veloren/veloren!2910
 2021-10-10 16:56:46 +00:00
Sam
fc787d150e Now stores a column for entity path to more easily allow searching for what drops a particular item in the future 
Fixed excel perceiving certain csv entries as a date
 2021-10-10 12:37:16 -04:00
Joshua Barretto
086097cd56 Better vines and lighting 2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce Added new cavern sprites to caverns 2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12 cavern sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17 More cavern details 2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7 Performance improvements for terrain watcher 2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7 Added caverns, fixed chunk load performance issue 2021-10-10 13:41:56 +01:00
Imbris
4f6eb286e6 Remove dead commented code, updated changelog, commented profiling spans 
(but left in for easy reuse later), fix clippy complaint
 2021-10-10 03:09:03 -04:00
Imbris
57922d9802 Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change) 2021-10-10 02:42:07 -04:00
Imbris
11c8cf19d1 Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change) 2021-10-10 02:42:07 -04:00
Imbris
5777486f5c Remove custom for_each_in from Chonk 2021-10-10 02:42:07 -04:00
Imbris
f65399eb00 Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation 2021-10-10 02:42:07 -04:00
Imbris
2350c08e91 Try marking VolGrid2d::for_each_in and friends as inlineable 2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045 Try marking Chonk::for_each_in and related functions as inlineable 2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59 simplify water/walls check code, interally iterate in chonks (but not 
chunks)
 2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet 2021-10-10 02:42:06 -04: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
Sam
53c9dfcd92 Csv export entity drops tool now has ability to export all entities at once. 2021-10-07 20:28:18 -04:00
Treeco
dafa1327d0 Added mottled bark to birch 2021-10-06 02:26:43 +01:00
Samuel Keiffer
aaaf59d672 Merge branch 'sam/wiki-loot' into 'master' 
Created csv export tool to get all item drops from an entity

See merge request veloren/veloren!2892
 2021-10-05 15:45:22 +00:00
Sam
b7e2e27000 Now outputs item names instead of item asset paths. 2021-10-04 21:46:19 -04:00
ubruntu
0e2808a8fd Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
2ae7bca9c0 Rebalanced boat speed 2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612 Fixed sail boat thrust, removed dead water code, added comments 2021-10-05 00:02:03 +01:00
Joshua Barretto
e8021fab2c Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
3b66af468a Improved river and lake banks 2021-10-05 00:02:03 +01:00
Joshua Barretto
826aff2ea4 Better lake entrances and distance 2021-10-05 00:02:03 +01:00
Joshua Barretto
f118d15745 Fixed oceans 2021-10-05 00:02:03 +01:00
Joshua Barretto
87c7d6e982 Improved river/lake rendering 2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00
Sam
2dceadaebb Created csv export tool to get all item drops from an entity 2021-10-02 12:08:40 -04:00
Benoît du Garreau
ef1c51332d Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02: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
juliancoffee
943e7cd0e1 Fix csv tools for loot tables 2021-09-27 15:09:22 +03:00
juliancoffee
9c2fc0d962 Adress review 
- Mention failed loot specifier during getting item from lottery
 2021-09-27 15:09:22 +03:00
juliancoffee
8af4cf1a37 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
juliancoffee
ac5ea0cfe8 Hardened Loot handling part two 
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
 2021-09-27 15:09:22 +03:00
juliancoffee
b056cccb0c Hardened loot table handling 
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
 2021-09-27 15:09:22 +03:00
Sam
09dd9b4813 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Marcel
cea927efb6 Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2021-09-24`

See merge request veloren/veloren!2862
 2021-09-26 19:25:02 +00: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
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
heydabop
e2f9237f05
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction 2021-09-23 10:05:12 -05:00
Joshua Barretto
bee5b232e6 Fixed crash caused by invalid health, stated current <= maximum invariant more clearly 2021-09-23 12:36:03 +01:00
Snowram
5838a84568 Consolidates projectile offsets into utils 2021-09-22 03:05:57 +02:00
Snowram
9c2ce83430 Set projectile offsets in states instead of globally 2021-09-22 01:07:09 +02:00
Snowram
cf6bf74f7a Set beam offset depending on body dimensions 2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7 animation tweaks 2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
Marcel Märtens
88685cc016 update crates 2021-09-20 14:39:01 +02:00
Joshua Barretto
e098a38d8e Merge branch 'james/rrt-pathfinding' into 'master' 
Initial RRT flight pathfinding

See merge request veloren/veloren!2773
 2021-09-19 19:30:31 +00:00
Joshua Barretto
f94d579c04 Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master' 
Tweak coefficient of beam_offset for clay_golem

See merge request veloren/veloren!2859
 2021-09-18 17:36:08 +00:00
juliancoffee
1d8c368137 Tweak coefficient of beam_offset for clay_golem 2021-09-18 19:55:46 +03: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
Joshua Barretto
2f1fe39e04 Merge branch 'james/lava-dungeons' into 'master' 
Prettier site2 houses

See merge request veloren/veloren!2852
 2021-09-18 14:58:42 +00:00
Justin Shipsey
02c19aaee8 Merge branch 'zesterer/remove-unscheduled-skydives' into 'master' 
Remove unscheduled skydives

See merge request veloren/veloren!2851
 2021-09-18 04:53:22 +00:00
James Melkonian
36884d6919 Move rrt algorithm into its own function 2021-09-17 16:27:00 -07:00
James Melkonian
9875a74640 Make RRT pathfinding a cfg feature 2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750 Disable RRT pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728 Initial RRT flight pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
42fdf0818d Gable primitive and dungeon lava rooms 2021-09-17 15:45:26 -07:00
Joshua Barretto
a76496c339 Use previous position caches for airship collision detection 2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4 Merge branch 'anomaluridae/cleanup-interactable' into 'master' 
Seperation of targets vs interactables. Cleaner cursor interactions.

See merge request veloren/veloren!2754
 2021-09-17 19:25:08 +00:00
anomaluridae
82f3c3c3e8 is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
anomaluridae
6362df4ffc keep MAX_TARGET_RANGE within voxygen 2021-09-17 10:34:20 -07:00
anomaluridae
42d5836cfa properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds. 2021-09-17 10:34:20 -07:00
anomaluridae
5c66f73bb4 make the ContollerInputs.select_pos be explicitly the breakable blacks for mining 2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
juliancoffee
e5d69d153b Adress review 
Make sausage ascii-art have `a` line inside of stadium
 2021-09-17 13:28:34 +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
6c3b61dc25 Implement CapsulePrism collisions 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
Sam
99981338bb Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Sam
3d31248ced Fixed health ui in few places and xp scaling from health. 2021-09-14 10:55:14 -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
fec92c3000 Fixed plugin tests with hack. 2021-09-13 10:34:40 -04: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
Sam
c7291701e1 Sprite interaction fixes 2021-09-07 20:34:04 -04: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
Sam
f65b3a094d Cultists now properly raid villages. 2021-09-04 12:25:04 -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
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
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
6b0d016418 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Sam
0a3b541940 Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00
Sam
5f08089bd9 Recover section no longer has 0 movement. 2021-09-02 19:27:07 -04: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
Samuel Keiffer
a733ad00e6 Merge branch 'ubruntu/sometimes-drop-nothing' into 'master' 
NPCs can drop nothing

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

See merge request veloren/veloren!2797
 2021-09-01 12:47:50 +00:00
Joshua Barretto
1b0cb40d94 Made ore streams mineable 2021-09-01 12:05:00 +01: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
5dbc05730d Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement. 2021-08-31 13:37:57 -04:00
Sam
f986176604 Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection. 2021-08-31 13:37:56 -04:00
Sam
2a3cc3d35a No longer send collect inventory event if interactable sprite kind cannot be found. 2021-08-31 13:37:56 -04:00
Sam
6b71133c50 Fixed interaction to work underwater. 2021-08-31 13:37:55 -04:00
Sam
13fa154e55 Changelog and added arm length (body radius) to sprite pickup range. 2021-08-31 13:37:53 -04:00
Sam
6d91bae44b Sprite interaction now uses pathfinding to check that it can be picked up. 2021-08-31 13:37:36 -04:00
Sam
28d23c89ed Added simple distance check for sprite interaction. 2021-08-31 13:37:36 -04:00
Sam
9e5744f3ee Entities will now attempt to orient towards the sprite they are interacting with. 2021-08-31 13:37:36 -04:00
Sam
44c3b0f153 Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Sam
538cb56b87 Sprites now go through a character state to be picked up. 2021-08-31 13:36:04 -04:00
Joshua Barretto
0b1a820762 Make arrows 'bonk' hanging sprites 2021-08-31 13:31:27 +01:00
Monty Marz
13c15b3840 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
0011e75526 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
87f4efd65b Added spot loot 2021-08-29 12:50:35 +01:00
Monty Marz
771a380e6c witch stuff 2021-08-28 14:53:30 +01:00
Monty Marz
df0ab43bb8 taiga and savannah definitions 2021-08-28 14:53:30 +01:00
Joshua Barretto
06d85b8b10 Added index customisation for world structure models 2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1 sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +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
juliancoffee
1ff99dcc34 Remove unused SkillBoost functions 2021-08-26 14:49:52 +03:00
juliancoffee
81bbc8c31f Split adjusted_by_skills by toolkind 2021-08-26 14:49:51 +03:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Imbris
2c3b484567 Merge branch 'imbris/some-tweaks' into 'master' 
Add comment on tuple bool field meaning in pathing

Closes #758

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

See merge request veloren/veloren!2776
 2021-08-21 16:14:42 +00:00
Imbris
a612631aa4 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
c00bca7e93 Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00
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
130ae1f429 Add ori_modifier for DashMelee and nerf it 
* 0.6 -> 0.3 ori modifier during charge in DashMelee
 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
5e7e560c10 Merge branch 'min-persistent-world' into 'master' 
min-persistent-world

See merge request veloren/veloren!2662
 2021-08-13 12:30:28 +00:00
Dr. Dystopia
94bcf5b59b Move assignment out of if-statement 2021-08-12 12:34:04 +02: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
Samuel Keiffer
d5feca45c5 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' 
Consolidate redundant stage sections

See merge request veloren/veloren!2748
 2021-08-10 01:23:26 +00:00
juliancoffee
449902a50e Use asset::load_dir to get list of all items 2021-08-10 02:03:46 +03:00
Sam
52ee598cf1 Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
pacmanmati
5f37509a78 #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
juliancoffee
4069a381c5 Make Frenzied buff again 2021-08-09 13:05:00 +03:00
Treeco
a48fa0f349 Buff swim thrust for humans reduce gains from skillpoints 
This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when skilled
However, this turns out to be horrifically fps-dependant, both after this branch and in master. Needs further research into fixes
This commit tunes it for 60 fps
 2021-08-09 10:06:16 +01:00
Treeco
2fc62bfe7f Make each race's hitbox and weight scale linearly with their height 
This causes all humanoids to handle identically when falling, gliding, or swimming
 2021-08-09 10:06:16 +01:00
Ludvig Böklin
ebf489984c Improve gliding 
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
 2021-08-09 10:06:16 +01:00
Ludvig Böklin
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients 
Increase glider zero-lift drag
 2021-08-09 10:06:15 +01:00
Samuel Keiffer
9bfd396c36 Merge branch 'ubruntu/relative-xp-curve' into 'master' 
XP reward curve modified for faster gain at lower levels

See merge request veloren/veloren!2706
 2021-08-08 03:34:57 +00:00
ubruntu
dca795e533 XP reward curve modified for faster gain at lower levels 2021-08-08 03:34:56 +00:00
juliancoffee
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
Samuel Keiffer
2b10f818f5 Merge branch 'juliancoffee/pillar_fix' into 'master' 
Nerf pillars + Fix Beam ori

See merge request veloren/veloren!2732
 2021-08-07 16:35:24 +00:00
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
juliancoffee
c0f3dfe6bd Normalize masses in range 75-100. 
+ Remove match on body_type
 2021-08-06 11:57:42 +03:00
juliancoffee
4029d4a720 Change beam offsets 
* Make it so that beam starts from inside hitbox of owner.
Without it it's possible to cheese beem attack just making close enough
to its owner.
 2021-08-05 21:07:46 +03:00
juliancoffee
3386805765 Give TrainingDummy hitbox 2021-08-05 21:07:46 +03:00
juliancoffee
8a83ecf57f Fix Beam orientation, remove orientation_behavior 
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
 2021-08-05 21:07:46 +03:00
Ludvig Böklin
cbd7c4481c Make character upright itself even while idle 2021-08-05 08:34:21 +02:00
Samuel Keiffer
92b32b4c36 Merge branch 'ygor/fix-axe-energy-reward' into 'master' 
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
 2021-08-05 00:38:41 +00:00
Joshua Barretto
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +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
5e6007db03 Return self-harm 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
229e7b9cec Add CHANGELOG note about battle_mode setting 2021-08-03 16:43:54 +03:00
juliancoffee
61416faec3 Refactor Aura system, add avoid_harm flag 
+ fix bug where you cast OutOfGroup on yourself and your group
 2021-08-03 16:42:58 +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
Ygor Souza
1b5c3883a4 Allow axe combo to reward energy without skillpoint 
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
 2021-08-03 07:10:03 +02: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
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Imbris
3ddbb0a5fb Merge branch 'mohs/refactoring_character_behavior' into 'master' 
reducing complexity of character_behavior's run method by extracting logical pieces.

See merge request veloren/veloren!2697
 2021-07-31 02:47:55 +00:00
Thomas Kosel
2bf8a8c55c
improving code quality by removing superfluous & 2021-07-30 10:12:20 +02:00
Thomas Kosel
005c33bb28
renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
Thomas Kosel
0b07b14093
moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
Imbris
6b54bedcd0 Merge branch 'imbris/1002-fix' into 'master' 
Add comment to physics and replace magic number in climbing boost with a named...

Closes #1002

See merge request veloren/veloren!2694
 2021-07-29 17:46:14 +00:00
Imbris
9fb6b84670 Merge branch 'juliancoffee/hud_refactor' into 'master' 
Skillbar hud refactoring (+ shortened key names)

See merge request veloren/veloren!2663
 2021-07-29 16:08:56 +00:00
Imbris
01d1089a46 Add comment to physics and replace magic number in climbing boost with a named constant, fixes #1002 2021-07-29 03:11:44 -04: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
juliancoffee
4adc045627 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03: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
juliancoffee
1bdab02aad Deduplicate bar text 2021-07-28 10:33:51 +03:00
Thomas Kosel
acb7f5dc4b
#918 remove usages of .restrict_mut() from character_behavior.rs 2021-07-27 23:34:16 +02: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
Imbris
1a081cdc5b Merge branch 'james/map-ui' into 'master' 
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
 2021-07-25 17:24:50 +00:00
Avi Weinstock
edad38098f Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions" 
This reverts commit 0247ae2bf6.
 2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772 Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" 
This reverts commit 63eff216f0.
 2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
54eb97b9de Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07: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
f039321cd7 Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-24 20:19:16 +02:00
Dr. Dystopia
575db6f51d Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions 2021-07-24 20:01:11 +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
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 Märtens
baf19b4d60 remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place 2021-07-22 20:57:16 +02:00
Marcel Märtens
7d93d907f6 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
Knightress Paladin
7ce9a3e284 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
c48a7c0072 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
578cacc194 Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
9be690770a Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
ce31ac9fd1 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
68725a0131 Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00
Dr. Dystopia
9abd066e53 Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Knightress Paladin
081c6e5362 Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Imbris
3e6fd0ee1d Setup animation mount points for quadruped medium, update offsets in 
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
 2021-07-18 15:09:36 -04:00
Imbris
b2bf83e200 Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs 2021-07-18 15:04:02 -04:00
Snowram
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -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
Joshua Barretto
1501f0467e Merge branch 'zesterer/small-fixes' into 'master' 
Fixed handling of orientation changes for airships

See merge request veloren/veloren!2640
 2021-07-18 08:29:50 +00:00
Imbris
30119a6afc Re-address approx_constant lint without using fractional constants and 
re-add a few blank lines
 2021-07-17 20:41:09 -04:00
Joshua Barretto
eade248e1f Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
Imbris
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
juliancoffee
021d5c60de Add test for duplicates in EntityConfig::meta 
+ make tests cleaner
 2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
d04364b1f1 Replace EntityConfig main/second_tool with hands 
+ Check equip_slot can hold item in LoadoutBuilder
 2021-07-17 15:37:31 +03:00
juliancoffee
1d2ea717ab Move builder assets in EntityConfig to meta field 2021-07-17 15:37:31 +03:00
juliancoffee
6403ee0634 Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
7401d74aa6 Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
d920f911a2 Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 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
Jonathan Berglin
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Avi Weinstock
9e9cbd290b cargo fmt 2021-07-15 15:52:10 -04: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
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
f05fc79fe2 Merge branch 'juliancoffee/forgiving_travellers' into 'master' 
AI small fixes

See merge request veloren/veloren!2598
 2021-07-15 08:15:25 +00:00
Dr. Dystopia
4d96d6f9a0 Resolve all '#[allow(clippy::neg_multiply)]' error supressions 2021-07-14 22:18:30 +02: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
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
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +02: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
146f86be2c Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
Sam
fbcc774911 Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future. 2021-07-10 23:22:00 -05: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
b4ec433509 Add healing aura for sceptre M2 2021-07-10 20:02:35 -07:00
Samuel Keiffer
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00