Joshua Yanovski
35deaae540
Fix various builds.
2022-07-14 22:25:00 -07:00
Joshua Yanovski
6eb26ba6d8
Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen
2022-07-07 16:02:18 -07:00
Joshua Yanovski
45f5fbe3dd
Remove unused tree code.
2022-07-02 19:45:33 -07:00
Joshua Yanovski
a3b7127de9
Evven zoomier WorldGen, lots of things broken!
2022-06-28 00:24:46 -07:00
Joshua Yanovski
a973155597
Zoomy worldgen WIP, please do not complain things are broken.
2022-06-24 02:48:09 -07:00
Christof Petig
1c5cb8abcd
follow the more elegant proposal by clippy
2022-06-07 23:37:51 +02:00
Christof Petig
fca4372205
avoid economy of scale in economy_tree
2022-06-07 21:46:41 +02:00
Christof Petig
5a965d21c7
replace vector copying with an iterator
2022-06-07 21:38:17 +02:00
Christof Petig
db85d2a146
fix clippy
2022-06-07 18:30:05 +02:00
Christof Petig
6d3ea3172c
separate orders by professions and everyone
...
cleanup and fix
strictly this population growth logic is wrong, but identical to the existing one
standardize on production, remove more dead code
fix example + rustfmt
separate csv logic from tick (intention is to move it into economy)
remove the format call from economy (inactive debugging code)
remove more formatting
rustfmt
small clippy fix
Reduce precision on output
move csv code
move rest of sim2 mod into economy (context)
remove more unused parts
keep things a bit more coherent
remove pub
make more functions and fields private
remove outdated input, fix other, print names, move output to proper abstraction
remove dead code
2022-06-07 18:30:05 +02:00
Christof Petig
edffd576d4
only the code move part of shredded_economy4
2022-06-07 18:30:05 +02:00
Christof Petig
3fc59d7e4d
lower trading output to trace (and raise one to warn)
2022-05-29 19:09:52 +02:00
Sam
816c265662
Rebase stuffs
2022-05-16 15:11:26 -04:00
Marcel Märtens
697673bcca
update toolchain to nightly-2022-04-25
2022-05-03 15:22:28 +02:00
Christof Petig
2f7c50281f
fix neighbor logic in test, fix clippy, fix rustfmt
2022-04-24 17:26:16 +02:00
Christof Petig
8dfd6dc523
document more elements of economy
2022-04-24 17:26:16 +02:00
Christof Petig
faf12118f0
remember which good a profession is missing for productivity
2022-04-24 17:26:16 +02:00
Christof Petig
40cf44d7b1
Enforce a minimum price for goods
2022-04-23 22:11:29 +02:00
flo
3d24b1d635
CliffTowns
2022-03-29 12:52:08 +00:00
Christof Petig
aeac483bac
parallel simulation of economies
2022-03-21 23:35:08 +01:00
Christof Petig
96c5d17460
Address xmac's comments and prepare for parallelization
2022-03-21 23:35:08 +01:00
Christof Petig
ef6cee891f
move the economy tick into Economy
...
This prepares for a parallel processing as it centralizes access to the surrounding index
2022-03-19 09:39:56 +01:00
Christof Petig
546afa86ae
Economy redesign: Cleaner file structure (no code change)
2022-03-05 09:19:26 +00:00
Christof Petig
f347b9de11
Diversify price calculation for items by using multiple categories per item.
2022-03-03 02:32:34 +00:00
Sam
c77270b799
Addressed feedback
2022-02-12 20:52:01 -05:00
Sam
b28f6276dd
Gnarling dungeons now only generate near forests.
2022-02-10 14:58:09 -05:00
floppy
996488ca7e
remove unnecessary, vec!s from namgen bricks
2022-02-10 09:58:14 +01:00
floppy
03cb885af4
- add more custom bricks for biomes
...
- update biome and site names
2022-02-09 08:14:13 +01:00
floppy
422be1b451
- add generate_gnarling and generate_town in namegen.rs
...
- enable generate_town for site2 towns in site2/mod.rs
2022-02-05 13:32:45 +01:00
floppy
bd862b3dd1
tweak generate_danari in namegen.rs
2022-02-05 11:21:19 +01:00
floppy
b5dfe74d41
-add more biome specific namegen functions
...
-introduce random choice between engl and custom naming
-add namegen section for site/theme based naming
2022-02-04 15:45:11 +01:00
InfRandomness
54b69e37a5
Implement giant trees in site2
2022-02-02 02:33:37 +00:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Joshua Barretto
d8c4284a32
Merge branch 'zesterer/worldgen' into 'master'
...
Improvements to site2
See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
juliancoffee
6ae25d5956
Require rng from EntityInfo::with_asset_expect
2022-01-28 00:02:34 +02:00
juliancoffee
79a04c3533
fmt
2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7
Loadout Update: Use
...
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
2022-01-28 00:02:34 +02:00
Joshua Barretto
692855198e
Improved terrain in sites
2022-01-27 11:48:41 +00:00
floppy
d2e84fb936
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:29:34 +01:00
floppy
52c4c170fc
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:25:17 +01:00
floppy
87ea7a906a
more biome namegen bricks
2022-01-26 14:58:48 +01:00
Joshua Barretto
59ac3b1d4f
Fixed site2 economies
2022-01-25 16:31:12 +00:00
floppy
4a8c428a3f
update/add namegen-bricks for forest and grassland
2022-01-18 08:36:40 +01:00
floppy
88a39476bc
tweak fn generate_biome in namegen
2022-01-17 19:03:15 +01:00
floppy
ced1a82824
- add size threshold for biomes to name, to exclude mini-biomes from clogging the map.
...
- fmt, clippy
2022-01-17 11:19:34 +01:00
floppy
18c434c613
tweak generate_biome
2022-01-17 09:04:12 +01:00
floppy
c00f5bafee
add fn generate_forest in namegen to name forest biomes
2022-01-17 08:36:35 +01:00
floppy
5ad8501cc8
update bricks in fn generate_biome in namegen, tweaks
...
WIP
2022-01-16 21:22:12 +01:00
floppy
d5f0ee2fc5
create fn generate_biome in namegen
2022-01-16 16:40:22 +01:00
