From a0bf61cfa7b29264d3d51fa9107cece6d59b1831 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 27 Apr 2015 19:00:35 -0400 Subject: [PATCH] do the same for wrought iron --- chains/textures/chains_wrought_iron.png | Bin 926 -> 398 bytes homedecor/exterior.lua | 2 +- homedecor/lighting.lua | 4 ++-- homedecor/misc-nodes.lua | 8 ++++---- .../homedecor_tile_horizlines_overlay.png | Bin 86 -> 86 bytes .../textures/homedecor_tile_wrought_iron.png | Bin 1086 -> 382 bytes .../textures/homedecor_tile_wrought_iron2.png | Bin 926 -> 0 bytes homedecor/window_treatments.lua | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 homedecor/textures/homedecor_tile_wrought_iron2.png diff --git a/chains/textures/chains_wrought_iron.png b/chains/textures/chains_wrought_iron.png index eef6fb778fa6629a25812be7309943e341dc6d6d..882963f7c45ff721c7903ad069ea7b21c86f2aca 100644 GIT binary patch delta 382 zcmV-^0fGLW2aW@f8Gix*005AYXf^-<0aZyvK~yNubQB>?*Wawe` zzoK@eCdF@628M$Gkv8yvcMtyh_$frfB+SIT`t`9a-Y@&Umov52`WU@y?VSYDr4Vw>Pa?|tqtU2}GOKpfabf~H!GPBH+V+552l5OF!@GsS#nL}+cO*%&%Z z36T(-h=GZl=C`+ZCoZP=`|}e_%?yzM008 zTq-jWArm10Gk494mw8!U$A0WPm=a;{R$8mABcgLc2mt7WMRZ%Z z9z(?m|KsDoeI%!N+565%>P_!EAAy_RUoZdnkzCqk@5kgWedMn9osZo0Ui^CLBYlj^ c-giEK0B3+p>-GPQfB*mh07*qoM6N<$f~v{4=>Px# delta 915 zcmV;E18n?`1D*$v8Gi!+001a04^sdD00d`2O+f$vv5yPaA;mu zU|3ODQB0GCcyVQ0QcOpFb!>`#aej4cac5kZiF=lad7hJqkb-rnnv9BqdWU>*lZt_T zbZc&8STr&*G&C|eH8emxIZaAPMnghYQcg!hKvhsps-2LTiGO-dNkmpqN?}}9URO|R zWL;QOPmO?cWnEN@e{+w5bdP~_f_H6!c5H=tZl{`!n2LLsiF*FSbtMae|2ntb!&ZdYJqobU073H zS5i_>OKD5eSyfO>N=IQ^ zRajI{S5r?+Nk@o$aF~gDkb`w~ZDp2+d6|lPURhI@hr>2Y>qb#pV`w4|di!H#W34K@f>zpb2^= z6{;?C8w)`pKp)2}>6=|v+J@{cttbP0$;_hOIm_UkJSp{{6YQp zVSkq3zb^;!znZc_Fg+`6cXmRIYIpvsImSG&@D>*^LUVPow>na)HyD7&=8Gz@d7HJr zqcX!wM*&8Rn2?yqXDp_iOr1_of~W`adfx{0sm9002ovPDHLkV1j93c!dA} diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 1c05d85c..337bbf4b 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -39,7 +39,7 @@ homedecor.register("bench_large_1", { mesh = "homedecor_bench_large_1.obj", tiles = { "homedecor_generic_wood.png", - "homedecor_tile_wrought_iron2.png" + "homedecor_tile_wrought_iron.png" }, description = "Garden Bench (style 1)", inventory_image = "homedecor_bench_large_1_inv.png", diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 25cfccc4..587b4177 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -205,7 +205,7 @@ homedecor.register("candlestick_wrought_iron", { tiles = { "homedecor_candle_sides.png", {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, - "homedecor_tile_wrought_iron2.png", + "homedecor_tile_wrought_iron.png", }, inventory_image = "homedecor_candlestick_wrought_iron_inv.png", selection_box = cs_cbox, @@ -240,7 +240,7 @@ homedecor.register("wall_sconce", { 'homedecor_candle_sides.png', {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, 'homedecor_wall_sconce_back.png', - 'homedecor_tile_wrought_iron2.png', + 'homedecor_tile_wrought_iron.png', }, inventory_image = "homedecor_wall_sconce_inv.png", selection_box = { diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 8d460c5b..c825dfe2 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -79,7 +79,7 @@ homedecor.register("pole_brass", { homedecor.register("pole_wrought_iron", { description = S("Wrought Iron Pole"), - tiles = {"homedecor_tile_wrought_iron2.png"}, + tiles = { "homedecor_tile_wrought_iron.png^homedecor_tile_horizlines_overlay.png" }, inventory_image = "homedecor_pole_wrought_iron_inv.png", wield_image = "homedecor_pole_wrought_iron_inv.png", selection_box = { @@ -478,7 +478,7 @@ homedecor.register("sportbench", { description = "Sport bench", mesh = "homedecor_sport_bench.obj", tiles = { - "homedecor_tile_wrought_iron2.png", + "homedecor_tile_wrought_iron.png", "homedecor_bright_metal.png", "forniture_black_metal.png", "wool_black.png" @@ -702,8 +702,8 @@ homedecor.banister_materials = { }, { "wrought_iron", "wrought iron", - "homedecor_tile_wrought_iron2.png", - "homedecor_tile_wrought_iron2.png", + "homedecor_tile_wrought_iron.png", + "homedecor_tile_wrought_iron.png", "homedecor:pole_wrought_iron", "homedecor:pole_wrought_iron", "", diff --git a/homedecor/textures/homedecor_tile_horizlines_overlay.png b/homedecor/textures/homedecor_tile_horizlines_overlay.png index daf157ef8920adad81eb77a397d5e1a9fbde082f..401b03eed416ff20f2908b1ffdffb509ac188416 100644 GIT binary patch delta 43 xcmWFwn_!^Ed00b&b#a0OgBu$gTdo%m1H+|H%)t-eMxJE=0#8>zmvv4FO#lc54B7wy delta 43 xcmWFwn_!@3e^^6;b#a0OgBu$gTdo%m1A~JrbDphBSPBCWc)I$ztaD0e0s!CO3Nruz diff --git a/homedecor/textures/homedecor_tile_wrought_iron.png b/homedecor/textures/homedecor_tile_wrought_iron.png index c2d62cd936fcff1a154999a7567c6cf9d09203f8..f57994e77cbeb8051eb771b46b900c21fec74d51 100644 GIT binary patch delta 366 zcmV-!0g?W`2>t?)8Gix*005AYXf^-<0YynfK~yNub^?u#=>t~hHCZez~x1qY$E~PMX$*5JTFqowt==aN1iIT_q?`;<4JNfhH`1yk| z-+Mp(!ISsXA3S-NlHdNp-RE2Hr$2b~e)xkY?^=(yf1u`Xy`TR412xWL<&3(PD*ylh M07*qoM6N<$f-P;a0ssI2 delta 1076 zcmWNRYiJt<0D#kt>NYxMT6CiRm?EpVcDAgKG)tOib4i=zvOF)%JGoqQxjZhpTwa%4 z()99Z(xgq(y0)8@iMk@wDT85$Ez`n=GLel^8MVGp)F~(we4*I?-}mc-@4o}kQmr^$%FQrI2L$3?`_gQ6e!BSDLZddB zLdMkn-7iH^Cv8&6q{5+)d(34vSt|WuAr3~&iHB0ntIiDwkOS4R)oR5V(D+`U8Jhf6|s33yFW&~2NoNvHJRf!^E zu$l0==dxs(BAR(BPa-f4Y3f-5ln)DegQI{5w?l(xx+17E1e;|-juH?$bxNmErB})O zUp_T6nW$ySd>ln>8Y(bepGedhit@V^fJh+~oS!Z*@!+LqO)BC!$MinCF+OgeAOiIQ z9rHVtfH(+SWD>q|n1@(3K9?D@8|yimAW;XCAyJnl3|q1hZyHAn6z+mlP6%vF5Q`OR zVT#6Vx|GlEb6at@Sq<1sZaB|{FqVwMVz+l&w>AMEKO5J%W!3OOLf zumIq5bfXf&yDy4LQOv4WO(i2@9-BmM(Qz|Ppsskp$s`FJHu;+gy+)6ZVg3MvCbm41r29w-gJ?MQ6ia`(lA&s3=1b zy{AvDG^3~{Cj*$m)s9)1V=5PoC;$Gl`QUeWC+Z7PHEGFUYp+UrmY@GTW6B^xRrgh zJHukNw93Q+?Quiv%}O_*wjsv%g%dU;a+|&ra{si}_=#AA&bVe+pf>*3xX>RNO!8`|HNm z6WzCu6xW~G{P@mPgyCPMzv{w{$F48?liZd|@3rl0{SIB7JhP@QY;U) zKE2wwYkPKzIdtXAU+=Z4`_}g2k0qy1?$ST}c*5}l^8GQRylZ3Vs{dOuBzSv6e@3?e zO|}t#G`3{#t}Vlf%FN|molp7t-w!(7E23;l_6G3Kb1MUd?SYBTTNe}ax!Wh#+c!I2 lc~#rf@z#S?|B>lUhJOE>vZ3eSjrsjQuw)XY_#L5r;(slQ!AbxC diff --git a/homedecor/textures/homedecor_tile_wrought_iron2.png b/homedecor/textures/homedecor_tile_wrought_iron2.png deleted file mode 100644 index eef6fb778fa6629a25812be7309943e341dc6d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 926 zcmV;P17ZA$P)iVP;}rZ);{mLP1MNMn^?LUR_&xacF>hbXinTlZ%3bd2WSzZ-jYnZ)jm|XJ3kg zd{IqFkb`!6a%p#NXLW33T31m~PD^%fW^QO;Z)ad-URii=W_odHQB6uyPfT1_Q+#r1 zZ)aazS5k3mVp~^IWL{WeT~}gVR+WZ$L_t7jVq9fkT4rHdihglmTUBsrVp>*FSW`}a zb!>ojYkhNSfp=_OSW{hBQc_P#X<}PXOh`~nNl;Bmb!=sLZ)kIDWO8a_Zf0OtQcY`Q zTw`5VXkuGgRZvVyM`2r4SX56}Q%_7uM~HlIn2CCjgLQRnWtN9|nTmT}SyPvYdPPG) zU070wd~jJ*PiA0Ra%*E#PfLq`a*BR(N=HRYNk&ISLsU>qPD@B@WL<1!US(fdVq8~k zW?xH4MPFG|mx+3jgLavTdy<8BcyDJMnp|YM^#ZxNk>FRL_$SF zLZ`*5hyVZq7)eAyR2b6*!2@Cg0T2Mdt!>-3ZQHhO+eYlhwok9?4EP87_{HWHcMo>f zH#au4H$f1IVxS3nCKakKa~lgmAwVC;Ea{tFR@#Q_Ev+a6e96qB-Z{(e$^=GWQnnTH ztA;sChu4=<(Kg0kvrYruC_H<5*POgRMuTXu< z2pl=yl#kU4;rv1U_F*^LUVPow>na) zHyD7&=8Gz@d7HJrqcX!wM*&8Rn2?yqXDp_iOr1_of~W`adfx`~Uy|07*qoM6N<$g5{BR ACIA2c diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua index f4f20363..97309738 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor/window_treatments.lua @@ -172,7 +172,7 @@ end local mats = { { "brass", "Brass", "homedecor_tile_brass.png" }, - { "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron2.png" }, + { "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron.png" }, { "wood", "Wooden", "default_wood.png" } }