nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-25 02:00:37 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:MinetestForFun/server-minetestforfun

Browse Source
This commit is contained in:
BUISSON-DEBON Quentin 2016-05-09 00:31:29 +02:00
commit aae01b1b80
7 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/3d_armor/3d_armor/armor.conf.example
View File

@ -9,7 +9,7 @@ ARMOR_MATERIALS = {
bronze = "default:bronze_ingot", bronze = "default:bronze_ingot",
diamond = "default:diamond", diamond = "default:diamond",
gold = "default:gold_ingot", gold = "default:gold_ingot",
mithril = "moreores:mithril_ingot", mithril = "default:mithril_ingot",
crystal = "ethereal:crystal_ingot", crystal = "ethereal:crystal_ingot",
} }

5
mods/3d_armor/3d_armor/armor.lua
View File

@ -20,7 +20,7 @@ ARMOR_MATERIALS = {
bronze = "default:bronze_ingot", bronze = "default:bronze_ingot",
diamond = "default:diamond", diamond = "default:diamond",
gold = "default:gold_ingot", gold = "default:gold_ingot",
mithril = "moreores:mithril_ingot", mithril = "default:mithril_ingot",
crystal = "ethereal:crystal_ingot", crystal = "ethereal:crystal_ingot",
-- Hunter armors (A déc-ommenter quand activation de l'armure au total) -- Hunter armors (A déc-ommenter quand activation de l'armure au total)
hardenedleather = "3d_armor:hardenedleather", hardenedleather = "3d_armor:hardenedleather",
@ -59,9 +59,6 @@ if input then
input:close() input:close()
input = nil input = nil
end end
if not minetest.get_modpath("moreores") then
ARMOR_MATERIALS.mithril = nil
end
if not minetest.get_modpath("ethereal") then if not minetest.get_modpath("ethereal") then
ARMOR_MATERIALS.crystal = nil ARMOR_MATERIALS.crystal = nil
end end

19
mods/3d_armor/3d_armor/crafting_guide.txt
View File

@ -17,8 +17,8 @@ Helmets:
[3d_armor:helmet_bronze] X = [default:bronze_ingot] [3d_armor:helmet_bronze] X = [default:bronze_ingot]
[3d_armor:helmet_diamond] X = [default:diamond] [3d_armor:helmet_diamond] X = [default:diamond]
[3d_armor:helmet_gold] X = [default:gold_ingot] [3d_armor:helmet_gold] X = [default:gold_ingot]
[3d_armor:helmet_mithril] X = [moreores:mithril_ingot] * [3d_armor:helmet_mithril] X = [default:mithril_ingot]
[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] ** [3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] *
Chestplates: Chestplates:
@ -36,8 +36,8 @@ Chestplates:
[3d_armor:chestplate_bronze] X = [default:bronze_ingot] [3d_armor:chestplate_bronze] X = [default:bronze_ingot]
[3d_armor:chestplate_diamond] X = [default:diamond] [3d_armor:chestplate_diamond] X = [default:diamond]
[3d_armor:chestplate_gold] X = [default:gold_ingot] [3d_armor:chestplate_gold] X = [default:gold_ingot]
[3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] * [3d_armor:chestplate_mithril] X = [default:mithril_ingot]
[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] ** [3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] *
Leggings: Leggings:
@ -55,8 +55,8 @@ Leggings:
[3d_armor:leggings_bronze] X = [default:bronze_ingot] [3d_armor:leggings_bronze] X = [default:bronze_ingot]
[3d_armor:leggings_diamond] X = [default:diamond] [3d_armor:leggings_diamond] X = [default:diamond]
[3d_armor:leggings_gold] X = [default:gold_ingot] [3d_armor:leggings_gold] X = [default:gold_ingot]
[3d_armor:leggings_mithril] X = [moreores:mithril_ingot] * [3d_armor:leggings_mithril] X = [default:mithril_ingot]
[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] ** [3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] *
Boots: Boots:
@ -72,8 +72,7 @@ Boots:
[3d_armor:boots_bronze] X = [default:bronze_ingot [3d_armor:boots_bronze] X = [default:bronze_ingot
[3d_armor:boots_diamond] X = [default:diamond] [3d_armor:boots_diamond] X = [default:diamond]
[3d_armor:boots_gold] X = [default:gold_ingot] [3d_armor:boots_gold] X = [default:gold_ingot]
[3d_armor:boots_mithril] X = [moreores:mithril_ingot] * [3d_armor:boots_mithril] X = [default:mithril_ingot]
[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] ** [3d_armor:boots_crystal] X = [ethereal:crystal_ingot] *
* Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549 * Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal
** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal

2
mods/3d_armor/shields/crafting_guide.txt
View File

@ -15,7 +15,7 @@ Shields -- Crafting Guide
[shields:shield_bronze] X = [default:bronze_ingot] [shields:shield_bronze] X = [default:bronze_ingot]
[shields:shield_diamond] X = [default:diamond] [shields:shield_diamond] X = [default:diamond]
[shields:shield_gold] X = [default:gold_ingot] [shields:shield_gold] X = [default:gold_ingot]
[shields:shield_mithril] X = [moreores:mithril_ingot] [shields:shield_mithril] X = [default:mithril_ingot]
[shields:shield_crystal] X = [ethereal:crystal_ingot] [shields:shield_crystal] X = [ethereal:crystal_ingot]
Enhanced Shields Enhanced Shields

2
mods/3d_armor/shields/init.lua
View File

@ -1,5 +1,3 @@
local use_moreores = minetest.get_modpath("moreores")
-- Regisiter Shields -- Regisiter Shields
minetest.register_tool("shields:shield_admin", { minetest.register_tool("shields:shield_admin", {

6
mods/3d_armor/technic_armor/init.lua
View File

@ -11,12 +11,10 @@ if minetest.get_modpath("technic") then
carbon="technic:carbon_steel_ingot", carbon="technic:carbon_steel_ingot",
stainless="technic:stainless_steel_ingot", stainless="technic:stainless_steel_ingot",
} }
if minetest.get_modpath("moreores") then
stats.tin = { name="Tin", armor=1.6, heal=0, use=750 } stats.tin = { name="Tin", armor=1.6, heal=0, use=750 }
stats.silver = { name="Silver", armor=1.8, heal=0, use=650 } stats.silver = { name="Silver", armor=1.8, heal=0, use=650 }
mats.tin = "moreores:tin_ingot" mats.tin = "default:tin_ingot"
mats.silver = "moreores:silver_ingot" mats.silver = "default:silver_ingot"
end
for k, v in pairs(stats) do for k, v in pairs(stats) do
minetest.register_tool("technic_armor:helmet_"..k, { minetest.register_tool("technic_armor:helmet_"..k, {

2
mods/quests

@ -1 +1 @@
Subproject commit 8f10e93bc3ff4b82400627abf552b3a5a15aa33f Subproject commit b3a5eca1b556d80e7bb8b5ea0d83216304523873