Changes

no edit summary
Line 359: Line 359:  
if self:_is_carrier() then
 
if self:_is_carrier() then
 
if has_planes and self._ship:night_bombing() then
 
if has_planes and self._ship:night_bombing() then
return format{"Bombing Run (${attack_power})", attack_power = self:_attack_power_cap(firepower + torpedo, 300)}
+
return format{"Bombing (${attack_power})", attack_power = self:_attack_power_cap(firepower + torpedo, 300)}
 
end
 
end
 
return "No Action"
 
return "No Action"
Line 383: Line 383:  
function ShipCapabilities:opening_torpedo()
 
function ShipCapabilities:opening_torpedo()
 
local torpedo = self._ship:torpedo_leveled()
 
local torpedo = self._ship:torpedo_leveled()
if not torpedo or torpedo <= 0 then
+
local opening_torpedo = self._ship:opening_torpedo()
 +
if (opening_torpedo ~= true) and (opening_torpedo == false or not torpedo or torpedo <= 0) then
 
return "No"
 
return "No"
 
end
 
end
local opening_torpedo = false
   
if self:_is_submarine() then
 
if self:_is_submarine() then
 
if self:level() >= 10 then
 
if self:level() >= 10 then
Line 412: Line 412:  
function ShipCapabilities:asw_attack()
 
function ShipCapabilities:asw_attack()
 
local base_asw
 
local base_asw
if self:_is_asw_surface_ship() then
+
local asw_override = self._ship:asw_attack()
 +
if asw_override == false then
 +
return "No"
 +
elseif self:_is_asw_surface_ship() then
 
base_asw = 25
 
base_asw = 25
 
elseif self:_is_asw_aviation_ship() then
 
elseif self:_is_asw_aviation_ship() then
Anonymous user