mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
15b11d9154
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
220 lines
4.7 KiB
Plaintext
220 lines
4.7 KiB
Plaintext
[
|
|
(
|
|
name: "Credge",
|
|
position: (4176, 4080),
|
|
kind: Settlement,
|
|
neighbors: [
|
|
(2, 112),
|
|
(1, 146),
|
|
(6, 98),
|
|
(9, 145),
|
|
],
|
|
resources: [
|
|
(
|
|
good: Terrain(Lake),
|
|
amount: 4,
|
|
),
|
|
(
|
|
good: Terrain(Mountain),
|
|
amount: 52,
|
|
),
|
|
(
|
|
good: Terrain(Grassland),
|
|
amount: 7073,
|
|
),
|
|
(
|
|
good: Terrain(Ocean),
|
|
amount: 4929,
|
|
),
|
|
(
|
|
good: Terrain(Forest),
|
|
amount: 6360,
|
|
),
|
|
],
|
|
),
|
|
(
|
|
name: "Etodren",
|
|
position: (1200, 2928),
|
|
kind: Settlement,
|
|
neighbors: [
|
|
(2, 258),
|
|
(0, 146),
|
|
(6, 60),
|
|
(9, 158),
|
|
],
|
|
resources: [
|
|
(
|
|
good: Terrain(Mountain),
|
|
amount: 288,
|
|
),
|
|
(
|
|
good: Terrain(Grassland),
|
|
amount: 4129,
|
|
),
|
|
(
|
|
good: Terrain(Desert),
|
|
amount: 230,
|
|
),
|
|
(
|
|
good: Terrain(Ocean),
|
|
amount: 2923,
|
|
),
|
|
(
|
|
good: Terrain(Forest),
|
|
amount: 3139,
|
|
),
|
|
],
|
|
),
|
|
(
|
|
name: "Twige",
|
|
position: (2000, 7632),
|
|
kind: Settlement,
|
|
neighbors: [
|
|
(0, 112),
|
|
(1, 258),
|
|
(6, 109),
|
|
(9, 32),
|
|
],
|
|
resources: [
|
|
(
|
|
good: Terrain(Lake),
|
|
amount: 1,
|
|
),
|
|
(
|
|
good: Terrain(Mountain),
|
|
amount: 231,
|
|
),
|
|
(
|
|
good: Terrain(Grassland),
|
|
amount: 3308,
|
|
),
|
|
(
|
|
good: Terrain(Desert),
|
|
amount: 1695,
|
|
),
|
|
(
|
|
good: Terrain(Ocean),
|
|
amount: 487,
|
|
),
|
|
(
|
|
good: Terrain(Forest),
|
|
amount: 1338,
|
|
),
|
|
],
|
|
),
|
|
(
|
|
name: "Pleed Dungeon",
|
|
position: (6922, 1034),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Fred Lair",
|
|
position: (3786, 2250),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Frer Dungeon",
|
|
position: (6602, 2250),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Inige Castle",
|
|
position: (1360, 4304),
|
|
kind: Castle,
|
|
neighbors: [
|
|
(0, 98),
|
|
(1, 60),
|
|
(2, 109),
|
|
(9, 99),
|
|
],
|
|
resources: [
|
|
(
|
|
good: Terrain(Mountain),
|
|
amount: 424,
|
|
),
|
|
(
|
|
good: Terrain(Grassland),
|
|
amount: 958,
|
|
),
|
|
(
|
|
good: Terrain(Desert),
|
|
amount: 1285,
|
|
),
|
|
(
|
|
good: Terrain(Ocean),
|
|
amount: 669,
|
|
),
|
|
(
|
|
good: Terrain(Forest),
|
|
amount: 1781,
|
|
),
|
|
],
|
|
),
|
|
(
|
|
name: "Estedock Catacombs",
|
|
position: (4650, 330),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Oreefey Lair",
|
|
position: (1578, 3754),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Lasnast Keep",
|
|
position: (1136, 6832),
|
|
kind: Castle,
|
|
neighbors: [
|
|
(0, 145),
|
|
(2, 32),
|
|
(1, 158),
|
|
(6, 99),
|
|
],
|
|
resources: [
|
|
(
|
|
good: Terrain(Mountain),
|
|
amount: 352,
|
|
),
|
|
(
|
|
good: Terrain(Grassland),
|
|
amount: 887,
|
|
),
|
|
(
|
|
good: Terrain(Desert),
|
|
amount: 2606,
|
|
),
|
|
(
|
|
good: Terrain(Ocean),
|
|
amount: 286,
|
|
),
|
|
(
|
|
good: Terrain(Forest),
|
|
amount: 679,
|
|
),
|
|
],
|
|
),
|
|
(
|
|
name: "Oren Lair",
|
|
position: (6730, 2506),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
(
|
|
name: "Ween Crib",
|
|
position: (2250, 8010),
|
|
kind: Dungeon,
|
|
neighbors: [],
|
|
resources: [],
|
|
),
|
|
] |