From ef521bc2c25b73ed711694856722e752ef5449f2 Mon Sep 17 00:00:00 2001 From: Martin Doege Date: Tue, 14 Apr 2015 08:50:02 +0200 Subject: [PATCH] add leather and feathers --- mods/default/crafting.lua | 5 +- mods/fake_fire/init.lua | 2 +- mods/fake_fire/textures/flint.png | Bin 1309 -> 253 bytes mods/fake_fire/textures/flint_and_steel.png | Bin 1427 -> 295 bytes mods/mobs/init.lua | 32 +++++++++--- mods/mobs/textures/mobs_feather.png | Bin 0 -> 255 bytes mods/throwing/arrow.lua | 8 +-- mods/throwing/init.lua | 54 ++------------------ mods/throwing/textures/arrow.png | Bin 0 -> 259 bytes mods/throwing/textures/bow_standby.png | Bin 0 -> 305 bytes 10 files changed, 38 insertions(+), 63 deletions(-) create mode 100644 mods/mobs/textures/mobs_feather.png create mode 100644 mods/throwing/textures/arrow.png create mode 100644 mods/throwing/textures/bow_standby.png diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 6dae1ed..dc79217 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -541,9 +541,8 @@ minetest.register_craft({ minetest.register_craft({ output = 'default:book', recipe = { - {'default:paper'}, - {'default:paper'}, - {'default:paper'}, + {'default:paper','default:paper'}, + {'default:paper','mobs:leather'}, } }) diff --git a/mods/fake_fire/init.lua b/mods/fake_fire/init.lua index e29c98c..4fafb35 100644 --- a/mods/fake_fire/init.lua +++ b/mods/fake_fire/init.lua @@ -96,7 +96,7 @@ end, }) minetest.register_craftitem("fake_fire:flint", { - description = "flint", + description = "Flint", inventory_image = "flint.png", stack_max = 99, liquids_pointable = false, diff --git a/mods/fake_fire/textures/flint.png b/mods/fake_fire/textures/flint.png index f53881d5e6bc7e9b30390ba8da29de2d40b72552..0cf7b191b055088758166442e7ab2f3dca6199c8 100644 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBc3jfAr-gYUU%ebQxIrNEWdZa zc*l3WxZ}=M3pktW7F|g@=HEPDY%}-0c7?e-f-}vJ*EH;BsCfT!#?uC&vzEaeiSpUH zy38^k!x^4ec)esVIM*pK;YW~zZXK%!kRjxtFPFTBaR-M-jaGwjKBEOkh78w*BiRk= zEGFwJxj*a>xyaIUq@D3a1^-75hohklH$Q4Eu&KCLV6nK@+}>H!shX{XUx_8@hn|Gv zfpy8eO#1{q1ujnu;&YM`U!S6SVfOp`0mjlVz5njjDV$;t^bdoltDnm{r-UW|c$r<} literal 1309 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3-o*<7!?2DVB6cUq=Rpjs4tz5?L7-m>B|m zLR^93?Ck7fVqzK^8pg)PVPRqQ_4Su8Uj~Ygg3%Bd_91X&*_9Lq21bUGAiv=MBO5RT ze`i+(MmT4IM`SSr1Gf+eGhVt|_XjA*UgGKN%6^AMfStp*?t7I1P)M@GHKN2hKQ}iu zuY|$5C^fMpHASI3vm`^o-P1Q9ypc~Fs7MN=C^$c@q&%@Gl_4N8Gp|I?&oxA$%vjG< z&(Of&OVL80Do;-r#}J8d*K>h<2Mjov0yeJO{l8N-VfM%5ID?BB>4|AQ_iW8p#%|NF zooZycYRcoTC67y%S_ytwrfjyt^kI>C-A{qM@_P-7&F!Mr*y~o$oBRW4D1)b~pUXO@ GgeCw91zmvv diff --git a/mods/fake_fire/textures/flint_and_steel.png b/mods/fake_fire/textures/flint_and_steel.png index 1fc4f9210d32d3262b0ca113de955b41e6b7d73b..4b2a6a184d18bb5a2b0af1da3aabc0fc7332d9cb 100644 GIT binary patch delta 279 zcmV+y0qFjd3#S5*8Gi-<0047(dh`GQ0PaadK~#9!?bopl!yphqQFnBd%s}rUJQka< z2XipcMOU0e2!=Bp*p^aUgQEPW7-MGxfbGuN9uGK<1JYRv&{{(X;cIYh2>?Uh`yYTb zq8fh`fc5~bOYMi^ro$kG@)#ke0|-(2xp8d?pmwdL_CYsb+J7ee16~8*;Hh#JO$*4AwW-j3gAjy3_yt5Ob6iLmvIsJS+PyXMNqWsB!lvNA9*GX(gA zxB|u5+1bU!#56QCjE#*=O-)@~T*AV_GBPrXii+y%>zkUIrcIl+V#SKfmoMMAapV90 z|3EFHU^E1VM+nS$E*j0iz{pS%<>&kwIMSz`0t=uj8K2S)q#5JPCIX^cyHLrxhxhOTUBsE2$JhLQ2!QIn0AiR-J z9H>YNq$oH)t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psM|zE{-7<{#z#=6lzxB zadDj>cI4Fm|2k*e5?mjD3D|A^Y_Ez#+b7k-y-lWBn{!)gU9V;^eSBf!%<`dKT68hj z)ZKxG5dwaPZZ=%7h?>L0(e}HzWTC{PZO=;1R(Tem?6$cab7i`k$l*Y{-{*4k-q!Zc z;a7H;rn+9Fu&l{p*&NnbyC#3lV5wTA%Ui^Y{G1L76^Voynav2|*xRtuut-&5-4)KG zzbpF;6@*=@m$h$bF8EcyVBXqIe{aW^U3~xNyI{VV@_)zcr?@?UUSaTb^>bP0l+XkK D(PX3^ diff --git a/mods/mobs/init.lua b/mods/mobs/init.lua index 7216555..7da934d 100644 --- a/mods/mobs/init.lua +++ b/mods/mobs/init.lua @@ -182,8 +182,8 @@ mobs:register_mob("mobs:sheep", { drops = { {name = "mobs:mutton_raw", chance = 1, - min = 2, - max = 3,}, + min = 1, + max = 2,}, {name = "wool:white", chance = 1, min = 1, @@ -268,7 +268,7 @@ mobs:register_mob("mobs:pig", { drops = { {name = "mobs:porkchop_raw", chance = 1, - min = 2, + min = 1, max = 3,}, }, drawtype = "front", @@ -314,8 +314,12 @@ mobs:register_mob("mobs:cow", { drops = { {name = "mobs:beef_raw", chance = 1, - min = 3, - max = 5,}, + min = 1, + max = 3,}, + {name = "mobs:leather", + chance = 1, + min = 0, + max = 2,}, }, drawtype = "front", water_damage = 1, @@ -377,6 +381,10 @@ mobs:register_mob("mobs:chicken", { chance = 1, min = 1, max = 1,}, + {name = "mobs:feather", + chance = 1, + min = 0, + max = 2,}, }, drawtype = "front", water_damage = 1, @@ -490,7 +498,7 @@ mobs:register_mob("mobs:skeleton", { chance = 1, min = 0, max = 2,}, - {name = "throwing:bow_steel", + {name = "throwing:bow_wood", chance = 3, min = 1, max = 1,}, @@ -713,6 +721,18 @@ minetest.register_craft({ cooktime = 5, }) +-- leather, feathers, etc. + +minetest.register_craftitem("mobs:leather", { + description = "Leather", + inventory_image = "mobs_leather.png", +}) + +minetest.register_craftitem("mobs:feather", { + description = "Feather", + inventory_image = "mobs_feather.png", +}) + mobs:register_mob("mobs:rat", { type = "animal", hp_max = 1, diff --git a/mods/mobs/textures/mobs_feather.png b/mods/mobs/textures/mobs_feather.png new file mode 100644 index 0000000000000000000000000000000000000000..5fc423db23f1bb8a177a2a7d83f4455e6522c0ca GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJW1cRKAr-gYPCw0iRDp-(u88eL zuCIX?>;yF@$}1hKspXhh^I+1%U)h-e<0xR&+P) zDn5HRUo_*@pSbKxt645}f8tc^*u9{&{B9FV`MFa0U5bos%kMc~*PU>1<@V2MjVyWx zGE;7cGRed=T;|!Kq0k`T82IDD^#Zm(eelF{r5}E*T CPh}zi literal 0 HcmV?d00001 diff --git a/mods/throwing/arrow.lua b/mods/throwing/arrow.lua index 1b922d6..0b7dcf5 100644 --- a/mods/throwing/arrow.lua +++ b/mods/throwing/arrow.lua @@ -1,6 +1,6 @@ minetest.register_craftitem("throwing:arrow", { description = "Arrow", - inventory_image = "throwing_arrow.png", + inventory_image = "arrow.png", }) minetest.register_node("throwing:arrow_box", { @@ -79,8 +79,10 @@ end minetest.register_entity("throwing:arrow_entity", THROWING_ARROW_ENTITY) minetest.register_craft({ - output = 'throwing:arrow 16', + output = 'throwing:arrow 4', recipe = { - {'default:stick', 'default:stick', 'default:steel_ingot'}, + {'fake_fire:flint'}, + {'default:stick'}, + {'mobs:feather'}, } }) diff --git a/mods/throwing/init.lua b/mods/throwing/init.lua index f0156f1..c0724f3 100644 --- a/mods/throwing/init.lua +++ b/mods/throwing/init.lua @@ -31,7 +31,7 @@ end minetest.register_tool("throwing:bow_wood", { description = "Wood Bow", - inventory_image = "throwing_bow_wood.png", + inventory_image = "bow_standby.png", stack_max = 1, on_use = function(itemstack, user, pointed_thing) if throwing_shoot_arrow(itemstack, user, pointed_thing) then @@ -46,55 +46,9 @@ minetest.register_tool("throwing:bow_wood", { minetest.register_craft({ output = 'throwing:bow_wood', recipe = { - {'farming:string', 'default:wood', ''}, - {'farming:string', '', 'default:wood'}, - {'farming:string', 'default:wood', ''}, - } -}) - -minetest.register_tool("throwing:bow_stone", { - description = "Stone Bow", - inventory_image = "throwing_bow_stone.png", - stack_max = 1, - on_use = function(itemstack, user, pointed_thing) - if throwing_shoot_arrow(item, user, pointed_thing) then - if not minetest.setting_getbool("creative_mode") then - itemstack:add_wear(65535/100) - end - end - return itemstack - end, -}) - -minetest.register_craft({ - output = 'throwing:bow_stone', - recipe = { - {'farming:string', 'default:cobble', ''}, - {'farming:string', '', 'default:cobble'}, - {'farming:string', 'default:cobble', ''}, - } -}) - -minetest.register_tool("throwing:bow_steel", { - description = "Steel Bow", - inventory_image = "throwing_bow_steel.png", - stack_max = 1, - on_use = function(itemstack, user, pointed_thing) - if throwing_shoot_arrow(item, user, pointed_thing) then - if not minetest.setting_getbool("creative_mode") then - itemstack:add_wear(65535/200) - end - end - return itemstack - end, -}) - -minetest.register_craft({ - output = 'throwing:bow_steel', - recipe = { - {'farming:string', 'default:steel_ingot', ''}, - {'farming:string', '', 'default:steel_ingot'}, - {'farming:string', 'default:steel_ingot', ''}, + {'farming:cotton', 'default:stick', ''}, + {'farming:cotton', '', 'default:stick'}, + {'farming:cotton', 'default:stick', ''}, } }) diff --git a/mods/throwing/textures/arrow.png b/mods/throwing/textures/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..8d3cb745d889861dacbcd13a79a95be337872173 GIT binary patch literal 259 zcmV+e0sQ`nP)fBU<4ly7{!MIH1O^KExap06K@XC#+w3W;6DRWN`e(a zn1UY$lsN9zTA_WE);KkQiSGsgW8q&%0F;3r9zq6w{Tu#8zz0kwx$52UUqAo=002ov JPDHLkV1k@fXWsw- literal 0 HcmV?d00001 diff --git a/mods/throwing/textures/bow_standby.png b/mods/throwing/textures/bow_standby.png new file mode 100644 index 0000000000000000000000000000000000000000..c69fe230ad7e72492b5ed74565d2903a92b17a7a GIT binary patch literal 305 zcmV-10nYx3P)M{!-oP8k1^&53C!W*0E*+J&ys67Toho5cLS_(Q9wFtdiI()8$e$y7@>`K z1L*JD0&fP;H=H!!7hDuziFX4etDnKE0rcUs#@T@0_G{qHfZq9Q;fH|L_;7$WUJYoS zzXje5ScQuMEb-OZGDz%(50nd7fE00000NkvXXu0mjf D+t!8} literal 0 HcmV?d00001