57882ae56a
Merge branch 'master' into biome_colored_foliage
2023-02-14 13:27:37 +00:00
fee4ccf096
Convert old player leaves into new system
...
This commit adds a couple of lines to the `mcl_mapgen_core:fix_foliage_palette_indexes"` LBM, which ensures that player leaves which were placed before this update get converted into the new player leaves.
I would have included mangrove leaves, but decided against it because of an issue where the `param2` of mangrove leaves was accidentally set to 1 (in the schematics?). This meant that if I included mangrove leaves, the LBM would have converted the natural leaves as well.
This would have made it very tedious to clean up the leaves after chopping down a mangrove tree, since these would not rot by themselves.
2023-02-14 11:20:00 +00:00
f653f47f26
Improve the new code somewhat
2023-02-14 08:36:49 +00:00
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
2ccfd89379
Add nil checks
2023-02-13 15:49:19 +00:00
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
5da6c25ccf
Fix cornflower biomes and change seed values for cornflowers and lilies of the valley
2023-02-12 23:29:02 +00:00
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
ff79af26e4
Add Lily of the Valley Flower
...
Awesome Lily Texture by Nicu
2023-02-12 23:29:02 +00:00
3590ff6dfb
Improve some LBM code
2023-02-12 08:23:19 +00:00
b789845f62
Indentation improvements
2023-02-10 15:19:02 +00:00
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
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
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
ace6f8db43
Ensure index for heightmap entry is within bounds
2023-02-06 13:16:15 -06:00
9aeafe6053
Fix mapgen issue for mcl5 to mcl2 conversion
2023-02-06 13:16:15 -06:00
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
f3bed9f599
Move locals upward & uncomment some things (again)
2023-01-24 07:27:36 +00:00
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
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
2d81d153bd
Unsimplify the LBM
2023-01-22 18:02:31 +00:00
dc7a46df4e
Simplify the LBM even more
2023-01-22 17:46:17 +00:00
ad25b0bc4b
Make set palette safer
2023-01-22 16:51:40 +00:00
b77260253a
Make grass palette fix LBM more efficient
2023-01-22 15:59:10 +00:00
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
d89a7e0326
Rename _mcl_palette_index back to _mcl_grass_palette_index
2023-01-17 12:55:40 +00:00
5fd5cc9f1c
Merge branch 'master' into simplified_palette_index
2023-01-17 12:53:09 +00:00
c75ec6916c
Conflict fix attempt 2
2023-01-17 12:52:50 +00:00
4b6b4d8398
revert 26e032687a
...
revert Fix conflict with most recent master
2023-01-17 12:49:43 +00:00
26e032687a
Fix conflict with most recent master
2023-01-17 12:39:15 +00:00
0931af21c8
Remove most oak trees from Bamboo biomes.
2023-01-16 18:34:48 -05:00
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
38732e801d
Fix geode crash
2023-01-15 22:27:02 +00:00
8f6c932e88
Allow blaze spawners to be deactivated
2023-01-15 22:22:14 +00:00
18c0e1f050
Change the indexes back to the older ones
2023-01-14 10:05:00 +00:00
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
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
09db6017c3
Merge branch 'master' into simplified_palette_index
2023-01-05 10:06:11 +00:00
e314addeb3
Merge branch 'master' into mcl_bamboo_too
...
# Conflicts:
# mods/ITEMS/mcl_dye/init.lua
2023-01-04 23:10:54 -05:00
609ef220ad
Village building and paths should not spawn on top of snowy trees
2023-01-04 15:14:40 -06:00
32a7eb4087
Fix incorrect foundation size for belltower
2023-01-04 15:14:37 -06:00
388632cd46
Fixed BROKEN skycolor
2023-01-02 19:36:01 -05:00
3d2955c394
Merge branch 'master' into simplified_palette_index
2022-12-30 10:36:35 +00:00
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
54548ecfdf
Merge branch 'master' into simplified_palette_index
2022-12-29 14:51:17 +00:00
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
137179ac8e
revert 3afb42b2f7
...
revert Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:13:50 +00:00
3afb42b2f7
Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:12:00 +00:00
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
28cb06421d
Merge branch 'master' into mcl_bamboo_too
2022-12-28 18:13:51 -05:00
FossFanatic
PrairieWind
ancientmarinerdev
Michieal
kabou