mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-01-11 18:40:25 +01:00
Fix dyes' craft recipes (and peace_areas)
- Fix peace_areas when player's pos is nil - Solves #245 - Add dyes tab to the spreadsheet
This commit is contained in:
parent
413dd24bca
commit
5f1aa7a47b
@ -55,11 +55,11 @@ minetest.register_craft({
|
||||
-- Mix recipes
|
||||
-- Just mix everything to everything somehow sanely
|
||||
|
||||
dyelocal.mixbases = {"magenta", "red", "orange", "brown", "yellow", "green", "dark_green", "cyan", "blue", "violet", "black", "dark_grey", "grey", "white"}
|
||||
dyelocal.mixbases = {"magenta", "red", "orange", "brown", "yellow", "green", "dark_green", "cyan", "blue", "violet", "black", "dark_grey", "grey", "white", "light_grey"}
|
||||
|
||||
dyelocal.mixes = {
|
||||
-- magenta, red, orange, brown, yellow, green, dark_green, cyan, blue, violet, black, dark_grey, grey, white
|
||||
white = {"pink", "pink", "orange", "orange", "yellow", "green", "green", "grey", "cyan", "violet", "grey", "grey", "white", "white"},
|
||||
-- magenta, red, orange, brown, yellow, green, dark_green, cyan, blue, violet, black, dark_grey, grey, white, light_grey
|
||||
white = {"pink", "pink", "orange", "orange", "yellow", "green", "green", "grey", "cyan", "violet", "grey", "grey", "light_grey", "white", "white"},
|
||||
grey = {"pink", "pink", "orange", "orange", "yellow", "green", "green", "grey", "cyan", "pink", "dark_grey", "grey", "grey"},
|
||||
dark_grey = {"brown", "brown", "brown", "brown", "brown", "dark_green", "dark_green", "blue", "blue", "violet", "black", "black"},
|
||||
black = {"black", "black", "black", "black", "black", "black", "black", "black", "black", "black", "black"},
|
||||
|
@ -7,6 +7,7 @@ peace_areas = {areas = {}}
|
||||
|
||||
minetest.register_on_punchplayer(function(player, hitter)
|
||||
local pos = player:getpos()
|
||||
if pos == nil then return end
|
||||
for name, positions in pairs(peace_areas.areas) do
|
||||
local pos1 = positions["pos1"]
|
||||
local pos2 = positions["pos2"]
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user