nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-25 02:00:37 +01:00
Code Issues Releases Wiki Activity

Fix dyes' craft recipes (and peace_areas)

Browse Source 
- Fix peace_areas when player's pos is nil
 - Solves #245
 - Add dyes tab to the spreadsheet
This commit is contained in:
LeMagnesium 2015-08-28 22:00:07 +02:00
parent 413dd24bca
commit 5f1aa7a47b
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
minetestforfun_game/mods/dye/init.lua
View File

@ -55,11 +55,11 @@ minetest.register_craft({
-- Mix recipes -- Mix recipes
-- Just mix everything to everything somehow sanely -- 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 = { dyelocal.mixes = {
-- magenta, red, orange, brown, yellow, green, dark_green, cyan, blue, violet, black, dark_grey, grey, 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", "white", "white"}, 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"}, 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"}, 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"}, black = {"black", "black", "black", "black", "black", "black", "black", "black", "black", "black", "black"},

1
mods/peace_areas/init.lua
View File

@ -7,6 +7,7 @@ peace_areas = {areas = {}}
minetest.register_on_punchplayer(function(player, hitter) minetest.register_on_punchplayer(function(player, hitter)
local pos = player:getpos() local pos = player:getpos()
if pos == nil then return end
for name, positions in pairs(peace_areas.areas) do for name, positions in pairs(peace_areas.areas) do
local pos1 = positions["pos1"] local pos1 = positions["pos1"]
local pos2 = positions["pos2"] local pos2 = positions["pos2"]

BIN
other_things/Tableau-valeurs-MFF.ods
View File

Binary file not shown.