IN WORK - Space GCW - Most schematics in place, purchaseable and craftable - just components are not yet in place fully.

This commit is contained in:
Cekis
2018-01-31 01:09:20 +00:00
parent 20d55fac6d
commit d6e37e2e43
114 changed files with 8148 additions and 2043 deletions
@@ -351,15 +351,6 @@ public class combat_ship extends script.base_script
space_crafting.setupChassisDifferentiation(self);
}
space_combat.recalculateEfficiency(intSlots[intI], self);
if (currentSlotComponentType == ship_component_type.SCT_weapon)
{
int flags = getShipComponentFlags(self, intSlots[intI]);
boolean isBitSet = (flags & ship_component_flags.SCF_reverse_engineered) != 0;
if (isBitSet)
{
space_crafting.recalculateFireRateFromSlot(player, self, intSlots[intI]);
}
}
}
return SCRIPT_CONTINUE;
}
@@ -860,17 +851,6 @@ public class combat_ship extends script.base_script
space_crafting.setupChassisDifferentiation(self);
}
space_pilot_command.allPurposeShipComponentReset(self);
int currentSlotComponentType = ship_chassis_slot_type.getComponentTypeForSlot(intSlot);
if (currentSlotComponentType == ship_component_type.SCT_weapon)
{
int flags = getShipComponentFlags(self, intSlot);
boolean isBitSet = (flags & ship_component_flags.SCF_reverse_engineered) != 0;
obj_id player = utils.getContainingPlayer(self);
if (isBitSet)
{
space_crafting.recalculateFireRateFromSlot(player, self, intSlot);
}
}
return SCRIPT_CONTINUE;
}
public int OnShipFiredCountermeasure(obj_id self, int intWeaponIndex, obj_id objPlayer) throws InterruptedException