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
ab1cfde34d
Merge pull request 'Put back default sky and fog color.' ( #3201 ) from fix_v6_sky_color into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3201
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2022-12-29 07:59:28 +00:00
d5f8129ea7
Merge branch 'master' into fix_v6_sky_color
2022-12-29 07:55:49 +00:00
1295b2dc12
Merge pull request 'Dye refactoring; untangle bone meal, lapis, ink sac and cocoa beans from dye items.' ( #3176 ) from redo_dyes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3176
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-29 03:11:33 +00:00
44f724f677
Minor refactoring of mcl_dye, fix dye texture names.
...
* Reorganize dyes table.
* Rename dye item textures to conform to mcl naming standard.
* Refactor dye item registration.
* Shuffle recipes around in a more logical order.
* Remove unused dye names from lists that are probably equally unused.
2022-12-29 03:08:50 +00:00
92ee402971
Separate white dye from bone meal.
...
* Add craftitem for ":mcl_bone_meal:bone_meal" to mcl_dye (temporarily.)
* Add crafting recipe for bone meal.
* Add texture for white dye item.
* Merge craftitem registration for "mcl_dye:white" with generic dyes.
* Add crafting recipe for white dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update mcl_crimson and sweet berry on_rightclick handlers.
* Update composter output, both as freestanding and to hoppers.
* Update bone block crafting recipes.
* Update tropical fish, cod and salmon mob drops.
2022-12-29 03:08:50 +00:00
7d8fdc6ec3
Separate brown dye from cocoa beans.
...
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
2022-12-29 03:08:49 +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
7311071303
Separate black dye from squid ink sac.
...
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
2022-12-29 03:08:49 +00:00
437842134e
Merge pull request 'Slime, magma cube and cow spawning fixes.' ( #3162 ) from slime_fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3162
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-29 02:14:32 +00:00
60b0cfe89a
Remove FIXME about slimes spawning in swamps.
...
* This has been fixed.
2022-12-29 02:13:57 +00:00
d8a883e81f
Limit size of cow herds spawning.
...
* Cows should spawn in herds of max 4, not 8.
2022-12-29 02:13:57 +00:00
15f5c3c30a
Make slimes spawn at night in swamps.
...
* Adds spawn definitions for large, small and tiny slimes to spawn in
Swampland and MangroveSwamp biomes when light levels are less than 7.
2022-12-29 02:13:57 +00:00
4af8148850
Refactor spawn registrations.
...
* Unduplicate spawnable biome lists for slimes and magma cubes.
* Rename min and max spawndepth identifiers.
2022-12-29 02:13:57 +00:00
ea6201d32f
Add missing biome to slime spawn list.
...
* Add "MangroveSwamp_underground" to the lists of spawnable biomes for
big, small and tiny slimes.
2022-12-29 02:13:57 +00:00
da17ff8ea0
Remove stray dependency.
...
While mobs_mc_gameconfig was deleted at some point during the mob
refactoring, it was still listed in mobs_mc's mod.conf.
2022-12-29 02:13:57 +00:00
6756ee340c
Mob spawning chatcommand refactoring.
...
* Put calculations that are only used conditionally inside the
related `if` block.
* Make code logic more explicit.
* Take logging statement out of return value assignment.
* Remove duplicate assignment.
* Fix a typo in the function's description.
2022-12-29 02:13:57 +00:00
0c454a34c9
Use vectors in `get_next_mob_spawn_pos()`
2022-12-29 02:13:57 +00:00
8279dcb3dd
Add FIXME notes to slime mob code.
...
Missing features:
* Slimes should not only spawn in caves, but also at night in swamps.
* Slimes should only spawn on 10% of the map ("slime chunks").
* There are no spawn eggs registered for small and tiny slimes and magma
cubes.
2022-12-29 02:13:57 +00:00
ea19f02e14
Assorted `spawn_children_on_die` fixes.
...
* Use proper vector semantics.
* Optimize away superfluous temp variables and repetitive local variable
declarations.
2022-12-29 02:13:57 +00:00
95cbac78a8
Change number of children spawned on die.
...
When a slime or magma cube dies, it should spawn between 2 to 4 smaller
children. The code was always spawning 4 children (3 for big magma
cubes). This commit makes the following changes to the function
`spawn_children_on_die`:
* Make the number of children spawned a random number between 2 and 4.
* No longer accept the `children_count` as an argument, because this
number should always be a random number between 2 and 4 anyway.
* Update all callers accordingly.
2022-12-29 02:13:57 +00:00
c1cde073c8
Rename _mcl_palette_index to _mcl_grass_palette_index
2022-12-28 19:34:24 +00:00
ef15477e37
Rename _mcl_palette_index to _mcl_grass_palette_index
2022-12-28 19:33:26 +00:00
a0c5a04d26
Rename _mcl_palette_index to _mcl_grass_palette_index
2022-12-28 19:32:42 +00:00
18e932997d
Rename _mcl_palette_index to _mcl_grass_palette_index
2022-12-28 19:31:11 +00:00
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
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
81daec14a2
Merge pull request 'Update sounds from MTG' ( #3157 ) from grorp/MineClone2:patch-1 into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3157
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-27 21:36:33 +00:00
9f9cc3a629
Change grass block inventory colour
...
According to the wiki, the hex code of the grass block when held or in the inventory is #7CBD6B.
2022-12-27 21:19:33 +00:00
ac90350257
Change palette indexes to fit the new palette
2022-12-27 20:57:58 +00:00
a6841fe38b
Simplify palette and add helpful text file
2022-12-27 20:55:24 +00:00
5e129985f2
Put back default sky and fog color.
...
Recent changes set the default colors to some pretty psychedelic ones.
The stated purpose was debugging, but in absense of any actual debugging
code other than v6 mapgen inadvertently assuming that role, more sensible
colors were reinstated.
If debugging code is desired, it should probably be added to the main
parts of mcl_weather.
2022-12-27 15:10:24 +01:00
0dc31611ac
Merge pull request 'Adjusts mcl_crimson Doors to have a specified side texture' ( #3140 ) from Wbjitscool/MineClone2:master into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3140
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-12-25 02:09:14 +00:00
b0070a3b83
Merge pull request 'Fix the disapearance of christmas texture of the ender chest once it is placed' ( #3184 ) from 3raven/MineClone2:master into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3184
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-12-25 01:46:14 +00:00
5964f25fa7
Merge branch 'master' into master
2022-12-24 17:01:13 +00:00
2db9ea6459
Merge pull request 'Small Useless Textures Cleanup' ( #3164 ) from useless_textures_cleanup into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3164
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
2022-12-24 15:16:28 +00:00
e0a9aca469
Merge branch 'master' into useless_textures_cleanup
2022-12-24 15:05:14 +00:00
fb8f59e918
Merge pull request 'Overworld Biome Sky And Fog Colours' ( #3158 ) from biome_skycolor_overworld into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3158
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
2022-12-24 15:01:43 +00:00
9eb86f011b
Make the code clearer to read
2022-12-24 14:54:48 +00:00
d3e8e24f42
Fix the disapearance of christmas texture of the ender chest once it is placed
...
Fix the disapearance of christmas texture of the ender chest once it is placed
2022-12-24 14:44:06 +00:00
770dd0ec47
Merge branch 'master' into useless_textures_cleanup
2022-12-24 12:31:56 +00:00
00b2afecad
Merge branch 'master' into biome_skycolor_overworld
2022-12-24 12:31:10 +00:00
cbf090485c
Merge pull request 'Fix creative inventory view being reset upon taking damage' ( #3102 ) from CyberMango/MineClone2:bug/mango/creative_inventory_view_resets_on_damage into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3102
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-24 01:18:16 +00:00
bd38827f60
Fixes #2976
...
Now the inventory view on creative is no longer set to the survival
inventory upon taking damage.
Also the initial inventory view when openning a world in creative is at
the search page, not the survival inventory page.
mcl_inventory/init.lua no longer wraps mcl_armor.update_player to also
update the inventory view. This visual update happens anyways since it
is registered to happen on a visual change with
mcl_player.register_on_visual_change .
This also fixes a small visual bug that, on creative mode, if you would
equip/unequip an armor piece, the image of the player would be updated
twice.
2022-12-23 13:54:41 +02:00
522bbbbe26
Delete 'mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png'
2022-12-22 12:47:44 +00:00
e1f26ea70d
Remove dry grass side texture
...
The same reason as why the dry grass top texture got removed.
2022-12-22 12:40:36 +00:00
9ef4a850b1
Remove dry grass top texture
...
This is a remnant of Minetest Game and used to be for dry biomes before colour palettes were a thing in MineClone 2.
2022-12-22 12:40:10 +00:00
FossFanatic
ancientmarinerdev
kabou
PrairieWind
3raven
CyberMango