seefoe/dsrc
1
0
Fork 0
mirror of https://bitbucket.org/seefoe/dsrc.git synced 2026-10-06 21:13:09 -04:00
Code Issues Projects Releases Wiki Activity

WIP: all ship tests are complete - battle types as well - pre-system test.

Browse Source
This commit is contained in:
Cekis
2018-03-11 02:02:10 +00:00
parent d0b0fad2d0
commit d5eba026a8
14 changed files with 743 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/space/combat/combat_ship.java
+7
View File
@@ -156,6 +156,9 @@ public class combat_ship extends script.base_script
{
return SCRIPT_CONTINUE;
}
if(hasObjVar(self, "intPvPDamageOnly") && space_utils.isPlayerControlledShip(objAttacker) && !(pvpGetType(objAttacker) == PVPTYPE_DECLARED)){
return SCRIPT_CONTINUE;
}
if (!isShipSlotTargetable(self, intTargetedComponent))
{
intTargetedComponent = space_combat.SHIP;
@@ -228,6 +231,10 @@ public class combat_ship extends script.base_script
fltRemainingDamage = space_combat.doArmorDamage(objAttacker, self, intWeaponSlot, fltRemainingDamage, intSide);
if (fltRemainingDamage > 0)
{
// this case prevents a player from doing component or chassis damage during a space GCW fight.
if(space_utils.isPlayerControlledShip(objAttacker) && hasScript(self, "systems.gcw.space.capital_ship")){
return SCRIPT_CONTINUE;
}
if (bossShip && !utils.hasScriptVar(self, "armorDepleted"))
{
messageTo(self, "armorDepleted", null, 0f, false);