From d8dbf6a4af3ddfb9005ce44f2fc5bcfe01fdedaf Mon Sep 17 00:00:00 2001
From: Duane <duane@duanerobertson.com>
Date: Tue, 21 Jun 2016 03:14:49 -0500
Subject: [PATCH] Make armor.lua compatible with 3d_armor.

abms.lua may need to be changed.
---
 armor.lua | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/armor.lua b/armor.lua
index c7f9ed5..d131221 100644
--- a/armor.lua
+++ b/armor.lua
@@ -2,23 +2,25 @@ fun_caves.armor_expire = {}
 
 local function armor(user, factor)
 	local player_name = user:get_player_name()
-	user:set_armor_groups({fleshy=factor})
+	local armor = user:get_armor_groups()
+	armor.fleshy = armor.fleshy * factor
+	user:set_armor_groups(armor)
 	minetest.chat_send_player(player_name, 'Your skin feels harder...')
 	fun_caves.armor_expire[player_name] = minetest.get_gametime() + 3600
 end
 
 local descs = {
-	{'wood', 95, 'group:wood'},
-	{'stone', 90, 'group:stone'},
-	{'steel', 80, 'default:steel_ingot'},
-	{'copper', 85, 'default:copper_ingot'},
-	{'bronze', 70, 'default:bronze_ingot'},
-	{'gold', 60, 'default:gold_ingot'},
-	{'diamond', 50, 'default:diamond'},
-	{'silver', 40, 'fun_caves:silver_ingot'},
-	{'mese', 30, 'default:mese_crystal'},
-	--{'', 20, ''},
-	--{'adamant', 10, 'fun_caves:adamant'},
+	{'wood', 0.95, 'group:wood'},
+	{'stone', 0.9, 'group:stone'},
+	{'steel', 0.8, 'default:steel_ingot'},
+	{'copper', 0.85, 'default:copper_ingot'},
+	{'bronze', 0.7, 'default:bronze_ingot'},
+	{'gold', 0.6, 'default:gold_ingot'},
+	{'diamond', 0.5, 'default:diamond'},
+	{'silver', 0.4, 'fun_caves:silver_ingot'},
+	{'mese', 0.3, 'default:mese_crystal'},
+	--{'', 0.2, ''},
+	--{'adamant', 0.1, 'fun_caves:adamant'},
 }
 
 for _, desc in pairs(descs) do