Merge branch 'master' into 'master'

feat: change recipe to hemp and upgraded bags

## Hemp bags + Bigger bags = WIN

* Changed bag recipe to use hemp
* Increased large bag capacity
* Added label for bag number

_This PR must be accepted before the minetest-game repo PR_

See merge request !1
master
Milan* 2016-09-24 20:27:50 +02:00
commit 66f4c91250
2 changed files with 37 additions and 10 deletions

View File

@ -1,3 +1,4 @@
default
farming
hemp
inventory_plus

View File

@ -6,6 +6,14 @@ Copyright (c) 2012 cornernote, Brett O'Donnell <cornernote@gmail.com>
Source Code: https://github.com/cornernote/minetest-bags
License: BSD-3-Clause https://raw.github.com/cornernote/minetest-bags/master/LICENSE
Modified by ClaudiusMinimus
Sep 20, 2016
Changed recipe for small bags from leather to hemp fabric
Changed recipe for medium bags to two small bags and four pieces of cotton
Changed recipe for large bags to two medium bags and four pieces of cotton
Added Bag number labels for each open bag
Increased Large bag capacity to 32
]]--
@ -27,12 +35,21 @@ local get_formspec = function(player,page)
for i=1,4 do
if page=="bag"..i then
local image = player:get_inventory():get_stack("bag"..i, 1):get_definition().inventory_image
return "size[8,8.5]"
.."list[current_player;main;0,4.5;8,4;]"
-- return "size[8,8.5]"
-- increased the height of the formspec
return "size[8,9.5]"
--.."list[current_player;main;0,4.5;8,4;]"
-- increased formspec room for bag inventory
.."list[current_player;main;0,5.5;8,5;]"
.."button[0,0;2,0.5;main;Main]"
.."button[2,0;2,0.5;bags;Bags]"
.."image[7,0;1,1;"..image.."]"
.."list[current_player;bag"..i.."contents;0,1;8,3;]"
--bag number label for formspec to the right of the bag image
.."label[6,0.25;Bag " ..i.. "]"
-- .."list[current_player;bag"..i.."contents;0,1;8,3;]"
-- added room for a fourth bag inventory row
.."list[current_player;bag"..i.."contents;0,1;8,4;]"
.."listring[current_name;bag"..i.."contents]"
.."listring[current_player;main]"
end
@ -109,7 +126,9 @@ minetest.register_tool("bags:medium", {
minetest.register_tool("bags:large", {
description = "Large Bag",
inventory_image = "bags_large.png",
groups = {bagslots=24},
--groups = {bagslots=24},
-- increased bag inventory slots to 32 relative to cost of upgrade
groups = {bagslots=32},
})
-- register bag crafts
@ -117,22 +136,29 @@ minetest.register_craft({
output = "bags:small",
recipe = {
{"", "farming:cotton", ""},
{"mobs:leather", "mobs:leather", "mobs:leather"},
{"mobs:leather", "mobs:leather", "mobs:leather"},
-- material changed from leather to hemp:
{"hemp:hemp_fabric", "hemp:hemp_fabric", "hemp:hemp_fabric"},
{"hemp:hemp_fabric", "hemp:hemp_fabric", "hemp:hemp_fabric"},
},
})
minetest.register_craft({
output = "bags:medium",
recipe = {
{"bags:small", "bags:small"},
{"bags:small", "bags:small"},
-- made small to medium bag upgrade relavtive to increased inventory capacity
-- {"bags:small", "bags:small"},
-- {"bags:small", "bags:small"},
{"farming:cotton", "bags:small", "farming:cotton"},
{"farming:cotton", "bags:small", "farming:cotton"},
},
})
minetest.register_craft({
output = "bags:large",
recipe = {
{"bags:medium", "bags:medium"},
{"bags:medium", "bags:medium"},
-- made medium to large bag upgrade relavtive to increased inventory capacity
-- {"bags:medium", "bags:medium"},
-- {"bags:medium", "bags:medium"},
{"farming:cotton", "bags:medium", "farming:cotton"},
{"farming:cotton", "bags:medium", "farming:cotton"},
},
})