Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-27 18:39:34 +01:00
Code Issues Projects Releases Packages Wiki Activity
10463 commits 114 branches 83 tags 190 MiB
Commit graph

10463 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michieal
87327abfb9 Restructure Commit. 
Recipes are in recipes.lua
Bamboo Basic nodes are in bamboo_base.lua
Bamboo items are in bamboo_items.lua
Bamboo api / globals are in globals.lua.
 2022-12-29 13:16:48 -05:00
Michieal
34263c2ef3 Change bamboo back to Axey, instead of swordy. 2022-12-29 12:28:42 -05:00
Michieal
38c6969292 Fix mod.conf in mcl_fishing 
Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
 2022-12-29 11:31:13 -05: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 3afb42b2f7 
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
FossFanatic
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
FossFanatic
d5f8129ea7 Merge branch 'master' into fix_v6_sky_color 2022-12-29 07:55:49 +00:00
Michieal
1d0968f4f5 Fix bamboo nodes on_destruct to handle the alt nodes too. 
clean up ToDos
 2022-12-29 01:38:10 -05:00
Michieal
0f9d263e02 Add Bamboo to the Fishing Junk table. 
Update the mod.conf to be aware of mcl_bamboo.
 2022-12-29 01:29:25 -05:00
Michieal
26c1be3722 Fix bamboo node to be Swordy. 
Added in secondary bamboo node types.
Changed the grow_bamboo function to make use of new alt nodes, and removed unneccessary "force" parameter.
 2022-12-29 01:03:25 -05:00
ancientmarinerdev
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
kabou
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
kabou
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
kabou
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
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
kabou
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
ancientmarinerdev
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
kabou
60b0cfe89a Remove FIXME about slimes spawning in swamps. 
* This has been fixed.
 2022-12-29 02:13:57 +00:00
kabou
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
kabou
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
kabou
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
kabou
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
kabou
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
kabou
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
kabou
0c454a34c9 Use vectors in get_next_mob_spawn_pos() 2022-12-29 02:13:57 +00:00
kabou
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
kabou
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
kabou
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
Michieal
acc2be7253 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too 2022-12-28 18:21:39 -05:00
Michieal
3015bfb8c4 Merge branch 'master' into mcl_bamboo_too 2022-12-28 23:16:01 +00:00
Michieal
28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
Michieal
731468cf5a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 18:10:12 -05:00
Michieal
ff7693937a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 15:29:06 -05:00
FossFanatic
c1cde073c8 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:34:24 +00:00
Michieal
76669e1f3c Moved bamboo grow code to its own function, and made that function global so that it can be called outside of mcl_bamboo. 2022-12-28 14:34:14 -05:00
FossFanatic
ef15477e37 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:33:26 +00:00
FossFanatic
a0c5a04d26 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:32:42 +00:00
FossFanatic
18e932997d Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:31:11 +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
ancientmarinerdev
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
FossFanatic
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
FossFanatic
ac90350257 Change palette indexes to fit the new palette 2022-12-27 20:57:58 +00:00
FossFanatic
a6841fe38b Simplify palette and add helpful text file 2022-12-27 20:55:24 +00:00
kabou
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
Michieal
6f05992c8b Fix Licensing. 
Removed Make_Stairs check.
Made unified protection check.
Began work on the second half of scaffolding.
Removed comments that was no longer needed.
 2022-12-25 07:30:31 -05:00
PrairieWind
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