Attacking stealthed/invisible creatures now uses a normal hit check and then...

Attacking stealthed/invisible creatures now uses a normal hit check and then adds a random 33% chance to hit


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

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

@@ -128,11 +128,10 @@ local function archery_projectile(tx, ty, tg, self)
 	atk = atk + (tg.archery.atk or 0)
 	dam = dam + (tg.archery.dam or 0)
 	print("[ATTACK ARCHERY] to ", target.name, " :: ", dam, apr, armor, "::", mult)
-	if not self:canSee(target) then atk = atk / 3 end
 
 	-- If hit is over 0 it connects, if it is 0 we still have 50% chance
 	local hitted = false
-	if self:checkHit(atk, def) then
+	if self:checkHit(atk, def) and (self:canSee(target) or rng.chance(3)) then
 		apr = apr + (tg.archery.apr or 0)
 		print("[ATTACK ARCHERY] raw dam", dam, "versus", armor, "with APR", apr)
 

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

@@ -295,7 +295,6 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 		mult = mult * t.getStalkedDamageMultiplier(self, t, effStalker.bonus)
 	end
 
-	if not self:canSee(target) then atk = atk / 3 end
 	local dam, apr, armor = force_dam or self:combatDamage(weapon), self:combatAPR(weapon), target:combatArmor()
 	print("[ATTACK] to ", target.name, " :: ", dam, apr, armor, def, "::", mult)
 
@@ -320,7 +319,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 	elseif self:checkEvasion(target) then
 		evaded = true
 		game.logSeen(target, "%s evades %s.", target.name:capitalize(), self.name)
-	elseif self:checkHit(atk, def) then
+	elseif self:checkHit(atk, def) and (self:canSee(target) or rng.chance(3)) then
 		local pres = util.bound(target:combatArmorHardiness() / 100, 0, 1)
 		print("[ATTACK] raw dam", dam, "versus", armor, pres, "with APR", apr)
 		armor = math.max(0, armor - apr)
@@ -725,17 +724,17 @@ end
 
 --- Gets the attack using only strength
 function _M:combatAttackStr(weapon, ammo)
-	return self:combatAttackBase(weapon, ammo) + (self:getStr(100, true) - 10)
+	return self:rescaleCombatStats(self:combatAttackBase(weapon, ammo) + (self:getStr(100, true) - 10))
 end
 
 --- Gets the attack using only dexterity
 function _M:combatAttackDex(weapon, ammo)
-	return self:combatAttackBase(weapon, ammo) + (self:getDex(100, true) - 10)
+	return self:rescaleCombatStats(self:combatAttackBase(weapon, ammo) + (self:getDex(100, true) - 10))
 end
 
 --- Gets the attack using only magic
 function _M:combatAttackMag(weapon, ammo)
-	return self:combatAttackBase(weapon, ammo) + (self:getMag(100, true) - 10)
+	return self:rescaleCombatStats(self:combatAttackBase(weapon, ammo) + (self:getMag(100, true) - 10))
 end
 
 --- Gets the armor penetration