Merge remote-tracking branch 'upstream/master'

Requires UI git tag "version-2" or commit a7556c50, and Minetest v5.4.0
or later

.github/workflows/integration-test.yml

@@ -0,0 +1,14 @@
+name: integration-test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: integration-test
+      run: ./integration-test.sh

.github/workflows/luacheck.yml

@@ -0,0 +1,17 @@
+name: luacheck
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: apt
+      run: sudo apt-get install -y luarocks
+    - name: luacheck install
+      run: luarocks install --local luacheck
+    - name: luacheck run
+      run: $HOME/.luarocks/bin/luacheck ./

.gitignore

@@ -4,5 +4,7 @@
 *bak*
 tags
 *.vim
-armor.conf
 
+## Eclipse project files & directories
+.project
+.settings

.luacheckrc

@@ -0,0 +1,32 @@
+
+unused_args = false
+
+globals = {
+	"wieldview",
+	"armor",
+	"inventory_plus"
+}
+
+read_globals = {
+	-- Stdlib
+	string = {fields = {"split"}},
+	table = {fields = {"copy", "getn"}},
+
+	-- Minetest
+	"vector", "ItemStack",
+	"dump", "VoxelArea",
+
+	-- deps
+	"default",
+	"minetest",
+	"unified_inventory",
+	"wardrobe",
+	"player_monoids",
+	"armor_monoid",
+	"sfinv",
+	"ARMOR_MATERIALS",
+	"ARMOR_FIRE_NODES",
+	"pova",
+	"skins",
+	"u_skins"
+}

3d_armor/LICENSE.txt

@@ -1,9 +1,26 @@
 [mod] 3d Armor [3d_armor]
 =========================
 
-License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
+License Source Code
+-------------------
 
-License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
+Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
 
-https://github.com/daviddoesminetest/3d-armors-new-textures
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+License Textures
+----------------
+
+Copyright (C) 2017-2019 davidthecreator - CC-BY-SA 3.0

3d_armor/README.md

@@ -0,0 +1,524 @@
+# [mod] Visible Player Armor [3d_armor]
+
+|  |  |  |  | 
+|--|--|--|--|
+|-[Overview](#overview)                                                     |||-[API](#api)
+|-[Armor Configuration](#armor-configuration)                               |||- - [3d_Armor Item Storage](#3d_armor-item-storage)
+|- - [disable_specific_materials](#to-disable-individual-armor-materials)   |||- - [Armor Registration](#armor-registration)
+|- - [armor_init_delay](#initialization-glitches-when-a-player-first-joins) |||- - [Registering Armor Groups](#registering-armor-groups)
+|- - [armor_init_times](#number-of-initialization-attempts)                 |||- - [Groups used by 3d_Armor](#groups-used-by-3d_armor)
+|- - [armor_bones_delay](#armor-not-in-bones-due-to-server-lag)             |||- - - [Elements](#elements)
+|- - [armor_update_time](#how-often-player-armor-items-are-updated)         |||- - - [Attributes](#attributes)
+|- - [armor_drop](#drop-armor-when-a-player-dies)                           |||- - - [Physics](#physics)
+|- - [armor_destroy](#destroy-armor-when-a-player-dies)                     |||- - - [Durability](#durability)
+|- - [armor_level_multiplier](#armor-level-multiplyer)                      |||- - - [Armor Material](#armor-material)
+|- - [armor_heal_multiplier](#armor-healing-multiplyer)                     |||- - [Armour Functions](#armor-functions)
+|- - [armor_set_elements](#allows-the-customisation-of-armor-set)           |||- - - [armor:set_player_armor](#armor-set_player_armor)
+|- - [armor_set_bonus](#armor-set-bonus-multiplier)                         |||- - - [armor:punch](#armor-punch)
+|- - [armor_water_protect](#enable-water-protection)                        |||- - - [armor:damage](#armor-damage)
+|- - [armor_fire_protect](#enable-fire-protection)                          |||- - - [armor:remove_all](#armor-remove_all)
+|- - [armor_punch_damage](#enable-punch-damage-effects)                     |||- - - [armor:equip](#armor-equip)
+|- - [armor_migrate_old_inventory](#migration-of-old-armor-inventories)     |||- - - [armor:unequip](#armor-unequip)
+|- - [wieldview_update_time](#how-often-player-wield-items-are-updated)     |||- - - [armor:update_skin](#armor-update_skin)
+|-[Credits](#credits)                                                       |||- - [Callbacks](#Callbacks)
+|                                                                           |||- - - [Item callbacks](#item-callbacks)
+|                                                                           |||- - - [Global callbacks](#global-callbacks)
+
+# Overview
+
+**Depends:** default
+
+**Recommends:** sfinv, unified_inventory or smart_inventory (use only one to avoid conflicts)
+
+**Supports:** player_monoids, armor_monoid and POVA
+
+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.
+
+# Armor Configuration
+
+Change the following default settings by going to Main Menu>>Settings(Tab)>>All Settings(Button)>>Mods>>minetest-3d_Armor>>3d_Armor
+
+### To disable individual armor materials
+ **set the below to false**
+
+    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 = true
+
+### Initialization glitches when a player first joins
+ **Increase to prevent glitches**
+ 
+    armor_init_delay = 2
+
+### Number of initialization attempts
+ **Increase to prevent glitches - Use in conjunction with armor_init_delay if initialization problems persist.**
+
+    armor_init_times = 10
+
+### Armor not in bones due to server lag
+ **Increase to help resolve**
+ 
+    armor_bones_delay = 1
+
+### How often player armor items are updated
+**Number represents how often per second update is performed, higher value means less performance hit for servers but armor items maybe delayed in updating when switching.Fractional seconds also supported eg 0.1**
+
+    armor_update_time = 1
+	
+### Drop armor when a player dies
+ **Uses bones mod if present, otherwise items are dropped around the player when false.**
+
+    armor_drop = true
+
+### Destroy armor when a player dies
+ **overrides armor_drop.**
+
+    armor_destroy = false
+
+### Armor level multiplyer
+ **Increase to make armor more effective and decrease to make armor less effective**
+ **eg: level_multiplier = 0.5 will reduce armor level by half.**
+
+    armor_level_multiplier = 1
+
+### Armor healing multiplyer
+ **Increase to make armor healing more effective and decrease to make healing less effective**
+ **eg: armor_heal_multiplier = 0 will disable healing altogether.**
+
+    armor_heal_multiplier = 1
+	
+### Allows the customisation of armor set 
+ **Shields already configured as need to be worn to complete an armor set**   
+ **These names come from [Element names](#groups-used-by-3d_armor), the second half of the element name only is used eg armor_head is head**
+ 
+    armor_set_elements = head torso legs feet shield
+
+### Armor set bonus multiplier 
+ **Set to 1 to disable set bonus**
+ 
+    armor_set_multiplier = 1.1
+
+### Enable water protection
+ **periodically restores breath when activated**
+
+    armor_water_protect = true
+
+### Enable fire protection 
+**defaults to true if using ethereal mod**
+
+    armor_fire_protect = false
+	
+### Fire protection enabled, disable torch fire damage 
+**when fire protection is enabled allows you to disable fire damage from torches**
+**defaults to true if using ethereal mod**
+
+    armor_fire_protect_torch = false
+
+### Enable punch damage effects
+
+    armor_punch_damage = true
+
+### Migration of old armor inventories
+
+    armor_migrate_old_inventory = true
+	
+### How often player wield items are updated
+**Number represents how often per second update is performed, higher value means less performance hit for servers but wield items maybe delayed in updating when switching. Fractional seconds also supported eg 0.1**   
+***Note this is MT engine functionality but included for completness***
+
+    wieldview_update_time = 1
+
+# API
+
+## 3d_Armor item storage
+3d_Armor stores each armor piece a player currently has equiped in a ***detached*** inventory. The easiest way to access this inventory if needed is using this line of code
+
+	local _, armor_inv = armor:get_valid_player(player, "3d_armor")
+
+**Example** 
+
+	armor:register_on_equip(function(player, index, stack)
+		local _, armor_inv = armor:get_valid_player(player, "3d_armor")
+			for i = 1, 6 do
+				local stack = armor_inv:get_stack("armor", i)
+					if stack:get_name() == "3d_armor:chestplate_gold" then
+						minetest.chat_send_player(player:get_player_name(),"Got to love the Bling!!!")
+					end
+			end
+	end)
+
+## Armor Registration
+
+    armor:register_armor(name, def)
+
+Wrapper function for `minetest.register_tool`, which enables the easy registration of new armor items. While registering armor as a tool item is still supported, this may be deprecated in future so all armor items should be registered using *armor:register_armor(name,def)*.
+
+### Additional fields supported by 3d_armor
+
+	texture = <filename>
+	preview = <filename>
+	armor_groups = <table>
+	damage_groups = <table>
+	reciprocate_damage = <bool>
+	on_equip = <function>
+	on_unequip = <function>
+	on_destroy = <function>
+	on_damage = <function>
+	on_punched = <function>
+
+***Reciprocal tool*** damage will apply damage back onto the attacking tool/weapon, however this will only be done by the first armor inventory item with `reciprocate_damage = true`, damage does not stack.
+ 
+**Example Simple:**
+
+    armor:register_armor("mod_name:chestplate_leather", {
+    	description = "Leather Chestplate",
+    	inventory_image = "mod_name_inv_chestplate_leather.png",
+    	texture = "mod_name_leather_chestplate.png",
+    	preview = "mod_name_leather_chestplate_preview.png",
+    	groups = {armor_torso=1, armor_heal=0, armor_use=2000, flammable=1},
+    	armor_groups = {fleshy=10},
+    	damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1}
+    })
+*See ***armor.lua*** under **3d_armor>>3d_armor** for further examples*
+
+**Extended functionality**   
+The values for ***texture*** and ***preview*** do not need to be included when registering armor if they follow the naming convention in the textures mod folder of:   
+***texture:*** *mod_name_leather_chestplate.png*   
+***preview:*** *mod_name_leather_chestplate_preview.png*
+
+## Registering Armor Groups
+3d armor has a built in armor group which is ***fleshy*** all players base vulnerability to being fleshy is ***100***. 
+ 3d armour allows for the easy registration/addition of new armor groups::
+
+    armor:register_armor_group(group, base)
+    
+***group:*** Is the name of the new armor group 
+***base*** Is the starting vulnerability that all players have to that new group. This dosent need to be 100.
+
+**Example**
+
+    armor:register_armor_group("radiation", 100)
+
+New armor group is registered called *radiation* and all players start off with a base vulnerability of *100* to radiation.
+
+**Example** *Showing armor reg, new group usage and custom function*
+
+    armor:register_armor("mod_name:speed_boots", {
+    	description = "Speed Boots",
+    	inventory_image = "mod_name_speed_boots_inv.png",
+    	texture = "mod_name_speed_boots.png",
+    	preview = "mod_name_speed_boots_preview.png",
+    	groups = {armor_feet=1, armor_use=500, physics_speed=1.2, flammable=1},
+    	armor_groups = {fleshy=10, radiation=10},
+    	damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1},
+    	reciprocate_damage = true,
+    	on_destroy = function(player, index, stack)
+    		local pos = player:get_pos()
+    		if pos then
+    			minetest.sound_play({
+    				name = "mod_name_break_sound",
+    				pos = pos,
+    				gain = 0.5,
+    			})
+    		end
+    	end,
+    })
+
+### Tools/weapons and new armor groups
+The above allows armor to block/prevent new damage types but you also need to assign the new damage group to a tool/weapon or even a node (see technic mod) to make wearing the armor item meaningful. Simply add the ***armor_groups*** name to the tool items ***damage_groups***. 
+
+**Example**
+
+    minetest.register_tool("mod_name:glowing_sword", {
+	    description = "Glowing Sword",
+	    inventory_image = "mod_name_tool_glowingsword.png",
+	    tool_capabilities = {full_punch_interval = 1.2,max_drop_level=0,
+	    groupcaps={
+		    cracky = {times={[3]=1.60}, uses=10, maxlevel=1},},
+		    damage_groups = {fleshy=10,radiation=20},
+		    },
+		sound = {breaks = "default_tool_breaks"},
+	    groups = {pickaxe = 1, flammable = 2}
+    })
+
+## Groups used by 3d_Armor
+3d_armor has many default groups already registered, these are categorized under 4 main headings
+ - **Elements:** armor_head, armor_torso, armor_legs, armor_feet
+ - **Attributes:** armor_heal, armor_fire, armor_water
+ - **Physics:** physics_jump, physics_speed, physics_gravity
+ - **Durability:** armor_use, flammable
+ 
+***Note: for calculation purposes "Attributes" and "Physics" values stack***
+
+### Elements
+Additional armor elements can be added by dependant mods, for example shields adds the group armor_shield which has by default a limit that only 1 shield can be worn at a time.
+
+Adding Elements is more complex but the below code can be used to add new elements;
+
+    if minetest.global_exists("armor") and armor.elements then
+    	table.insert(armor.elements, "hands")
+    end
+**1st line** not strictly needed but checks that the global table "armor" and subtable "elements" exists   
+**2nd line** adds a new value to the armor.elements table called "hands"  
+
+See ***init.lua*** under **3d_armor>>shields** for a further example
+
+The new armor item can now be registered using the new element
+**Example**
+
+    armor:register_armor("mod_name:gloves_wood", {    
+	    description = "Wood Gauntlets",   
+	    inventory_image = "mod_name_inv_gloves_wood.png",
+	    texture = "mod_name_gloves_wood.png",
+    	preview = "mod_name_gloves_wood_preview.png",   
+	    groups = {armor_hands=1, armor_heal=0, armor_use=2000, flammable=1},   
+	    armor_groups = {fleshy=5},    
+	    damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1},
+	})
+
+### Attributes
+Three attributes are avaliable in 3d_armor these are armor_heal, armor_fire and armor_water. Although possible to add additional attributes they would do nothing as code needs to be provide to specifiy the behaviour this could be done in a dependant mod
+
+#### Armor_heal
+This isn't how much the armor will heal but relates to the chance the armor will completely block the damage. For each point of ***armor_heal*** there is a 1% chance that damage will be completely blocked, this value will stack between all armor pieces
+
+**Example**
+The below Diamond chestplate has a 12% chance to completely block all damage (armor_heal=12), however so do boots, helmet and trousers so if the player was wearing all 4 pieces they would have a 48% chance of blocking all damage each attack.
+ 
+	armor:register_armor("3d_armor:chestplate_diamond", {
+		description = S("Diamond Chestplate"),
+		inventory_image = "3d_armor_inv_chestplate_diamond.png",
+		groups = {armor_torso=1, armor_heal=12, armor_use=200},
+		armor_groups = {fleshy=20},
+		damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
+	}) 
+
+#### Armor_fire
+***"Armor_fire"*** provides 5 levels of fire protection    
+ - level 1 protects against torches
+ - level 2 protects against crystal spike (Ethereal mod)
+ - level 3 protects against fire
+ - level 4 unused
+ - level 5 protects against lava
+	
+**Example**
+
+	armor:register_armor("mod_name:fire_proof_jacket", {
+		description = "Fire Proof Jacket",
+		inventory_image = "mod_name_inv_fire_proof_jacket.png",
+		groups = {armor_torso=1, armor_fire=3, armor_use=1000},
+		armor_groups = {fleshy=10},
+		damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
+	})
+
+#### Armor_water
+***"Armor_water"*** will periodically restore a players breath when underwater. This only has one level or state, which is armor_water=1  
+
+**Example**
+
+	armor:register_armor("mod_name:helmet_underwater_breath", {
+		description = "Helmet of Underwater Breathing",
+		inventory_image = "mod_name_inv_helmet_underwater_breath.png",
+		groups = {armor_head=1, armor_water=1, armor_use=1000},
+		armor_groups = {fleshy=5},
+		damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
+	})
+
+### Physics
+The physics attributes supported by 3d_armor are ***physics_jump, physics_speed and physics_gravity***. Although 3d_armor supports the use of this with no other mods it is recommended that the mod [player_monoids](https://forum.minetest.net/viewtopic.php?t=14895) is used to help with intermod compatability. 
+
+***physics_jump*** - Will increase/decrease the jump strength of the player so they can jump more/less. The base number is "1" and any value is added or subtracted, supports fractional so "physics_jump=1" will increase jump strength by 100%. "physics_jump= -0.5" will decrease jump by 50%.  
+
+***physics_speed*** - Will increase/decrease the walk speed of the player so they walk faster/slower. The base number is "1" and any value is added or subtracted, supports fractional so "physics_speed=1.5" will increase speed by 150%, "physics_speed= -0.5" will decrease speed by 50%. 
+
+***physics_gravity*** - Will increase/decrease gravity the player experiences so it's higher/lower. The base number is "1" and any value is added or subtracted, supports fractional so "physics_gravity=2" will increase gravity by 200%, "physics_gravity= -1" will decrease gravity by 100%. 
+
+*Note: The player physics modifications won't be applied via `set_physics_override` if `player_physics_locked` is set to 1 in the respective player's meta.*
+
+### Durability
+Durability is determined by the value assigned to the group ***armor_use***. The higher the ***armor_use*** value the faster/more quickly it is damaged/degrades. This is calculated using the formula:
+
+     Total uses = approx(65535/armor_use)
+	 
+ **Example**  
+ All wood armor items have an ***armor_use=2000***;
+ 
+	65535/2000 = 32.76 (32)   
+ After 32 uses(hits) the armor item will break.   
+ 
+ All diamond armor items have an  ***armor_use=200***;
+ 
+	65535/2000 = 327.6 (327)   
+ After 327 uses(hits) the armor item will break. 
+
+### Armor Material 
+The material the armor is made from is defined by adding the material to the end of registered armor item name. It is very important the material is the last item in the registered item name and it is preceeded by an "_" eg "_materialname".
+The material name is what 3d_armor uses to determine if a player is wearing a set of armor. To recieve the set bonus all items worn must be made of the same material.
+So to get a set bonus under the default set settings the players armor items listed below must be made of the same material:
+* head - Helmet
+* torso - Chestplate
+* legs - Leggings
+* feet - Boots
+* shield - Shields   
+
+If all of the above were made of material "wood" the player would recieve an ***armor_set_bonus*** of armor_level * 1.1, essentially +10%  
+
+ **Example One** 
+ 
+	armor:register_armor("3d_armor:helmet_bronze", {
+		description = S("Bronze Helmet"),
+		inventory_image = "3d_armor_inv_helmet_bronze.png",
+		groups = {armor_head=1, armor_heal=6, armor_use=400, physics_speed=-0.01, physics_gravity=0.01},
+		armor_groups = {fleshy=10},
+		damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2},
+	})
+	
+ **Example Two** 
+ 
+	armor:register_armor("new_mod:helmet_spartan_bronze", {
+		description = S("Spartan Helmet"),
+		inventory_image = "new_mod_inv_helmet_spartan_bronze.png",
+		groups = {armor_head=1, armor_heal=6, armor_use=350, physics_speed=-0.01, physics_gravity=0.01},
+		armor_groups = {fleshy=12},
+		damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2},
+	})
+
+***Note: At the moment an armor item can only be made of one material***
+
+## Armor Functions
+
+### armor set_player_armor
+
+	armor:set_player_armor(player)
+
+Primarily an internal function but can be called externally to apply any
+changes that might not otherwise get handled.
+
+### armor punch
+
+	armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
+
+Used to apply damage to all equipped armor based on the damage groups of
+each individual item.`hitter`, `time_from_last_punch` and `tool_capabilities`
+are optional but should be valid if included.
+
+### armor damage
+
+	armor:damage(player, index, stack, use)
+
+Adds wear to a single armor itemstack, triggers `on_damage` callbacks and
+updates the necessary inventories. Also handles item destruction callbacks
+and so should NOT be called from `on_unequip` to avoid an infinite loop.
+
+### armor remove_all
+
+	armor:remove_all(player)
+
+Removes all armors from the player's inventory without triggering any callback.
+
+### armor equip
+
+	armor:equip(player, armor_name)
+
+Equip the armor, removing the itemstack from the main inventory if there's one.
+
+### armor unequip
+
+	armor:unequip(player, armor_name)
+
+Unequip the armor, adding the itemstack to the main inventory.
+
+### armor update_skin
+
+	armor:update_skin(player_name)
+
+Triggers a skin update with the same action as if a field with `skins_set` was submitted.
+
+## Callbacks
+
+### Item Callbacks
+
+In all of the below when armor is destroyed `stack` will contain a copy of the previous stack.
+
+*unsure what this note means may apply to all item callbacks or just on_punched*   
+Return `false` to override armor damage effects.
+
+#### on_equip
+
+	on_equip = func(player, index, stack)
+
+#### on_unequip
+
+	on_unequip = func(player, index, stack)
+
+#### on_destroy 
+
+	on_destroy = func(player, index, stack)
+
+#### on_damage
+
+	on_damage = func(player, index, stack)
+
+#### on_punched
+
+	on_punched = func(player, hitter, time_from_last_punch, tool_capabilities)
+
+`on_punched` is called every time a player is punched or takes damage, `hitter`, `time_from_last_punch` and `tool_capabilities` can be `nil` and will be in the case of fall damage.  
+When fire protection is enabled, hitter == "fire" in the event of fire damage.    
+
+
+### Global Callbacks
+
+#### armor register_on_update
+
+	armor:register_on_update(function(player))
+
+#### armor register_on_equip
+
+	armor:register_on_equip(function(player, index, stack))
+
+#### armor register_on_unequip
+
+	armor:register_on_unequip(function(player, index, stack))
+
+#### armor register_on_destroy
+armor:register_on_destroy(function(player, index, stack))
+
+ **Example**
+
+	armor:register_on_update(function(player)
+		print(player:get_player_name().." armor updated!")
+	end)
+
+
+# Credits
+ 
+### The below have added too, tested or in other ways contributed to the development and ongoing support of 3d_Armor
+
+|Stu              |Stujones11       |Stu              |Github Ghosts    |
+|:---------------:|:---------------:|:---------------:|:---------------:|
+|Pavel_S          |BlockMen         |Tenplus1         |donat-b          |
+|JPRuehmann       |BrandonReese     |Megaf            |Zeg9             |
+|poet.nohit       |Echoes91         |Adimgar          |Khonkhortisan    |
+|VanessaE         |CraigyDavi       |proller          |Thomasrudin      |
+|Byakuren         |kilbith (jp)     |afflatus         |G1ov4            |
+|Thomas-S         |Dragonop         |Napiophelios     |Emojigit         |
+|rubenwardy       |daviddoesminetest|bell07           |OgelGames        |
+|tobyplowy        |crazyginger72    |fireglow         |bhree            |
+|Lone_Wolf(HT)    |Wuzzy(2)         |numberZero       |Monte48          |
+|AntumDeluge      |Terumoc          |runsy            |Dacmot           |
+|codexp           |davidthecreator  |SmallJoker       |orbea            |
+|BuckarooBanzay   |daret            |Exeterdad        |Calinou          |
+|Pilcrow182       |indriApollo      |HybridDog        |CraigyDavi       |
+|Paly-2           |Diogogomes       |                 |                 |
+
+*Note: Names gathered from 3d_armor forum thread and github, I may have missed some people, apologises if I have - S01*  

3d_armor/README.txt

@@ -1,188 +0,0 @@
-[mod] Visible Player Armor [3d_armor]
-=====================================
-
-Depends: default
-
-Recommends: sfinv, unified_inventory or smart_inventory (use only one to avoid conflicts)
-
-Supports: player_monoids and armor_monoid
-
-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.
-
-Armor Configuration
--------------------
-
-Override the following default settings by adding them to your minetest.conf file.
-
--- 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 = 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
-
-API
----
-
-Armor Registration:
-
-armor:register_armor(name, def)
-
-Wrapper function for `minetest.register_tool`, while registering armor as
-a tool item is still supported, this may be deprecated in future so new code
-should use this method.
-
-Additional fields supported by 3d_armor:
-
-	texture = <filename>
-	preview = <filename>
-	armor_groups = <table>
-	damage_groups = <table>
-	reciprocate_damage = <bool>
-	on_equip = <function>
-	on_unequip = <function>
-	on_destroy = <function>
-	on_damage = <function>
-	on_punched = <function>
-
-armor:register_armor_group(group, base)
-
-Example:
-
-armor:register_armor_group("radiation", 100)
-
-armor:register_armor("mod_name:speed_boots", {
-	description = "Speed Boots",
-	inventory_image = "mod_name_speed_boots_inv.png",
-	texture = "mod_name_speed_boots.png",
-	preview = "mod_name_speed_boots_preview.png",
-	groups = {armor_feet=1, armor_use=500, physics_speed=1.2, flammable=1},
-	armor_groups = {fleshy=10, radiation=10},
-	damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1},
-	reciprocate_damage = true,
-	on_destroy = function(player, index, stack)
-		local pos = player:getpos()
-		if pos then
-			minetest.sound_play({
-				name = "mod_name_break_sound",
-				pos = pos,
-				gain = 0.5,
-			})
-		end
-	end,
-})
-
-See armor.lua, technic_armor and shields mods for more examples.
-
-Default groups:
-
-Elements: armor_head, armor_torso, armor_legs, armor_feet
-Attributes: armor_heal, armor_fire, armor_water
-Physics: physics_jump, physics_speed, physics_gravity
-Durability: armor_use, flammable
-
-Notes:
-
-Elements may be modified by dependent mods, eg shields adds armor_shield.
-Attributes and physics values are 'stackable', durability is determined
-by the level of armor_use, total uses == approx (65535/armor_use), non-fleshy
-damage groups need to be defined in the tool/weapon used against the player.
-
-Reciprocal tool damage will be done only by the first armor inventory item
- with `reciprocate_damage = true`
-
-Armor Functions:
-
-armor:set_player_armor(player)
-
-Primarily an internal function but can be called externally to apply any
-changes that might not otherwise get handled.
-
-armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
-
-Used to apply damage to all equipped armor based on the damage groups of
-each individual item.`hitter`, `time_from_last_punch` and `tool_capabilities`
-are optional but should be valid if included.
-
-armor:damage(player, index, stack, use)
-
-Adds wear to a single armor itemstack, triggers `on_damage` callbacks and
-updates the necessary inventories. Also handles item destruction callbacks
-and so should NOT be called from `on_unequip` to avoid an infinite loop.
-
-Item Callbacks:
-
-on_equip = func(player, index, stack)
-on_unequip = func(player, index, stack)
-on_destroy = func(player, index, stack)
-on_damage = func(player, index, stack)
-on_punched = func(player, hitter, time_from_last_punch, tool_capabilities)
-
-Notes:
-
-`on_punched` is called every time a player is punched or takes damage, `hitter`,
-`time_from_last_punch` and `tool_capabilities` can be `nil` and will be in the
-case of fall damage, etc. When fire protection is enabled, hitter == "fire"
-in the event of fire damage. Return `false` to override armor damage effects.
-When armor is destroyed `stack` will contain a copy of the previous stack.
-
-Global Callbacks:
-
-armor:register_on_update(func(player))
-armor:register_on_equip(func(player, index, stack))
-armor:register_on_unequip(func(player, index, stack))
-armor:register_on_destroy(func(player, index, stack))
-
-Global Callback Example:
-
-armor:register_on_update(function(player)
-	print(player:get_player_name().." armor updated!")
-end)
-

3d_armor/api.lua

@@ -1,6 +1,10 @@
+-- support for i18n
+local S = minetest.get_translator(minetest.get_current_modname())
+
 local skin_previews = {}
 local use_player_monoids = minetest.global_exists("player_monoids")
 local use_armor_monoid = minetest.global_exists("armor_monoid")
+local use_pova_mod = minetest.get_modpath("pova")
 local armor_def = setmetatable({}, {
 	__index = function()
 		return setmetatable({
@@ -69,7 +73,9 @@ armor = {
 		on_damage = {},
 		on_destroy = {},
 	},
-	version = "0.4.9",
+	migrate_old_inventory = true,
+  version = "0.4.13",
+  get_translator = S
 }
 
 armor.config = {
@@ -89,14 +95,38 @@ armor.config = {
 	material_gold = true,
 	material_mithril = true,
 	material_crystal = true,
+	set_elements = "head torso legs feet shield",
+	set_multiplier = 1.1,
 	water_protect = true,
 	fire_protect = minetest.get_modpath("ethereal") ~= nil,
+	fire_protect_torch = minetest.get_modpath("ethereal") ~= nil,
 	punch_damage = true,
 }
 
 -- Armor Registration
 
 armor.register_armor = function(self, name, def)
+	def.on_secondary_use = function(itemstack, player)
+		return armor:equip(player, itemstack)
+	end
+	def.on_place = function(itemstack, player, pointed_thing)
+		if pointed_thing.type == "node" and player and not player:get_player_control().sneak then
+			local node = minetest.get_node(pointed_thing.under)
+			local ndef = minetest.registered_nodes[node.name]
+			if ndef and ndef.on_rightclick then
+				return ndef.on_rightclick(pointed_thing.under, node, player, itemstack, pointed_thing)
+			end
+		end
+		return armor:equip(player, itemstack)
+	end
+	-- The below is a very basic check to try and see if a material name exists as part
+	-- of the item name. However this check is very simple and just checks theres "_something"
+	-- at the end of the item name and logging an error to debug if not.
+	local check_mat_exists = string.match(name, "%:.+_(.+)$")
+	if check_mat_exists == nil then
+		minetest.log("warning:[3d_armor] Registered armor "..name..
+		" does not have \"_material\" specified at the end of the item registration name")
+	end
 	minetest.register_tool(name, def)
 end
 
@@ -167,24 +197,26 @@ armor.update_player_visuals = function(self, player)
 			self.textures[name].wielditem,
 		})
 	end
+	self:run_callbacks("on_update", player)
 end
 
 armor.set_player_armor = function(self, player)
-	local name, player_inv = self:get_valid_player(player, "[set_player_armor]")
+	local name, armor_inv = self:get_valid_player(player, "[set_player_armor]")
 	if not name then
 		return
 	end
 	local state = 0
 	local count = 0
-	local material = {count=1}
 	local preview = armor:get_preview(name)
 	local texture = "3d_armor_trans.png"
-	local textures = {}
 	local physics = {}
 	local attributes = {}
 	local levels = {}
 	local groups = {}
 	local change = {}
+	local set_worn = {}
+	local armor_multi = 0
+	local worn_armor = armor:get_weared_armor_elements(player)
 	for _, phys in pairs(self.physics) do
 		physics[phys] = 1
 	end
@@ -195,7 +227,10 @@ armor.set_player_armor = function(self, player)
 		change[group] = 1
 		levels[group] = 0
 	end
-	local list = player_inv:get_list("armor")
+	local list = armor_inv:get_list("armor")
+	if type(list) ~= "table" then
+		return
+	end
 	for i, stack in pairs(list) do
 		if stack:get_count() == 1 then
 			local def = stack:get_definition()
@@ -211,6 +246,7 @@ armor.set_player_armor = function(self, player)
 						local level = def.groups["armor_"..element]
 						levels["fleshy"] = levels["fleshy"] + level
 					end
+					break
 				end
 				-- DEPRECATED, use armor_groups instead
 				if def.groups["armor_radiation"] and levels["radiation"] then
@@ -234,21 +270,38 @@ armor.set_player_armor = function(self, player)
 				local value = def.groups["armor_"..attr] or 0
 				attributes[attr] = attributes[attr] + value
 			end
-			local mat = string.match(item, "%:.+_(.+)$")
-			if material.name then
-				if material.name == mat then
-					material.count = material.count + 1
+		end
+	end
+	-- The following code compares player worn armor items against requirements
+	-- of which armor pieces are needed to be worn to meet set bonus requirements
+	for loc,item in pairs(worn_armor) do
+		local item_mat = string.match(item, "%:.+_(.+)$")
+		local worn_key = item_mat or "unknown"
+
+		-- Perform location checks to ensure the armor is worn correctly
+		for k,set_loc in pairs(armor.config.set_elements)do
+			if set_loc == loc then
+				if set_worn[worn_key] == nil then
+					set_worn[worn_key] = 0
+					set_worn[worn_key] = set_worn[worn_key] + 1
+				else
+					set_worn[worn_key] = set_worn[worn_key] + 1
 				end
-			else
-				material.name = mat
 			end
 		end
 	end
+
+	-- Apply the armor multiplier only if the player is wearing a full set of armor
+	for mat_name,arm_piece_num in pairs(set_worn) do
+		if arm_piece_num == #armor.config.set_elements then
+			armor_multi = armor.config.set_multiplier
+		end
+	end
 	for group, level in pairs(levels) do
 		if level > 0 then
 			level = level * armor.config.level_multiplier
-			if material.name and material.count == #self.elements then
-				level = level * 1.1
+			if armor_multi ~= 0 then
+				level = level * armor.config.set_multiplier
 			end
 		end
 		local base = self.registered_groups[group]
@@ -260,7 +313,8 @@ armor.set_player_armor = function(self, player)
 		change[group] = groups[group] / base
 	end
 	for _, attr in pairs(self.attributes) do
-		self.def[name][attr] = attributes[attr]
+		local mult = attr == "heal" and self.config.heal_multiplier or 1
+		self.def[name][attr] = attributes[attr] * mult
 	end
 	for _, phys in pairs(self.physics) do
 		self.def[name][phys] = physics[phys]
@@ -268,6 +322,11 @@ armor.set_player_armor = function(self, player)
 	if use_armor_monoid then
 		armor_monoid.monoid:add_change(player, change, "3d_armor:armor")
 	else
+		-- Preserve immortal group (damage disabled for player)
+		local immortal = player:get_armor_groups().immortal
+		if immortal and immortal ~= 0 then
+			groups.immortal = 1
+		end
 		player:set_armor_groups(groups)
 	end
 	if use_player_monoids then
@@ -277,8 +336,19 @@ armor.set_player_armor = function(self, player)
 			"3d_armor:physics")
 		player_monoids.gravity:add_change(player, physics.gravity,
 			"3d_armor:physics")
+	elseif use_pova_mod then
+		-- only add the changes, not the default 1.0 for each physics setting
+		pova.add_override(name, "3d_armor", {
+			speed = physics.speed - 1,
+			jump = physics.jump - 1,
+			gravity = physics.gravity - 1,
+		})
+		pova.do_override(player)
 	else
-		player:set_physics_override(physics)
+		local player_physics_locked = player:get_meta():get_int("player_physics_locked")
+		if player_physics_locked == nil or player_physics_locked == 0 then
+			player:set_physics_override(physics)
+		end
 	end
 	self.textures[name].armor = texture
 	self.textures[name].preview = preview
@@ -286,23 +356,24 @@ armor.set_player_armor = function(self, player)
 	self.def[name].state = state
 	self.def[name].count = count
 	self:update_player_visuals(player)
-	self:run_callbacks("on_update", player)
 end
 
 armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabilities)
-	local name, player_inv = self:get_valid_player(player, "[punch]")
+	local name, armor_inv = self:get_valid_player(player, "[punch]")
 	if not name then
 		return
 	end
+	local set_state
+	local set_count
 	local state = 0
 	local count = 0
 	local recip = true
 	local default_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1}
-	local list = player_inv:get_list("armor")
+	local list = armor_inv:get_list("armor")
 	for i, stack in pairs(list) do
 		if stack:get_count() == 1 then
-			local name = stack:get_name()
-			local use = minetest.get_item_group(name, "armor_use") or 0
+			local itemname = stack:get_name()
+			local use = minetest.get_item_group(itemname, "armor_use") or 0
 			local damage = use > 0
 			local def = stack:get_definition() or {}
 			if type(def.on_punched) == "function" then
@@ -315,6 +386,9 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
 				local groupcaps = tool_capabilities.groupcaps or {}
 				local uses = 0
 				damage = false
+				if next(groupcaps) == nil then
+					damage = true
+				end
 				for group, caps in pairs(groupcaps) do
 					local maxlevel = caps.maxlevel or 0
 					local diff = maxlevel - level
@@ -350,21 +424,33 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
 				end
 			end
 			if damage == true and hitter == "fire" then
-				damage = minetest.get_item_group(name, "flammable") > 0
+				damage = minetest.get_item_group(itemname, "flammable") > 0
 			end
 			if damage == true then
 				self:damage(player, i, stack, use)
+				set_state = self.def[name].state
+				set_count = self.def[name].count
 			end
 			state = state + stack:get_wear()
 			count = count + 1
 		end
 	end
+	if set_count and set_count ~= count then
+		state = set_state or state
+		count = set_count or count
+	end
 	self.def[name].state = state
 	self.def[name].count = count
 end
 
 armor.damage = function(self, player, index, stack, use)
 	local old_stack = ItemStack(stack)
+	local worn_armor = armor:get_weared_armor_elements(player)
+	local armor_worn_cnt = 0
+	for k,v in pairs(worn_armor) do
+		armor_worn_cnt = armor_worn_cnt + 1
+	end
+	use = math.ceil(use/armor_worn_cnt)
 	stack:add_wear(use)
 	self:run_callbacks("on_damage", player, index, stack)
 	self:set_inventory_stack(player, index, stack)
@@ -375,19 +461,85 @@ armor.damage = function(self, player, index, stack, use)
 	end
 end
 
-armor.get_player_skin = function(self, name)
-	local skin = nil
-	if self.skin_mod == "skins" or self.skin_mod == "simple_skins" then
-		skin = skins.skins[name]
-	elseif self.skin_mod == "u_skins" then
-		skin = u_skins.u_skins[name]
-	elseif self.skin_mod == "wardrobe" then
-		local skins = wardrobe.playerSkins or {}
-		if skins[name] then
-			skin = string.gsub(skins[name], "%.png$","")
-		end
+armor.get_weared_armor_elements = function(self, player)
+    local name, inv = self:get_valid_player(player, "[get_weared_armor]")
+	local weared_armor = {}
+	if not name then
+		return
 	end
-	return skin or armor.default_skin
+    for i=1, inv:get_size("armor") do
+        local item_name = inv:get_stack("armor", i):get_name()
+        local element = self:get_element(item_name)
+        if element ~= nil then
+            weared_armor[element] = item_name
+        end
+	end
+	return weared_armor
+end
+
+armor.equip = function(self, player, itemstack)
+    local name, armor_inv = self:get_valid_player(player, "[equip]")
+    local weared_armor = self:get_weared_armor_elements(player)
+    local armor_element = self:get_element(itemstack:get_name())
+	if name and armor_element then
+		if weared_armor[armor_element] ~= nil then
+			self:unequip(player, armor_element)
+		end
+		armor_inv:add_item("armor", itemstack:take_item())
+		self:set_player_armor(player)
+		self:save_armor_inventory(player)
+	end
+	return itemstack
+end
+
+armor.unequip = function(self, player, armor_element)
+    local name, armor_inv = self:get_valid_player(player, "[unequip]")
+	local weared_armor = self:get_weared_armor_elements(player)
+	if not name or not weared_armor[armor_element] then
+		return
+	end
+	local itemstack = armor_inv:remove_item("armor", ItemStack(weared_armor[armor_element]))
+	minetest.after(0, function()
+		local inv = player:get_inventory()
+		if inv:room_for_item("main", itemstack) then
+			inv:add_item("main", itemstack)
+		else
+			minetest.add_item(player:get_pos(), itemstack)
+		end
+	end)
+    self:set_player_armor(player)
+	self:save_armor_inventory(player)
+end
+
+armor.remove_all = function(self, player)
+    local name, inv = self:get_valid_player(player, "[remove_all]")
+	if not name then
+		return
+    end
+	inv:set_list("armor", {})
+	self:set_player_armor(player)
+	self:save_armor_inventory(player)
+end
+
+armor.get_player_skin = function(self, name)
+	if (self.skin_mod == "skins" or self.skin_mod == "simple_skins") and skins.skins[name] then
+		return skins.skins[name]..".png"
+	elseif self.skin_mod == "u_skins" and u_skins.u_skins[name] then
+		return u_skins.u_skins[name]..".png"
+	elseif self.skin_mod == "wardrobe" and wardrobe.playerSkins and wardrobe.playerSkins[name] then
+		return wardrobe.playerSkins[name]
+	end
+	return armor.default_skin..".png"
+end
+
+armor.update_skin = function(self, name)
+	minetest.after(0, function()
+		local pplayer = minetest.get_player_by_name(name)
+		if pplayer then
+			self.textures[name].skin = self:get_player_skin(name)
+			self:set_player_armor(pplayer)
+		end
+	end)
 end
 
 armor.add_preview = function(self, preview)
@@ -395,7 +547,7 @@ armor.add_preview = function(self, preview)
 end
 
 armor.get_preview = function(self, name)
-	local preview = armor:get_player_skin(name).."_preview.png"
+	local preview = string.gsub(armor:get_player_skin(name), ".png", "_preview.png")
 	if skin_previews[preview] then
 		return preview
 	end
@@ -417,58 +569,97 @@ armor.get_armor_formspec = function(self, name, listring)
 	for _, attr in pairs(self.attributes) do
 		formspec = formspec:gsub("armor_attr_"..attr, armor.def[name][attr])
 	end
-	for _, group in pairs(self.attributes) do
-		formspec = formspec:gsub("armor_group_"..group, armor.def[name][group])
+	for group, _ in pairs(self.registered_groups) do
+		formspec = formspec:gsub("armor_group_"..group,
+			armor.def[name].groups[group])
 	end
 	return formspec
 end
 
+armor.get_element = function(self, item_name)
+	for _, element in pairs(armor.elements) do
+		if minetest.get_item_group(item_name, "armor_"..element) > 0 then
+			return element
+		end
+	end
+end
+
+armor.serialize_inventory_list = function(self, list)
+	local list_table = {}
+	for _, stack in ipairs(list) do
+		table.insert(list_table, stack:to_string())
+	end
+	return minetest.serialize(list_table)
+end
+
+armor.deserialize_inventory_list = function(self, list_string)
+	local list_table = minetest.deserialize(list_string)
+	local list = {}
+	for _, stack in ipairs(list_table or {}) do
+		table.insert(list, ItemStack(stack))
+	end
+	return list
+end
+
+armor.load_armor_inventory = function(self, player)
+	local _, inv = self:get_valid_player(player, "[load_armor_inventory]")
+	if inv then
+		local meta = player:get_meta()
+		local armor_list_string = meta:get_string("3d_armor_inventory")
+		if armor_list_string then
+			inv:set_list("armor",
+				self:deserialize_inventory_list(armor_list_string))
+			return true
+		end
+	end
+end
+
+armor.save_armor_inventory = function(self, player)
+	local _, inv = self:get_valid_player(player, "[save_armor_inventory]")
+	if inv then
+		local meta = player:get_meta()
+		meta:set_string("3d_armor_inventory",
+			self:serialize_inventory_list(inv:get_list("armor")))
+	end
+end
+
 armor.update_inventory = function(self, player)
 	-- DEPRECATED: Legacy inventory support
 end
 
 armor.set_inventory_stack = function(self, player, i, stack)
-	local msg = "[set_inventory_stack]"
-	local name = player:get_player_name()
-	if not name then
-		minetest.log("warning", "3d_armor: Player name is nil "..msg)
-		return
+	local _, inv = self:get_valid_player(player, "[set_inventory_stack]")
+	if inv then
+		inv:set_stack("armor", i, stack)
+		self:save_armor_inventory(player)
 	end
-	local player_inv = player:get_inventory()
-	local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
-	if not player_inv then
-		minetest.log("warning", "3d_armor: Player inventory is nil "..msg)
-		return
-	elseif not armor_inv then
-		minetest.log("warning", "3d_armor: Detached armor inventory is nil "..msg)
-		return
-	end
-	player_inv:set_stack("armor", i, stack)
-	armor_inv:set_stack("armor", i, stack)
 end
 
 armor.get_valid_player = function(self, player, msg)
 	msg = msg or ""
 	if not player then
-		minetest.log("warning", "3d_armor: Player reference is nil "..msg)
+		minetest.log("warning", S("3d_armor: Player reference is nil @1", msg))
 		return
 	end
 	local name = player:get_player_name()
 	if not name then
-		minetest.log("warning", "3d_armor: Player name is nil "..msg)
+		minetest.log("warning", S("3d_armor: Player name is nil @1", msg))
 		return
 	end
-	local inv = player:get_inventory()
+	local inv = minetest.get_inventory({type="detached", name=name.."_armor"})
 	if not inv then
-		minetest.log("warning", "3d_armor: Player inventory is nil "..msg)
+		minetest.log("warning", S("3d_armor: Detached armor inventory is nil @1", msg))
 		return
 	end
 	return name, inv
 end
 
 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)})
+	local node = minetest.get_node_or_nil(pos)
+	if node then
+		local obj = minetest.add_item(pos, stack)
+		if obj then
+			obj:set_velocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)})
+		end
 	end
 end

3d_armor/armor.conf

@@ -0,0 +1,37 @@
+-- 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
+

3d_armor/armor.lua

@@ -1,7 +1,5 @@
-local S = function(s) return s end
-if minetest.global_exists("intllib") then
-	S = intllib.Getter()
-end
+-- support for i18n
+local S = armor.get_translator
 
 armor:register_armor("3d_armor:helmet_admin", {
 	description = S("Admin Helmet"),
@@ -81,6 +79,19 @@ if armor.materials.wood then
 		damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1},
 		groups = {armor_feet=1, armor_heal=0, armor_use=2000, flammable=1},
 	})
+	local wood_armor_fuel = {
+		helmet = 6,
+		chestplate = 8,
+		leggings = 7,
+		boots = 5
+	}
+	for armor, burn in pairs(wood_armor_fuel) do
+		minetest.register_craft({
+			type = "fuel",
+			recipe = "3d_armor:" .. armor .. "_wood",
+			burntime = burn,
+		})
+	end
 end
 
 if armor.materials.cactus then
@@ -112,6 +123,19 @@ if armor.materials.cactus then
 		armor_groups = {fleshy=5},
 		damage_groups = {cracky=3, snappy=3, choppy=2, crumbly=2, level=1},
 	})
+	local cactus_armor_fuel = {
+		helmet = 14,
+		chestplate = 16,
+		leggings = 15,
+		boots = 13
+	}
+	for armor, burn in pairs(cactus_armor_fuel) do
+		minetest.register_craft({
+			type = "fuel",
+			recipe = "3d_armor:" .. armor .. "_cactus",
+			burntime = burn,
+		})
+	end
 end
 
 if armor.materials.steel then

3d_armor/depends.txt

@@ -1,7 +1,8 @@
 default
 player_monoids?
 armor_monoid?
+pova?
 fire?
 ethereal?
 bakedclay?
-intllib?
+moreores?

3d_armor/init.lua

@@ -1,7 +1,3 @@
-local S = function(s) return s end
-if minetest.global_exists("intllib") then
-	S = intllib.Getter()
-end
 local modname = minetest.get_current_modname()
 local modpath = minetest.get_modpath(modname)
 local worldpath = minetest.get_worldpath()
@@ -11,19 +7,27 @@ local timer = 0
 
 dofile(modpath.."/api.lua")
 
+-- local functions
+local F = minetest.formspec_escape
+local S = armor.get_translator
+
+-- integration test
+if minetest.settings:get_bool("enable_3d_armor_integration_test") then
+	dofile(modpath.."/integration_test.lua")
+end
+
+
 -- Legacy Config Support
 
 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
 for name, _ in pairs(armor.config) do
 	local global = "ARMOR_"..name:upper()
@@ -41,11 +45,13 @@ end
 -- Load Configuration
 
 for name, config in pairs(armor.config) do
-	local setting = minetest.setting_get("armor_"..name)
+	local setting = minetest.settings:get("armor_"..name)
 	if type(config) == "number" then
 		setting = tonumber(setting)
+	elseif type(config) == "string" then
+		setting = tostring(setting)
 	elseif type(config) == "boolean" then
-		setting = minetest.setting_getbool("armor_"..name)
+		setting = minetest.settings:get_bool("armor_"..name)
 	end
 	if setting ~= nil then
 		armor.config[name] = setting
@@ -58,11 +64,26 @@ for material, _ in pairs(armor.materials) do
 	end
 end
 
+-- Convert set_elements to a Lua table splitting on blank spaces
+local t_set_elements = armor.config.set_elements
+armor.config.set_elements = string.split(t_set_elements, " ")
+
+-- Remove torch damage if fire_protect_torch == false
+if armor.config.fire_protect_torch == false and armor.config.fire_protect == true then
+	for k,v in pairs(armor.fire_nodes) do
+		for k2,v2 in pairs(v) do
+			if string.find (v2,"torch") then
+				armor.fire_nodes[k] = nil
+			end
+		end
+	end
+end
+
 -- Mod Compatibility
 
 if minetest.get_modpath("technic") then
 	armor.formspec = armor.formspec..
-		"label[5,2.5;"..S("Radiation")..":  armor_group_radiation]"
+		"label[5,2.5;"..F(S("Radiation"))..": armor_group_radiation]"
 	armor:register_armor_group("radiation")
 end
 local skin_mods = {"skins", "u_skins", "simple_skins", "wardrobe"}
@@ -90,74 +111,151 @@ dofile(modpath.."/armor.lua")
 -- Armor Initialization
 
 armor.formspec = armor.formspec..
-	"label[5,1;"..S("Level")..": armor_level]"..
-	"label[5,1.5;"..S("Heal")..":  armor_attr_heal]"
+	"label[5,1;"..F(S("Level"))..": armor_level]"..
+	"label[5,1.5;"..F(S("Heal"))..": armor_attr_heal]"
 if armor.config.fire_protect then
-	armor.formspec = armor.formspec.."label[5,2;"..S("Fire")..":  armor_fire]"
+	armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..": armor_attr_fire]"
 end
+armor:register_on_damage(function(player, index, stack)
+	local name = player:get_player_name()
+	local def = stack:get_definition()
+	if name and def and def.description and stack:get_wear() > 60100 then
+		minetest.chat_send_player(name, S("Your @1 is almost broken!", def.description))
+		minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0})
+	end
+end)
 armor:register_on_destroy(function(player, index, stack)
 	local name = player:get_player_name()
 	local def = stack:get_definition()
 	if name and def and def.description then
-		minetest.chat_send_player(name, S("Your").." "..def.description.." "..
-			S("got destroyed").."!")
+		minetest.chat_send_player(name, S("Your @1 got destroyed!", def.description))
+		minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0})
 	end
 end)
 
-local function init_player_armor(player)
-	local name = player:get_player_name()
+local function validate_armor_inventory(player)
+	-- Workaround for detached inventory swap exploit
+	local _, inv = armor:get_valid_player(player, "[validate_armor_inventory]")
+	local pos = player:get_pos()
+	if not inv then
+		return
+	end
+	local armor_prev = {}
+	local attribute_meta = player:get_meta() -- I know, the function's name is weird but let it be like that. ;)
+	local armor_list_string = attribute_meta:get_string("3d_armor_inventory")
+	if armor_list_string then
+		local armor_list = armor:deserialize_inventory_list(armor_list_string)
+		for i, stack in ipairs(armor_list) do
+			if stack:get_count() > 0 then
+				armor_prev[stack:get_name()] = i
+			end
+		end
+	end
+	local elements = {}
 	local player_inv = player:get_inventory()
-	local pos = player:getpos()
-	if not name or not player_inv or not pos then
+	for i = 1, 6 do
+		local stack = inv:get_stack("armor", i)
+		if stack:get_count() > 0 then
+			local item = stack:get_name()
+			local element = armor:get_element(item)
+			if element and not elements[element] then
+				if armor_prev[item] then
+					armor_prev[item] = nil
+				else
+					-- Item was not in previous inventory
+					armor:run_callbacks("on_equip", player, i, stack)
+				end
+				elements[element] = true;
+			else
+				inv:remove_item("armor", stack)
+				minetest.item_drop(stack, player, pos)
+				-- The following code returns invalid items to the player's main
+				-- inventory but could open up the possibity for a hacked client
+				-- to receive items back they never really had. I am not certain
+				-- so remove the is_singleplayer check at your own risk :]
+				if minetest.is_singleplayer() and player_inv and
+						player_inv:room_for_item("main", stack) then
+					player_inv:add_item("main", stack)
+				end
+			end
+		end
+	end
+	for item, i in pairs(armor_prev) do
+		local stack = ItemStack(item)
+		-- Previous item is not in current inventory
+		armor:run_callbacks("on_unequip", player, i, stack)
+	end
+end
+
+local function init_player_armor(initplayer)
+	local name = initplayer:get_player_name()
+	local pos = initplayer:get_pos()
+	if not name or not pos then
 		return false
 	end
 	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:run_callbacks("on_equip", player, index, stack)
+			validate_armor_inventory(player)
+			armor:save_armor_inventory(player)
 			armor:set_player_armor(player)
 		end,
 		on_take = function(inv, listname, index, stack, player)
-			player:get_inventory():set_stack(listname, index, nil)
-			armor:run_callbacks("on_unequip", player, index, stack)
+			validate_armor_inventory(player)
+			armor:save_armor_inventory(player)
 			armor:set_player_armor(player)
 		end,
 		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			local plaver_inv = player:get_inventory()
-			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, nil)
+			validate_armor_inventory(player)
+			armor:save_armor_inventory(player)
 			armor:set_player_armor(player)
 		end,
-		allow_put = function(inv, listname, index, stack, player)
-			local def = stack:get_definition() or {}
-			local allowed = 0
-			for _, element in pairs(armor.elements) do
-				if def.groups["armor_"..element] then
-					allowed = 1
-					for i = 1, 6 do
-						local item = inv:get_stack("armor", i):get_name()
-						if minetest.get_item_group(item, "armor_"..element) > 0 then
-							return 0
-						end
-					end
+		allow_put = function(inv, listname, index, put_stack, player)
+			if player:get_player_name() ~= name then
+				return 0
+			end
+			local element = armor:get_element(put_stack:get_name())
+			if not element then
+				return 0
+			end
+			for i = 1, 6 do
+				local stack = inv:get_stack("armor", i)
+				local def = stack:get_definition() or {}
+				if def.groups and def.groups["armor_"..element]
+						and i ~= index then
+					return 0
 				end
 			end
-			return allowed
+			return 1
 		end,
 		allow_take = function(inv, listname, index, stack, player)
+			if player:get_player_name() ~= name then
+				return 0
+			end
 			return stack:get_count()
 		end,
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+			if player:get_player_name() ~= name then
+				return 0
+			end
 			return count
 		end,
 	}, name)
 	armor_inv:set_size("armor", 6)
-	player_inv:set_size("armor", 6)
+	if not armor:load_armor_inventory(initplayer) and armor.migrate_old_inventory then
+		local player_inv = initplayer:get_inventory()
+		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:save_armor_inventory(initplayer)
+		player_inv:set_size("armor", 0)
+	end
 	for i=1, 6 do
-		local stack = player_inv:get_stack("armor", i)
-		armor_inv:set_stack("armor", i, stack)
-		armor:run_callbacks("on_equip", player, i, stack)
+		local stack = armor_inv:get_stack("armor", i)
+		if stack:get_count() > 0 then
+			armor:run_callbacks("on_equip", initplayer, i, stack)
+		end
 	end
 	armor.def[name] = {
 		init_time = minetest.get_gametime(),
@@ -177,7 +275,7 @@ local function init_player_armor(player)
 	end
 	local skin = armor:get_player_skin(name)
 	armor.textures[name] = {
-		skin = skin..".png",
+		skin = skin,
 		armor = "3d_armor_trans.png",
 		wielditem = "3d_armor_trans.png",
 		preview = armor.default_skin.."_preview.png",
@@ -192,7 +290,7 @@ local function init_player_armor(player)
 			end
 		end
 	end
-	armor:set_player_armor(player)
+	armor:set_player_armor(initplayer)
 	return true
 end
 
@@ -220,24 +318,24 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if not name then
 		return
 	end
+	local player_name = player:get_player_name()
 	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)
+			armor:update_skin(player_name)
 		end
 	end
 end)
 
 minetest.register_on_joinplayer(function(player)
 	default.player_set_model(player, "3d_armor_character.b3d")
-	minetest.after(0, function(player)
-		if init_player_armor(player) == false then
-			pending_players[player] = 0
+	local player_name = player:get_player_name()
+
+	minetest.after(0, function()
+		local pplayer = minetest.get_player_by_name(player_name)
+		if pplayer and init_player_armor(pplayer) == false then
+			pending_players[pplayer] = 0
 		end
-	end, player)
+	end)
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -251,26 +349,27 @@ end)
 
 if armor.config.drop == true or armor.config.destroy == true then
 	minetest.register_on_dieplayer(function(player)
-		local name, player_inv = armor:get_valid_player(player, "[on_dieplayer]")
+		local name, armor_inv = 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 = player_inv:get_stack("armor", i)
+		for i=1, armor_inv:get_size("armor") do
+			local stack = armor_inv:get_stack("armor", i)
 			if stack:get_count() > 0 then
 				table.insert(drop, stack)
-				armor:set_inventory_stack(player, i, nil)
 				armor:run_callbacks("on_unequip", player, i, stack)
+				armor_inv:set_stack("armor", i, nil)
 			end
 		end
+		armor:save_armor_inventory(player)
 		armor:set_player_armor(player)
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		if pos and armor.config.destroy == false then
 			minetest.after(armor.config.bones_delay, function()
 				local meta = nil
-				local maxp = vector.add(pos, 8)
-				local minp = vector.subtract(pos, 8)
+				local maxp = vector.add(pos, 16)
+				local minp = vector.subtract(pos, 16)
 				local bones = minetest.find_nodes_in_area(minp, maxp, {"bones:bones"})
 				for _, p in pairs(bones) do
 					local m = minetest.get_meta(p)
@@ -296,25 +395,32 @@ if armor.config.drop == true or armor.config.destroy == true then
 			end)
 		end
 	end)
+else -- reset un-dropped armor and it's effects
+	minetest.register_on_respawnplayer(function(player)
+		armor:set_player_armor(player)
+	end)
 end
 
 if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
 		local name = player:get_player_name()
-		if name then
+		local hit_ip = hitter:is_player()
+		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+			return
+		elseif name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end
 	end)
 end
 
-minetest.register_on_player_hpchange(function(player, hp_change)
-	if player and hp_change < 0 then
+minetest.register_on_player_hpchange(function(player, hp_change, reason)
+	if player and reason.type ~= "drown" and reason.hunger == nil
+			and hp_change < 0 then
 		local name = player:get_player_name()
 		if name then
 			local heal = armor.def[name].heal
-			heal = heal * armor.config.heal_multiplier
 			if heal >= math.random(100) then
 				hp_change = 0
 			end
@@ -330,80 +436,70 @@ end, true)
 
 minetest.register_globalstep(function(dtime)
 	timer = timer + dtime
-	if timer > armor.config.init_delay then
-		for player, count in pairs(pending_players) do
-			local remove = init_player_armor(player) == true
-			pending_players[player] = count + 1
-			if remove == false and count > armor.config.init_times then
-				minetest.log("warning", "3d_armor: Failed to initialize player")
-				remove = true
-			end
-			if remove == true then
-				pending_players[player] = nil
+	if timer <= armor.config.init_delay then
+		return
+	end
+	timer = 0
+
+	for player, count in pairs(pending_players) do
+		local remove = init_player_armor(player) == true
+		pending_players[player] = count + 1
+		if remove == false and count > armor.config.init_times then
+			minetest.log("warning", S("3d_armor: Failed to initialize player"))
+			remove = true
+		end
+		if remove == true then
+			pending_players[player] = nil
+		end
+	end
+
+	-- water breathing protection, added by TenPlus1
+	if armor.config.water_protect == true then
+		for _,player in pairs(minetest.get_connected_players()) do
+			local name = player:get_player_name()
+			if armor.def[name].water > 0 and
+					player:get_breath() < 10 then
+				player:set_breath(10)
 			end
 		end
-		timer = 0
 	end
 end)
 
--- Fire Protection and water breating, added by TenPlus1
-
+-- Fire Protection, added by TenPlus1.
 if armor.config.fire_protect == true then
-	-- override hot nodes so they do not hurt player anywhere but mod
+	-- override any hot nodes that do not already deal damage
 	for _, row in pairs(armor.fire_nodes) do
 		if minetest.registered_nodes[row[1]] then
-			minetest.override_item(row[1], {damage_per_second = 0})
+			local damage = minetest.registered_nodes[row[1]].damage_per_second
+			if not damage or damage == 0 then
+				minetest.override_item(row[1], {damage_per_second = row[3]})
+			end
 		end
 	end
 else
 	print ("[3d_armor] Fire Nodes disabled")
 end
 
-if armor.config.water_protect == true or armor.config.fire_protect == true then
-	minetest.register_globalstep(function(dtime)
-		armor.timer = armor.timer + dtime
-		if armor.timer < armor.config.update_time then
-			return
-		end
-		for _,player in pairs(minetest.get_connected_players()) do
-			local name = player:get_player_name()
-			local pos = player:getpos()
-			local hp = player:get_hp()
-			if not name or not pos or not hp then
-				return
-			end
-			-- water breathing
-			if armor.config.water_protect == true then
-				if armor.def[name].water > 0 and
-						player:get_breath() < 10 then
-					player:set_breath(10)
-				end
-			end
+if armor.config.fire_protect == true then
+	minetest.register_on_player_hpchange(function(player, hp_change, reason)
+
+		if reason.type == "node_damage" and reason.node then
 			-- fire protection
-			if armor.config.fire_protect == true then
-				local fire_damage = true
-				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 fire_damage == true then
+			if armor.config.fire_protect == true and hp_change < 0 then
+				local name = player:get_player_name()
+				for _,igniter in pairs(armor.fire_nodes) do
+					if reason.node == igniter[1] then
+						if armor.def[name].fire < igniter[2] then
 							armor:punch(player, "fire")
-							last_punch_time[name] = minetest.get_gametime()
-							fire_damage = false
-						end
-						if hp > 0 and armor.def[name].fire < row[2] then
-							hp = hp - row[3] * armor.config.update_time
-							player:set_hp(hp)
-							break
+						else
+							hp_change = 0
 						end
 					end
 				end
 			end
 		end
-		armor.timer = 0
-	end)
+		return hp_change
+	end, true)
 end
+
+minetest.log("action", "[3d_armor] loaded.")

3d_armor/integration_test.lua

@@ -0,0 +1,25 @@
+
+minetest.log("warning", "[TEST] integration-test enabled!")
+
+minetest.register_on_mods_loaded(function()
+	minetest.after(1, function()
+
+		local data = minetest.write_json({ success = true }, true);
+		local file = io.open(minetest.get_worldpath().."/integration_test.json", "w" );
+		if file then
+			file:write(data)
+			file:close()
+		end
+
+		file = io.open(minetest.get_worldpath().."/registered_nodes.txt", "w" );
+		if file then
+			for name in pairs(minetest.registered_nodes) do
+				file:write(name .. '\n')
+			end
+			file:close()
+		end
+
+		minetest.log("warning", "[TEST] integration tests done!")
+		minetest.request_shutdown("success")
+	end)
+end)

3d_armor/locale/3d_armor.es.tr

@@ -0,0 +1,58 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: La armadura desconectada es nula @1
+3d_armor: Player name is nil @1=3d_armor: El nombre del jugador es nulo @1
+3d_armor: Player reference is nil @1=3d_armor: La referencia del jugador es nula @1
+
+### armor.lua ###
+
+Admin Boots=Botas de admin
+Admin Chestplate=Peto de admin
+Admin Helmet=Casco de admin
+Admin Leggings=Grebas de admin
+Bronze Boots=Botas de bronce
+Bronze Chestplate=Peto de bronce
+Bronze Helmet=Casco de bronce
+Bronze Leggings=Grebas de bronce
+Cactus Boots=Botas de cactus
+Cactus Chestplate=Peto de cactus
+Cactus Helmet=Casco de cactus
+Cactus Leggings=Grebas de cactus
+Crystal Boots=Botas de cristal
+Crystal Chestplate=Peto de cristal
+Crystal Helmet=Casco de cristal
+Crystal Leggings=Grebas de cristal
+Diamond Boots=Botas de diamante
+Diamond Chestplate=Peto de diamante
+Diamond Helmet=Casco de diamante
+Diamond Leggings=Grebas de diamante
+Gold Boots=Botas de oro
+Gold Chestplate=Peto de oro
+Gold Helmet=Casco de oro
+Gold Leggings=Grebas de oro
+Mithril Boots=Botas de mitrilo
+Mithril Chestplate=Peto de mitrilo
+Mithril Helmet=Casco de mitrilo
+Mithril Leggings=Grebas de mitrilo
+Steel Boots=Botas de acero
+Steel Chestplate=Peto de acero
+Steel Helmet=Casco de acero
+Steel Leggings=Grebas de acero
+Wood Boots=Botas de madera
+Wood Chestplate=Peto de madera
+Wood Helmet=Casco de madera
+Wood Leggings=Grebas de madera
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: Fallo en la inicialización del jugador
+Fire=Fuego
+Heal=Salud
+Level=Nivel
+Radiation=Radiación
+Your @1 got destroyed!=¡Tu @1 fue destruído!
+Your @1 is almost broken!=¡Tu @1 esta a punto de romperse!
+[3d_armor] Fire Nodes disabled=[3d_armor] Nodos de fuego desabilitados

3d_armor/locale/3d_armor.fr.tr

@@ -0,0 +1,58 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor : Inventaire détaché pour l'armure non trouvé @1
+3d_armor: Player name is nil @1=3d_armor : Nom du joueur non trouvé @1
+3d_armor: Player reference is nil @1=3d_armor : Référence au joueur non trouvée @1
+
+### armor.lua ###
+
+Admin Boots=Bottes d'admin
+Admin Chestplate=Cuirasse d'admin
+Admin Helmet=Casque d'admin
+Admin Leggings=Jambières d'admin
+Bronze Boots=Bottes en bronze
+Bronze Chestplate=Cuirasse en bronze
+Bronze Helmet=Casque en bronze
+Bronze Leggings=Jambières en bronze
+Cactus Boots=Bottes en cactus
+Cactus Chestplate=Cuirasse en cactus
+Cactus Helmet=Casque en cactus
+Cactus Leggings=Jambières en cactus
+Crystal Boots=Bottes en cristal
+Crystal Chestplate=Cuirasse en cristal
+Crystal Helmet=Casque en cristal
+Crystal Leggings=Jambières en cristal
+Diamond Boots=Bottes en diamant
+Diamond Chestplate=Cuirasse en diamant
+Diamond Helmet=Casque en diamant
+Diamond Leggings=Jambières en diamant
+Gold Boots=Bottes en or
+Gold Chestplate=Cuirasse en or
+Gold Helmet=Casque en or
+Gold Leggings=Jambières en or
+Mithril Boots=Bottes en mithril
+Mithril Chestplate=Cuirasse en mithril
+Mithril Helmet=Casque en mithril
+Mithril Leggings=Jambières en mithril
+Steel Boots=Bottes en acier
+Steel Chestplate=Cuirasse en acier
+Steel Helmet=Casque en acier
+Steel Leggings=Jambières en acier
+Wood Boots=Bottes en bois
+Wood Chestplate=Cuirasse en bois
+Wood Helmet=Casque en bois
+Wood Leggings=Jambières en bois
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor : Impossible d'initialiser le joueur
+Fire=Fire
+Heal=Soins
+Level=Niveau
+Radiation=Radiation
+Your @1 got destroyed!=Une partie de votre armure a été détruite : @1 !
+Your @1 is almost broken!=Une partie de votre armure est presque détruite : @1 !
+[3d_armor] Fire Nodes disabled=[3d_armor] Nœuds de type feu désactivés

3d_armor/locale/3d_armor.it.tr

@@ -0,0 +1,85 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: L'inventario separato dell'armatura è nullo @1
+3d_armor: Player name is nil @1=3d_armor: Il nome dell'utente è nullo @1
+3d_armor: Player reference is nil @1=3d_armor: Il riferimento all'utente è nullo @1
+
+### armor.lua ###
+
+Admin Boots=Stivali dell'amministratrice/tore
+Admin Chestplate=Corazza dell'amministratrice/tore
+Admin Helmet=Elmo dell'amministratrice/tore
+Admin Leggings=Gambali dell'amministratrice/tore
+Bronze Boots=Stivali di bronzo
+Bronze Chestplate=Corazza di bronzo
+Bronze Helmet=Elmo di bronzo
+Bronze Leggings=Gambali di bronzo
+Cactus Boots=Stivali di cactus
+Cactus Chestplate=Corazza di cactus
+Cactus Helmet=Elmo di cactus
+Cactus Leggings=Gambali di cactus
+Crystal Boots=Stivali di cristallo
+Crystal Chestplate=Corazza di cristallo
+Crystal Helmet=Elmo di cristallo
+Crystal Leggings=Gambali di cristallo
+Diamond Boots=Stivali di diamante
+Diamond Chestplate=Corazza di diamante
+Diamond Helmet=Elmo di diamante
+Diamond Leggings=Gambali di diamante
+Gold Boots=Stivali d'oro
+Gold Chestplate=Corazza d'oro
+Gold Helmet=Elmo d'oro
+Gold Leggings=Gambali d'oro
+Mithril Boots=Stivali di mithril
+Mithril Chestplate=Corazza di mithril
+Mithril Helmet=Elmo di mithril
+Mithril Leggings=Gambali di mithril
+Steel Boots=Stivali d'acciaio
+Steel Chestplate=Corazza d'acciaio
+Steel Helmet=Elmo d'acciaio
+Steel Leggings=Gambali d'acciaio
+Wood Boots=Stivali di legno
+Wood Chestplate=Corazza di legno
+Wood Helmet=Elmo di legno
+Wood Leggings=Gambali di legno
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: Inizializzazione dell'utente fallita
+Fire=Fuoco
+Heal=Guarigione
+Level=Livello
+Radiation=Radiazione
+Your @1 got destroyed!=@1 in frantumi!
+Your @1 is almost broken!=@1 quasi in frantumi!
+[3d_armor] Fire Nodes disabled=[3d_armor] Nodi fuoco disabilitati
+
+
+##### not used anymore #####
+
+3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod caricata ma inutilizzata.
+Back=Indietro
+Armor=Armatura
+3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod caricata ma inutilizzata.
+Armor stand top=Parte superiore del supporto per armatura
+Armor stand=Supporto per armatura
+Armor Stand=Supporto per armatura
+Locked Armor stand=Supporto per armatura chiuso a chiave
+Armor Stand (owned by @1)=Supporto per armatura (di proprietà di @1)
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod caricata ma inutilizzata.
+3d Armor=Armatura 3D
+Armor not initialized!=Armatura non inizializzata!
+Admin Shield=Scudo dell'amministratrice/tore
+Wooden Shield=Scudo di legno
+Enhanced Wood Shield=Scudo di legno migliorato
+Cactus Shield=Scudo di cactus
+Enhanced Cactus Shield=Scudo di cactus migliorato
+Steel Shield=Scudo d'acciaio
+Bronze Shield=Scudo di bronzo
+Diamond Shield=Scudo di diamante
+Gold Shield=Scudo d'oro
+Mithril Shield=Scudo di mithril
+Crystal Shield=Scudo di cristallo

3d_armor/locale/3d_armor.ms.tr

@@ -0,0 +1,85 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: Inventori perisai terpisah tiada nilai @1
+3d_armor: Player name is nil @1=3d_armor: Nama pemain tiada nilai @1
+3d_armor: Player reference is nil @1=3d_armor: Rujukan pemain tiada nilai @1
+
+### armor.lua ###
+
+Admin Boots=But Pentadbir
+Admin Chestplate=Perisai Dada Pentadbir
+Admin Helmet=Helmet Pentadbir
+Admin Leggings=Perisai Kaki Pentadbir
+Bronze Boots=But Gangsa
+Bronze Chestplate=Perisai Dada Gangsa
+Bronze Helmet=Helmet Gangsa
+Bronze Leggings=Perisai Kaki Gangsa
+Cactus Boots=But Kaktus
+Cactus Chestplate=Perisai Dada Kaktus
+Cactus Helmet=Helmet Kaktus
+Cactus Leggings=Perisai Kaki Kaktus
+Crystal Boots=But Kristal
+Crystal Chestplate=Perisai Dada Kristal
+Crystal Helmet=Helmet Kristal
+Crystal Leggings=Perisai Kaki Kristal
+Diamond Boots=But Intan
+Diamond Chestplate=Perisai Dada Intan
+Diamond Helmet=Helmet Intan
+Diamond Leggings=Perisai Kaki Intan
+Gold Boots=But Emas
+Gold Chestplate=Perisai Dada Emas
+Gold Helmet=Helmet Emas
+Gold Leggings=Perisai Kaki Emas
+Mithril Boots=But Mithril
+Mithril Chestplate=Perisai Dada Mithril
+Mithril Helmet=Helmet Mithril
+Mithril Leggings=Perisai Kaki Mithril
+Steel Boots=But Keluli
+Steel Chestplate=Perisai Dada Keluli
+Steel Helmet=Helmet Keluli
+Steel Leggings=Perisai Kaki Keluli
+Wood Boots=But Kayu
+Wood Chestplate=Perisai Dada Kayu
+Wood Helmet=Helmet Kayu
+Wood Leggings=Perisai Kaki Kayu
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: Gagal mengasalkan pemain
+Fire=Api
+Heal=Pulih
+Level=Tahap
+Radiation=Radiasi
+Your @1 got destroyed!=@1 anda telah musnah!
+Your @1 is almost broken!=
+[3d_armor] Fire Nodes disabled=[3d_armor] Nod-nod Api dilumpuhkan
+
+
+##### not used anymore #####
+
+3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mods dimuatkan tetapi tidak digunakan.
+Back=Kembali
+Armor=Perisai
+3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mods dimuatkan tetapi tidak digunakan.
+Armor stand top=Bhg atas dirian perisai
+Armor stand=Dirian perisai
+Armor Stand=Dirian Perisai
+Locked Armor stand=Dirian perisai Berkunci
+Armor Stand (owned by @1)=Dirian Perisai (milik @1)
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mods dimuatkan tetapi tidak digunakan.
+3d Armor=Perisai 3d
+Armor not initialized!=Perisai tidak diasalkan!
+Admin Shield=Perisai Pegang Pentadbir
+Wooden Shield=Perisai Pegang Kayu
+Enhanced Wood Shield=Perisai Pegang Kayu Kukuh
+Cactus Shield=Perisai Pegang Kaktus
+Enhanced Cactus Shield=Perisai Pegang Kaktus Kukuh
+Steel Shield=Perisai Pegang Keluli
+Bronze Shield=Perisai Pegang Gangsa
+Diamond Shield=Perisai Pegang Intan
+Gold Shield=Perisai Pegang Emas
+Mithril Shield=Perisai Pegang Mithril
+Crystal Shield=Perisai Pegang Kristal

3d_armor/locale/3d_armor.pt.tr

@@ -0,0 +1,85 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1
+3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
+3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
+
+### armor.lua ###
+
+Admin Boots=Botas de Administrador
+Admin Chestplate=Peitoral de Administrador
+Admin Helmet=Capacete de Administrador
+Admin Leggings=Calças de Administrador
+Bronze Boots=Botas de Bronze
+Bronze Chestplate=Peitoral de Bronze
+Bronze Helmet=Capacete de Bronze
+Bronze Leggings=Calças de Bronze
+Cactus Boots=Botas de Madeira
+Cactus Chestplate=Peitoral de Cacto
+Cactus Helmet=Capacete de Cacto
+Cactus Leggings=Calças de Cacto
+Crystal Boots=Botas de Cristal
+Crystal Chestplate=Peitoral de Cristal
+Crystal Helmet=Capacete de Cristal
+Crystal Leggings=Calças de Cristal
+Diamond Boots=Botas de Diamante
+Diamond Chestplate=Peitoral de Diamante
+Diamond Helmet=Capacete de Diamante
+Diamond Leggings=Calças de Diamante
+Gold Boots=Botas de Ouro
+Gold Chestplate=Peitoral de Ouro
+Gold Helmet=Capacete de Ouro
+Gold Leggings=Calças de Ouro
+Mithril Boots=Botas de Mithril
+Mithril Chestplate=Peitoral de Mithril
+Mithril Helmet=Capacete de Mithril
+Mithril Leggings=Calças de Mithril
+Steel Boots=Botas de Aço
+Steel Chestplate=Peitoral de Aço
+Steel Helmet=Capacete de Aço
+Steel Leggings=Calças de Aço
+Wood Boots=Botas de Madeira
+Wood Chestplate=Peitoral de Madeira
+Wood Helmet=Capacete de Madeira
+Wood Leggings=Calças de Madeira
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador
+Fire=Fogo
+Heal=Saúde
+Level=Nível
+Radiation=Radiação
+Your @1 got destroyed!=@1 foi destruído(a)!
+Your @1 is almost broken!=
+[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados
+
+
+##### not used anymore #####
+
+3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante.
+Back=Voltar
+Armor=Armadura
+3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante.
+Armor stand top=Topo de estande de armadura
+Armor stand=Estande de armadura
+Armor Stand=Estande de Armadura
+Locked Armor stand=Estande de Armadura Trancada
+Armor Stand (owned by @1)=Estande de Armadura (pertente a @1)
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante.
+3d Armor=3d Armor
+Armor not initialized!=Armadura não inicializada!
+Admin Shield=Escudo de Administrador
+Wooden Shield=Escudo de Madeira
+Enhanced Wood Shield=Escudo de Madeira Melhorado
+Cactus Shield=Escudo de Cacto
+Enhanced Cactus Shield=Escudo de Cacto Melhorado
+Steel Shield=Escudo de Aço
+Bronze Shield=Escudo de Bronze
+Diamond Shield=Escudo de Diamante
+Gold Shield=Escudo de Ouro
+Mithril Shield=Escudo de Mithril
+Crystal Shield=Escudo de Cristal

3d_armor/locale/3d_armor.pt_BR.tr

@@ -0,0 +1,85 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1
+3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
+3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
+
+### armor.lua ###
+
+Admin Boots=Botas de Administrador
+Admin Chestplate=Peitoral de Administrador
+Admin Helmet=Capacete de Administrador
+Admin Leggings=Calças de Administrador
+Bronze Boots=Botas de Bronze
+Bronze Chestplate=Peitoral de Bronze
+Bronze Helmet=Capacete de Bronze
+Bronze Leggings=Calças de Bronze
+Cactus Boots=Botas de Madeira
+Cactus Chestplate=Peitoral de Cacto
+Cactus Helmet=Capacete de Cacto
+Cactus Leggings=Calças de Cacto
+Crystal Boots=Botas de Cristal
+Crystal Chestplate=Peitoral de Cristal
+Crystal Helmet=Capacete de Cristal
+Crystal Leggings=Calças de Cristal
+Diamond Boots=Botas de Diamante
+Diamond Chestplate=Peitoral de Diamante
+Diamond Helmet=Capacete de Diamante
+Diamond Leggings=Calças de Diamante
+Gold Boots=Botas de Ouro
+Gold Chestplate=Peitoral de Ouro
+Gold Helmet=Capacete de Ouro
+Gold Leggings=Calças de Ouro
+Mithril Boots=Botas de Mithril
+Mithril Chestplate=Peitoral de Mithril
+Mithril Helmet=Capacete de Mithril
+Mithril Leggings=Calças de Mithril
+Steel Boots=Botas de Aço
+Steel Chestplate=Peitoral de Aço
+Steel Helmet=Capacete de Aço
+Steel Leggings=Calças de Aço
+Wood Boots=Botas de Madeira
+Wood Chestplate=Peitoral de Madeira
+Wood Helmet=Capacete de Madeira
+Wood Leggings=Calças de Madeira
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador
+Fire=Fogo
+Heal=Saúde
+Level=Nível
+Radiation=Radiação
+Your @1 got destroyed!=@1 foi destruído(a)!
+Your @1 is almost broken!=
+[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados
+
+
+##### not used anymore #####
+
+3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante.
+Back=Voltar
+Armor=Armadura
+3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante.
+Armor stand top=Topo de estande de armadura
+Armor stand=Estande de armadura
+Armor Stand=Estande de Armadura
+Locked Armor stand=Estande de Armadura Trancada
+Armor Stand (owned by @1)=Estande de Armadura (pertente a @1)
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante.
+3d Armor=3d Armor
+Armor not initialized!=Armadura não inicializada!
+Admin Shield=Escudo de Administrador
+Wooden Shield=Escudo de Madeira
+Enhanced Wood Shield=Escudo de Madeira Melhorado
+Cactus Shield=Escudo de Cacto
+Enhanced Cactus Shield=Escudo de Cacto Melhorado
+Steel Shield=Escudo de Aço
+Bronze Shield=Escudo de Bronze
+Diamond Shield=Escudo de Diamante
+Gold Shield=Escudo de Ouro
+Mithril Shield=Escudo de Mithril
+Crystal Shield=Escudo de Cristal

3d_armor/locale/3d_armor.ru.tr

@@ -0,0 +1,85 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor: Отдельный инвентарь брони является nil @1
+3d_armor: Player name is nil @1=3d_armor: Имя игрока является nil @1
+3d_armor: Player reference is nil @1=3d_armor: Ссылка игрока является nil @1
+
+### armor.lua ###
+
+Admin Boots=ботинки админа
+Admin Chestplate=бронежилет админа
+Admin Helmet=шлем админа
+Admin Leggings=гамаши админа
+Bronze Boots=бронзовые ботинки
+Bronze Chestplate=бронзовый бронежилет
+Bronze Helmet=бронзовый шлем
+Bronze Leggings=бронзовые гамаши
+Cactus Boots=кактусовые ботинки
+Cactus Chestplate=кактусовый бронежилет
+Cactus Helmet=кактусовый шлем
+Cactus Leggings=кактусовые гамаши
+Crystal Boots=кристалловые ботинки
+Crystal Chestplate=кристалловый бронежилет
+Crystal Helmet=кристалловый шлем
+Crystal Leggings=кристалловые гамаши
+Diamond Boots=алмазные ботинки
+Diamond Chestplate=алмазный бронежилет
+Diamond Helmet=алмазный шлем
+Diamond Leggings=алмазные гамаши
+Gold Boots=золотые ботинки
+Gold Chestplate=золотой бронежилет
+Gold Helmet=золотой шлем
+Gold Leggings=золотые гамаши
+Mithril Boots=мифриловые ботинки
+Mithril Chestplate=мифриловый бронежилет
+Mithril Helmet=мифриловый шлем
+Mithril Leggings=мифриловые гамаши
+Steel Boots=стальные ботинки
+Steel Chestplate=стальной бронежилет
+Steel Helmet=стальной шлем
+Steel Leggings=стальные гамаши
+Wood Boots=деревянные ботинки
+Wood Chestplate=деревянный бронежилет
+Wood Helmet=деревянный шлем
+Wood Leggings=деревянные гамаши
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor: не смог подготовить игрока
+Fire=огонь
+Heal=исцеление
+Level=уровень
+Radiation=излучение
+Your @1 got destroyed!=твой(и) @1 был(и) разрушен(ы)!
+Your @1 is almost broken!=
+[3d_armor] Fire Nodes disabled=[3d_armor] блоки огня отключены
+
+
+##### not used anymore #####
+
+3d_armor_ip: Mod loaded but unused.=3d_armor_ip: мод загружен но не используется.
+Back=назад
+Armor=бронь
+3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: мод загружен но не используется.
+Armor stand top=стойка для брони (верх)
+Armor stand=стойка для брони
+Armor Stand=стойка для брони
+Locked Armor stand=защищенная стойка для брони
+Armor Stand (owned by @1)=стойка для брони (принадлежит @1)
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui: мод загружен но не используется.
+3d Armor=3D бронь
+Armor not initialized!=бронь не подготовлена!
+Admin Shield=щит админа
+Wooden Shield=деревянный щит
+Enhanced Wood Shield=улучшенный деревянный щит
+Cactus Shield=кактусный щит
+Enhanced Cactus Shield=улучшенный кактусный щит
+Steel Shield=стальной щит
+Bronze Shield=бронзовый щит
+Diamond Shield=алмазный щит
+Gold Shield=золотой щит
+Mithril Shield=мифриловый щит
+Crystal Shield=кристалловый щит

3d_armor/locale/template.txt

@@ -0,0 +1,58 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=
+3d_armor: Player name is nil @1=
+3d_armor: Player reference is nil @1=
+
+### armor.lua ###
+
+Admin Boots=
+Admin Chestplate=
+Admin Helmet=
+Admin Leggings=
+Bronze Boots=
+Bronze Chestplate=
+Bronze Helmet=
+Bronze Leggings=
+Cactus Boots=
+Cactus Chestplate=
+Cactus Helmet=
+Cactus Leggings=
+Crystal Boots=
+Crystal Chestplate=
+Crystal Helmet=
+Crystal Leggings=
+Diamond Boots=
+Diamond Chestplate=
+Diamond Helmet=
+Diamond Leggings=
+Gold Boots=
+Gold Chestplate=
+Gold Helmet=
+Gold Leggings=
+Mithril Boots=
+Mithril Chestplate=
+Mithril Helmet=
+Mithril Leggings=
+Steel Boots=
+Steel Chestplate=
+Steel Helmet=
+Steel Leggings=
+Wood Boots=
+Wood Chestplate=
+Wood Helmet=
+Wood Leggings=
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=
+Fire=
+Heal=
+Level=
+Radiation=
+Your @1 got destroyed!=
+Your @1 is almost broken!=
+[3d_armor] Fire Nodes disabled=

3d_armor/mod.conf

@@ -0,0 +1,4 @@
+name = 3d_armor
+depends = default
+optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores
+description = Adds craftable armor that is visible to other players.