| Line 249: |
Line 249: |
| | if self._cg then | | if self._cg then |
| | return self._cg | | return self._cg |
| | + | end |
| | + | if self._cg == false then |
| | + | return false |
| | end | | end |
| | local id = self:api_id() | | local id = self:api_id() |
| | if id and id > 1500 then | | if id and id > 1500 then |
| | local new_id = require('Module:Data/EnemyEquipmentCG')[id] | | local new_id = require('Module:Data/EnemyEquipmentCG')[id] |
| | + | new_id = new_id or id - 1500 |
| | local reference | | local reference |
| − | if new_id and new_id > 1500 then | + | if new_id and new_id ~= id and new_id > 1500 then |
| | local EnemyEquipment = require('Module:Collection/EnemyEquipment') | | local EnemyEquipment = require('Module:Collection/EnemyEquipment') |
| − | reference = U.find(EnemyEquipment, new_id - 1000, '_id') | + | reference = U.find(EnemyEquipment, new_id, '_id') |
| | end | | end |
| − | if new_id and new_id <= 1500 then | + | if new_id and new_id ~= id and new_id <= 1500 then |
| | local ShipEquipment = require('Module:Data/Equipment') | | local ShipEquipment = require('Module:Data/Equipment') |
| | reference = U.find(ShipEquipment, new_id, '_id') | | reference = U.find(ShipEquipment, new_id, '_id') |
| Line 276: |
Line 280: |
| | return Formatting:equipment_cg(id, self:asset_name()) | | return Formatting:equipment_cg(id, self:asset_name()) |
| | end | | end |
| − | return self._cg | + | return false |
| | end | | end |
| | | | |
| Line 433: |
Line 437: |
| | -- or eq_type == 58 -- Jet-powered Attack Aircraft | | -- or eq_type == 58 -- Jet-powered Attack Aircraft |
| | -- or eq_type == 59 -- Jet-powered Recon Aircraft | | -- or eq_type == 59 -- Jet-powered Recon Aircraft |
| | + | -- or eq_type == 91 -- Jet-powered Fighter-Bomber (II) |
| | -- or eq_type == 94 -- Carrier-based Reconnaissance Aircraft (II) | | -- or eq_type == 94 -- Carrier-based Reconnaissance Aircraft (II) |
| | end | | end |
| | | | |
| | function EquipmentData:is_lbas_ha_bomber() | | function EquipmentData:is_lbas_ha_bomber() |
| − | return self:id() >= 501 and self:type() == 7 and self:range() == 4 | + | return self:id() >= 1501 and self:type() == 7 and self:range() == 4 |
| | end | | end |
| | | | |
| Line 485: |
Line 490: |
| | or eq_type == 57 -- Jet-powered Fighter-Bomber | | or eq_type == 57 -- Jet-powered Fighter-Bomber |
| | or eq_type == 58 -- Jet-powered Attack Aircraft | | or eq_type == 58 -- Jet-powered Attack Aircraft |
| | + | or eq_type == 91 -- Jet-powered Fighter-Bomber (II) |
| | end | | end |
| | | | |
| Line 543: |
Line 549: |
| | return eq_type == 4 -- Secondary Guns | | return eq_type == 4 -- Secondary Guns |
| | or eq_type == 95 -- Secondary Guns (II) | | or eq_type == 95 -- Secondary Guns (II) |
| | + | end |
| | + | |
| | + | function EquipmentData:is_jet_powered_fighter_bomber() |
| | + | local eq_type = self:type() |
| | + | return eq_type == 57 -- Jet-powered Fighter-Bombers |
| | + | or eq_type == 91 -- Jet-powered Fighter-Bombers (II) |
| | end | | end |
| | | | |