533f59bf27
Merge branch 'master' into mcl_bamboo_too
2023-01-06 18:08:33 -05:00
3074c15d14
clear up comment confusion.
...
Factored out hard coded names for variable names.
removed "minecraft" from README.md.
2023-01-06 18:07:30 -05:00
132178b8c7
clear up comment confusion.
2023-01-06 17:46:54 -05:00
ede21a8627
revert f92ea77849
...
revert accidental second commit.
Mega commit. lol.
Did a LOT of refactoring.
Cleaned up some vestigial code.
Cleaned up aliases.
2023-01-06 22:43:41 +00:00
82fae13b47
Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too
2023-01-06 17:41:57 -05:00
f92ea77849
Mega commit. lol.
...
Did a LOT of refactoring.
Cleaned up some vestigial code.
Cleaned up aliases.
2023-01-06 17:41:01 -05:00
7ebf9b7ab8
Mega commit. lol.
...
Did a LOT of refactoring.
Cleaned up some vestigial code.
Cleaned up aliases.
2023-01-06 17:40:35 -05:00
07a56165ed
update optional depends.
2023-01-06 20:23:59 +00:00
ee0b355f51
Fix licensing.
2023-01-06 20:21:08 +00:00
6fd799ac42
Fix Country Lode HUD Issue
...
Fixed the error that was thrown when the advancement is unlocked and also fixed the popup HUD so the advancement title fits correctly
2023-01-06 16:35:59 +00:00
59694ebc7c
Fix merge conflict
2023-01-06 13:52:03 +00:00
cc24144bc6
Fixed collision and selection box for endcap nodes.
...
fixed typo in debug message.
2023-01-06 01:22:18 -05:00
e1cd16c971
Adjusted growth interval.
...
tested and fixed bamboo growth function.
Add debug code across growth function and scaffold place.
disabled debug for commit. removed finished todos.
2023-01-06 00:41:26 -05:00
e4db91d35c
Fix crash bug
2023-01-06 02:59:02 +00:00
2527479401
Clean up on isle 5, please
2023-01-06 02:59:02 +00:00
85f7bbdb80
Optimisation. Don't even prepare to path if not ready to path
2023-01-06 02:59:02 +00:00
465a919f6b
Villager will now reclaim job during the day even when it isn't work time
2023-01-06 02:59:02 +00:00
325a666c62
Added pathfinder constants to make it easier to tweak
2023-01-06 02:59:02 +00:00
e9b54e85c2
Pathfinding clean up
2023-01-06 02:59:02 +00:00
4324fe2489
Villager will now path from one house to another in search of available job or bed
2023-01-06 02:59:02 +00:00
d6804bf4b7
Fix distance to target issue, and refactor pathing actions
2023-01-06 02:59:02 +00:00
87f04bdd9f
Prevent attempting to path through 2 doors until code supports it. Clean up also.
2023-01-06 02:59:02 +00:00
e3307d647b
Fix pathing to bell that is sat on the ground
2023-01-06 02:59:02 +00:00
29cd73cb84
Pathfinding through door should also check door closest to position so villager can leave current house
2023-01-06 02:59:02 +00:00
5c0a763b83
Optimisation - Only check for town bell if ready to path
2023-01-06 02:59:02 +00:00
9b1ceebf0d
Villagers will now pathfind to town bell that isn't on the ground
2023-01-06 02:59:02 +00:00
ed64e7f733
Reverted scaffolding (WIP) for final push. Making an issue for it's continued work. Left wip in, but commented and future featured out. Will test changes forthwith.
...
Adjusted bamboo base code (randomize which one to use.) to do less math and accomplish the same thing.
2023-01-05 20:27:52 -05:00
856a60bcc2
Merge pull request 'Fix a few issues with sweet berries.' ( #3187 ) from CyberMango/MineClone2:bug/mango/sweet_berry_fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3187
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-06 00:09:41 +00:00
08f9c0074a
REVERT: Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions.
2023-01-05 18:31:21 -05:00
c4969c13cd
trying to fix redundancy error...
2023-01-05 00:30:18 -05:00
f70176da34
Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions.
2023-01-04 23:56:51 -05:00
e314addeb3
Merge branch 'master' into mcl_bamboo_too
...
# Conflicts:
# mods/ITEMS/mcl_dye/init.lua
2023-01-04 23:10:54 -05:00
df8fc65e1e
temp commit.
2023-01-04 23:03:08 -05:00
687887fe27
Incorporate applying bonemeal to Bamboo stalks.
2023-01-04 22:49:17 -05:00
65aa956d9c
Add alias for scaffolding.
...
Rework grow_bamboo to handle random heights, and to handle bonemeal.
Remove "bamboo_node" in favor of is_bamboo()
2023-01-04 22:43:05 -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
5e969ba928
Added sweet berries death messages.
2023-01-04 23:04:19 +02:00
17e02aec3c
Applying bone meal on a stage 3 sweet berry no longer grows it.
...
It now ignores the bone meal and harvests the sweet berry as normal.
2023-01-04 23:04:19 +02:00
fb28e192e6
Bone meal applied on sweet berries only grows them by 1 stage now.
...
The interface of the grow plant is a bit confusing since even with
stages set to 0 the plant grows by 1 stage (if other conditions such as
light are met). Therefore changing it to 0 makes the plant grow by 1.
2023-01-04 23:04:19 +02:00
0f569fdbaa
Bone meal on sweet berries in creative mode is no longer wasted and
...
minor fixes.
removed an unnecessary -- in a comment.
Removed a redundant concatination.
2023-01-04 23:04:19 +02:00
8a7fcfde82
Fixed sweet berries bugs.
...
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
2023-01-04 23:04:19 +02:00
fb51067c78
Created a shared function for planting a seed that can also be consumed.
2023-01-04 23:04:19 +02:00
8dd4a2611e
Added alias for scaffolding.
2023-01-04 14:25:31 -05:00
f86ee99abf
Further cleaned up bamboo base code.
...
Fixed some errors in Scaffolding, Commented out the in progress section.
2023-01-04 11:28:09 -05:00
0b1916b807
Fix baby zombies going through 1 node high space
2023-01-04 07:52:48 -06:00
d1a017f6b2
optimized out some for loops, cleaned up code for bamboo placement.
...
tested the changes.
2023-01-03 18:40:40 -05:00
50e50e2904
Continued some optimizations of code in bamboo.on_place.
...
Begun work on scaffolding.
2023-01-03 15:57:58 -05:00
9351f72c15
Updated Bamboo translations template.txt
2023-01-03 15:38:34 -05:00
ef7fb0d2e3
Cleaned up the code. Fixed side placement of bamboo against bamboo.
...
Dinked with the random number generator some more.
Condensed some more of the code duplication (WIP).
Added in MCL_Log function.
Finally settled on a decent looking Bamboo top.
2023-01-03 01:38:12 -05:00
5ef7d9f7a0
Added in Bamboo_Plank variable.
...
Dinked with the random number generator some.
Moved Bamboo Mosaic from base to items.
condensed some of the code duplication (WIP).
started to add in checks to prevent bamboo from being placed against itself horizontally.
Fixed a couple of naming issues.
2023-01-02 22:36:09 -05:00
388632cd46
Fixed BROKEN skycolor
2023-01-02 19:36:01 -05:00
dd4a0a4172
Fixed mcl_fishing depending on mcl_bamboo.
2023-01-02 19:24:56 -05:00
df6d1c026a
Fix crash for sky colour if cannot find biome
2023-01-02 21:48:58 +00:00
d586b3fecc
Tracked down missing node type placement issues, and fixed them.
...
Now with Chicken Cherry Cola!
2023-01-02 03:54:26 -05:00
a7a0c4791a
Many bug fixes, Adjusted randomizing code.
...
And, Now with Lime-Cherry Kool-aid!! Yum!
2023-01-02 02:19:33 -05:00
23b62c296a
Fix code caching errors, and remove unused variables from init.
2023-01-01 23:07:20 -05:00
f8ae702ce4
Function name consistency
2023-01-02 00:58:23 +00:00
5faf060122
Fix crash and remove unused duplicate variables
2023-01-02 00:54:08 +00:00
8c648d1fc3
Refactor mob_step and do_states
2023-01-02 00:00:40 +00:00
2a37d38f6c
Reformat cocoa pod node definition groups.
2022-12-31 11:18:04 +01:00
89821a8329
Rename cocoa pod placement function.
...
* Rename cocoa pod placement function to match the `on_place` call in
the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
2022-12-31 10:41:39 +01:00
2ea72ccda8
Merge branch 'master' into mcl-meshhand-fixes
2022-12-30 18:47:55 +00:00
c2ba70a601
Merge branch 'master' into mcl-item-entity-fixes
2022-12-30 18:34:41 +00:00
661afed46c
Merge branch 'master' into mcl-init-fixes
2022-12-30 18:11:08 +00:00
aacbaddfe0
Add warped hyphae texture to the right folder
2022-12-30 01:27:02 +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
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
34263c2ef3
Change bamboo back to Axey, instead of swordy.
2022-12-29 12:28:42 -05:00
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
d5f8129ea7
Merge branch 'master' into fix_v6_sky_color
2022-12-29 07:55:49 +00:00
1d0968f4f5
Fix bamboo nodes on_destruct to handle the alt nodes too.
...
clean up ToDos
2022-12-29 01:38:10 -05:00
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
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
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
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
28cb06421d
Merge branch 'master' into mcl_bamboo_too
2022-12-28 18:13:51 -05:00
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
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
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
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
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
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
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
5964f25fa7
Merge branch 'master' into master
2022-12-24 17:01:13 +00:00
e0a9aca469
Merge branch 'master' into useless_textures_cleanup
2022-12-24 15:05:14 +00:00
Michieal
Michieal
PrairieWind
ancientmarinerdev
CyberMango
CyberMango
Johannes Fritz
kabou
iliekprogrammar
FossFanatic
3raven