diff --git a/.gitmodules b/.gitmodules index 758b11da..a74a4758 100644 --- a/.gitmodules +++ b/.gitmodules @@ -189,3 +189,18 @@ [submodule "mods/camera"] path = mods/camera url = https://github.com/sys4-fr/camera.git +[submodule "mods/3d_armor"] + path = mods/3d_armor + url = https://github.com/stujones11/minetest-3d_armor.git +[submodule "mods/technic_armor"] + path = mods/technic_armor + url = https://github.com/stujones11/technic_armor.git +[submodule "mods/hbhunger"] + path = mods/hbhunger + url = http://repo.or.cz/minetest_hbhunger.git +[submodule "mods/hudbars"] + path = mods/hudbars + url = http://repo.or.cz/minetest_hudbars.git +[submodule "mods/mana"] + path = mods/mana + url = git://repo.or.cz/minetest_mana.git diff --git a/minetest.conf b/minetest.conf index 7873f025..8ac0ec31 100755 --- a/minetest.conf +++ b/minetest.conf @@ -50,7 +50,7 @@ server_name = NotreAmiLeCube (Survival & PVP) [FR/EN] server_description = Server hosted by sys4. This server have a class system(Warrior, Hunter, Wizard) and is highly modded, content-rich, good luck to survive and have fun! [This server is a fork from MinetestForFun Classic] motd = Welcome to "NotreAmiLeCube (Survival & PVP) [EN/FR]" server! / Bienvenue sur le serveur "NotreAmiLeCube (Survie & PVP) [FR/EN]" ! serverlist_url = servers.minetest.net -server_url = http://mff.sys4.fr/ +server_url = http://nalc.sys4.fr/ server_announce = false server_address = 78.210.252.189 port = 30002 @@ -149,6 +149,63 @@ creeper:creeper = 25000,2 mob_horse:horse = 60000,1 mobs_turtles:turtle = 30000,1 mobs_turtles:seaturtle = 30000,1 + +# Armor Configuration +# ------------------- + +# Set false to disable individual armor materials. +armor_material_wood = true +armor_material_cactus = true +armor_material_steel = true +armor_material_bronze = true +armor_material_diamond = true +armor_material_gold = true +armor_material_mithril = true +armor_material_crystal = false +armor_material_reinforcedleather = true +armor_material_hardenedleather = true +armor_material_blackmithril = true + +# Increase this if you get initialization glitches when a player first joins. +armor_init_delay = 1 + +# Number of initialization attempts. +# Use in conjunction with armor_init_delay if initialization problems persist. +armor_init_times = 1 + +# Increase this if armor is not getting into bones due to server lag. +armor_bones_delay = 1 + +# How often player armor items are updated. +armor_update_time = 1 + +# Drop armor when a player dies. +# Uses bones mod if present, otherwise items are dropped around the player. +armor_drop = true + +# Pulverise armor when a player dies, overrides armor_drop. +armor_destroy = false + +# You can use this to increase or decrease overall armor effectiveness, +# eg: level_multiplier = 0.5 will reduce armor level by half. +armor_level_multiplier = 1 + +# You can use this to increase or decrease overall armor healing, +# eg: armor_heal_multiplier = 0 will disable healing altogether. +armor_heal_multiplier = 1 + +# Enable water protection (periodically restores breath when activated) +armor_water_protect = true + +# Enable fire protection (defaults true if using ethereal mod) +armor_fire_protect = false + +# Enable punch damage effects. +armor_punch_damage = true + +# Enable migration of old armor inventories +armor_migrate_old_inventory = true + # DROPONDIE MOD - si false, les sacs des joueurs sont vidées à leurs mort keepInventory = false # RANDOM_MESSAGES MOD - paramétrage de l'interval entre deux messages, 30min actuellement @@ -194,12 +251,12 @@ secure.trusted_mods = irc, snow, stacktraceplus #irc.send_join_part = true ## Player Anim ## -player_model_version = default_character_v1 +player_model_version = default_character_v2 # item_drop enable_item_drop = false enable_item_pickup_key = false -enable_item_pickup = true +#enable_item_pickup = true item_pickup_radius = 0.75 -item_pickup_keytype = Sneak +#item_pickup_keytype = Sneak diff --git a/mods/3d_armor b/mods/3d_armor new file mode 160000 index 00000000..579d245a --- /dev/null +++ b/mods/3d_armor @@ -0,0 +1 @@ +Subproject commit 579d245a00fcf5bc4fef438d6d1efe84873339b7 diff --git a/mods/3d_armor/.gitignore b/mods/3d_armor/.gitignore deleted file mode 100755 index 6e4e4593..00000000 --- a/mods/3d_armor/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -## Generic ignorable patterns and files -*~ -.*.swp -*bak* -tags -*.vim -armor.conf - diff --git a/mods/3d_armor/3d_armor/README.txt b/mods/3d_armor/3d_armor/README.txt deleted file mode 100755 index 224f81c9..00000000 --- a/mods/3d_armor/3d_armor/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -[mod] Visible Player Armor [3d_armor] -===================================== - -Depends: default - -Recommends: inventory_plus or unified_inventory (use only one) - -Adds craftable armor that is visible to other players. Each armor item worn contributes to -a player's armor group level making them less vulnerable to weapons. - -Armor takes damage when a player is hurt but also offers a percentage chance of healing. -Overall level is boosted by 10% when wearing a full matching set. - -Fire protection added by TenPlus1 when using crystal armor if Ethereal mod active, level 1 -protects against torches, level 2 for crystal spike, level 3 for fire, level 5 for lava. - -Configuration -------------- - -Armor can be configured by adding a file called armor.conf in 3d_armor mod and/or world directory. -see armor.conf.example for all available options. - -Note: worldpath config settings override any settings made in the mod's directory. - diff --git a/mods/3d_armor/3d_armor/admin.lua b/mods/3d_armor/3d_armor/admin.lua deleted file mode 100755 index eaa71ad8..00000000 --- a/mods/3d_armor/3d_armor/admin.lua +++ /dev/null @@ -1,45 +0,0 @@ -minetest.register_alias("adminboots","3d_armor:boots_admin") -minetest.register_alias("adminhelmet","3d_armor:helmet_admin") -minetest.register_alias("adminchestplate","3d_armor:chestplate_admin") -minetest.register_alias("adminleggings","3d_armor:leggings_admin") - -minetest.register_tool("3d_armor:helmet_admin", { - description = "Admin Helmet", - inventory_image = "3d_armor_inv_helmet_admin.png", - groups = {armor_head=1000, armor_heal=1000, armor_use=0, armor_water=1,}, - wear = 0, - on_drop = function(itemstack, dropper, pos) - return - end, -}) - -minetest.register_tool("3d_armor:chestplate_admin", { - description = "Admin Chestplate", - inventory_image = "3d_armor_inv_chestplate_admin.png", - groups = {armor_torso=1000, armor_heal=1000, armor_use=0}, - wear = 0, - on_drop = function(itemstack, dropper, pos) - return - end, -}) - -minetest.register_tool("3d_armor:leggings_admin", { - description = "Admin Leggings", - inventory_image = "3d_armor_inv_leggings_admin.png", - groups = {armor_legs=1000, armor_heal=1000, armor_use=0}, - wear = 0, - on_drop = function(itemstack, dropper, pos) - return - end, -}) - -minetest.register_tool("3d_armor:boots_admin", { - description = "Admin Boots", - inventory_image = "3d_armor_inv_boots_admin.png", - groups = {armor_feet=1000, armor_heal=1000, armor_use=0}, - wear = 0, - on_drop = function(itemstack, dropper, pos) - return - end, -}) - diff --git a/mods/3d_armor/3d_armor/armor.conf b/mods/3d_armor/3d_armor/armor.conf deleted file mode 100755 index b097f3dd..00000000 --- a/mods/3d_armor/3d_armor/armor.conf +++ /dev/null @@ -1,37 +0,0 @@ --- Armor Configuration (defaults) - --- Increase this if you get initialization glitches when a player first joins. -ARMOR_INIT_DELAY = 3 - --- Number of initialization attempts. --- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist. -ARMOR_INIT_TIMES = 3 - --- Increase this if armor is not getting into bones due to server lag. -ARMOR_BONES_DELAY = 3 - --- How often player armor/wield items are updated. -ARMOR_UPDATE_TIME = 1 - --- Drop armor when a player dies. --- Uses bones mod if present, otherwise items are dropped around the player. -ARMOR_DROP = true - --- Pulverise armor when a player dies, overrides ARMOR_DROP. -ARMOR_DESTROY = false - --- You can use this to increase or decrease overall armor effectiveness, --- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half. -ARMOR_LEVEL_MULTIPLIER = 1 - --- You can use this to increase or decrease overall armor healing, --- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether. -ARMOR_HEAL_MULTIPLIER = 1 - --- You can also use this file to execute arbitary lua code --- eg: Dumb the armor down if using Simple Mobs ---if minetest.get_modpath("mobs") then --- ARMOR_LEVEL_MULTIPLIER = 1 --- ARMOR_HEAL_MULTIPLIER = 0 ---end - diff --git a/mods/3d_armor/3d_armor/armor.conf.example b/mods/3d_armor/3d_armor/armor.conf.example deleted file mode 100755 index 2e1149a1..00000000 --- a/mods/3d_armor/3d_armor/armor.conf.example +++ /dev/null @@ -1,57 +0,0 @@ --- Armor Configuration (defaults) - --- You can remove any unwanted armor materials from this table. --- Note that existing armor that is removed will show up as an unknown item. -ARMOR_MATERIALS = { - wood = "group:wood", - cactus = "default:cactus", - steel = "default:steel_ingot", - bronze = "default:bronze_ingot", - diamond = "default:diamond", - gold = "default:gold_ingot", - mithril = "default:mithril_ingot", - crystal = "ethereal:crystal_ingot", -} - --- Enable fire protection (defaults true if using ethereal mod) -ARMOR_FIRE_PROTECT = false - --- Fire protection nodes, (name, protection level, damage) -ARMOR_FIRE_NODES = { - {"default:lava_source", 5, 4}, - {"default:lava_flowing", 5, 4}, - {"fire:basic_flame", 3, 4}, - {"fire:permanent_flame", 3, 4}, - {"ethereal:crystal_spike", 2, 1}, - {"ethereal:fire_flower", 2, 1}, - {"default:torch", 1, 1}, -} - --- Increase this if you get initialization glitches when a player first joins. -ARMOR_INIT_DELAY = 1 - --- Number of initialization attempts. --- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist. -ARMOR_INIT_TIMES = 1 - --- Increase this if armor is not getting into bones due to server lag. -ARMOR_BONES_DELAY = 1 - --- How often player armor/wield items are updated. -ARMOR_UPDATE_TIME = 1 - --- Drop armor when a player dies. --- Uses bones mod if present, otherwise items are dropped around the player. -ARMOR_DROP = true - --- Pulverise armor when a player dies, overrides ARMOR_DROP. -ARMOR_DESTROY = false - --- You can use this to increase or decrease overall armor effectiveness, --- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half. -ARMOR_LEVEL_MULTIPLIER = 1 - --- You can use this to increase or decrease overall armor healing, --- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether. -ARMOR_HEAL_MULTIPLIER = 1 - diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua deleted file mode 100755 index b5a9808b..00000000 --- a/mods/3d_armor/3d_armor/armor.lua +++ /dev/null @@ -1,721 +0,0 @@ -local armors_no_shields = { ["3d_armor:helmet_hardenedleather"] = true,["3d_armor:chestplate_hardenedleather"] = true, - ["3d_armor:leggings_hardenedleather"] = true,["3d_armor:boots_hardenedleather"] = true, - ["3d_armor:helmet_reinforcedleather"] = true,["3d_armor:chestplate_reinforcedleather"] = true, - ["3d_armor:leggings_reinforcedleather"] = true,["3d_armor:boots_reinforcedleather"] = true, -} -- modif MFF (crabman/24/06/2015) - - -ARMOR_INIT_DELAY = 1 -ARMOR_INIT_TIMES = 1 -ARMOR_BONES_DELAY = 1 -ARMOR_UPDATE_TIME = 1 -ARMOR_DROP = minetest.get_modpath("bones") ~= nil -ARMOR_DESTROY = false -ARMOR_LEVEL_MULTIPLIER = 1 -ARMOR_HEAL_MULTIPLIER = 1 -ARMOR_RADIATION_MULTIPLIER = 1 -ARMOR_MATERIALS = { - wood = "group:wood", - cactus = "default:cactus", - steel = "default:steel_ingot", - bronze = "default:bronze_ingot", - diamond = "default:diamond", - gold = "default:gold_ingot", - mithril = "default:mithril_ingot", - crystal = "ethereal:crystal_ingot", - -- Hunter armors (A déc-ommenter quand activation de l'armure au total) - hardenedleather = "3d_armor:hardenedleather", - reinforcedleather = "3d_armor:reinforcedleather", - -- Warrior armors - blackmithril = "3d_armor:blackmithril_ingot" - -- Wizard armors - --armor = "xxx", - --armor = "xxx", -} -ARMOR_FIRE_PROTECT = minetest.get_modpath("ethereal") ~= nil -ARMOR_FIRE_NODES = { - {"default:lava_source", 5, 8}, - {"default:lava_flowing", 5, 8}, - {"fire:basic_flame", 3, 4}, - {"fire:permanent_flame", 3, 4}, - {"ethereal:crystal_spike", 2, 1}, - {"ethereal:fire_flower", 2, 1}, - {"default:torch", 1, 1}, -} - -local skin_mod = nil -local inv_mod = nil - -local modpath = minetest.get_modpath(ARMOR_MOD_NAME) -local worldpath = minetest.get_worldpath() -local input = io.open(modpath.."/armor.conf", "r") -if input then - dofile(modpath.."/armor.conf") - input:close() - input = nil -end -input = io.open(worldpath.."/armor.conf", "r") -if input then - dofile(worldpath.."/armor.conf") - input:close() - input = nil -end -if not minetest.get_modpath("ethereal") then - ARMOR_MATERIALS.crystal = nil -end - -armor = { - timer = 0, - elements = {"head", "torso", "legs", "feet"}, - physics = {"jump","speed","gravity"}, - formspec = "size[8,8.5]image[2,0.75;2,4;armor_preview]" - .."list[current_player;main;0,4.5;8,4;]" - .."list[current_player;craft;4,1;3,3;]" - .."list[current_player;craftpreview;7,2;1,1;]" - .."listring[current_player;main]" - .."listring[current_player;craft]", - textures = {}, - default_skin = "character", - version = "0.4.5", -} - -if minetest.get_modpath("inventory_plus") then - inv_mod = "inventory_plus" - armor.formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]" - .."image[2.5,0.75;2,4;armor_preview]" - .."label[5,1;Level: armor_level]" - .."label[5,1.5;Heal: armor_heal]" - .."label[5,2;Fire: armor_fire]" - .."label[5,2.5;Radiation: armor_radiation]" - .."list[current_player;main;0,4.5;8,4;]" - if minetest.get_modpath("crafting") then - inventory_plus.get_formspec = function(player, page) - end - end -elseif minetest.get_modpath("unified_inventory") then - inv_mod = "unified_inventory" - unified_inventory.register_button("armor", { - type = "image", - image = "inventory_plus_armor.png", - tooltip = "Armor inventory", - show_with = false, --Modif MFF (Crabman 30/06/2015) - }) - unified_inventory.register_page("armor", { - get_formspec = function(player, perplayer_formspec) - local fy = perplayer_formspec.formspec_y - local name = player:get_player_name() - local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]" - .."label[0,0;Armor]" - .."list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]" - .."image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]" - .."label[5.0,"..(fy + 0.0)..";Level: "..armor.def[name].level.."]" - .."label[5.0,"..(fy + 0.4)..";Heal: "..armor.def[name].heal.."]" - .."label[5.0,"..(fy + 0.8)..";Fire: "..armor.def[name].fire.."]" - .."label[5.0,"..(fy + 1.2)..";Radiation: "..armor.def[name].radiation.."]" - .."label[5.0,"..(fy + 1.6)..";Speed: "..armor.def[name].speed.."]" - .."label[5.0,"..(fy + 2)..";Jump: "..armor.def[name].jump.."]" - .."label[5.0,"..(fy + 2.4)..";Gravity: "..armor.def[name].gravity.."]" - .."listring[current_player;main]" - .."listring[detached:"..name.."_armor;armor]" - return {formspec=formspec} - end, - }) -elseif minetest.get_modpath("inventory_enhanced") then - inv_mod = "inventory_enhanced" -end - -if minetest.get_modpath("skins") then - skin_mod = "skins" -elseif minetest.get_modpath("simple_skins") then - skin_mod = "simple_skins" -elseif minetest.get_modpath("u_skins") then - skin_mod = "u_skins" -elseif minetest.get_modpath("wardrobe") then - skin_mod = "wardrobe" -end - -armor.def = { - state = 0, - count = 0, -} - -armor.update_player_visuals = function(self, player) - if not player then - return - end - local name = player:get_player_name() - if self.textures[name] then - default.player_set_textures(player, { - self.textures[name].skin, - self.textures[name].armor, - self.textures[name].wielditem, - }) - end -end - -armor.set_player_armor = function(self, player) - local name, player_inv = armor:get_valid_player(player, "[set_player_armor]") - if not name then - return - end - local armor_texture = "3d_armor_trans.png" - local armor_level = 0 - local armor_heal = 0 - local armor_fire = 0 - local armor_water = 0 - local armor_radiation = 0 - local state = 0 - local items = 0 - local elements = {} - local textures = {} - local physics_o = {speed=1,gravity=1,jump=1} - local material = {type=nil, count=1} - local preview = "" - for _,v in ipairs(self.elements) do - elements[v] = false - end - for i=1, 6 do - local stack = player_inv:get_stack("armor", i) - local item = stack:get_name() - if stack:get_count() == 1 then - local def = stack:get_definition() - for k, v in pairs(elements) do - if v == false then - local level = def.groups["armor_"..k] - if level then - local texture = item:gsub("%:", "_") - if texture:find("enchanted") then --MFF xdecor enchanting preview fix - texture = texture:gsub("_enchanted", "") - texture = texture:gsub("_strong", "") - texture = texture:gsub("_speed", "") - end - table.insert(textures, texture..".png") - if preview == "" then - preview = texture .. "_preview.png" - elseif stack:get_name():find("shield") then -- //MFF(Mg|09/05/15) - preview = preview.. "^" .. texture.."_preview.png" - else - preview = texture .. "_preview.png^" .. preview - end - armor_level = armor_level + level - state = state + stack:get_wear() - items = items + 1 - armor_heal = armor_heal + (def.groups["armor_heal"] or 0) - armor_fire = armor_fire + (def.groups["armor_fire"] or 0) - armor_water = armor_water + (def.groups["armor_water"] or 0) - armor_radiation = armor_radiation + (def.groups["armor_radiation"] or 0) - for kk,vv in ipairs(self.physics) do - local o_value = def.groups["physics_"..vv] - if o_value then - physics_o[vv] = physics_o[vv] + o_value - end - end - local mat = string.match(item, "%:.+_(.+)$") - if material.type then - if material.type == mat then - material.count = material.count + 1 - end - else - material.type = mat - end - elements[k] = true - end - end - end - end - end - if preview ~= "" then - preview = "^" .. preview - end - preview = armor:get_preview(name) .. preview -- //MFF(Mg|09/05/15) - if minetest.get_modpath("shields") then - armor_level = armor_level * 0.9 - end - if material.type and material.count == #self.elements then - armor_level = armor_level * 1.1 - end - armor_level = armor_level * ARMOR_LEVEL_MULTIPLIER - armor_heal = armor_heal * ARMOR_HEAL_MULTIPLIER - armor_radiation = armor_radiation * ARMOR_RADIATION_MULTIPLIER - if #textures > 0 then - armor_texture = table.concat(textures, "^") - end - local armor_groups = {fleshy=100} - if armor_level > 0 then - armor_groups.level = math.floor(armor_level / 20) - armor_groups.fleshy = 100 - armor_level - armor_groups.radiation = 100 - armor_radiation - end - player:set_armor_groups(armor_groups) - --player:set_physics_override(physics_o) - player_physics.set_stats(player, "3d_armor", {speed=physics_o.speed-1, jump=physics_o.jump-1, gravity=physics_o.gravity-1}) - pclasses.api.util.on_update(name) - self.textures[name].armor = armor_texture - self.textures[name].preview = preview - self.def[name].state = state - self.def[name].count = items - self.def[name].level = armor_level - self.def[name].heal = armor_heal - self.def[name].jump = physics_o.jump - self.def[name].speed = physics_o.speed - self.def[name].gravity = physics_o.gravity - self.def[name].fire = armor_fire - self.def[name].water = armor_water - self.def[name].radiation = armor_radiation - self:update_player_visuals(player) -end - -armor.update_armor = function(self, player) - -- Legacy support: Called when armor levels are changed - -- Other mods can hook on to this function, see hud mod for example -end - -armor.get_player_skin = function(self, name) - local skin = nil - if skin_mod == "skins" or skin_mod == "simple_skins" then - skin = skins.skins[name] - elseif skin_mod == "u_skins" then - skin = u_skins.u_skins[name] - elseif skin_mod == "wardrobe" then - skin = string.gsub(wardrobe.playerSkins[name], "%.png$","") - end - return skin or armor.default_skin -end - -armor.get_preview = function(self, name) - if skin_mod == "skins" then - return armor:get_player_skin(name).."_preview.png" - elseif skin_mod == "u_skins"then - return string.gsub(armor.textures[name].skin, ".png", "_preview.png") - end - return "character_preview.png" -end - -armor.get_armor_formspec = function(self, name) - if not armor.textures[name] then - minetest.log("error", "3d_armor: Player texture["..name.."] is nil [get_armor_formspec]") - return "" - end - if not armor.def[name] then - minetest.log("error", "3d_armor: Armor def["..name.."] is nil [get_armor_formspec]") - return "" - end - local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]" - formspec = formspec:gsub("armor_preview", armor.textures[name].preview) - formspec = formspec:gsub("armor_level", armor.def[name].level) - formspec = formspec:gsub("armor_heal", armor.def[name].heal) - formspec = formspec:gsub("armor_fire", armor.def[name].fire) - formspec = formspec:gsub("armor_radiation", armor.def[name].radiation) - formspec = formspec:gsub("armor_speed", armor.def[name].speed) - formspec = formspec:gsub("armor_jump", armor.def[name].jump) - formspec = formspec:gsub("armor_gravity", armor.def[name].gravity) - return formspec -end - -armor.update_inventory = function(self, player) - local name = armor:get_valid_player(player, "[set_player_armor]") - if not name or inv_mod == "inventory_enhanced" then - return - end - if inv_mod == "unified_inventory" then - if unified_inventory.current_page[name] == "armor" then - unified_inventory.set_inventory_formspec(player, "armor") - end - else - local formspec = armor:get_armor_formspec(name) - if inv_mod == "inventory_plus" then - formspec = formspec.."listring[current_player;main]" - .."listring[detached:"..name.."_armor;armor]" - local page = player:get_inventory_formspec() - if page:find("detached:"..name.."_armor") then - inventory_plus.set_inventory_formspec(player, formspec) - end - else - player:set_inventory_formspec(formspec) - end - end -end - -armor.get_valid_player = function(self, player, msg) - msg = msg or "" - if not player then - minetest.log("error", "3d_armor: Player reference is nil "..msg) - return - end - local name = player:get_player_name() - if not name then - minetest.log("error", "3d_armor: Player name is nil "..msg) - return - end - local pos = player:getpos() - local player_inv = player:get_inventory() - local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"}) - if not pos then - minetest.log("error", "3d_armor: Player position is nil "..msg) - return - elseif not player_inv then - minetest.log("error", "3d_armor: Player inventory is nil "..msg) - return - elseif not armor_inv then - minetest.log("error", "3d_armor: Detached armor inventory is nil "..msg) - return - end - return name, player_inv, armor_inv, pos -end - --- Register Player Model - -default.player_register_model("3d_armor_character.b3d", { - animation_speed = 30, - textures = { - armor.default_skin..".png", - "3d_armor_trans.png", - "3d_armor_trans.png", - }, - animations = { - stand = {x=0, y=79}, - lay = {x=162, y=166}, - walk = {x=168, y=187}, - mine = {x=189, y=198}, - walk_mine = {x=200, y=219}, - sit = {x=81, y=160}, - }, -}) - --- Register Callbacks - -minetest.register_on_player_receive_fields(function(player, formname, fields) - local name = armor:get_valid_player(player, "[on_player_receive_fields]") - if not name or inv_mod == "inventory_enhanced" then - return - end - if inv_mod == "inventory_plus" and fields.armor then - local formspec = armor:get_armor_formspec(name) - inventory_plus.set_inventory_formspec(player, formspec) - return - end - for field, _ in pairs(fields) do - if string.find(field, "skins_set") then - minetest.after(0, function(player) - local skin = armor:get_player_skin(name) - armor.textures[name].skin = skin..".png" - armor:set_player_armor(player) - end, player) - end - end -end) - -minetest.register_on_joinplayer(function(player) - default.player_set_model(player, "3d_armor_character.b3d") - local name = player:get_player_name() - local player_inv = player:get_inventory() - local armor_inv = minetest.create_detached_inventory(name.."_armor", { - on_put = function(inv, listname, index, stack, player) - player:get_inventory():set_stack(listname, index, stack) - armor:set_player_armor(player) - armor:update_inventory(player) - end, - on_take = function(inv, listname, index, stack, player) - player:get_inventory():set_stack(listname, index, nil) - armor:set_player_armor(player) - armor:update_inventory(player) - end, - on_move = function(inv, from_list, from_index, to_list, to_index, count, player) - local plaver_inv = player:get_inventory() - local old_stack = inv:get_stack(from_list, from_index) - local stack = inv:get_stack(to_list, to_index) - player_inv:set_stack(to_list, to_index, stack) - player_inv:set_stack(from_list, from_index, old_stack) - armor:set_player_armor(player) - armor:update_inventory(player) - end, - allow_put = function(inv, listname, index, stack, player) - --DEBUT modif MFF (crabman/24/06/2015) - local name = stack:get_name() - local player_inv = player:get_inventory() - local size = player_inv:get_size(listname) - if not ( (name:split(":")[1] == "3d_armor" and stack:get_definition().groups["armor_heal"]) or name:split(":")[1] == "shields" or name:split(":")[1] == "technic_armor") then - return 0 - end - - -- if player class != item class - if not pclasses.api.util.can_have_item(player:get_player_name(), name) then - return 0 - end - - --MFF (crabman/27/11/2015) no same item type. *helmet* - local ptype = name:split(":")[2]:split("_")[1] - if ptype == "enchanted" then - ptype = name:split(":")[2]:split("_")[2] - end - for i=1, size do - local stack = player_inv:get_stack(listname, i) - if stack:get_count() > 0 then - if stack:get_name():find(ptype) then - return 0 - end - end - end - - if name:find("shield") then - for i=1, size do - local stack = player_inv:get_stack(listname, i) - if stack:get_count() > 0 then - if armors_no_shields[stack:get_name()] ~= nil then - return 0 - end - end - end - else - if armors_no_shields[name] ~= nil then - for i=1, size do - local stack = player_inv:get_stack(listname, i) - if stack:get_count() > 0 then - if stack:get_name():find("shields:") then - return 0 - end - end - end - end - end - --FIN modif MFF (crabman/24/06/2015) - return 1 - end, - allow_take = function(inv, listname, index, stack, player) - return stack:get_count() - end, - allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) - return count - end, - }) - if inv_mod == "inventory_plus" then - inventory_plus.register_button(player,"armor", "Armor") - end - armor_inv:set_size("armor", 6) - player_inv:set_size("armor", 6) - for i=1, 6 do - local stack = player_inv:get_stack("armor", i) - armor_inv:set_stack("armor", i, stack) - end - armor.def[name] = { - state = 0, - count = 0, - level = 0, - heal = 0, - jump = 1, - speed = 1, - gravity = 1, - fire = 0, - water = 0, - radiation = 0, - } - armor.textures[name] = { - skin = armor.default_skin..".png", - armor = "3d_armor_trans.png", - wielditem = "3d_armor_trans.png", - preview = armor.default_skin.."_preview.png", - } - if skin_mod == "skins" then - local skin = skins.skins[name] - if skin and skins.get_type(skin) == skins.type.MODEL then - armor.textures[name].skin = skin..".png" - end - elseif skin_mod == "simple_skins" then - local skin = skins.skins[name] - if skin then - armor.textures[name].skin = skin..".png" - end - elseif skin_mod == "u_skins" then - local skin = u_skins.u_skins[name] - if skin and u_skins.get_type(skin) == u_skins.type.MODEL then - armor.textures[name].skin = skin..".png" - end - elseif skin_mod == "wardrobe" then - local skin = wardrobe.playerSkins[name] - if skin then - armor.textures[name].skin = skin - end - end - if minetest.get_modpath("player_textures") then - local filename = minetest.get_modpath("player_textures").."/textures/player_"..name - local f = io.open(filename..".png") - if f then - f:close() - armor.textures[name].skin = "player_"..name..".png" - end - end - for i=1, ARMOR_INIT_TIMES do - minetest.after(ARMOR_INIT_DELAY * i, function(player) - armor:set_player_armor(player) - if not inv_mod then - armor:update_inventory(player) - end - end, player) - end -end) ---[[ -if ARMOR_DROP == true or ARMOR_DESTROY == true then - armor.drop_armor = function(pos, stack) - local obj = minetest.add_item(pos, stack) - if obj then - obj:setvelocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)}) - end - end - minetest.register_on_dieplayer(function(player) - local name, player_inv, armor_inv, pos = armor:get_valid_player(player, "[on_dieplayer]") - if not name then - return - end - local drop = {} - for i=1, player_inv:get_size("armor") do - local stack = armor_inv:get_stack("armor", i) - -- Modification for MFF - if stack:get_count() > 0 and (not pclasses.data.reserved_items[armor_inv:get_stack("armor", i):get_name()] or - not pclasses.api.util.can_have_item(name, armor_inv:get_stack("armor", i):get_name())) then - table.insert(drop, stack) - armor_inv:set_stack("armor", i, nil) - player_inv:set_stack("armor", i, nil) - end - end - armor:set_player_armor(player) - if inv_mod == "unified_inventory" then - unified_inventory.set_inventory_formspec(player, "craft") - elseif inv_mod == "inventory_plus" then - local formspec = inventory_plus.get_formspec(player,"main") - inventory_plus.set_inventory_formspec(player, formspec) - else - armor:update_inventory(player) - end - if ARMOR_DESTROY == false then - minetest.after(ARMOR_BONES_DELAY, function() - local node = minetest.get_node(vector.round(pos)) - -- Modification for MFF - if node and node.name == "bones:bones" then - local meta = minetest.get_meta(vector.round(pos)) - local owner = meta:get_string("owner") - local inv = meta:get_inventory() - for _,stack in ipairs(drop) do - if name == owner and inv:room_for_item("main", stack) then - inv:add_item("main", stack) - else - armor.drop_armor(pos, stack) - end - end - else - for _,stack in ipairs(drop) do - armor.drop_armor(pos, stack) - end - end - end) - end - end) -end ---]] - -minetest.register_on_player_hpchange(function(player, hp_change) - local name, player_inv, armor_inv = armor:get_valid_player(player, "[on_hpchange]") - if name and hp_change < 0 then - - -- used for insta kill tools/commands like /kill (doesnt damage armor) - if hp_change < -100 then - return hp_change - end - - local heal_max = 0 - local state = 0 - local items = 0 - for i=1, 6 do - local stack = player_inv:get_stack("armor", i) - if stack:get_count() > 0 then - local use = stack:get_definition().groups["armor_use"] or 0 - local heal = stack:get_definition().groups["armor_heal"] or 0 - local item = stack:get_name() - stack:add_wear(use) - armor_inv:set_stack("armor", i, stack) - player_inv:set_stack("armor", i, stack) - state = state + stack:get_wear() - items = items + 1 - if stack:get_count() == 0 then - local desc = minetest.registered_items[item].description - if desc then - minetest.chat_send_player(name, "Your "..desc.." got destroyed!") - end - armor:set_player_armor(player) - armor:update_inventory(player) - end - heal_max = heal_max + heal - end - end - armor.def[name].state = state - armor.def[name].count = items - heal_max = heal_max * ARMOR_HEAL_MULTIPLIER - if heal_max > math.random(100) then - hp_change = 0 - end - armor:update_armor(player) - end - return hp_change -end, true) - --- Fire Protection and water breating, added by TenPlus1 - -if ARMOR_FIRE_PROTECT == true then - -- override hot nodes so they do not hurt player anywhere but mod - for _, row in pairs(ARMOR_FIRE_NODES) do - if minetest.registered_nodes[row[1]] then - minetest.override_item(row[1], {damage_per_second = 0}) - end - end -else - minetest.log("info", "[3d_armor] Fire Nodes disabled") -end - -function armor_step() - for _,player in pairs(minetest.get_connected_players()) do - local name = player:get_player_name() - local pos = player:getpos() - local hp = player:get_hp() - -- water breathing - if name and armor.def[name].water > 0 then - if player:get_breath() < 10 then - player:set_breath(10) - end - end - -- fire protection - if ARMOR_FIRE_PROTECT == true - and name and pos and hp then - pos.y = pos.y + 1.4 -- head level - local node_head = minetest.get_node(pos).name - pos.y = pos.y - 1.2 -- feet level - local node_feet = minetest.get_node(pos).name - -- is player inside a hot node? - for _, row in pairs(ARMOR_FIRE_NODES) do - -- check fire protection, if not enough then get hurt - if row[1] == node_head or row[1] == node_feet then - if hp > 0 and armor.def[name].fire < row[2] then - hp = hp - row[3] * ARMOR_UPDATE_TIME - player:set_hp(hp) - break - end - end - end - end - end - minetest.after(ARMOR_UPDATE_TIME, armor_step) -end - --- Launch once started -minetest.after(0, armor_step) - - --- kill player when command issued -minetest.register_chatcommand("kill", { - params = "", - description = "Kills player instantly", - func = function(name, param) - local player = minetest.get_player_by_name(name) - if player then - player:set_hp(-1001) - end - end, -}) diff --git a/mods/3d_armor/3d_armor/crafting_guide.txt b/mods/3d_armor/3d_armor/crafting_guide.txt deleted file mode 100755 index 2086f8cd..00000000 --- a/mods/3d_armor/3d_armor/crafting_guide.txt +++ /dev/null @@ -1,78 +0,0 @@ -3d_armor -- Crafting Guide --------------------------- - -Helmets: - -+---+---+---+ -| X | X | X | -+---+---+---+ -| X | | X | -+---+---+---+ -| | | | -+---+---+---+ - -[3d_armor:helmet_wood] X = [default:wood] -[3d_armor:helmet_cactus] X = [default:cactus] -[3d_armor:helmet_steel] X = [default:steel_ingot] -[3d_armor:helmet_bronze] X = [default:bronze_ingot] -[3d_armor:helmet_diamond] X = [default:diamond] -[3d_armor:helmet_gold] X = [default:gold_ingot] -[3d_armor:helmet_mithril] X = [default:mithril_ingot] -[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] * - -Chestplates: - -+---+---+---+ -| X | | X | -+---+---+---+ -| X | X | X | -+---+---+---+ -| X | X | X | -+---+---+---+ - -[3d_armor:chestplate_wood] X = [default:wood] -[3d_armor:chestplate_cactus] X = [default:cactus] -[3d_armor:chestplate_steel] X = [default:steel_ingot] -[3d_armor:chestplate_bronze] X = [default:bronze_ingot] -[3d_armor:chestplate_diamond] X = [default:diamond] -[3d_armor:chestplate_gold] X = [default:gold_ingot] -[3d_armor:chestplate_mithril] X = [default:mithril_ingot] -[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] * - -Leggings: - -+---+---+---+ -| X | X | X | -+---+---+---+ -| X | | X | -+---+---+---+ -| X | | X | -+---+---+---+ - -[3d_armor:leggings_wood] X = [default:wood] -[3d_armor:leggings_cactus] X = [default:cactus] -[3d_armor:leggings_steel] X = [default:steel_ingot] -[3d_armor:leggings_bronze] X = [default:bronze_ingot] -[3d_armor:leggings_diamond] X = [default:diamond] -[3d_armor:leggings_gold] X = [default:gold_ingot] -[3d_armor:leggings_mithril] X = [default:mithril_ingot] -[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] * - -Boots: - -+---+---+---+ -| X | | X | -+---+---+---+ -| X | | X | -+---+---+---+ - -[3d_armor:boots_wood] X = [default:wood] -[3d_armor:boots_cactus] X = [default:cactus] -[3d_armor:boots_steel] X = [default:steel_ingot] -[3d_armor:boots_bronze] X = [default:bronze_ingot -[3d_armor:boots_diamond] X = [default:diamond] -[3d_armor:boots_gold] X = [default:gold_ingot] -[3d_armor:boots_mithril] X = [default:mithril_ingot] -[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] * - - * Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal diff --git a/mods/3d_armor/3d_armor/depends.txt b/mods/3d_armor/3d_armor/depends.txt deleted file mode 100755 index 0dd76f9f..00000000 --- a/mods/3d_armor/3d_armor/depends.txt +++ /dev/null @@ -1,7 +0,0 @@ -default -player_physics -inventory_plus? -unified_inventory? -fire? -ethereal? -bakedclay? diff --git a/mods/3d_armor/3d_armor/description.txt b/mods/3d_armor/3d_armor/description.txt deleted file mode 100644 index b0a9b0a5..00000000 --- a/mods/3d_armor/3d_armor/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds craftable armor that is visible to other players. diff --git a/mods/3d_armor/3d_armor/init.lua b/mods/3d_armor/3d_armor/init.lua deleted file mode 100755 index f8aa8626..00000000 --- a/mods/3d_armor/3d_armor/init.lua +++ /dev/null @@ -1,254 +0,0 @@ -ARMOR_MOD_NAME = minetest.get_current_modname() -dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/armor.lua") -dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/admin.lua") - -if ARMOR_MATERIALS.wood then - minetest.register_tool("3d_armor:helmet_wood", { - description = "Wood Helmet", - inventory_image = "3d_armor_inv_helmet_wood.png", - groups = {armor_head=1, armor_heal=0, armor_use=2000}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_wood", { - description = "Wood Chestplate", - inventory_image = "3d_armor_inv_chestplate_wood.png", - groups = {armor_torso=3, armor_heal=0, armor_use=2000}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_wood", { - description = "Wood Leggings", - inventory_image = "3d_armor_inv_leggings_wood.png", - groups = {armor_legs=3, armor_heal=0, armor_use=2000}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_wood", { - description = "Wood Boots", - inventory_image = "3d_armor_inv_boots_wood.png", - groups = {armor_feet=1, armor_heal=0, armor_use=2000}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.cactus then - minetest.register_tool("3d_armor:helmet_cactus", { - description = "Cactus Helmet", - inventory_image = "3d_armor_inv_helmet_cactus.png", - groups = {armor_head=3, armor_heal=0, armor_use=1000}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_cactus", { - description = "Cactus Chestplate", - inventory_image = "3d_armor_inv_chestplate_cactus.png", - groups = {armor_torso=5, armor_heal=0, armor_use=1000}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_cactus", { - description = "Cactus Leggings", - inventory_image = "3d_armor_inv_leggings_cactus.png", - groups = {armor_legs=5, armor_heal=0, armor_use=1000}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_cactus", { - description = "Cactus Boots", - inventory_image = "3d_armor_inv_boots_cactus.png", - groups = {armor_feet=3, armor_heal=0, armor_use=1000}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.steel then - minetest.register_tool("3d_armor:helmet_steel", { - description = "Steel Helmet", - inventory_image = "3d_armor_inv_helmet_steel.png", - groups = {armor_head=4, armor_heal=0, armor_use=500}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_steel", { - description = "Steel Chestplate", - inventory_image = "3d_armor_inv_chestplate_steel.png", - groups = {armor_torso=8, armor_heal=0, armor_use=500}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_steel", { - description = "Steel Leggings", - inventory_image = "3d_armor_inv_leggings_steel.png", - groups = {armor_legs=8, armor_heal=0, armor_use=500}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_steel", { - description = "Steel Boots", - inventory_image = "3d_armor_inv_boots_steel.png", - groups = {armor_feet=4, armor_heal=0, armor_use=500}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.bronze then - minetest.register_tool("3d_armor:helmet_bronze", { - description = "Bronze Helmet", - inventory_image = "3d_armor_inv_helmet_bronze.png", - groups = {armor_head=5, armor_heal=0, armor_use=250}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_bronze", { - description = "Bronze Chestplate", - inventory_image = "3d_armor_inv_chestplate_bronze.png", - groups = {armor_torso=9, armor_heal=0, armor_use=250}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_bronze", { - description = "Bronze Leggings", - inventory_image = "3d_armor_inv_leggings_bronze.png", - groups = {armor_legs=9, armor_heal=0, armor_use=250}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_bronze", { - description = "Bronze Boots", - inventory_image = "3d_armor_inv_boots_bronze.png", - groups = {armor_feet=5, armor_heal=0, armor_use=250}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.diamond then - minetest.register_tool("3d_armor:helmet_diamond", { - description = "Diamond Helmet", - inventory_image = "3d_armor_inv_helmet_diamond.png", - groups = {armor_head=7, armor_heal=0, armor_use=100}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_diamond", { - description = "Diamond Chestplate", - inventory_image = "3d_armor_inv_chestplate_diamond.png", - groups = {armor_torso=13, armor_heal=0, armor_use=100}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_diamond", { - description = "Diamond Leggings", - inventory_image = "3d_armor_inv_leggings_diamond.png", - groups = {armor_legs=13, armor_heal=0, armor_use=100}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_diamond", { - description = "Diamond Boots", - inventory_image = "3d_armor_inv_boots_diamond.png", - groups = {armor_feet=7, armor_heal=0, armor_use=100}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.gold then - minetest.register_tool("3d_armor:helmet_gold", { - description = "Gold Helmet", - inventory_image = "3d_armor_inv_helmet_gold.png", - groups = {armor_head=5, armor_heal=0, armor_use=200}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_gold", { - description = "Gold Chestplate", - inventory_image = "3d_armor_inv_chestplate_gold.png", - groups = {armor_torso=11, armor_heal=0, armor_use=200}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_gold", { - description = "Gold Leggings", - inventory_image = "3d_armor_inv_leggings_gold.png", - groups = {armor_legs=11, armor_heal=0, armor_use=200}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_gold", { - description = "Gold Boots", - inventory_image = "3d_armor_inv_boots_gold.png", - groups = {armor_feet=5, armor_heal=0, armor_use=200}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.mithril then - minetest.register_tool("3d_armor:helmet_mithril", { - description = "Mithril Helmet (Warrior)", - inventory_image = "3d_armor_inv_helmet_mithril.png", - groups = {armor_head=9, armor_heal=0, armor_use=50}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_mithril", { - description = "Mithril Chestplate (Warrior)", - inventory_image = "3d_armor_inv_chestplate_mithril.png", - groups = {armor_torso=15, armor_heal=0, armor_use=50}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_mithril", { - description = "Mithril Leggings (Warrior)", - inventory_image = "3d_armor_inv_leggings_mithril.png", - groups = {armor_legs=15, armor_heal=0, armor_use=50}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_mithril", { - description = "Mithril Boots (Warrior)", - inventory_image = "3d_armor_inv_boots_mithril.png", - groups = {armor_feet=9, armor_heal=0, armor_use=50}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.crystal then - minetest.register_tool("3d_armor:helmet_crystal", { - description = "Crystal Helmet", - inventory_image = "3d_armor_inv_helmet_crystal.png", - groups = {armor_head=15, armor_heal=0, armor_use=50, armor_fire=1}, - wear = 0, - }) - minetest.register_tool("3d_armor:chestplate_crystal", { - description = "Crystal Chestplate", - inventory_image = "3d_armor_inv_chestplate_crystal.png", - groups = {armor_torso=20, armor_heal=0, armor_use=50, armor_fire=1}, - wear = 0, - }) - minetest.register_tool("3d_armor:leggings_crystal", { - description = "Crystal Leggings", - inventory_image = "3d_armor_inv_leggings_crystal.png", - groups = {armor_legs=20, armor_heal=0, armor_use=50, armor_fire=1}, - wear = 0, - }) - minetest.register_tool("3d_armor:boots_crystal", { - description = "Crystal Boots", - inventory_image = "3d_armor_inv_boots_crystal.png", - groups = {armor_feet=15, armor_heal=0, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1}, - wear = 0, - }) -end - -for k, v in pairs(ARMOR_MATERIALS) do - minetest.register_craft({ - output = "3d_armor:helmet_"..k, - recipe = { - {v, v, v}, - {v, "", v}, - {"", "", ""}, - }, - }) - minetest.register_craft({ - output = "3d_armor:chestplate_"..k, - recipe = { - {v, "", v}, - {v, v, v}, - {v, v, v}, - }, - }) - minetest.register_craft({ - output = "3d_armor:leggings_"..k, - recipe = { - {v, v, v}, - {v, "", v}, - {v, "", v}, - }, - }) - minetest.register_craft({ - output = "3d_armor:boots_"..k, - recipe = { - {v, "", v}, - {v, "", v}, - }, - }) -end - diff --git a/mods/3d_armor/3d_armor/models/3d_armor_character.b3d b/mods/3d_armor/3d_armor/models/3d_armor_character.b3d deleted file mode 100755 index 278956b0..00000000 Binary files a/mods/3d_armor/3d_armor/models/3d_armor_character.b3d and /dev/null differ diff --git a/mods/3d_armor/3d_armor/models/3d_armor_character.blend b/mods/3d_armor/3d_armor/models/3d_armor_character.blend deleted file mode 100755 index 5ded978c..00000000 Binary files a/mods/3d_armor/3d_armor/models/3d_armor_character.blend and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin.png deleted file mode 100644 index e9fa1534..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin_preview.png deleted file mode 100644 index 9ef18848..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_admin_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze.png deleted file mode 100644 index 05fb1e89..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze_preview.png deleted file mode 100644 index 5b002826..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus.png deleted file mode 100644 index a4d8d8f8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus_preview.png deleted file mode 100644 index b77493d6..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png deleted file mode 100644 index c4ccdc28..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal_preview.png deleted file mode 100755 index 494c6ee9..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond.png deleted file mode 100644 index c37e2e70..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png deleted file mode 100644 index b7e01d48..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold.png deleted file mode 100644 index 17992c2a..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png deleted file mode 100644 index c6b55b2a..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril.png deleted file mode 100644 index 00047866..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril_preview.png deleted file mode 100644 index 308194f1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_mithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel.png deleted file mode 100644 index 0a7e2cbd..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel_preview.png deleted file mode 100644 index c73a6e8e..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood.png deleted file mode 100644 index 50371af8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood_preview.png deleted file mode 100644 index 7f12ffb9..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin.png deleted file mode 100644 index ff580a30..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin_preview.png deleted file mode 100644 index 59d729b3..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_admin_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze.png deleted file mode 100644 index 6a6957ef..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze_preview.png deleted file mode 100644 index d8b14784..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus.png deleted file mode 100755 index 49c07dd9..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus_preview.png deleted file mode 100644 index bfde0c2d..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png deleted file mode 100644 index 9ed661ab..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal_preview.png deleted file mode 100755 index febb1dcb..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png deleted file mode 100644 index a1750b62..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png deleted file mode 100644 index 69b13f66..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png deleted file mode 100644 index dd872ab8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png deleted file mode 100644 index 9381b9e3..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril.png deleted file mode 100644 index a8193fbf..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril_preview.png deleted file mode 100644 index 993b9d28..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_mithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel.png deleted file mode 100644 index ee1a73a4..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel_preview.png deleted file mode 100644 index 33fb2ab9..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood.png deleted file mode 100644 index b39be331..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood_preview.png deleted file mode 100644 index 02b1f316..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin.png deleted file mode 100644 index 37e3bb96..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin_preview.png deleted file mode 100644 index d653a25c..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_admin_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze.png deleted file mode 100644 index 4f50d22f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze_preview.png deleted file mode 100644 index ae44bfbe..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus.png deleted file mode 100644 index 80dfeae1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus_preview.png deleted file mode 100644 index ab3ad6ea..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png deleted file mode 100644 index f8ef0448..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal_preview.png deleted file mode 100755 index 9c1735a3..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png deleted file mode 100644 index 6ce507c1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png deleted file mode 100644 index 4dd76c16..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold.png deleted file mode 100644 index eac5e6ea..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png deleted file mode 100644 index f7214085..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril.png deleted file mode 100644 index 909154e2..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril_preview.png deleted file mode 100644 index 567a7ecf..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_mithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel.png deleted file mode 100644 index 2571105c..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel_preview.png deleted file mode 100644 index bcc9398f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood.png deleted file mode 100755 index 66b484ae..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood_preview.png deleted file mode 100644 index 36a8976a..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_admin.png deleted file mode 100644 index b124c887..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_bronze.png deleted file mode 100644 index 1f66bf95..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_cactus.png deleted file mode 100644 index a5ec82c8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_crystal.png deleted file mode 100755 index 68cb6d10..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png deleted file mode 100644 index 262489c6..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png deleted file mode 100644 index 00385cd0..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_mithril.png deleted file mode 100644 index f57efc09..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_steel.png deleted file mode 100644 index 0a89d922..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_wood.png deleted file mode 100644 index b6a92449..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_admin.png deleted file mode 100644 index ee6254c3..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_bronze.png deleted file mode 100644 index 9ce96bc7..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_cactus.png deleted file mode 100644 index eabccce8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_crystal.png deleted file mode 100755 index d14de1b1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png deleted file mode 100644 index 73ae2f99..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png deleted file mode 100644 index 387f526c..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_mithril.png deleted file mode 100644 index f2cd956d..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_steel.png deleted file mode 100644 index 32b5ab4f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_wood.png deleted file mode 100644 index c746491d..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_admin.png deleted file mode 100644 index 0eaf9ee8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_bronze.png deleted file mode 100644 index 39418bd3..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_cactus.png deleted file mode 100644 index ca663189..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_crystal.png deleted file mode 100755 index 5b9d031b..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png deleted file mode 100644 index c0a6f11f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png deleted file mode 100644 index e4edc1f2..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_mithril.png deleted file mode 100644 index 259f249b..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_steel.png deleted file mode 100644 index 519ef9a6..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_wood.png deleted file mode 100644 index fbeea447..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_admin.png deleted file mode 100644 index 9358e26e..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_bronze.png deleted file mode 100644 index 75bd9024..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_cactus.png deleted file mode 100644 index 734907f2..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_crystal.png deleted file mode 100755 index 7ed14fe0..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png deleted file mode 100644 index b0cf1514..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png deleted file mode 100644 index ff38e6c9..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_mithril.png deleted file mode 100644 index a0f8a059..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_steel.png deleted file mode 100644 index 5f95a1bd..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_wood.png deleted file mode 100644 index 32a19e20..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin.png deleted file mode 100644 index 28400347..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin_preview.png deleted file mode 100644 index 7900a4ca..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_admin_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze.png deleted file mode 100644 index 99ebdaa1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze_preview.png deleted file mode 100644 index 73f7a111..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus.png deleted file mode 100644 index 6b503670..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus_preview.png deleted file mode 100644 index 1bc7ffaf..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png deleted file mode 100644 index 26793a72..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal_preview.png deleted file mode 100755 index 31ed4f4f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png deleted file mode 100644 index ba7659f1..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png deleted file mode 100644 index af43c4e4..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold.png deleted file mode 100644 index 0e513cb8..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png deleted file mode 100644 index 101eb14f..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril.png deleted file mode 100644 index 9302b938..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril_preview.png deleted file mode 100644 index 734564ea..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_mithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel.png deleted file mode 100644 index b04a4d82..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel_preview.png deleted file mode 100644 index 8ad4affd..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood.png deleted file mode 100644 index e4c8e94b..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood_preview.png deleted file mode 100644 index 5f402785..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_trans.png b/mods/3d_armor/3d_armor/textures/3d_armor_trans.png deleted file mode 100755 index 4d7beb80..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_trans.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_ui_form.png b/mods/3d_armor/3d_armor/textures/3d_armor_ui_form.png deleted file mode 100644 index 69980310..00000000 Binary files a/mods/3d_armor/3d_armor/textures/3d_armor_ui_form.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/character_preview.png b/mods/3d_armor/3d_armor/textures/character_preview.png deleted file mode 100644 index 23d64645..00000000 Binary files a/mods/3d_armor/3d_armor/textures/character_preview.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor/textures/inventory_plus_armor.png b/mods/3d_armor/3d_armor/textures/inventory_plus_armor.png deleted file mode 100755 index 6cde6402..00000000 Binary files a/mods/3d_armor/3d_armor/textures/inventory_plus_armor.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor_stand/LICENSE.txt b/mods/3d_armor/3d_armor_stand/LICENSE.txt deleted file mode 100644 index 5c8246a9..00000000 --- a/mods/3d_armor/3d_armor_stand/LICENSE.txt +++ /dev/null @@ -1,7 +0,0 @@ -[mod] 3d Armor Stand [3d_armor_stand] -===================================== - -License Source Code: LGPL v2.1 - -Lecense Media: CC BY-SA 3.0 - diff --git a/mods/3d_armor/3d_armor_stand/README.txt b/mods/3d_armor/3d_armor_stand/README.txt deleted file mode 100644 index 6a98ab99..00000000 --- a/mods/3d_armor/3d_armor_stand/README.txt +++ /dev/null @@ -1,21 +0,0 @@ -[mod] 3d Armor Stand [3d_armor_stand] -===================================== - -Depends: 3d_armor - -Adds a chest-like armor stand for armor storage and display. - -Crafting --------- - -F = Wooden Fence [default:fence_wood] -S = Steel Ingot [default:steel_ingot] - -+---+---+---+ -| | F | | -+---+---+---+ -| | F | | -+---+---+---+ -| S | S | S | -+---+---+---+ - diff --git a/mods/3d_armor/3d_armor_stand/init.lua b/mods/3d_armor/3d_armor_stand/init.lua deleted file mode 100644 index 0a4e91c1..00000000 --- a/mods/3d_armor/3d_armor_stand/init.lua +++ /dev/null @@ -1,301 +0,0 @@ -local armor_stand_formspec = "size[8,7]" .. - default.gui_bg .. - default.gui_bg_img .. - default.gui_slots .. - default.get_hotbar_bg(0,3) .. - "list[current_name;armor_head;3,0.5;1,1;]" .. - "list[current_name;armor_torso;4,0.5;1,1;]" .. - "list[current_name;armor_legs;3,1.5;1,1;]" .. - "list[current_name;armor_feet;4,1.5;1,1;]" .. - "image[3,0.5;1,1;3d_armor_stand_head.png]" .. - "image[4,0.5;1,1;3d_armor_stand_torso.png]" .. - "image[3,1.5;1,1;3d_armor_stand_legs.png]" .. - "image[4,1.5;1,1;3d_armor_stand_feet.png]" .. - "list[current_player;main;0,3;8,1;]" .. - "list[current_player;main;0,4.25;8,3;8]" - -local elements = {"head", "torso", "legs", "feet"} - -local function get_stand_object(pos) - local object = nil - local objects = minetest.get_objects_inside_radius(pos, 0.5) or {} - for _, obj in pairs(objects) do - local ent = obj:get_luaentity() - if ent then - if ent.name == "3d_armor_stand:armor_entity" then - -- Remove duplicates - if object then - obj:remove() - else - object = obj - end - end - end - end - return object -end - -local function update_entity(pos) - local node = minetest.get_node(pos) - local object = get_stand_object(pos) - if object then - if not string.find(node.name, "3d_armor_stand:") then - object:remove() - return - end - else - object = minetest.add_entity(pos, "3d_armor_stand:armor_entity") - end - if object then - local texture = "3d_armor_trans.png" - local textures = {} - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - local yaw = 0 - if inv then - for _, element in pairs(elements) do - local stack = inv:get_stack("armor_"..element, 1) - if stack:get_count() == 1 then - local item = stack:get_name() or "" - local def = stack:get_definition() or {} - local groups = def.groups or {} - if groups["armor_"..element] then - local texture = def.texture or item:gsub("%:", "_") - table.insert(textures, texture..".png") - end - end - end - end - if #textures > 0 then - texture = table.concat(textures, "^") - end - if node.param2 then - local rot = node.param2 % 4 - if rot == 1 then - yaw = 3 * math.pi / 2 - elseif rot == 2 then - yaw = math.pi - elseif rot == 3 then - yaw = math.pi / 2 - end - end - object:setyaw(yaw) - object:set_properties({textures={texture}}) - end -end - -local function has_locked_armor_stand_privilege(meta, player) - local name = "" - if player then - if minetest.check_player_privs(player, "protection_bypass") then - return true - end - name = player:get_player_name() - end - if name ~= meta:get_string("owner") then - return false - end - return true -end - -minetest.register_node("3d_armor_stand:armor_stand", { - description = "Armor stand", - drawtype = "mesh", - mesh = "3d_armor_stand.obj", - tiles = {"default_wood.png", "default_steel_block.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.5,-0.5,-0.5, 0.5,1.4,0.5} - }, - groups = {choppy=2, oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", armor_stand_formspec) - meta:set_string("infotext", "Armor Stand") - local inv = meta:get_inventory() - for _, element in pairs(elements) do - inv:set_size("armor_"..element, 1) - end - end, - can_dig = function(pos, player) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - for _, element in pairs(elements) do - if not inv:is_empty("armor_"..element) then - return false - end - end - return true - end, - after_place_node = function(pos) - minetest.add_entity(pos, "3d_armor_stand:armor_entity") - end, - allow_metadata_inventory_put = function(pos, listname, index, stack) - local def = stack:get_definition() or {} - local groups = def.groups or {} - if groups[listname] then - return 1 - end - return 0 - end, - allow_metadata_inventory_move = function(pos) - return 0 - end, - on_metadata_inventory_put = function(pos) - update_entity(pos) - end, - on_metadata_inventory_take = function(pos) - update_entity(pos) - end, - after_destruct = function(pos) - update_entity(pos) - end, - on_blast = function(pos) - local object = get_stand_object(pos) - if object then - object:remove() - end - minetest.after(1, function(pos) - update_entity(pos) - end, pos) - end, -}) - -minetest.register_node("3d_armor_stand:locked_armor_stand", { - description = "Locked Armor stand", - drawtype = "mesh", - mesh = "3d_armor_stand.obj", - tiles = {"default_wood.png", "default_steel_block.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.5,-0.5,-0.5, 0.5,1.4,0.5} - }, - groups = {choppy=2, oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", armor_stand_formspec) - meta:set_string("infotext", "Armor Stand") - meta:set_string("owner", "") - local inv = meta:get_inventory() - for _, element in pairs(elements) do - inv:set_size("armor_"..element, 1) - end - end, - can_dig = function(pos, player) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - for _, element in pairs(elements) do - if not inv:is_empty("armor_"..element) then - return false - end - end - return true - end, - after_place_node = function(pos, placer) - minetest.add_entity(pos, "3d_armor_stand:armor_entity") - local meta = minetest.get_meta(pos) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", "Armor Stand (owned by " .. - meta:get_string("owner") .. ")") - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) - if not has_locked_armor_stand_privilege(meta, player) then - return 0 - end - local def = stack:get_definition() or {} - local groups = def.groups or {} - if groups[listname] then - return 1 - end - return 0 - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) - if not has_locked_armor_stand_privilege(meta, player) then - return 0 - end - return stack:get_count() - end, - allow_metadata_inventory_move = function(pos) - return 0 - end, - on_metadata_inventory_put = function(pos) - update_entity(pos) - end, - on_metadata_inventory_take = function(pos) - update_entity(pos) - end, - after_destruct = function(pos) - update_entity(pos) - end, - on_blast = function(pos) - local object = get_stand_object(pos) - if object then - object:remove() - end - minetest.after(1, function(pos) - update_entity(pos) - end, pos) - end, -}) - -minetest.register_entity("3d_armor_stand:armor_entity", { - physical = true, - visual = "mesh", - mesh = "3d_armor_entity.obj", - visual_size = {x=1, y=1}, - collisionbox = {-0.1,-0.4,-0.1, 0.1,1.3,0.1}, - textures = {"3d_armor_trans.png"}, - pos = nil, - timer = 0, - on_activate = function(self) - local pos = self.object:getpos() - if pos then - self.pos = vector.round(pos) - update_entity(pos) - end - end, - on_step = function(self, dtime) - if not self.pos then - return - end - self.timer = self.timer + dtime - if self.timer > 1 then - self.timer = 0 - local pos = self.object:getpos() - if pos then - if vector.equals(vector.round(pos), self.pos) then - return - end - end - update_entity(self.pos) - self.object:remove() - end - end, -}) - -minetest.register_craft({ - output = "3d_armor_stand:armor_stand", - recipe = { - {"", "default:fence_wood", ""}, - {"", "default:fence_wood", ""}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - } -}) - -minetest.register_craft({ - output = "3d_armor_stand:locked_armor_stand", - recipe = { - {"3d_armor_stand:armor_stand", "default:steel_ingot"}, - } -}) - diff --git a/mods/3d_armor/3d_armor_stand/models/3d_armor_entity.obj b/mods/3d_armor/3d_armor_stand/models/3d_armor_entity.obj deleted file mode 100644 index 052f6925..00000000 --- a/mods/3d_armor/3d_armor_stand/models/3d_armor_entity.obj +++ /dev/null @@ -1,193 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: '3d_armor_entity_3.blend' -# www.blender.org -mtllib 3d_armor_entity.mtl -o Player_Cube -v 2.200000 9.763893 1.200000 -v 2.200000 9.763893 -1.200000 -v 2.200000 2.663871 1.200000 -v 2.200000 2.663871 -1.200000 -v -2.200000 9.763893 -1.200000 -v -2.200000 9.763893 1.200000 -v -2.200000 2.663871 -1.200000 -v -2.200000 2.663871 1.200000 -v 2.300000 13.863962 2.300000 -v 2.300000 13.863962 -2.300000 -v 2.300000 9.263885 2.300000 -v 2.300000 9.263885 -2.300000 -v -2.300000 13.863962 -2.300000 -v -2.300000 13.863962 2.300000 -v -2.300000 9.263885 -2.300000 -v -2.300000 9.263885 2.300000 -v -2.322686 2.473175 -1.300000 -v -2.322686 2.473175 1.300000 -v -4.713554 2.682348 1.300000 -v -4.713554 2.682348 -1.300000 -v -1.686446 9.745432 -1.300000 -v -1.686446 9.745432 1.300000 -v -4.077313 9.954605 1.300000 -v -4.077313 9.954605 -1.300000 -v 4.077313 9.954605 -1.300000 -v 4.077313 9.954605 1.300000 -v 1.686446 9.745432 1.300000 -v 1.686446 9.745432 -1.300000 -v 4.713554 2.682348 -1.300000 -v 4.713554 2.682348 1.300000 -v 2.322686 2.473175 1.300000 -v 2.322686 2.473175 -1.300000 -v 0.139099 2.938947 -1.200000 -v 0.139099 2.938947 1.200000 -v 0.261266 -4.059988 1.200000 -v 0.261266 -4.059988 -1.200000 -v 2.660901 -4.018101 1.190000 -v 2.660901 -4.018101 -1.210000 -v 2.538733 2.980834 1.190000 -v 2.538733 2.980834 -1.210000 -v -0.139099 2.938947 -1.200000 -v -0.139099 2.938947 1.200000 -v -0.261266 -4.059988 1.200000 -v -0.261266 -4.059988 -1.200000 -v -2.538734 2.980834 -1.210000 -v -2.538734 2.980834 1.190000 -v -2.660901 -4.018101 -1.210000 -v -2.660901 -4.018101 1.190000 -v -2.799999 -4.387500 1.390000 -v -2.799999 -4.387500 -1.410000 -v -2.800000 -0.812499 1.390000 -v -2.800000 -0.812499 -1.410000 -v -0.000000 -4.387500 -1.400000 -v -0.000000 -4.387500 1.400000 -v -0.000000 -0.812499 1.400000 -v -0.000000 -0.812499 -1.400000 -v 2.800000 -0.812499 -1.410000 -v 2.800000 -0.812499 1.390000 -v 2.799999 -4.387500 -1.410000 -v 2.799999 -4.387500 1.390000 -v 0.000000 -4.387500 -1.400000 -v 0.000000 -4.387500 1.400000 -v 0.000000 -0.812499 1.400000 -v 0.000000 -0.812499 -1.400000 -v 2.267006 13.830965 2.267006 -v 2.267006 13.830965 -2.267006 -v 2.267006 9.296881 2.267006 -v 2.267006 9.296881 -2.267006 -v -2.267006 13.830965 -2.267006 -v -2.267006 13.830965 2.267006 -v -2.267006 9.296881 -2.267006 -v -2.267006 9.296881 2.267006 -vt 0.250000 0.375000 -vt 0.250000 0.000000 -vt 0.312500 0.000000 -vt 0.312500 0.375000 -vt 0.437500 0.375000 -vt 0.437500 0.500000 -vt 0.312500 0.500000 -vt 0.562500 0.375000 -vt 0.562500 0.500000 -vt 0.437500 0.000000 -vt 0.500000 0.000000 -vt 0.500000 0.375000 -vt 0.625000 0.000000 -vt 0.625000 0.375000 -vt 0.500000 0.750000 -vt 0.500000 0.500000 -vt 0.625000 0.500000 -vt 0.625000 0.750000 -vt 0.750000 0.750000 -vt 0.750000 1.000000 -vt 0.625000 1.000000 -vt 0.875000 0.750000 -vt 0.875000 1.000000 -vt 0.750000 0.500000 -vt 0.875000 0.500000 -vt 1.000000 0.750000 -vt 1.000000 0.500000 -vt 0.750000 0.375000 -vt 0.812500 0.500000 -vt 0.812500 0.375000 -vt 0.687500 0.375000 -vt 0.687500 0.500000 -vt 0.687500 0.000000 -vt 0.750000 0.000000 -vt 0.812500 0.000000 -vt 0.875000 0.375000 -vt 0.875000 0.000000 -vt 0.125000 0.375000 -vt 0.062500 0.375000 -vt 0.062500 0.500000 -vt 0.125000 0.500000 -vt 0.187500 0.375000 -vt 0.187500 0.500000 -vt 0.000000 0.375000 -vt 0.000000 0.000000 -vt 0.062500 0.000000 -vt 0.187500 0.000000 -vt 0.125000 0.000000 -vt 0.437500 0.875000 -vt 0.437500 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.875000 -vt 0.250000 0.875000 -vt 0.312500 0.875000 -vt 0.312500 0.656250 -vt 0.250000 0.656250 -vt 0.500000 0.875000 -vt 0.437500 0.656250 -vt 0.500000 0.656250 -vt 0.375000 0.656250 -vt 0.312500 1.000000 -usemtl Armor -s off -f 1/1 3/2 4/3 2/4 -f 5/5 6/6 1/7 2/4 -f 8/6 7/5 4/8 3/9 -f 5/5 2/4 4/3 7/10 -f 7/10 8/11 6/12 5/5 -f 8/11 3/13 1/14 6/12 -f 9/15 11/16 12/17 10/18 -f 13/19 14/20 9/21 10/18 -f 12/22 11/23 16/20 15/19 -f 13/19 10/18 12/17 15/24 -f 14/22 13/19 15/24 16/25 -f 9/26 14/22 16/25 11/27 -f 17/28 18/24 19/29 20/30 -f 24/31 23/32 22/24 21/28 -f 23/31 24/14 20/13 19/33 -f 24/31 21/28 17/34 20/33 -f 21/28 22/30 18/35 17/34 -f 22/30 23/36 19/37 18/35 -f 27/30 31/35 30/37 26/36 -f 28/28 32/34 31/35 27/30 -f 25/31 29/33 32/34 28/28 -f 26/31 30/33 29/13 25/14 -f 25/31 28/28 27/24 26/32 -f 32/28 29/30 30/29 31/24 -f 40/38 33/39 34/40 39/41 -f 36/42 38/38 37/41 35/43 -f 39/44 37/45 38/46 40/39 -f 34/1 35/2 37/47 39/42 -f 40/38 38/48 36/46 33/39 -f 33/42 36/47 35/48 34/38 -f 45/38 46/41 42/40 41/39 -f 41/42 42/38 43/48 44/47 -f 45/38 41/39 44/46 47/48 -f 42/1 46/42 48/47 43/2 -f 46/44 45/39 47/46 48/45 -f 44/42 43/43 48/41 47/38 -f 53/49 54/50 49/51 50/52 -f 51/53 52/54 50/55 49/56 -f 55/57 51/49 49/58 54/59 -f 52/52 56/54 53/55 50/60 -f 56/49 55/52 54/60 53/58 -f 52/52 51/51 55/61 56/54 -f 64/49 61/58 62/60 63/52 -f 57/52 59/60 61/55 64/54 -f 63/57 62/59 60/58 58/49 -f 58/53 60/56 59/55 57/54 -f 61/49 59/52 60/51 62/50 -f 57/52 64/54 63/61 58/51 -f 65/15 66/18 68/17 67/16 -f 69/19 66/18 65/21 70/20 -f 68/22 71/19 72/20 67/23 -f 69/19 71/24 68/17 66/18 -f 70/22 72/25 71/24 69/19 -f 65/26 67/27 72/25 70/22 diff --git a/mods/3d_armor/3d_armor_stand/models/3d_armor_stand.obj b/mods/3d_armor/3d_armor_stand/models/3d_armor_stand.obj deleted file mode 100644 index 89f3793a..00000000 --- a/mods/3d_armor/3d_armor_stand/models/3d_armor_stand.obj +++ /dev/null @@ -1,191 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: '3d_armor_stand.blend' -# www.blender.org -mtllib 3d_armor_stand.mtl -o Player_Cube -v 0.062500 1.312500 -0.062500 -v 0.062500 1.312500 0.062500 -v -0.062500 1.312500 -0.062500 -v -0.062500 1.312500 0.062500 -v -0.187500 -0.437504 0.062500 -v -0.187500 -0.437504 -0.062500 -v -0.187500 0.937500 0.062500 -v -0.187500 0.937500 -0.062500 -v -0.250000 0.250000 0.062500 -v -0.250000 0.250000 -0.062500 -v -0.250000 0.125003 0.062500 -v -0.250000 0.125003 -0.062500 -v 0.250000 0.250000 0.062500 -v 0.250000 0.250000 -0.062500 -v 0.250000 0.125003 0.062500 -v 0.250000 0.125003 -0.062500 -v -0.062500 -0.437504 -0.062500 -v -0.062500 -0.437504 0.062500 -v -0.062500 0.937500 0.062500 -v -0.062500 0.937500 -0.062500 -v 0.062500 0.250000 0.062500 -v 0.062500 0.250000 -0.062500 -v 0.187500 0.250000 -0.062500 -v 0.187500 0.250000 0.062500 -v 0.187500 0.937500 -0.062500 -v 0.187500 0.937500 0.062500 -v 0.187500 -0.437504 -0.062500 -v 0.187500 -0.437504 0.062500 -v 0.062500 -0.437504 -0.062500 -v 0.062500 -0.437504 0.062500 -v 0.062500 0.937500 0.062500 -v 0.062500 0.937500 -0.062500 -v -0.062500 0.812500 -0.062500 -v -0.187500 0.812500 -0.062500 -v -0.062500 0.812500 0.062500 -v -0.187500 0.812500 0.062500 -v 0.062500 0.812500 -0.062500 -v 0.187500 0.812500 -0.062500 -v 0.187500 0.812500 0.062500 -v 0.062500 0.812500 0.062500 -v 0.375000 0.812500 0.062500 -v 0.375000 0.812500 -0.062500 -v 0.375000 0.937500 0.062500 -v 0.375000 0.937500 -0.062500 -v 0.500000 -0.437500 -0.500000 -v 0.500000 -0.437500 0.500000 -v -0.500000 -0.437500 -0.500000 -v -0.500000 -0.437500 0.500000 -v -0.062500 0.250000 -0.062500 -v -0.187500 0.250000 -0.062500 -v -0.062500 0.250000 0.062500 -v -0.187500 0.250000 0.062500 -v -0.375000 0.937500 0.062500 -v -0.375000 0.937500 -0.062500 -v -0.375000 0.812500 -0.062500 -v -0.375000 0.812500 0.062500 -v 0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 0.500000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 -0.500000 0.500000 -v 0.187500 0.124998 0.062500 -v 0.187500 0.124998 -0.062500 -v 0.062500 0.124998 0.062500 -v 0.062500 0.124998 -0.062500 -v -0.062500 0.124998 -0.062500 -v -0.187500 0.124998 -0.062500 -v -0.062500 0.124998 0.062500 -v -0.187500 0.124998 0.062500 -vt 0.000000 0.000000 -vt 0.875000 0.000000 -vt 0.875000 0.250000 -vt 0.000000 0.250000 -vt 0.125000 0.500000 -vt 0.125000 0.750000 -vt -0.000000 0.750000 -vt -0.000000 0.500000 -vt 0.750000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.250000 -vt 0.750000 0.250000 -vt 0.375000 0.500000 -vt 0.375000 0.750000 -vt 0.875000 0.750000 -vt 0.875000 1.000000 -vt 0.000000 1.000000 -vt 0.875000 0.500000 -vt 0.750000 0.500000 -vt 1.000000 0.500000 -vt 1.000000 0.750000 -vt 0.750000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.625000 0.750000 -vt 0.625000 0.500000 -vt 0.250000 0.500000 -vt 0.250000 0.750000 -vt 0.625000 0.250000 -vt 0.625000 -0.000000 -vt 0.250000 0.250000 -vt 0.250000 0.000000 -vt 0.375000 0.250000 -vt 0.250000 1.000000 -vt 1.000000 1.000000 -vt 0.750000 1.000000 -vt 0.375000 -0.000000 -vt 0.125000 0.250000 -vt 0.125000 1.000000 -vt 0.125000 0.000000 -vt -0.000000 0.937500 -vt 1.000000 0.937500 -vt 0.937500 0.000000 -vt 0.937500 1.000000 -vt 1.000000 0.062500 -vt 0.000000 0.062500 -vt 0.062500 0.000000 -vt 0.062500 1.000000 -g Player_Cube_Stand -usemtl Stand -s off -f 64/1 29/2 30/3 63/4 -f 52/5 50/6 10/7 9/8 -f 17/9 18/10 5/11 6/12 -f 68/3 66/2 6/1 5/4 -f 7/13 8/14 54/7 53/8 -f 67/15 68/16 5/17 18/7 -f 62/4 27/3 29/18 64/8 -f 66/3 65/18 17/8 6/4 -f 9/19 10/20 12/21 11/22 -f 63/7 30/15 28/16 61/17 -f 65/18 67/15 18/7 17/8 -f 61/8 28/18 27/15 62/7 -f 19/23 7/24 36/14 35/25 -f 8/14 7/13 19/26 20/25 -f 23/15 24/18 13/20 14/21 -f 13/8 15/27 16/28 14/7 -f 39/29 38/30 42/10 41/11 -f 29/31 27/4 28/1 30/32 -f 25/28 26/27 43/26 44/25 -f 38/12 25/19 44/13 42/33 -f 25/28 32/7 31/8 26/27 -f 8/26 20/13 33/33 34/29 -f 25/19 38/12 37/11 32/20 -f 31/17 40/7 39/28 26/34 -f 26/34 39/28 41/25 43/23 -f 43/7 41/28 42/34 44/17 -f 53/22 54/21 55/35 56/36 -f 36/14 7/24 53/17 56/7 -f 8/26 34/29 55/11 54/20 -f 34/37 36/33 56/4 55/1 -f 51/13 21/26 22/25 49/14 -f 20/4 3/12 1/19 32/8 -f 40/15 31/16 19/23 35/25 -f 35/29 33/30 37/2 40/3 -f 33/33 20/13 32/5 37/38 -f 3/14 4/24 2/23 1/25 -f 19/12 4/4 3/1 20/9 -f 31/36 2/17 4/7 19/22 -f 32/22 1/7 2/8 31/19 -f 23/5 62/38 64/33 22/13 -f 21/14 63/24 61/39 24/6 -f 61/3 62/2 16/10 15/11 -f 62/38 23/5 14/8 16/4 -f 24/6 61/39 15/17 13/7 -f 50/18 66/3 12/11 10/20 -f 66/40 68/38 11/4 12/1 -f 50/18 49/26 65/29 66/3 -f 51/25 52/15 68/16 67/23 -f 68/16 52/15 9/21 11/35 -f 49/26 22/13 64/33 65/29 -f 51/25 67/23 63/24 21/14 -f 67/33 65/37 64/30 63/29 -f 37/1 22/2 21/3 40/4 -f 38/4 23/3 22/18 37/8 -f 40/7 21/15 24/16 39/17 -f 39/8 24/18 23/15 38/7 -f 36/2 34/3 50/4 52/1 -f 35/15 36/16 52/17 51/7 -f 34/3 33/18 49/8 50/4 -f 33/18 35/15 51/7 49/8 -g Player_Cube_Base -usemtl Base -f 47/17 48/1 46/10 45/35 -f 59/1 57/10 58/35 60/17 -f 48/17 60/41 58/42 46/35 -f 46/43 58/10 57/35 45/44 -f 47/1 45/10 57/45 59/46 -f 48/47 47/48 59/17 60/1 diff --git a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_feet.png b/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_feet.png deleted file mode 100644 index d04f9e39..00000000 Binary files a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_feet.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_head.png b/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_head.png deleted file mode 100644 index 228c08e1..00000000 Binary files a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_head.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_legs.png b/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_legs.png deleted file mode 100644 index 66ec3574..00000000 Binary files a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_legs.png and /dev/null differ diff --git a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_torso.png b/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_torso.png deleted file mode 100644 index af95ec7f..00000000 Binary files a/mods/3d_armor/3d_armor_stand/textures/3d_armor_stand_torso.png and /dev/null differ diff --git a/mods/3d_armor/LICENSE.md b/mods/3d_armor/LICENSE.md deleted file mode 100755 index d383270a..00000000 --- a/mods/3d_armor/LICENSE.md +++ /dev/null @@ -1,11 +0,0 @@ -3D Armor - Visible Player Armor -=============================== - -Default Item Textures (C) Cisoun - WTFPL - -Armor Textures: Copyright (C) 2013 Ryan Jones - CC-BY-SA - -Source Code: Copyright (C) 2013 Stuart Jones - LGPL - -Special credit to Jordach and MirceaKitsune for providing the default 3d character model. - diff --git a/mods/3d_armor/README.md b/mods/3d_armor/README.md deleted file mode 100755 index 54548bf8..00000000 --- a/mods/3d_armor/README.md +++ /dev/null @@ -1,68 +0,0 @@ -Modpack - 3d Armor [0.4.5] -========================== - -[mod] Visible Player Armor [3d_armor] -------------------------------------- - -Minetest Version: 0.4.13 - -Game: minetest_game and many derivatives - -Depends: default - -Recommends: inventory_plus or unified_inventory (use only one) - -Adds craftable armor that is visible to other players. Each armor item worn contributes to -a player's armor group level making them less vulnerable to attack. - -Armor takes damage when a player is hurt, however, many armor items offer a 'stackable' -percentage chance of restoring the lost health points. Overall armor level is boosted by 10% -when wearing a full matching set (helmet, chestplate, leggings and boots of the same material) - -Fire protection has been added by TenPlus1 and in use when ethereal mod is found and crystal -armor has been enabled. each piece of armor offers 1 fire protection, level 1 protects -against torches, level 2 against crystal spikes, 3 for fire and 5 protects when in lava. - -Compatible with player skins [skins] by Zeg9 and Player Textures [player_textures] by PilzAdam -and [simple_skins] by TenPlus1. - -Armor can be configured by adding a file called armor.conf in 3d_armor mod or world directory. -see armor.conf.example for all available options. - -[mod] Visible Wielded Items [wieldview] ---------------------------------------- - -Depends: 3d_armor - -Makes hand wielded items visible to other players. - -[mod] Shields [shields] ------------------------ - -Depends: 3d_armor - -Originally a part of 3d_armor, shields have been re-included as an optional extra. -If you do not want shields then simply remove the shields folder from the modpack. - -[mod] Technic Armor [technic_armor] ------------------------------------ - -Depends: 3d_armor, technic_worldgen - -Adds tin, silver and technic materials to 3d_armor. -Requires technic (technic_worldgen at least) mod. - -[mod] Hazmat Suit [hazmat_suit] -------------------------------- - -Depends: 3d_armor, technic - -Adds hazmat suit to 3d_armor. It protects rather well from fire (if enabled in configuration) and radiation, and it has built-in oxygen supply. -Requires technic mod. - -[mod] 3d Armor Stand [3d_armor_stand] -------------------------------------- - -Depends: 3d_armor - -Adds a chest-like armor stand for armor storage and display. diff --git a/mods/3d_armor/description.txt b/mods/3d_armor/description.txt deleted file mode 100644 index 2da5ba4d..00000000 --- a/mods/3d_armor/description.txt +++ /dev/null @@ -1 +0,0 @@ -Visible player armor & wielded items. diff --git a/mods/3d_armor/modpack.txt b/mods/3d_armor/modpack.txt deleted file mode 100755 index e69de29b..00000000 diff --git a/mods/3d_armor/shields/README.txt b/mods/3d_armor/shields/README.txt deleted file mode 100755 index 3146bcbb..00000000 --- a/mods/3d_armor/shields/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -Adds shields to 3d_armor - -Depends: 3d_armor - -Originally a part of 3d_armor, shields have been re-included as an optional extra. -If you do not what shields then simply remove the shields folder from the modpack. diff --git a/mods/3d_armor/shields/crafting_guide.txt b/mods/3d_armor/shields/crafting_guide.txt deleted file mode 100755 index 651d94cf..00000000 --- a/mods/3d_armor/shields/crafting_guide.txt +++ /dev/null @@ -1,36 +0,0 @@ -Shields -- Crafting Guide --------------------------- - -+---+---+---+ -| X | X | X | -+---+---+---+ -| X | X | X | -+---+---+---+ -| | X | | -+---+---+---+ - -[shields:shield_wood] X = [default:wood] -[shields:shield_cactus] X = [default:cactus] -[shields:shield_steel] X = [default:steel_ingot] -[shields:shield_bronze] X = [default:bronze_ingot] -[shields:shield_diamond] X = [default:diamond] -[shields:shield_gold] X = [default:gold_ingot] -[shields:shield_mithril] X = [default:mithril_ingot] -[shields:shield_crystal] X = [ethereal:crystal_ingot] - -Enhanced Shields ----------------- - -+---+ -| S | -+---+ -| X | -+---+ -| S | -+---+ - -[shields:shield_enhanced_wood] X = [shields:shield_wood] -[shields:shield_enhanced_cactus] X = [shields:shield_cactus] - -S = [default:steel_ingot] - diff --git a/mods/3d_armor/shields/depends.txt b/mods/3d_armor/shields/depends.txt deleted file mode 100755 index 585cc7aa..00000000 --- a/mods/3d_armor/shields/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -3d_armor diff --git a/mods/3d_armor/shields/description.txt b/mods/3d_armor/shields/description.txt deleted file mode 100644 index cb378bbf..00000000 --- a/mods/3d_armor/shields/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds visible shields to 3d armor. diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua deleted file mode 100755 index a24d523f..00000000 --- a/mods/3d_armor/shields/init.lua +++ /dev/null @@ -1,133 +0,0 @@ --- Regisiter Shields - -minetest.register_tool("shields:shield_admin", { - description = "Admin Shield", - inventory_image = "shields_inv_shield_admin.png", - groups = {armor_shield=1000, armor_heal=100, armor_use=0}, - wear = 0, -}) - -if ARMOR_MATERIALS.wood then - minetest.register_tool("shields:shield_wood", { - description = "Wooden Shield", - inventory_image = "shields_inv_shield_wood.png", - groups = {armor_shield=3, armor_heal=0, armor_use=2000}, - wear = 0, - }) - minetest.register_tool("shields:shield_enhanced_wood", { - description = "Enhanced Wood Shield", - inventory_image = "shields_inv_shield_enhanced_wood.png", - groups = {armor_shield=4, armor_heal=0, armor_use=1000}, - wear = 0, - }) - minetest.register_craft({ - output = "shields:shield_enhanced_wood", - recipe = { - {"default:steel_ingot"}, - {"shields:shield_wood"}, - {"default:steel_ingot"}, - }, - }) -end - -if ARMOR_MATERIALS.cactus then - minetest.register_tool("shields:shield_cactus", { - description = "Cactus Shield", - inventory_image = "shields_inv_shield_cactus.png", - groups = {armor_shield=5, armor_heal=0, armor_use=1000}, - wear = 0, - }) - minetest.register_tool("shields:shield_enhanced_cactus", { - description = "Enhanced Cactus Shield", - inventory_image = "shields_inv_shield_enhanced_cactus.png", - groups = {armor_shield=6, armor_heal=0, armor_use=500}, - wear = 0, - }) - minetest.register_craft({ - output = "shields:shield_enhanced_cactus", - recipe = { - {"default:steel_ingot"}, - {"shields:shield_cactus"}, - {"default:steel_ingot"}, - }, - }) -end - -if ARMOR_MATERIALS.steel then - minetest.register_tool("shields:shield_steel", { - description = "Steel Shield", - inventory_image = "shields_inv_shield_steel.png", - groups = {armor_shield=7, armor_heal=0, armor_use=500}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.bronze then - minetest.register_tool("shields:shield_bronze", { - description = "Bronze Shield", - inventory_image = "shields_inv_shield_bronze.png", - groups = {armor_shield=8, armor_heal=0, armor_use=250}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.diamond then - minetest.register_tool("shields:shield_diamond", { - description = "Diamond Shield", - inventory_image = "shields_inv_shield_diamond.png", - groups = {armor_shield=11, armor_heal=0, armor_use=100}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.gold then - minetest.register_tool("shields:shield_gold", { - description = "Gold Shield", - inventory_image = "shields_inv_shield_gold.png", - groups = {armor_shield=9, armor_heal=0, armor_use=200}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.mithril then - minetest.register_tool("shields:shield_mithril", { - description = "Mithril Shield (Warrior)", - inventory_image = "shields_inv_shield_mithril.png", - groups = {armor_shield=13, armor_heal=0, armor_use=50}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.blackmithril then - minetest.register_tool("shields:shield_blackmithril", { - description = "Black Mithril Shield (Warrior)", - inventory_image = "shields_inv_shield_black_mithril_warrior.png", - groups = {armor_shield=15, armor_heal=0, armor_use=50}, - wear = 0, - }) -end - -if ARMOR_MATERIALS.crystal then - minetest.register_tool("shields:shield_crystal", { - description = "Crystal Shield", - inventory_image = "shields_inv_shield_crystal.png", - groups = {armor_shield=15, armor_heal=0, armor_use=50, armor_fire=1}, - wear = 0, - }) -end - -for k, v in pairs(ARMOR_MATERIALS) do - minetest.register_craft({ - output = "shields:shield_"..k, - recipe = { - {v, v, v}, - {v, v, v}, - {"", v, ""}, - }, - }) -end - -minetest.after(0, function() - table.insert(armor.elements, "shield") -end) - diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_admin.png b/mods/3d_armor/shields/textures/shields_inv_shield_admin.png deleted file mode 100755 index eb9a0cdb..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_admin.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_warrior.png b/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_warrior.png deleted file mode 100644 index c4e9c9a2..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_warrior.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_bronze.png b/mods/3d_armor/shields/textures/shields_inv_shield_bronze.png deleted file mode 100755 index ae702935..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_bronze.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_cactus.png b/mods/3d_armor/shields/textures/shields_inv_shield_cactus.png deleted file mode 100755 index e06ff5b5..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_cactus.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png b/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png deleted file mode 100644 index fdc5f329..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_diamond.png b/mods/3d_armor/shields/textures/shields_inv_shield_diamond.png deleted file mode 100755 index 0d54498b..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_diamond.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_cactus.png b/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_cactus.png deleted file mode 100755 index 6bbe19f9..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_cactus.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_wood.png b/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_wood.png deleted file mode 100755 index bd2bebc0..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_enhanced_wood.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_gold.png b/mods/3d_armor/shields/textures/shields_inv_shield_gold.png deleted file mode 100755 index 30f4d798..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_gold.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_mithril.png b/mods/3d_armor/shields/textures/shields_inv_shield_mithril.png deleted file mode 100644 index 2e0a7678..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_mithril.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_steel.png b/mods/3d_armor/shields/textures/shields_inv_shield_steel.png deleted file mode 100755 index b39120e9..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_steel.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_wood.png b/mods/3d_armor/shields/textures/shields_inv_shield_wood.png deleted file mode 100755 index da400204..00000000 Binary files a/mods/3d_armor/shields/textures/shields_inv_shield_wood.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_admin.png b/mods/3d_armor/shields/textures/shields_shield_admin.png deleted file mode 100644 index 8b466d3e..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_admin.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_admin_preview.png b/mods/3d_armor/shields/textures/shields_shield_admin_preview.png deleted file mode 100644 index 86d2f9be..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_admin_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_blackmithril.png b/mods/3d_armor/shields/textures/shields_shield_blackmithril.png deleted file mode 100755 index f19048ab..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_blackmithril.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_blackmithril_preview.png b/mods/3d_armor/shields/textures/shields_shield_blackmithril_preview.png deleted file mode 100644 index 64f58e60..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_blackmithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_bronze.png b/mods/3d_armor/shields/textures/shields_shield_bronze.png deleted file mode 100644 index 1f25adae..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_bronze.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_bronze_preview.png b/mods/3d_armor/shields/textures/shields_shield_bronze_preview.png deleted file mode 100644 index 18acce9f..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_bronze_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_cactus.png b/mods/3d_armor/shields/textures/shields_shield_cactus.png deleted file mode 100644 index 19cca873..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_cactus.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_cactus_preview.png b/mods/3d_armor/shields/textures/shields_shield_cactus_preview.png deleted file mode 100644 index 67cc4de0..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_crystal.png b/mods/3d_armor/shields/textures/shields_shield_crystal.png deleted file mode 100644 index c991a281..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_crystal.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_crystal_preview.png b/mods/3d_armor/shields/textures/shields_shield_crystal_preview.png deleted file mode 100644 index 2fd8d8d4..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_crystal_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_diamond.png b/mods/3d_armor/shields/textures/shields_shield_diamond.png deleted file mode 100644 index dc6a7d20..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_diamond.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_diamond_preview.png b/mods/3d_armor/shields/textures/shields_shield_diamond_preview.png deleted file mode 100644 index 6ea838aa..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_diamond_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus.png b/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus.png deleted file mode 100644 index fe816516..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus_preview.png b/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus_preview.png deleted file mode 100644 index 0da7f565..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_enhanced_wood.png b/mods/3d_armor/shields/textures/shields_shield_enhanced_wood.png deleted file mode 100644 index a86c4fd7..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_enhanced_wood.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_enhanced_wood_preview.png b/mods/3d_armor/shields/textures/shields_shield_enhanced_wood_preview.png deleted file mode 100644 index adfe1a60..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_enhanced_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_gold.png b/mods/3d_armor/shields/textures/shields_shield_gold.png deleted file mode 100644 index abfc7a10..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_gold.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_gold_preview.png b/mods/3d_armor/shields/textures/shields_shield_gold_preview.png deleted file mode 100644 index 94317c6e..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_gold_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_mithril.png b/mods/3d_armor/shields/textures/shields_shield_mithril.png deleted file mode 100644 index d64a144d..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_mithril.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_mithril_preview.png b/mods/3d_armor/shields/textures/shields_shield_mithril_preview.png deleted file mode 100644 index 209dc808..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_mithril_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_steel.png b/mods/3d_armor/shields/textures/shields_shield_steel.png deleted file mode 100644 index df54f9c3..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_steel.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_steel_preview.png b/mods/3d_armor/shields/textures/shields_shield_steel_preview.png deleted file mode 100644 index b922bf87..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_steel_preview.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_wood.png b/mods/3d_armor/shields/textures/shields_shield_wood.png deleted file mode 100644 index 4646e3d3..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_wood.png and /dev/null differ diff --git a/mods/3d_armor/shields/textures/shields_shield_wood_preview.png b/mods/3d_armor/shields/textures/shields_shield_wood_preview.png deleted file mode 100644 index 21972484..00000000 Binary files a/mods/3d_armor/shields/textures/shields_shield_wood_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/LICENSE.txt b/mods/3d_armor/technic_armor/LICENSE.txt deleted file mode 100644 index 2402dac9..00000000 --- a/mods/3d_armor/technic_armor/LICENSE.txt +++ /dev/null @@ -1,7 +0,0 @@ -[mod] Technic Armor [technic_armor] -=================================== - -License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1 - -License Textures: poet.nohit and numberZero - 2015-2017 WTFPL - diff --git a/mods/3d_armor/technic_armor/README.txt b/mods/3d_armor/technic_armor/README.txt deleted file mode 100644 index 76a88eb3..00000000 --- a/mods/3d_armor/technic_armor/README.txt +++ /dev/null @@ -1,9 +0,0 @@ -[mod] Technic Armor [technic_armor] -=================================== - -Adds tin, silver and technic materials to 3d_armor. -Requires technic (technic_worldgen at least) mod. - -Depends: 3d_armor, technic_worldgen - -Textures by poet.nohit and numberZero diff --git a/mods/3d_armor/technic_armor/depends.txt b/mods/3d_armor/technic_armor/depends.txt deleted file mode 100644 index 2546a84b..00000000 --- a/mods/3d_armor/technic_armor/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -3d_armor -technic_worldgen -moreores? diff --git a/mods/3d_armor/technic_armor/description.txt b/mods/3d_armor/technic_armor/description.txt deleted file mode 100644 index 5738c4fa..00000000 --- a/mods/3d_armor/technic_armor/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds tin, silver and technic materials to 3d_armor. diff --git a/mods/3d_armor/technic_armor/init.lua b/mods/3d_armor/technic_armor/init.lua deleted file mode 100644 index e1a663d0..00000000 --- a/mods/3d_armor/technic_armor/init.lua +++ /dev/null @@ -1,56 +0,0 @@ -local stats = { - lead = { name="Lead", material="technic:lead_ingot", armor=1.6, heal=0, use=500, radiation=80*1.1 }, - brass = { name="Brass", material="technic:brass_ingot", armor=1.8, heal=0, use=650, radiation=43 }, - cast = { name="Cast Iron", material="technic:cast_iron_ingot", armor=2.5, heal=8, use=200, radiation=40 }, - carbon = { name="Carbon Steel", material="technic:carbon_steel_ingot", armor=2.7, heal=10, use=100, radiation=40 }, - stainless = { name="Stainless Steel", material="technic:stainless_steel_ingot", armor=2.7, heal=10, use=75, radiation=40 }, -} -if minetest.get_modpath("moreores") then - stats.tin = { name="Tin", material="moreores:tin_ingot", armor=1.6, heal=0, use=750, radiation=37 } - stats.silver = { name="Silver", material="moreores:silver_ingot", armor=1.8, heal=6, use=650, radiation=53 } -end - -local parts = { - helmet = { place="head", name="Helmet", level=5, radlevel = 0.10, craft={{1,1,1},{1,0,1}} }, - chestplate = { place="torso", name="Chestplate", level=8, radlevel = 0.35, craft={{1,0,1},{1,1,1},{1,1,1}} }, - leggings = { place="legs", name="Leggings", level=7, radlevel = 0.15, craft={{1,1,1},{1,0,1},{1,0,1}} }, - boots = { place="feet", name="Boots", level=4, radlevel = 0.10, craft={{1,0,1},{1,0,1}} }, -} -if minetest.get_modpath("shields") then - parts.shield = { place="shield", name="Shield", level=5, radlevel=0.00, craft={{1,1,1},{1,1,1},{0,1,0}} } -end - --- Makes a craft recipe based on a template --- template is a recipe-like table but indices are used instead of actual item names: --- 0 means nothing, everything else is treated as an index in the materials table -local function make_recipe(template, materials) - local recipe = {} - for j, trow in ipairs(template) do - local rrow = {} - for i, tcell in ipairs(trow) do - if tcell == 0 then - rrow[i] = "" - else - rrow[i] = materials[tcell] - end - end - recipe[j] = rrow - end - return recipe -end - -for key, armor in pairs(stats) do - for partkey, part in pairs(parts) do - local partname = "technic_armor:"..partkey.."_"..key - minetest.register_tool(partname, { - description = armor.name.." "..part.name, - inventory_image = "technic_armor_inv_"..partkey.."_"..key..".png", - groups = {["armor_"..part.place]=math.floor(part.level*armor.armor), armor_heal=armor.heal, armor_use=armor.use, armor_radiation=math.floor(part.radlevel*armor.radiation)}, - wear = 0, - }) - minetest.register_craft({ - output = partname, - recipe = make_recipe(part.craft, {armor.material}), - }) - end -end diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png deleted file mode 100644 index a54b9701..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png deleted file mode 100644 index b054d4f0..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png deleted file mode 100644 index 379cc8ec..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png deleted file mode 100644 index 8d7e480d..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png deleted file mode 100644 index 5aa0aaa6..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png deleted file mode 100644 index 22699f23..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png deleted file mode 100644 index a809e623..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png deleted file mode 100644 index a6e7690e..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png deleted file mode 100644 index 1af5ccca..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png deleted file mode 100644 index 01e0caf6..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png deleted file mode 100644 index eaa86c42..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png deleted file mode 100644 index 53cc9e78..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png deleted file mode 100644 index 11c740a4..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png deleted file mode 100644 index b1085af2..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png deleted file mode 100644 index d123aff3..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png deleted file mode 100644 index 94c2a47a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png deleted file mode 100644 index 7f2b9f12..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png deleted file mode 100644 index da747e5e..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png deleted file mode 100644 index 6fa06286..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png deleted file mode 100644 index bfbd4ec3..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png deleted file mode 100644 index 8b91c7e9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png deleted file mode 100644 index 8429cbce..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png deleted file mode 100644 index 67900492..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png deleted file mode 100644 index abf63b63..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png deleted file mode 100644 index c2db5f62..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png deleted file mode 100644 index 1266e6e1..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png deleted file mode 100644 index 562354e9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png deleted file mode 100644 index 362a4ad1..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png deleted file mode 100644 index 9107a10b..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png deleted file mode 100644 index cd625f46..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png deleted file mode 100644 index 2a6eb6f9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png deleted file mode 100644 index 02a67b86..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png deleted file mode 100644 index 87ec50b8..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png deleted file mode 100644 index c8d30c56..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png deleted file mode 100644 index 251a95ed..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png deleted file mode 100644 index ebc64547..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png deleted file mode 100644 index 413625e0..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png deleted file mode 100644 index a1d33d7d..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png deleted file mode 100644 index b37bfcb7..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png deleted file mode 100644 index d08cc693..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png deleted file mode 100644 index 4e0dae27..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png deleted file mode 100644 index efb95be5..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png deleted file mode 100644 index 145d6c30..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png deleted file mode 100644 index dbf043f6..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png deleted file mode 100644 index ba33d073..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png deleted file mode 100644 index 5fb7067a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png deleted file mode 100644 index 7af90038..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png deleted file mode 100644 index 6d114e7a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png deleted file mode 100644 index 6fbc5b39..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png deleted file mode 100644 index 4984954c..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png deleted file mode 100644 index b9217995..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png deleted file mode 100644 index 5e6749e8..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png deleted file mode 100644 index b2ca61da..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png deleted file mode 100644 index 442caa27..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png deleted file mode 100644 index 5462100b..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png deleted file mode 100644 index eeb73287..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png deleted file mode 100644 index e56ec306..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png deleted file mode 100644 index fc2a5920..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png deleted file mode 100644 index 15092c10..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png deleted file mode 100644 index 5e54cd66..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png deleted file mode 100644 index 4a170034..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png deleted file mode 100644 index 1cc480e3..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png deleted file mode 100644 index c37cb75e..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png deleted file mode 100644 index 876bf7ca..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png deleted file mode 100644 index e4673a95..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png deleted file mode 100644 index df61ca62..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png deleted file mode 100644 index 6e456a3e..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png deleted file mode 100644 index ad8c91b2..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png deleted file mode 100644 index 7e4feaf1..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png deleted file mode 100644 index bbaeb6a6..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png deleted file mode 100644 index dbb63cd9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png deleted file mode 100644 index c6ae42a7..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png deleted file mode 100644 index f1bcfb98..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png deleted file mode 100644 index 751e050e..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png deleted file mode 100644 index 39dd7f4c..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png deleted file mode 100644 index 24557263..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png deleted file mode 100644 index e6fb9d8c..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png deleted file mode 100644 index f9c84fdb..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png deleted file mode 100644 index 05048e32..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png deleted file mode 100644 index 2c83e23c..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png deleted file mode 100644 index 9fb6391f..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png deleted file mode 100644 index e7ca67f6..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png deleted file mode 100644 index 67dd9330..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png deleted file mode 100644 index 75be6c9f..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png deleted file mode 100644 index 2777c6d7..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png deleted file mode 100644 index 6ae30f32..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png deleted file mode 100644 index 0f6ecd2a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png deleted file mode 100644 index 5eab543a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png deleted file mode 100644 index 6504d9d8..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png deleted file mode 100644 index 59731350..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png deleted file mode 100644 index a6d105f9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png deleted file mode 100644 index 7ffdb639..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png deleted file mode 100644 index 83d65c4b..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png deleted file mode 100644 index f78e1a9a..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png deleted file mode 100644 index 2b275cff..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png deleted file mode 100644 index 09112776..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png deleted file mode 100644 index 2d0aea62..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png deleted file mode 100644 index 96a82b56..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png deleted file mode 100644 index 8f29f6b4..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png deleted file mode 100644 index 8573eec9..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png deleted file mode 100644 index 1b046819..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png deleted file mode 100644 index 6d6adb37..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png deleted file mode 100644 index 8bdcbb45..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png deleted file mode 100644 index 048927cd..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png and /dev/null differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png deleted file mode 100644 index 25fa7a0b..00000000 Binary files a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png and /dev/null differ diff --git a/mods/3d_armor/wieldview/README.txt b/mods/3d_armor/wieldview/README.txt deleted file mode 100755 index cffae468..00000000 --- a/mods/3d_armor/wieldview/README.txt +++ /dev/null @@ -1,15 +0,0 @@ -[mod] visible wielded items [wieldview] -======================================= - -depends: default, 3d_armor - -Makes hand wielded items visible to other players. - -default settings: [minetest.conf] - -# Set number of seconds between visible wielded item updates. -wieldview_update_time = 2 - -# Show nodes as tiles, disabled by default -wieldview_node_tiles = false - diff --git a/mods/3d_armor/wieldview/depends.txt b/mods/3d_armor/wieldview/depends.txt deleted file mode 100755 index 585cc7aa..00000000 --- a/mods/3d_armor/wieldview/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -3d_armor diff --git a/mods/3d_armor/wieldview/description.txt b/mods/3d_armor/wieldview/description.txt deleted file mode 100644 index 0d51ad95..00000000 --- a/mods/3d_armor/wieldview/description.txt +++ /dev/null @@ -1 +0,0 @@ -Makes hand wielded items visible to other players. diff --git a/mods/3d_armor/wieldview/init.lua b/mods/3d_armor/wieldview/init.lua deleted file mode 100755 index d7b78c57..00000000 --- a/mods/3d_armor/wieldview/init.lua +++ /dev/null @@ -1,75 +0,0 @@ -local time = 0 -local update_time = tonumber(minetest.setting_get("wieldview_update_time")) -if not update_time then - update_time = 2 - minetest.setting_set("wieldview_update_time", tostring(update_time)) -end -local node_tiles = minetest.setting_getbool("wieldview_node_tiles") -if not node_tiles then - node_tiles = false - minetest.setting_set("wieldview_node_tiles", "false") -end - -wieldview = { - wielded_item = {}, - transform = {}, -} - -dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua") - -wieldview.get_item_texture = function(self, item) - local texture = "3d_armor_trans.png" - if item ~= "" then - if minetest.registered_items[item] then - if minetest.registered_items[item].inventory_image ~= "" then - texture = minetest.registered_items[item].inventory_image - elseif node_tiles == true and minetest.registered_items[item].tiles - and type(minetest.registered_items[item].tiles[1]) == "string" - and minetest.registered_items[item].tiles[1] ~= "" then - texture = minetest.inventorycube(minetest.registered_items[item].tiles[1]) - end - end - if wieldview.transform[item] then - texture = texture.."^[transform"..wieldview.transform[item] - end - end - return texture -end - -wieldview.update_wielded_item = function(self, player) - if not player then - return - end - local name = player:get_player_name() - local stack = player:get_wielded_item() - local item = stack:get_name() - if not item then - return - end - if self.wielded_item[name] then - if self.wielded_item[name] == item then - return - end - armor.textures[name].wielditem = self:get_item_texture(item) - armor:update_player_visuals(player) - end - self.wielded_item[name] = item -end - -minetest.register_on_joinplayer(function(player) - local name = player:get_player_name() - wieldview.wielded_item[name] = "" - minetest.after(0, function(player) - wieldview:update_wielded_item(player) - end, player) -end) - -function step() - for _,player in ipairs(minetest.get_connected_players()) do - wieldview:update_wielded_item(player) - end - time = 0 - minetest.after(update_time, step) -end -minetest.after(0, step) - diff --git a/mods/3d_armor/wieldview/transform.lua b/mods/3d_armor/wieldview/transform.lua deleted file mode 100755 index 4d5133e8..00000000 --- a/mods/3d_armor/wieldview/transform.lua +++ /dev/null @@ -1,24 +0,0 @@ --- Wielded Item Transformations - http://dev.minetest.net/texture - -wieldview.transform = { - ["default:torch"]="R270", - ["default:sapling"]="R270", - ["flowers:dandelion_white"]="R270", - ["flowers:dandelion_yellow"]="R270", - ["flowers:geranium"]="R270", - ["flowers:rose"]="R270", - ["flowers:tulip"]="R270", - ["flowers:viola"]="R270", - ["bucket:bucket_empty"]="R270", - ["bucket:bucket_water"]="R270", - ["bucket:bucket_lava"]="R270", - ["screwdriver:screwdriver"]="R270", - ["screwdriver:screwdriver1"]="R270", - ["screwdriver:screwdriver2"]="R270", - ["screwdriver:screwdriver3"]="R270", - ["screwdriver:screwdriver4"]="R270", - ["vessels:glass_bottle"]="R270", - ["vessels:drinking_glass"]="R270", - ["vessels:steel_bottle"]="R270", -} - diff --git a/mods/3d_armor/3d_armor_stand/depends.txt b/mods/3d_armor_classes/mff_classes/depends.txt similarity index 90% rename from mods/3d_armor/3d_armor_stand/depends.txt rename to mods/3d_armor_classes/mff_classes/depends.txt index fdbb2900..b6cac219 100644 --- a/mods/3d_armor/3d_armor_stand/depends.txt +++ b/mods/3d_armor_classes/mff_classes/depends.txt @@ -1,2 +1 @@ 3d_armor - diff --git a/mods/3d_armor_classes/mff_classes/init.lua b/mods/3d_armor_classes/mff_classes/init.lua new file mode 100644 index 00000000..74cba083 --- /dev/null +++ b/mods/3d_armor_classes/mff_classes/init.lua @@ -0,0 +1,226 @@ +armor.config.material_reinforcedleather = true +armor.config.material_hardenedleather = true +armor.config.material_blackmithril = true + +armor.materials.reinforcedleather = "3d_armor:reinforcedleather" +armor.materials.hardenedleather = "3d_armor:hardenedleather" +armor.materials.blackmithril = "3d_armor:blackmithril_ingot" + +-- Load Configuration + +for name, config in pairs(armor.config) do + local setting = minetest.settings:get("armor_"..name) + if type(config) == "number" then + setting = tonumber(setting) + elseif type(config) == "boolean" then + setting = minetest.settings:get_bool("armor_"..name) + end + if setting ~= nil then + armor.config[name] = setting + end +end +for material, _ in pairs(armor.materials) do + local key = "material_"..material + if armor.config[key] == false then + armor.materials[material] = nil + end +end + + +-- Reinforced Leather +minetest.register_craftitem(":3d_armor:reinforcedleather", { + description = "Reinforced Leather", + inventory_image = "3d_armor_reinforcedleather.png", + stack_max = 99, +}) + +minetest.register_craft({ + output = "3d_armor:reinforcedleather", + recipe = { + {"default:mithril_ingot", "technic:brass_ingot", ""}, + {"darkage:chain", "mobs:minotaur_eye", ""}, + {"", "", ""} + } +}) + +if armor.materials.reinforcedleather then + -- Register helmets : + armor:register_armor(":3d_armor:helmet_reinforcedleather", { + description = "Reinforced Leather Helmet (Hunter)", + inventory_image = "3d_armor_inv_helmet_reinforcedleather.png", + groups = {armor_head=1, armor_use=40, physics_speed=0.02, physics_gravity=-0.02}, + armor_groups = {fleshy=6}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=2} + }) + + -- Register chestplates : + armor:register_armor(":3d_armor:chestplate_reinforcedleather", { + description = "Reinforced Leather Chestplate (Hunter)", + inventory_image = "3d_armor_inv_chestplate_reinforcedleather.png", + groups = {armor_torso = 1, armor_use = 40, physics_speed=0.08, physics_gravity=-0.08}, + armor_groups = {fleshy=11}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=2} + }) + + -- Register leggings : + armor:register_armor(":3d_armor:leggings_reinforcedleather", { + description = "Reinforced Leather Leggings (Hunter)", + inventory_image = "3d_armor_inv_leggings_reinforcedleather.png", + groups = {armor_legs = 1, armor_use = 40, physics_speed=0.06, physics_gravity=-0.06}, + armor_groups = {fleshy=11}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=2} + }) + + -- Register boots : + armor:register_armor(":3d_armor:boots_reinforcedleather", { + description = "Reinforced Leather Boots (Hunter)", + inventory_image = "3d_armor_inv_boots_reinforcedleather.png", + groups = {armor_feet = 1, armor_use = 40, physics_speed=0.02, physics_gravity=-0.02}, + armor_groups = {fleshy=6}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=3} + }) +end + + +-- Hardened Leather +minetest.register_craftitem(":3d_armor:hardenedleather", { + description = "Hardened Leather", + inventory_image = "3d_armor_hardenedleather.png", + stack_max = 99, +}) + +minetest.register_craft({ + output = "3d_armor:hardenedleather", + recipe = { + {"default:steel_ingot", "mobs:leather", "default:bronze_ingot"}, + {"mobs:leather", "mobs:leather", "mobs:leather" }, + {"default:bronze_ingot", "mobs:leather", "default:steel_ingot" } + } +}) + +if armor.materials.hardenedleather then + -- Register helmets : + armor:register_armor(":3d_armor:helmet_hardenedleather", { + description = "Hardened Leather Helmet (Hunter)", + inventory_image = "3d_armor_inv_helmet_hardenedleather.png", + groups = {armor_head = 1, armor_use = 250, physics_speed=0.01, physics_gravity=-0.01}, + armor_groups = {fleshy=5}, + damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2} + }) + + -- Register chestplates : + armor:register_armor(":3d_armor:chestplate_hardenedleather", { + description = "Hardened Leather Chestplate (Hunter)", + inventory_image = "3d_armor_inv_chestplate_hardenedleather.png", + groups = {armor_torso = 1, armor_use = 250, physics_speed=0.04, physics_gravity=-0.04}, + armor_groups = {fleshy=8}, + damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2} + }) + + -- Register leggings : + armor:register_armor(":3d_armor:leggings_hardenedleather", { + description = "Hardened Leather Leggings (Hunter)", + inventory_image = "3d_armor_inv_leggings_hardenedleather.png", + groups = {armor_legs = 1, armor_use = 250, physics_speed=0.03, physics_gravity=-0.03}, + armor_groups = {fleshy=8}, + damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2} + }) + + -- Register boots : + armor:register_armor(":3d_armor:boots_hardenedleather", { + description = "Hardened Leather Boots (Hunter)", + inventory_image = "3d_armor_inv_boots_hardenedleather.png", + groups = {armor_feet = 1, armor_use = 250, physics_speed=0.01, physics_gravity=-0.01}, + armor_groups = {fleshy=5}, + damage_groups = {cracky=2, snappy=3, choppy=2, crumbly=1, level=2} + }) +end + +-- Black Mithril +minetest.register_craftitem(":3d_armor:blackmithril_ingot", { + description = "Black Mithril Ingot", + inventory_image = "3d_armor_blackmithril_ingot.png", + stack_max = 99, + groups = {ingot = 1} +}) + +minetest.register_craft({ + output = "3d_armor:blackmithril_ingot", + recipe = { + {"default:mithril_ingot", "mobs:dungeon_master_blood", ""}, + {"mobs:dungeon_master_diamond", "default:obsidian", ""}, + {"", "", ""} + } +}) + +if armor.materials.blackmithril then + -- Register helmets : + armor:register_armor(":3d_armor:helmet_blackmithril", { + description = "Black Mithril Helmet (Warrior)", + inventory_image = "3d_armor_inv_helmet_blackmithril.png", + groups = {armor_head = 1, armor_heal = 15, armor_use = 40}, + armor_groups = {fleshy=16}, + damage_groups = {cracky=2, snappy=1, level=3} + }) + + -- Register chestplates : + armor:register_armor(":3d_armor:chestplate_blackmithril", { + description = "Black Mithril Chestplate (Warrior)", + inventory_image = "3d_armor_inv_chestplate_blackmithril.png", + groups = {armor_torso = 1, armor_heal = 15, armor_use = 40}, + armor_groups = {fleshy=22}, + damage_groups = {cracky=2, snappy=1, level=3} + }) + + -- Register leggings : + armor:register_armor(":3d_armor:leggings_blackmithril", { + description = "Black Mithril Leggings (Warrior)", + inventory_image = "3d_armor_inv_leggings_blackmithril.png", + groups = {armor_legs = 1, armor_heal = 15, armor_use = 40}, + armor_groups = {fleshy=22}, + damage_groups = {cracky=2, snappy=1, level=3} + }) + + -- Register boots : + armor:register_armor(":3d_armor:boots_blackmithril", { + description = "Black Mithril Boots (Warrior)", + inventory_image = "3d_armor_inv_boots_blackmithril.png", + groups = {armor_feet = 1, armor_heal = 15, armor_use = 40}, + armor_groups = {fleshy=16}, + damage_groups = {cracky=2, snappy=1, level=3} + }) +end + +for k, v in pairs(armor.materials) do + minetest.register_craft({ + output = "3d_armor:helmet_"..k, + recipe = { + {v, v, v}, + {v, "", v}, + {"", "", ""}, + }, + }) + minetest.register_craft({ + output = "3d_armor:chestplate_"..k, + recipe = { + {v, "", v}, + {v, v, v}, + {v, v, v}, + }, + }) + minetest.register_craft({ + output = "3d_armor:leggings_"..k, + recipe = { + {v, v, v}, + {v, "", v}, + {v, "", v}, + }, + }) + minetest.register_craft({ + output = "3d_armor:boots_"..k, + recipe = { + {v, "", v}, + {v, "", v}, + }, + }) +end diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_blackmithril_ingot.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_blackmithril_ingot.png new file mode 100644 index 00000000..e4e5e870 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_blackmithril_ingot.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril.png new file mode 100644 index 00000000..617c19e4 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril_preview.png new file mode 100644 index 00000000..a561ce9e Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_blackmithril_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather.png new file mode 100644 index 00000000..ac5aa9ec Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather_preview.png new file mode 100755 index 00000000..61f63038 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_hardenedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather.png new file mode 100644 index 00000000..22a5337b Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather_preview.png new file mode 100755 index 00000000..14bca15a Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_boots_reinforcedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril.png new file mode 100644 index 00000000..613a4882 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril_preview.png new file mode 100644 index 00000000..f39dd559 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_blackmithril_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather.png new file mode 100644 index 00000000..f378a002 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather_preview.png new file mode 100755 index 00000000..c3ee51de Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_hardenedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather.png new file mode 100644 index 00000000..3e918409 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather_preview.png new file mode 100755 index 00000000..44fbdd28 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_chestplate_reinforcedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_hardenedleather.png new file mode 100755 index 00000000..ce24e725 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril.png new file mode 100644 index 00000000..45645f9b Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril_preview.png new file mode 100644 index 00000000..a9e767d1 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_blackmithril_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather.png new file mode 100644 index 00000000..26be0a5a Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather_preview.png new file mode 100755 index 00000000..3d6f5350 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_hardenedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather.png new file mode 100644 index 00000000..d48c3f57 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather_preview.png new file mode 100755 index 00000000..f58ae77b Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_helmet_reinforcedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_blackmithril.png new file mode 100755 index 00000000..498218d0 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_hardenedleather.png new file mode 100755 index 00000000..770f3296 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_reinforcedleather.png new file mode 100644 index 00000000..2ca3e235 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_boots_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_blackmithril.png new file mode 100755 index 00000000..9ef01a19 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_hardenedleather.png new file mode 100755 index 00000000..0d5a9fca Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_reinforcedleather.png new file mode 100644 index 00000000..c3125007 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_chestplate_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_blackmithril.png new file mode 100755 index 00000000..42b2d55f Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_hardenedleather.png new file mode 100755 index 00000000..c34cd715 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_reinforcedleather.png new file mode 100644 index 00000000..71717ec9 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_helmet_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_blackmithril.png new file mode 100755 index 00000000..b7e0eb84 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_hardenedleather.png new file mode 100755 index 00000000..21f1d004 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_reinforcedleather.png new file mode 100644 index 00000000..92890757 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_inv_leggings_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril.png new file mode 100644 index 00000000..9a92c63b Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril_preview.png new file mode 100644 index 00000000..265882cb Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_blackmithril_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather.png new file mode 100644 index 00000000..0478a2dd Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather_preview.png new file mode 100755 index 00000000..bc9a4e88 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_hardenedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather.png new file mode 100644 index 00000000..483017ae Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather_preview.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather_preview.png new file mode 100755 index 00000000..f6e89e76 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_leggings_reinforcedleather_preview.png differ diff --git a/mods/3d_armor_classes/mff_classes/textures/3d_armor_reinforcedleather.png b/mods/3d_armor_classes/mff_classes/textures/3d_armor_reinforcedleather.png new file mode 100755 index 00000000..ecaa9159 Binary files /dev/null and b/mods/3d_armor_classes/mff_classes/textures/3d_armor_reinforcedleather.png differ diff --git a/mods/hbhunger b/mods/hbhunger new file mode 160000 index 00000000..7b10cdcb --- /dev/null +++ b/mods/hbhunger @@ -0,0 +1 @@ +Subproject commit 7b10cdcb5bd89ee4b9ecc7ac696c04a3e6463ce3 diff --git a/mods/hbhunger/README.txt b/mods/hbhunger/README.txt deleted file mode 100755 index 0fc60521..00000000 --- a/mods/hbhunger/README.txt +++ /dev/null @@ -1,75 +0,0 @@ -Minetest mod: Hunger [hbhunger] -=============================== -Version: 0.3.0 - -License of source code: WTFPL ------------------------------ -by Wuzzy (2015) - -Forked from the “Better HUD (and hunger)” mod by BlockMen (2013-2014). - - -Using the mod: --------------- -This mod adds a mechanic for hunger. -This mod depends on the HUD bars mod [hudbars], major version 1. - -You can create a "hunger.conf" file to customize the properties of hunger for your needs. - -About hunger -============ -This mod adds a hunger mechanic to the game. -A new player starts with 20 satiation points out of 30. -Player actions like digging, placing and walking cause exhausion, which lower the player's -satiation. Also every 800 seconds you lose 1 satiation point without doing anything. -If you are hungry (0 satiation) you will suffer damage and die in case you don't eat something. -If your satiation is greater than 15, you will slowly regenerate health points. -Eating food will increase your satiation. -Important: Eating food will not directly increase your health anymore, as long as the food item -is supported by this mod (see below). - - -Currently supported food: -------------------------- -- Apples (default) -- Animalmaterials (mobf modpack) -- Bread (default) -- Bushes -- bushes_classic -- Creatures -- Dwarves (beer and such) -- Docfarming -- Fishing -- Farming plus -- Farming (default and Tenplus1's fork) -- Food -- fruit -- Glooptest -- JKMod -- kpgmobs -- Mobfcooking -- Mooretrees -- Mtfoods -- mushroom -- mush45 -- Seaplants (sea) -- Simple mobs - -Examples: -Eating an apple (from the default Minetest game) increases your satiation by 2, -eating a bread (from the default Minetest game) increases your satiation by 4. - - -License of textures: --------------------- -hunger_icon.png - PilzAdam (WTFPL), modified by BlockMen -hunger_bar.png - Wuzzy (WTFPL) - -everything else is WTFPL: -(c) Copyright BlockMen (2013-2015) - -This program is free software. It comes without any warranty, to -the extent permitted by applicable law. You can redistribute it -and/or modify it under the terms of the Do What The Fuck You Want -To Public License, Version 2, as published by Sam Hocevar. See -http://sam.zoy.org/wtfpl/COPYING for more details. diff --git a/mods/hbhunger/changelog.txt b/mods/hbhunger/changelog.txt deleted file mode 100755 index a1c7f11e..00000000 --- a/mods/hbhunger/changelog.txt +++ /dev/null @@ -1,13 +0,0 @@ -0.1.0 ------ -Initial release - -0.2.0 ------ -- Change “saturation” to “satiation” -- Rename global table to “hbhunger” to avoid collisions -- General cleanup - -0.3.0 ------ -- Play simple eating sound when something is eaten diff --git a/mods/hbhunger/depends.txt b/mods/hbhunger/depends.txt deleted file mode 100755 index 6015079c..00000000 --- a/mods/hbhunger/depends.txt +++ /dev/null @@ -1,29 +0,0 @@ -hudbars -default? -animalmaterials? -bucket? -bushes? -bushes_classic? -cooking? -creatures? -docfarming? -dwarves? -ethereal? -farming? -farming_plus? -ferns? -fishing? -fruit? -glooptest? -jkanimals? -jkfarming? -jkwine? -kpgmobs? -mobfcooking? -mobs? -moretrees? -mtfoods? -mush45? -mushroom? -seaplants? -pclasses? diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/hunger.lua deleted file mode 100755 index 503680a0..00000000 --- a/mods/hbhunger/hunger.lua +++ /dev/null @@ -1,505 +0,0 @@ --- Keep these for backwards compatibility -function hbhunger.save_hunger(player) - hbhunger.set_hunger(player) -end -function hbhunger.load_hunger(player) - hbhunger.get_hunger(player) -end - --- Poison player -local function poisenp(tick, time, time_left, player) - time_left = time_left + tick - if time_left < time then - minetest.after(tick, poisenp, tick, time, time_left, player) - else - --reset hud image - end - if player:get_hp()-1 > 0 then - player:set_hp(player:get_hp()-1) - end - -end - -function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal) - return function(itemstack, user, pointed_thing) - if itemstack:take_item() ~= nil and user ~= nil then - local name = user:get_player_name() - local h = tonumber(hbhunger.hunger[name]) - local hp = user:get_hp() - minetest.sound_play({name = "hbhunger_eat_generic", gain = 1}, {pos=user:getpos(), max_hear_distance = 16}) - - -- Saturation - if h < 30 and hunger_change then - h = h + hunger_change - if h > 30 then h = 30 end - hbhunger.hunger[name] = h - hbhunger.set_hunger(user) - end - -- Healing - if hp < 20 and heal then - hp = hp + heal - if hp > 20 then hp = 20 end - user:set_hp(hp) - end - -- Poison - if poisen then - --set hud-img - poisenp(1.0, poisen, 0, user) - end - - --sound:eat - itemstack:add_item(replace_with_item) - end - return itemstack - end -end - -local function overwrite(name, hunger_change, replace_with_item, poisen, heal) - local tab = minetest.registered_items[name] - if tab == nil then return end - tab.on_use = hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal) - minetest.registered_items[name] = tab -end - -if minetest.get_modpath("default") ~= nil then - overwrite("default:apple", 2) -end -if minetest.get_modpath("farming") ~= nil then - overwrite("farming:bread", 4) -end - -if minetest.get_modpath("mobs") ~= nil then - if mobs.mod ~= nil and mobs.mod == "redo" then - overwrite("mobs:cheese", 4) - overwrite("mobs:meat", 5) - overwrite("mobs:meat_raw", 3) - overwrite("mobs:rat_cooked", 5) - overwrite("mobs:honey", 6) - overwrite("mobs:pork_raw", 4, "", 3) - overwrite("mobs:pork_cooked", 7) - overwrite("mobs:chicken_cooked", 4) - overwrite("mobs:chicken_raw", 2, "", 3) - overwrite("mobs:egg", 1) - overwrite("mobs:chicken_egg_fried", 2) - if minetest.get_modpath("bucket") then - overwrite("mobs:bucket_milk", 3, "bucket:bucket_empty") - end - else - overwrite("mobs:meat", 6) - overwrite("mobs:meat_raw", 3) - overwrite("mobs:rat_cooked", 5) - end -end - -if minetest.get_modpath("moretrees") ~= nil then - overwrite("moretrees:coconut_milk", 1) - overwrite("moretrees:raw_coconut", 2) - overwrite("moretrees:acorn_muffin", 3) - overwrite("moretrees:spruce_nuts", 1) - overwrite("moretrees:pine_nuts", 1) - overwrite("moretrees:fir_nuts", 1) -end - -if minetest.get_modpath("dwarves") ~= nil then - overwrite("dwarves:beer", 2) - overwrite("dwarves:apple_cider", 1) - overwrite("dwarves:midus", 2) - overwrite("dwarves:tequila", 2) - overwrite("dwarves:tequila_with_lime", 2) - overwrite("dwarves:sake", 2) -end - -if minetest.get_modpath("animalmaterials") ~= nil then - overwrite("animalmaterials:milk", 2) - overwrite("animalmaterials:meat_raw", 3) - overwrite("animalmaterials:meat_pork", 3) - overwrite("animalmaterials:meat_beef", 3) - overwrite("animalmaterials:meat_chicken", 3) - overwrite("animalmaterials:meat_lamb", 3) - overwrite("animalmaterials:meat_venison", 3) - overwrite("animalmaterials:meat_undead", 3, "", 3) - overwrite("animalmaterials:meat_toxic", 3, "", 5) - overwrite("animalmaterials:meat_ostrich", 3) - overwrite("animalmaterials:fish_bluewhite", 2) - overwrite("animalmaterials:fish_clownfish", 2) -end - -if minetest.get_modpath("fishing") ~= nil then - overwrite("fishing:fish_raw", 2) - overwrite("fishing:fish_cooked", 4) - overwrite("fishing:sushi", 6) - overwrite("fishing:shark", 2) - overwrite("fishing:shark_cooked", 6) - overwrite("fishing:pike", 2) - overwrite("fishing:pike_cooked", 6) - - overwrite("fishing:clownfish_raw", 2) --new fishing - overwrite("fishing:bluewhite_raw", 2) --new fishing - overwrite("fishing:shark_raw", 2) --new fishing - overwrite("fishing:pike_raw", 2) --new fishing - overwrite("fishing:carp_raw", 2) --new fishing - overwrite("fishing:perch_raw", 2) --new fishing - overwrite("fishing:catfish_raw", 2) --new fishing - overwrite("fishing:exoticfish_raw", 2) --new fishing -end - -if minetest.get_modpath("glooptest") ~= nil then - overwrite("glooptest:kalite_lump", 1) -end - -if minetest.get_modpath("bushes") ~= nil then - overwrite("bushes:sugar", 1) - overwrite("bushes:strawberry", 2) - overwrite("bushes:berry_pie_raw", 3) - overwrite("bushes:berry_pie_cooked", 4) - overwrite("bushes:basket_pies", 15) -end - -if minetest.get_modpath("bushes_classic") then - -- bushes_classic mod, as found in the plantlife modpack - local berries = { - "strawberry", - "blackberry", - "blueberry", - "raspberry", - "gooseberry", - "mixed_berry"} - for _, berry in ipairs(berries) do - if berry ~= "mixed_berry" then - overwrite("bushes:"..berry, 1) - end - overwrite("bushes:"..berry.."_pie_raw", 2) - overwrite("bushes:"..berry.."_pie_cooked", 5) - overwrite("bushes:basket_"..berry, 15) - end -end - -if minetest.get_modpath("flowers") ~= nil then - overwrite("flowers:mushroom_brown", 1) - overwrite("flowers:mushroom_red", 1, "", 3) -end - -if minetest.get_modpath("mushroom") ~= nil then - overwrite("mushroom:brown", 1) - overwrite("mushroom:red", 1, "", 3) - -- mushroom potions: red = strong poison, brown = light restorative - if minetest.get_modpath("vessels") then - overwrite("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) - overwrite("mushroom:poison", 1, "vessels:glass_bottle", 10) - end -end - -if minetest.get_modpath("docfarming") ~= nil then - overwrite("docfarming:carrot", 3) - overwrite("docfarming:cucumber", 2) - overwrite("docfarming:corn", 3) - overwrite("docfarming:potato", 4) - overwrite("docfarming:bakedpotato", 5) - overwrite("docfarming:raspberry", 3) -end - -if minetest.get_modpath("farming_plus") ~= nil then - overwrite("farming_plus:carrot_item", 3) - overwrite("farming_plus:banana", 2) - overwrite("farming_plus:orange_item", 2) - overwrite("farming:pumpkin_bread", 4) - overwrite("farming_plus:strawberry_item", 2) - overwrite("farming_plus:tomato_item", 2) - overwrite("farming_plus:potato_item", 4) - overwrite("farming_plus:rhubarb_item", 2) -end - -if minetest.get_modpath("mtfoods") ~= nil then - overwrite("mtfoods:dandelion_milk", 1) - overwrite("mtfoods:sugar", 1) - overwrite("mtfoods:short_bread", 4) - overwrite("mtfoods:cream", 1) - overwrite("mtfoods:chocolate", 2) - overwrite("mtfoods:cupcake", 2) - overwrite("mtfoods:strawberry_shortcake", 2) - overwrite("mtfoods:cake", 3) - overwrite("mtfoods:chocolate_cake", 3) - overwrite("mtfoods:carrot_cake", 3) - overwrite("mtfoods:pie_crust", 3) - overwrite("mtfoods:apple_pie", 3) - overwrite("mtfoods:rhubarb_pie", 2) - overwrite("mtfoods:banana_pie", 3) - overwrite("mtfoods:pumpkin_pie", 3) - overwrite("mtfoods:cookies", 2) - overwrite("mtfoods:mlt_burger", 5) - overwrite("mtfoods:potato_slices", 2) - overwrite("mtfoods:potato_chips", 3) - --mtfoods:medicine - overwrite("mtfoods:casserole", 3) - overwrite("mtfoods:glass_flute", 2) - overwrite("mtfoods:orange_juice", 2) - overwrite("mtfoods:apple_juice", 2) - overwrite("mtfoods:apple_cider", 2) - overwrite("mtfoods:cider_rack", 2) -end - -if minetest.get_modpath("fruit") ~= nil then - overwrite("fruit:apple", 2) - overwrite("fruit:pear", 2) - overwrite("fruit:bananna", 3) - overwrite("fruit:orange", 2) -end - -if minetest.get_modpath("mush45") ~= nil then - overwrite("mush45:meal", 4) -end - -if minetest.get_modpath("seaplants") ~= nil then - overwrite("seaplants:kelpgreen", 1) - overwrite("seaplants:kelpbrown", 1) - overwrite("seaplants:seagrassgreen", 1) - overwrite("seaplants:seagrassred", 1) - overwrite("seaplants:seasaladmix", 6) - overwrite("seaplants:kelpgreensalad", 1) - overwrite("seaplants:kelpbrownsalad", 1) - overwrite("seaplants:seagrassgreensalad", 1) - overwrite("seaplants:seagrassgreensalad", 1) -end - -if minetest.get_modpath("mobfcooking") ~= nil then - overwrite("mobfcooking:cooked_pork", 6) - overwrite("mobfcooking:cooked_ostrich", 6) - overwrite("mobfcooking:cooked_beef", 6) - overwrite("mobfcooking:cooked_chicken", 6) - overwrite("mobfcooking:cooked_lamb", 6) - overwrite("mobfcooking:cooked_venison", 6) - overwrite("mobfcooking:cooked_fish", 6) -end - -if minetest.get_modpath("creatures") ~= nil then - overwrite("creatures:meat", 6) - overwrite("creatures:flesh", 3) - overwrite("creatures:rotten_flesh", 3, "", 3) -end - -if minetest.get_modpath("ethereal") then - overwrite("ethereal:strawberry", 1) - overwrite("ethereal:banana", 4) - overwrite("ethereal:pine_nuts", 1) - overwrite("ethereal:bamboo_sprout", 0, "", 3) - overwrite("ethereal:fern_tubers", 1) - overwrite("ethereal:banana_bread", 7) - overwrite("ethereal:mushroom_plant", 2) - overwrite("ethereal:coconut_slice", 2) - overwrite("ethereal:golden_apple", 4, "", nil, 10) - overwrite("ethereal:wild_onion_plant", 2) - overwrite("ethereal:mushroom_soup", 4, "ethereal:bowl") - overwrite("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") - overwrite("ethereal:hearty_stew", 6, "ethereal:bowl", 3) - overwrite("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") - if minetest.get_modpath("bucket") then - overwrite("ethereal:bucket_cactus", 2, "bucket:bucket_empty") - end - overwrite("ethereal:fish_raw", 2) - overwrite("ethereal:fish_cooked", 4) - overwrite("ethereal:seaweed", 1) - overwrite("ethereal:yellowleaves", 1, "", nil, 1) - overwrite("ethereal:sashimi", 4) -end - -if minetest.get_modpath("farming") and farming.mod == "redo" then - overwrite("farming:bread", 5) - overwrite("farming:potato", 1) - overwrite("farming:orange", 4) - overwrite("farming:baked_potato", 5) - overwrite("farming:cucumber", 3) - overwrite("farming:tomato", 3) - overwrite("farming:carrot", 3) - overwrite("farming:carrot_gold", 6, "", nil, 10) - overwrite("farming:corn", 3) - overwrite("farming:corn_cob", 5) - overwrite("farming:melon_slice", 2) - overwrite("farming:pumpkin_slice", 1) - overwrite("farming:pumpkin_bread", 7) - overwrite("farming:coffee_cup", 2, "farming:drinking_cup") - overwrite("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) - overwrite("farming:cookie", 2) - overwrite("farming:chocolate_dark", 3) - overwrite("farming:donut", 4) - overwrite("farming:donut_chocolate", 5) - overwrite("farming:donut_apple", 5) - overwrite("farming:raspberries", 1) - overwrite("farming:blueberries", 1) - overwrite("farming:muffin_blueberry", 4) - overwrite("farming:beans", 1) - overwrite("farming:grapes", 2) - if minetest.get_modpath("vessels") then - overwrite("farming:smoothie_raspberry", 2, "vessels:drinking_glass") - end - overwrite("farming:rhubarb", 1) - overwrite("farming:rhubarb_pie", 5) -end - -if minetest.get_modpath("maptools") then - overwrite("maptools:superapple", 10, "", nil, 20) -- valeur perso pour "Super Apple" => 10 coeurs, 5 pains -end - -if minetest.get_modpath("kpgmobs") ~= nil then - overwrite("kpgmobs:uley", 3) - overwrite("kpgmobs:meat", 6) - overwrite("kpgmobs:rat_cooked", 5) - overwrite("kpgmobs:med_cooked", 4) - if minetest.get_modpath("bucket") then - overwrite("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") - end -end - -if minetest.get_modpath("jkfarming") ~= nil then - overwrite("jkfarming:carrot", 3) - overwrite("jkfarming:corn", 3) - overwrite("jkfarming:melon_part", 2) - overwrite("jkfarming:cake", 3) -end - -if minetest.get_modpath("jkanimals") ~= nil then - overwrite("jkanimals:meat", 6) -end - -if minetest.get_modpath("jkwine") ~= nil then - overwrite("jkwine:grapes", 2) - overwrite("jkwine:winebottle", 1) -end - -if minetest.get_modpath("cooking") ~= nil then - overwrite("cooking:meat_beef_cooked", 4) - overwrite("cooking:fish_bluewhite_cooked", 3) - overwrite("cooking:fish_clownfish_cooked", 1) - overwrite("cooking:meat_chicken_cooked", 2) - overwrite("cooking:meat_cooked", 2) - overwrite("cooking:meat_pork_cooked", 3) - overwrite("cooking:meat_toxic_cooked", -3) - overwrite("cooking:meat_venison_cooked", 3) - overwrite("cooking:meat_undead_cooked", 1) -end - --- ferns mod of plantlife_modpack -if minetest.get_modpath("ferns") ~= nil then - overwrite("ferns:fiddlehead", 1, "", 1) - overwrite("ferns:fiddlehead_roasted", 3) - overwrite("ferns:ferntuber_roasted", 3) - overwrite("ferns:horsetail_01", 1) -end - --- Food mod by Rubenwardy ( https://github.com/rubenwardy/food ) -if minetest.get_modpath("food") ~= nil then - overwrite("food:apple_juice", 1) - overwrite("food:rainbow_juice", 6) - overwrite("food:cheese", 4) - overwrite("food:cactus_juice", 3) - overwrite("food:cake", 5) - overwrite("food:cake_carrot", 6) - overwrite("food:cake_choco", 7) - overwrite("food:milk", 3) - overwrite("food:milk_chocolate", 4) - overwrite("food:pasta_bake", 7) - overwrite("food:soup_chicken", 4) - overwrite("food:soup_tomato", 4) -end - --- player-action based hunger changes - -local exhausting_items = { - ["helmet"] = { - ["wood"] = 1, - ["cactus"] = 2, - ["steel"] = 4, - ["bronze"] = 5, - ["gold"] = 6, - ["diamond"] = 3, - ["mithril"] = 1, - ["blackmithril"] = 2 - }, - ["chestplate"] = { - ["wood"] = 1, - ["cactus"] = 2, - ["steel"] = 4, - ["bronze"] = 5, - ["gold"] = 6, - ["diamond"] = 3, - ["mithril"] = 1, - ["blackmithril"] = 2 - }, - ["leggings"] = { - ["wood"] = 1, - ["cactus"] = 2, - ["steel"] = 4, - ["bronze"] = 5, - ["gold"] = 6, - ["diamond"] = 3, - ["mithril"] = 1, - ["blackmithril"] = 2 - }, - ["boots"] = { - ["wood"] = 1, - ["cactus"] = 2, - ["steel"] = 4, - ["bronze"] = 5, - ["gold"] = 6, - ["diamond"] = 3, - ["mithril"] = 1, - ["blackmithril"] = 2 - }, - ["shield"] = { - ["wood"] = 1, - ["cactus"] = 2, - ["steel"] = 4, - ["bronze"] = 5, - ["gold"] = 6, - ["diamond"] = 3, - ["mithril"] = 1, - ["blackmithril"] = 2 - } -} - -function hbhunger.handle_node_actions(pos, oldnode, player, ext) - if not player or not player:is_player() then - return - end - local name = player:get_player_name() - local exhaus = hbhunger.exhaustion[name] - if exhaus == nil then return end -- fix for nodebreaker, if owner has not logged in since the launch of the server, hunger stat is nil,then crash - local new = HUNGER_EXHAUST_PLACE - -- placenode event - if not ext then - new = HUNGER_EXHAUST_DIG - end - -- assume its send by main timer when movement detected - if not pos and not oldnode then - new = HUNGER_EXHAUST_MOVE - end - exhaus = exhaus + new - - -- Armor's exhaus - if minetest.get_modpath("3d_armor") then - local name, inv, arminv, pos = armor:get_valid_player(player, "[exhaus]") - local armorinv = arminv:get_list("armor") --- table.foreach(armorinv, print) - for index, stack in ipairs(armorinv) do - if stack:get_count() > 0 and (stack:get_name():split(":")[1] == "3d_armor" or stack:get_name():split(":")[1] == "shields") then - local itemname = stack:get_name():split(":")[2]:split("_")[1] - local itemmaterial = stack:get_name():split(":")[2]:split("_")[2] - exhaus = exhaus + ((exhausting_items[itemname] and exhausting_items[itemname][itemmaterial]) or 0)/10 -- 0 is admin armor - -- Value is divided by 5 to give a larger scale to our values, without having to high nor - -- too low exhausting factor - end - end - end - - if exhaus > HUNGER_EXHAUST_LVL then - exhaus = 0 - local h = tonumber(hbhunger.hunger[name]) - h = h - 1 - if h < 0 then h = 0 end - hbhunger.hunger[name] = h - hbhunger.set_hunger(player) - end - hbhunger.exhaustion[name] = exhaus -end - -minetest.register_on_placenode(hbhunger.handle_node_actions) -minetest.register_on_dignode(hbhunger.handle_node_actions) diff --git a/mods/hbhunger/init.lua b/mods/hbhunger/init.lua deleted file mode 100755 index dba3d813..00000000 --- a/mods/hbhunger/init.lua +++ /dev/null @@ -1,156 +0,0 @@ -if minetest.setting_getbool("enable_damage") then - -hbhunger = {} - --- HUD statbar values -hbhunger.hunger = {} -hbhunger.hunger_out = {} - --- HUD item ids -local hunger_hud = {} - -HUNGER_HUD_TICK = 1.0 - ---Some hunger settings -hbhunger.exhaustion = {} -- Exhaustion is experimental! - -HUNGER_HUNGER_TICK = 800 -- time in seconds after that 1 hunger point is taken -HUNGER_EXHAUST_DIG = 3 -- exhaustion increased this value after digged node -HUNGER_EXHAUST_PLACE = 1 -- exhaustion increased this value after placed -HUNGER_EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected -HUNGER_EXHAUST_LVL = 160 -- at what exhaustion player satiation gets lowerd - --- NALC : Fix MFF pclasses behaviour -local pc = false -if minetest.get_modpath("pclasses") and pclasses then - pc = true -end - ---load custom settings -local set = io.open(minetest.get_modpath("hbhunger").."/hbhunger.conf", "r") -if set then - dofile(minetest.get_modpath("hbhunger").."/hbhunger.conf") - set:close() -end - -local function custom_hud(player) - hb.init_hudbar(player, "satiation", hbhunger.get_hunger(player)) -end - -dofile(minetest.get_modpath("hbhunger").."/hunger.lua") - --- register satiation hudbar -hb.register_hudbar("satiation", 0xFFFFFF, "Satiation", { icon = "hbhunger_icon.png", bar = "hbhunger_bar.png" }, 20, 30, false) - --- update hud elemtens if value has changed -local function update_hud(player) - local name = player:get_player_name() - --hunger - local h_out = tonumber(hbhunger.hunger_out[name]) - local h = tonumber(hbhunger.hunger[name]) - if h_out ~= h then - hbhunger.hunger_out[name] = h - hb.change_hudbar(player, "satiation", h) - end -end - -hbhunger.get_hunger = function(player) - local inv = player:get_inventory() - if not inv then return nil end - local hgp = inv:get_stack("hunger", 1):get_count() - if hgp == 0 then - hgp = 21 - inv:set_stack("hunger", 1, ItemStack({name=":", count=hgp})) - else - hgp = hgp - end - return hgp-1 -end - -hbhunger.set_hunger = function(player) - local inv = player:get_inventory() - local name = player:get_player_name() - local value = hbhunger.hunger[name] - if not inv or not value then return nil end - if value > 30 then value = 30 end - if value < 0 then value = 0 end - - inv:set_stack("hunger", 1, ItemStack({name=":", count=value+1})) - - return true -end - -minetest.register_on_joinplayer(function(player) - local name = player:get_player_name() - local inv = player:get_inventory() - inv:set_size("hunger",1) - hbhunger.hunger[name] = hbhunger.get_hunger(player) - hbhunger.hunger_out[name] = hbhunger.hunger[name] - hbhunger.exhaustion[name] = 0 - custom_hud(player) - hbhunger.set_hunger(player) -end) - -minetest.register_on_respawnplayer(function(player) - -- reset hunger (and save) - local name = player:get_player_name() - hbhunger.hunger[name] = 20 - hbhunger.set_hunger(player) - hbhunger.exhaustion[name] = 0 -end) - -local timer = 0 -local timer2 = 0 -local function hunger_step() - timer = timer + HUNGER_HUD_TICK - timer2 = timer2 + HUNGER_HUD_TICK - for _,player in ipairs(minetest.get_connected_players()) do - local name = player:get_player_name() - - local h = tonumber(hbhunger.hunger[name]) - local hp = player:get_hp() - local timerquot = 1 -- By default regen 0.5 hearth every 10sec - - if pc then -- NALC : Fix MFF modif - if pclasses.api.get_player_class(name) == "warrior" then - timerquot = 1.42 -- Black_Mithril armor = 0.5 hearth every 7.0sec - elseif pclasses.api.util.does_wear_full_armor(name, "mithril", false) then - timerquot = 1.17 -- Mithril armor = 0.5 hearth every 8.5sec - end - end - - if timer > 10/timerquot then - -- heal player by 1 hp if not dead and satiation is > 15 (of 30) - if h > 15 and hp > 0 and player:get_breath() > 0 then - player:set_hp(hp+1) - -- or damage player by 1 hp if satiation is < 2 (of 30) - elseif h <= 1 then - if hp-1 >= 0 then player:set_hp(hp-1) end - end - end - -- lower satiation by 1 point after xx seconds - if timer2 > HUNGER_HUNGER_TICK then - if h > 0 then - h = h-1 - hbhunger.hunger[name] = h - hbhunger.set_hunger(player) - end - end - - -- update all hud elements - update_hud(player) - - local controls = player:get_player_control() - -- Determine if the player is walking - if controls.up or controls.down or controls.left or controls.right then - hbhunger.handle_node_actions(nil, nil, player) - end - end - --end - if timer > 10 then timer = 0 end - if timer2 > HUNGER_HUNGER_TICK then timer2 = 0 end - minetest.after(HUNGER_HUD_TICK, hunger_step) -end -minetest.after(0, hunger_step) - -end diff --git a/mods/hbhunger/sounds/hbhunger_eat_generic.ogg b/mods/hbhunger/sounds/hbhunger_eat_generic.ogg deleted file mode 100755 index 406714d9..00000000 Binary files a/mods/hbhunger/sounds/hbhunger_eat_generic.ogg and /dev/null differ diff --git a/mods/hbhunger/textures/hbhunger_bar.png b/mods/hbhunger/textures/hbhunger_bar.png deleted file mode 100755 index c94bf528..00000000 Binary files a/mods/hbhunger/textures/hbhunger_bar.png and /dev/null differ diff --git a/mods/hbhunger/textures/hbhunger_icon.png b/mods/hbhunger/textures/hbhunger_icon.png deleted file mode 100755 index a5cc2a12..00000000 Binary files a/mods/hbhunger/textures/hbhunger_icon.png and /dev/null differ diff --git a/mods/hudbars b/mods/hudbars new file mode 160000 index 00000000..ba21f474 --- /dev/null +++ b/mods/hudbars @@ -0,0 +1 @@ +Subproject commit ba21f47489ddecd691943ce5505db5d25d49ae07 diff --git a/mods/hudbars/API.md b/mods/hudbars/API.md deleted file mode 100755 index 8dd8f0ef..00000000 --- a/mods/hudbars/API.md +++ /dev/null @@ -1,192 +0,0 @@ -API documentation for the HUD bars mod 1.4.1 -============================================ - -## Introduction -This API allows you to add, change, hide and unhide custom HUD bars for this mod. - -## Overview -To give you a *very* brief overview over this API, here is the basic workflow on how to add your own custom HUD bar: - -* Create images for your HUD bar -* Call `hb.register_hudbar` to make the definition of the HUD bar known to this mod -* Call `hb.init_hudbar` for each player for which you want to use previously defined HUD bar -* Use `hb.change_hudbar` whenever you need to change the values of a HUD bar of a certain player -* If you need it: Use `hb.hide_hudbar` and `hb.unhide_hudbar` to hide or unhide HUD bars of a certain player - -## The basic rules -In order to use this API, you should be aware of a few basic rules in order to understand it: - -* A HUD bar is an approximate graphical representation of the ratio of a current value and a maximum value, i.e. current health of 15 and maximum health of 20. A full HUD bar represents 100%, an empty HUD bar represents 0%. -* The current value must always be equal to or smaller then the maximum -* Both current value and maximum must not be smaller than 0 -* Both current value and maximum must be real numbers. So no NaN, infinity, etc. -* The HUD bar will be hidden if the maximum equals 0. This is intentional. -* The health and breath HUD bars are hardcoded. - -These are soft rules, the HUD bars mod will not enforce all of these. -But this mod has been programmed under the assumption that these rules are followed, for integrity. - -## Adding a HUD bar -To make a new HUD bar known to this mod, you need … - -* … an image of size 2×16 for the bar -* … an icon of size 16×16 (optional) -* … to register it with `hb.register_hudbar` - -### Bar image -The image for the bar will be repeated horizontally to denote the “value” of the HUD bar. -It **must** be of size 2×16. -If neccessary, the image will be split vertically in half, and only the left half of the image -is displayed. So the final HUD bar will always be displayed on a per-pixel basis. - -The default bar images are single-colored, but you can use other styles as well, for instance, -a vertical gradient. - -### Icon -A 16×16 image shown left of the HUD bar. This is optional. - -### `hb.register_hudbar(identifier, text_color, label, textures, default_start_value, default_start_max, default_start_hidden, format_string)` -This function registers a new custom HUD bar definition to the HUD bars mod, so it can be later used to be displayed, changed, hidden -and unhidden on a per-player basis. -Note this does not yet display the HUD bar. - -The HUD bars will be displayed in a “first come, first serve” order. This API does not allow fow a custom order or a way to set it -manually in a reliable way. However, you can use the setting `hudbars_sorting` for this. See the advanced setting menu in Minetest -for more information. - - -#### Parameters -* `identifier`: A globally unique internal name for the HUD bar, will be used later to refer to it. Please only rely on alphanumeric characters for now. The identifiers “`health`” and “`breath`” are used internally for the built-in health and breath bar, respectively. Please do not use these names. -* `text_color`: A 3-octet number defining the color of the text. The octets denote, in this order red, green and blue and range from `0x00` (complete lack of this component) to `0xFF` (full intensity of this component). Example: `0xFFFFFF` for white. -* `label`: A string which is displayed on the HUD bar itself to describe the HUD bar. Try to keep this string short. -* `textures`: A table with the following fields: - * `bar`: The file name of the bar image (as string). This is only used for the `progress_bar` bar type (see `README.txt`, settings section). - * `icon`: The file name of the icon, as string. For the `progress_bar` type, it is shown as single image left of the bar, for the two statbar bar types, it is used as the statbar icon and will be repeated. This field can be `nil`, in which case no icon will be used, but this is not recommended, because the HUD bar will be invisible if the one of the statbar bar types is used. - * `bgicon`: The file name of the background icon, it is used as the background for the modern statbar mode only. This field can be `nil`, in which case no background icon will be displayed in this mode. -* `default_start_value`: If this HUD bar is added to a player, and no initial value is specified, this value will be used as initial current value -* `default_max_value`: If this HUD bar is added to a player, and no initial maximum value is specified, this value will be used as initial maximum value -* `default_start_hidden`: The HUD bar will be initially start hidden by default when added to a player. Use `hb.unhide_hudbar` to unhide it. -* `format_string`: This is optional; You can specify an alternative format string display the final text on the HUD bar. The default format string is “`%s: %d/%d`” (in this order: Label, current value, maximum value). See also the Lua documentation of `string.format`. - -#### Return value -Always `nil`. - - -## Displaying a HUD bar -After a HUD bar has been registered, they are not yet displayed yet for any player. HUD bars must be -explicitly initialized on a per-player basis. - -You probably want to do this in the `minetest.register_on_joinplayer`. - -### `hb.init_hudbar(player, identifier, start_value, start_max, start_hidden)` -This function initialzes and activates a previously registered HUD bar and assigns it to a -certain client/player. This has only to be done once per player and after that, you can change -the values using `hb.change_hudbar`. - -However, if `start_hidden` was set to `true` for the HUD bar (in `hb.register_hudbar`), the HUD bar -will initially be hidden, but the HUD elements are still sent to the client. Otherwise, -the HUD bar will be initially be shown to the player. - -#### Parameters -* `player`: `ObjectRef` of the player to which the new HUD bar should be displayed to. -* `identifier`: The identifier of the HUD bar type, as specified in `hb.register_hudbar`. -* `start_value`: The initial current value of the HUD bar. This is optional, `default_start_value` of the registration function will be used, if this is `nil`. -* `start_max`: The initial maximum value of the HUD bar. This is optional, `default_start_max` of the registration function will be used, if this is `nil` -* `start_hidden`: Whether the HUD bar is initially hidden. This is optional, `default_start_hidden` of the registration function will be used as default - -#### Return value -Always `nil`. - - - -## Modifying a HUD bar -After a HUD bar has been added, you can change the current and maximum value and other attributes on a per-player basis. -You use the function `hb.change_hudbar` for this. - -### `hb.change_hudbar(player, identifier, new_value, new_max_value, new_icon, new_bgicon, new_bar, new_label, new_text_color)` -Changes the values and the appearance of an initialized HUD bar for a certain player. `new_value` -and `new_max_value` are the most important parameters as they specify the new current and maximum new values, you do not need -to worry too much about the other parameters. - -The following parameters are less important and provided for styling the HUD bar after registration (if -this is desired). The “styling” parameters parallel the parameters of `hb.register_hudbar`. It is -recommended to not change the style of a HUD bar too often as this can be distracting or confusing -for players. - -`new_value`, `new_max_value` `new_icon`, `new_bgicon`, `new_bar`, `new_label` and `new_text_color` can be -`nil`; if one of them is `nil`, that means the value is unchanged. If all those values are `nil`, this -function is a no-op. - -This function tries to minimize the amount of calls to `hud_change` of the Minetest Lua API -(and thus, network traffic), when you only change the value and/or maximum value. In this case, -`hud_change` is only called if it is actually needed, e.g. when the actual length of the bar -or the displayed string changed, so you do not have to worry about it. There is, however, no -such network optimization for the “styling” parameters, so keep this in mind. - -#### Parameters -* `player`: `ObjectRef` of the player to which the HUD bar belongs to -* `identifier`: The identifier of the HUD bar type to change, as specified in `hb.register_hudbar`. -* `new_value`: The new current value of the HUD bar -* `new_max_value`: The new maximum value of the HUD bar -* `new_icon`: File name of the new icon -* `new_bgicon`: File name of the new background icon for the modern-style statbar -* `new_bar`: File name of the new bar segment image -* `new_label`: A new text label of the HUD bar. Note the format string still applies -* `new_text_color`: A 3-octet number defining the new color of the text. - -#### Return value -Always `nil`. - - -## Hiding and unhiding a HUD bar -You can also hide custom HUD bars, meaning they will not be displayed for a certain player. You can still -use `hb.change_hudbar` on a hidden HUD bar, the new values will be correctly displayed after the HUD bar -has been unhidden. Both functions will only call `hud_change` if there has been an actual change to avoid -unneccessary traffic. - -Note that the hidden state of a HUD bar will *not* be saved by this mod on server shutdown, so you may need -to write your own routines for this or by setting the correct value for `start_hidden` when calling -`hb.init_hudbar`. - -### `hb.hide_hudbar(player, identifier)` -Hides the specified HUD bar from the screen of the specified player. - -#### Parameters -* `player`: `ObjectRef` of the player to which the HUD bar belongs to -* `identifier`: The identifier of the HUD bar type to hide, as specified in `hb.register_hudbar`. - -#### Return value -Always `nil`. - - -### `hb.unhide_hudbar(player, identifier)` -Makes a previously hidden HUD bar visible again to a player. - -#### Parameters -* `player`: `ObjectRef` of the player to which the HUD bar belongs to -* `identifier`: The identifier of the HUD bar type to unhide, as specified in `hb.register_hudbar`. - -#### Return value -Always `nil`. - - -## Reading HUD bar information -It is also possible to read information about an active HUD bar. - -### `hb.get_hudbar_state(player, identifier)` -Returns the current state of the active player's HUD bar. - -#### Parameters -* `player`: `ObjectRef` of the player to which the HUD bar belongs to -* `identifier`: The identifier of the HUD bar type to hide, as specified in `hb.register_hudbar`. - -#### Return value -A table which holds information on the current state of the HUD bar. Note the table is a deep -copy of the internal HUD bar state, it is *not* a reference; the information hold by the table is -only true for the moment you called this function. The fields of this table are: - -* `value`: Current value of HUD bar. -* `max`: Current maximum value of HUD bar. -* `hidden`: Boolean denoting whether the HUD bar is hidden. -* `barlength`: The length of the HUD bar in pixels. This field is meaningless if the HUD bar is currently hidden. -* `text`: The text shown on the HUD bar. This fiels is meaningless if the HUD bar is currently hidden. diff --git a/mods/hudbars/README.txt b/mods/hudbars/README.txt deleted file mode 100755 index 2fe71279..00000000 --- a/mods/hudbars/README.txt +++ /dev/null @@ -1,109 +0,0 @@ -Minetest mod: HUD bars -====================== -Version: 1.2.1 - -This software uses semantic versioning, as defined by version 2.0.0 of the SemVer -standard. - - -License of source code: WTFPL ------------------------------ -Author: Wuzzy (2015) -Forked from the “Better HUD” [hud] mod by BlockMen. - - -Using the mod: --------------- -This mod changes the HUD of Minetest. It replaces the default health and breath symbols by horizontal colored bars with text showing -the number. - -Furthermore, it enables other mods to add their own custom bars to the HUD, this mod will place them accordingly. - -You can create a “hudbars.conf” file to customize the positions of the health and breath bars. Take a look at “hudbars.conf.example” -to get more infos. The lines starting with “--” are comments, remove the two dashes to activate a setting. Settings which are not -set will use a default value instead. - - -IMPORTANT: -Keep in mind if running a server with this mod, that the custom position should be displayed correctly on every screen size! - -Settings: ---------- -This mod can be configured by editing minetest.conf. Currently, the following setting is recognized: - -- hudbars_autohide_breath: A boolean setting, it can be either “true” or “false”. If set to “true”, - the breath bar will be automatically hidden shortly after the breathbar has been filled up. If set - to “false”, the breath bar will always be displayed. The default value is “true”. - -- hudbars_sorting: This setting allows you to specify the “slot” positions of the HUD bars manually. - - The setting has to be specified as a comma-seperated list of key=value pairs, where a key refers to the - identifier of a HUD bar and the value refers to the slot number of where the HUD bar should be placed. - The slot number must be an integer greater of equal to 0. The slot positions start (slot 0) at the - bottom (nearest to hotbar in default configuration) left side, the following slot 1 is at the right - side, slot `2` is on the right side again, but placed over the first HUD bar (slot 0), and it goes on, - in a zig-zag pattern. - All HUD bars to which no sorting rule has been applied will fill in all slots which have not been occupied - by the HUD bars specified in this setting, the slots will be filled in from the lowest slot number. - Note that the order of those remaining HUD bars is *not* fixed, it basically just boils down on which mod - “came” first. Don't worry, the mod will still work perfectly fine, this setting is entirely optional. - - Be careful not to use slot indices twice, or else different HUD bars will be drawn over each other! - - If this setting is not set, by default the health and breath bar are displayed at slot positions 0 and 1, - respectively (health bar at left bottom-most positoin, breath bar right from it). All other HUD bars are - placed automatically. - - Example value: - breath=0, health=1 - This places the breath bar at the left side, and the health bar to the right side. - -- hudbars_bar_type: Specifies the style of bars. You can select between the default progress-bar-like bars and the good old statbars - like you know from vanilla Minetest. Note that the classic and modern statbars are still a little bit experimental. - These values are possible: - - progress_bar: A horizontal progress-bar-like bar with a label, showing numerical value (current, maximum), and an icon. - These bars usually convey the most information. This is the default and recommended value.. - - statbar_classic: Classic statbar, like in vanilla Minetest. Made out of up to 20 half-symbols. Those bars represent the vague ratio between - the current value and the maximum value. 1 half-symbol stands for approximately 5% of the maximum value. - - statbar_modern: Like the classic statbar, but also supports background images, this kind of statbar may be considered to be more user-friendly - than the classic statbar. This bar type closely resembles the [hud] mod. - -- hudbars_vmargin: The vertical distance between two HUD bars in pixels (default: 24) -- hudbars_tick: The number of seconds between two updates of the HUD bars. Increase this number if you have a slow server (default: 0.1) - -Position settings: -With these settings you can configure the positions of the HUD bars. All settings must be specified as a number. -The pos settings are specified as a floating-point number between 0 to 1 each, the start_offset settings are -specified as whole numbers, they specify a number of pixels. -The left and right variants are used for the zig-zag mode. In the stack_up and stack_down modes, only the left variant is used for -the base position - -- hudbars_pos_left_x, hudbars_pos_left_y: Screen position (x and y) of the left HUD bar in zigzag mode. 0 is left-most/top, 1 is right-most/bottom. - Defaults: 0.5 (x) and 1 (y) -- hudbars_pos_right_x, hudbars_pos_right_y: Same as above, but for the right one. - Defaults: 0.5 and 1. -- hudbars_start_offset_left_x, hudbars_start_offset_left_y: Offset in pixels from the basic screen position specified in hudbars_pos_left_x/hudbars_pos_left_y. - Defaults: -175 and -86 -- hudbars_start_offset_right_x, hudbars_start_offset_right_y: Same as above, but for the right one. - Defaults: 15 and -86 - -API: ----- -The API is used to add your own custom HUD bars. -Documentation for the API of this mod can be found in API.md. - - -License of textures: --------------------- -hudbars_icon_health.png - celeron55 (CC BY-SA 3.0), modified by BlockMen -hudbars_bgicon_health.png - celeron55 (CC BY-SA 3.0), modified by BlockMen -hudbars_icon_breath.png - kaeza (WTFPL), modified by BlockMen -hudbars_bar_health.png - Wuzzy (WTFPL) -hudbars_bar_breath.png - Wuzzy (WTFPL) -hudbars_bar_background.png - Wuzzy(WTFPL) - -This program is free software. It comes without any warranty, to -the extent permitted by applicable law. You can redistribute it -and/or modify it under the terms of the Do What The Fuck You Want -To Public License, Version 2, as published by Sam Hocevar. See -http://sam.zoy.org/wtfpl/COPYING for more details. diff --git a/mods/hudbars/changelog.txt b/mods/hudbars/changelog.txt deleted file mode 100755 index 8edab4e6..00000000 --- a/mods/hudbars/changelog.txt +++ /dev/null @@ -1,83 +0,0 @@ -Note: This software uses semantic versioning, -as of version 2.0.0 of the standard . - -0.1.0 ------ -- Initial release, forked from mod “Better HUD” [hud]. - -0.2.0 ------ -- Add API documentation - -0.3.0 ------ -- Rename main table from “hud” to “hb” (affects function names!) -- Arguments 3-4 of hb.change_hudbar can be nil for values which should not change -- Add proper function hb.init_hudbar, replaces odd call to hud.hudtables[identifier].add_all -- Update API documentation and fix mistakes -- Use “hudbars.conf” instead of “hud.conf” - -0.4.0 ------ -- New function: hb.get_hudbar_state to get information about the state of an active HUD bar, such as values, whether it is hidden, etc. -- hb.change_hudbar has been optimized to call hud_change fewer times, which is hopefully good for networking -- Rename hb.register_hudbar parameter “start_hide” to “start_hidden” -- start_hidden parameter now finally works -- Do not affect other HUD flags (crosshair, wielditem, etc.) when starting mod -- Show error message when trying to call hb.init_hudbar or hb.change_hudbar with bad values -- Update documentation -- Lots of refactoring -- Health and breath bar now use API - -1.0.0 ------ -- Add new parameter start_hidden to hb.init_hudbar, specified whether HUD bar is hidden on start -- Copy-editing of API.md and README.txt -- Internal: Fix add_all weirdness - -1.0.1 ------ -- Fix race condition causing crash at start of server - -1.0.2 ------ -- Fix other HUD elements disappearing for rejoining players -- Remove pointless delays for initializing the HUD for new or rejoining players - -1.0.3 ------ -- Adjust default HUD bars position for Minetest 0.4.12 - -1.1.0 ------ -- Add boolean minetest.conf setting support (hudbars_autohide_breathbar) to control whether the breath bar is automatically hidden when full (default: yes) - -1.2.0 ------ -- New setting: hudbars_sorting. You can now manually sort all the HUD bars. Useful if you don't like automatic order -- New setting: hudbars_bar_type. You now can change the appearance of the HUD bars. -- New HUD bar types, slightly experimental: Classic statbars and modern [hud]-style statbars -- New experimental/unfinished setting: hudbars_alignment_pattern: You can now make the HUD bars stack vertically instead of the current zig-zag pattern. Note you probably need to change source code to productively use this feature -- Various position-related HUD bar settings (see README.txt) -- Remove hudbars.conf support and hudbars.conf.example (was never officially supported anyways) - -1.2.1 ------ -- Fix crash when enable_damage is changed in mid-game - -1.3.0 ------ -- Make all settings avaialbe in Minetest's advanced settings menu -- Fix HUD bars overlap when both hudbars_tick and hudbars_vmargin were set -- Use Markdown syntax in readme file -- Fix some factual mistakes in readme file -- Add metadata: mod.conf, description.txt, screenshot.png - -1.4.0 ------ -- Allow to change HUD bar images and label after it has been registered -- Minor API.md correction - -1.4.1 ------ -- Fix bug in hb.change_hudbar being a no-op if new_value and new_max value are nil diff --git a/mods/hudbars/depends.txt b/mods/hudbars/depends.txt deleted file mode 100755 index 9207dab8..00000000 --- a/mods/hudbars/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -intllib? diff --git a/mods/hudbars/description.txt b/mods/hudbars/description.txt deleted file mode 100644 index 9e10e894..00000000 --- a/mods/hudbars/description.txt +++ /dev/null @@ -1 +0,0 @@ -Replaces the health and breath symbols in the HUD by “progress bars” and shows exact values. Other mods can add more progress bars for custom player stats. diff --git a/mods/hudbars/hudbars.conf b/mods/hudbars/hudbars.conf deleted file mode 100755 index af83d698..00000000 --- a/mods/hudbars/hudbars.conf +++ /dev/null @@ -1,10 +0,0 @@ --- if custom==true, use custom position --- X 0=left, 1=right ---Y 0,1,2 = down--> up -hb.settings.custom.custom = true -hb.settings.custom.health = { x = 0, y = 0 } -hb.settings.custom.satiation = { x = 0, y = 1 } -hb.settings.custom.sprint = { x = 1, y = 1 } -hb.settings.custom.mana = { x = 1, y = 0 } -hb.settings.custom.armor = { x = 1, y = 2 } -hb.settings.custom.breath = { x = 0, y = 2 } diff --git a/mods/hudbars/init.lua b/mods/hudbars/init.lua deleted file mode 100644 index 11138fbb..00000000 --- a/mods/hudbars/init.lua +++ /dev/null @@ -1,517 +0,0 @@ -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end - -hb = {} - -hb.hudtables = {} - --- number of registered HUD bars -hb.hudbars_count = 0 - --- table which records which HUD bar slots have been “registered” so far; used for automatic positioning -hb.registered_slots = {} - -hb.settings = {} - -function hb.load_setting(sname, stype, defaultval, valid_values) - local sval - if stype == "string" then - sval = minetest.setting_get(sname) - elseif stype == "bool" then - sval = minetest.setting_getbool(sname) - elseif stype == "number" then - sval = tonumber(minetest.setting_get(sname)) - end - if sval ~= nil then - if valid_values ~= nil then - local valid = false - for i=1,#valid_values do - if sval == valid_values[i] then - valid = true - end - end - if not valid then - minetest.log("error", "[hudbars] Invalid value for "..sname.."! Using default value ("..tostring(defaultval)..").") - return defaultval - else - return sval - end - else - return sval - end - else - return defaultval - end -end - --- (hardcoded) default settings -hb.settings.max_bar_length = 160 -hb.settings.statbar_length = 20 - --- statbar positions -hb.settings.pos_left = {} -hb.settings.pos_right = {} -hb.settings.start_offset_left = {} -hb.settings.start_offset_right= {} -hb.settings.pos_left.x = hb.load_setting("hudbars_pos_left_x", "number", 0.5) -hb.settings.pos_left.y = hb.load_setting("hudbars_pos_left_y", "number", 1) -hb.settings.pos_right.x = hb.load_setting("hudbars_pos_right_x", "number", 0.5) -hb.settings.pos_right.y = hb.load_setting("hudbars_pos_right_y", "number", 1) -hb.settings.start_offset_left.x = hb.load_setting("hudbars_start_offset_left_x", "number", -175) -hb.settings.start_offset_left.y = hb.load_setting("hudbars_start_offset_left_y", "number", -86) -hb.settings.start_offset_right.x = hb.load_setting("hudbars_start_offset_right_x", "number", 15) -hb.settings.start_offset_right.y = hb.load_setting("hudbars_start_offset_right_y", "number", -86) - -hb.settings.vmargin = hb.load_setting("hudbars_vmargin", "number", 24) -hb.settings.tick = hb.load_setting("hudbars_tick", "number", 0.4) - --- experimental setting: Changing this setting is not officially supported, do NOT rely on it! -hb.settings.forceload_default_hudbars = hb.load_setting("hudbars_forceload_default_hudbars", "bool", true) - --- Misc. settings -hb.settings.alignment_pattern = hb.load_setting("hudbars_alignment_pattern", "string", "zigzag", {"zigzag", "stack_up", "stack_down"}) -hb.settings.bar_type = hb.load_setting("hudbars_bar_type", "string", "progress_bar", {"progress_bar", "statbar_classic", "statbar_modern"}) -hb.settings.autohide_breath = hb.load_setting("hudbars_autohide_breath", "bool", true) - -local sorting = minetest.setting_get("hudbars_sorting") -if sorting ~= nil then - hb.settings.sorting = {} - hb.settings.sorting_reverse = {} - for k,v in string.gmatch(sorting, "(%w+)=(%w+)") do - hb.settings.sorting[k] = tonumber(v) - hb.settings.sorting_reverse[tonumber(v)] = k - end -else - hb.settings.sorting = { ["health"] = 0, ["breath"] = 1 } - hb.settings.sorting_reverse = { [0] = "health", [1] = "breath" } -end - --- Table which contains all players with active default HUD bars (only for internal use) ---hb.players = {} - -function hb.value_to_barlength(value, max) - if max == 0 then - return 0 - else - if hb.settings.bar_type == "progress_bar" then - local x - if value < 0 then x=-0.5 else x = 0.5 end - local ret = math.modf((value/max) * hb.settings.max_bar_length + x) - return ret - else - local x - if value < 0 then x=-0.5 else x = 0.5 end - local ret = math.modf((value/max) * hb.settings.statbar_length + x) - return ret - end - end -end - -function hb.get_hudtable(identifier) - return hb.hudtables[identifier] -end - -function hb.get_hudbar_position_index(identifier) - if hb.settings.sorting[identifier] ~= nil then - return hb.settings.sorting[identifier] - else - local i = 0 - while true do - if hb.registered_slots[i] ~= true and hb.settings.sorting_reverse[i] == nil then - return i - end - i = i + 1 - end - end -end - -function hb.register_hudbar(identifier, text_color, label, textures, default_start_value, default_start_max, default_start_hidden, format_string) - minetest.log("action", "hb.register_hudbar: "..tostring(identifier)) - local hudtable = {} - local pos, offset - local index = math.floor(hb.get_hudbar_position_index(identifier)) - hb.registered_slots[index] = true - if hb.settings.alignment_pattern == "stack_up" then - pos = hb.settings.pos_left - offset = { - x = hb.settings.start_offset_left.x, - y = hb.settings.start_offset_left.y - hb.settings.vmargin * index - } - elseif hb.settings.alignment_pattern == "stack_down" then - pos = hb.settings.pos_left - offset = { - x = hb.settings.start_offset_left.x, - y = hb.settings.start_offset_left.y + hb.settings.vmargin * index - } - else - if index % 2 == 0 then - pos = hb.settings.pos_left - offset = { - x = hb.settings.start_offset_left.x, - y = hb.settings.start_offset_left.y - hb.settings.vmargin * (index/2) - } - else - pos = hb.settings.pos_right - offset = { - x = hb.settings.start_offset_right.x, - y = hb.settings.start_offset_right.y - hb.settings.vmargin * ((index-1)/2) - } - end - end - if format_string == nil then - format_string = S("%s: %d/%d") - end - - hudtable.add_all = function(player, hudtable, start_value, start_max, start_hidden) - if start_value == nil then start_value = hudtable.default_start_value end - if start_max == nil then start_max = hudtable.default_start_max end - if start_hidden == nil then start_hidden = hudtable.default_start_hidden end - local ids = {} - local state = {} - local name = player:get_player_name() - local bgscale, iconscale, text, barnumber, bgiconnumber - if start_max == 0 or start_hidden then - bgscale = { x=0, y=0 } - else - bgscale = { x=1, y=1 } - end - if start_hidden then - iconscale = { x=0, y=0 } - barnumber = 0 - bgiconnumber = 0 - text = "" - else - iconscale = { x=1, y=1 } - barnumber = hb.value_to_barlength(start_value, start_max) - bgiconnumber = hb.settings.statbar_length - text = string.format(format_string, label, start_value, start_max) - end - if hb.settings.bar_type == "progress_bar" then - ids.bg = player:hud_add({ - hud_elem_type = "image", - position = pos, - scale = bgscale, - text = "hudbars_bar_background.png", - alignment = {x=1,y=1}, - offset = { x = offset.x - 1, y = offset.y - 1 }, - }) - if textures.icon ~= nil then - ids.icon = player:hud_add({ - hud_elem_type = "image", - position = pos, - scale = iconscale, - text = textures.icon, - alignment = {x=-1,y=1}, - offset = { x = offset.x - 3, y = offset.y }, - }) - end - elseif hb.settings.bar_type == "statbar_modern" then - if textures.bgicon ~= nil then - ids.bg = player:hud_add({ - hud_elem_type = "statbar", - position = pos, - text = textures.bgicon, - number = bgiconnumber, - alignment = {x=-1,y=-1}, - offset = { x = offset.x, y = offset.y }, - }) - end - end - local bar_image - if hb.settings.bar_type == "progress_bar" then - bar_image = textures.bar - elseif hb.settings.bar_type == "statbar_classic" or hb.settings.bar_type == "statbar_modern" then - bar_image = textures.icon - end - ids.bar = player:hud_add({ - hud_elem_type = "statbar", - position = pos, - text = bar_image, - number = barnumber, - alignment = {x=-1,y=-1}, - offset = offset, - size = "", - }) - if hb.settings.bar_type == "progress_bar" then - ids.text = player:hud_add({ - hud_elem_type = "text", - position = pos, - text = text, - alignment = {x=1,y=1}, - number = text_color, - direction = 0, - offset = { x = offset.x + 2, y = offset.y - 1}, - }) - end - -- Do not forget to update hb.get_hudbar_state if you add new fields to the state table - state.hidden = start_hidden - state.value = start_value - state.max = start_max - state.text = text - state.barlength = hb.value_to_barlength(start_value, start_max) - - local main_error_text = - "[hudbars] Bad initial values of HUD bar identifier “"..tostring(identifier).."” for player "..name..". " - - if start_max < start_value then - minetest.log("error", main_error_text.."start_max ("..start_max..") is smaller than start_value ("..start_value..")!") - end - if start_max < 0 then - minetest.log("error", main_error_text.."start_max ("..start_max..") is smaller than 0!") - end - if start_value < 0 then - minetest.log("error", main_error_text.."start_value ("..start_value..") is smaller than 0!") - end - - hb.hudtables[identifier].hudids[name] = ids - hb.hudtables[identifier].hudstate[name] = state - end - - hudtable.identifier = identifier - hudtable.format_string = format_string - hudtable.label = label - hudtable.hudids = {} - hudtable.hudstate = {} - hudtable.default_start_hidden = default_start_hidden - hudtable.default_start_value = default_start_value - hudtable.default_start_max = default_start_max - - hb.hudbars_count= hb.hudbars_count + 1 - - hb.hudtables[identifier] = hudtable -end - -function hb.init_hudbar(player, identifier, start_value, start_max, start_hidden) - local hudtable = hb.get_hudtable(identifier) - hb.hudtables[identifier].add_all(player, hudtable, start_value, start_max, start_hidden) -end - -function hb.change_hudbar(player, identifier, new_value, new_max_value, new_icon, new_bgicon, new_bar, new_label, new_text_color) - if new_value == nil and new_max_value == nil and new_icon == nil and new_bgicon == nil and new_bar == nil and new_label == nil and new_text_color == nil then - return - end - - local name = player:get_player_name() - local hudtable = hb.get_hudtable(identifier) - local value_changed, max_changed = false, false - - if new_max_value ~= nil then - if new_max_value ~= hudtable.hudstate[name].max then - hudtable.hudstate[name].max = new_max_value - max_changed = true - end - else - new_max_value = (hudtable.hudstate[name] or {max = 0}).max - end - - if new_value ~= nil and hudtable.hudstate[name] then - if new_value ~= hudtable.hudstate[name].value then - if new_value > new_max_value then - new_value = new_max_value - end - hudtable.hudstate[name].value = new_value - value_changed = true - end - else - new_value = (hudtable.hudstate[name] or {value = 0}).value - end - - if hb.settings.bar_type == "progress_bar" then - if new_icon ~= nil and hudtable.hudids[name].icon ~= nil then - player:hud_change(hudtable.hudids[name].icon, "text", new_icon) - end - if new_bgicon ~= nil and hudtable.hudids[name].bgicon ~= nil then - player:hud_change(hudtable.hudids[name].bgicon, "text", new_bgicon) - end - if new_bar ~= nil then - player:hud_change(hudtable.hudids[name].bar , "text", new_bar) - end - if new_label ~= nil then - hudtable.label = new_label - local new_text = string.format(hudtable.format_string, new_label, hudtable.hudstate[name].value, hudtable.hudstate[name].max) - player:hud_change(hudtable.hudids[name].text, "text", new_text) - end - if new_text_color ~= nil then - player:hud_change(hudtable.hudids[name].text, "number", new_text_color) - end - else - if new_icon ~= nil and hudtable.hudids[name].bar ~= nil then - player:hud_change(hudtable.hudids[name].bar, "text", new_icon) - end - if new_bgicon ~= nil and hudtable.hudids[name].bg ~= nil then - player:hud_change(hudtable.hudids[name].bg, "text", new_bgicon) - end - end - - local main_error_text = - "[hudbars] Bad call to hb.change_hudbar, identifier: “"..tostring(identifier).."”, player name: “"..name.."”. " - if new_max_value < new_value then - minetest.log("error", main_error_text.."new_max_value ("..new_max_value..") is smaller than new_value ("..new_value..")!") - end - if new_max_value < 0 then - minetest.log("error", main_error_text.."new_max_value ("..new_max_value..") is smaller than 0!") - end - if new_value < 0 then - minetest.log("error", main_error_text.."new_value ("..new_value..") is smaller than 0!") - end - - if hudtable.hudstate[name].hidden == false then - if max_changed and hb.settings.bar_type == "progress_bar" then - if hudtable.hudstate[name].max == 0 then - player:hud_change(hudtable.hudids[name].bg, "scale", {x=0,y=0}) - else - player:hud_change(hudtable.hudids[name].bg, "scale", {x=1,y=1}) - end - end - - if value_changed or max_changed then - local new_barlength = hb.value_to_barlength(new_value, new_max_value) - if new_barlength ~= hudtable.hudstate[name].barlength then - player:hud_change(hudtable.hudids[name].bar, "number", hb.value_to_barlength(new_value, new_max_value)) - hudtable.hudstate[name].barlength = new_barlength - end - - if hb.settings.bar_type == "progress_bar" then - local new_text = string.format(hudtable.format_string, hudtable.label, new_value, new_max_value) - if new_text ~= hudtable.hudstate[name].text then - player:hud_change(hudtable.hudids[name].text, "text", new_text) - hudtable.hudstate[name].text = new_text - end - end - end - end -end - -function hb.hide_hudbar(player, identifier) - local name = player:get_player_name() - local hudtable = hb.get_hudtable(identifier) - if(hudtable.hudstate[name].hidden == false) then - if hb.settings.bar_type == "progress_bar" then - if hudtable.hudids[name].icon ~= nil then - player:hud_change(hudtable.hudids[name].icon, "scale", {x=0,y=0}) - end - player:hud_change(hudtable.hudids[name].bg, "scale", {x=0,y=0}) - player:hud_change(hudtable.hudids[name].text, "text", "") - elseif hb.settings.bar_type == "statbar_modern" then - player:hud_change(hudtable.hudids[name].bg, "number", 0) - end - player:hud_change(hudtable.hudids[name].bar, "number", 0) - hudtable.hudstate[name].hidden = true - end -end - -function hb.unhide_hudbar(player, identifier) - local name = player:get_player_name() - local hudtable = hb.get_hudtable(identifier) - if(hudtable.hudstate[name].hidden) then - local name = player:get_player_name() - local value = hudtable.hudstate[name].value - local max = hudtable.hudstate[name].max - if hb.settings.bar_type == "progress_bar" then - if hudtable.hudids[name].icon ~= nil then - player:hud_change(hudtable.hudids[name].icon, "scale", {x=1,y=1}) - end - if hudtable.hudstate[name].max ~= 0 then - player:hud_change(hudtable.hudids[name].bg, "scale", {x=1,y=1}) - end - player:hud_change(hudtable.hudids[name].text, "text", tostring(string.format(hudtable.format_string, hudtable.label, value, max))) - elseif hb.settings.bar_type == "statbar_modern" then - player:hud_change(hudtable.hudids[name].bg, "number", hb.settings.statbar_length) - end - player:hud_change(hudtable.hudids[name].bar, "number", hb.value_to_barlength(value, max)) - hudtable.hudstate[name].hidden = false - end -end - -function hb.get_hudbar_state(player, identifier) - local ref = hb.get_hudtable(identifier).hudstate[player:get_player_name()] - -- Do not forget to update this chunk of code in case the state changes - local copy = { - hidden = ref.hidden, - value = ref.value, - max = ref.max, - text = ref.text, - barlength = ref.barlength, - } - return copy -end - ---register built-in HUD bars -if minetest.setting_getbool("enable_damage") or hb.settings.forceload_default_hudbars then - hb.register_hudbar("health", 0xFFFFFF, S("Health"), { bar = "hudbars_bar_health.png", icon = "hudbars_icon_health.png", bgicon = "hudbars_bgicon_health.png" }, 20, 20, false) - hb.register_hudbar("breath", 0xFFFFFF, S("Breath"), { bar = "hudbars_bar_breath.png", icon = "hudbars_icon_breath.png", bgicon = "hudbars_bgicon_breath.png" }, 10, 10, true) -end - -local function hide_builtin(player) - local flags = player:hud_get_flags() - flags.healthbar = false - flags.breathbar = false - player:hud_set_flags(flags) -end - - -local function custom_hud(player) - if minetest.setting_getbool("enable_damage") or hb.settings.forceload_default_hudbars then - local hide - if minetest.setting_getbool("enable_damage") then - hide = false - else - hide = true - end - hb.init_hudbar(player, "health", player:get_hp(), nil, hide) - local breath = player:get_breath() - local hide_breath - if breath == 11 and hb.settings.autohide_breath == true then hide_breath = true else hide_breath = false end - hb.init_hudbar(player, "breath", math.min(breath, 10), nil, hide_breath or hide) - end -end - --- update built-in HUD bars -local function update_hud(player) - if minetest.setting_getbool("enable_damage") then - if hb.settings.forceload_default_hudbars then - hb.unhide_hudbar(player, "health") - end - --air - local breath = player:get_breath() - - if breath == 11 and hb.settings.autohide_breath == true then - hb.hide_hudbar(player, "breath") - else - hb.unhide_hudbar(player, "breath") - hb.change_hudbar(player, "breath", math.min(breath, 10)) - end - - --health - hb.change_hudbar(player, "health", player:get_hp()) - elseif hb.settings.forceload_default_hudbars then - hb.hide_hudbar(player, "health") - hb.hide_hudbar(player, "breath") - end -end - -local function hb_step() - if minetest.setting_getbool("enable_damage") or hb.settings.forceload_default_hudbars then - for _,player in ipairs(minetest.get_connected_players()) do - -- only proceed if damage is enabled - -- update all hud elements - update_hud(player) - end - end - minetest.after(hb.settings.tick, hb_step) -end - - -minetest.register_on_joinplayer(function(player) - local name = player:get_player_name() - if not name or name == "" then return end - hide_builtin(player) - custom_hud(player) -end) - -minetest.after(0, hb_step) diff --git a/mods/hudbars/locale/de.txt b/mods/hudbars/locale/de.txt deleted file mode 100644 index 578764ea..00000000 --- a/mods/hudbars/locale/de.txt +++ /dev/null @@ -1,3 +0,0 @@ -Health = Leben -Breath = Atem -%s: %d/%d = %s: %d/%d diff --git a/mods/hudbars/locale/template.txt b/mods/hudbars/locale/template.txt deleted file mode 100644 index 0a26b8fe..00000000 --- a/mods/hudbars/locale/template.txt +++ /dev/null @@ -1,5 +0,0 @@ -Health -Breath - -# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” -%s: %d/%d diff --git a/mods/hudbars/mod.conf b/mods/hudbars/mod.conf deleted file mode 100644 index add28e65..00000000 --- a/mods/hudbars/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = hudbars diff --git a/mods/hudbars/screenshot.png b/mods/hudbars/screenshot.png deleted file mode 100644 index 93ed93e8..00000000 Binary files a/mods/hudbars/screenshot.png and /dev/null differ diff --git a/mods/hudbars/settingtypes.txt b/mods/hudbars/settingtypes.txt deleted file mode 100644 index 5779063c..00000000 --- a/mods/hudbars/settingtypes.txt +++ /dev/null @@ -1,98 +0,0 @@ -[Appearance] -# Specifies how the value indicators (i.e. health, breah, etc.) look. There are 3 styles -# available. You can choose between the default progress-bar-like bars and the good -# old statbars like you know from vanilla Minetest. -# These values are possible: -# - progress_bar: A horizontal progress-bar-like bar with a label, showing numerical value -# (current, maximum), and an icon. These bars usually convey the most -# information. This is the default and recommended value. -# - statbar_classic: Classic statbar, like in vanilla Minetest. Made out of up to 20 -# half-symbols. Those bars represent the vague ratio between -# the current value and the maximum value. 1 half-symbol stands for -# approximately 5% of the maximum value. -# - statbar_modern: Like the classic statbar, but also supports background images, this -# kind of statbar may be considered to be more user-friendly than the -# classic statbar. This bar type closely resembles the mod -# “Better HUD” [hud] by BlockMen. -hudbars_bar_type (HUD bars style) enum progress_bar progress_bar,statbar_classic,statbar_modern - - -# If enabled (default), the breath indicators in the HUD will be automatically hidden shortly -# after the breath has been filled up. Otherwise, the breath will always be displayed. -hudbars_autohide_breath (Automatically hide breath indicators) bool true - -# This setting changes the way the HUD bars are ordered on the display. You can choose -# between a zig-zag pattern (default) or a vertically stacked pattern. -# The following values are allowed: -# - zigzag: Starting from the left bottom, the next is right from the first, -# the next is above the first, the next is right of the third, etc. -# - stack_up: The HUD bars are stacked vertically, going upwards. -# - stack_down: The HUD bars are stacked vertically, going downwards. -hudbars_alignment_pattern (HUD bars alignment pattern) enum zigzag zigzag,stack_up,stack_down - -# This setting allows you to specify the order of the HUD bars explicitly. If left empty -# (the default), the health and breath indicators come first, additional indicators -# may appear in any order. This setting is quite technical and normal users probably do not -# need to worry about it. -# -# Syntax: -# The setting has to be specified as a comma-seperated list of key=value pairs, where a key -# refers to the identifier of a HUD bar and the value refers to the slot number of where the -# HUD bar should be placed. The slot number must be an integer greater of equal to 0. Where -# the HUD bars will be displayed exactly depends on the alignment pattern being used. -# All HUD bars to which no order value has been applied will fill in all slots which have -# not been occupied by the HUD bars specified in this setting, the slots will be filled in -# from the lowest slot number. -# Note that the order of those remaining HUD bars is not fixed, it basically just boils -# down on which mod “came” first. Don't worry, the mod will still work perfectly fine, this -# setting is entirely optional. -# The identifier for the health bar is “health” and the identifier for the breath bar is -# “breath”. For other HUD bars, you have to learn it from the mod which is supplying them. -# -# Be careful not to use slot indices twice, or else different HUD bars will be drawn over -# each other! -# -# Example: “breath=0, health=1” -# This makes the breath bar first and the health bar second, which is the opposite order -# of the default one. -hudbars_sorting (HUD bars order) string - -[Positions and offsets] -# Horizontal (x) main position of the HUD bars over the entire screen. -# 0.0 is left-most, 1.0 is right-most. -# For the zig-zag alignment pattern, this is for the left HUD bars. -hudbars_pos_left_x (Left HUD bar screen x position) float 0.5 0.0 1.0 -# Vertical (y) main position of the HUD bars over the entire screen. -# 0.0 is top, 1.0 is bottom. -# For the zig-zag alignment pattern, this is for the left HUD bars. -hudbars_pos_left_y (Left HUD bar screen y position) float 1.0 0.0 1.0 -# Horizontal (x) main position of the right HUD bars over the entire screen. -# 0.0 is left-most, 1.0 is right-most. -# Only used for the zig-zag alignment pattern. -hudbars_pos_right_x (Right HUD bar screen x position) float 0.5 0.0 1.0 -# Vertical main position (y) of the right HUD bars over the entire screen. -# 0.0 is top, 1.0 is bottom. -# Only used for the zig-zag alignment pattern. -hudbars_pos_right_y (Right HUD bar screen y position) float 1.0 0.0 1.0 - -# Precise x offset in pixels from the basic screen x position of the HUD bars. -# For the zig-zag alignment pattern, this is for the left HUD bars. -hudbars_start_offset_left_x (Left HUD bar x offset) int -175 -# Precise y offset in pixels from the basic screen y position of the HUD bars. -# For the zig-zag alignment pattern, this is for the left HUD bars. -hudbars_start_offset_left_y (Left HUD bar y offset) int -86 -# Precise x offset in pixels from the basic screen x position of the right HUD bars. -# Only used for the zig-zag alignment pattern. -hudbars_start_offset_right_x (Right HUD bar x offset) int 15 -# Precise y offset in pixels from the basic screen y position of the right HUD bars. -# Only used for the zig-zag alignment pattern. -hudbars_start_offset_right_y (Right HUD bar y offset) int -86 - -# The vertical distance between two HUD bars, in pixels. -hudbars_vmargin (Vertical distance between HUD bars) int 24 0 - -[Performance] -# The of seconds which need to pass before the server updates the default HUD bars -# (health and breath). Increase this number if you have a slow server or a slow network -# connection and experience performance problems. -hudbars_tick (Default HUD bars update interval) float 0.1 0.0 4.0 diff --git a/mods/hudbars/textures/hudbars_bar_background.png b/mods/hudbars/textures/hudbars_bar_background.png deleted file mode 100755 index 9a9513b0..00000000 Binary files a/mods/hudbars/textures/hudbars_bar_background.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_bar_breath.png b/mods/hudbars/textures/hudbars_bar_breath.png deleted file mode 100755 index 7d19a575..00000000 Binary files a/mods/hudbars/textures/hudbars_bar_breath.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_bar_health.png b/mods/hudbars/textures/hudbars_bar_health.png deleted file mode 100755 index 65309160..00000000 Binary files a/mods/hudbars/textures/hudbars_bar_health.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_bgicon_breath.png b/mods/hudbars/textures/hudbars_bgicon_breath.png deleted file mode 100644 index 176629af..00000000 Binary files a/mods/hudbars/textures/hudbars_bgicon_breath.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_bgicon_health.png b/mods/hudbars/textures/hudbars_bgicon_health.png deleted file mode 100755 index 8c1ddad5..00000000 Binary files a/mods/hudbars/textures/hudbars_bgicon_health.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_icon_breath.png b/mods/hudbars/textures/hudbars_icon_breath.png deleted file mode 100755 index f48aa35c..00000000 Binary files a/mods/hudbars/textures/hudbars_icon_breath.png and /dev/null differ diff --git a/mods/hudbars/textures/hudbars_icon_health.png b/mods/hudbars/textures/hudbars_icon_health.png deleted file mode 100755 index 941e9731..00000000 Binary files a/mods/hudbars/textures/hudbars_icon_health.png and /dev/null differ diff --git a/mods/mana b/mods/mana new file mode 160000 index 00000000..f4a0c313 --- /dev/null +++ b/mods/mana @@ -0,0 +1 @@ +Subproject commit f4a0c31301abe015a8a9baa2a0ea97ab48ad5cf9 diff --git a/mods/mana/API.md b/mods/mana/API.md deleted file mode 100755 index dce2daf6..00000000 --- a/mods/mana/API.md +++ /dev/null @@ -1,125 +0,0 @@ -API documentation for Mana 1.1.0 -================================ - -## Introduction -The API of the Mana mod allows you to set and receive -the current and maxiumum mana reserves of a player, -and to subtract and add mana. - -## The basic rules -For integrity reasons, this mod will ensure that the following assumptions -are true at all times for all players: - -* Current and maximum mana can never be smaller than 0 -* The current value must not be greater than the maximum value -* Only integer numbers are permitted for mana values - -It should be not possible to break these rules using this API alone. -If you somehow manage to break one ofthe rules, please report a bug. - -If a real number is used as input for a value, it will be rounded -(“round up half” rule). - -## Functions -Of not specified otherwise, all functions return `nil`. -`playername` always refers to the name of a player, as string. -`value` always refers to a number and for most functions it must always be equal to or greater than 0. - - -### `mana.set(playername, value)` -Sets the mana reserve of the specified player to `value`. -If `value` is smaller than 0, the mana will be set to 0. -If `value` is greater than the maximum, the mana will be set to the maximum. - - -### `mana.setmax(playername, value)` -Sets the maximum of the player to `value`. - -If the new maximum would become smaller than the current value, -the current value will automatically be set to -the new maximum. - -### `mana.setregen(playername, value)` -Sets the mana regeneration per mana tick of the player to `value`. -Floating-point numbers are also permitted, in which the generation -of 1 mana takes longer than 1 mana tick. I.e. `0.5`. means -that 1 mana is generated every 2 mana ticks. A negative value means the -player loses mana. - - -The length of one “mana tick” is specified as the server-wide setting -`mana_default_regen` in seconds. - - -### `mana.get(playername)` -Returns the current mana of the specified player as number. - - -### `mana.getmax(playername)` -Returns the current maximum mana of the specified player as number. - - -### `mana.getregen(playername)` -Returns the current mana regneration per mana tick of the specified -player as number. -The length of one “mana tick” is specified as the server-wide setting -`mana_default_regen` in seconds. - - -### `mana.add(playername, value)` -Adds the specified non-negative amount of mana to the player, but only -if the sum would not be greater than the maximum, - -#### Return value -* `true` on success, all mana has been added -* `false` on failure, no mana has been added - - -### `mana.subtract(playername, value)` -Subtracts the specified non-negative amount of mana from the player, -but only if the player has sufficient mana reservers. - -#### Return value -* `true` on success, all mana has been subtracted -* `false` on failure, no mana has been subtraceed - - -### `mana.add_up_to(playername, value)` -Adds the specified non-negative amount of mana to the player, but it will -be capped at the maximum. - -#### Return value -* `true, excess` on success, where `excess` is the amount of Mana which could not be added because it would have exceeded the maximum. `excess` equals `0` if all mana has been added -* `false` on failure (mana could not be added) - - -### `mana.subtract_up_to(playername, value)` -Subtracts the specified non-negative amount of mana from the player, -but if the difference is smaller than 0, the mana will be set to 0. - -#### Return value -* `true, missing` on success, where `missing` is the amount of Mana which could not be subtracted because it would have exceeded 0. `missing` equals `0` if all mana has been subtracted -* `false` on failure (mana could not be subtracted) - - -## Appendix -### General recommendations -If you want your mod to be portable, it is recommended that you balance your mod in such a way that it assumes -that every player starts with the following default mana values: - -* Max. mana: 200 -* Mana regeneration: 1 mana every 0.2 seconds - -Also assume that the max. mana never changes. -This should (hopefully) ensure that multiple independent mana-using mods are more or less balanced when using -the default settings. - -Also, to make life easier for subgame makers, define custom minetest.conf settings for your mod in order to -overwrite the mana costs (and other relevant values) used by your mod. That way, subgame makers only have to edit -minetest.conf, and not your mod. - -You do not have to bother about default values if you want to directly integrate your mod in a subgame and do -not plan to release the mod independently. - -The best way to reliable balance the mana values used by several mods is to create a standalone subgame. It is -highly recommended that you tweak the mana values of the mods to fit the subgame's needs. diff --git a/mods/mana/README.txt b/mods/mana/README.txt deleted file mode 100755 index 8a54d407..00000000 --- a/mods/mana/README.txt +++ /dev/null @@ -1,52 +0,0 @@ -Mana mod [mana] -=============== -Version: 1.1.0 -Note: This mod uses semantic versioning, as defined by version 2.0.0 of the SemVer standard. -See: - -Description -=========== -This mod adds basic support for mana to Minetest. - -Each player will have an additional attribute: Mana. To be precise: - -- Current mana reserves: How much mana the player currently has -- Maximum possible mana: How much mana the player can have at maximum -- Mana regeneration amont: How much mana will be generated each “mana tick” (default 0.2 seconds) - -By default, each player spawns with 0/200 mana, and regenerates 1 mana per fifth of a second. All -these values can be configured with the server settings (`minetest.conf`) and it is highly advised to do -so if you plan to integrate this mod into a subgame. - -The mana regeneration rate (the “mana tick”) is a global setting and is *not* configured on a -per-player basis. - -The mod provides a simple API to set, get, add and subtract the mana (and maximum) mana of any player, and -for setting the regeneration amount. Note that this mod itself does *not* change the gameplay in a meaningful -way. You should install other mods which use the Mana mod as a dependency. - -The API documentation is in the file API.md. - -If the mod “HUD bars” [hudbars] is installed, a blue bar will be added to the HUD showing the player's mana reserves. -It currently only works with version 0.3.0 of this mod. - -Otherwise, the mana is just shown as text. - -Configuration -============= - -This mod can be configured with minetest.conf! The following settings are accepted: - -* `mana_default_max`: Initial max. mana given to new players. Default: `200`. This value must be non-negative. -* `mana_default_regen`: Initial regenerated mana per “mana tick”. Default: `1`. This value can be a floating value. I.e. if the value is `0.5`, 1 mana is generated every two mana ticks (note that the player's mana amount is still a whole number). This value can be negative, in which case the player will lose mana. -* `mana_regen_timer`: The length of a “mana tick” in seconds. Each player will get his/her mana increased by the current - regen value per mana tick. Default: `0.2`. This value must be positive, also try to avoid very small values - as those could probably stress your machine a lot. - - -License information -=================== -* textures/mana_icon.png: CC-BY by Buch . -* textures/mana_bgicon.png: CC-BY, originally by Buch , modified by Wuzzy. -* textures/mana_bar.png: WTFPL by Wuzzy. -* Everything else: WTFPL. diff --git a/mods/mana/depends.txt b/mods/mana/depends.txt deleted file mode 100755 index 3e1d5c20..00000000 --- a/mods/mana/depends.txt +++ /dev/null @@ -1 +0,0 @@ -hudbars? diff --git a/mods/mana/description.txt b/mods/mana/description.txt deleted file mode 100755 index e9efb088..00000000 --- a/mods/mana/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds a mana attribute to players, can be used as energy source for magical items, etc. diff --git a/mods/mana/init.lua b/mods/mana/init.lua deleted file mode 100755 index 66e88b04..00000000 --- a/mods/mana/init.lua +++ /dev/null @@ -1,337 +0,0 @@ ---[[ -Mana 1.0.2 -This mod adds mana to players, a special attribute - -License: WTFPL -]] - ---[===[ - Initialization -]===] - -mana = {} -mana.playerlist = {} - -mana.settings = {} -mana.settings.default_max = 200 -mana.settings.default_regen = 10 -mana.settings.regen_timer = 10 - -do - local default_max = tonumber(minetest.setting_get("mana_default_max")) - if default_max ~= nil then - mana.settings.default_max = default_max - end - - local default_regen = tonumber(minetest.setting_get("mana_default_regen")) - if default_regen ~= nil then - mana.settings.default_regen = default_regen - end - - local regen_timer = tonumber(minetest.setting_get("mana_regen_timer")) - if regen_timer ~= nil then - mana.settings.regen_timer = regen_timer - end -end - - -minetest.mkdir(minetest.get_worldpath() .. "/mana/") - ---[===[ - API functions -]===] - -function mana.set(playername, value) - if value < 0 then - minetest.log("info", "[mana] Warning: mana.set was called with negative value!") - value = 0 - end - value = mana.round(value) - if value > mana.playerlist[playername].maxmana then - value = mana.playerlist[playername].maxmana - end - if mana.playerlist[playername].mana ~= value then - mana.playerlist[playername].mana = value - mana.hud_update(playername) - end -end - -function mana.setmax(playername, value) - if value < 0 then - value = 0 - minetest.log("info", "[mana] Warning: mana.setmax was called with negative value!") - end - value = mana.round(value) - if mana.playerlist[playername].maxmana ~= value then - mana.playerlist[playername].maxmana = value - if(mana.playerlist[playername].mana > value) then - mana.playerlist[playername].mana = value - end - mana.hud_update(playername) - end -end - -function mana.setregen(playername, value) - mana.playerlist[playername].regen = value -end - -function mana.get(playername) - return mana.playerlist[playername].mana -end - -function mana.getmax(playername) - return mana.playerlist[playername].maxmana -end - -function mana.getregen(playername) - return mana.playerlist[playername].regen -end - -function mana.add_up_to(playername, value) - local t = mana.playerlist[playername] - value = mana.round(value) - if(t ~= nil and value >= 0) then - local excess - if((t.mana + value) > t.maxmana) then - excess = (t.mana + value) - t.maxmana - t.mana = t.maxmana - else - excess = 0 - t.mana = t.mana + value - end - mana.hud_update(playername) - return true, excess - else - return false - end -end - -function mana.add(playername, value) - local t = mana.playerlist[playername] - value = mana.round(value) - if(t ~= nil and ((t.mana + value) <= t.maxmana) and value >= 0) then - t.mana = t.mana + value - mana.hud_update(playername) - return true - else - return false - end -end - -function mana.subtract(playername, value) - local t = mana.playerlist[playername] - value = mana.round(value) - if(t ~= nil and t.mana >= value and value >= 0) then - t.mana = t.mana -value - mana.hud_update(playername) - return true - else - return false - end -end - -function mana.subtract_up_to(playername, value) - local t = mana.playerlist[playername] - value = mana.round(value) - if(t ~= nil and value >= 0) then - local missing - if((t.mana - value) < 0) then - missing = math.abs(t.mana - value) - t.mana = 0 - else - missing = 0 - t.mana = t.mana - value - end - mana.hud_update(playername) - return true, missing - else - return false - end -end - - - - - ---[===[ - File handling, loading data, saving data, setting up stuff for players. -]===] - - --- Load the playerlist from a previous session, if available. -function mana.load_file(playername) - local filepath = minetest.get_worldpath().."/mana/" .. playername - local file = io.open(filepath, "r") - if file then - minetest.log("action", "[mana] File opened for player " .. playername .. ".") - local string = file:read() - io.close(file) - if(string ~= nil) then - local savetable = minetest.deserialize(string) - if savetable and type(savetable) == "table" then - minetest.log("action", "[mana] Data successfully read.") - return savetable - end - end - end - return {} -end - -mana.playerlist = {} - -function mana.save_to_file(playername) - local savetable = mana.playerlist[playername] - - local savestring = minetest.serialize(savetable) - - local filepath = minetest.get_worldpath().."/mana/" .. playername - local file = io.open(filepath, "w") - if file then - file:write(savestring) - io.close(file) - minetest.log("action", "[mana] Wrote mana data for "..playername..".") - else - minetest.log("error", "[mana] Failed to write mana data for "..playername..".") - end -end - - -minetest.register_on_respawnplayer(function(player) - local playername = player:get_player_name() - mana.set(playername, 0) - mana.hud_update(playername) -end) - - -minetest.register_on_leaveplayer(function(player) - local playername = player:get_player_name() - if not minetest.get_modpath("hudbars") ~= nil then - mana.hud_remove(playername) - end - mana.save_to_file(playername) -end) - -minetest.register_on_shutdown(function() - minetest.log("action", "[mana] Server shuts down. Rescuing data into mana.mt") - for _, pref in pairs(minetest.get_connected_players()) do - mana.save_to_file(pref:get_player_name()) - end -end) - -minetest.register_on_joinplayer(function(player) - local playername = player:get_player_name() - - mana.playerlist[playername] = mana.load_file(playername) - if not mana.playerlist[playername].mana then - mana.playerlist[playername].mana = 0 - mana.playerlist[playername].maxmana = mana.settings.default_max - mana.playerlist[playername].regen = mana.settings.default_regen - mana.playerlist[playername].remainder = 0 - end - - if minetest.get_modpath("hudbars") ~= nil then - hb.init_hudbar(player, "mana", mana.get(playername), mana.getmax(playername)) - else - mana.hud_add(playername) - end -end) - - ---[===[ - Mana regeneration -]===] - -mana.regen_timer = 0 - -function mana_regen_step() - local players = minetest.get_connected_players() - for i=1, #players do - local name = players[i]:get_player_name() - if mana.playerlist[name] ~= nil then - if players[i]:get_hp() > 0 then - local plus = mana.playerlist[name].regen - -- Compability check for version <= 1.0.2 which did not have the remainder field - if mana.playerlist[name].remainder ~= nil then - plus = plus + mana.playerlist[name].remainder - end - local plus_now = math.floor(plus) - local floor = plus - plus_now - if plus_now > 0 then - mana.add_up_to(name, plus_now) - else - mana.subtract_up_to(name, math.abs(plus_now)) - end - mana.playerlist[name].remainder = floor - end - end - end - minetest.after(mana.settings.regen_timer, mana_regen_step) -end -minetest.after(0, mana_regen_step) - ---[===[ - HUD functions -]===] - -if minetest.get_modpath("hudbars") ~= nil then - hb.register_hudbar("mana", 0xFFFFFF, "Mana", { bar = "mana_bar_purple.png", icon = "mana_icon_purple.png", bgicon = "mana_bgicon.png" }, 0, mana.settings.default_max, false) - - function mana.hud_update(playername) - local player = minetest.get_player_by_name(playername) - if player ~= nil then - hb.change_hudbar(player, "mana", mana.get(playername), mana.getmax(playername)) - end - end - - function mana.hud_remove(playername) - end - -else - function mana.manastring(playername) - return string.format("Mana: %d/%d", mana.get(playername), mana.getmax(playername)) - end - - function mana.hud_add(playername) - local player = minetest.get_player_by_name(playername) - player:hud_add({ - hud_elem_type = "statbar", - position = {x=0.5,y=1}, - size = {x=24, y=24}, - text = "mana_icon_bg_empty.png", - number = 20, - alignment = {x=-1,y=-1}, - offset = {x=80, y=-186}, - } - ) - local id = player:hud_add({ - hud_elem_type = "statbar", - position = {x=0.5,y=1}, - size = {x=24, y=24}, - text = "mana_icon_purple.png", - number = mana.get(playername)/10, - alignment = {x=-1,y=-1}, - offset = {x=80, y=-186}, - } - ) - - mana.playerlist[playername].hudid = id - return id - end - - function mana.hud_update(playername) - local player = minetest.get_player_by_name(playername) - player:hud_change(mana.playerlist[playername].hudid, "number", mana.get(playername)/100) - end - - function mana.hud_remove(playername) - local player = minetest.get_player_by_name(playername) - player:hud_remove(mana.playerlist[playername].hudid) - end -end - ---[===[ - Helper functions -]===] -mana.round = function(x) - return math.ceil(math.floor(x+0.5)) -end diff --git a/mods/mana/textures/mana_bar.png b/mods/mana/textures/mana_bar.png deleted file mode 100755 index bb4faa33..00000000 Binary files a/mods/mana/textures/mana_bar.png and /dev/null differ diff --git a/mods/mana/textures/mana_bar_purple.png b/mods/mana/textures/mana_bar_purple.png deleted file mode 100755 index 89e8d8ae..00000000 Binary files a/mods/mana/textures/mana_bar_purple.png and /dev/null differ diff --git a/mods/mana/textures/mana_bgicon.png b/mods/mana/textures/mana_bgicon.png deleted file mode 100755 index c4f0cdda..00000000 Binary files a/mods/mana/textures/mana_bgicon.png and /dev/null differ diff --git a/mods/mana/textures/mana_icon_bg_empty.png b/mods/mana/textures/mana_icon_bg_empty.png deleted file mode 100755 index 45d5e4f9..00000000 Binary files a/mods/mana/textures/mana_icon_bg_empty.png and /dev/null differ diff --git a/mods/mana/textures/mana_icon_purple.png b/mods/mana/textures/mana_icon_purple.png deleted file mode 100755 index f8400c70..00000000 Binary files a/mods/mana/textures/mana_icon_purple.png and /dev/null differ diff --git a/mods/mff/mff_pclasses/depends.txt b/mods/mff/mff_pclasses/depends.txt index 5b6cf0f4..828a8e0c 100755 --- a/mods/mff/mff_pclasses/depends.txt +++ b/mods/mff/mff_pclasses/depends.txt @@ -1,3 +1,4 @@ +sprint mff_core pclasses runes diff --git a/mods/pclasses/init.lua b/mods/pclasses/init.lua index 69b2e6f5..7da30675 100755 --- a/mods/pclasses/init.lua +++ b/mods/pclasses/init.lua @@ -74,15 +74,17 @@ if pclasses.conf.default_class then end minetest.register_on_joinplayer(function(player) - local pname = player:get_player_name() - pclasses.api.create_graveyard_inventory(player) --create inventory before - - local cname = pclasses.api.get_player_class(pname) - if cname ~= nil and pclasses.api.get_class_by_name(cname) then - pclasses.api.set_player_class(pname, cname) - elseif pclasses.api.get_class_by_name(pclasses.conf.default_class) then - pclasses.api.set_player_class(pname, pclasses.conf.default_class) - end + + minetest.after(5, function(player) + local pname = player:get_player_name() + pclasses.api.create_graveyard_inventory(player) --create inventory before + local cname = pclasses.api.get_player_class(pname) + if cname ~= nil and pclasses.api.get_class_by_name(cname) then + pclasses.api.set_player_class(pname, cname) + elseif pclasses.api.get_class_by_name(pclasses.conf.default_class) then + pclasses.api.set_player_class(pname, pclasses.conf.default_class) + end + end, player) end) minetest.register_on_shutdown(function() diff --git a/mods/technic_armor b/mods/technic_armor new file mode 160000 index 00000000..694642f5 --- /dev/null +++ b/mods/technic_armor @@ -0,0 +1 @@ +Subproject commit 694642f5619aa31ef81caadbddade5d007527ae9