1087 Commits

Author SHA1 Message Date
tchncs
72e72d0bd3 update submodule illuna 2016-06-08 20:02:26 +02:00
tchncs
72f68f9de0 update submdoule illuna 2016-06-08 19:54:34 +02:00
tchncs
10d1f448b2 update submodule darkage, mobs_redo 2016-06-08 13:18:50 +02:00
paramat
b5ea7d17b2 Mapgen: Add biome fields for riverbed node and depth 2016-06-05 19:15:50 +01:00
tchncs
f9b87f3300 update submdoule illuna and mobs_redo 2016-06-05 19:04:44 +02:00
tchncs
633be8f94e update submodule wine, darkage 2016-06-04 22:48:50 +02:00
Auke Kok
dcf2465441 Farming: allow LBM's for other mods as well.
Fixes #1114
2016-06-04 13:39:58 +01:00
paramat
6386684f3e Fire: Ignite tnt, gunpowder, permanent flame above coalblock
Enable ignition of tnt, gunpowder and permanent
flame above coalblock using flint and steel
Override coalblock to remove flame above when dug
Add depends.txt for default mod
2016-06-04 13:39:00 +01:00
tchncs
30e1476c5d replace default crafting_guide in initial stuff 2016-06-01 18:44:10 +02:00
tchncs
e6ab3a5977 update submodule xdecor 2016-05-31 19:12:39 +02:00
tchncs
40a736cc14 update submodule caverealms 2016-05-31 18:17:11 +02:00
tchncs
87551af24b add caverealms to submodules 2016-05-31 18:12:02 +02:00
tchncs
d2f63e50c5 change pick_diamond speed and make it group 3 again 2016-05-31 18:02:13 +02:00
tchncs
6f9cf1e999 update submodules 2016-05-31 10:49:50 +02:00
tchncs
30241f62ad update submodules 2016-05-31 09:57:11 +02:00
Auke Kok
ba33639887 Doors: Pass pointed_thing to on_rightclick() callback
This is an omission technicality. The callee should be able
to trust this isn't `nil`
2016-05-30 11:55:12 +01:00
paramat
541b2d79c7 Default: New mese texture. Add missing texture credits
Mese texture is a classic-mese-yellow version
of celeron55's texture used in MTv0.4.0
Add missing texture credits for mese crystal
and mese crystal fragment
2016-05-30 11:54:24 +01:00
tchncs
5bb740cac3 update submodules 2016-05-28 22:58:57 +02:00
paramat
37347d40f4 Default: Bookshelf has 2 openings instead of 4
Make rotatable with 'paramtype2 = facedir'
2016-05-28 15:11:43 +01:00
Auke Kok
d61803b65f Fire: move fire node removal out of ABM.
Because the fire nodes are not removed 100% when there are
no more burnable nodes nearby, they can potentially stay around
for very, very long times, leading to ABM trains every 5 seconds
for no good reason (only 1 in 16 will be removed every interval).

A much better method to remove fire nodes is to remove them by
timer, and give removal a 100% chance if no flammable nodes are
adjacent. This makes fire cleanup a lot faster and more natural,
and will reduce the amount of ABM hits making fire overall more
responsive.

We also remove the 1 in 4 chance and fold the removal of flammable
nodes into the ABM chance.

There's some low hanging fruit cleanups in here as well.
2016-05-28 15:11:31 +01:00
Auke Kok
0da14dbb56 cherry-pick from github.com/minetest/minetest_game> Default: Convert saplings to use node timers
Each sapling is given a single node timer that is between
2 and 4 days of game play time (40-80 minutes). If you walk out
of the zone, and come back later, the tree will always grow
to full if the timer has elapsed.

Because trees.lua is all functions, it needs to be parsed before
nodes.lua, since that references some of its functions. Hence,
change the order of parsing here. Otherwise saplings would not
grow to full.
2016-05-28 08:58:23 +02:00
paramat
b80af1bc95 cherry-pick from github.com/minetest/minetest_game> Vessels: Improve code style 2016-05-28 08:57:47 +02:00
paramat
7a1b975f8f cherry-pick from github.com/minetest/minetest_game> Vessels: Make shelf open on 2 sides not impossible 4 sides
Make shelf facedir rotatable as is now required
2016-05-28 08:56:50 +02:00
Duane Robertson
68a9d8e338 cherry-pick from github.com/minetest/minetest_game> Doors: Fix uninitialized state variable 2016-05-28 08:56:09 +02:00
Thomas--S
168d9a2591 cherry-pick from github.com/minetest/minetest_game> Vessels: Smaller/improved textures, remove duplicated 'inv' textures
Removed unnecessary inventory textures
The drinking glass inventory texture now differs from
the node texture to be more clearly a drinking glass
Smaller textures to reduce size as nodes
2016-05-28 08:54:52 +02:00
red-001
91bb144fef cherry-pick from github.com/minetest/minetest_game> Creative: Reset 'start_i' to 1 when the inventory filter is changed 2016-05-28 08:52:52 +02:00
paramat
504961a0a2 cherry-pick from github.com/minetest/minetest_game> Tnt: Avoid divide-by-zero errors in calc_velocity() 2016-05-28 08:47:25 +02:00
tenplus1
32c5872bd1 cherry-pick from github.com/minetest/minetest_game> Creative: Fix inventory crash after toggling creative mode in-game 2016-05-28 08:46:13 +02:00
tenplus1
77873ddb9e cherry-pick from github.com/minetest/minetest_game> Creative: Fix '-' glitch in playername
Fix the glitch when players use the '-' character in their username
on a server, causing creative inventory to not pass page 2
2016-05-28 08:45:27 +02:00
tenplus1
5e84246526 cherry-pick from github.com/minetest/minetest_game> Creative: Add global variable creative.formspec_add
This pull adds a new global variable called creative.formspec_add
that will allow mods to add to the creative inventory screen
without the need to fork the mod altogether.  Simple solution
that works already for inventory_plus' BACK button
2016-05-28 08:44:28 +02:00
paramat
75a85b951e cherry-pick from github.com/minetest/minetest_game> Stairs/default: Make sandstone(brick) groups consistent
Sandstone is crumbly = 1 cracky = 3 to be slowly diggable by hand
Sandstonebrick(stair/slab) is cracky = 2
2016-05-28 08:42:57 +02:00
Foz
c47d026950 cherry-pick from github.com/minetest/minetest_game> Tnt: Fix bug in dropped item counting 2016-05-28 08:40:00 +02:00
tchncs
75aa611aa2 update submodule farming 2016-05-26 12:10:29 +02:00
tchncs
82a9d81e19 add xdecor to submodules 2016-05-25 23:03:30 +02:00
tchncs
881f4ac066 add hudbars to submodules 2016-05-25 23:01:38 +02:00
tchncs
c181117afb add darkage to submodules 2016-05-25 22:59:14 +02:00
tchncs
66c5683ccf add bags and plantlife to submodules 2016-05-25 22:56:32 +02:00
tchncs
907cb3be8c add 3d_armor to submodules 2016-05-25 22:52:40 +02:00
tchncs
82a31236be add worldedit to submodules 2016-05-25 22:03:46 +02:00
tchncs
92ee60e6c7 update submodule farming 2016-05-25 15:34:48 +02:00
Auke Kok
e0cb3fce02 Default: Convert saplings to use node timers
Each sapling is given a single node timer that is between
2 and 4 days of game play time (40-80 minutes). If you walk out
of the zone, and come back later, the tree will always grow
to full if the timer has elapsed.

Because trees.lua is all functions, it needs to be parsed before
nodes.lua, since that references some of its functions. Hence,
change the order of parsing here. Otherwise saplings would not
grow to full.
2016-05-25 03:27:08 +01:00
Auke Kok
70ef7864c1 Farming: Convert plants to use node timers
This PR requires @minetest/minetest#3677

Farming and plant growth has traditionally in minetest been
implemented using ABM's. These ABM's periodically tick and cause
plants to grow. The way these ABM's work has several side effects
that can be considered harmful.

Not to mention a comprehensive list of downsides here, but ABM's
are chance-dependent. That results in the chance that some nodes
potentially never get processed by the ABM action, and others get
processed always. One can easily find this effect by planting a large
field of crops, and seeing that some nodes are fully grown really
fast, and some just won't make it to fully grown status even after
hours or play time.

One could solve the problem by making the ABM's slower, and giving them
a 100% of action, but this would cause the entire field to grow a step
instantly at ABM intervals, and is both ugly, and a large number of
node updates that needs to be sent out to each client. Very un-ideal.

With NodeTimers though, each node will see a separate node timer event,
and they will likely not coalesce. This means that we can stop relying
on chance to distribute plant growth, and assign a single timer event
to grow the plant to the next phase.  Due to the timer implementation,
we won't ever miss a growth event, and we can re-scehdule them until
the plant has reached full size.

Previously, plants would attempt to grow every 9 seconds, with a
chance of 1/20. This means typically, a plant would need 9*20 seconds
to grow 1 phase, and since there are 8 steps, a typical plant growth
would require 9*20*8 ABM node events. (spread out over 9*8 ABM actual
underlying events per block, roughly).

because plants are likely not growing to full for a very long time
due to statistics working against it (5% of the crops take 20x longer
than the median to grow to full, we'd be seeing ABMs fire possibly
up to 9*20*8*20 with a 95% confidence interval (the actual math
is likely off, but the scale should be correct). That's incredibly
wasteful. We'd reach those conditions easily with 20 plant nodes.

Now, after we convert to NodeTimers, each plant node will see exactly
8 NodeTimer events, and no more. This scales lineairly per plant.

I've tuned the growth rate of crops to be mature in just under 3
whole days. That's about 1hr of game time. Previously, about half
the crops would grow to full in under 2 days, but many plants would
still not be mature by the end of day 3. This is more consistent.

An additional problem in the farming mod was that the final fully-grown
plant was also included in the ABM, causing infinite more ABM's even
after the entire field had grown to completion.

Now, we're left with the problem that none of the pre-existing plants
have actual node timers started on them, and we do not want a new ABM
to fix this issue, since that would be wasteful.  Fortunately, there
is now an LBM concept, and we can use it to assure that NodeTimers
on crop nodes are properly started, and only have to do the actual
conversion once per block, ever.

We want to provide a fairly similar growth rate after this conversion
and as such I've resorted to modelling some statistical data. For this
I created a virtual 32x32 crop field with 9 steps (8 transitions)
as is the default wheat crop. We then apply a step where 1 in 20
plants in the field grows a step (randomly chosen) and count the
number of steps needed to get to 25%, 50, 75% and 95% grown.

The resulting data looks as follows:

25% - ~120 steps * 9 sec / abm = 1080s
50% - ~152 steps               = 1368s
75% - ~194 steps               = 1746s
95% - ~255 steps               = 2295s

Next, we want to create a model where the chance that a crop grows
is 100% every node timer. Since there will only be 8 steps ever,
we want the slowest crops to grow in intervals of ~ 2300 / 8 seconds
and the fastest 1/4 of crops to grow 1080 / 8 seconds intervals.
We can roughly compare this to a normal distribution with a median
of 1400 with a stddev of ~350 (thick fingering this one here).

The rest is a bit of thick-fingering to get similar growth rates,
taking into account that ABM's fire regularly so if they're missed
it's fairly painless, but our timers are going to be 1-2 minutes
apart at minimum. I calculate the timer should be around 150s
median, and experimented with several jitter ranges.

Eventually I settled for now on [80,200] with a redo of [40,80],
meaning that each growth step at minimum takes (80 to 200) seconds,
and if a negative growth condition was found (darkness, soil not
wet, etc), then the growth step is retried every (40 to 80) seconds.

The end result is a growth period from seed to full in ~ 2.25
minetest days. This is a little bit shorter than the current
growth rate but the chances you'll miss timer ticks is a bit
larger, so in normal gameplay it should be fairly comparable.

A side effect is that fields grow to full yield fairly quickly
after crops make it to mature growth, and no crops are mature
a very long time before the majority grows to full. The spread
and view over a growing field is also fairly even, there's no
large updates with plenty of nodes. Just a node here or there
every second or so in large fields.

Ultimately, we get rid of ABM rollercoasters that cause tens of
node updates every 9 seconds. This will help multiplayer servers
likely a lot.
2016-05-25 03:26:53 +01:00
tchncs
c8fc4cfb36 update submodules 2016-05-24 12:01:34 +02:00
Auke Kok
fc902a77de Boats: Lower boat collision box top
Standing on a boat makes you appear to "hover" over it since this
collision box is way too high. Lower it so that it's low enough
to look normal when walking on top of a boat
2016-05-23 08:37:58 +01:00
paramat
3e5f3f28d2 Vessels: Improve code style 2016-05-23 08:37:58 +01:00
paramat
d8daee7e47 Vessels: Make shelf open on 2 sides not impossible 4 sides
Make shelf facedir rotatable as is now required
2016-05-23 08:37:58 +01:00
Duane Robertson
7681682d28 Doors: Fix uninitialized state variable 2016-05-23 08:37:11 +01:00
tchncs
79e4ea3bf2 update submodules 2016-05-23 09:07:19 +02:00
tchncs
ad04e5ae0d update submodules 2016-05-22 23:33:14 +02:00
tchncs
8ef03465d1 update submodules 2016-05-22 23:05:42 +02:00