From 202a6ff9af6702f4c61fefeb58502b2a7e363208 Mon Sep 17 00:00:00 2001 From: darkrose Date: Sun, 25 Jun 2017 23:02:03 +1000 Subject: [PATCH] apple planks and some texture fixes --- data/textures/applewood_plank.png | Bin 0 -> 416 bytes data/textures/steel_block.png | Bin 506 -> 1354 bytes data/textures/steel_sheet.png | Bin 0 -> 855 bytes data/textures/wood_plank.png | Bin 849 -> 391 bytes src/content_craft.cpp | 32 ++++++++++++++++++++++ src/content_craftitem.cpp | 23 ++++++++++++++++ src/content_craftitem.h | 2 ++ src/content_mapnode.cpp | 14 +++++----- src/content_mapnode_door.cpp | 4 +-- src/content_mapnode_sign.cpp | 11 ++++---- src/content_mapnode_special.cpp | 5 ++-- src/nodemeta/content_nodemeta_storage.cpp | 4 +-- 12 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 data/textures/applewood_plank.png create mode 100644 data/textures/steel_sheet.png diff --git a/data/textures/applewood_plank.png b/data/textures/applewood_plank.png new file mode 100644 index 0000000000000000000000000000000000000000..06dc557342fd3c2d280ab4606d6bdfef7e790502 GIT binary patch literal 416 zcmV;R0bl-!P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^Rc1{n+<4G?!VGynhrGD$>1R5;76 zleTGZ~_;KL}w z#onC$Il*bQsJ`ov_3dYKv34V=1pv+UDGj5TiM)?>3;-+pcQSN^gtg-b3Bs68H{i7& zraJ78_QvX@TE~#jy5ur0o;56O-^$Pg36+y4=?@}0-GG#gb%w(Mj*sUv+3%myI5A}C6f%m;czVU{rh*^&lu4fFyEJtEA48O*G@s`9#aRb}SZ z+OjO?dH($QbKADp*VmhaK-{BdW+tL~_V9Ycy{kJB5m7{lB!J!KsOcfCk z>Ah#>M+6McOlFqWS_pMTcp{}qcyQ+n`XCx+8BsTxSyg-QBEn!+)}~CXf2yrDW_Gu? zxBs}?jiS0HM7+?pUq8QoX6EoX{8(i1?nJ_TMg#yNQdJRYt%*qaE9^u>#Ou0l@4LHw z#`qvaCGXI*NdG71`z?_?i0R%n_jCSp!mmQjWl@p+ zILs`O1Y%_c5E&)>SsGJlu1cXCDP79wzVE&Ff(bxWC9@n{uh(i^07}8r!5Br_xYfa| z!$(@v1I*f5y_}y_wV8RjT+FN_mzgE4NOv;;#4Kn}J=Q%RPz0+oGcx(1nx-g=H)aOX zEF+@Ytqmt;xMxI0epGTqRJNYx0g;(?(Sw* z`kT!FfVNi8szP+TkeS3>f!1Ay0=TF?G^OWWRA&kUfIuEYsn<1g%IGkwujR5j>n&R% zPYz}cl=XsUX$>tS%3|TDD3NYHg_=avTB~fE84=}OR8I~>XliMOLd@qmTDxg+j8QZe z2mpzcyT1KSf9$Um%`UIMkyw-YJWkNf!DPeXY1vwvRiez+`)d*dy4ot_#qAj;C?R4rLccg|9yw3#!x@Crejz{Y}+=*@W`gZ%;mBg$@{+7 zG(C=kh!lWGujx9;$xJZ2`$Sifou?6@mYVZCiO7&ee?S#HGS-)uZQJHWy{}yDV{Y8J zpV^Lx1e&UutLk}`8sn|%BB4Zs-V?d|QC?RAWCyY2mrg?4iT-jDJ7-U>-EYx*IEIcN*xY|QcCX~0Eh?xlv14;05kwB%fifp>fE&5ZjCY4S|TDMt+m#gne}Q~$`~_E zlO>CYh*(NdN=ZwomgVzh@ZO71M69i?2IhHo&LMt-X{~=BtkrubB4Z2@e|hhP7659k zDJ7ZFaxSH;ZA28K%-osfLsoeR0AmbUMQdxVwH9M+tx3yTyQAI(002ovPDHLkV1n;g)a?KO diff --git a/data/textures/steel_sheet.png b/data/textures/steel_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..dd349bc33b284a18f3c611871d2926c833e6570f GIT binary patch literal 855 zcmV-d1E~CoP)Px#32;bRa{vGi!~g&e!~vBn4jTXf00(qQO+^Rc1{n-B5po8U5&!@K=}AOER7l5d zR#A4tFbI=?``=&}Z4B%Khft^9me-{=GLpdN-`}5^C9(%iSXF1N3EV+4)7%{Z<=#8M`bmPAQ{VhlxO#K!uh;Ah1d>P)kXI^WcZE^k{*3;t z0zd+=+Eiw4q?E?!XK~%r9wU6i7diXe0wZlQKoSCl&LpNcGSl4)qsNiZG3*IFk%Sac z5fK8<;+{M)TJ{F(P$&%!%*+&0g=Q+EDhi^RDRa4&0S zrVJutKbf7Tn%&Ls@kEYj29Bz%uywDo-GYV&vwil5uG?lg?)<8-r-b|3QeAllom?ID z+1mC6pc0zGe%;=xT~B7(wJpZp>C@4YWT#S)XNhFu-j>Zy`95-IS!5;&QX(=UKA+E8 zYo5uQoQ_r(ub(z2S&OGOU3ox8#C2UYr|5dx$y6d?Kg(+7)I?Q;Ow4{c*>iW>=d5zy zMQ?y9%Tad}GP@fiBG&RQg_>DnhzK^TAejJ&eK$QYdgH39sh;lc$Zbk@zpl@9UGwI$ h?>i#ZKk8}=@E<>=6T=$S;fDYK002ovPDHLkV1g~ii~Rrq literal 0 HcmV?d00001 diff --git a/data/textures/wood_plank.png b/data/textures/wood_plank.png index 2780939d81e25f1d547af925c89bd20102609094..5465e698f6c9b6dfaa609da6c9ae524f93abc189 100644 GIT binary patch delta 324 zcmV-K0lWUu28RQXOn>1984MyLzfwU20003QNkla7w=xJRY*I=PL=aPmy`YGVogn%+YS45Fp1HfRI4=+gxeH{fVcGfipV@z4 znsKqSs*~23Ea}v%>O7%Suj<5rcCDg6zX<@=Or}J#q+P3MV1EVQ4McHp^D2b_0Ikhs zO%xVpJnTQGdH*hj0RTrEOX@tqw}x3?a8_vCzDZ#KKyy8Xl>K~&8FhH}^eJJae1|b# zVL}wc>C1`UT-~gWo!#W?tJM+8D=0008xNkl1wkJLk-qnL9UP zKyV}e0g8$!RBY=HN@!9`1BEVKWTSg&5hN=&g|5VnE>+yArJ!Q9tr8HS7!6umg{VnO zz!ptP?#;b-X6~HNMWA%`?q1&K;gxsaJVlp`rs*&WL8~F;ghb)KTS$EJo@sBltwqWypnhUPa8f zetpAKAQ`+e|Fmq}+$MEXNDzW23!W?s6uDv|)RUULD3Rr*qgcCRPK90`0BAd7;n)GW z{Pk}H5?&#AC4UP_mU&_f#LSVVEpqjfGdOjeKYzu%Q}WDXW{3y}=MTyDoh|a<5d!_H zNAL~_1yz;fLqu*|I*XaI{?|I+U0$^=88c;uQvu+}iI)UdqQQ}i$45`_LfcHSW`ex^ z+5)(UdB;AhZ2E#$axPMJlv$OQe97K?77tYWNEyFgD zG-LC}HNINAW!@`g^!G{@77xp4cT7`H$+JMeD(LkeME?BtEY1nTy%FP4P20Bod*ctj z{P~szFBCD*F9I<*7LFg1-JMHyv{2!_&k}84h+C4o1YNO!g*ZdjmdS-8Ao% zs?6vY0e=zU`GZf2H&32d3*hRQXDYat6^&3gb*RmbMn0rU;K2_V&*90z7G{xTzpyT!8Y>Ixh1-8 z%49sj(J@8o+71OCC=x+Ec{AbCwJp0}Y7CA8&wo8Gvb=N@RmC~Q`~4IQx+$8{y(d2M z#H0MMvS!{XPK8q^=VX2DSLEY!uT%E+5yqniIs+Aa1~Ep8qF`pG#EB!_-s01hHJg9& zfMmH5%NgXe_fL~jM?I-gI=cH1`gy{ur>c6WdR+9xyLTA0p7P;`P)Ym`Em18vl_Rb+ Q01E&B07*qoM6N<$f@(K)rvLx| diff --git a/src/content_craft.cpp b/src/content_craft.cpp index e81a420..2cec7de 100644 --- a/src/content_craft.cpp +++ b/src/content_craft.cpp @@ -463,6 +463,8 @@ void setSignRecipe(u16 input, u16 result) setRecipe(r,result,1); r[7] = CONTENT_CRAFTITEM_JUNGLE_PLANK; setRecipe(r,result,1); + r[7] = CONTENT_CRAFTITEM_APPLE_PLANK; + setRecipe(r,result,1); } // shears recipe, input is blade yields one result void setShearsRecipe(u16 input, u16 result) @@ -495,6 +497,12 @@ void setShovelRecipe(u16 input, u16 result) CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE }; setRecipe(r2,result,0); + u16 r3[9] = { + CONTENT_IGNORE, input, CONTENT_IGNORE, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE + }; + setRecipe(r3,result,0); } // spear recipe, input is blade yields one result void setSpearRecipe(u16 input, u16 result) @@ -545,6 +553,18 @@ void setAxeRecipe(u16 input, u16 result) CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE }; setRecipe(r5,result,0); + u16 r6[9] = { + input, input, CONTENT_IGNORE, + input, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE + }; + setRecipe(r6,result,0); + u16 r7[9] = { + CONTENT_IGNORE, input, input, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, input, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE + }; + setRecipe(r7,result,0); } // pick recipe, input is blade yields one result void setPickRecipe(u16 input, u16 result) @@ -567,6 +587,12 @@ void setPickRecipe(u16 input, u16 result) CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE }; setRecipe(r2,result,0); + u16 r3[9] = { + input, input, input, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE + }; + setRecipe(r3,result,0); } // sword recipe, input is blade yields one result void setSwordRecipe(u16 input, u16 result) @@ -589,6 +615,12 @@ void setSwordRecipe(u16 input, u16 result) CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE }; setRecipe(r2,result,0); + u16 r3[9] = { + CONTENT_IGNORE, input, CONTENT_IGNORE, + CONTENT_IGNORE, input, CONTENT_IGNORE, + CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE + }; + setRecipe(r3,result,0); } // gate recipe 1 2 1 in two rows yields one result void setGateRecipe(u16 input1, u16 input2, u16 result) diff --git a/src/content_craftitem.cpp b/src/content_craftitem.cpp index a5ee47f..a7a0c34 100644 --- a/src/content_craftitem.cpp +++ b/src/content_craftitem.cpp @@ -88,6 +88,16 @@ void content_craftitem_init() content_list_add("craftguide",i,1,0); content_list_add("creative",i,1,0); + i = CONTENT_CRAFTITEM_PADLOCK; + f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)]; + f->content = CONTENT_CRAFTITEM_PADLOCK; + f->texture = "padlock.png"; + f->name = "padlock"; + f->description = gettext("Padlock"); + crafting::set1over1Recipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_CRAFTITEM_COPPER_INGOT,CONTENT_CRAFTITEM_PADLOCK); + content_list_add("craftguide",i,1,0); + content_list_add("creative",i,1,0); + i = CONTENT_CRAFTITEM_CHARCOAL; f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)]; f->content = CONTENT_CRAFTITEM_CHARCOAL; @@ -430,6 +440,7 @@ void content_craftitem_init() crafting::set1To2Recipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_CRAFTITEM_STICK); + crafting::set1To2Recipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_LEAVES,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_APPLE_LEAVES,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_JUNGLELEAVES,CONTENT_CRAFTITEM_STICK); @@ -449,6 +460,18 @@ void content_craftitem_init() content_list_add("craftguide",i,1,0); content_list_add("creative",i,1,0); + i = CONTENT_CRAFTITEM_APPLE_PLANK; + f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)]; + f->content = CONTENT_CRAFTITEM_APPLE_PLANK; + f->texture = "applewood_plank.png"; + f->name = "applewood_plank"; + f->description = gettext("Apple Wood Plank"); + f->fuel_time = 30/16; + crafting::set1To4Recipe(CONTENT_APPLEWOOD,CONTENT_CRAFTITEM_APPLE_PLANK); + crafting::set1To2Recipe(CONTENT_YOUNG_APPLE_TREE,CONTENT_CRAFTITEM_APPLE_PLANK); + content_list_add("craftguide",i,1,0); + content_list_add("creative",i,1,0); + i = CONTENT_CRAFTITEM_WOOD_PLANK; f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)]; f->content = CONTENT_CRAFTITEM_WOOD_PLANK; diff --git a/src/content_craftitem.h b/src/content_craftitem.h index 2562551..e1b3618 100644 --- a/src/content_craftitem.h +++ b/src/content_craftitem.h @@ -82,6 +82,7 @@ void content_craftitem_init(); CraftItemFeatures *content_craftitem_features(content_t i); #define CONTENT_CRAFTITEM_PAPER (CONTENT_CRAFTITEM_MASK | 0x01) +#define CONTENT_CRAFTITEM_PADLOCK (CONTENT_CRAFTITEM_MASK | 0x02) #define CONTENT_CRAFTITEM_CHARCOAL (CONTENT_CRAFTITEM_MASK | 0x03) #define CONTENT_CRAFTITEM_COAL (CONTENT_CRAFTITEM_MASK | 0x04) #define CONTENT_CRAFTITEM_IRON (CONTENT_CRAFTITEM_MASK | 0x05) @@ -100,6 +101,7 @@ CraftItemFeatures *content_craftitem_features(content_t i); #define CONTENT_CRAFTITEM_CLAY_BRICK (CONTENT_CRAFTITEM_MASK | 0x12) #define CONTENT_CRAFTITEM_RAT (CONTENT_CRAFTITEM_MASK | 0x13) #define CONTENT_CRAFTITEM_COOKED_RAT (CONTENT_CRAFTITEM_MASK | 0x14) +#define CONTENT_CRAFTITEM_APPLE_PLANK (CONTENT_CRAFTITEM_MASK | 0x15) #define CONTENT_CRAFTITEM_FIREFLY (CONTENT_CRAFTITEM_MASK | 0x16) #define CONTENT_CRAFTITEM_APPLE (CONTENT_CRAFTITEM_MASK | 0x17) #define CONTENT_CRAFTITEM_APPLE_IRON (CONTENT_CRAFTITEM_MASK | 0x18) diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 0db76ed..9da12a4 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -2918,7 +2918,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_SQUARE; f = &content_features(i); f->description = gettext("Pine Wood Column"); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; @@ -2927,7 +2927,7 @@ void content_mapnode_init(bool repeat) f->light_propagates = true; f->sunlight_propagates = true; content_nodebox_column_square(f); - f->setInventoryTextureNodeBox(i,"pine.jpg","pine.jpg","pine.jpg"); + f->setInventoryTextureNodeBox(i,"pine.png","pine.png","pine.png"); f->type = CMT_WOOD; f->dig_time = 0.5; f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE; @@ -2943,7 +2943,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE; f = &content_features(i); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; @@ -2960,7 +2960,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_SQUARE_TOP; f = &content_features(i); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; @@ -3371,7 +3371,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_CROSS; f = &content_features(i); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; @@ -3389,7 +3389,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_CROSS_BASE; f = &content_features(i); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; @@ -3406,7 +3406,7 @@ void content_mapnode_init(bool repeat) i = CONTENT_WOOD_PINE_COLUMN_CROSS_TOP; f = &content_features(i); - f->setAllTextures("pine.jpg"); + f->setAllTextures("pine.png"); f->param_type = CPT_LIGHT; f->draw_type = CDT_NODEBOX; f->is_ground_content = true; diff --git a/src/content_mapnode_door.cpp b/src/content_mapnode_door.cpp index 3e6687e..6450058 100644 --- a/src/content_mapnode_door.cpp +++ b/src/content_mapnode_door.cpp @@ -1316,7 +1316,7 @@ void content_mapnode_door(bool repeat) f = &content_features(i); f->param2_type = CPT_FACEDIR_SIMPLE; f->description = gettext("Steel Gate"); - f->setAllTextures("gate_steel.png"); + f->setAllTextures("steel_sheet.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_steel_inv.png"); f->wield_nodebox = false; @@ -1482,7 +1482,7 @@ void content_mapnode_door(bool repeat) f = &content_features(i); f->param2_type = CPT_FACEDIR_SIMPLE; f->description = gettext("Steel Gate"); - f->setAllTextures("steel.png"); + f->setAllTextures("steel_sheet.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_steel_inv.png"); f->wield_nodebox = false; diff --git a/src/content_mapnode_sign.cpp b/src/content_mapnode_sign.cpp index 44d46dd..8b8f0cc 100644 --- a/src/content_mapnode_sign.cpp +++ b/src/content_mapnode_sign.cpp @@ -136,8 +136,7 @@ void content_mapnode_sign(bool repeat) content_nodebox_sign(f); f->setFaceText(5,FaceText(0.05,0.0675,0.95,0.55)); f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png"); -/* TODO: apple planks - crafting::setSignRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_SIGN);*/ + crafting::setSignRecipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_SIGN_APPLE); content_list_add("craftguide",i,1,0); content_list_add("creative",i,1,0); @@ -347,7 +346,7 @@ void content_mapnode_sign(bool repeat) i = CONTENT_SIGN_STEEL; f = &content_features(i); f->description = gettext("Sign"); - f->setAllTextures("steel_block.png"); + f->setAllTextures("steel_sheet.png"); f->param_type = CPT_LIGHT; f->light_propagates = true; f->sunlight_propagates = true; @@ -367,7 +366,7 @@ void content_mapnode_sign(bool repeat) f->suffocation_per_second = 0; content_nodebox_sign(f); f->setFaceText(5,FaceText(0.05,0.0675,0.95,0.55)); - f->setInventoryTextureNodeBox(i,"steel_block.png", "steel_block.png", "steel_block.png"); + f->setInventoryTextureNodeBox(i,"steel_sheet.png", "steel_sheet.png", "steel_sheet.png"); crafting::setSignRecipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_SIGN_STEEL); content_list_add("craftguide",i,1,0); content_list_add("creative",i,1,0); @@ -375,7 +374,7 @@ void content_mapnode_sign(bool repeat) i = CONTENT_SIGN_WALL_STEEL; f = &content_features(i); f->description = gettext("Sign"); - f->setAllTextures("steel_block.png"); + f->setAllTextures("steel_sheet.png"); f->param_type = CPT_LIGHT; f->param2_type = CPT_FACEDIR_WALLMOUNT; f->draw_type = CDT_NODEBOX; @@ -400,7 +399,7 @@ void content_mapnode_sign(bool repeat) i = CONTENT_SIGN_UD_STEEL; f = &content_features(i); f->description = gettext("Sign"); - f->setAllTextures("steel_block.png"); + f->setAllTextures("steel_sheet.png"); f->param_type = CPT_LIGHT; f->light_propagates = true; f->sunlight_propagates = true; diff --git a/src/content_mapnode_special.cpp b/src/content_mapnode_special.cpp index b343ced..7399055 100644 --- a/src/content_mapnode_special.cpp +++ b/src/content_mapnode_special.cpp @@ -139,7 +139,7 @@ void content_mapnode_special(bool repeat) i = CONTENT_APPLE_FENCE; f = &content_features(i); - f->description = gettext("Fence"); + f->description = gettext("Apple Wood Fence"); f->setAllTextures("applewood.png"); f->light_propagates = true; f->param_type = CPT_LIGHT; @@ -159,8 +159,7 @@ void content_mapnode_special(bool repeat) content_nodebox_fence_inv(f); content_nodebox_fence(f); f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png"); -/* TODO: apple planks - crafting::setWallRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_FENCE);*/ + crafting::setWallRecipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_APPLE_FENCE); content_list_add("craftguide",i,1,0); content_list_add("creative",i,1,0); diff --git a/src/nodemeta/content_nodemeta_storage.cpp b/src/nodemeta/content_nodemeta_storage.cpp index d92d7b1..8aec8eb 100644 --- a/src/nodemeta/content_nodemeta_storage.cpp +++ b/src/nodemeta/content_nodemeta_storage.cpp @@ -179,7 +179,7 @@ void ChestNodeMetadata::inventoryModified() b[0] = 1; m_is_expanded = true; m_expanded_slot_id = i; - }else if (itm->getContent() == CONTENT_TOOLITEM_KEY) { + }else if (itm->getContent() == CONTENT_CRAFTITEM_PADLOCK) { if (m_is_exo) continue; a[2] = 0; @@ -250,7 +250,7 @@ void ChestNodeMetadata::inventoryModified() if (a[0]) l->addAllowed(CONTENT_CHEST); if (a[1]) - l->addAllowed(CONTENT_TOOLITEM_KEY); + l->addAllowed(CONTENT_CRAFTITEM_PADLOCK); if (a[2]) l->addAllowed(CONTENT_CRAFTITEM_OERKKI_DUST); }