From eaedd74fb13a560f16769360fe9163ccdf32b255 Mon Sep 17 00:00:00 2001 From: NathanSalapat Date: Wed, 18 Mar 2015 19:43:54 -0500 Subject: [PATCH] More machetes and bugs. --- crafting.lua | 60 +++++++++++++++++++++++ drinking.lua | 33 ++++++------- foods.lua | 65 +++++++++++++++++++++++++ init.lua | 3 +- nodes.lua | 38 +++++++++++++++ textures/survival_centipede_cooked.png | Bin 0 -> 234 bytes textures/survival_centipede_raw.png | Bin 0 -> 231 bytes textures/survival_cricket_cooked.png | Bin 0 -> 268 bytes textures/survival_cricket_raw.png | Bin 0 -> 269 bytes textures/survival_energy_bar.png | Bin 0 -> 399 bytes textures/survival_machete_gold.png | Bin 240 -> 0 bytes textures/survival_machete_mese.png | Bin 0 -> 268 bytes textures/survival_machete_silver.png | Bin 289 -> 0 bytes textures/survival_milipede_cooked.png | Bin 0 -> 286 bytes textures/survival_milipede_raw.png | Bin 0 -> 285 bytes textures/survival_slug_cooked.png | Bin 0 -> 293 bytes textures/survival_slug_raw.png | Bin 0 -> 301 bytes textures/survival_worm_cooked.png | Bin 0 -> 299 bytes textures/survival_worm_raw.png | Bin 0 -> 300 bytes tools.lua | 34 ++++++++++++- 20 files changed, 212 insertions(+), 21 deletions(-) create mode 100644 foods.lua create mode 100644 textures/survival_centipede_cooked.png create mode 100644 textures/survival_centipede_raw.png create mode 100644 textures/survival_cricket_cooked.png create mode 100644 textures/survival_cricket_raw.png create mode 100644 textures/survival_energy_bar.png delete mode 100644 textures/survival_machete_gold.png create mode 100644 textures/survival_machete_mese.png delete mode 100644 textures/survival_machete_silver.png create mode 100644 textures/survival_milipede_cooked.png create mode 100644 textures/survival_milipede_raw.png create mode 100644 textures/survival_slug_cooked.png create mode 100644 textures/survival_slug_raw.png create mode 100644 textures/survival_worm_cooked.png create mode 100644 textures/survival_worm_raw.png diff --git a/crafting.lua b/crafting.lua index 27210b7..86fb3fc 100644 --- a/crafting.lua +++ b/crafting.lua @@ -42,3 +42,63 @@ minetest.register_craft({ {'group:stick', '', ''}, } }) + +minetest.register_craft({ + output = 'survival:machete_diamond 1', + recipe = { + {'', '', 'default:diamond'}, + {'', 'default:diamond', ''}, + {'group:stick', '', ''}, + } +}) + +minetest.register_craft({ + output = 'survival:machete_mese 1', + recipe = { + {'', '', 'default:mese_crystal'}, + {'', 'default:mese_crystal', ''}, + {'group:stick', '', ''}, + } +}) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:slug_cooked', + recipe = 'survival:slug_raw', + cooktime = 1, + }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:cricket_cooked', + recipe = 'survival:cricket_raw', + cooktime = 1, + }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:worm_cooked', + recipe = 'survival:worm_raw', + cooktime = 1, + }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:centipede_cooked', + recipe = 'survival:centipede_raw', + cooktime = 1, + }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:milipede_cooked', + recipe = 'survival:milipede_raw', + cooktime = 1, + }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:canteen_water_clean', + recipe = 'survival:canteen_water_dirty', + cooktime = 30, --boiling the water should take a long time. +}) diff --git a/drinking.lua b/drinking.lua index 56cfe9d..2062db2 100644 --- a/drinking.lua +++ b/drinking.lua @@ -2,17 +2,18 @@ -- drinking enabled you can just modify the init.lua file and remove the line that loads -- this file. ---minetest.register_craftitem('survival:canteen_empty', { --- description = 'empty canteen', --- inventory_image = 'survival_canteen_empty.png', --- stack_max = 1, --- liquids_pointable = true, --- on_use = function(itemstack, user, pointed_thing) --- if pointed_thing.type ~= 'node' then --- return --- end - ---}) +minetest.register_craftitem('survival:canteen_empty', { + description = 'empty canteen', + inventory_image = 'survival_canteen_empty.png', + stack_max = 1, + liquids_pointable = true, + on_use = function(itemstack, user, pointed_thing) + if string.find(minetest.get_node(pointed_thing.under).name, 'default:water_source') + then + local giving_back = 'survival:canteen_water_dirty', + else -- Do nothing + end, +}) --minetest.register_craft({ -- output = 'survival:canteen_empty 1', @@ -25,19 +26,13 @@ minetest.register_craftitem('survival:canteen_water_clean', { description = 'clean drinking water', inventory_image = 'survival_canteen_water_clean.png', stack_max = 1, - on_use = minetest.item_eat(1, 'survival:canteen_empty'), + on_use = minetest.item_eat(1, 'default:wood'), }) minetest.register_craftitem('survival:canteen_water_dirty', { description = 'dirty water', inventory_image = 'survival_canteen_water_dirty.png', stack_max = 1, - on_use = minetest.item_eat (math.random(-5,1) 'survival:canteen_empty'), -}) + on_use = minetest.item_eat((math.random(-2, 1)), 'default:wood'), -minetest.register_craft({ - type = 'cooking', - output = 'survival:canteen_water_clean', - recipe = 'survival:canteen_water_dirty', - cooktime = 30, --boiling the water should take a long time. }) diff --git a/foods.lua b/foods.lua new file mode 100644 index 0000000..13aba9e --- /dev/null +++ b/foods.lua @@ -0,0 +1,65 @@ +minetest.register_craftitem('survival:energy_bar', { + description = 'energy_bar', + inventory_image = 'survival_energy_bar.png', + on_use = minetest.item_eat(10) -- Should also make you thirsty. +}) + +minetest.register_craftitem('survival:slug_raw', { + description = 'slug', + inventory_image = 'survival_slug_raw.png', + on_use = minetest.item_eat(-4) +}) + +minetest.register_craftitem('survival:slug_cooked', { + description = 'cooked slug', + inventory_image = 'survival_slug_cooked.png', + on_use = minetest.item_eat(.25) +}) + +minetest.register_craftitem('survival:cricket_raw', { + description = 'cricket', + inventory_image = 'survival_cricket_raw.png', + on_use = minetest.item_eat(.25) +}) + +minetest.register_craftitem('survival:cricket_cooked', { + description = 'cooked cricket', + inventory_image = 'survival_cricket_cooked.png', + on_use = minetest.item_eat(.125) +}) + +minetest.register_craftitem('survival:worm_raw', { + description = 'worm', + inventory_image = 'survival_worm_raw.png', + on_use = minetest.item_eat(.25) +}) + +minetest.register_craftitem('survival:worm_cooked', { + description = 'cooked worm', + inventory_image = 'survival_worm_cooked.png', + on_use = minetest.item_eat(.125) +}) + +minetest.register_craftitem('survival:centipede_raw', { + description = 'centipede', + inventory_image = 'survival_centipede_raw.png', + on_use = minetest.item_eat(.25) +}) + +minetest.register_craftitem('survival:centipede_cooked', { + description = 'cooked centipede', + inventory_image = 'survival_centipede_cooked.png', + on_use = minetest.item_eat(.25) +}) + +minetest.register_craftitem('survival:milipede_raw', { + description = 'milipede', + inventory_image = 'survival_milipede_raw.png', + on_use = minetest.item_eat(-4) +}) + +minetest.register_craftitem('survival:milipede_cooked', { + description = 'cooked milipede', + inventory_image = 'survival_milipede_cooked.png', + on_use = minetest.item_eat(-3) +}) diff --git a/init.lua b/init.lua index 810ef1d..3bc97c3 100644 --- a/init.lua +++ b/init.lua @@ -2,4 +2,5 @@ dofile(minetest.get_modpath('survival')..'/crafting.lua') dofile(minetest.get_modpath('survival')..'/nodes.lua') dofile(minetest.get_modpath('survival')..'/tools.lua') ---dofile(minetest.get_modpath('survival')..'/drinking.lua') working on this yet. +--dofile(minetest.get_modpath('survival')..'/drinking.lua')-- working on this yet. +dofile(minetest.get_modpath('survival')..'/foods.lua') diff --git a/nodes.lua b/nodes.lua index e81aaaa..aaef63d 100644 --- a/nodes.lua +++ b/nodes.lua @@ -42,3 +42,41 @@ minetest.register_node('survival:barrel', { " takes stuff from barrel at "..minetest.pos_to_string(pos)) end, }) + +minetest.register_node(":default:dirt_with_grass", { + description = "Dirt with Grass", + tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, + is_ground_content = true, + groups = {crumbly=3,soil=1}, + drop = { + max_items = 2, + items = { + { + items = {'survival:slug_raw'}, + rarity = 30, + }, + { + items = {'survival:cricket_raw'}, + rarity = 30, + }, + { + items = {'survival:worm_raw'}, + rarity = 30, + }, + { + items = {'survival:centipede_raw'}, + rarity = 30, + }, + { + items = {'survival:milipede_raw'}, + rarity = 30, + }, + { + items = {'default:dirt'}, + }, + }, + }, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.25}, + }), +}) diff --git a/textures/survival_centipede_cooked.png b/textures/survival_centipede_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..cffa4db4fc428e19da899a437e2d23a0caa086dd GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEzopr0La`&5dZ)H literal 0 HcmV?d00001 diff --git a/textures/survival_centipede_raw.png b/textures/survival_centipede_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..488ca02f9b2c217614f3f22e330267c527da7570 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n)@Fez)tdj+9fGe5xTSEiv9YzC%Pp6bl#ux6 z{Pe@cg1;{w)Hg3WQ(yCC<=Qp>{c}_Qoc>E9V}an`*z?$usFygreG(4c~5sx@KKy z&Ys+-In}63Hc4q_E`y$>v*I%511oL%<7&Q1bKmhkC8KM4>tHLh6VQGJPgg&ebxsLQ E02@D8H2?qr literal 0 HcmV?d00001 diff --git a/textures/survival_cricket_raw.png b/textures/survival_cricket_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..f083be50139e9ef169f9b8b7d3412630a9798753 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|nR*^;q<%9p5qd(UtnQRug@W=juhro0jWo94{ z-gGkH@_*-_KlU(`a|&#5+H}i0paU2@UHx3vIVCg! E0K8RHmH+?% literal 0 HcmV?d00001 diff --git a/textures/survival_energy_bar.png b/textures/survival_energy_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..ca100d64e5f1715ca85249bd0c652527521f387d GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~D|W(-1e{WI%;BAf*t zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{XVmhs3zm?1^N|0A;}Wgh!W@g+}zZ>5(ej@)Wnk1 z6ovB4k_-iRPv3y>Mm}+%qVJwAjv*GOlmGnxZ_ljS(AntZFon@>>gEEg$rpDgJ^R1b z{oG^I1GkS&Q2blXfB5qE{ST5ZHRbT^6V5Z-WB>vuq=ZV20>veaZp}A7vtmlhjrzyN z&5POe4?knt`d_8>V2_t48wj}b#_d>G!2Iv~6Qe)xPaa)a`M>wP#<}!_goG0r^?gzu zJ*tyCjo!Tc9nS-@z*tMwv)^rocLHNq62qCWW0Ou6TwlOE9C0)-??Tq8=H^K)}k^GX<;i&7IyQd1Pl zGfOfQ+&z5*!W;R-fr=tLT^vI!PQSgdk+;Es$K_(am}AaiF3SPZ!4!i_=FhoaSv%5Ma3wnWS9utk-A_vtNkXTno9LWBiBM zgyssX?77K%Kwgp8)0sgcs(|Bk;q8sU4{Mm;HI9hFDD(=RQ-DEQnS8%x!z9`ZG&BYe2&vI(wtI%)>dG?+ATK*#3a4jMMEyh(U8Z6aO9Y z94CDq28ExOS9z^V&}@CaJMMJhlwhy<&b4n3Og7@Ke0gZ=skN~khwk%)1%$@d%cTjd aH20sh>DA)9>)rz$#o+1c=d#Wzp$P!@zF)Ec diff --git a/textures/survival_milipede_cooked.png b/textures/survival_milipede_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..2e30ae5a3ee2641a3b606d4172024f3d752233b5 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4n%iVQN-V~UM{BAf*t zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{XVmhxTVf^%dH@Fk|nMYCC>S|xv6<249-QVi6yBi z3gww484B*6z5(HleBwYwZJsWUAr_~T6BY;<7#SEC%=rBAPx#YE2|ND2WoOp=^<=qz z&kddgrEAM1I4AxWvAjB`|M`APdH&S4gkn}+I@!lsv#`h8IMiuI zXJccd=_p{Bm^0q+r2{d)$JQWy+3Hs&#MuM4pM`I4L2q~@RT1tA6o<*k7U TD(S~S9%k@#^>bP0l+XkKhf!WP literal 0 HcmV?d00001 diff --git a/textures/survival_milipede_raw.png b/textures/survival_milipede_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..bfed1c36c29844fd690436835455e448545790b8 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4n%iVQN-V~UM{BAf*t zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{XVmhxFuJriNSfGkYtH#M2T~LZfQLCqmV~EA+Er|nR%hWq#}BIU&FFGAIhf&=WO8-ahCk^E2?;j} zfAYt?`QqIX$HUBIs;KtbV{?LO&he-A1!sAHK<7q|6I=K^r<_*Fjy00+nxe#~{eQu= zvGJL0y+O>GLkA8V`0)C?J)3Ev8k@xI#>U2n*StA+h2PtJ;Lolw%v-rh#Y(H@R-ZB7 cz7ST1hO@ez*LOad33M2Pr>mdKI;Vst0KM#Bpa1{> literal 0 HcmV?d00001 diff --git a/textures/survival_slug_raw.png b/textures/survival_slug_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..34de4560ec06c44cb77fba1d0269b6fb4d7b584f GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEqU3_fI^Zbt`Q~9`MJ5Nc_j?aMX8A;sVNHO znI#zt?w-B@;f;LaKt)qMT^vI!PA4ZwusRF>Iet)$uVp6ZU-xB_ofo%Q_`bAfW@bM8 zj9dOe(rUlG$w#srI+q`*X9I%TNWC>}x%)mauAA8i1gx`tPds?^IG^VPn^Jb$?u5cw zm+DJeZ#cYJQ!SyFmY9%`@Z;-q`Q~LR?94r94;(m9@b@P_$e0}!pZ2gv9Pa*juPI~E iVkgZ+&BqVCLm6f!8a&(jyvi5oKn71&KbLh*2~7YMV`-28 literal 0 HcmV?d00001 diff --git a/textures/survival_worm_cooked.png b/textures/survival_worm_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..76eaf494d36580604bdec67d402937c38992eae9 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE1T^vI!PA4Zwu=el(foR;R|B@0CKY(~&dCu-10cF$;ZjtP&20UeAb2PD@DmasI%858IP($GW*C e37vkx#-NjG{`JkO-uXc1F?hQAxvXP=8zdPnA9gv>`84iS0rv&n$jP~1=66b*UH-n_Wuxd#1vM|`iJbHI z`-=XQlmG&&?RQgEZZb$TNIG3;Fum#azp&M8bP0l+XkK_i$gM literal 0 HcmV?d00001 diff --git a/tools.lua b/tools.lua index ea47b5b..58b9966 100644 --- a/tools.lua +++ b/tools.lua @@ -44,6 +44,38 @@ minetest.register_tool('survival:machete_bronze', { choppy = {times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=30, maxlevel=2}, snappy = {times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=40, maxlevel=2}, }, - damage_grpups = {fleshy=5} + damage_groups = {fleshy=5} }, }) + +-- Diamond Machete +minetest.register_tool('survival:machete_diamond', { + description = 'diamond machete', + inventory_image = 'survival_machete_diamond.png', + tool_capabilities = { + full_punch_interval = 1, + max_drop_level = 1, + groupcaps = { + crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=30, maxlevel=3}, + choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=2}, + snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=40, maxlevel=3}, + }, + damage_groups = {fleshy=6}, + } +}) + +-- Mese Machete +minetest.register_tool('survival:machete_mese', { + description = 'mese machete', + inventory_image = 'survival_machete_mese.png', + tool_capabilities = { + full_punch_interval = 1, + max_drop_level = 3, + groupcaps = { + crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=20, maxlevel=3}, + choppy={times={[1]=2.20, [2]=1.00, [3]=0.60}, uses=20, maxlevel=3}, + snappy={times={[1]=2.0, [2]=1.00, [3]=0.35}, uses=30, maxlevel=3}, + }, + damage_groups = {fleshy=7}, + } +})