Commit Graph

6687 Commits

Author SHA1 Message Date
Phaethon H a3de5b7cb0 Move cauldron nodebox preset table outside of function, to be built once instead of with each function call.
Skip intermediate variable for returns.
Added mcl_cauldrons.get_substance() to get substance from cauldron.
Added explicit list of cauldron substances.
2021-11-06 00:11:35 -07:00
Phaethon H 5b03c604b3 Update banner dipping into cauldron with new cauldron names/behavior.
Update weather/rain filling cauldrons with new cauldron names/behavior.
set_level() determining current substance.
2021-11-05 19:22:51 -07:00
Phaethon H 407903b73a Renaming some cauldron-associated symbols.
Item group comparision against 0 instead of greater than.
Cauldron callbacks assigned function references instead of functions defined in-place.
Short-hand invocation of callback with default alternate value.
local helper function merge_tables made recursive to allow selective subkey override/substituion.
Cauldron fill heights determined by table lookup instead of cascading "if"s.
Trimming some dead code.
2021-11-05 17:18:30 -07:00
Phaethon H ad46840fa9 Allow filling up glass bottles from cauldrons with river water.
Play sounds for filling bottles from water sources.
Play water_source sound for taking bucket of river water from cauldron.
Remove redundant check to skip building water source due to filling cauldron.
2021-10-25 14:31:24 -07:00
Phaethon H 3b9c553b6c Styling edits. 2021-10-24 20:54:11 -07:00
Phaethon H 6ed5865aff Fix spelling mistake in variable name. 2021-10-24 16:10:52 -07:00
Phaethon H fd8182c74c Wire in documentation aliases for the filled cauldrons.
Delete commented out code.
Change names of variables to be more clear of purpose.

Slightly cleaner logic getting bucket from cauldron.
Play sounds when bucket takes from cauldron.
Guard against entirety of bucket placing water source if cauldron filled successfully (avoid empty if branch).

Adjust cauldron collision box to make it possible to jump/fall inside.
Minimally functioning state: water cauldron extinguish entity on fire.

Fix interaction of bottles with water sources and cauldrons:
 * take and give 1/3 level from/to cauldrons (creative mode and survival mode inventory changse).
 * take from mcl_core:water_source

Removed utils.lua (contents were moved into register.lua).
2021-10-24 15:37:43 -07:00
Phaethon H 2775f89979 Cauldron API, callback-based; changes to mcl_buckets and mcl_potions for interaction with water cauldron. 2021-10-22 10:30:33 -07:00
AFCMS 1b0b5fc733 Merge branch 'master' into api-cauldrons 2021-05-27 09:10:19 +02:00
epCode 138a3cd154 Add in header blend file 2021-05-26 19:13:30 -07:00
Lizzy Fleckenstein c57ead6985 Use next() instead of one-time loop to fix luacheck warning in mcl_util.calculate_durability 2021-05-26 20:56:00 +02:00
Lizzy Fleckenstein 772f48ed58 Fix crash / luacheck warning caused by armor with thorns level > 10 2021-05-26 20:51:39 +02:00
Lizzy Fleckenstein 079cedaa34 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-26 20:48:07 +02:00
Lizzy Fleckenstein 1b0d6a2c2d Fix timing out of assist death message sources 2021-05-26 20:48:00 +02:00
NO11 656891ec61 [mcl_core] fix function codestyle in nodes_trees.lua 2021-05-26 18:02:28 +00:00
NO11 90bab9026b [mcl_core] fix function codestyle in nodes_liquid.lua 2021-05-26 17:57:43 +00:00
NO11 5b43303873 [mcl_core] fix function codestyle in nodes_climb.lua 2021-05-26 17:54:58 +00:00
NO11 211b078d3a [mcl_core] fix function codestyle in nodes_base.lua 2021-05-26 17:51:24 +00:00
NO11 bb77443892 [mcl_core] fix function codestyle in functions.lua 2021-05-26 17:43:42 +00:00
AFCMS 5fc3256930 fix codestyle in mcl_hbarmor 2021-05-26 16:55:32 +02:00
AFCMS ee9577b625 fix functions in mcl_hbarmor 2021-05-26 16:43:36 +02:00
AFCMS fd387a65af fix some codestyle issues in hudbars 2021-05-26 16:42:12 +02:00
AFCMS 190d5cad33 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-05-26 16:25:38 +02:00
AFCMS 4c9eeed499 Update CONTRIBUTING.md 2021-05-26 16:25:16 +02:00
NO11 6105a9ef22 Fix function code style in mcl:core/crafting.lua 2021-05-25 20:00:06 +00:00
AFCMS 49044ac15e unify codestyle [2] 2021-05-25 13:18:12 +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 981f3d5d74 fix some codestyle issues 2021-05-25 10:51:46 +02:00
AFCMS 3f3abbbee1 speedup mcl_particles code 2021-05-25 09:09:16 +02:00
AFCMS 42d3830c48 [mcl_nether] fix warnings 2021-05-25 08:49:46 +02:00
AFCMS 8592670f9b [tsm_railcorridors] fix warnings 2021-05-25 08:44:24 +02:00
AFCMS d3a237384d [mcl_end] fix warnings 2021-05-25 08:40:21 +02:00
AFCMS 79cf98c8e3 [mcl_mobs] fix some warnings 2021-05-25 01:48:14 +02:00
AFCMS 00f4cfa5b5 simplify mcl_util code 2021-05-25 01:33:26 +02:00
AFCMS 0cc11d0bbb [mcl_loot] fix warnings 2021-05-25 01:28:10 +02:00
AFCMS f61102279f [_mcl_autogroup] fix warnings 2021-05-25 01:26:26 +02:00
AFCMS f5a91f7c24 [biomeinfo] fix warnings 2021-05-25 01:23:41 +02:00
AFCMS 540508638c rewrite flowlib to be more efficient 2021-05-25 01:22:25 +02:00
AFCMS 03c9c0b830 [mcl_explosion] fix warnings 2021-05-25 00:57:42 +02:00
AFCMS 36f3c26139 [walkover] fix warnings 2021-05-25 00:55:14 +02:00
AFCMS 0d13e1ffdd [drippingwater] fix warnings 2021-05-25 00:54:12 +02:00
AFCMS be9fff4fe2 [mcl_boats] fix warnings 2021-05-25 00:50:04 +02:00
AFCMS ad16fe7072 [mcl_burning] fix warnings 2021-05-25 00:48:46 +02:00
AFCMS dd3b5a98ae [mcl_falling_nodes] fix warnings 2021-05-25 00:46:39 +02:00
AFCMS fddaacdeae [mcl_item_entity] fix warnings 2021-05-25 00:43:42 +02:00
AFCMS 8286fd2a4d [mcl_minecarts] fix warnings 2021-05-25 00:43:08 +02:00
AFCMS f76b66eec6 [mcl_mobs] fix some warnings (131 remaining!) 2021-05-25 00:37:02 +02:00
cora 66f132a645 fix crash on creeper explosion ( #1755 ) 2021-05-24 12:41:16 +02:00
AFCMS b6dd8d5c44 [mcl_paintings] fix warnings 2021-05-23 15:13:44 +02:00