From 642cc82cbac3d8a56cd66b20e6cc2ba6bf5691d6 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 25 Feb 2018 20:53:17 +0000 Subject: [PATCH] WIP: added status updates and spacebattlestatus command --- .../compiled/game/.idea/workspace.xml | 333 ++++++++---------- .../datatables/npc/space/space_gcw_hero.tab | 4 +- .../space/combat/combat_ship_player.java | 152 +++++--- .../systems/gcw/space/battle_controller.java | 96 ++++- .../systems/gcw/space/battle_spawner.java | 18 +- .../compiled/game/.idea/workspace.xml | 148 ++++---- .../game/datatables/command/command_table.tab | 328 ++++++++--------- .../command/command_table_space.tab | 113 +++--- .../compiled/game/datatables/skill/skills.tab | 6 +- 9 files changed, 674 insertions(+), 524 deletions(-) mode change 100644 => 100755 sku.0/sys.shared/compiled/game/datatables/command/command_table.tab diff --git a/sku.0/sys.server/compiled/game/.idea/workspace.xml b/sku.0/sys.server/compiled/game/.idea/workspace.xml index 1b2fe25df..a067e99e4 100755 --- a/sku.0/sys.server/compiled/game/.idea/workspace.xml +++ b/sku.0/sys.server/compiled/game/.idea/workspace.xml @@ -1,9 +1,10 @@ + + + - - @@ -446,6 +447,7 @@ + @@ -458,7 +460,6 @@ - @@ -594,8 +595,10 @@ + + @@ -1142,6 +1145,8 @@ + + @@ -1184,6 +1189,7 @@ + @@ -1205,6 +1211,8 @@ + + @@ -1438,8 +1446,8 @@ - - + + @@ -1455,11 +1463,11 @@ - + - - + + @@ -1468,8 +1476,8 @@ - - + + @@ -1477,12 +1485,14 @@ - - + + - - - + + + + + @@ -1508,36 +1518,36 @@ - required_config - exteriorAppearance - getObjIdWithNull - matchesNameAndDescriptor - isIdNull - decd_maple_sparse - appearance - imperial_tier5 - kessel - corellian_corvette - ravager - imp_corellian_corvette_tier4 - kessel_no_destroy - squad_corvette_convoy_imp - exbx - corvette - imperial_lancer - combat_ship_capital - "role" - cap - bossType - combat_ship_boss - battle_type - lastRunInterval - endBattle - "endBattle" == 1 "controller" .active last_battle_time + /pvp + cmdSpaceFaction + getMessageListeners + startBattle + "startBattle" + "start + "msgShuttleTakeOff" + spaceimperialhelper + getPlanetByName + arhul_narra + soontir_fel + xwing_tier_8 + xwing_tier_10 + tier_ + fireRocketLauncher + devastation + timerSet + timer_set + chat.*gcw + ".gcw + imperial_announcement + send + sendSystemMessage + gcw_announcement_invasion_almost_lost_imperial_tatooine_bestine + stringsBestine.txt + "role" @@ -1550,13 +1560,13 @@ Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\script\systems\gcw Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\datatables\buildout\rori Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\datatables\buildout - Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\datatables Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\object\draft_schematic Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\object\draft_schematic\clothing Z:\swg-main\dsrc\sku.0\sys.server\compiled\game Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\script\npe Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\object\weapon\melee Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\script + Z:\swg-main\dsrc\sku.0\sys.server\compiled\game\datatables @@ -1570,8 +1580,6 @@ - -