Commit Graph

369 Commits

Author SHA1 Message Date
Avi Weinstock
ddf6a26577 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Rickey Chamblee
8a25ebb59a Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
Monty Marz
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
Louis Pearson
5cbdf1850c Fix travellers stuck in town
There was an off by one error in the code that negates the progress
along paths that are reversed.
2021-04-08 05:10:04 -06:00
holychowders
54d0c0f098 Update the changelog 2021-04-07 17:38:09 -07:00
hqurve
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
Marcel
f0cabf1add Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Marcel
4dde9f84b0 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Hunter Parks
6af9662b03 Change cursor lock location to be center of screen
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Hunter Parks
7df0413be4 Fixes #520 and #840 - locks cursor to screen when menu is not open
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
Monty
b8c474057c More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Avi Weinstock
a1cfd9ea3c Make merchants spawn with stacks of stackable items. 2021-04-04 13:47:05 -04:00
Avi Weinstock
78f130a3b2 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Sam
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Avi Weinstock
b7dbadc32f Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
Avi Weinstock
0122dca3c3 Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Joshua Barretto
3c19713e63 Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites

See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
bed863c50c Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
Joshua Barretto
b0acbda236 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Joshua Barretto
5bf17779ec Updated changelog, fmt 2021-03-28 18:07:01 +01:00
Avi Weinstock
40f2c59401 Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -04:00
Sam
ade466a12b Removed potential for divide by zero 2021-03-27 21:06:21 -04:00
Sam
0e3b0a9ee7 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
Sam
a5b7477e96 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Louis Pearson
b03a207957 Update CHANGELOG.md 2021-03-28 00:53:40 +00:00
Marcel
79cc3af058 Merge branch 'swilliams/character-randomization-fix' into 'master'
Character Creation Randomization Fix

See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
9ca0388561 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
Samuel Keiffer
7879466f32 Merge branch 'aweinstock/diamond-prices' into 'master'
Improve econsim's handling of diamond prices by lowering the implied homicide rate.

See merge request veloren/veloren!2005
2021-03-27 15:29:19 +00:00
Avi Weinstock
4b62a99ed9 Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
Louis Pearson
21f794f84c Use Depot instead of Store for BuildArea 2021-03-27 07:54:02 -06:00
Louis Pearson
2b0c71bfca Remove internal feature from CHANGELOG.md 2021-03-26 06:29:23 -06:00
Marcel
843850a4b8 Merge branch 'aweinstock/tradepricing' into 'master'
Get SitePricing information to clients, and use it to display coin-denominated...

See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
Louis Pearson
0a294bcf56 Use older version of Store and introduce Depot
Removal of items in Store can cause get to fail. It has been reverted to
an older version that did not support removal. The newer version is now
called Depot and changed so that None is returned if the item does
not exist instead of crashing.
2021-03-25 07:41:53 -06:00
Avi Weinstock
8d90548331 Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Avi Weinstock
c4a6875133 Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs. 2021-03-24 15:42:37 -04:00
Avi Weinstock
cfb55b4881 Add an additional kind of stairs to dungeons. 2021-03-23 18:17:00 -04:00
Joshua Barretto
21b20ea75e Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
Enable RtSim Airships.

See merge request veloren/veloren!1973
2021-03-23 14:29:43 +00:00
Marcel
f2c01409a2 Merge branch 'sam/continuous-roll' into 'master'
Roll Tweaks

See merge request veloren/veloren!1975
2021-03-23 09:46:21 +00:00
Avi Weinstock
49f39fb752 Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
Joshua Barretto
695f6c52fe Added raycast check to beams 2021-03-23 10:43:18 +01:00
Sam
7ede94b4c9 Changelog 2021-03-22 23:53:00 -04:00
heydabop
0e3f7625a9 Fix #962 - kick old client and add new client on duplicate login 2021-03-22 19:15:24 -05:00
Joshua Barretto
7b736640f5 Smoother particle emission for moving objects 2021-03-22 00:23:25 +00:00
Vincent Foulon
7dad972632 add changelog entry 2021-03-20 17:18:32 +01:00
Marcel Märtens
2733ba2e27 Change the version number to 0.9 2021-03-20 13:07:09 +01:00
Imbris
9fb44e5674 More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations 2021-03-18 21:20:22 -04:00
Vincent Foulon
eafa69ee4c allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Imbris
8d9809ed25 update changelog, clippy fixes 2021-03-16 04:06:15 -04:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Avi Weinstock
9304ecab3d Address Imbris's MR 1888 comments, and add changelog entry.
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Christof Petig
15b11d9154 Implement /price_list (work in progress), stub for /buy and /sell
remove outdated economic simulation code

remove old values, document

add natural resources to economy

Remove NaturalResources from Place (now in Economy)

find closest site to each chunk

implement natural resources (the distance scale is wrong)

cargo fmt

working distance calculation

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

use natural resources and controlled area to replenish goods

increase the amount of chunks controlled by one guard to 50

add new professions and goods to the list

implement multiple products per worker

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

correctly determine which goods guards will give you access to

correctly estimate the amount of natural resources controlled

adapt to new server API

instrument tooltips

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

closures for tooltip content generation

pass site/cave id to the client

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

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

Specialize the Crafter into Brewer,Bladesmith and Blacksmith

working server request for economic info from within tooltip

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

fix overlapping ids between caves and sites

display stock amount

correctly handle invalid (cave) ids in the request

some initial balancing, turn off most info logging

less intrusive way of implementing the dynamic tool tips in map

further tooltip cleanup

further cleanup, dynamic tooltip not fully working as intended

correctly working tooltip visibility logic

cleanup, display labor value

separate economy info request in a separate translation unit

display values as well

nicer display format for economy

add last_exports and coin to the new economy

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

balancing attempt

print town size statistics

cargo fmt (dead code)

resource tweaks, csv debugging

output a more interesting town (and then all sites)

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

load professions from ron (WIP)

use assets manager in economy

loading professions works

use professions from ron file

fix Labor debug logic

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

better structured resource data

traders, more professions (WIP)

fix exception when starting the simulation

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

documentation clean up

fix merge artifact

Revise trader mechanic

start Coin with a reasonable default

remove the outdated economy code

preserve documentation from removed old structure

output neighboring sites (preparation)

pass list of neighbors to economy

add trade structures

trading stub

Description of purpose by zesterer on Discord

remember prices (needed for planning)

avoid growing the order vector unboundedly

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

use drain to process Vecs, avoid clone

fix the test server

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

enable info output in test

debug missing and extra goods

use the same logging extension as water, activate feature

update dependencies

determine good prices, good exchange goods

a working set of revisions

a cozy world which economy tests in 2s

first order planning version

fun with package version

buy according to value/priority, not missing amount

introduce min price constant, fix order priority

in depth debugging

with a correct sign the trading plans start to make sense

move the trade planning to a separate function

rename new function

reorganize code into subroutines (much cleaner)

each trading step now has its own function

cut down the number of debugging output

introduce RoadSecurity and Transportation

transport capacity bookkeeping

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

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

proper transportation estimation (although 0)

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

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

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

fix warnings and use the transportation from stock again

cargo fmt

prepare evaluation of trade

don't count transportation multiple times

fix merge artifact

operational trade planning
trade itself is still misleading

make clippy happy

clean up

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

incomplete merchant labor_value computation

correct last commit

make economy of scale more explicit

make clippy happy (and code cleaner)

more merchant tweaks (more pop=better)

beginning of real trading code

revert the update of dependencies

remove stale comments/unused code

trading implementation complete (but untested)

something is still strange ...

fix sign in trading

another sign fix

some bugfixes and plenty of debugging code

another bug fixed, more to go

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

introduce Terrain and Territory

fix merge mistakes
2021-03-14 03:18:32 +00:00
Joshua Barretto
235d657c97 Made /time relative to the current day for day-relative times 2021-03-11 19:13:19 +00:00
Sam
de5ef03ac4 Auras will now refresh buffs if a buff was already present that had a lesser duration.
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
2021-03-09 18:03:06 -05:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Joshua Barretto
e4e512a5d7 Updated changelog 2021-03-07 14:25:33 +00:00
Avi Weinstock
22fcc6417c Make fireworks recursively shoot more fireworks (95% average replication). 2021-03-06 14:05:51 -05:00
Marcel Märtens
c681992367 Changelog:
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
2021-03-03 15:06:34 +01:00
ccgauche
356f09d780 Update CHANGELOG.md 2021-03-02 09:46:08 +00:00
ccgauche
7f4411ba1f Merge branch 'master' into 'ccgauche/plugin-player-join-event'
# Conflicts:
#   CHANGELOG.md
2021-03-02 09:45:15 +00:00
Jesus Bracho
c0573cca44 Implement stacking and splitting 2021-03-02 00:08:46 +00:00
ccgauche
4cffd2cadd Updated CI + Changelog 2021-03-01 19:28:27 +01:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Monty Marz
e5273e3a8e reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button 2021-02-27 19:02:26 +00:00
jshipsey
16720a6826 weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Sarra
f39f5ab5d3 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
ccgauche
387daf8aea Change invalid message in examples and cleanup
Updated changelog + Removed hello plugin from plugins folder
2021-02-23 00:02:58 +01:00
Joshua Barretto
e2290783fc Merge branch 'humanoid_ai_glide_when_falling' into 'master'
FIX #956: Humanoid ai glide when falling

See merge request veloren/veloren!1772
2021-02-22 00:57:25 +00:00
Overblob
370259fe54 CI - Fix clippy errors
Fix trailing whitspace
2021-02-22 00:57:25 +00:00
Sam
f24490dc80 Added functionality for buffs queueing. Saturation now queues. 2021-02-20 17:13:17 -05:00
Avi Weinstock
c489d095df Implement persistence for modular weapons.
This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search.

Squahed fixes:

- Fix some constraint violations that occurred when swapping inventory items.
- Comment out recipes for modular weapons.
- Make update_item_at_slot_using_persistence_key and is_modular more idiomatic.
- Add changelog entry.
- Document `defer_foreign_keys` usage.
2021-02-20 14:31:46 -05:00
Snowram
f78170704a Allows some species to be immune to specific buffs 2021-02-20 14:03:15 +00:00
Avi Weinstock
559ad7b7f5 Client-side trade improvements.
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
2021-02-19 15:20:27 -05:00
Marcel
c6d69d1196 Merge branch 'xMAC94x/network_tokio' into 'master'
xMAC94x/network_tokio switch from `async_std` to `tokio`

See merge request veloren/veloren!1789
2021-02-17 22:47:11 +00:00
Ada Lovegirls
96b8a582fe Fixed missing controller actions
(cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)
2021-02-17 21:10:14 +00:00
Marcel Märtens
03af9937cf Stabelize Network again:
- completly switch to Bytes, even in api. speed up TCP by fak 2
 - improve benchmarks
 - speed up mpsc metrics
 - gracefully handle shutdown by interpreting Ok(0) as tokio::tcpstream closed now.
 - fix hotloop in participants by adding `Some(n)` to fix endless handing.
 - fix closing bug by closing streams after `recv_mgr` is shutdown even if now shutdown is triggered locally.
 - fix prometheus
 - no longer throw when a `Stream` is dropped while participant still receives a msg for it.
 - fix the bandwith handling, TCP network send speed is up to 1.5GiB/s while recv is 150MiB/s
 - add documentation
 - tmp require rt-multi-threaded in client for tokio, to not fail cargo check

this is prob stable, i tested over 1 hour.
after that some optimisations in priomgr.
and impl. propper bandwith.
Speed is up to 2GB/s write and 150MB/s recv on a single core

sync add documentation
2021-02-17 19:37:48 +01:00
Ada Lovegirls
06575f601e Merge branch 'master' into 'ada/improve-controller-bindings'
# Conflicts:
#   CHANGELOG.md
2021-02-16 15:30:46 +00:00
Synis
2e4cf7cc4e Added changelog entry 2021-02-16 13:26:40 +01:00
Lippy13
b64fc5e822 Fix #689 - dungeon without stairs to boss floor 2021-02-16 00:54:44 +00:00
AdaLovegirls
390812f54e Improve controller keybindings 2021-02-14 21:31:31 -06:00
Avi Weinstock
c984035976 MR 1775 review fixes.
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
2021-02-14 11:13:56 -05:00
Snowram
6ac52daeae Refactor, addresses more comments 2021-02-10 00:34:37 +01:00
Scott Williams
ae22a98167 Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops. 2021-02-07 19:04:20 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60c16e57b1 Added snow particles 2021-01-31 15:15:17 +00:00
jiminycrick
46c8c744fa Add migration for starter gear 2021-01-28 17:22:39 -08:00
Scott Williams
0cde434e3b All gems make a sound. 2021-01-25 22:53:23 +00:00
Snowram
ad6cdcab71 Merge branch 'swilliams/gems' into 'master'
Adds 6 different gems and removes shiny gem.

See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Samuel Keiffer
0343b57b2b Merge branch 'lboklin/glider-stamina' into 'master'
Glider stamina cost now only when first starting to glide based on fall speed

See merge request veloren/veloren!1727
2021-01-25 00:17:32 +00:00
Scott Williams
fda6c9ffd1 Added to changelog. 2021-01-24 16:52:56 +00:00
Ludvig Böklin
30168e375f Glider stamina only costs on deploy 2021-01-24 10:56:35 +01:00
Scott Williams
c7baf1fd86 General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
Scott Williams
2a9c4f6f2e Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
Sam
c888ec0535 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00