Merge pull request #16 from sorrymak/master

Monel
This commit is contained in:
Oleg Matveev 2013-07-08 04:22:15 -07:00
commit cb6aa6110c
29 changed files with 29 additions and 9 deletions

View File

@ -14,7 +14,8 @@ instruments.groupcaps = {
{cracky={times={[1]=5.42, [2]=3.92, [3]=2.42}, uses=instruments.durability[12], maxlevel=3}},--german_silver
{cracky={times={[1]=5.45, [2]=3.95, [3]=2.45}, uses=instruments.durability[13], maxlevel=3}},--albata
{cracky={times={[1]=5.40, [2]=3.90, [3]=2.40}, uses=instruments.durability[14], maxlevel=3}},--steel
{cracky={times={[1]=5.30, [2]=3.80, [3]=2.30}, uses=instruments.durability[15], maxlevel=3}},--black steel
{cracky={times={[1]=5.35, [2]=3.85, [3]=2.35}, uses=instruments.durability[15], maxlevel=3}},--monel
{cracky={times={[1]=5.30, [2]=3.80, [3]=2.30}, uses=instruments.durability[16], maxlevel=3}},--black steel
},
{--Axes
{choppy={times={[1]=10.00, [2]=7.50, [3]=5.00}, uses=instruments.durability[1], maxlevel=1},--stone
@ -45,8 +46,10 @@ instruments.groupcaps = {
fleshy={times={[2]=1.10, [3]=0.60}, uses=instruments.durability[13]*1.2, maxlevel=2}},
{choppy={times={[1]=5.40, [2]=3.90, [3]=2.40}, uses=instruments.durability[14], maxlevel=3},--steel
fleshy={times={[2]=1.10, [3]=0.60}, uses=instruments.durability[14]*1.2, maxlevel=2}},
{choppy={times={[1]=5.30, [2]=3.80, [3]=2.30}, uses=instruments.durability[15], maxlevel=3},--black steel
{choppy={times={[1]=5.35, [2]=3.85, [3]=2.35}, uses=instruments.durability[15], maxlevel=3},--monel
fleshy={times={[2]=1.10, [3]=0.60}, uses=instruments.durability[15]*1.2, maxlevel=2}},
{choppy={times={[1]=5.30, [2]=3.80, [3]=2.30}, uses=instruments.durability[16], maxlevel=3},--black steel
fleshy={times={[2]=1.10, [3]=0.60}, uses=instruments.durability[16]*1.2, maxlevel=2}},
},
{--Shovels
{crumbly={times={[1]=9.40, [2]=6.00, [3]=4.20}, uses=instruments.durability[1], maxlevel=1}},--stone
@ -63,7 +66,8 @@ instruments.groupcaps = {
{crumbly={times={[1]=4.82, [2]=3.42, [3]=2.12}, uses=instruments.durability[12], maxlevel=3}},--german_silver
{crumbly={times={[1]=4.85, [2]=3.45, [3]=2.15}, uses=instruments.durability[13], maxlevel=3}},--albata
{crumbly={times={[1]=4.80, [2]=3.40, [3]=2.10}, uses=instruments.durability[14], maxlevel=3}},--steel
{crumbly={times={[1]=4.70, [2]=3.30, [3]=2.00}, uses=instruments.durability[15], maxlevel=3}},--black steel
{crumbly={times={[1]=4.75, [2]=3.35, [3]=2.05}, uses=instruments.durability[15], maxlevel=3}},--monel
{crumbly={times={[1]=4.70, [2]=3.30, [3]=2.00}, uses=instruments.durability[16], maxlevel=3}},--black steel
},
{--Hammers
{cracky={times={[1]=14.0, [2]=10.5, [3]=7.00}, uses=instruments.durability[1], maxlevel=1}},--stone
@ -80,7 +84,8 @@ instruments.groupcaps = {
{cracky={times={[1]=9.42, [2]=6.92, [3]=4.42}, uses=instruments.durability[12], maxlevel=3}},--german_silver
{cracky={times={[1]=9.45, [2]=6.95, [3]=4.45}, uses=instruments.durability[13], maxlevel=3}},--albata
{cracky={times={[1]=9.40, [2]=6.90, [3]=4.40}, uses=instruments.durability[14], maxlevel=3}},--steel
{cracky={times={[1]=9.30, [2]=6.80, [3]=4.30}, uses=instruments.durability[15], maxlevel=3}},--black steel
{cracky={times={[1]=9.35, [2]=6.85, [3]=4.35}, uses=instruments.durability[15], maxlevel=3}},--monel
{cracky={times={[1]=9.30, [2]=6.80, [3]=4.30}, uses=instruments.durability[16], maxlevel=3}},--black steel
},
{--Swords
{},--stone
@ -123,6 +128,9 @@ instruments.groupcaps = {
{fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=instruments.durability[1], maxlevel=3},--steel
snappy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[1], maxlevel=2},
choppy={times={[3]=2.80}, uses=instruments.durability[1], maxlevel=0}},
{fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=instruments.durability[1], maxlevel=3},--monel
snappy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[1], maxlevel=2},
choppy={times={[3]=2.70}, uses=instruments.durability[1], maxlevel=0}},
{fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=instruments.durability[1], maxlevel=3},--black steel
snappy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[1], maxlevel=2},
choppy={times={[3]=2.50}, uses=instruments.durability[1], maxlevel=0}},
@ -155,8 +163,10 @@ instruments.groupcaps = {
fleshy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[13]*1.2, maxlevel=2}},
{choppy={times={[1]=5.10, [2]=3.70, [3]=2.30}, uses=instruments.durability[14], maxlevel=3},--steel
fleshy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[14]*1.2, maxlevel=2}},
{choppy={times={[1]=5.00, [2]=3.60, [3]=2.20}, uses=instruments.durability[15], maxlevel=3},--black steel
fleshy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[15]*1.2, maxlevel=2}},
{choppy={times={[1]=5.05, [2]=3.65, [3]=2.25}, uses.instruments.durability[15], maxlevel=3},--monel
fleshy={times={[2]=1.00, [3]=0.50}, uses.instruments.durability[15]*1.2, maxlevel=2}},
{choppy={times={[1]=5.00, [2]=3.60, [3]=2.20}, uses=instruments.durability[16], maxlevel=3},--black steel
fleshy={times={[2]=1.00, [3]=0.50}, uses=instruments.durability[16]*1.2, maxlevel=2}},
},
{--Spears
},

View File

@ -26,6 +26,7 @@ instruments.materials = {
"german_silver",
"albata",
"steel",
"monel",
--------
"black_steel",
}
@ -49,6 +50,7 @@ instruments.desc_list = {
"German Silver",
"Albata",
"Steel",
"Monel",
--------
"Black Steel",
}
@ -60,9 +62,9 @@ instruments.stone_head_recipes = {
hammer = {{{"default:cobble","default:cobble","default:cobble"},{"default:cobble","default:cobble","default:cobble"}},6},
}
instruments.levels = {0,0,0,0,1,2,2,2,2,2,3,4,4,4,5}
instruments.levels = {0,0,0,0,1,2,2,2,2,2,3,4,4,4,4,5}
instruments.durability = {50, 211, 281, 296, 411, 521, 531, 581, 601, 731, 801, 1001, 1011, 1101, 1501}
instruments.durability = {50, 211, 281, 296, 411, 521, 531, 581, 601, 731, 801, 1001, 1011, 1101, 1111, 1501}
instruments.list = {"pick", "axe", "shovel", "hammer", "sword", "spear", "chisel", "saw"}

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 518 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

View File

@ -1,6 +1,6 @@
metals = {}
metals.levels = {0,0,0,1,2,2,2,2,2,2,2,2,2,2,3,3,3,4,4,4,4,5}
metals.levels = {0,0,0,1,2,2,2,2,2,2,2,2,2,2,3,3,3,4,4,4,4,4,5}
metals.list = {
'bismuth',
@ -28,6 +28,7 @@ metals.list = {
'albata',
'nickel',
'steel',
'monel',
----------
'black_steel'
}
@ -58,6 +59,7 @@ metals.desc_list = {
'Albata',
'Nickel',
'Steel',
'Monel',
----------
'Black Steel'
}
@ -325,6 +327,12 @@ end
-- Alloys
--
minetest.register_craft({
type = "shapeless",
output = "metals:monel_unshaped 4",
recipe = {"metals:nickel_unshaped", "metals:nickel_unshaped", "metals:nickel_unshaped", "metals:copper_unshaped"},
})
minetest.register_craft({
type = "shapeless",
output = "metals:german_silver_unshaped 4",

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 837 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 695 B