From f2b188179e6be542910e5eedef324524cd85a470 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Wed, 30 May 2018 07:30:56 +0100 Subject: [PATCH] Fixed issue with Heavy Vaksai not generating properly. --- .../datatables/ship/chassis_modifiers.tab | 2 +- .../game/datatables/ship/shiptype.tab | 2 +- .../space_combat/ship_droid_assignments.tab | 2 +- .../player/player_blacksun_vaksai_s02.tpf | 2 +- .../game/script/library/space_create.java | 12 +----------- .../game/script/space/combat/combat_ship.java | 19 ++----------------- .../script/space/crafting/yt2400_deed.java | 16 +++++----------- .../ship_control_device.java | 16 +--------------- .../ship/shared_blacksun_vaksai_s02_pcd.tpf | 7 +++++-- 9 files changed, 18 insertions(+), 60 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/ship/chassis_modifiers.tab b/sku.0/sys.server/compiled/game/datatables/ship/chassis_modifiers.tab index c4ec94d16..8c8bd8c7b 100755 --- a/sku.0/sys.server/compiled/game/datatables/ship/chassis_modifiers.tab +++ b/sku.0/sys.server/compiled/game/datatables/ship/chassis_modifiers.tab @@ -63,4 +63,4 @@ player_naboo_n1 0.05 0.8 0.8 1.6 40 60 250 250 125 1 interceptor 4 player_tiedefender 0.2 0.4 0.5 1.5 25 30 200 300 150 0.93 mediumFighter 5 player_havoc 0.2 0.55 0.65 1.5 40 45 250 250 125 0.96 mediumFighter 4 player_twing 0.2 0.4 0.8 1.6 45 45 375 375 250 0.95 mediumfighter 4 -player_blacksun_heavy_vaksai 0.2 0.35 0.4 1.3 40 40 100 100 50 0.97 heavyfighter 4 +player_blacksun_vaksai_s02 0.2 0.35 0.4 1.3 40 40 100 100 50 0.97 heavyfighter 4 diff --git a/sku.0/sys.server/compiled/game/datatables/ship/shiptype.tab b/sku.0/sys.server/compiled/game/datatables/ship/shiptype.tab index 73bcdea1c..76ea132d9 100755 --- a/sku.0/sys.server/compiled/game/datatables/ship/shiptype.tab +++ b/sku.0/sys.server/compiled/game/datatables/ship/shiptype.tab @@ -620,4 +620,4 @@ nebulon_frigate 1.76 60000 50000 rct_generic 15000 15000 eng_generic 15000 15000 player_havoc 1.5 1643.2 10000 rct_generic 300 300 eng_incom_fusialthrust 300 300 46 18.3 16.9 32 53 32 53 32 53 shd_generic 300 300 1121 1121 9 300 300 3210 3210 6 arm_generic 400 400 arm_generic 400 400 cap_generic 1240 62.2 bst_generic 20 20 100 5 10 20 15 20 20 20 20 20 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_seinar_concussion_missile_s01 20 20 0.345 23.6 23.6 23.6 25 6 wpn_seinar_concussion_missile_s01 20 20 0.345 23.6 23.6 23.6 25 6 wpn_std_countermeasure 250 250 0.1 23.6 25 100 25 6 player_tiedefender 1.78 1765 10000 rct_generic 300 300 eng_novaldex_eventhorizon 300 300 60 33.7 40.1 32 71 32 71 32 71 shd_generic 300 300 1099 1099 8 300 300 2865 2865 8 arm_generic 500 500 arm_generic 500 500 cap_generic 920 56.2 bst_generic 20 20 100 5 10 20 15 20 20 20 20 20 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_seinar_concussion_missile_s01 20 20 0.345 23.6 23.6 23.6 25 6 wpn_std_countermeasure 250 250 0.1 23.6 25 100 player_twing 1.8 1650 10000 rct_generic 300 300 eng_incom_fusialthrust 100 100 46 12.2 15.67 28 77 46 71 53 82 shd_generic 400 500 980 980 5 400 500 400 500 5 arm_generic 200 200 arm_generic 200 200 cap_generic 512 32.1 bst_generic 20 20 100 5 10 20 15 20 20 20 20 20 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_generic 200 200 0.287 27.648 510 580 wpn_seinar_concussion_missile_s01 20 20 0.345 23.6 23.6 23.6 25 6 wpn_seinar_concussion_missile_s01 20 20 0.345 23.6 23.6 23.6 25 6 wpn_std_countermeasure 250 250 0.1 23.6 25 100 -player_blacksun_heavy_vaksai 1.81 519 10000 rct_generic 300 300 eng_incom_fusialthrust 100 100 55 16.8 8.4 34 61 34 61 34 61 shd_generic 400 500 300 500 5 400 500 400 500 5 arm_generic 300 300 arm_generic 300 300 cap_generic 571.2 35.36 bst_xwing_booster_s01 20 20 20 20 20 20 20 wpn_incom_disruptor 200 200 0.345 23.6 120 250 +player_blacksun_vaksai_s02 1.81 519 10000 rct_generic 300 300 eng_incom_fusialthrust 100 100 55 16.8 8.4 34 61 34 61 34 61 shd_generic 400 500 300 500 5 400 500 400 500 5 arm_generic 300 300 arm_generic 300 300 cap_generic 571.2 35.36 bst_xwing_booster_s01 20 20 20 20 20 20 20 wpn_incom_disruptor 200 200 0.345 23.6 120 250 diff --git a/sku.0/sys.server/compiled/game/datatables/space_combat/ship_droid_assignments.tab b/sku.0/sys.server/compiled/game/datatables/space_combat/ship_droid_assignments.tab index 2d9918cbb..aa0b7be37 100755 --- a/sku.0/sys.server/compiled/game/datatables/space_combat/ship_droid_assignments.tab +++ b/sku.0/sys.server/compiled/game/datatables/space_combat/ship_droid_assignments.tab @@ -59,4 +59,4 @@ player_yt2400.iff flight_computer player_tiedefender.iff flight_computer player_twing.iff astromech player_havoc.iff flight_computer -player_blacksun_heavy_vaksai.iff flight_computer +player_blacksun_vaksai_s02.iff flight_computer diff --git a/sku.0/sys.server/compiled/game/object/ship/player/player_blacksun_vaksai_s02.tpf b/sku.0/sys.server/compiled/game/object/ship/player/player_blacksun_vaksai_s02.tpf index 0d5e2e299..eaa13f8f2 100755 --- a/sku.0/sys.server/compiled/game/object/ship/player/player_blacksun_vaksai_s02.tpf +++ b/sku.0/sys.server/compiled/game/object/ship/player/player_blacksun_vaksai_s02.tpf @@ -2,7 +2,7 @@ @class ship_object_template 1 -shipType = "player_blacksun_heavy_vaksai" +shipType = "player_blacksun_vaksai_s02" @class tangible_object_template 4 diff --git a/sku.0/sys.server/compiled/game/script/library/space_create.java b/sku.0/sys.server/compiled/game/script/library/space_create.java index 6d7d8e5fb..a806ef93b 100755 --- a/sku.0/sys.server/compiled/game/script/library/space_create.java +++ b/sku.0/sys.server/compiled/game/script/library/space_create.java @@ -1,18 +1,8 @@ package script.library; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; -import script.vector; -import script.transform; -import script.library.hue; -import script.library.ship_ai; -import script.library.sui; +import java.util.Vector; public class space_create extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship.java b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship.java index d18c695bd..3b066aa18 100755 --- a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship.java +++ b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship.java @@ -1,24 +1,9 @@ package script.space.combat; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.library.*; -import script.library.space_combat; -import script.library.space_battlefield; -import script.library.space_crafting; -import script.library.pclib; -import script.library.space_utils; -import script.library.space_content; -import script.library.ship_ai; -import script.library.utils; -import script.library.space_transition; -import script.library.space_pilot_command; -import script.library.gcw; +import java.util.Vector; public class combat_ship extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/space/crafting/yt2400_deed.java b/sku.0/sys.server/compiled/game/script/space/crafting/yt2400_deed.java index 71f055cc5..503e951a2 100755 --- a/sku.0/sys.server/compiled/game/script/space/crafting/yt2400_deed.java +++ b/sku.0/sys.server/compiled/game/script/space/crafting/yt2400_deed.java @@ -1,18 +1,12 @@ package script.space.crafting; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.space_crafting; -import script.library.utils; -import script.library.create; import script.library.space_transition; -import script.library.space_utils; +import script.library.utils; +import script.menu_info; +import script.menu_info_types; +import script.obj_id; +import script.string_id; public class yt2400_deed extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java index 46c3acf77..b70553538 100755 --- a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java +++ b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java @@ -1,21 +1,7 @@ package script.space.ship_control_device; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.utils; -import script.library.space_transition; -import script.library.space_crafting; -import script.library.space_utils; -import script.library.space_combat; -import script.library.static_item; -import script.library.sui; -import script.library.player_structure; +import script.library.*; public class ship_control_device extends script.base_script { diff --git a/sku.0/sys.shared/compiled/game/object/intangible/ship/shared_blacksun_vaksai_s02_pcd.tpf b/sku.0/sys.shared/compiled/game/object/intangible/ship/shared_blacksun_vaksai_s02_pcd.tpf index 6c70fc03b..fcee6e8e0 100755 --- a/sku.0/sys.shared/compiled/game/object/intangible/ship/shared_blacksun_vaksai_s02_pcd.tpf +++ b/sku.0/sys.shared/compiled/game/object/intangible/ship/shared_blacksun_vaksai_s02_pcd.tpf @@ -2,9 +2,12 @@ @class intangible_object_template 0 -@class object_template 5 +@class object_template 10 objectName = "space_item_n" "blacksun_vaksai_s02_pcd" + detailedDescription = "space_item_n" "blacksun_vaksai_s02_pcd" -appearanceFilename = "appearance/black_sun_fighter_light_body_s01.apt" + +appearanceFilename = "appearance/black_sun_fighter_light_body_s02.apt" + clientDataFile = "clientData/ship/pcd/client_shared_blacksun_vaksai_s02_pcd.cdf"