Merge branch 'master' into MoreRogueUpdates

game/modules/tome/data/chats/artifice-mastery.lua

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2015 Nicolas Casalini
+-- Copyright (C) 2009 - 2017 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

game/modules/tome/data/chats/artifice.lua

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2015 Nicolas Casalini
+-- Copyright (C) 2009 - 2017 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

game/modules/tome/data/chats/trap-priming.lua

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2015 Nicolas Casalini
+-- Copyright (C) 2009 - 2017 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

game/modules/tome/data/general/objects/egos/staves.lua

@@ -673,6 +673,9 @@ newEntity{
 	greater_ego = 1,
 	rarity = 35,
 	cost = 60,
+	combat = {
+		accuracy_effect_scale = 0.5,
+	},
 	wielder = {
 		combat_atk = resolvers.mbonus_material(10, 5),
 		combat_dam = resolvers.mbonus_material(10, 5),

game/modules/tome/resolvers.lua

@@ -558,7 +558,7 @@ function resolvers.calc.moddable_tile(t, e)
 	elseif slot == "robe" then r = {"upper_body_34","upper_body_35","upper_body_36","upper_body_37","upper_body_38",}
 	elseif slot == "shield" then r = {"%s_hand_10_01","%s_hand_11_01","%s_hand_11_02","%s_hand_12_01","%s_hand_12_02",}
 	elseif slot == "staff" then r = {"%s_hand_08_01", "%s_hand_08_03", "%s_hand_08_02", "%s_hand_08_04", "%s_hand_08_05"} -- 03 & 02 are reversed due to an error in gfx, don't change it!
-	elseif slot == "leather_boots" then r = {"feet_03","feet_10","feet_10","feet_11","feet_11",}
+	elseif slot == "leather_boots" then r = {"feet_04","feet_10","feet_10","feet_11","feet_11",}
 	elseif slot == "heavy_boots" then r = {"feet_06","feet_06","feet_07","feet_09","feet_08",}
 	elseif slot == "gauntlets" then r = {"hands_03","hands_04","hands_05","hands_07","hands_06",}
 	elseif slot == "gloves" then r = {"hands_02","hands_02","hands_08","hands_08","hands_09"}