You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
176 lines
11 KiB
176 lines
11 KiB
diff -ru /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/init.lua /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/init.lua
|
|
--- /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/init.lua 2022-02-02 15:39:47.522997688 -0500
|
|
+++ /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/init.lua 2022-02-03 18:29:06.109638406 -0500
|
|
@@ -640,7 +640,7 @@
|
|
if not item then return end
|
|
local inv_image = item.inventory_image
|
|
if not inv_image then return end
|
|
- return string.match(inv_image,"colorize:#(......):200")
|
|
+ return string.match(inv_image,"colorize:#(......):128")
|
|
end
|
|
|
|
-- punch-to-recolor using the airbrush
|
|
@@ -779,7 +779,7 @@
|
|
local color = param2
|
|
|
|
local v = 0
|
|
- local s = 1
|
|
+ local s = 1
|
|
if color < 24 then v = 1
|
|
elseif color > 23 and color < 48 then v = 2
|
|
elseif color > 47 and color < 72 then v = 3
|
|
@@ -797,7 +797,7 @@
|
|
elseif color == 244 then return "light_grey"
|
|
elseif color == 247 then return "grey"
|
|
elseif color == 251 then return "dark_grey"
|
|
- elseif color == 255 then return "black"
|
|
+ elseif color == 255 then return "black"
|
|
else return "grey_"..15-(color-240)
|
|
end
|
|
else
|
|
@@ -1020,7 +1020,7 @@
|
|
local hexgrey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
|
|
local grey = "grey_"..y
|
|
|
|
- if y == 0 then grey = "black"
|
|
+ if y == 0 then grey = "black"
|
|
elseif y == 4 then grey = "dark_grey"
|
|
elseif y == 8 then grey = "grey"
|
|
elseif y == 11 then grey = "light_grey"
|
|
@@ -1119,7 +1119,7 @@
|
|
return
|
|
end
|
|
minetest.chat_send_player(player_name, "*** Switching to "..newcolor.." for the airbrush, to match that node.")
|
|
- unifieddyes.player_current_dye[player_name] = "dye:"..newcolor
|
|
+ unifieddyes.player_current_dye[player_name] = "dye:"..newcolor
|
|
end
|
|
end
|
|
})
|
|
@@ -1152,11 +1152,11 @@
|
|
end
|
|
end
|
|
|
|
- if fields.show_all then
|
|
+ if fields.show_all then
|
|
unifieddyes.player_showall[player_name] = true
|
|
unifieddyes.show_airbrush_form(player)
|
|
return
|
|
- elseif fields.show_avail then
|
|
+ elseif fields.show_avail then
|
|
unifieddyes.player_showall[player_name] = false
|
|
unifieddyes.show_airbrush_form(player)
|
|
return
|
|
@@ -1196,7 +1196,7 @@
|
|
|
|
if (showall or unifieddyes.palette_has_color[nodepalette.."_"..s3]) and
|
|
(minetest.registered_items[dye] and (creative or inv:contains_item("main", dye))) then
|
|
- unifieddyes.player_selected_dye[player_name] = dye
|
|
+ unifieddyes.player_selected_dye[player_name] = dye
|
|
unifieddyes.show_airbrush_form(player)
|
|
end
|
|
end
|
|
@@ -1232,14 +1232,14 @@
|
|
local color = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
|
|
if minetest.registered_items["dye:"..val..hue] then
|
|
minetest.override_item("dye:"..val..hue, {
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":128",
|
|
})
|
|
else
|
|
if (val..hue) ~= "medium_orange"
|
|
and (val..hue) ~= "light_red" then
|
|
minetest.register_craftitem(":dye:"..val..hue, {
|
|
description = S(desc),
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":128",
|
|
groups = { dye=1, not_in_creative_inventory=1 },
|
|
})
|
|
end
|
|
@@ -1261,7 +1261,7 @@
|
|
|
|
minetest.register_craftitem(":dye:"..val..hue.."_s50", {
|
|
description = S(desc.." (low saturation)"),
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":128",
|
|
groups = { dye=1, not_in_creative_inventory=1 },
|
|
})
|
|
minetest.register_alias("unifieddyes:"..val..hue.."_s50", "dye:"..val..hue.."_s50")
|
|
@@ -1281,7 +1281,7 @@
|
|
|
|
minetest.register_craftitem(":dye:"..name, {
|
|
description = S(desc),
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#"..rgb..":200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#"..rgb..":128",
|
|
groups = { dye=1, not_in_creative_inventory=1 },
|
|
})
|
|
minetest.register_alias("unifieddyes:"..name, "dye:"..name)
|
|
@@ -1289,16 +1289,16 @@
|
|
end
|
|
|
|
minetest.override_item("dye:grey", {
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#888888:200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#888888:128",
|
|
})
|
|
|
|
minetest.override_item("dye:dark_grey", {
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#444444:200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#444444:128",
|
|
})
|
|
|
|
minetest.register_craftitem(":dye:light_grey", {
|
|
description = S("Light grey Dye"),
|
|
- inventory_image = "unifieddyes_dye.png^[colorize:#cccccc:200",
|
|
+ inventory_image = "unifieddyes_dye.png^[colorize:#cccccc:128",
|
|
groups = { dye=1, not_in_creative_inventory=1 },
|
|
})
|
|
|
|
@@ -1323,7 +1323,7 @@
|
|
for y = 0, 15 do
|
|
local grey = "grey_"..y
|
|
|
|
- if y == 0 then grey = "black"
|
|
+ if y == 0 then grey = "black"
|
|
elseif y == 4 then grey = "dark_grey"
|
|
elseif y == 8 then grey = "grey"
|
|
elseif y == 11 then grey = "light_grey"
|
|
diff -ru /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/README.md /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/README.md
|
|
--- /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/README.md 2022-02-02 14:41:24.795046997 -0500
|
|
+++ /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/README.md 2022-02-03 18:42:53.185626763 -0500
|
|
@@ -9,6 +9,8 @@
|
|
|
|
License: GPL 2.0 or higher.
|
|
|
|
+Authors: VanessaE, Poikilos (created new unifieddyes_dye.png from scratch, changed colorize value)
|
|
+
|
|
Install: Unzip the distribution file, rename the resultant folder to just "unifieddyes", move it into Minetest's mods folder, and enable it in your world configuration.
|
|
|
|
Usage: for detailed usage information, please see [the Unified Dyes Thread](https://forum.minetest.net/viewtopic.php?f=11&t=2178&p=28399) on the Minetest forum.
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/textures/unifieddyes_dye.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/coderbuild/unifieddyes/textures/unifieddyes_dye.png differ
|
|
diff -ru /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/license.txt /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/license.txt
|
|
--- /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/license.txt 2022-02-02 14:21:04.655064173 -0500
|
|
+++ /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/license.txt 2022-02-03 18:44:59.425624986 -0500
|
|
@@ -29,7 +29,7 @@
|
|
----------------------------
|
|
|
|
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
|
-Copyright (C) 2012-2016 Perttu Ahola (celeron55) <celeron55@gmail.com>
|
|
+Copyright (c) 2012-2016 Perttu Ahola (celeron55) <celeron55@gmail.com>, Copyright (c) 2022 Jake "Poikilos" Gustafson (all dyes redrawn)
|
|
|
|
You are free to:
|
|
Share — copy and redistribute the material in any medium or format.
|
|
Only in /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye: projects
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_black.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_black.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_blue.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_blue.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_brown.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_brown.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_cyan.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_cyan.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_dark_green.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_dark_green.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_dark_grey.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_dark_grey.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_green.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_green.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_grey.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_grey.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_magenta.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_magenta.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_orange.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_orange.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_pink.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_pink.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_red.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_red.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_violet.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_violet.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_white.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_white.png differ
|
|
Binary files /home/owner/git/EnlivenMinetest/Bucket_Game-base/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_yellow.png and /home/owner/git/EnlivenMinetest/Bucket_Game-branches/dye-redrawn-vs-220114/mods/codercore/dye/textures/dye_yellow.png differ
|
|
|