IN WORK - Space GCW - Vendors added, ships semi added and other stuff.

2026-09-11 22:45:06 -04:00 · 2018-01-24 09:47:20 +00:00
parent f7c18db65f
commit cec80cc72c
41 changed files with 545 additions and 196 deletions
@@ -216,4 +216,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -15	0	object/tangible/ground_spawning/patrol_waypoint.iff	0	1612	96	1751	1	0	0	0	systems.spawning.patrol_point_setup	ignoreInBuildoutArray|0|1|pointName|4|cll8_work_path_3_7375869_0|registerWithController|0|1|$|
 -16	0	object/tangible/ground_spawning/patrol_waypoint.iff	0	1609	96	1718	1	0	0	0	systems.spawning.patrol_point_setup	ignoreInBuildoutArray|0|1|pointName|4|cll8_work_path_4_7375869_0|registerWithController|0|1|$|
 -17	0	object/tangible/ground_spawning/patrol_waypoint.iff	0	1642	96	1718	1	0	0	0	systems.spawning.patrol_point_setup	ignoreInBuildoutArray|0|1|pointName|4|cll8_work_path_5_7375869_0|registerWithController|0|1|$|
-18	0	object/tangible/spawning/static_npc/junk_dealer/junk_dealer_arms.iff	0	1654	96	1757	0	0	0	1		$|
+-18	0	object/tangible/ground_spawning/area_spawner.iff	0	1654	96	1757	0.118262	0	0.992982	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|0.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|rebel2_gcw2_vendor|strSpawnerType|4|area|strSpawns|4|rebel2_gcw2_vendor|$|
@@ -1142,3 +1142,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -1	0	object/tangible/poi/tatooine/explore_tal_imp_base.iff	0	1913	20	349	1	0	0	0		$|
 -2	0	object/tangible/poi/tatooine/explore_tal_imp_vs_reb_battle.iff	0	1644	39	1798	1	0	0	0		$|
 4845399	0	object/tangible/ground_spawning/mob_spawner.iff	0	1917	0	225	1	0	0	0		$|
+-3	0	object/tangible/ground_spawning/area_spawner.iff	0	1863.06	20	174.075	0.953956	0	0.299948	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|imperial_gcw2_vendor|strSpawnerType|4|area|strSpawns|4|imperial_gcw2_vendor|$|
@@ -4620,3 +4620,11 @@ item_heroic_tusken_shelves
 item_heroic_tusken_stairs											
 item_heroic_tusken_vent_pillar											
 item_tcg_loot_reward_series8_bespin_house_deed			"string:player_structure.deed.template=object/building/player/player_house_tcg_8_bespin_house.iff,int:player_structure.deed.buildtime=90"								
+item_schematic_gcw2_mandal_armor_plating			"string:loot_schematic.schematic=object/draft_schematic/space/armor/adv_mandal_armor_plating.iff,int:loot_schematic.uses=1,string:loot_schematic.skill_req=class_structures_phase4_novice"
+item_schematic_gcw2_mandal_fusion_reactor			"string:loot_schematic.schematic=object/draft_schematic/space/reactor/fusion_reactor_mandal.iff,int:loot_schematic.uses=1,string:loot_schematic.skill_req=class_structures_phase4_novice"
+item_schematic_gcw2_eng_reward_experimental			"string:loot_schematic.schematic=object/draft_schematic/space/engine/eng_reward_experimental.iff,int:loot_schematic.uses=1,string:loot_schematic.skill_req=class_structures_phase4_novice"
+item_schematic_gcw2_borstel_cannon			"string:loot_schematic.schematic=object/draft_schematic/space/weapon/wpn_borstel_experimental.iff,int:loot_schematic.uses=1,string:loot_schematic.skill_req=class_structures_phase4_novice"
+item_ship_deed_tiedefender			"int:loot_schematic.type=1,string:loot_schematic.skill_req=class_structures_phase4_novice,string:loot_schematic.schematic=object/draft_schematic/space/chassis/tiedefender.iff,int:loot_schematic.uses=1"
+item_ship_deed_twing			"int:loot_schematic.type=1,string:loot_schematic.skill_req=class_structures_phase4_novice,string:loot_schematic.schematic=object/draft_schematic/space/chassis/twing.iff,int:loot_schematic.uses=1"
+item_schematic_gcw2_vaksai_heavy			"int:loot_schematic.type=1,string:loot_schematic.skill_req=class_structures_phase4_novice,string:loot_schematic.schematic=object/draft_schematic/space/chassis/blacksun_heavy_vaksai.iff,int:loot_schematic.uses=1"
+item_ship_deed_havoc			"int:loot_schematic.type=1,string:loot_schematic.skill_req=class_structures_phase4_novice,string:loot_schematic.schematic=object/draft_schematic/space/chassis/havoc.iff,int:loot_schematic.uses=1"
@@ -8246,4 +8246,12 @@ item_heroic_tusken_vent_pillar	object/tangible/loot/npc_loot/heroic_tusken_vent_
 item_tcg_loot_reward_series8_bespin_house_deed	object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.iff							4		"item.special.nomove,item.structure_deed.player_structure_deed"			cloud city house	a cloud city house	
 sorosuub	object/tangible/space/veteran_reward/sorosuub_space_yacht_deed.iff		1					1		"item.special.nomove,space.veteran_reward.yacht_deed"			Schematic Deed: Sorosuub Luxury Yacht	This schematic will give the player a Sorosuub Luxury Yacht space ship.	
 item_imperial_station_token_01_01	object/tangible/gcw/gcw_imperial_token.iff	item						1		"object.autostack,item.special.nomove,item.heroic_token"	2	0	Imperial Station Battle Token	A token earned for your assistance during the galactic conflict.
-item_rebel_station_token_01_01	object/tangible/gcw/gcw_rebel_token.iff	item						1		"object.autostack,item.special.nomove,item.heroic_token"	2	0	Rebel Station Battle Token	A token earned for your assistance during the galactic conflict.
+item_rebel_station_token_01_01	object/tangible/gcw/gcw_rebel_token.iff	item						1		"object.autostack,item.special.nomove,item.heroic_token"	2	0	Rebel Station Battle Token	A token earned for your assistance during the galactic conflict.
+item_schematic_gcw2_mandal_armor_plating	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Mandal Motors Armor Plating	Schematic for Mandal Motors Armor Plating earned from participating in epic Space Battles.
+item_schematic_gcw2_mandal_fusion_reactor	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Mandal Motors Fusion Reactor	Schematic for Mandal Motors Fusion Reactor earned from participating in epic Space Battles.
+item_schematic_gcw2_eng_reward_experimental	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Experimental Starfighter Engine	Schematic for Experimental Starfighter Engine earned from participating in epic Space Battles.
+item_schematic_gcw2_borstel_cannon	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Experimental Borstel Cannon	Schematic for Experimental Borstel Cannon earned from participating in epic Space Battles.
+item_ship_deed_tiedefender	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Tie Defender Chassis	Schematic for Tie Defender Chassis earned from participating in epic Space Battles.
+item_ship_deed_twing	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for T-Wing Chassis	Schematic for T-Wing Chassis earned from participating in epic Space Battles.
+item_schematic_gcw2_vaksai_heavy	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Blacksun Heavy Vaksai Chassis	Schematic for Blacksun Heavy Vaksai Chassis earned from participating in epic Space Battles.
+item_ship_deed_havoc	object/tangible/loot/loot_schematic/generic_limited_use.iff							1		item.loot_schematic.loot_schematic		1	Schematic for Havoc Starfighter Chassis	Schematic for Havoc Starfighter Chassis earned from participating in epic Space Battles.
@@ -1,4 +1,10 @@
 item	cash	token0	token1	token2	token3	token4	class	script	note
 s[none]	i[0]	i[0]	i[0]	i[0]	i[0]	i[0]	i[0]	s	c
-item_event_ewok_berry_01_01		100					0		"See library.utils for the int value of the classes. 0 is ""all"" but will only show if there are no items for the opener's class."
-item_event_ewok_drink_01_01		100					0		"So in the case of this table only traders will see the ""all"" items."
+item_schematic_gcw2_mandal_armor_plating		100					0		"See library.utils for the int value of the classes. 0 is ""all"" but will only show if there are no items for the opener's class."
+item_schematic_gcw2_mandal_fusion_reactor		100					0		"So in the case of this table only traders will see the ""all"" items."
+item_schematic_gcw2_eng_reward_experimental		100					0
+item_schematic_gcw2_borstel_cannon		100					0
+item_ship_deed_tiedefender		300					0
+item_ship_deed_twing		300					0
+item_schematic_gcw2_vaksai_heavy		300					0
+item_ship_deed_havoc		300					0
@@ -6680,5 +6680,5 @@ nym_themepark_sulfur_pirate_henchmen_low	60	1	0	0	-1	NORMAL			lok	sulfur_lake_pi
 gcw_atst_familiar	1	0	0	0	0	NORMAL			global	imperial			atst_toy.iff	0.1	0.1	0					35	35	-1	100	100	0	0	100	2																									none																1								0			
 gcw_atxt_familiar	1	0	0	0	0	NORMAL			global	rebel			atxt_toy.iff	0.1	0.1	0					0	0	0	0	0	0	0	0	2																									none																1								0			
 naboo_vana_legacy_jeepfal_nareedo	25	0	0	0	0	NORMAL			global	thug	thug		thug_rodian_male			0					0	0	0	0	0	0	0	-1	2																npc/npc_1_10	generic_npc_1								npc											ai.thug		thug	slang			pirate_pistol_low_level		pirate_carbine_low_level				0	2			
-rebel_station_vendor	100	0	0	0	0	ELITE			anywhere	rebel	Rebel		dressed_rebel_recruiter_human_female_01.iff	1	1	0					0	0	0	0	0	0	0	-1	2												0	0												npc	1									string:item.vendor.vendor_table=space_gcw_stuff,string:item.token.type=item_rebel_station_token_01_01	npc.vendor.vendor,conversation.rebel_space_gcw_vendor,event.emperorsday.rebel_npc												0	0
-imperial_station_vendor	100	0	0	0	0	ELITE			anywhere	imperial	Imperial		dressed_imperial_officer_m.iff	1	1	0					0	0	0	0	0	0	0	-1	2												0	0												npc	1									string:item.vendor.vendor_table=space_gcw_stuff,string:item.token.type=item_imperial_station_token_01_01	npc.vendor.vendor,conversation.imperial_space_gcw_vendor,event.emperorsday.imperial_npc												0	0
+rebel2_gcw2_vendor	100	0	0	0	0	ELITE			anywhere	rebel	Rebel		dressed_rebel_recruiter_human_female_01.iff	1	1	0					0	0	0	0	0	0	0	-1	2												0	0												npc	1									string:item.vendor.vendor_table=space_gcw_stuff,string:item.token.type=item_rebel_station_token_01_01	npc.vendor.vendor,conversation.rebel_space_gcw_vendor												0	0
+imperial_gcw2_vendor	100	0	0	0	0	ELITE			anywhere	imperial	Imperial		dressed_imperial_officer_m.iff	1	1	0					0	0	0	0	0	0	0	-1	2												0	0												npc	1									string:item.vendor.vendor_table=space_gcw_stuff,string:item.token.type=item_imperial_station_token_01_01	npc.vendor.vendor,conversation.imperial_space_gcw_vendor												0	0
@@ -60,3 +60,6 @@ player_gunship_imperial	0.1	0.2	0.2	1.2	10	10	10	10	10	0.6	pob	5
 player_gunship_neutral	0.1	0.2	0.2	1.2	10	10	10	10	10	0.6	pob	5
 player_gunship_rebel	0.1	0.2	0.2	1.2	10	10	10	10	10	0.6	pob	5
 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
@@ -617,3 +617,6 @@ ixiyen_s03_tier10	1.8	14000	5000	rct_generic	8000	8000	eng_incom_fusialthrust	80
 yt1300_tier10	1.69	18000	5000	rct_generic	12000	12000	eng_incom_fusialthrust	12000	12000	200	80	60	80	80	80	80	80	80	shd_generic	5000	5000	35000	35000	200							arm_generic	18000	18000	arm_generic	18000	18000	cap_generic	5000	5000	5000	100	bst_generic	5000	5000	200	3	10	50	50													wpn_tieadvanced_blaster	5000	5000	0.5	1	2000	3000	0.7	0.7			wpn_tieadvanced_blaster	5000	5000	0.78	1	2000	3000	0.7	0.7			wpn_seinar_concussion_missile_s01	5000	5000	3	1	2500	3500	0.75	0.75	12	20	wpn_seinar_concussion_missile_s01	5000	5000	3	1	2500	3500	0.75	0.75	12	20																																													0
 imperial_lancer	1.76	60000	50000	rct_generic	15000	15000	eng_generic	15000	15000	32	8	8	3	3	3	3	3	3	shd_generic	10000	15000	60000	60000	1000	shd_generic	10000	15000	60000	60000	1000	arm_generic	50000	50000	arm_generic	50000	50000	cap_generic	10000	5000	2356.5	128.3		5000	20							5000	20	bdg_generic	15000	15000	hgr_generic	10000	10000	tst_generic	10000	10000																																																																																									
 nebulon_frigate	1.76	60000	50000	rct_generic	15000	15000	eng_generic	15000	15000	32	8	8	3	3	3	3	3	3	shd_generic	10000	15000	60000	60000	1000	shd_generic	10000	15000	60000	60000	1000	arm_generic	50000	50000	arm_generic	50000	50000	cap_generic	10000	5000	2356.5	128.3		5000	20							5000	20	bdg_generic	15000	15000	hgr_generic	10000	10000	tst_generic	10000	10000																																																																																									
+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_incom_disruptor	200	200	0.356	22.167	470	610					wpn_incom_disruptor	200	200	0.356	22.167	470	610					wpn_incom_disruptor	200	200	0.356	22.167	470	610					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		20	20	0.573	27.648	27.648	27.648						20	20	0.573	27.648	27.648	27.648
+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_tieadvanced_blaster	200	200	0.318	24.312	550	650					wpn_sienar_heatseeker_missile_s01	200	200	14.52	52.91	657	1210	0.9	0.76	24	3	wpn_std_countermeasure	250	250	0.1	23.6	25	100			25	6		20	20	0.573	27.648	27.648	27.648						20	20	0.573	27.648	27.648	27.648						20	20	0.573	27.648	27.648	27.648						20	20	0.573	27.648	27.648	27.648						20	20	0.345	23.6	23.6	23.6
+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_incom_disruptor	200	200	0.345	23.6	120	250					wpn_incom_disruptor	200	200	0.345	23.6	120	250
@@ -56,3 +56,6 @@ player_advanced_xwing.iff		astromech
 player_blacksun_vaksai.iff		flight_computer
 player_tieinterceptor_imperial_guard.iff		flight_computer
 player_yt2400.iff		flight_computer
+player_tiedefender.iff		flight_computer
+player_twing.iff		astromech
+player_havoc.iff		flight_computer
@@ -41,3 +41,6 @@ gunship_rebel	1000000	Rebel Gunship	pilot_rebel_navy_master
 gunship_neutral	1000000	Neutral Gunship	pilot_neutral_master
 gunship_imperial	1000000	Imperial Gunship	pilot_imperial_navy_master
 naboo_n1	75000	Naboo N-1	pilot_neutral_starships_04
+tiedefender	100000	TIE Defender	pilot_imperial_navy_master
+havoc	75000	Havoc Starfighter	pilot_neutral_starships_04
+twing	75000	T-Wing	pilot_rebel_navy_starships_04
@@ -1,4 +1,3 @@
-
@base object/ship/blacksun_light_s04.iff

@class ship_object_template 1
@@ -9,4 +8,4 @@ shipType = "player_blacksun_vaksai"

@class object_template 2

-sharedTemplate = "object/ship/player/shared_player_blacksun_vaksai.iff"
+sharedTemplate = "object/ship/player/shared_player_blacksun_vaksai.iff"
@@ -0,0 +1,13 @@
+
+@base object/ship/tiedefender.iff
+
+@class ship_object_template 1
+
+shipType = "player_tiedefender"
+
+@class tangible_object_template 0
+
+@class object_template 2
+
+sharedTemplate = "object/ship/player/shared_player_tiedefender.iff"
+
@@ -0,0 +1,13 @@
+
+@base object/ship/twing.iff
+
+@class ship_object_template 1
+
+shipType = "player_twing"
+
+@class tangible_object_template 0
+
+@class object_template 2
+
+sharedTemplate = "object/ship/player/shared_player_twing.iff"
+
@@ -0,0 +1,12 @@
+
+@base object/ship/base/base_fighter_ship.iff
+
+@class ship_object_template 1
+
+shipType = "tiedefender"
+
+@class tangible_object_template 0
+
+@class object_template 2
+
+sharedTemplate = "object/ship/shared_tiedefender.iff"
@@ -0,0 +1,12 @@
+
+@base object/ship/base/base_fighter_ship.iff
+
+@class ship_object_template 1
+
+shipType = "twing"
+
+@class tangible_object_template 0
+
+@class object_template 2
+
+sharedTemplate = "object/ship/shared_twing.iff"
@@ -0,0 +1,10 @@
+
+@base object/tangible/ship/components/chassis/base_chassis_token.iff
+
+@class tangible_object_template 2
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/components/chassis/shared_tiedefender_chassis_token.iff"
+
+objvars =+ ["shiptype" = "tiedefender"]
@@ -0,0 +1,10 @@
+
+@base object/tangible/ship/components/chassis/base_chassis_token.iff
+
+@class tangible_object_template 2
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/components/chassis/shared_twing_chassis_token.iff"
+
+objvars =+ ["shiptype" = "twing"]
@@ -0,0 +1,5 @@
+@base object/tangible/ship/components/base/ship_component_loot_base.iff
+@class tangible_object_template 1
+@class object_template 5
+sharedTemplate = "object/tangible/ship/components/reactor/shared_rct_mandal_fusion.iff"
+moveFlags = [ MF_player ]
@@ -0,0 +1,10 @@
+@base object/tangible/ship/crafted/armor/base_armor.iff
+
+@class tangible_object_template 1
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/crafted/armor/shared_adv_mandal_armor_plating.iff"
+
+moveFlags = [ MF_player ]
+
@@ -0,0 +1,10 @@
+@base object/tangible/ship/crafted/chassis/base_deed.iff
+
+@class tangible_object_template 1
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/crafted/chassis/shared_tiedefender_deed.iff"
+
+moveFlags = [ MF_player ]
+
@@ -0,0 +1,10 @@
+@base object/tangible/ship/crafted/chassis/base_deed.iff
+
+@class tangible_object_template 1
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/crafted/chassis/shared_twing_deed.iff"
+
+moveFlags = [ MF_player ]
+
@@ -0,0 +1,10 @@
+@base object/tangible/ship/crafted/reactor/base_reactor.iff
+
+@class tangible_object_template 1
+
+@class object_template 5
+
+sharedTemplate = "object/tangible/ship/crafted/reactor/shared_fusion_reactor_mandal.iff"
+
+moveFlags = [ MF_player ]
+
@@ -0,0 +1,11 @@
+
+
+@base object/tangible/ship/crafted/weapon/base_weapon.iff
+
+@class tangible_object_template 1
+
+@class object_template 8
+
+sharedTemplate = "object/tangible/ship/crafted/weapon/shared_wpn_borstel_experimental.iff"
+
+moveFlags = [ MF_player ]
@@ -12,14 +12,18 @@ public class imperial_space_gcw_vendor extends script.base_script
    public imperial_space_gcw_vendor()
    {
    }
-    public static String c_stringFile = "conversation/imperial_space_gcw_vendor";
+    public static String c_stringFile = "conversation/imperial_gcw2_vendor";
    private boolean defaultCondition() throws InterruptedException
    {
        return true;
    }
-    private boolean isImperial(obj_id player) throws InterruptedException
+    private boolean isRebel(obj_id player) throws InterruptedException
    {
-        return factions.isImperial(player);
+        return factions.isRebel(player);
+    }
+    private boolean isNeutral(obj_id player) throws InterruptedException
+    {
+        return factions.isNeutral(player);
    }
    private void showTokenVendorUI(obj_id player, obj_id npc) throws InterruptedException
    {
@@ -72,17 +76,24 @@ public class imperial_space_gcw_vendor extends script.base_script
        {
            return SCRIPT_OVERRIDE;
        }
-        if (isImperial(player))
+        if (isRebel(player))
        {
            doAnimationAction(self, "dismiss");
-            string_id message = new string_id(c_stringFile, "s_5");
+            string_id message = new string_id(c_stringFile, "s_4");
+            chat.chat(self, player, message);
+            return SCRIPT_CONTINUE;
+        }
+        if (isNeutral(player))
+        {
+            showTokenVendorUI(player, self);
+            string_id message = new string_id(c_stringFile, "s_7");
            chat.chat(self, player, message);
            return SCRIPT_CONTINUE;
        }
        if (defaultCondition())
        {
            showTokenVendorUI(player, self);
-            string_id message = new string_id(c_stringFile, "s_6");
+            string_id message = new string_id(c_stringFile, "s_8");
            chat.chat(self, player, message);
            return SCRIPT_CONTINUE;
        }
@@ -12,7 +12,7 @@ public class rebel_space_gcw_vendor extends script.base_script
    public rebel_space_gcw_vendor()
    {
    }
-    public static String c_stringFile = "conversation/rebel_space_gcw_vendor";
+    public static String c_stringFile = "conversation/rebel2_gcw2_vendor";
    private boolean defaultCondition() throws InterruptedException
    {
        return true;
@@ -21,6 +21,10 @@ public class rebel_space_gcw_vendor extends script.base_script
    {
        return factions.isImperial(player);
    }
+    private boolean isNeutral(obj_id player) throws InterruptedException
+    {
+        return factions.isNeutral(player);
+    }
    private void showTokenVendorUI(obj_id player, obj_id npc) throws InterruptedException
    {
        dictionary d = new dictionary();
@@ -75,14 +79,21 @@ public class rebel_space_gcw_vendor extends script.base_script
        if (isImperial(player))
        {
            doAnimationAction(self, "dismiss");
-            string_id message = new string_id(c_stringFile, "s_5");
+            string_id message = new string_id(c_stringFile, "s_4");
+            chat.chat(self, player, message);
+            return SCRIPT_CONTINUE;
+        }
+        if (isNeutral(player))
+        {
+            showTokenVendorUI(player, self);
+            string_id message = new string_id(c_stringFile, "s_7");
            chat.chat(self, player, message);
            return SCRIPT_CONTINUE;
        }
        if (defaultCondition())
        {
            showTokenVendorUI(player, self);
-            string_id message = new string_id(c_stringFile, "s_6");
+            string_id message = new string_id(c_stringFile, "s_8");
            chat.chat(self, player, message);
            return SCRIPT_CONTINUE;
        }
@@ -228,7 +228,26 @@ public class space_utils extends script.base_script
    public static boolean isShipPaintable(obj_id objShip) throws InterruptedException
    {
        String chassis = getShipChassisType(objShip);
-        if (chassis.equals("player_basic_tiefighter") || chassis.equals("player_decimator") || chassis.equals("player_tieadvanced") || chassis.equals("player_tieaggressor") || chassis.equals("player_tiebomber") || chassis.equals("player_tiefighter") || chassis.equals("player_tie_in") || chassis.equals("player_tieinterceptor") || chassis.equals("player_tie_light_duty") || chassis.equals("player_tieoppressor") || chassis.equals("player_gunship_imperial") || chassis.equals("player_gunship_rebel") || chassis.equals("player_gunship_neutral") || chassis.equals("player_vwing") || chassis.equals("player_naboo_n1"))
+        if (
+                chassis.equals("player_basic_tiefighter") ||
+                chassis.equals("player_decimator") ||
+                chassis.equals("player_tieadvanced") ||
+                chassis.equals("player_tieaggressor") ||
+                chassis.equals("player_tiebomber") ||
+                chassis.equals("player_tiefighter") ||
+                chassis.equals("player_tie_in") ||
+                chassis.equals("player_tieinterceptor") ||
+                chassis.equals("player_tie_light_duty") ||
+                chassis.equals("player_tieoppressor") ||
+                chassis.equals("player_gunship_imperial") ||
+                chassis.equals("player_gunship_rebel") ||
+                chassis.equals("player_gunship_neutral") ||
+                chassis.equals("player_vwing") ||
+                chassis.equals("player_naboo_n1") ||
+                chassis.equals("player_tiedefender") ||
+                chassis.equals("player_havoc") ||
+                chassis.equals("player_twing")
+            )
        {
            return false;
        }
@@ -237,7 +256,26 @@ public class space_utils extends script.base_script
    public static boolean isShipTextureable(obj_id objShip) throws InterruptedException
    {
        String chassis = getShipChassisType(objShip);
-        if (chassis.equals("player_basic_tiefighter") || chassis.equals("player_decimator") || chassis.equals("player_tieadvanced") || chassis.equals("player_tieaggressor") || chassis.equals("player_tiebomber") || chassis.equals("player_tiefighter") || chassis.equals("player_tie_in") || chassis.equals("player_tieinterceptor") || chassis.equals("player_tie_light_duty") || chassis.equals("player_tieoppressor") || chassis.equals("player_gunship_imperial") || chassis.equals("player_gunship_rebel") || chassis.equals("player_gunship_neutral") || chassis.equals("player_vwing") || chassis.equals("player_naboo_n1"))
+        if (
+                chassis.equals("player_basic_tiefighter") ||
+                chassis.equals("player_decimator") ||
+                chassis.equals("player_tieadvanced") ||
+                chassis.equals("player_tieaggressor") ||
+                chassis.equals("player_tiebomber") ||
+                chassis.equals("player_tiefighter") ||
+                chassis.equals("player_tie_in") ||
+                chassis.equals("player_tieinterceptor") ||
+                chassis.equals("player_tie_light_duty") ||
+                chassis.equals("player_tieoppressor") ||
+                chassis.equals("player_gunship_imperial") ||
+                chassis.equals("player_gunship_rebel") ||
+                chassis.equals("player_gunship_neutral") ||
+                chassis.equals("player_vwing") ||
+                chassis.equals("player_naboo_n1") ||
+                chassis.equals("player_tiedefender") ||
+                chassis.equals("player_havoc") ||
+                chassis.equals("player_twing")
+            )
        {
            return false;
        }
@@ -57,170 +57,72 @@ public class chassis_blueprints extends script.base_script
    public String getSkillRequiredForShip(obj_id deed) throws InterruptedException
    {
        String type = getStringObjVar(deed, "shiptype");
-        if (type == null)
-        {
-            return "";
+        switch(type){
+            case "z95":
+                return "@skl_n:pilot_rebel_navy_novice";
+            case "ywing":
+                return "@skl_n:pilot_rebel_navy_starships_01";
+            case "ywing_longprobe":
+                return "@skl_n:pilot_rebel_navy_starships_02";
+            case "xwing":
+                return "@skl_n:pilot_rebel_navy_starships_03";
+            case "awing":
+            case "twing":
+                return "@skl_n:pilot_rebel_navy_starships_04";
+            case "bwing":
+            case "yk137r":
+            case "gunship_rebel":
+                return "@skl_n:pilot_rebel_navy_master";
+            case "hutt_light_s01":
+            case "hutt_light_s02":
+                return "@skl_n:pilot_neutral_novice";
+            case "hutt_medium_s01":
+            case "hutt_medium_s02":
+                return "@skl_n:pilot_neutral_starships_01";
+            case "hutt_heavy_s01":
+            case "hutt_heavy_s02":
+            case "blacksun_light_s01":
+            case "blacksun_light_s02":
+            case "blacksun_light_s03":
+            case "blacksun_light_s04":
+                return "@skl_n:pilot_neutral_starships_02";
+            case "blacksun_medium_s01":
+            case "blacksun_medium_s02":
+            case "blacksun_medium_s03":
+            case "blacksun_medium_s04":
+                return "@skl_n:pilot_neutral_starships_03";
+            case "blacksun_heavy_s01":
+            case "blacksun_heavy_s02":
+            case "blacksun_heavy_s03":
+            case "blacksun_heavy_s04":
+            case "havoc":
+                return "@skl_n:pilot_neutral_starships_04";
+            case "yt1300":
+            case "hutt_turret_ship":
+            case "gunship_neutral":
+            case "blacksun_heavy_vaksai":
+                return "@skl_n:pilot_neutral_master";
+            case "tie_light_duty":
+                return "@skl_n:pilot_imperial_navy_novice";
+            case "tiefighter":
+                return "@skl_n:pilot_imperial_navy_starships_01";
+            case "ti_in":
+                return "@skl_n:pilot_imperial_navy_starships_02";
+            case "tieinterceptor":
+            case "tiebomber":
+                return "@skl_n:pilot_imperial_navy_starships_03";
+            case "tieadvanced":
+            case "tieaggressor":
+                return "@skl_n:pilot_imperial_navy_starships_04";
+            case "tieoppressor":
+            case "decimator":
+            case "gunship_imperial":
+            case "tiedefender":
+                return "@skl_n:pilot_imperial_navy_master";
+            case "firespray":
+                return "@space_crafting_n:all_master";
+            default:
+                return "";
        }
-        else if (type.equals("z95"))
-        {
-            return "@skl_n:pilot_rebel_navy_novice";
-        }
-        else if (type.equals("xwing"))
-        {
-            return "@skl_n:pilot_rebel_navy_starships_03";
-        }
-        else if (type.equals("hutt_light_s01"))
-        {
-            return "@skl_n:pilot_neutral_novice";
-        }
-        else if (type.equals("hutt_light_s02"))
-        {
-            return "@skl_n:pilot_neutral_novice";
-        }
-        else if (type.equals("tiefighter"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_01";
-        }
-        else if (type.equals("tieinterceptor"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_03";
-        }
-        else if (type.equals("tieadvanced"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_04";
-        }
-        else if (type.equals("tieaggressor"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_04";
-        }
-        else if (type.equals("tiebomber"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_03";
-        }
-        else if (type.equals("tieoppressor"))
-        {
-            return "@skl_n:pilot_imperial_navy_master";
-        }
-        else if (type.equals("awing"))
-        {
-            return "@skl_n:pilot_rebel_navy_starships_04";
-        }
-        else if (type.equals("bwing"))
-        {
-            return "@skl_n:pilot_rebel_navy_master";
-        }
-        else if (type.equals("ywing"))
-        {
-            return "@skl_n:pilot_rebel_navy_starships_01";
-        }
-        else if (type.equals("firespray"))
-        {
-            return "@space_crafting_n:all_master";
-        }
-        else if (type.equals("yt1300"))
-        {
-            return "@skl_n:pilot_neutral_master";
-        }
-        else if (type.equals("decimator"))
-        {
-            return "@skl_n:pilot_imperial_navy_master";
-        }
-        else if (type.equals("ykl37r"))
-        {
-            return "@skl_n:pilot_rebel_navy_master";
-        }
-        else if (type.equals("hutt_heavy_s01"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("hutt_heavy_s02"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("hutt_medium_s01"))
-        {
-            return "@skl_n:pilot_neutral_starships_01";
-        }
-        else if (type.equals("hutt_medium_s02"))
-        {
-            return "@skl_n:pilot_neutral_starships_01";
-        }
-        else if (type.equals("tie_in"))
-        {
-            return "@skl_n:pilot_imperial_navy_starships_02";
-        }
-        else if (type.equals("tie_light_duty"))
-        {
-            return "@skl_n:pilot_imperial_navy_novice";
-        }
-        else if (type.equals("ywing_longprobe"))
-        {
-            return "@skl_n:pilot_rebel_navy_starships_02";
-        }
-        else if (type.equals("blacksun_light_s01"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("blacksun_light_s02"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("blacksun_light_s03"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("blacksun_light_s04"))
-        {
-            return "@skl_n:pilot_neutral_starships_02";
-        }
-        else if (type.equals("blacksun_heavy_s01"))
-        {
-            return "@skl_n:pilot_neutral_starships_04";
-        }
-        else if (type.equals("blacksun_heavy_s02"))
-        {
-            return "@skl_n:pilot_neutral_starships_04";
-        }
-        else if (type.equals("blacksun_heavy_s03"))
-        {
-            return "@skl_n:pilot_neutral_starships_04";
-        }
-        else if (type.equals("blacksun_heavy_s04"))
-        {
-            return "@skl_n:pilot_neutral_starships_04";
-        }
-        else if (type.equals("blacksun_medium_s01"))
-        {
-            return "@skl_n:pilot_neutral_starships_03";
-        }
-        else if (type.equals("blacksun_medium_s02"))
-        {
-            return "@skl_n:pilot_neutral_starships_03";
-        }
-        else if (type.equals("blacksun_medium_s03"))
-        {
-            return "@skl_n:pilot_neutral_starships_03";
-        }
-        else if (type.equals("blacksun_medium_s04"))
-        {
-            return "@skl_n:pilot_neutral_starships_03";
-        }
-        else if (type.equals("hutt_turret_ship"))
-        {
-            return "@skl_n:pilot_neutral_master";
-        }
-        else if (type.equals("gunship_neutral"))
-        {
-            return "@skl_n:pilot_neutral_master";
-        }
-        else if (type.equals("gunship_imperial"))
-        {
-            return "@skl_n:pilot_imperial_navy_master";
-        }
-        else if (type.equals("gunship_rebel"))
-        {
-            return "@skl_n:pilot_rebel_navy_master";
-        }
-        return "";
    }
 }
@@ -270,7 +270,19 @@ public class customization_kit extends script.base_script
                    if (isIdValid(objShip))
                    {
                        String chassis = getShipChassisType(objShip);
-                        if (chassis.equals("player_basic_tiefighter") || chassis.equals("player_decimator") || chassis.equals("player_tieadvanced") || chassis.equals("player_tieaggressor") || chassis.equals("player_tiebomber") || chassis.equals("player_tiefighter") || chassis.equals("player_tie_in") || chassis.equals("player_tieinterceptor") || chassis.equals("player_tie_light_duty") || chassis.equals("player_tieoppressor"))
+                        if (
+                                chassis.equals("player_basic_tiefighter") ||
+                                chassis.equals("player_decimator") ||
+                                chassis.equals("player_tieadvanced") ||
+                                chassis.equals("player_tieaggressor") ||
+                                chassis.equals("player_tiebomber") ||
+                                chassis.equals("player_tiefighter") ||
+                                chassis.equals("player_tie_in") ||
+                                chassis.equals("player_tieinterceptor") ||
+                                chassis.equals("player_tie_light_duty") ||
+                                chassis.equals("player_tieoppressor") ||
+                                chassis.equals("player_tiedefender")
+                            )
                        {
                            string_id message = new string_id(STF, "imperial");
                            sendSystemMessage(player, message);
@@ -53,29 +53,26 @@ public class terminal_space extends script.terminal.base.base_terminal
        if (rgnCities == null || rgnCities.length == 0)
        {
            setName(self, "BUSTED TERMINAL! PUT ME IN A CITY!@!@!@!@");
+            return SCRIPT_CONTINUE;
        }
        else 
        {
-            for (int i = 0; i < rgnCities.length; i++)
-            {
-                region rgnTest = rgnCities[i];
+            for (region rgnTest : rgnCities) {
                strName = rgnTest.getName();
-                if (strName.startsWith("@"))
-                {
+                if (strName.startsWith("@")) {
                    string_id strTest = utils.unpackString(strName);
                    strName = strTest.getAsciiId();
                    dctTeleportInfo = dataTableGetRow(strFileName, strName);
-                    if (dctTeleportInfo != null)
-                    {
+                    if (dctTeleportInfo != null) {
                        break;
                    }
                }
            }
-        }
-        if (dctTeleportInfo == null)
-        {
-            setName(self, "NO ENTRY FOR " + strName + " in teleport datable. Busted terminal");
-            return SCRIPT_CONTINUE;
+            if (dctTeleportInfo == null)
+            {
+                setName(self, "NO ENTRY FOR " + strName + " in teleport datatable. Busted terminal");
+                return SCRIPT_CONTINUE;
+            }
        }
        utils.setScriptVar(self, "space.loc.space", new location(dctTeleportInfo.getFloat("spaceX"), dctTeleportInfo.getFloat("spaceY"), dctTeleportInfo.getFloat("spaceZ"), dctTeleportInfo.getString("spaceScene")));
        utils.setScriptVar(self, "space.locationName", "w" + dctTeleportInfo.getInt("spaceLocationIndex"));
@@ -0,0 +1,23 @@
+
+@base object/ship/shared_blacksun_light_s04.iff
+
+@class ship_object_template 3
+
+cockpitFilename = "cockpit/blacksun_light.iff"
+playerControlled = true
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_starships_blacksunheavyvaksai"]
+
+@class object_template 7
+
+objectName = "space_ship" "player_blacksun_vaksai_s02"
+lookAtText = "space_ship" "player_blacksun_vaksai_s02"
+
+containerType = CT_slotted
+slotDescriptorFilename = "abstract/slot/descriptor/ship_single_seat.iff"
+
+appearanceFilename = "appearance/black_sun_fighter_light_body_s02.apt"
+
+clientDataFile = "clientData/ship/client_shared_blacksun_vaksai_s02.cdf"
@@ -0,0 +1,19 @@
+
+@base object/ship/shared_tiedefender.iff
+
+@class ship_object_template 3
+
+cockpitFilename = "cockpit/tiefighter.iff"
+playerControlled = true
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_starships_tiedefender"]
+
+@class object_template 7
+
+objectName = "space_ship" "player_tie_defender"
+lookAtText = "space_ship" "player_tie_defender"
+containerType = CT_slotted
+slotDescriptorFilename = "abstract/slot/descriptor/ship_single_seat.iff"
+
@@ -0,0 +1,19 @@
+
+@base object/ship/shared_twing.iff
+
+@class ship_object_template 3
+
+cockpitFilename = "cockpit/xwing.iff"
+playerControlled = true
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_starships_twing"]
+
+@class object_template 7
+
+objectName = "space_ship" "player_twing"
+lookAtText = "space_ship" "player_twing"
+
+containerType = CT_slotted
+slotDescriptorFilename = "abstract/slot/descriptor/ship_single_seat.iff"
@@ -0,0 +1,17 @@
+
+@base object/ship/base/shared_ship_fighter_base.iff
+
+@class ship_object_template 2
+
+@class tangible_object_template 0
+
+@class object_template 7
+
+objectName = "" "tiedefender_n"
+detailedDescription = ""  "tiedefender_d"
+lookAtText = ""  "xwing swg-se test"
+
+appearanceFilename = "appearance/tie_defender.apt"
+
+clientDataFile = "clientData/ship/client_shared_tiedefender.cdf"
+
@@ -0,0 +1,17 @@
+
+@base object/ship/base/shared_ship_fighter_base.iff
+
+@class ship_object_template 2
+
+@class tangible_object_template 0
+
+@class object_template 7
+
+objectName = "" "twing_n"
+detailedDescription = ""  "twing_d"
+lookAtText = ""  "xwing swg-se test"
+
+appearanceFilename = "appearance/twing_body.apt"
+
+clientDataFile = "clientData/ship/client_shared_twing.cdf"
+
@@ -0,0 +1,19 @@
+//            Classification:             Null
+//
+
+@base object/tangible/ship/components/chassis/shared_base_chassis_token.iff
+
+@class tangible_object_template 4
+
+
+@class object_template 7
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "player_blacksun_vaksai_s02_chassis_token"
+detailedDescription = "space_crafting_d" "player_blacksun_vaksai_s02_chassis_token"
+containerType = CT_none
+appearanceFilename = "appearance/eqp_chassis_blueprints.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+gameObjectType = GOT_ship_component_chassis
@@ -0,0 +1,19 @@
+//            Classification:             Null
+//
+
+@base object/tangible/ship/components/chassis/shared_base_chassis_token.iff
+
+@class tangible_object_template 4
+
+
+@class object_template 7
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "twing_chassis_token"
+detailedDescription = "space_crafting_d" "twing_chassis_token"
+containerType = CT_none
+appearanceFilename = "appearance/eqp_chassis_blueprints.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+gameObjectType = GOT_ship_component_chassis
@@ -0,0 +1,25 @@
+
+//            Classification:             Null
+//
+
+@base object/tangible/ship/components/base/shared_ship_component_base.iff
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_ordnance_level7"]
+
+@class object_template 7
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "adv_mandal_armor_plating"
+detailedDescription = "space_crafting_d" "adv_mandal_armor_plating"
+containerType = CT_none
+appearanceFilename = "appearance/ship_component_armor_s01.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+
+
+
+
+gameObjectType = GOT_ship_component_armor
@@ -0,0 +1,16 @@
+@base object/tangible/ship/crafted/chassis/shared_base_deed.iff
+
+@class tangible_object_template 4
+
+
+@class object_template 7
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "twing_deed"
+detailedDescription = "space_crafting_d" "twing_deed"
+containerType = CT_none
+appearanceFilename = "appearance/eqp_comp_chassis_deed.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+
@@ -0,0 +1,21 @@
+
+//            Classification:             Null
+//
+
+@base object/tangible/ship/components/base/shared_ship_component_base.iff
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_ordnance_level9"]
+
+@class object_template 7
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "fusion_reactor_mandal"
+detailedDescription = "space_crafting_d" "fusion_reactor_mandal"
+containerType = CT_none
+appearanceFilename = "appearance/ship_component_reactor_s01.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+gameObjectType = GOT_ship_component_reactor
@@ -0,0 +1,23 @@
+//------------------------------------------------------------
+// WEAPON LOOT OBJECT: Incom Long-range Disruptor Cannon
+//------------------------------------------------------------
+// Shared Object template created 02/10/2004
+// Cbarnes
+
+@base object/tangible/ship/crafted/weapon/shared_base_weapon.iff
+
+@class tangible_object_template 8
+
+certificationsRequired = ["cert_ordnance_level8"]
+
+@class object_template 8
+clearFloraRadius = 0
+
+objectName = "space_crafting_n" "wpn_borstel_experimental"
+detailedDescription = "space_crafting_d" "wpn_borstel_experimental"
+containerType = CT_none
+appearanceFilename = "appearance/ship_component_weapon_s02.apt"
+portalLayoutFilename = ""
+clientDataFile = ""
+
+gameObjectType = GOT_ship_component_weapon