Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-12-25 19:02:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move gunpowder to mcl_mobitems

Browse Source
This commit is contained in:
Wuzzy 2017-02-16 21:33:14 +01:00
parent a0adb8bed7
commit 001a2d2064
8 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/CORE/mcl_core/craftitems.lua
View File

@ -97,14 +97,6 @@ minetest.register_craftitem("mcl_core:flint", {
groups = { craftitem=1 }, groups = { craftitem=1 },
}) })
minetest.register_craftitem("mcl_core:gunpowder", {
description = "Gunpowder",
inventory_image = "default_gunpowder.png",
stack_max = 64,
groups = { craftitem=1 },
})
minetest.register_craftitem("mcl_core:sugar", { minetest.register_craftitem("mcl_core:sugar", {
description = "Sugar", description = "Sugar",
inventory_image = "default_sugar.png", inventory_image = "default_sugar.png",

2
mods/ENTITIES/mobs_mc/creeper.lua
View File

@ -36,7 +36,7 @@ mobs:register_mob("mobs_mc:creeper", {
armor = 100, armor = 100,
maxdrops = 3, maxdrops = 3,
drops = { drops = {
{name = "mcl_core:gunpowder", {name = "mcl_mobitems:gunpowder",
chance = 1, chance = 1,
min = 0, min = 0,
max = 2,}, max = 2,},

2
mods/ENTITIES/mobs_mc/ghast.lua
View File

@ -37,7 +37,7 @@ mobs:register_mob("mobs_mc:ghast", {
chance = 1, chance = 1,
min = 0, min = 0,
max = 1,}, max = 1,},
{name = "mcl_core:gunpowder", {name = "mcl_mobitems:gunpowder",
chance = 1, chance = 1,
min = 0, min = 0,
max = 2,}, max = 2,},

2
mods/ITEMS/mcl_fire/fire_charge.lua
View File

@ -25,5 +25,5 @@ minetest.register_craftitem("mcl_fire:fire_charge", {
minetest.register_craft({ minetest.register_craft({
type = 'shapeless', type = 'shapeless',
output = 'mcl_fire:fire_charge 3', output = 'mcl_fire:fire_charge 3',
recipe = { 'mcl_mobitems:blaze_powder', 'group:coal', 'mcl_core:gunpowder' }, recipe = { 'mcl_mobitems:blaze_powder', 'group:coal', 'mcl_mobitems:gunpowder' },
}) })

7
mods/ITEMS/mcl_mobitems/init.lua
View File

@ -247,6 +247,13 @@ minetest.register_craftitem("mcl_mobitems:slimeball", {
groups = { craftitem = 1 }, groups = { craftitem = 1 },
}) })
minetest.register_craftitem("mcl_mobitems:gunpowder", {
description = "Gunpowder",
inventory_image = "default_gunpowder.png",
stack_max = 64,
groups = { craftitem=1 },
})
minetest.register_tool("mcl_mobitems:carrot_on_a_stick", { minetest.register_tool("mcl_mobitems:carrot_on_a_stick", {
description = "Carrot on a Stick", description = "Carrot on a Stick",
wield_image = "mcl_mobitems_carrot_on_a_stick.png", wield_image = "mcl_mobitems_carrot_on_a_stick.png",

0
mods/CORE/mcl_core/textures/default_gunpowder.png → mods/ITEMS/mcl_mobitems/textures/default_gunpowder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

6
mods/ITEMS/mcl_tnt/init.lua
View File

@ -144,8 +144,8 @@ minetest.register_entity("mcl_tnt:tnt", TNT)
minetest.register_craft({ minetest.register_craft({
output = "mcl_tnt:tnt", output = "mcl_tnt:tnt",
recipe = { recipe = {
{'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'}, {'mcl_mobitems:gunpowder','group:sand','mcl_mobitems:gunpowder'},
{'group:sand','mcl_core:gunpowder','group:sand'}, {'group:sand','mcl_mobitems:gunpowder','group:sand'},
{'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'} {'mcl_mobitems:gunpowder','group:sand','mcl_mobitems:gunpowder'}
} }
}) })

2
mods/MISC/mcl_temp_helper_recipes/init.lua
View File

@ -4,7 +4,7 @@
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "mcl_core:gunpowder", output = "mcl_mobitems:gunpowder",
recipe = { recipe = {
'group:sand', 'group:sand',
'mcl_core:gravel', 'mcl_core:gravel',