From 7b764adbc0c90a8909d2132379ceb352b620e24c Mon Sep 17 00:00:00 2001 From: Van Date: Thu, 31 Aug 2023 22:27:08 +0000 Subject: [PATCH] Banners color editing (#3868) ### Changing banner colors Reason: I think the current colors of the banners do not match the palette of the surrounding world. Solution: Muting Banner Tones ### Testing Check out the new colors on 12 color banners. ### Attachments Changed banner colors/Current banner appearance UPDATE: Adjusted colors, see the third attachment UPDATE: Changed the color of the white flag. Fixed a bug with different colors of patterns and banners, increased the contrast of folds. The last four attachments display all. Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3868 Reviewed-by: chmodsayshello Co-authored-by: Van Co-committed-by: Van --- mods/ITEMS/mcl_banners/init.lua | 32 +++++++++++++-------------- textures/mcl_banners_banner_base.png | Bin 791 -> 1126 bytes 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mods/ITEMS/mcl_banners/init.lua b/mods/ITEMS/mcl_banners/init.lua index 18b50928a..8c2c1298c 100644 --- a/mods/ITEMS/mcl_banners/init.lua +++ b/mods/ITEMS/mcl_banners/init.lua @@ -22,22 +22,22 @@ mcl_banners = {} mcl_banners.colors = { -- Format: -- [ID] = { banner description, wool, unified dyes color group, overlay color, dye, color name for emblazonings } - ["unicolor_white"] = {"white", S("White Banner"), "mcl_wool:white", "#FFFFFF", "mcl_dye:white", N("White") }, + ["unicolor_white"] = {"white", S("White Banner"), "mcl_wool:white", "#C8C8C8", "mcl_dye:white", N("White") }, ["unicolor_darkgrey"] = {"grey", S("Grey Banner"), "mcl_wool:grey", "#303030", "mcl_dye:dark_grey", N("Grey") }, ["unicolor_grey"] = {"silver", S("Light Grey Banner"), "mcl_wool:silver", "#5B5B5B", "mcl_dye:grey", N("Light Grey") }, ["unicolor_black"] = {"black", S("Black Banner"), "mcl_wool:black", "#000000", "mcl_dye:black", N("Black") }, - ["unicolor_red"] = {"red", S("Red Banner"), "mcl_wool:red", "#BC0000", "mcl_dye:red", N("Red") }, - ["unicolor_yellow"] = {"yellow", S("Yellow Banner"), "mcl_wool:yellow", "#E6CD00", "mcl_dye:yellow", N("Yellow") }, - ["unicolor_dark_green"] = {"green", S("Green Banner"), "mcl_wool:green", "#006000", "mcl_dye:dark_green", N("Green") }, - ["unicolor_cyan"] = {"cyan", S("Cyan Banner"), "mcl_wool:cyan", "#00ACAC", "mcl_dye:cyan", N("Cyan") }, - ["unicolor_blue"] = {"blue", S("Blue Banner"), "mcl_wool:blue", "#0000AC", "mcl_dye:blue", N("Blue") }, - ["unicolor_red_violet"] = {"magenta", S("Magenta Banner"), "mcl_wool:magenta", "#AC007C", "mcl_dye:magenta", N("Magenta")}, - ["unicolor_orange"] = {"orange", S("Orange Banner"), "mcl_wool:orange", "#E67300", "mcl_dye:orange", N("Orange") }, - ["unicolor_violet"] = {"purple", S("Purple Banner"), "mcl_wool:purple", "#6400AC", "mcl_dye:violet", N("Violet") }, - ["unicolor_brown"] = {"brown", S("Brown Banner"), "mcl_wool:brown", "#603000", "mcl_dye:brown", N("Brown") }, - ["unicolor_pink"] = {"pink", S("Pink Banner"), "mcl_wool:pink", "#DE557C", "mcl_dye:pink", N("Pink") }, - ["unicolor_lime"] = {"lime", S("Lime Banner"), "mcl_wool:lime", "#30AC00", "mcl_dye:green", N("Lime") }, - ["unicolor_light_blue"] = {"light_blue", S("Light Blue Banner"), "mcl_wool:light_blue", "#4040CF", "mcl_dye:lightblue", N("Light Blue") }, + ["unicolor_red"] = {"red", S("Red Banner"), "mcl_wool:red", "#760F15", "mcl_dye:red", N("Red") }, + ["unicolor_yellow"] = {"yellow", S("Yellow Banner"), "mcl_wool:yellow", "#E2b43E", "mcl_dye:yellow", N("Yellow") }, + ["unicolor_dark_green"] = {"green", S("Green Banner"), "mcl_wool:green", "#385833", "mcl_dye:dark_green", N("Green") }, + ["unicolor_cyan"] = {"cyan", S("Cyan Banner"), "mcl_wool:cyan", "#114C56", "mcl_dye:cyan", N("Cyan") }, + ["unicolor_blue"] = {"blue", S("Blue Banner"), "mcl_wool:blue", "#20336B", "mcl_dye:blue", N("Blue") }, + ["unicolor_red_violet"] = {"magenta", S("Magenta Banner"), "mcl_wool:magenta", "#B36897", "mcl_dye:magenta", N("Magenta")}, + ["unicolor_orange"] = {"orange", S("Orange Banner"), "mcl_wool:orange", "#B35E2E", "mcl_dye:orange", N("Orange") }, + ["unicolor_violet"] = {"purple", S("Purple Banner"), "mcl_wool:purple", "#764F91", "mcl_dye:violet", N("Violet") }, + ["unicolor_brown"] = {"brown", S("Brown Banner"), "mcl_wool:brown", "#46251A", "mcl_dye:brown", N("Brown") }, + ["unicolor_pink"] = {"pink", S("Pink Banner"), "mcl_wool:pink", "#C98196", "mcl_dye:pink", N("Pink") }, + ["unicolor_lime"] = {"lime", S("Lime Banner"), "mcl_wool:lime", "#7DA553", "mcl_dye:green", N("Lime") }, + ["unicolor_light_blue"] = {"light_blue", S("Light Blue Banner"), "mcl_wool:light_blue", "#5176B2", "mcl_dye:lightblue", N("Light Blue") }, } @@ -96,8 +96,8 @@ end dofile(modpath.."/patterncraft.lua") -- Overlay ratios (0-255) -local base_color_ratio = 224 -local layer_ratio = 255 +local base_color_ratio = 225 +local layer_ratio = 225 local standing_banner_entity_offset = { x=0, y=-0.499, z=0 } local hanging_banner_entity_offset = { x=0, y=-1.7, z=0 } @@ -181,7 +181,7 @@ function mcl_banners.make_banner_texture(base_color, layers) local color = mcl_banners.colors[layerinfo.color][4] -- Generate layer texture - local layer = "(("..pattern.."^[colorize:"..color..":"..layer_ratio..")^[mask:"..pattern..")" + local layer = "((mcl_banners_banner_base.png^[colorize:"..color..":"..layer_ratio..")^[mask:"..pattern..")" finished_banner = finished_banner .. "^" .. layer end diff --git a/textures/mcl_banners_banner_base.png b/textures/mcl_banners_banner_base.png index 3ccd925645bb964163d525a6173a6211aafe1d95..b7824f0ec2a19feee5efc57e33221c5a8585caca 100644 GIT binary patch delta 1117 zcmV-j1fu(w2IdHm7=H)`00020X>r~F00b>bL_t(|+U=UZs#Gx$#`k%w#ZCk(K@e;N zI}2-H!t%a=l}~U>L9A{i+{#LDsoZq~9et&*=|K9o8;|FG<jir z4~Iia(cUwN_4f8QrD(6u-HdM#n(+<7Gytd5>7p4BXxjsDJRUEa0fDw2fM#&hmroyE zRIjJZ02pS0V8gQj7=i_Y4etT?_T|&L>5uPUFRItmmVg@R>6Rs+MtT}8fe-KAo|}ID z`2M1LT>`*HWPc&3@d|*A$U;!#?`#QRdRyx}GG3R80?<*-7_UnO&kIAF6Ksm>rp+l% zbAk~F>%Ip-N8JNq-S=hyjAZ}-vKav4I#1*5sH^el0|0m$XGdL)M<2Qb002M`7E1uw zn5+}z_7(s(ChG*by#kmX1v~(~^{>;O0qFXV!kuTl2Y+CC6i@&#EOLbE`T4#D0ER`5 zP(452w|oFQK`e>V60j1WOxkPBh$sQdq`lURh@t>H#u9+Y+xLv;`%#v+#ds?bVgSux z4uhpA5UqQ!2Jj+5FU_?;ME;=tt^hFNoCK8tZ1Miy=qrFN-rpO21)!NA=LO|FAmja` zXrN9o>wo>DXyD}moC;3?kV$`gqptum>2GiJEdab9fa@{O$X3}U=>k406hqn^Sm9snx=vZ_aJqj|uzYB1Uh%c5Y?KLd*wZL59Y6%ZoBllj5d?4g zdmAF036}Q*Ebs3@h-!iMX>E!1AVjr*l?q#Rz%YQ`ZcwilU@!pC+YRc~0t|)$@Q5pb zp-oW$z=)650<0PWM{5Dr9staUGJug(ShL8{B*@w$>;Yh(PzEqs3q$}$Yk>%W)&kQ2 zz<-Dl<2?W{V#N3?fby1@WkkgfSO7*!V$TOy#n68XfK%fs04lx!pV406Rsi^nYJoBU zEBtMNppMXs|63raBUAuxpyw` z#{gKT#8m*+DRJ+3dLT zH$(MIV1`=z0SaI!4E}4P2P0)4;Jtjrr!MUUgmwmx>-N3f!!;}aU;D}QXB~aE8eQ?paGe*3P-;w$xH9-XM^ggt^=91U?TbSE*eZ(zR1QMFAe) z7r9p2X$A^_Pf@@^+(H9Ddgc~r61LxOCulZqT5d~)p3w8u5}#s!IYEsh5GEZe6$n7l z2++lE7l6PR(g8paIW6LgEg&5N2%x2uNsB$&d+EU^uz$!(>kJgCewYF%gQ2eY49Lhu zb*41wsT4JavnbOSAbp*80C3?fYVYGG-~nU;yodW0Gz;+p%_})o#KgefY-}s-UXU77{z{pr!6f3=32^2%mDYjzrgAfsJN#DoQR)*KZ@EaO*sLe z{{pChF@abBZATB44o43Y|Kr@tZTh?bRcg))jDHiVE}*UHh@0j!!am|n{4VAZ`|=$3 z|9<@c-Iy46!%urOcxk%=Y~TI_7H*u}-> z)w;tbKnEg#iHVEzn#XphR=GGkuUchn^LX767b|B58i7$T3INtS(sSZ#MScJP002ov KP6b4+LSTaU>R}K7