diff --git a/mods/3d_armor/armor_bronze/init.lua b/mods/3d_armor/armor_bronze/init.lua index ebdc4c2b..f9820e35 100644 --- a/mods/3d_armor/armor_bronze/init.lua +++ b/mods/3d_armor/armor_bronze/init.lua @@ -32,7 +32,7 @@ if armor.materials.bronze then description = S("Bronze Helmet"), inventory_image = "3d_armor_inv_helmet_bronze.png", groups = {armor_head=1, armor_heal=6, armor_use=400, - physics_speed=-0.01, physics_gravity=0.01}, + physics_speed=-0.01, physics_gravity=0.01, armor_radiation=5}, armor_groups = {fleshy=10}, damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, }) @@ -55,7 +55,7 @@ if armor.materials.bronze then description = S("Bronze Chestplate"), inventory_image = "3d_armor_inv_chestplate_bronze.png", groups = {armor_torso=1, armor_heal=6, armor_use=400, - physics_speed=-0.04, physics_gravity=0.04}, + physics_speed=-0.04, physics_gravity=0.04, armor_radiation=16}, armor_groups = {fleshy=15}, damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, }) @@ -78,7 +78,7 @@ if armor.materials.bronze then description = S("Bronze Leggings"), inventory_image = "3d_armor_inv_leggings_bronze.png", groups = {armor_legs=1, armor_heal=6, armor_use=400, - physics_speed=-0.03, physics_gravity=0.03}, + physics_speed=-0.03, physics_gravity=0.03, armor_radiation=7}, armor_groups = {fleshy=15}, damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, }) @@ -101,7 +101,7 @@ if armor.materials.bronze then description = S("Bronze Boots"), inventory_image = "3d_armor_inv_boots_bronze.png", groups = {armor_feet=1, armor_heal=6, armor_use=400, - physics_speed=-0.01, physics_gravity=0.01}, + physics_speed=-0.01, physics_gravity=0.01, armor_radiation=5}, armor_groups = {fleshy=10}, damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, }) diff --git a/mods/3d_armor/armor_crystal/init.lua b/mods/3d_armor/armor_crystal/init.lua index aa9a76af..6812d9fe 100644 --- a/mods/3d_armor/armor_crystal/init.lua +++ b/mods/3d_armor/armor_crystal/init.lua @@ -29,7 +29,7 @@ if armor.materials.crystal then armor:register_armor(":3d_armor:helmet_crystal", { description = S("Crystal Helmet"), inventory_image = "3d_armor_inv_helmet_crystal.png", - groups = {armor_head=1, armor_heal=12, armor_use=100, armor_fire=1}, + groups = {armor_head=1, armor_heal=12, armor_use=100, armor_fire=1, armor_radiation=2}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -48,7 +48,7 @@ if armor.materials.crystal then armor:register_armor(":3d_armor:chestplate_crystal", { description = S("Crystal Chestplate"), inventory_image = "3d_armor_inv_chestplate_crystal.png", - groups = {armor_torso=1, armor_heal=12, armor_use=100, armor_fire=1}, + groups = {armor_torso=1, armor_heal=12, armor_use=100, armor_fire=1, armor_radiation=5}, armor_groups = {fleshy=20}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -67,7 +67,7 @@ if armor.materials.crystal then armor:register_armor(":3d_armor:leggings_crystal", { description = S("Crystal Leggings"), inventory_image = "3d_armor_inv_leggings_crystal.png", - groups = {armor_legs=1, armor_heal=12, armor_use=100, armor_fire=1}, + groups = {armor_legs=1, armor_heal=12, armor_use=100, armor_fire=1, armor_radiation=3}, armor_groups = {fleshy=20}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -89,7 +89,7 @@ if armor.materials.crystal then description = S("Crystal Boots"), inventory_image = "3d_armor_inv_boots_crystal.png", groups = {armor_feet=1, armor_heal=12, armor_use=100, physics_speed=1, - physics_jump=0.5, armor_fire=1}, + physics_jump=0.5, armor_fire=1, armor_radiation=2}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=1, level=3}, }) diff --git a/mods/3d_armor/armor_diamond/init.lua b/mods/3d_armor/armor_diamond/init.lua index c92cf0eb..0269fd00 100644 --- a/mods/3d_armor/armor_diamond/init.lua +++ b/mods/3d_armor/armor_diamond/init.lua @@ -29,7 +29,7 @@ if armor.materials.diamond then armor:register_armor(":3d_armor:helmet_diamond", { description = S("Diamond Helmet"), inventory_image = "3d_armor_inv_helmet_diamond.png", - groups = {armor_head=1, armor_heal=12, armor_use=200}, + groups = {armor_head=1, armor_heal=12, armor_use=200, armor_radiation=1}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, }) @@ -48,7 +48,7 @@ if armor.materials.diamond then armor:register_armor(":3d_armor:chestplate_diamond", { description = S("Diamond Chestplate"), inventory_image = "3d_armor_inv_chestplate_diamond.png", - groups = {armor_torso=1, armor_heal=12, armor_use=200}, + groups = {armor_torso=1, armor_heal=12, armor_use=200, armor_radiation=4}, armor_groups = {fleshy=20}, damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, }) @@ -67,7 +67,7 @@ if armor.materials.diamond then armor:register_armor(":3d_armor:leggings_diamond", { description = S("Diamond Leggings"), inventory_image = "3d_armor_inv_leggings_diamond.png", - groups = {armor_legs=1, armor_heal=12, armor_use=200}, + groups = {armor_legs=1, armor_heal=12, armor_use=200, armor_radiation=2}, armor_groups = {fleshy=20}, damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, }) @@ -86,7 +86,7 @@ if armor.materials.diamond then armor:register_armor(":3d_armor:boots_diamond", { description = S("Diamond Boots"), inventory_image = "3d_armor_inv_boots_diamond.png", - groups = {armor_feet=1, armor_heal=12, armor_use=200}, + groups = {armor_feet=1, armor_heal=12, armor_use=200, armor_radiation=1}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, }) diff --git a/mods/3d_armor/armor_gold/init.lua b/mods/3d_armor/armor_gold/init.lua index a8bb01ff..b6c6e428 100644 --- a/mods/3d_armor/armor_gold/init.lua +++ b/mods/3d_armor/armor_gold/init.lua @@ -34,7 +34,7 @@ if armor.materials.gold then description = S("Gold Helmet"), inventory_image = "3d_armor_inv_helmet_gold.png", groups = {armor_head=1, armor_heal=6, armor_use=300, - physics_speed=-0.02, physics_gravity=0.02}, + physics_speed=-0.02, physics_gravity=0.02, armor_radiation=6}, armor_groups = {fleshy=10}, damage_groups = {cracky=1, snappy=2, choppy=2, crumbly=3, level=2}, }) @@ -57,7 +57,7 @@ if armor.materials.gold then description = S("Gold Chestplate"), inventory_image = "3d_armor_inv_chestplate_gold.png", groups = {armor_torso=1, armor_heal=6, armor_use=300, - physics_speed=-0.05, physics_gravity=0.05}, + physics_speed=-0.05, physics_gravity=0.05, armor_radiation=21}, armor_groups = {fleshy=15}, damage_groups = {cracky=1, snappy=2, choppy=2, crumbly=3, level=2}, }) @@ -80,7 +80,7 @@ if armor.materials.gold then description = S("Gold Leggings"), inventory_image = "3d_armor_inv_leggings_gold.png", groups = {armor_legs=1, armor_heal=6, armor_use=300, - physics_speed=-0.04, physics_gravity=0.04}, + physics_speed=-0.04, physics_gravity=0.04, armor_radiation=9}, armor_groups = {fleshy=15}, damage_groups = {cracky=1, snappy=2, choppy=2, crumbly=3, level=2}, }) @@ -103,7 +103,7 @@ if armor.materials.gold then description = S("Gold Boots"), inventory_image = "3d_armor_inv_boots_gold.png", groups = {armor_feet=1, armor_heal=6, armor_use=300, - physics_speed=-0.02, physics_gravity=0.02}, + physics_speed=-0.02, physics_gravity=0.02, armor_radiation=6}, armor_groups = {fleshy=10}, damage_groups = {cracky=1, snappy=2, choppy=2, crumbly=3, level=2}, }) diff --git a/mods/3d_armor/armor_mithril/init.lua b/mods/3d_armor/armor_mithril/init.lua index cdec0db3..ab34a866 100644 --- a/mods/3d_armor/armor_mithril/init.lua +++ b/mods/3d_armor/armor_mithril/init.lua @@ -28,7 +28,7 @@ if armor.materials.mithril then armor:register_armor(":3d_armor:helmet_mithril", { description = S("Mithril Helmet"), inventory_image = "3d_armor_inv_helmet_mithril.png", - groups = {armor_head=1, armor_heal=13, armor_use=66}, + groups = {armor_head=1, armor_heal=13, armor_use=66, armor_radiation=3}, armor_groups = {fleshy=16}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -46,7 +46,7 @@ if armor.materials.mithril then armor:register_armor(":3d_armor:chestplate_mithril", { description = S("Mithril Chestplate"), inventory_image = "3d_armor_inv_chestplate_mithril.png", - groups = {armor_torso=1, armor_heal=13, armor_use=66}, + groups = {armor_torso=1, armor_heal=13, armor_use=66, armor_radiation=10}, armor_groups = {fleshy=21}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -64,7 +64,7 @@ if armor.materials.mithril then armor:register_armor(":3d_armor:leggings_mithril", { description = S("Mithril Leggings"), inventory_image = "3d_armor_inv_leggings_mithril.png", - groups = {armor_legs=1, armor_heal=13, armor_use=66}, + groups = {armor_legs=1, armor_heal=13, armor_use=66, armor_radiation=4}, armor_groups = {fleshy=21}, damage_groups = {cracky=2, snappy=1, level=3}, }) @@ -82,7 +82,7 @@ if armor.materials.mithril then armor:register_armor(":3d_armor:boots_mithril", { description = S("Mithril Boots"), inventory_image = "3d_armor_inv_boots_mithril.png", - groups = {armor_feet=1, armor_heal=13, armor_use=66}, + groups = {armor_feet=1, armor_heal=13, armor_use=66, armor_radiation=3}, armor_groups = {fleshy=16}, damage_groups = {cracky=2, snappy=1, level=3}, }) diff --git a/mods/3d_armor/armor_nether/init.lua b/mods/3d_armor/armor_nether/init.lua index 3e20ee33..d22f9481 100644 --- a/mods/3d_armor/armor_nether/init.lua +++ b/mods/3d_armor/armor_nether/init.lua @@ -30,7 +30,7 @@ if armor.materials.nether then armor:register_armor(":3d_armor:helmet_nether", { description = S("Nether Helmet"), inventory_image = "3d_armor_inv_helmet_nether.png", - groups = {armor_head=1, armor_heal=14, armor_use=100, armor_fire=1}, + groups = {armor_head=1, armor_heal=14, armor_use=100, armor_fire=1, armor_radiation=1}, armor_groups = {fleshy=18}, damage_groups = {cracky=3, snappy=2, level=3}, }) @@ -49,7 +49,7 @@ if armor.materials.nether then armor:register_armor(":3d_armor:chestplate_nether", { description = S("Nether Chestplate"), inventory_image = "3d_armor_inv_chestplate_nether.png", - groups = {armor_torso=1, armor_heal=14, armor_use=200, armor_fire=1}, + groups = {armor_torso=1, armor_heal=14, armor_use=200, armor_fire=1, armor_radiation=3}, armor_groups = {fleshy=25}, damage_groups = {cracky=3, snappy=2, level=3}, }) @@ -68,7 +68,7 @@ if armor.materials.nether then armor:register_armor(":3d_armor:leggings_nether", { description = S("Nether Leggings"), inventory_image = "3d_armor_inv_leggings_nether.png", - groups = {armor_legs=1, armor_heal=14, armor_use=200, armor_fire=1}, + groups = {armor_legs=1, armor_heal=14, armor_use=200, armor_fire=1, armor_radiation=1}, armor_groups = {fleshy=25}, damage_groups = {cracky=3, snappy=2, level=3}, }) @@ -87,7 +87,7 @@ if armor.materials.nether then armor:register_armor(":3d_armor:boots_nether", { description = S("Nether Boots"), inventory_image = "3d_armor_inv_boots_nether.png", - groups = {armor_feet=1, armor_heal=14, armor_use=200, armor_fire=1}, + groups = {armor_feet=1, armor_heal=14, armor_use=200, armor_fire=1, armor_radiation=1}, armor_groups = {fleshy=18}, damage_groups = {cracky=3, snappy=2, level=3}, }) diff --git a/mods/3d_armor/armor_steel/init.lua b/mods/3d_armor/armor_steel/init.lua index d8cbc0bc..e9dffd1e 100644 --- a/mods/3d_armor/armor_steel/init.lua +++ b/mods/3d_armor/armor_steel/init.lua @@ -33,7 +33,7 @@ if armor.materials.steel then description = S("Steel Helmet"), inventory_image = "3d_armor_inv_helmet_steel.png", groups = {armor_head=1, armor_heal=0, armor_use=800, - physics_speed=-0.01, physics_gravity=0.01}, + physics_speed=-0.01, physics_gravity=0.01, armor_radiation=4}, armor_groups = {fleshy=10}, damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2}, }) @@ -56,7 +56,7 @@ if armor.materials.steel then description = S("Steel Chestplate"), inventory_image = "3d_armor_inv_chestplate_steel.png", groups = {armor_torso=1, armor_heal=0, armor_use=800, - physics_speed=-0.04, physics_gravity=0.04}, + physics_speed=-0.04, physics_gravity=0.04, armor_radiation=14}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2}, }) @@ -79,7 +79,7 @@ if armor.materials.steel then description = S("Steel Leggings"), inventory_image = "3d_armor_inv_leggings_steel.png", groups = {armor_legs=1, armor_heal=0, armor_use=800, - physics_speed=-0.03, physics_gravity=0.03}, + physics_speed=-0.03, physics_gravity=0.03, armor_radiation=6}, armor_groups = {fleshy=15}, damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2}, }) @@ -102,7 +102,7 @@ if armor.materials.steel then description = S("Steel Boots"), inventory_image = "3d_armor_inv_boots_steel.png", groups = {armor_feet=1, armor_heal=0, armor_use=800, - physics_speed=-0.01, physics_gravity=0.01}, + physics_speed=-0.01, physics_gravity=0.01, armor_radiation=4}, armor_groups = {fleshy=10}, damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2}, }) diff --git a/mods/obsidianstuff/armor.lua b/mods/obsidianstuff/armor.lua index 88d18419..dcbcedc5 100644 --- a/mods/obsidianstuff/armor.lua +++ b/mods/obsidianstuff/armor.lua @@ -4,9 +4,9 @@ armor:register_armor("obsidianstuff:helmet_obsidian", { description = "Obsidian Helmet", inventory_image = "obsidianstuff_inv_helmet_obsidian.png", - groups = {armor_head = 1, armor_heal = 10, armor_use = 500, armor_fire = 15}, + groups = {armor_head = 14, armor_heal = 10, armor_use = 70, armor_fire = 15, armor_radiation=2}, armor_groups = {fleshy = 14}, - damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 2} + damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 3} }) minetest.register_craft({ @@ -24,9 +24,9 @@ minetest.register_craft({ armor:register_armor("obsidianstuff:chestplate_obsidian", { description = "Obsidian Chestplate", inventory_image = "obsidianstuff_inv_chestplate_obsidian.png", - groups = {armor_torso = 1, armor_heal = 10, armor_use = 500, armor_fire = 15}, + groups = {armor_torso = 18, armor_heal = 10, armor_use = 70, armor_fire = 15, armor_radiation=6}, armor_groups = {fleshy = 18}, - damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 2} + damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 3} }) minetest.register_craft({ @@ -44,9 +44,9 @@ minetest.register_craft({ armor:register_armor("obsidianstuff:leggings_obsidian", { description = "Obsidian Leggings", inventory_image = "obsidianstuff_inv_leggings_obsidian.png", - groups = {armor_legs = 1, armor_heal = 10, armor_use = 500, armor_fire = 15}, + groups = {armor_legs = 18, armor_heal = 10, armor_use = 70, armor_fire = 15, armor_radiation=3}, armor_groups = {fleshy = 18}, - damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 2} + damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 3} }) minetest.register_craft({ @@ -64,9 +64,9 @@ minetest.register_craft({ armor:register_armor("obsidianstuff:boots_obsidian", { description = "Obsidian Boots", inventory_image = "obsidianstuff_inv_boots_obsidian.png", - groups = {armor_feet = 1, armor_heal = 10, armor_use = 500, armor_fire = 15}, + groups = {armor_feet = 14, armor_heal = 10, armor_use = 70, armor_fire = 15, armor_radiation=2}, armor_groups = {fleshy = 14}, - damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 2} + damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 3} }) minetest.register_craft({ @@ -85,9 +85,9 @@ if minetest.get_modpath("shields") then armor:register_armor("obsidianstuff:shield_obsidian", { description = "Obsidian Shield", inventory_image = "obsidianstuff_inv_shield_obsidian.png", - groups = {armor_shield = 1, armor_heal = 10, armor_use = 500, armor_fire = 15}, + groups = {armor_shield = 18, armor_heal = 10, armor_use = 70, armor_fire = 15}, armor_groups = {fleshy = 18}, - damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 2} + damage_groups = {cracky = 2, snappy = 2, choppy = 2, level = 3} }) minetest.register_craft({ diff --git a/mods/rainbow_ore/rainbow_armor.lua b/mods/rainbow_ore/rainbow_armor.lua index 9c3ad5ff..f5a39647 100644 --- a/mods/rainbow_ore/rainbow_armor.lua +++ b/mods/rainbow_ore/rainbow_armor.lua @@ -6,7 +6,7 @@ local S = minetest.get_translator(rainbow_ore.modname) minetest.register_tool("rainbow_ore:rainbow_ore_helmet", { description = S("Rainbow Helmet"), inventory_image = "rainbow_ore_helmet_inv.png", - groups = {armor_head=20, armor_heal=17, armor_use=40, armor_fire=1}, + groups = {armor_head=20, armor_heal=17, armor_use=70, armor_fire=1, armor_radiation=9}, armor_groups = {fleshy=20}, wear = 0, damage_groups = {cracky=2, snappy=1, level=3}, @@ -14,7 +14,7 @@ minetest.register_tool("rainbow_ore:rainbow_ore_helmet", { minetest.register_tool("rainbow_ore:rainbow_ore_chestplate", { description = S("Rainbow Chestplate"), inventory_image = "rainbow_ore_chestplate_inv.png", - groups = {armor_torso=25, armor_heal=17, armor_use=40, armor_fire=1}, + groups = {armor_torso=25, armor_heal=17, armor_use=70, armor_fire=1, armor_radiation=31}, armor_groups = {fleshy=25}, damage_groups = {cracky=2, snappy=1, level=3}, wear = 0, @@ -22,7 +22,7 @@ minetest.register_tool("rainbow_ore:rainbow_ore_chestplate", { minetest.register_tool("rainbow_ore:rainbow_ore_leggings", { description = S("Rainbow Leggings"), inventory_image = "rainbow_ore_leggings_inv.png", - groups = {armor_legs=25, armor_heal=17, armor_use=40, armor_fire=1}, + groups = {armor_legs=25, armor_heal=17, armor_use=70, armor_fire=1, armor_radiation=11}, armor_groups = {fleshy=25}, damage_groups = {cracky=2, snappy=1, level=3}, wear = 0, @@ -31,7 +31,7 @@ minetest.register_tool("rainbow_ore:rainbow_ore_leggings", { minetest.register_tool("rainbow_ore:rainbow_ore_boots", { description = S("Rainbow Boots"), inventory_image = "rainbow_ore_boots_inv.png", - groups = {armor_feet=20, armor_heal=17, armor_use=40, physics_speed=1, physics_jump=0.5, armor_fire=1}, + groups = {armor_feet=20, armor_heal=17, armor_use=70, physics_speed=1, physics_jump=0.5, armor_fire=1, armor_radiation=9}, wear = 0, damage_groups = {cracky=2, snappy=1, level=3}, armor_groups = {fleshy=20}, diff --git a/mods/rainbow_ore/rainbow_shield.lua b/mods/rainbow_ore/rainbow_shield.lua index 11c8201f..41362cc3 100644 --- a/mods/rainbow_ore/rainbow_shield.lua +++ b/mods/rainbow_ore/rainbow_shield.lua @@ -1,22 +1,28 @@ - local S = minetest.get_translator(rainbow_ore.modname) - --Define Rainbow shield minetest.register_tool("rainbow_ore:rainbow_ore_shield", { description = S("Rainbow Shield"), inventory_image = "rainbow_ore_shield_inv.png", - groups = {armor_shield=20, armor_heal=17, armor_use=40, armor_fire=1}, + groups = { armor_shield = 20, armor_heal = 17, armor_use = 70, armor_fire = 1 }, + armor_groups = { fleshy = 20 }, + damage_groups = { cracky = 2, snappy = 1, level = 3 }, + reciprocate_damage = true, + on_damage = function(player, index, stack) + play_sound_effect(player, "default_glass_footstep") + end, + on_destroy = function(player, index, stack) + play_sound_effect(player, "default_break_glass") + end, wear = 0, }) - --Define Rainbow shield crafting recipe minetest.register_craft({ output = "rainbow_ore:rainbow_ore_shield", recipe = { - {"rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot"}, - {"rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot"}, - {"", "rainbow_ore:rainbow_ore_ingot", ""}, + { "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot" }, + { "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot", "rainbow_ore:rainbow_ore_ingot" }, + { "", "rainbow_ore:rainbow_ore_ingot", "" }, }, -}) \ No newline at end of file +}) diff --git a/mods/technic_armor/init.lua b/mods/technic_armor/init.lua index 0cf9ff2b..a23ceb7d 100644 --- a/mods/technic_armor/init.lua +++ b/mods/technic_armor/init.lua @@ -1,4 +1,3 @@ - -- Use 3d_armor translator to take advantage of existing translations for armor parts local S = minetest.get_translator("3d_armor") @@ -11,7 +10,7 @@ if minetest.get_modpath("technic_worldgen") then armor = 1.6, heal = 0, use = 500, - radiation = 88 + radiation = 88, } materials.brass = { name = S("Brass"), @@ -19,7 +18,7 @@ if minetest.get_modpath("technic_worldgen") then armor = 1.8, heal = 0, use = 650, - radiation = 43 + radiation = 43, } materials.cast = { name = S("Cast Iron"), @@ -27,7 +26,7 @@ if minetest.get_modpath("technic_worldgen") then armor = 2.5, heal = 8, use = 200, - radiation = 40 + radiation = 40, } materials.carbon = { name = S("Carbon Steel"), @@ -35,7 +34,7 @@ if minetest.get_modpath("technic_worldgen") then armor = 2.7, heal = 10, use = 100, - radiation = 40 + radiation = 40, } materials.stainless = { name = S("Stainless Steel"), @@ -43,7 +42,7 @@ if minetest.get_modpath("technic_worldgen") then armor = 2.7, heal = 10, use = 75, - radiation = 40 + radiation = 40, } end @@ -54,7 +53,7 @@ if minetest.get_modpath("moreores") then armor = 1.8, heal = 6, use = 650, - radiation = 53 + radiation = 53, } end @@ -65,7 +64,7 @@ if minetest.get_modpath("default") then armor = 1.6, heal = 0, use = 750, - radiation = 37 + radiation = 37, } end @@ -75,29 +74,29 @@ local parts = { place = "head", level = 5, radlevel = 0.10, - craft = {{1, 1, 1}, {1, 0, 1}} + craft = { { 1, 1, 1 }, { 1, 0, 1 } }, }, chestplate = { name = S("Chestplate"), place = "torso", level = 8, radlevel = 0.35, - craft = {{1, 0, 1}, {1, 1, 1}, {1, 1, 1}} + craft = { { 1, 0, 1 }, { 1, 1, 1 }, { 1, 1, 1 } }, }, leggings = { name = S("Leggings"), place = "legs", level = 7, radlevel = 0.15, - craft = {{1, 1, 1}, {1, 0, 1}, {1, 0, 1}} + craft = { { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 } }, }, boots = { name = S("Boots"), place = "feet", level = 4, radlevel = 0.10, - craft = {{1, 0, 1}, {1, 0, 1}} - } + craft = { { 1, 0, 1 }, { 1, 0, 1 } }, + }, } if minetest.get_modpath("shields") then @@ -106,7 +105,7 @@ if minetest.get_modpath("shields") then place = "shield", level = 5, radlevel = 0.00, - craft = {{1, 1, 1}, {1, 1, 1}, {0, 1, 0}} + craft = { { 1, 1, 1 }, { 1, 1, 1 }, { 0, 1, 0 } }, } end @@ -123,16 +122,21 @@ end for material, m in pairs(materials) do for part, p in pairs(parts) do - local name = "technic_armor:"..part.."_"..material + local name = "technic_armor:" .. part .. "_" .. material armor:register_armor(name, { description = S("@1 @2", m.name, p.name), - inventory_image = "technic_armor_inv_"..part.."_"..material..".png", + inventory_image = "technic_armor_inv_" .. part .. "_" .. material .. ".png", groups = { - ["armor_"..p.place] = math.floor(p.level * m.armor), + ["armor_" .. p.place] = math.floor(p.level * m.armor), armor_heal = m.heal, armor_use = m.use, - armor_radiation = math.floor(p.radlevel * m.radiation) - } + armor_radiation = math.floor(p.radlevel * m.radiation), + }, + armor_groups = { + ["fleshy"] = math.floor(p.level * m.armor), + }, + --damage_groups = + --{ ["level"] = math.floor(p.level * m.armor), }, }) minetest.register_craft({ output = name, @@ -140,3 +144,8 @@ for material, m in pairs(materials) do }) end end + +-- groups = {armor_legs=25, armor_heal=17, armor_use=40, armor_fire=1}, +-- armor_groups = {fleshy=25}, +--damage_groups = {cracky=2, snappy=1, level=3}, +-- wear = 0, diff --git a/mods/tt_armor/init.lua b/mods/tt_armor/init.lua index f95b6e98..e7393f24 100644 --- a/mods/tt_armor/init.lua +++ b/mods/tt_armor/init.lua @@ -17,6 +17,7 @@ tt.register_snippet(function(itemstring) local armor_use = def.groups.armor_use local armor_fire = def.groups.armor_fire local armor_water = def.groups.armor_water + local armor_radiation = def.groups.armor_radiation local armor_feather = def.groups.armor_feather local physics_speed = def.groups.physics_speed local physics_gravity = def.groups.physics_gravity @@ -37,6 +38,10 @@ tt.register_snippet(function(itemstring) desc = desc .. "\n" .. S("Fire: @1", armor_fire) end + if armor_radiation then + desc = desc .. "\n" .. S("Radiation: @1", armor_radiation) + end + if armor_water then desc = desc .. "\n" .. S("Water protection") end