Commit Graph

7007 Commits

Author SHA1 Message Date
Forest Anderson
8cec35a9af Merge branch 'synis/fix-safezone-mass' into 'master'
Fix safezone entity mass

See merge request veloren/veloren!1902
2021-03-15 00:52:03 +00:00
Imbris
a558d42da7 Merge branch 'snowram/new-npcs' into 'master'
Snowram/new npcs

See merge request veloren/veloren!1896
2021-03-15 00:10:46 +00:00
Imbris
4e454d3215 Merge branch 'imbris/ping-while-waiting-for-gamesync' into 'master'
Keep connection alive while waiting for initial sync

See merge request veloren/veloren!1898
2021-03-14 22:07:56 +00:00
Marcel
b0a41704da Merge branch 'DaforLynx/upscale-tweak' into 'master'
Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981

See merge request veloren/veloren!1899
2021-03-14 21:26:42 +00:00
Synis
29d1dca067 Added mass to safezone entity 2021-03-14 22:04:56 +01:00
DaforLynx
f924e047ac Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981 2021-03-14 12:18:29 -07:00
Imbris
6ef459e815 Merge branch 'PersianKnight/DebugInfoHotKey_AxeSkillTree' into 'master'
PersianKnight / Debug info hot key and axe skill tree

See merge request veloren/veloren!1897
2021-03-14 17:29:30 +00:00
Imbris
de14e5bc5e to squash 2021-03-14 17:13:00 +00:00
Imbris
93e33eed25 Keep connection alive while waiting for initial sync 2021-03-14 17:11:44 +00:00
Snowram
60dd47cdea Theropod charge attack 2021-03-14 18:10:40 +01:00
PersianKnight
b87514266d Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30
Snowram
9d7e8957bb Add new npcs 2021-03-14 14:24:35 +01:00
Imbris
72ca632a2c Merge branch 'christof/trading_MVP' into 'master'
Economy rework, inter site trading, merchants in towns trading with players

See merge request veloren/veloren!1744
2021-03-14 03:18:32 +00: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
Imbris
fcdd7f1c8b Merge branch 'imbris/tracy-tweaks' into 'master'
Improvements for tracy server analysis and other misc tweaks

See merge request veloren/veloren!1891
2021-03-13 22:26:26 +00:00
Imbris
bc75a8b769 Merge branch 'PersianKnight/ImprovedSettings' into 'master'
Persian knight/improved settings

See merge request veloren/veloren!1893
2021-03-13 19:45:36 +00:00
Imbris
0127832172 Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode 2021-03-13 13:30:20 -05:00
PersianKnight
7c0fe70453 Improve default value of windows_size in Graphics and Help Windows in Interface Settings. 2021-03-13 19:09:38 +03:30
PersianKnight
42d57ccb92 The appearance of the reset buttons has improved. 2021-03-13 17:42:52 +03:30
PersianKnight
e3c0ceb9fa Fixed Toggle Debug Info from Settings 2021-03-13 17:38:34 +03:30
Imbris
0170acb460 Merge branch 'imbris/fix-server' into 'master'
Fix server panic

See merge request veloren/veloren!1890
2021-03-13 08:58:06 +00:00
Imbris
3c4829bc4a Fix server panic 2021-03-13 03:57:06 -05:00
Imbris
2511b8959c Add tracy entity count plot, span tweaks 2021-03-13 02:59:58 -05:00
Imbris
8d0b776f18 Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
2021-03-13 02:28:59 -05:00
Samuel Keiffer
4022937da7 Merge branch 'PersianKnight/InterfaceSettings' into 'master'
Separated InterfaceSettings from GameplaySettings

See merge request veloren/veloren!1887
2021-03-13 01:55:18 +00:00
Samuel Keiffer
f18cdfd54e Merge branch 'DaforLynx/more-sound-fixes' into 'master'
Small audio-related fixes

See merge request veloren/veloren!1889
2021-03-13 00:38:40 +00:00
DaforLynx
99261bf105 Many small changes to audio code, mainly sfx - changelog in MR 2021-03-12 15:00:09 -08:00
PersianKnight
dcb32a7ff1 Separated InterfaceSettings from GameplaySettings 2021-03-12 22:45:44 +03:30
Samuel Keiffer
bb34a604a7 Merge branch 'slipped/poise' into 'master'
poise ability values, melee

See merge request veloren/veloren!1884
2021-03-12 18:25:22 +00:00
Sam
803e42cc01 Fixed broken weapon. 2021-03-12 11:00:54 -05:00
Marcel
bf3e12f39a Merge branch 'aweinstock/botclient' into 'master'
move botclient to client/src/bin/bot

See merge request veloren/veloren!1886
2021-03-12 11:16:29 +00:00
Marcel Märtens
c1d6b1ac75 handle ticks in a seperate thread that tui on botclient 2021-03-12 11:08:24 +01:00
Marcel
bce635c1f5 Merge branch 'xMAC94x/par_network' into 'master'
lock on streams to allow parallel send

See merge request veloren/veloren!1885
2021-03-12 09:23:18 +00:00
Marcel Märtens
e001b2cac2 move botclient to client/src/bin/bot
start it with:
 - (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 09:28:24 +01:00
Avi Weinstock
7301182695 Draft of botclient. 2021-03-12 09:28:21 +01:00
Marcel Märtens
1cb6101326 lock on streams to allow parallel send 2021-03-12 09:25:12 +01:00
jshipsey
49f496e290 intitial values 2021-03-12 00:58:12 -05:00
Samuel Keiffer
d8f2d55923 Merge branch 'sam/crit-balance' into 'master'
Rebalanced crit stats

See merge request veloren/veloren!1883
2021-03-12 03:36:01 +00:00
Joshua Barretto
e43b57f119 Merge branch 'synis/castles-cont' into 'master'
Castle generation

See merge request veloren/veloren!1881
2021-03-12 01:49:26 +00:00
Sam
66181a7f8c Rebalanced crit stats 2021-03-11 20:30:15 -05:00
Marcel
1166893fd4 Merge branch 'xMAC94x/docker_quickfix' into 'master'
the docker container was missing the ca-certificates root store

See merge request veloren/veloren!1882
2021-03-11 23:09:42 +00:00
Marcel Märtens
767bae540e the docker container was missing the ca-certificates root store
Its now using ubuntus default root-store for tls operations.
2021-03-12 00:08:34 +01:00
Synis
9f9ed4b211 Addressed comments 2021-03-11 23:51:57 +01:00
Marcel
5d32690fbf Merge branch 'xMAC94x/server_parallize' into 'master'
handle msg as part of the servers state for best parallelisation. also include agent there

See merge request veloren/veloren!1878
2021-03-11 21:52:18 +00:00
Marcel
93cab075f8 Merge branch 'xMAC94x/non_blocking_register' into 'master'
Auth requests are now done async, the register system is fetching it, via a PendingLogin component

See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37 Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings

See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
Synis
631a591a68 Castle generation 2021-03-11 22:17:31 +01:00
Joshua Barretto
155bb7a146 Merge branch 'zesterer/relative-time-cmd' into 'master'
Made /time relative to the current day for day-relative times

See merge request veloren/veloren!1879
2021-03-11 19:25:37 +00:00
Joshua Barretto
235d657c97 Made /time relative to the current day for day-relative times 2021-03-11 19:13:19 +00:00
PersianKnight
3b3ffe30e9 Add Reset to Default Buttons for Interface, Gameplay and Sound Settings 2021-03-11 22:09:30 +03:30