better

git-svn-id: http://svn.net-core.org/repos/t-engine4@6686 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/GameState.lua

@@ -2018,7 +2018,7 @@ function _M:startEvents()
 end
 
 function _M:alternateZone(short_name, ...)
-	if not world:hasSeenZone(short_name) and not config.settings.cheat then print("Alternate layout for "..short_name.." refused: never visited") return "DEFAULT" end
+	if not world:hasSeenZone(short_name) and not config.settings.cheat and not world:hasAchievement("VAMPIRE_CRUSHER") then print("Alternate layout for "..short_name.." refused: never visited") return "DEFAULT" end
 
 	local list = {...}
 	table.insert(list, 1, {"DEFAULT", 1})

game/modules/tome/class/interface/Archery.lua

@@ -71,7 +71,7 @@ function _M:archeryAcquireTargets(tg, params)
 	local runfire = function(weapon, targets)
 		if params.one_shot then
 			local a = ammo
-			if not ammo.infinite then
+			if not ammo.infinite and ammo.combat.shots_left > 0 then
 				ammo.combat.shots_left = ammo.combat.shots_left - 1
 			end
 			if a then