Commit graph

9320 commits

Author SHA1 Message Date
Michieal
0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal
ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -05:00
SmokeyDope
48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope
88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope
1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope
cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope
156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
ancientmarinerdev
ace6f8db43 Ensure index for heightmap entry is within bounds 2023-02-06 13:16:15 -06:00
ancientmarinerdev
9aeafe6053 Fix mapgen issue for mcl5 to mcl2 conversion 2023-02-06 13:16:15 -06:00
Michieal
de00b7228e Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index. 2023-02-05 21:17:53 -05:00
FossFanatic
ccef2d1147 More sky improvements 2023-02-06 01:40:25 +00:00
GuyLiner
4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
2023-02-06 00:10:52 +00:00
Michieal
46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal
c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal
08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev
7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 03:23:13 +00:00
ancientmarinerdev
58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 00:27:48 +00:00
Michieal
50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope
08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope
bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope
cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope
16a6dcb66c Completely remove selection box for warped fungus
Recommended by Michael
2023-02-02 22:45:06 +00:00
SmokeyDope
89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope
eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope
27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope
b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope
659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope
88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
ancientmarinerdev
cdc922d4ac Merge pull request 'Make fletcher buy sticks' (#3383) from mrminer/MineClone2-Fletcher-Fix:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3383
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 15:37:35 +00:00
Michieal
ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00
Michieal
618313f0af Merge branch 'master' into fix_copper_blocks 2023-02-01 23:51:29 -05:00
ancientmarinerdev
31fb7faf16 Merge pull request 'feat: Rain particles move straight down, increase acceleration slightly' (#3369) from atomdmac/MineClone2:adjust-rain-velocity into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3369
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 04:50:00 +00:00
Michieal
a3bc3fd9b9 Removed old commented code to prevent accidental re-enabling, and put the todo into the correct spot. 2023-02-01 23:49:04 -05:00
Michieal
c370f1884b Fixed the unwax copper blocks variants to be able to properly remove oxidization levels properly.
MCL_COPPER Blocks off all types (not stairs and slabs) now function properly.
2023-02-01 23:34:02 -05:00
Michieal
b771f314fe Removed "scraping_copper_block" function.
Fixed the wax copper blocks variants to have the wax removed.
2023-02-01 23:24:59 -05:00
ancientmarinerdev
7daa79a3f8 Fix wither crash on certain version of Lua. 2023-02-02 02:22:21 +00:00
Michieal
4b0b3217e2 added in TODO 2023-02-01 19:55:23 -05:00
ancientmarinerdev
e363435134 Merge pull request 'mcl_starting_chest' (#3373) from mcl_starting_chest into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3373
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 23:54:44 +00:00
Michieal
5b1c7f2d3a Everything *BUT* scraping works properly. 2023-02-01 18:39:13 -05:00
FossFanatic
0c0845c1bd Change the underwater detection code a bit 2023-02-01 22:50:50 +00:00
FossFanatic
24b1078b61 Make the post effect alpha the same between water source and flow 2023-02-01 22:50:50 +00:00
FossFanatic
3546d04aaa Remove water HUD code 2023-02-01 22:50:50 +00:00
FossFanatic
1abd226e07 Remove water HUD 2023-02-01 22:50:50 +00:00
FossFanatic
cbb3260471 Make the palette fix LBM not run on v6 & singlenode
This fixes a crash when loading a world that doesn't have any biomes and the LBM tries to give the grassy nodes a biome colour.
2023-02-01 22:35:13 +00:00
Johannes Fritz
8793ed211e Fix ender chest crash + remove map hand reference 2023-02-01 09:56:12 -06:00
mrminer
01f814267e Update 'mods/ENTITIES/mobs_mc/villager.lua' 2023-01-31 21:14:23 +00:00
mrminer
8f4c69084d Make fletcher buy sticks 2023-01-31 21:12:01 +00:00
Michieal
425cf53194 fix minor bug. 2023-01-30 23:57:50 -05:00
Michieal
d04f162d8f Initialize Global variable. 2023-01-30 23:53:40 -05:00
Michieal
7f84922403 fix missing skin file 2023-01-30 23:14:44 -05:00
Michieal
025f97187a Adjust for mcl_skins requirements. 2023-01-30 23:07:23 -05:00
Michieal
06effcd786 Merge branch 'master' into texture-consolidation 2023-01-30 22:57:38 -05:00
Michieal
6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
ancientmarinerdev
245ce99223 Using mcl_vars 2023-01-31 02:28:04 +00:00
ancientmarinerdev
1f107ec0c7 Tidy 2023-01-31 02:28:04 +00:00
ancientmarinerdev
c209537cfe Make it a bit less chatty for logging 2023-01-31 02:28:04 +00:00
ancientmarinerdev
d583ccb986 Oooops, wrong number 2023-01-31 02:28:04 +00:00
ancientmarinerdev
7d803e174c Set freeze and warning when mobs too close to boundary of world 2023-01-31 02:28:04 +00:00
Michieal
319602508d Make copper block nodes use on_place. 2023-01-30 20:13:32 -05:00
Michieal
8c703f1352 Refactored out "varient" in foavor of "variant".
Set up a basic "on_place" function.

Made _mcl_copper_waxed_variant and _mcl_copper_unwaxed_variant node parameters so that the waxing_copper_block and scraping_copper_block functions can be made generic.

Adjusted said functions to look first for the variants, and added in protection checks for the blocks
2023-01-30 18:27:53 -05:00
Michieal
95b1429922 Add mcl_util to mcl_copper's mod.conf file. 2023-01-30 16:01:09 -05:00
SmokeyDope
32b5b435c5 Make weeping vines and twisting vines break instantly
Partial revert of previous commit, they should break instantly
2023-01-30 17:09:50 +00:00
SmokeyDope
a3fe41128f Make netherite ingot crafting shapeless 2023-01-30 05:38:33 +00:00
SmokeyDope
1a495dd63a Make ancient debris smeltable in a blast furnace 2023-01-30 05:03:50 +00:00
Michieal
29597af738 Fixed noted errors from Pull Request. 2023-01-29 13:12:24 -05:00
Michieal
f3e840a0ff Merge branch 'master' into mcl_starting_chest 2023-01-29 13:02:03 -05:00
Adam Macumber
7dd0293616 feat: Rain particles move straight down, increase acceleration slightly 2023-01-28 11:04:58 -05:00
ancientmarinerdev
63360bcab2 Merge pull request 'Nether & End Biome Sky/Fog Colours' (#3342) from biome_skycolor_otherworlds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3342
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-26 22:49:54 +00:00
Johannes Fritz
8cf6269dda Fix mesh hand unknown item bug + fix fast digging disabled for simple skins 2023-01-25 12:13:53 -06:00
SmokeyDope
1f09c0a128 Make weeping vines and twisting vines break the same speed as regular vines 2023-01-25 05:47:41 +00:00
SmokeyDope
fb8060c366 lower hardness of warped wart block and shroomlight block to match nether wart block 2023-01-25 04:06:59 +00:00
Johannes Fritz
da7320b14c Add survival tool capabilites to all items 2023-01-24 11:38:58 -06:00
Johannes Fritz
66ff8ab8a9 Add a creative dig speed setting 2023-01-24 11:16:28 -06:00
Johannes Fritz
a1cc24f8d3 Slowing creative digging 2023-01-24 11:16:28 -06:00
SmokeyDope
6f22d7daa4 Add node breaking logic to twisting vines and weeping vines
breaking twisting vines will break the ones above them, breaking weeping vines breaks the ones below them
2023-01-24 17:15:22 +00:00
SmokeyDope
dc3eedac5f Add breaking sounds for warped fungus, nether sprouts, warped roots, crimson fungus, crimson roots 2023-01-24 16:24:35 +00:00
FossFanatic
f3bed9f599 Move locals upward & uncomment some things (again) 2023-01-24 07:27:36 +00:00
FossFanatic
f84bdbd777 Merge branch 'master' into biome_skycolor_otherworlds 2023-01-24 07:22:04 +00:00
FossFanatic
7712c45c4e Fix conflict 2023-01-24 07:21:48 +00:00
ancientmarinerdev
02ee8b757d Merge pull request 'Biome Colour Palette Fixes' (#3203) from simplified_palette_index into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3203
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-24 00:21:12 +00:00
SmokeyDope
39b6e41a62 revert hitbox size for warped fungus 2023-01-23 22:34:22 +00:00
SmokeyDope
ef1f7b8e20 make blackstone, basalt, and nether gold ore mineable with a wooden pickaxe
Fixes #3287
2023-01-23 22:17:12 +00:00
SmokeyDope
70b56d7126 Fix hitbox size for Warped Fungus 2023-01-23 21:30:32 +00:00
ancientmarinerdev
c4ea504123 Fix crash when leaves don't have a registered orphan but try to rot 2023-01-23 20:58:05 +00:00
ancientmarinerdev
e4f26a4688 Fix self object checks for check suspend 2023-01-23 20:10:28 +00:00
ancientmarinerdev
af86e73280 Fix self object reference in player_in_active_range 2023-01-23 20:10:28 +00:00
ancientmarinerdev
32be8f9602 Fix more self object references in falling 2023-01-23 20:10:28 +00:00
ancientmarinerdev
15560d969c Change order of mob step 2023-01-23 20:10:28 +00:00
ancientmarinerdev
6bbf3af97b Remove log line 2023-01-23 20:10:28 +00:00
ancientmarinerdev
84317afc93 Review feedback implemented and planned changes 2023-01-23 20:10:28 +00:00
ancientmarinerdev
2cd6629ae1 Add some mob object checks to avoid crashing 2023-01-23 20:10:28 +00:00
SmokeyDope
f971283798 Add placement sounds to twisting vines and weeping vines 2023-01-23 16:55:18 +00:00
FossFanatic
9afdd09d9d Fix wrong init accident
I accidentally put the `init.lua` of `mcl_biomes` instead of `mcl_mapgen_core` in my previous commit. This fixes that.
2023-01-23 10:25:48 +00:00
SmokeyDope
62bb7a85eb Add sounds to weeping vines and twisting vines, updated warped wart block and shroomlight sounds 2023-01-23 02:04:58 +00:00
SmokeyDope
42eb541eaa Add sound to warped wart block and shroomlight block 2023-01-23 01:28:55 +00:00
SmokeyDope
9e8ed7efc3 make hoes effective and swords slightly effective on nether wart blocks 2023-01-23 00:11:56 +00:00
SmokeyDope
36231241ba make hoes effective on warped wart blocks and shroomlight blocks 2023-01-23 00:06:46 +00:00
CyberMango
e2cbd4267c Added back sweet berries death messages. 2023-01-22 22:59:28 +02:00
CyberMango
4ec506b534 Turned a global constant into local. 2023-01-22 22:59:28 +02:00
CyberMango
06435e0f4c Mixed 2 conditions into 1. 2023-01-22 22:59:28 +02:00
CyberMango
a1d98c080f Now only allowing players and lua entities to do assist kills. 2023-01-22 22:59:28 +02:00
CyberMango
96cd2657db Cleanup and removed debug prints. 2023-01-22 22:59:23 +02:00
CyberMango
cd63f32cdd Fixed and optimized assist death messages.
Still left many log messages, a longer timeout and some unclean parts.
2023-01-22 22:58:46 +02:00
FossFanatic
2d81d153bd Unsimplify the LBM 2023-01-22 18:02:31 +00:00
FossFanatic
dc7a46df4e Simplify the LBM even more 2023-01-22 17:46:17 +00:00
FossFanatic
ad25b0bc4b Make set palette safer 2023-01-22 16:51:40 +00:00
FossFanatic
b77260253a Make grass palette fix LBM more efficient 2023-01-22 15:59:10 +00:00
FossFanatic
b6951d00b9 Add an extra frame to the breaking animation 2023-01-22 15:06:51 +00:00
ancientmarinerdev
86e480aad0 Merge pull request 'Make sweet berries' velocity checks for damage conditions use absolute values.' (#3308) from CyberMango/MineClone2:dev/mango/make_berries_velocity_check_absolute into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3308
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 00:56:48 +00:00
ancientmarinerdev
ce7d493890 Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 00:45:53 +00:00
CyberMango
c57f797226 Make the velocity checks absolute.
Now sweet berries will cause damage in all directions.
2023-01-20 19:15:55 +02:00
CyberMango
78f32d2dd4 Removed the approved field from death reasons.
This created a strange bug that only death reasons created by
mcl_utils.deal_damage were "approved" so only they triggered running the
death callbacks, so only they triggered printing a death message.
Therefore most deaths did not produce a death message.
2023-01-20 19:15:21 +02:00
FossFanatic
a1ad84370c Move locals upward & uncomment some things
Some locals relating to the biome sky colours and fog colours have been moved upward since there otherwise were some issues.

The sky colours and fog colours of the Nether & End biomes have also been uncommented.
2023-01-20 15:44:03 +00:00
FossFanatic
f6a3fe2128 Make Nether & End use biome sky- or fog colours 2023-01-20 15:41:44 +00:00
ancientmarinerdev
a7632e767d Run credits update script for release 0.82 2023-01-19 21:09:42 +00:00
ancientmarinerdev
99d09c76ae Merge pull request 'mcl_bamboo2_cleanup' (#3327) from mcl_bamboo2_cleanup into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3327
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-19 21:01:08 +00:00
ancientmarinerdev
c7ebe1b8cd Updated Bamboo textures by Nicu. Updated credits as per request from Michieal 2023-01-19 20:51:49 +00:00
ancientmarinerdev
5c464f1c1d Merge pull request 'Grass Footstep Sound Fix' (#3312) from grass_sound_revert into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3312
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-19 13:02:38 +00:00
Michieal
b258ccffdc Merge Master into mcl_bamboo_cleanup 2023-01-18 20:29:40 -05:00
Michieal
a00ef4500d Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-18 18:40:23 -05:00
ancientmarinerdev
f3ba32d739 Disable zombie siege raid until we stop zombies pathing through door 2023-01-18 19:47:45 +00:00
Michieal
ed03cb470d Change Bamboo Trapdoor to be Boring. 2023-01-17 22:12:57 -05:00
FossFanatic
9746dbc376 Make the LBM run at every load again
After testing this out, it seems that the LBM only works consistenly when it runs at every load.
2023-01-17 16:04:12 +00:00
FossFanatic
d89a7e0326 Rename _mcl_palette_index back to _mcl_grass_palette_index 2023-01-17 12:55:40 +00:00
FossFanatic
5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
FossFanatic
c75ec6916c Conflict fix attempt 2 2023-01-17 12:52:50 +00:00
FossFanatic
4b6b4d8398 revert 26e032687a
revert Fix conflict with most recent master
2023-01-17 12:49:43 +00:00
FossFanatic
513d148eaf Merge branch 'master' into grass_sound_revert 2023-01-17 12:44:16 +00:00
FossFanatic
26e032687a Fix conflict with most recent master 2023-01-17 12:39:15 +00:00
Michieal
b99487b6ab Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-16 20:19:03 -05:00
Michieal
ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
Michieal
0931af21c8 Remove most oak trees from Bamboo biomes. 2023-01-16 18:34:48 -05:00
Michieal
77a8ca689f Give textures more definition. 2023-01-16 18:16:26 -05:00
ancientmarinerdev
30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-16 20:22:09 +00:00
Michieal
55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal
b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
Johannes Fritz
6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
Michieal
d48b3dcaee Starting Inventory fix #4 Optimized and remove chatcommand. 2023-01-16 02:12:39 -05:00
Michieal
88493091b6 Starting Inventory fix #3. turn off debugging in code.
Ready for testing.
2023-01-16 01:58:27 -05:00
Michieal
d68667beb9 Starting Inventory fix #2. add in chat command, /give_starting_inventory. add in debug code. 2023-01-16 01:53:35 -05:00
Michieal
181628e539 Starting Inventory fix #2 2023-01-16 00:51:23 -05:00
Michieal
c57a757510 Starting Inventory fix #1/ 2023-01-16 00:21:15 -05:00
Michieal
26f3275b7c renamed to mcl_starting_inventory... continued. Fixed the setting in settingtypes.txt 2023-01-15 21:23:49 -05:00
Michieal
45b4b4a458 renamed to mcl_starting_inventory as that is what it is. 2023-01-15 21:21:26 -05:00
Michieal
5424ca8c2b Created Starting Chest that is given to players.
Based on the "give_initial_stuff" mod.
2023-01-15 20:39:51 -05:00
ancientmarinerdev
9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
b3nderman
f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
ancientmarinerdev
38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev
8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
Michieal
e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05:00