59694ebc7c
Fix merge conflict
2023-01-06 13:52:03 +00: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
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
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
7ea41a2f21
Merge pull request 'Fix baby zombies going through 1 node high space' ( #3241 ) from short_baby_zombies into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3241
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-04 14:56:26 +00:00
0b1916b807
Fix baby zombies going through 1 node high space
2023-01-04 07:52:48 -06:00
0fca1ce469
Merge pull request 'Fix crash for sky colour if cannot find biome' ( #3239 ) from fix_colour_crash_risk into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3239
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-03 01:02:19 +00:00
df6d1c026a
Fix crash for sky colour if cannot find biome
2023-01-02 21:48:58 +00: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
46052e5b7e
Merge pull request 'Add templates for issues and pull requests' ( #3220 ) from gitea_templates into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3220
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-01 19:04:12 +00:00
6430fcf103
Clarify *missing feature request* template
2023-01-01 19:03:34 +00:00
7376b08c61
Better headers. More distinct *missing feature* template
2023-01-01 19:03:34 +00:00
2e28a3386b
Revert "Add "Testing/Review needed" tag to pull request templates"
...
This reverts commit 45656d8b747eac6400b2752fe2de603308ca69ef.
2023-01-01 19:03:34 +00:00
98dac6dcd7
Add "Testing/Review needed" tag to pull request templates
2023-01-01 19:03:34 +00:00
3026808a71
Add templates for issues and pull requests
2023-01-01 19:03:34 +00:00
7c7521ff15
Merge pull request 'Update readme' ( #3223 ) from updated_readme into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3223
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-31 13:23:03 +00:00
50d8e95c16
Update readme
2022-12-31 13:16:52 +00:00
fc74bd5cfe
Merge pull request 'fix-cocoa-place' ( #3221 ) from fix-cocoa-place into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3221
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-31 10:49:57 +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
3249c13752
Merge pull request '`mcl_meshhand` fixes' ( #2939 ) from mcl-meshhand-fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2939
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:50:46 +00:00
2ea72ccda8
Merge branch 'master' into mcl-meshhand-fixes
2022-12-30 18:47:55 +00:00
5237eca31e
Merge pull request '`mcl_item_entity` fixes' ( #2936 ) from mcl-item-entity-fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2936
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:39:34 +00:00
c2ba70a601
Merge branch 'master' into mcl-item-entity-fixes
2022-12-30 18:34:41 +00:00
723fe9c532
Merge pull request 'mcl_init fixes' ( #2862 ) from mcl-init-fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/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
e7ace0c87c
Merge pull request 'Main Menu Rework' ( #3193 ) from main_menu_rework into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3193
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-30 01:27:49 +00:00
ancientmarinerdev
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
CyberMango
CyberMango
Johannes Fritz
iliekprogrammar
test1
kabou