[ImgBot] Optimize images

*Total -- 507.49kb -> 121.83kb (75.99%)

/3d_armor/textures/3d_armor_helmet_cactus_preview.png -- 2.87kb -> 0.35kb (87.82%)
/3d_armor/textures/3d_armor_leggings_wood_preview.png -- 2.88kb -> 0.35kb (87.79%)
/3d_armor/textures/3d_armor_boots_wood_preview.png -- 2.90kb -> 0.36kb (87.67%)
/3d_armor/textures/3d_armor_helmet_wood_preview.png -- 2.89kb -> 0.36kb (87.58%)
/3d_armor/textures/3d_armor_boots_bronze_preview.png -- 2.90kb -> 0.36kb (87.58%)
/3d_armor/textures/3d_armor_boots_gold_preview.png -- 2.89kb -> 0.36kb (87.54%)
/3d_armor/textures/3d_armor_boots_steel_preview.png -- 2.87kb -> 0.36kb (87.46%)
/3d_armor/textures/3d_armor_boots_wood.png -- 2.92kb -> 0.37kb (87.4%)
/3d_armor/textures/3d_armor_boots_cactus_preview.png -- 2.90kb -> 0.37kb (87.32%)
/3d_armor/textures/3d_armor_helmet_bronze_preview.png -- 2.94kb -> 0.37kb (87.32%)
/3d_armor/textures/3d_armor_helmet_diamond_preview.png -- 2.96kb -> 0.38kb (87.25%)
/3d_armor/textures/3d_armor_helmet_mithril_preview.png -- 2.92kb -> 0.37kb (87.24%)
/3d_armor/textures/3d_armor_boots_diamond_preview.png -- 2.93kb -> 0.37kb (87.23%)
/3d_armor/textures/3d_armor_boots_admin_preview.png -- 2.93kb -> 0.37kb (87.22%)
/3d_armor/textures/3d_armor_helmet_gold_preview.png -- 2.92kb -> 0.37kb (87.22%)
/3d_armor/textures/3d_armor_helmet_admin_preview.png -- 2.95kb -> 0.38kb (87.21%)
/3d_armor/textures/3d_armor_inv_helmet_wood.png -- 2.85kb -> 0.36kb (87.21%)
/3d_armor/textures/3d_armor_boots_crystal_preview.png -- 2.92kb -> 0.37kb (87.2%)
/3d_armor/textures/3d_armor_boots_mithril_preview.png -- 2.91kb -> 0.37kb (87.19%)
/3d_armor/textures/3d_armor_helmet_crystal_preview.png -- 2.94kb -> 0.38kb (87.16%)
/3d_armor/textures/3d_armor_leggings_cactus_preview.png -- 2.93kb -> 0.38kb (87.16%)
/3d_armor/textures/3d_armor_helmet_steel_preview.png -- 2.92kb -> 0.38kb (87.09%)
/3d_armor/textures/3d_armor_leggings_bronze_preview.png -- 2.91kb -> 0.38kb (87.09%)
/3d_armor/textures/3d_armor_inv_helmet_cactus.png -- 2.91kb -> 0.38kb (87.04%)
/3d_armor/textures/3d_armor_boots_steel.png -- 2.96kb -> 0.38kb (87.02%)
/3d_armor/textures/3d_armor_leggings_gold_preview.png -- 2.89kb -> 0.38kb (86.99%)
/3d_armor/textures/3d_armor_leggings_wood.png -- 2.97kb -> 0.39kb (86.96%)
/3d_armor/textures/3d_armor_inv_helmet_bronze.png -- 2.91kb -> 0.38kb (86.95%)
/3d_armor/textures/3d_armor_leggings_crystal_preview.png -- 2.91kb -> 0.38kb (86.95%)
/3d_armor/textures/3d_armor_leggings_diamond_preview.png -- 2.94kb -> 0.38kb (86.93%)
/3d_armor/textures/3d_armor_boots_bronze.png -- 2.98kb -> 0.39kb (86.91%)
/3d_armor/textures/3d_armor_leggings_mithril_preview.png -- 2.93kb -> 0.38kb (86.88%)
/3d_armor/textures/3d_armor_leggings_admin_preview.png -- 2.93kb -> 0.38kb (86.88%)
/3d_armor/textures/3d_armor_leggings_steel_preview.png -- 2.91kb -> 0.38kb (86.86%)
/3d_armor/textures/3d_armor_inv_helmet_mithril.png -- 2.89kb -> 0.38kb (86.86%)
/3d_armor/textures/3d_armor_inv_helmet_diamond.png -- 2.91kb -> 0.38kb (86.85%)
/3d_armor/textures/3d_armor_inv_helmet_gold.png -- 2.88kb -> 0.38kb (86.82%)
/shields/textures/shields_inv_shield_cactus.png -- 2.93kb -> 0.39kb (86.82%)
/3d_armor/textures/3d_armor_inv_helmet_crystal.png -- 2.90kb -> 0.38kb (86.81%)
/3d_armor/textures/3d_armor_boots_gold.png -- 2.96kb -> 0.39kb (86.81%)
/3d_armor/textures/3d_armor_inv_helmet_admin.png -- 2.90kb -> 0.38kb (86.8%)
/3d_armor/textures/3d_armor_leggings_bronze.png -- 3.04kb -> 0.40kb (86.79%)
/shields/textures/shields_shield_cactus.png -- 2.99kb -> 0.40kb (86.75%)
/3d_armor/textures/3d_armor_boots_cactus.png -- 2.98kb -> 0.39kb (86.75%)
/shields/textures/shields_shield_cactus_preview.png -- 2.99kb -> 0.40kb (86.75%)
/3d_armor/textures/3d_armor_leggings_cactus.png -- 2.99kb -> 0.40kb (86.75%)
/3d_armor/textures/3d_armor_boots_mithril.png -- 3.00kb -> 0.40kb (86.73%)
/3d_armor/textures/3d_armor_inv_boots_cactus.png -- 2.92kb -> 0.39kb (86.67%)
/3d_armor/textures/3d_armor_inv_boots_bronze.png -- 2.97kb -> 0.40kb (86.67%)
/3d_armor/textures/3d_armor_boots_diamond.png -- 2.99kb -> 0.40kb (86.65%)
/3d_armor/textures/3d_armor_leggings_gold.png -- 3.01kb -> 0.40kb (86.65%)
/3d_armor/textures/3d_armor_boots_admin.png -- 2.98kb -> 0.40kb (86.63%)
/3d_armor/textures/3d_armor_inv_boots_admin.png -- 2.98kb -> 0.40kb (86.62%)
/3d_armor/textures/3d_armor_inv_boots_wood.png -- 2.99kb -> 0.40kb (86.61%)
/3d_armor/textures/3d_armor_inv_boots_diamond.png -- 2.98kb -> 0.40kb (86.61%)
/3d_armor/textures/3d_armor_inv_helmet_steel.png -- 2.91kb -> 0.39kb (86.59%)
/3d_armor/textures/3d_armor_boots_crystal.png -- 2.97kb -> 0.40kb (86.57%)
/3d_armor/textures/3d_armor_inv_boots_crystal.png -- 2.96kb -> 0.40kb (86.56%)
/3d_armor/textures/3d_armor_inv_leggings_admin.png -- 2.97kb -> 0.40kb (86.53%)
/3d_armor/textures/3d_armor_inv_leggings_cactus.png -- 2.95kb -> 0.40kb (86.51%)
/3d_armor/textures/3d_armor_inv_boots_gold.png -- 2.94kb -> 0.40kb (86.51%)
/shields/textures/shields_inv_shield_enhanced_cactus.png -- 2.95kb -> 0.40kb (86.49%)
/3d_armor/textures/3d_armor_inv_leggings_diamond.png -- 2.95kb -> 0.40kb (86.44%)
/3d_armor/textures/3d_armor_inv_leggings_crystal.png -- 2.95kb -> 0.40kb (86.43%)
/3d_armor/textures/3d_armor_inv_boots_steel.png -- 2.94kb -> 0.40kb (86.43%)
/3d_armor/textures/3d_armor_leggings_diamond.png -- 3.05kb -> 0.42kb (86.41%)
/shields/textures/shields_shield_enhanced_cactus.png -- 3.01kb -> 0.41kb (86.39%)
/shields/textures/shields_shield_enhanced_cactus_preview.png -- 3.01kb -> 0.41kb (86.39%)
/3d_armor/textures/3d_armor_leggings_admin.png -- 3.05kb -> 0.42kb (86.39%)
/3d_armor/textures/3d_armor_leggings_crystal.png -- 3.05kb -> 0.42kb (86.38%)
/3d_armor/textures/3d_armor_inv_chestplate_wood.png -- 3.05kb -> 0.42kb (86.38%)
/3d_armor/textures/3d_armor_leggings_mithril.png -- 3.03kb -> 0.41kb (86.38%)
/3d_armor/textures/3d_armor_inv_leggings_wood.png -- 2.97kb -> 0.41kb (86.36%)
/shields/textures/shields_inv_shield_wood.png -- 2.97kb -> 0.41kb (86.29%)
/3d_armor/textures/3d_armor_inv_boots_mithril.png -- 2.96kb -> 0.41kb (86.29%)
/shields/textures/shields_shield_wood_preview.png -- 3.03kb -> 0.42kb (86.28%)
/3d_armor/textures/3d_armor_inv_leggings_gold.png -- 2.97kb -> 0.41kb (86.19%)
/shields/textures/shields_inv_shield_bronze.png -- 3.12kb -> 0.43kb (86.16%)
/3d_armor/textures/3d_armor_inv_leggings_bronze.png -- 2.96kb -> 0.41kb (86.14%)
/shields/textures/shields_shield_wood.png -- 3.02kb -> 0.42kb (86.14%)
/shields/textures/shields_inv_shield_steel.png -- 3.10kb -> 0.43kb (86.11%)
/3d_armor/textures/3d_armor_inv_leggings_mithril.png -- 2.97kb -> 0.41kb (86.1%)
/3d_armor/textures/3d_armor_leggings_steel.png -- 3.03kb -> 0.42kb (86.08%)
/3d_armor/textures/3d_armor_inv_leggings_steel.png -- 2.94kb -> 0.41kb (86.07%)
/shields/textures/shields_inv_shield_mithril.png -- 3.09kb -> 0.43kb (86.03%)
/shields/textures/shields_shield_enhanced_wood_preview.png -- 3.12kb -> 0.44kb (85.96%)
/shields/textures/shields_inv_shield_diamond.png -- 3.11kb -> 0.44kb (85.94%)
/shields/textures/shields_inv_shield_enhanced_wood.png -- 3.07kb -> 0.43kb (85.92%)
/shields/textures/shields_inv_shield_gold.png -- 3.06kb -> 0.43kb (85.9%)
/3d_armor/textures/3d_armor_inv_chestplate_cactus.png -- 3.00kb -> 0.42kb (85.9%)
/3d_armor/textures/3d_armor_inv_chestplate_bronze.png -- 3.03kb -> 0.43kb (85.89%)
/3d_armor/textures/3d_armor_inv_chestplate_mithril.png -- 2.99kb -> 0.42kb (85.87%)
/3d_armor/textures/3d_armor_chestplate_bronze_preview.png -- 3.05kb -> 0.43kb (85.86%)
/3d_armor/textures/3d_armor_inv_chestplate_steel.png -- 3.02kb -> 0.43kb (85.83%)
/3d_armor/textures/3d_armor_inv_chestplate_diamond.png -- 3.03kb -> 0.43kb (85.82%)
/shields/textures/shields_shield_bronze_preview.png -- 3.19kb -> 0.45kb (85.81%)
/3d_armor/textures/3d_armor_chestplate_steel_preview.png -- 3.03kb -> 0.43kb (85.8%)
/3d_armor/textures/3d_armor_chestplate_wood_preview.png -- 3.00kb -> 0.43kb (85.79%)
/shields/textures/shields_inv_shield_crystal.png -- 3.07kb -> 0.44kb (85.79%)
/3d_armor/textures/3d_armor_chestplate_cactus_preview.png -- 3.05kb -> 0.43kb (85.78%)
/3d_armor/textures/3d_armor_inv_chestplate_admin.png -- 3.02kb -> 0.43kb (85.77%)
/shields/textures/shields_shield_bronze.png -- 3.18kb -> 0.45kb (85.77%)
/3d_armor/textures/3d_armor_inv_chestplate_gold.png -- 3.00kb -> 0.43kb (85.74%)
/3d_armor/textures/3d_armor_inv_chestplate_crystal.png -- 3.01kb -> 0.43kb (85.73%)
/shields/textures/shields_inv_shield_admin.png -- 3.06kb -> 0.44kb (85.72%)
/3d_armor/textures/3d_armor_chestplate_mithril_preview.png -- 3.05kb -> 0.44kb (85.71%)
/shields/textures/shields_shield_enhanced_wood.png -- 3.09kb -> 0.44kb (85.7%)
/3d_armor/textures/3d_armor_chestplate_diamond_preview.png -- 3.05kb -> 0.44kb (85.7%)
/shields/textures/shields_shield_steel_preview.png -- 3.15kb -> 0.45kb (85.7%)
/3d_armor/textures/3d_armor_chestplate_admin_preview.png -- 3.04kb -> 0.44kb (85.7%)
/3d_armor/textures/3d_armor_chestplate_crystal_preview.png -- 3.04kb -> 0.44kb (85.7%)
/shields/textures/shields_shield_diamond_preview.png -- 3.18kb -> 0.46kb (85.67%)
/3d_armor/textures/3d_armor_chestplate_wood.png -- 3.08kb -> 0.44kb (85.64%)
/3d_armor/textures/3d_armor_helmet_bronze.png -- 3.18kb -> 0.46kb (85.61%)
/3d_armor/textures/3d_armor_chestplate_gold_preview.png -- 3.01kb -> 0.43kb (85.61%)
/3d_armor/textures/3d_armor_helmet_wood.png -- 3.13kb -> 0.45kb (85.59%)
/shields/textures/shields_shield_diamond.png -- 3.18kb -> 0.46kb (85.58%)
/shields/textures/shields_shield_crystal_preview.png -- 3.14kb -> 0.46kb (85.47%)
/shields/textures/shields_shield_admin.png -- 3.16kb -> 0.46kb (85.47%)
/shields/textures/shields_shield_steel.png -- 3.18kb -> 0.46kb (85.46%)
/shields/textures/shields_shield_admin_preview.png -- 3.13kb -> 0.46kb (85.45%)
/shields/textures/shields_shield_mithril_preview.png -- 3.16kb -> 0.46kb (85.45%)
/3d_armor/textures/3d_armor_helmet_diamond.png -- 3.19kb -> 0.46kb (85.45%)
/3d_armor/textures/3d_armor_helmet_cactus.png -- 3.11kb -> 0.45kb (85.44%)
/shields/textures/shields_shield_mithril.png -- 3.17kb -> 0.46kb (85.42%)
/shields/textures/shields_shield_crystal.png -- 3.14kb -> 0.46kb (85.38%)
/shields/textures/shields_shield_gold_preview.png -- 3.14kb -> 0.46kb (85.33%)
/3d_armor/textures/3d_armor_helmet_admin.png -- 3.17kb -> 0.46kb (85.31%)
/shields/textures/shields_shield_gold.png -- 3.14kb -> 0.46kb (85.28%)
/3d_armor/textures/3d_armor_helmet_crystal.png -- 3.15kb -> 0.46kb (85.25%)
/3d_armor/textures/3d_armor_helmet_mithril.png -- 3.12kb -> 0.46kb (85.16%)
/3d_armor/textures/3d_armor_chestplate_bronze.png -- 3.26kb -> 0.49kb (85.03%)
/3d_armor/textures/3d_armor_chestplate_steel.png -- 3.23kb -> 0.49kb (84.92%)
/3d_armor/textures/3d_armor_helmet_steel.png -- 3.15kb -> 0.48kb (84.67%)
/3d_armor/textures/3d_armor_chestplate_cactus.png -- 3.21kb -> 0.49kb (84.64%)
/3d_armor/textures/3d_armor_helmet_gold.png -- 3.12kb -> 0.48kb (84.64%)
/3d_armor/textures/3d_armor_chestplate_mithril.png -- 3.26kb -> 0.50kb (84.6%)
/3d_armor/textures/3d_armor_chestplate_gold.png -- 3.19kb -> 0.50kb (84.46%)
/3d_armor/textures/3d_armor_chestplate_diamond.png -- 3.26kb -> 0.51kb (84.33%)
/3d_armor/textures/3d_armor_chestplate_admin.png -- 3.21kb -> 0.50kb (84.31%)
/3d_armor/textures/3d_armor_chestplate_crystal.png -- 3.19kb -> 0.50kb (84.23%)
/3d_armor/textures/inventory_plus_armor.png -- 3.59kb -> 0.65kb (81.97%)
/3d_armor_stand/models/3d_armor_stand.png -- 1.59kb -> 0.97kb (38.88%)
/3d_armor_stand/models/3d_armor_stand_locked.png -- 1.95kb -> 1.21kb (37.6%)
/screenshot.png -- 65.39kb -> 51.81kb (20.77%)
/3d_armor/textures/3d_armor_ui_form.png -- 8.90kb -> 8.26kb (7.2%)
/3d_armor/textures/character_preview.png -- 0.34kb -> 0.32kb (5.73%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>

.gitignore

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

3d_armor/api.lua

@@ -279,6 +279,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

3d_armor/armor.conf

@@ -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
-

3d_armor/init.lua

@@ -99,17 +99,27 @@ armor.formspec = armor.formspec..
 if armor.config.fire_protect then
 	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 @1 got destroyed!", def.description))
+		minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0})
 	end
 end)
 
 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
@@ -140,6 +150,7 @@ local function validate_armor_inventory(player)
 				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
@@ -330,8 +341,8 @@ if armor.config.drop == true or armor.config.destroy == true then
 		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)
@@ -467,5 +478,3 @@ if armor.config.water_protect == true or armor.config.fire_protect == true then
 		armor.timer = 0
 	end)
 end
-
-minetest.log("action", "[3d_armor] loaded.")