Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2024-09-15 09:43:11 +02:00
commit daf92c43e3

View File

@ -40,9 +40,10 @@ mymod.speed_monoid = player_monoids.make_monoid({
end, end,
fold = function(tab) fold = function(tab)
local res = 1 local res = 1
for _, speed in pairs(tab) do for _, speed in pairs(tab) do
res = res * speed res = res * speed
end end
return res
end, end,
identity = 1, identity = 1,
apply = function(speed, player) apply = function(speed, player)
@ -108,9 +109,10 @@ newmod.speed_boosts = player_monoids.make_monoid({
end, end,
fold = function(tab) fold = function(tab)
local res = 1 local res = 1
for _, speed in pairs(tab) do for _, speed in pairs(tab) do
res = math.max(res, speed) res = math.max(res, speed)
end end
return res
end, end,
identity = 1, identity = 1,
apply = ??? apply = ???
@ -202,4 +204,4 @@ global state.
* The order that different effects get combined together is based on key order, * The order that different effects get combined together is based on key order,
which may not be predictable. So you should try to make your monoids commutative which may not be predictable. So you should try to make your monoids commutative
in addition to associative, or at least not care if the order of two changes in addition to associative, or at least not care if the order of two changes
is swapped. is swapped.