Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
8,803 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

718 Commits (6675f9fd40070e2137b6c67446a76cff244957da)

Author SHA1 Message Date
cora 1b0053299c Do not replace bedrock during geode gen. 2022-06-15 05:10:41 +02:00
cora fa56ce5d52 Add outer geode layer 
uses deepslate until smooth basalt is there
 2022-06-15 05:10:41 +02:00
cora a0bed1d8bc Add proper logging + some fixes 2022-06-15 05:10:41 +02:00
cora a895292371 Add API documentation, minor fixes 2022-06-15 05:10:41 +02:00
cora b0b8638a4c Add /spawnstruct support 2022-06-15 05:10:41 +02:00
cora 8fa67e6b4f Geodes as test for place by function 2022-06-15 05:10:41 +02:00
cora 1eaac3c406 use gennotify instead of lbm for placement 
keep the lbm for secondary structures
 2022-06-15 05:10:41 +02:00
cora 6406a14738 Add Structure placement api 2022-06-15 05:10:41 +02:00
cora 899c849996 old registered_structures -> structure_data 2022-06-15 05:10:41 +02:00
cora 5c057f24fb get_mapgen_params -> get_mapgen_setting 2022-06-07 03:17:32 +02:00
cora 4bff9710a0 Make structblock non walk- and pointable 2022-06-06 01:08:55 +02:00
cora d4e4bc8708 add rarer beached shipwreck 2022-06-05 13:10:36 +02:00
cora b7419dc207 randomly enchant treasure 2022-06-05 13:10:36 +02:00
cora 4af1094eed Add shipwrecks 
schematics by chmodsayshello
 2022-06-05 13:10:36 +02:00
cora 6b9cb0062d save home coords in cat entity as well 2022-05-29 02:34:02 +02:00
cora 2337e72a23 simplify spawn logic 2022-05-29 02:34:02 +02:00
cora da6563a5b3 Spawn witch and black cat on witchhut generation 2022-05-29 02:34:02 +02:00
Elias Fleckenstein e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
Elias Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Elias Fleckenstein ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
cora fca259c074 fix crash during (artificial) village creation 
when using the village tool doing that on an unsuitable location
would result in no position for the belltower being available
this checks for that and ... doesn't crash then ^^
 2022-05-22 02:01:21 +02:00
cora 7379d5bee8 Add Belltower to villages 2022-05-21 14:48:56 +02:00
cora d67dd0577f fix crash through forgotten function call 2022-05-21 12:36:57 +02:00
cora 2b63866c14 spawn villagers (and golem) immediately after mg 2022-05-21 12:36:57 +02:00
cora e51ea1e079 initialize inventory nodes on mapgen 2022-05-21 12:36:57 +02:00
cora b58422a584 write villager id into bed nodemeta 2022-05-21 12:36:57 +02:00
cora 3ff4ea576d spawn iron golem on villagegen 2022-05-21 12:36:57 +02:00
cora 0d56ef1a90 add jobsites to villagegen schematics 2022-05-21 12:36:57 +02:00
cora 8d0afede37 don't block mapgen on village generation 2022-05-09 10:29:57 +00:00
cora 0288581407 increase wait til village generated 2022-05-09 10:29:57 +00:00
cora 46dbf8c0ab Spawn villagers on villagegen, stay in village 
This spawns a villager per bed on village gen and saves the bed
position in the entity. If it moves too far from the village
it gets teleported (for now) back.
 2022-05-09 10:29:57 +00:00
Alexander Minges faf3f60cff Use uncarved pumpkin instead of carved in mapgen 2022-04-22 18:07:37 +00:00
cora 3cb9947cf4 fix sugarcane not getting param2 on mapgen 2022-04-19 12:16:07 +02:00
kabou ace0dc00c7 Remove `settlements_in_world` and `settlements.txt` 
The global(!) table settlements_in_world` has no use, but is serialized and
saved to a file `settlements.txt` every time during generation of a new
village, adding more lag.  This commit removes all related code:
* Remove all instances of `settlements_in_world`.
* Remove `settlements.load()` and `settlements.save()`.
 2022-04-02 21:52:03 +02:00
kabou deed231f28 Fix typos. 2022-03-09 18:50:41 +01:00
kabou 1326b9e7e7 Add check for unknown nodes. 
* Check if node has a definition table before attempting to evaluate its
  attributes.  By application of De Morgan's law, the compound logic
  expression can be rewritten so that the existence of the table is
  checked before all following attribute references.
 2022-03-09 15:14:22 +01:00
kabou 6a69f49fa0 Add check for unknown nodes. 
* Check if node has a definition table before attempting to evaluate its
  attributes.
 2022-03-09 14:59:49 +01:00
kabou f5a8d6d17a Add check for unknown nodes. 
* Check if node has a definition table before attempting to evaluate its
  attributes.
* Define local variable to cache multiple accesses to `registered_nodes[]`
  and improve readability.
* Clarify code flow.
 2022-03-09 14:40:37 +01:00
E 87e494f42b mapgen/mcl_mapgen_core: move set_node decorations a node callback 
During the rewrite in 89e55e9065, a queue system was added to allow
using both VoxelManip-based generation steps, and set_node-based steps,
however some set_node-based steps (underground mushrooms, nether
decorations, and structures) were missed and remained in a VoxelManip
step. The result is that the changes made by the set_node stages were
overwritten after the (now-stale) VoxelManip data was committed later.

(ref. Mineclonia/Mineclonia#26)
 2022-02-25 18:38:50 +01:00
Emojigit c52e09ddcd mcl_structures 2022-02-23 23:58:05 +01:00
Elias Fleckenstein 0e9a56fa35
Add stacks to enchant_uniform_randomly 2021-12-07 18:19:41 +01:00
Elias Fleckenstein ec7e245b9d
Various fixes to the enchanting and loot system 
- enchanted loot generated by mapgen now uses PseudoRandom for randomness
- prevent fishing loot from generating loot 32767 times (!!!) when only 1 is needed
- bows and fishing rods obtained from the treasure section of fishing loot are now enchanted
- there is now a function to uniform enchant items other than books
 2021-12-07 17:57:18 +01:00
Elias Fleckenstein 34f329a9d5
TextureConverter: Implement grass palette conversion 
Source: https://minecraft.fandom.com/wiki/Tint
Since the MineClone2 biomes do not entirely match with the Minecraft ones I picked the Minecraft biomes that seem to match them best.
This also changes the palette index of the nether to match the desert instead of the mesa biome
and changes the color of grass blocks in item form to the default minecraft one.
 2021-11-03 19:57:21 +01:00
kay27 7ff476b9b9 Fix igloo hidden trapdoor with minetest.after(), https://git.minetest.land/MineClone2/MineClone2/issues/1797 2021-06-22 16:53:55 +04:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
AFCMS 00063cde73 speedup mcl_observer 2021-05-27 09:34:12 +02:00
Marcin Serwin 37b1191c0a Add polish translation of mcl_structures 2021-05-25 21:58:23 +02:00
AFCMS 9e074af07f unify code style [1] 2021-05-25 12:52:25 +02:00
AFCMS 388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS 8592670f9b [tsm_railcorridors] fix warnings 2021-05-25 08:44:24 +02:00
AFCMS a71a0e9161 fix even more warnings (nether portals and potions) 2021-05-22 23:04:18 +02:00
AFCMS 1870a89af0 remove unused var 2021-05-22 20:01:59 +02:00
Code-Sploit bcea5a35ef Try to fix unknown variable in mcl_chorus_flower 2021-05-14 08:22:10 +00:00
AFCMS 45201481c1 Merge branch 'master' into luacheck-script 2021-05-10 09:38:40 +02:00
kay27 f054eb1ce6 [mcl_biomes] Fix chorus random function, prevent chorus growth at return portal position 2021-05-10 02:47:56 +04:00
kay27 f3c540af5d [mcl_mapgen_core, mcl_biomes] Make chorus growth deterministic 2021-05-10 02:24:52 +04:00
kay27 96be84161f [mcl_mapgen_core] Don't crash if Ender Dragon doesn't spawn for some reason 2021-05-10 01:57:34 +04:00
AFCMS cbb014ed38 basic working script 2021-05-03 22:11:49 +02:00
AFCMS 02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
AFCMS 22a2fdbf5f fix more codestyle 2021-04-17 07:46:24 +02:00
AFCMS 5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
jordan4ibanez 67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00
Elias Fleckenstein 3c1a38904a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 09:25:44 +02:00
Elias Fleckenstein b2c09c8ba0 Add gateway portals 2021-04-07 09:17:13 +02:00
kay27 069e089ae4 [mcl_portals, mcl_structures] Add End gateways W-I-P by Elias Fleckenstein with minor portals improvements and fixes 2021-04-07 03:34:15 +04:00
Elias Fleckenstein 430f958fae Move end exit portal to 0, 0; Add end gateway portals (WIP) 2021-04-06 20:08:20 +02:00
Elias Fleckenstein ea08fee9ba Make the dragon stay within a 50 blocks range of the portal 2021-04-06 16:38:23 +02:00
Elias Fleckenstein 83b9cf3ad2 End exit portal openng / closing on dragon death / spawn 2021-04-06 15:48:17 +02:00
Elias Fleckenstein a348909ba3 Enderdragon: Proper Egg and XP spawning 2021-04-06 12:50:36 +02:00
Elias Fleckenstein 1144006cdd Add End main island generation 2021-04-04 15:16:06 +02:00
Elias Fleckenstein 49446bbb7b Make enderdragon spawn upon exit portal generation 2021-04-04 12:01:45 +02:00
kay27 d1a0299b92 [mcl_dungeons] Remove empty code section, add debug info 2021-03-29 03:34:41 +04:00
kay27 80d845adb6 [mcl_mapgen_core] Fix Nether generation chain reaction 2021-03-29 03:18:17 +04:00
kay27 1818fcf592 [mcl_mapgen_core] Remove water from End, fix https://git.minetest.land/MineClone2/MineClone2/issues/1394 2021-03-29 02:43:08 +04:00
kay27 cb2aae5a55 [mcl_mapgen_core] Redesign, mostly to remove water from End and restore static lvm_buffer to speed it up 2021-03-28 22:57:11 +04:00
kay27 03feb36558 Improve Nether Portals (#1315) (as a squash) 
Remove Nether portal caches, https://git.minetest.land/MineClone2/MineClone2/issues/1210

Store all exits from Nether portals in quick-access table

Implement proper Nether portal search, using the table, https://git.minetest.land/MineClone2/MineClone2/issues/1055

Store Nether portal exits table in mod storage

Remove exits from table on Nether portal destruction

Align destination area to [map chunks 5x5x5](https://git.minetest.land/MineClone2/MineClone2/wiki/World-structure%3A-positions%2C-boundaries%2C-blocks%2C-chunks%2C-dimensions%2C-barriers-and-the-void) to avoid lots of ```emerge_area()``` calls

Support Nether roof, https://git.minetest.land/MineClone2/MineClone2/issues/1267

Implement better suitable place search, https://git.minetest.land/MineClone2/MineClone2/issues/1126

Implement object queue not to trigger the same search again

Avoid lava lakes, https://git.minetest.land/MineClone2/MineClone2/issues/1126

Add ```/spawnstruct nether_portal``` chat command
Co-Authored-By: kay27 <kay27@noreply.git.minetest.land>
Co-Committed-By: kay27 <kay27@noreply.git.minetest.land>
 2021-03-21 23:14:33 +00:00
AFCMS 558fa57cc6 Solve quartz not generating in the nether 2021-03-18 09:48:18 +01:00
AFCMS 8f30e223e2 I hate reverting something xD 2021-03-16 17:39:06 +01:00
kay27 6e6809f360 Make books in chest loot deterministic, ref. https://git.minetest.land/MineClone2/MineClone2/issues/1254 and https://git.minetest.land/MineClone2/MineClone2/issues/1060 2021-03-08 04:14:03 +04:00
kay27 15fa1e5b7a Fix https://git.minetest.land/MineClone2/MineClone2/issues/1060 - attempt number 3 2021-03-08 03:05:43 +04:00
AFCMS bddc4a3ac7 make village tool experimental 2021-03-07 17:07:55 +01:00
kay27 8ed28adf7c Quick attempt to consider https://github.com/minetest/minetest/issues/5900#issuecomment-306071900 and fix https://git.minetest.land/MineClone2/MineClone2/issues/1212#issuecomment-16139 2021-03-07 06:31:43 +04:00
kay27 66febf158a Speedify dungeons a little and fix chest places (linear, not square) 2021-03-07 06:00:49 +04:00
kay27 45c0c576f7 Implement /spawnstruct dungeon 2021-03-07 03:49:34 +04:00
Elias Fleckenstein d57db0444f Use mod.conf in all mods, part 1 2021-03-04 15:22:14 +01:00
kay27 05a3b4e60c Wrap https://github.com/minetest/minetest/issues/10995 around, thanks @SmallJoker 2021-02-28 16:35:21 +04:00
kay27 abc0bb9e8e Fix dir_to_rotation() 2021-02-27 23:20:57 +04:00
kay27 21e6c5ad1f Fix https://git.minetest.land/MineClone2/MineClone2/issues/1216 2021-02-27 22:44:34 +04:00
kay27 2ce5c5415a Fix village initialization: https://git.minetest.land/MineClone2/MineClone2/issues/1206 https://git.minetest.land/MineClone2/MineClone2/issues/1207 https://git.minetest.land/MineClone2/MineClone2/issues/1209 2021-02-27 03:33:51 +04:00
Elias Fleckenstein d859d94a63 Merge pull request 'Fix #1204' (#1208) from AFCMS/MineClone2:afcms-patch-1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1208
 2021-02-26 16:26:46 +00:00
AFCMS 41e715ef39 Fix #1204 2021-02-26 15:57:44 +00:00
kay27 a5168721b1 Fix https://git.minetest.land/MineClone2/MineClone2/issues/1186 2021-02-25 17:36:42 +04:00
kay27 e23ad6cabf Merge pull request 'Add setting to disable ores generation' (#1174) from AFCMS/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1174
 2021-02-25 10:04:13 +00:00
kay27 54cd5007ed Try to wrap https://github.com/minetest/minetest/issues/10995 by cancelling redefinition of minetest.place_schematic 2021-02-25 01:03:41 +04:00
AFCMS f0348d99d9 Use setting to generate Quartz ore 2021-02-22 19:12:33 +00:00
kay27 47db5c5917 Make mcl_loot/get_random_slots() deterministic 2021-02-22 21:58:35 +04:00
AFCMS 0e6177ee1f Add setting to dissable ores generation #874 2021-02-22 12:33:28 +00:00
kay27 89e55e9065 Add sub-map generators queue, fix https://git.minetest.land/MineClone2/MineClone2/issues/993 and https://git.minetest.land/MineClone2/MineClone2/issues/1060 2021-02-22 03:15:32 +04:00
Elias Fleckenstein 100e37183d Update noise_params to the minetest 5.4 convention 2021-02-18 11:54:51 +01:00
kay27 a73f5dabbd Cleanup 2021-02-10 15:36:32 +00:00
kay27 1d792a650f Speedup placing villages 2/2 (update mcl_villages through Gitea, as direct push doesn't work) 2021-02-10 13:07:32 +00:00
MysticTempest dc9ca16321 Enable villager spawning. 2021-02-09 06:06:19 -06:00
MysticTempest e716ebd911 Make enderman grief less frequently, enable pseudobiome villages by default, and disable natural village generation in singlenode. 2021-02-01 15:45:22 -06:00
kay27 30b4b9661c Villages cleanup 2021-01-29 23:03:39 +04:00
MysticTempest 2fe5ac8569 Add experimental, pseudobiome-based village variation. 2021-01-28 23:59:01 -06:00
kay27 9a668204cb Remove inter-village distance check 2021-01-28 23:12:16 +04:00
MysticTempest ff38a44454 Give 'mcl_villages' the proper loot table, fix blacksmith shop catching fire/missing chest, add butcher shop, remove chest from large_houses, and remove screenshots. 2021-01-28 01:24:43 -06:00
kay27 ff2cd808d5 Fix https://git.minetest.land/Wuzzy/MineClone2/issues/1022 2021-01-28 03:17:11 +04:00
MysticTempest 0c23406531 Add mcl_villages; with support for seed-based, and multithreaded village generation by kay27. 2021-01-27 02:56:53 -06:00
MysticTempest cbd3a491f6 Add support for mcimported worlds by clearing out singlenode mapgen, and adding a toggleable fix for converted double_plants. 2021-01-25 20:23:38 -06:00
Elias Fleckenstein 4a4a834bf8 Generate Enchanted golden apples in chests 2021-01-22 19:45:18 +01:00
Elias Fleckenstein 8f62a3fe0c Enchanted book loot in desert temple 2020-12-23 12:25:18 +01:00
Elias Fleckenstein fdbfd4c654 Mineshaft Loot 2020-12-21 13:57:09 +01:00
Elias Fleckenstein d820c35937 Fishing & Mineshaft loot 2020-12-20 17:33:24 +01:00
Laurent Rocher af26f18bd6 Complete French Translation 2020-11-18 23:06:47 +01:00
kay27 4c2e28836c Fix generation of strongholds 2020-10-15 00:22:48 +04:00
kay27 ba51686e6c Russian translation 2020-07-20 00:11:13 +00:00
Wuzzy d0678d33f8 Use dungeons flag in mg_dungeons for MCL2 dungeons 2020-06-16 02:33:51 +02:00
Wuzzy 2394809649 Respect player's choice of mg_flags 2020-06-16 01:46:07 +02:00
Wuzzy dded403409 Mapgen: Set biomes flag explicitly 2020-06-16 00:20:13 +02:00
Wuzzy 7ff7b64ad0 Fix air holes in desert temple 2020-06-08 17:18:19 +02:00
Wuzzy 15f2960e34 Remove legacy village schematic 2020-06-03 19:57:04 +02:00
Wuzzy a25f7652f6 New desert temple schematic 2020-06-03 19:30:29 +02:00
Rocher Laurent 4957bd1118 Translate In French 2020-05-03 22:39:07 +02:00
Wuzzy a2785041dd Remove mod startup debug messages 2020-04-11 02:56:46 +02:00
wuniversales 15481cb24d Add Spanish translation 2020-02-04 21:43:50 +01:00
Wuzzy 1d2da1f01a TNT minecart and activator rail no longer WIP 2020-01-30 22:31:44 +01:00
Wuzzy d29c4bb795 Fix 2 undeclared global warnings in mapgen core 2019-12-22 20:22:19 +01:00
Wuzzy bbc5f2a0d9 Use sand and gravel for ocean floors 2019-12-22 01:22:05 +01:00
Wuzzy 305145ca1c Tweak oceangen 2019-12-18 21:04:07 +01:00
Wuzzy b7406ed3d5 Generate sponges in deep oceans in non-v6 mgs 2019-12-18 20:55:20 +01:00
Wuzzy f74a502979 Generate sponges in v6 2019-12-18 20:39:14 +01:00
Wuzzy 8b6dc30943 Generate kelp/seagrass in v6 2019-12-18 19:15:21 +01:00
Wuzzy e0e73b8ee8 Add basic seagrass/kelp mapgen 2019-12-18 18:42:04 +01:00
Wuzzy 41d7e513e7 Make variable local 2019-12-14 03:38:00 +01:00
Wuzzy affb984c56 Fix mapgen crash if there's unknown nodes 2019-12-14 01:30:21 +01:00
Wuzzy 3e3ed630e5 Add per-biome grass coloring 2019-12-13 23:48:13 +01:00
Wuzzy 62096c723a Generate new grass color 2019-12-13 15:33:13 +01:00
Wuzzy 6002cd0af5 Fix tallgrass, fern, bonemeal for new grass color 2019-12-13 15:32:57 +01:00
Wuzzy 325801efd7 First step towards param2-based grass color 2019-12-13 14:03:12 +01:00
Wuzzy 2e09febaae Rename Moss Stone to Mossy Cobblestone 2019-12-11 04:24:32 +01:00
Wuzzy 3322366457 Enable igloo basements with 50% chance 2019-10-02 22:38:35 +02:00
Wuzzy 5198f5cdec More igloo basement placement tweaks 2019-10-02 22:29:25 +02:00
Wuzzy da149d5a58 Apply more checks in igloo basement generation 2019-10-02 22:06:26 +02:00
Wuzzy b3e1df7e9b Round pos in spawnstruct chatcommand 2019-10-02 21:18:29 +02:00
Wuzzy 76ed6ff826 MGV6: Generate witch huts only in Normal biome 2019-09-11 16:06:41 +02:00
Wuzzy 6188d7b528 Fix other boolean settings default fails 2019-03-25 12:42:37 +01:00
Wuzzy 2d34a2982a Add biome type to biome metadata 2019-03-25 09:04:41 +01:00