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
01bb753549
Merge pull request 'Refactor mob_step and do_states' ( #3231 ) from mob_tweaks into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3231
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 14:10:39 +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
00c4ecf643
Merge pull request 'Villagers and pathfinding improvements' ( #3083 ) from village_town_bell_pathfix into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3083
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 02:59:48 +00: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
09db6017c3
Merge branch 'master' into simplified_palette_index
2023-01-05 10:06:11 +00: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
ddd004c0f0
Merge pull request 'Fix incorrect foundation size for belltower' ( #3147 ) from village_tweaks into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3147
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-04 21:45:47 +00: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
6cf1fa7b81
Merge branch 'master' into simplified_palette_index
2023-01-04 15:02:56 +00:00
Michieal
Michieal
PrairieWind
ancientmarinerdev
FossFanatic
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
CyberMango
CyberMango