archfan7411/kingdoms_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from cpdef/master

Browse Source 
fix dark_green/-grey
This commit is contained in:
Elkien3 2017-09-18 10:00:45 -05:00 committed by GitHub
commit 8ff3f1d928
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mods/painting/init.lua
View File

@ -21,16 +21,16 @@ local hexcols = {
violet = "8a00ff", blue = "000cff", violet = "8a00ff", blue = "000cff",
green = "0cff00", magenta = "fc00ff", green = "0cff00", magenta = "fc00ff",
cyan = "00ffea", grey = "bebebe", cyan = "00ffea", grey = "bebebe",
dark_grey = "7b7b7b", black = "000000", darkgrey = "7b7b7b", black = "000000",
dark_green = "006400", brown="964b00", darkgreen = "006400", brown="964b00",
pink = "ffc0cb" pink = "ffc0cb"
} }
local colors = {} local colors = {}
local revcolors = { local revcolors = {
"white", "dark_green", "grey", "red", "brown", "cyan", "orange", "violet", "white", "darkgreen", "grey", "red", "brown", "cyan", "orange", "violet",
"dark_grey", "pink", "green", "magenta", "yellow", "black", "blue" "darkgrey", "pink", "green", "magenta", "yellow", "black", "blue"
} }
local thickness = 0.1 local thickness = 0.1
@ -235,6 +235,7 @@ minetest.register_entity("painting:paintent", {
on_punch = function(self, puncher) on_punch = function(self, puncher)
--check for brush. --check for brush.
local name = string.match(puncher:get_wielded_item():get_name(), "_([^_]*)") local name = string.match(puncher:get_wielded_item():get_name(), "_([^_]*)")
--print(name)
if not colors[name] then -- Not one of the brushes; can't paint. if not colors[name] then -- Not one of the brushes; can't paint.
return return
end end
@ -472,8 +473,8 @@ local textures = {
violet = "violet.png", blue = "blue.png", violet = "violet.png", blue = "blue.png",
green = "green.png", magenta = "magenta.png", green = "green.png", magenta = "magenta.png",
cyan = "cyan.png", grey = "grey.png", cyan = "cyan.png", grey = "grey.png",
dark_grey = "darkgrey.png", black = "black.png", darkgrey = "darkgrey.png", black = "black.png",
dark_green = "darkgreen.png", brown="brown.png", darkgreen = "darkgreen.png", brown="brown.png",
pink = "pink.png" pink = "pink.png"
} }