723fe9c532
Merge pull request 'mcl_init fixes' ( #2862 ) from mcl-init-fixes into master
...
Reviewed-on: MineClone2/MineClone2#2862
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:18:21 +00:00
661afed46c
Merge branch 'master' into mcl-init-fixes
2022-12-30 18:11:08 +00:00
ancientmarinerdev
e7ace0c87c
Merge pull request 'Main Menu Rework' ( #3193 ) from main_menu_rework into master
...
Reviewed-on: MineClone2/MineClone2#3193
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-30 01:27:49 +00:00
9605e2ae0d
Make the theme less loud
2022-12-30 01:27:03 +00:00
80bb954814
Delete 'menu/theme_alt.ogg'
2022-12-30 01:27:03 +00:00
Michieal
10dc83b2a6
softer menu music ogg file
2022-12-30 01:27:02 +00:00
b95c623a74
Add a more original footer and headers
2022-12-30 01:27:02 +00:00
0ab4553648
Add more credits
2022-12-30 01:27:02 +00:00
65557152fb
Add a menu theme
2022-12-30 01:27:02 +00:00
1357193a78
Add a template for making splashes
2022-12-30 01:27:02 +00:00
aacbaddfe0
Add warped hyphae texture to the right folder
2022-12-30 01:27:02 +00:00
e246bf7ddf
Remove stray warped hyphae texture?
2022-12-30 01:27:02 +00:00
11bd29ed44
Add a couple of splash texts
2022-12-30 01:27:02 +00:00
de574729a2
Make footer have shadow and look better on 1080p monitors
2022-12-30 01:27:02 +00:00
95e269a61f
Add last background
2022-12-30 01:27:02 +00:00
5bdc145872
Add second batch of backgrounds
2022-12-30 01:27:02 +00:00
20e178d5d1
Add first batch of backgrounds
2022-12-30 01:27:01 +00:00
bdbc484c48
Delete 'menu/overlay.1.png'
2022-12-30 01:27:01 +00:00
56c62e9fba
Delete 'menu/overlay.2.png'
2022-12-30 01:27:01 +00:00
3b1acc60db
Delete 'menu/overlay.3.png'
2022-12-30 01:27:01 +00:00
6026687e93
Delete 'menu/overlay.4.png'
2022-12-30 01:27:01 +00:00
e813c48ed5
Delete 'menu/overlay.5.png'
2022-12-30 01:27:01 +00:00
75716d97e3
Delete 'menu/overlay.png'
2022-12-30 01:27:01 +00:00
ancientmarinerdev
6fe5bf8674
Merge pull request 'Update Code of Conduct email' ( #3214 ) from update_coc_email into master
...
Reviewed-on: MineClone2/MineClone2#3214
2022-12-29 23:47:50 +00:00
ancientmarinerdev
9574ba7f09
Update Code of Conduct email
2022-12-29 23:47:03 +00:00
ancientmarinerdev
0df4f9518a
Merge pull request 'Added credit for Japanese translations' ( #3213 ) from add_japanese_credits into master
...
Reviewed-on: MineClone2/MineClone2#3213
2022-12-29 22:18:44 +00:00
ancientmarinerdev
3ee4a62107
Added credit for Japanese translations
2022-12-29 22:17:16 +00:00
ancientmarinerdev
e6e898671a
Merge pull request 'add japanese translation' ( #3149 ) from SakuraRiu/MineClone2:master into master
...
Reviewed-on: MineClone2/MineClone2#3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2022-12-29 22:14:48 +00:00
ab1cfde34d
Merge pull request 'Put back default sky and fog color.' ( #3201 ) from fix_v6_sky_color into master
...
Reviewed-on: MineClone2/MineClone2#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
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: MineClone2/MineClone2#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
ancientmarinerdev
437842134e
Merge pull request 'Slime, magma cube and cow spawning fixes.' ( #3162 ) from slime_fixes into master
...
Reviewed-on: MineClone2/MineClone2#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
ancientmarinerdev
81daec14a2
Merge pull request 'Update sounds from MTG' ( #3157 ) from grorp/MineClone2:patch-1 into master
...
Reviewed-on: MineClone2/MineClone2#3157
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-27 21:36:33 +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
iliekprogrammar
ancientmarinerdev
FossFanatic
Michieal
kabou