Commit Graph

924 Commits

Author SHA1 Message Date
FossFanatic
aeddb7675f Don't run LBMs at every load
This commit makes it so the LBMs don't run at every load.

This commit also adds some new `minetest.register_on_generated()` code, which should ensure that any newly generated mapblocks have the correct foliage colours.
2023-02-13 18:50:26 +00:00
FossFanatic
2ccfd89379 Add nil checks 2023-02-13 15:49:19 +00:00
FossFanatic
1c84bc6572 Put all affected grass blocks in a local
This commit puts all nodes which make use of the grass palette in a local, to make for less messy code.
2023-02-13 10:33:47 +00:00
PrairieWind
5da6c25ccf Fix cornflower biomes and change seed values for cornflowers and lilies of the valley 2023-02-12 23:29:02 +00:00
PrairieWind
06f47a0756 Add Cornflowers
Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu
2023-02-12 23:29:02 +00:00
PrairieWind
ff79af26e4 Add Lily of the Valley Flower
Awesome Lily Texture by Nicu
2023-02-12 23:29:02 +00:00
FossFanatic
3590ff6dfb Improve some LBM code 2023-02-12 08:23:19 +00:00
FossFanatic
b789845f62 Indentation improvements 2023-02-10 15:19:02 +00:00
FossFanatic
4ddab8bdf1 Remove the ABMs
There are likely better ways to fix any palettes that the LBMs missed.
2023-02-09 16:16:13 +00:00
FossFanatic
b95ebb3fca Add LBMs, ABMs, and more
This commit adds 1 new LBM (for foliage) and 2 new ABMs (one for foliage, and one for grass).

This also adds a new generator so any new maps created will have biome coloured leaves with a faster method. (Vines are excluded from this generator since I don't know yet how to get those to work with this.)
2023-02-08 16:17:33 +00:00
FossFanatic
07f332f0cd Add foliage palette indexes
This commit adds foliage palette indexes to every biome, this makes it possible for foliage to use biome colouring.
2023-02-08 16:15:04 +00:00
ancientmarinerdev
ace6f8db43 Ensure index for heightmap entry is within bounds 2023-02-06 13:16:15 -06:00
ancientmarinerdev
9aeafe6053 Fix mapgen issue for mcl5 to mcl2 conversion 2023-02-06 13:16:15 -06:00
FossFanatic
cbb3260471 Make the palette fix LBM not run on v6 & singlenode
This fixes a crash when loading a world that doesn't have any biomes and the LBM tries to give the grassy nodes a biome colour.
2023-02-01 22:35:13 +00:00
FossFanatic
f3bed9f599 Move locals upward & uncomment some things (again) 2023-01-24 07:27:36 +00:00
ancientmarinerdev
02ee8b757d Merge pull request 'Biome Colour Palette Fixes' (#3203) from simplified_palette_index into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3203
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-24 00:21:12 +00:00
FossFanatic
9afdd09d9d Fix wrong init accident
I accidentally put the `init.lua` of `mcl_biomes` instead of `mcl_mapgen_core` in my previous commit. This fixes that.
2023-01-23 10:25:48 +00:00
FossFanatic
2d81d153bd Unsimplify the LBM 2023-01-22 18:02:31 +00:00
FossFanatic
dc7a46df4e Simplify the LBM even more 2023-01-22 17:46:17 +00:00
FossFanatic
ad25b0bc4b Make set palette safer 2023-01-22 16:51:40 +00:00
FossFanatic
b77260253a Make grass palette fix LBM more efficient 2023-01-22 15:59:10 +00:00
FossFanatic
9746dbc376 Make the LBM run at every load again
After testing this out, it seems that the LBM only works consistenly when it runs at every load.
2023-01-17 16:04:12 +00:00
FossFanatic
d89a7e0326 Rename _mcl_palette_index back to _mcl_grass_palette_index 2023-01-17 12:55:40 +00:00
FossFanatic
5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
FossFanatic
c75ec6916c Conflict fix attempt 2 2023-01-17 12:52:50 +00:00
FossFanatic
4b6b4d8398 revert 26e032687a2173b87e4bf6f9702ea46757ac2da6
revert Fix conflict with most recent master
2023-01-17 12:49:43 +00:00
FossFanatic
26e032687a Fix conflict with most recent master 2023-01-17 12:39:15 +00:00
Michieal
0931af21c8 Remove most oak trees from Bamboo biomes. 2023-01-16 18:34:48 -05:00
ancientmarinerdev
30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-16 20:22:09 +00:00
ancientmarinerdev
38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev
8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
FossFanatic
18c0e1f050 Change the indexes back to the older ones 2023-01-14 10:05:00 +00:00
FossFanatic
a500528613 Make the LBM run only once
Since some people complained about the LBM running at every load, I changed it so it only runs once instead. It shouldn't even need to run more than once anyways, unless somebody could prove the contrary.
2023-01-13 17:58:51 +00:00
Michieal
8df0b2a48e Made changes to the MapGen definitions because with the new grow code, bamboo creates its own height, and therefore places its own top. And, having multiple tops looks funny. 2023-01-09 16:31:02 -05:00
FossFanatic
09db6017c3 Merge branch 'master' into simplified_palette_index 2023-01-05 10:06:11 +00:00
Michieal
e314addeb3 Merge branch 'master' into mcl_bamboo_too
# Conflicts:
#	mods/ITEMS/mcl_dye/init.lua
2023-01-04 23:10:54 -05:00
ancientmarinerdev
609ef220ad Village building and paths should not spawn on top of snowy trees 2023-01-04 15:14:40 -06:00
ancientmarinerdev
32a7eb4087 Fix incorrect foundation size for belltower 2023-01-04 15:14:37 -06:00
Michieal
388632cd46 Fixed BROKEN skycolor 2023-01-02 19:36:01 -05:00
FossFanatic
3d2955c394 Merge branch 'master' into simplified_palette_index 2022-12-30 10:36:35 +00:00
ancientmarinerdev
e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2022-12-29 22:14:48 +00:00
FossFanatic
54548ecfdf Merge branch 'master' into simplified_palette_index 2022-12-29 14:51:17 +00:00
FossFanatic
5ec7b8ed89 Add LBM to fix grass palette indexes
Adds a LBM which basically fixes the grass palette indexes of the nodes from older worlds. I have also added some more nodes to `block_fixes`.
2022-12-29 14:18:37 +00:00
FossFanatic
137179ac8e revert 3afb42b2f771e9bd33f5e15cd7bd7fb9117b9480
revert Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:13:50 +00:00
FossFanatic
3afb42b2f7 Add a LBM to fix grass palette indexes on older worlds 2022-12-29 14:12:00 +00:00
kabou
d2edc75407 Separate blue dye from lapis lazuli.
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
2022-12-29 03:08:49 +00:00
Michieal
28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
FossFanatic
c1cde073c8 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:34:24 +00:00
FossFanatic
ef15477e37 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:33:26 +00:00
FossFanatic
1f601c68c5 Make snowy grass blocks have a palette index
This fixes the issue where snowy grass blocks always have the same coloured grass underneath them.
2022-12-28 17:02:58 +00:00
FossFanatic
9cf6c9ed5e Change swamp and mangrove grass palette index
Changes the grass palette index of the swamp and mangrove to use the swampier variant of the swamp colours.
2022-12-28 16:10:02 +00:00
FossFanatic
ac90350257 Change palette indexes to fit the new palette 2022-12-27 20:57:58 +00:00
Michieal
9445b02dcc MapGen update. Adjusted decorations. 2022-12-21 20:57:34 -05:00
FossFanatic
a50908e1eb Fix the flat biome having a beach sky colour 2022-12-21 16:00:04 +00:00
FossFanatic
afbb8e2288 Add locals for certain hex codes that occur too many times 2022-12-21 15:57:33 +00:00
FossFanatic
91836f3a1d Add sky and fog colour for each overworld biome 2022-12-21 13:04:46 +00:00
Riu Sakura
2b61231f82 add japanese translation 2022-12-19 15:33:31 +09:00
PrairieWind
0a2f57476e Update Woodland Outpost Schematic
Switched double chest with barrels so that they work correctly
2022-12-19 01:03:53 +00:00
PrairieWind
256655df83 Add bookshelves and anvils as structure constructed nodes 2022-12-19 01:03:53 +00:00
ancientmarinerdev
94a37790aa Fix incorrectly sized foundations 2022-12-15 21:52:24 +00:00
ancientmarinerdev
89f5d41366 Fix village building foundation material for desert 2022-12-15 21:52:24 +00:00
ancientmarinerdev
b33b87b9dd Fix village building foundations 2022-12-15 21:52:24 +00:00
ancientmarinerdev
295970fbac Adding extra row of blocks in front of doors to schemas so villagers can get out 2022-12-15 21:52:24 +00:00
cora
dea647129e Add missing EndBarrens biome definition 2022-11-17 06:32:38 +01:00
PrairieWind
89a342a34f Add Bee Nest Tree Schematics and generation 2022-11-17 03:16:45 +01:00
cora
63225c20e5 change schematics for gold and sponges instead of chests 2022-11-15 01:28:51 +01:00
PrairieWind
54d4a97a27 Add Ocean Temple Loot 2022-11-15 01:28:51 +01:00
cora
61b5783e73 Make temple rarer 2022-11-15 01:28:51 +01:00
cora
04cb919f2b structure-spawning: make water spawns possible 2022-11-15 01:28:51 +01:00
cora
4ceecffc8b Add ocean temple 2022-11-15 01:28:51 +01:00
cora
00541cbfb8 Fix end spike wrong vector.add usage 2022-11-15 01:26:06 +01:00
cora
36a6a353a3 Fix local construct_nodes 2022-11-15 01:26:06 +01:00
cora
e146b173b3 Replace "oning" with cages 2022-11-05 01:18:03 +01:00
cora
51d34c9f3d Add second pillager outpost schematic 2022-11-05 01:18:03 +01:00
cora
ae9173f7ec Grow legs under outpost with bridges 2022-11-02 00:13:29 +01:00
cora
b4cb06b5ed Tweak basalt delta floors 2022-11-01 04:52:17 +01:00
cora
009ca7535c Add nether outpost with bridges
just via spawnstruct for now
2022-11-01 04:52:17 +01:00
cora
d393e6a181 fix single mob spawning and poutpost walls 2022-11-01 04:52:17 +01:00
cora
f324e150ea Don't generate glowstone in the ceiling 2022-11-01 04:52:17 +01:00
cora
aa2661341b less lava springs, no ceiling lava springs 2022-11-01 04:52:17 +01:00
cora
72224a392a Add more nether bulwark variations 2022-11-01 04:52:17 +01:00
cora
376aeda495 change bulwark to use soulless fire for piggy comfort 2022-11-01 04:52:17 +01:00
cora
fe68e1eaac Generate netherrack and ores under the lava
another hack using minetest.generate_ores this time
2022-11-01 04:52:17 +01:00
cora
0f01a28c93 Add structure spawning to other structures 2022-11-01 04:52:17 +01:00
cora
27a434641d Make structure spawning respect caps 2022-11-01 04:52:17 +01:00
cora
77bdce5cea Add structure mob respawning mechanic
this sets a metadata field "spawnblock" in the nodes mobs spawn on
and registers an abm to respan them
2022-11-01 04:52:17 +01:00
cora
1f58cfb240 Fix merge conflict 2022-11-01 04:52:17 +01:00
cora
eef4b52ce4 Remove "wild" nether wart, remove natural wither skelly spawning
wither skellys spawn on bridges now, enough wart in outposts
and bulwarks
2022-11-01 04:52:17 +01:00
cora
6b8236e8f3 Fix crash in villagegen 2022-11-01 04:52:17 +01:00
cora
5d26595f4a enforce cavern setting for nether generation
people unticking the "caverns" box probably do not expect that this
only applies to nether "terrain"
2022-11-01 04:52:17 +01:00
cora
1c6d1c958a Add more nether bridge variants 2022-11-01 04:52:17 +01:00
cora
8aedd6a761 add nether bridge fragment 2022-11-01 04:52:17 +01:00
cora
6bc12ec5ec mcl_structures Check if file exists before placing schematics 2022-11-01 04:52:17 +01:00
cora
62f353d54f Spawn hoglins in stable bullwarks 2022-11-01 04:52:17 +01:00
cora
4ad1abde14 Fix basalt pillar artifacts above the nether roof 2022-11-01 04:52:17 +01:00
cora
768345a91c Fix top node and magma patches in nether wastes 2022-11-01 04:52:17 +01:00
cora
98dad0b191 Generate netherrack under the bedrock ceiling
this is a somewhat ugly hack that uses minetest.generate_decorations
which generates decorations regardless of biome so additional steps
had to be taken to ensure no other decorations "spill over" due to
this.
2022-11-01 04:52:17 +01:00
cora
302b18833a Add variable interior for nether bulwark 2022-11-01 04:52:17 +01:00
cora
f76e0628e4 initial daughter structure support 2022-11-01 04:52:17 +01:00
cora
24476caf7e Add nether bulwark 2022-11-01 04:52:17 +01:00