From 2ce323a6e8f0f32c5bffe39b9b76d2334a5e8515 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Mon, 10 Nov 2014 19:53:25 -0800
Subject: [PATCH 01/25] Added City Waypoint.  This now allows the Invasion
 Countdown Timer to Display.

---
 .../compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab     | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab
old mode 100644
new mode 100755
index 13baeeb32..275ee2141
--- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_5_6_ws.tab
@@ -1255,3 +1255,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 4085429	0	object/static/item/item_armor_bone_chestplate.iff	0	1892.3	12	724.25	-3.20E-08	0	1	0		$|
 4085430	0	object/static/item/item_armor_chitin_chestplate.iff	0	1893.31	12	724.25	-3.20E-08	0	1	0		$|
 4085431	0	object/static/item/item_armor_composite_chestplate.iff	0	1894.16	12	724.255	-3.20E-08	0	1	0		$|
+9865353	0	object/tangible/planet_map_location/city.iff	0	1434.6715	13	723.1726	-3.20E-08	0	1	0		$|

From 9536b151ca8952b4bd1a77a46fd85d9a74632392 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Mon, 10 Nov 2014 19:53:51 -0800
Subject: [PATCH 02/25] Added City Waypoint.  This now allows the Invasion
 Countdown Timer to Display.

---
 .../compiled/game/datatables/buildout/talus/talus_5_3_ws.tab     | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_5_3_ws.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_5_3_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_5_3_ws.tab
old mode 100644
new mode 100755
index f8cf57ec5..f84e0c27d
--- a/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_5_3_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_5_3_ws.tab
@@ -1060,3 +1060,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 9025621	0	object/static/structure/talus/talus_imprv_flagpole_s01.iff	0	701.491	20.1069	961.097	1	0	0	0		$|
 9025622	0	object/static/structure/talus/talus_imprv_flagpole_s01.iff	0	669.022	20.1069	960.787	1	0	0	0		$|
 9645427	0	object/static/structure/tatooine/wall_archway_tatooine_large_style_01.iff	0	1467.44	23.0069	1423.43	-0.60582	0	0.795602	0		$|
+9805353	0	object/tangible/planet_map_location/city.iff	0	329.7967	6	1165.197	-0.60582	0	0.795602	0		$|

From fe6fce2085f209ab387db15a41a72b3f4fbfea09 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:47:13 -0800
Subject: [PATCH 03/25] *Added Bestine Election Spawners and Variables.  The
 Bestine Election should now properly work. *Added Bestine Museum Spawners and
 Variables.  The Bestine Museum should now properly work. *Added Map Location
 for Bestine Museum *Added Map Location for small Bestine Cantina and attached
 appropriate Variables *Added Spawner for University Election Spawn and
 University Informant Spawn *Added Spawner for Housemaid Election Spawn *Added
 Bestine Marketplace Spawner for Bestine Elections *Added City Waypoint.  This
 now allows the Invasion Countdown Timer to Display. *Added appropriate
 Variables to allow for healing and safeLogout in main Cantina. *Added various
 spawner scripts for misc. NPCs. *Added Map Location for Bestine Salon

---
 .../buildout/tatooine/tatooine_4_3_ws.tab     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3_ws.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3_ws.tab
old mode 100644
new mode 100755
index eb65fba11..1a4ef0ca9
--- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3_ws.tab
@@ -69,11 +69,11 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 683522	0	object/tangible/crafting/station/public_food_station.iff	0	918.003	12	524.696	0.941076	0	0.338196	0		$|
 683528	0	object/static/structure/tatooine/pillar_pristine_large_style_01.iff	0	746.647	12	396.404	-0.693114	0	0.720829	0		$|
 683529	0	object/static/structure/tatooine/pillar_pristine_small_style_01.iff	0	747.647	12	396.442	-0.693114	0	0.720829	0		$|
-926472	0	object/building/tatooine/capitol_tatooine.iff	0	888.05	12	505.266	0.432613	0	0.90158	0		$|
+926472	0	object/building/tatooine/capitol_tatooine.iff	0	888.05	12	505.266	0.432613	0	0.90158	0	city.bestine.politician_event_grandparent:theme_park.dungeon.generic_spawner	bestine.tatooineCapitolObjId|0|926472|spawn_table|4|datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.iff|$|
 1026824	0	object/building/tatooine/starport_tatooine.iff	0	671.846	12	519.774	0.646043	0	0.763301	0	structure.municipal.starport:theme_park.dungeon.generic_spawner	travel.air_time|0|60|travel.cost|0|150|travel.ground_time|0|300|travel.point_name|4|Bestine Starport|travel.shuttle_available|0|1|travel.version|0|3|spawn_table|4|datatables/spawning/building_spawns/bestine_starport.iff|$|
 1027887	0	object/building/tatooine/housing_tatt_style01_small.iff	0	674.808	26	226.958	0.813878	0	0.581036	0		$|
 1027931	0	object/building/tatooine/housing_tatt_style01_small.iff	0	695.312	26	233.743	-0.592536	0	0.805544	0		$|
-1028167	0	object/building/tatooine/housing_tatt_style01_large.iff	0	944.493	12	424.633	0.937647	0	0.34759	0		$|
+1028167	0	object/building/tatooine/housing_tatt_style01_large.iff	0	944.493	12	424.633	0.937647	0	0.34759	0	planet_map.map_loc:city.bestine.museum_event_grandparent:theme_park.dungeon.generic_spawner	planetMap.category|4|museum|spawn_table|4|datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.iff|$|
 1028202	0	object/building/tatooine/filler_building_tatt_style01_02.iff	0	989.794	12	452.072	0.4008	0	0.916166	0		$|
 1028208	0	object/building/tatooine/filler_building_tatt_style01_05.iff	0	976	12	376	0.947651	0	0.319309	0		$|
 1028233	0	object/building/tatooine/filler_building_tatt_style01_08.iff	0	1010.83	12	354.758	0.993395	0	-0.114747	0		$|
@@ -89,12 +89,12 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1028455	0	object/building/tatooine/housing_tatt_style01_small.iff	0	1061.82	10	532.696	0.999058	0	-0.0433937	0		$|
 1028466	0	object/building/tatooine/housing_tatt_style01_small.iff	0	1077.38	10	539.96	0.91973	0	-0.392552	0		$|
 1028477	0	object/building/tatooine/housing_tatt_style01_small.iff	0	1046.7	10	533.821	0.999135	0	0.0415801	0		$|
-1028489	0	object/building/tatooine/housing_tatt_style01_med.iff	0	1049.11	10	560.029	-0.0142038	0	0.999899	0		$|
+1028489	0	object/building/tatooine/housing_tatt_style01_med.iff	0	1049.11	10	560.029	-0.0142038	0	0.999899	0	planet_map.map_loc	planetMap.category|4|cantina|healing.canhealshock|0|1|safeLogout|0|1|$|
 1028544	0	object/building/tatooine/guild_combat_tatooine_style_01.iff	0	798.621	12	503.067	0.94441	0	0.328769	0		$|
-1028554	0	object/building/tatooine/guild_commerce_tatooine_style_01.iff	0	871.565	12	594.342	-0.328017	0	0.944672	0		$|
+1028554	0	object/building/tatooine/guild_commerce_tatooine_style_01.iff	0	871.565	12	594.342	-0.328017	0	0.944672	0	theme_park.tatooine.bestine.bestine_sean_questn_university_spawner	$|
 1028574	0	object/building/tatooine/guild_university_tatooine_style_01.iff	0	793.718	12	581.644	0.431176	0	0.902268	0		$|
 1028590	0	object/building/tatooine/association_hall_civilian_tatooine.iff	0	928.921	12	569.878	-0.329522	0	0.944148	0		$|
-1028644	0	object/building/tatooine/cantina_tatooine.iff	0	643.74	12	427.231	0.986156	0	0.165823	0	structure.municipal.cantina:event.bh_event.cantina_controller:theme_park.dungeon.generic_spawner	spawn_table|4|datatables/spawning/clone_relic/ep3_bestine_cantina.iff|$|
+1028644	0	object/building/tatooine/cantina_tatooine.iff	0	643.74	12	427.231	0.986156	0	0.165823	0	structure.municipal.cantina:event.bh_event.cantina_controller:theme_park.dungeon.generic_spawner	spawn_table|4|datatables/spawning/clone_relic/ep3_bestine_cantina.iff|healing.canhealshock|0|1|safeLogout|0|1|$|
 1033371	0	object/tangible/terminal/terminal_mission_bounty.iff	0	602.784	12	438.2	-0.475382	0	0.879779	0		$|
 1033373	0	object/tangible/terminal/terminal_mission_bounty.iff	0	601.938	12	435.492	0.953847	0	-0.300293	0		$|
 1153330	0	object/static/structure/tatooine/wall_gate_tatooine_style_03.iff	0	1030.63	12	357.229	0.995953	0	0.0898786	0		$|
@@ -519,7 +519,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1278956	0	object/building/tatooine/housing_tatt_style01_small.iff	0	700.178	26	220.495	-0.592535	0	0.805544	0		$|
 1278967	0	object/static/structure/tatooine/beam_tatooine_overhead_style_02.iff	0	691.087	26	213.639	0.148651	0	0.98889	0		$|
 1278968	0	object/building/tatooine/housing_tatt_style01_small.iff	0	679.673	26	213.71	0.81388	0	0.581033	0		$|
-1278979	0	object/building/tatooine/housing_tatt_style01_small.iff	0	709.399	26	206.143	-0.592536	0	0.805544	0		$|
+1278979	0	object/building/tatooine/housing_tatt_style01_small.iff	0	709.399	26	206.143	-0.592536	0	0.805544	0	theme_park.tatooine.bestine.bestine_farious_gletch_spawner	$|
 1278990	0	object/static/structure/tatooine/beam_tatooine_overhead_style_02.iff	0	700.304	26	199.273	0.988012	0	-0.15438	0		$|
 1278991	0	object/building/tatooine/housing_tatt_style01_small.iff	0	688.895	26	199.357	0.81388	0	0.581033	0		$|
 1279012	0	object/static/structure/tatooine/wall_pristine_tatooine_small_style_01.iff	0	710.426	25.0872	219.97	0.805072	0	0.593178	0		$|
@@ -542,7 +542,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1279857	0	object/static/structure/tatooine/wall_pristine_tatooine_small_style_01.iff	0	690.631	26	192.392	0.998988	0	0.044985	0		$|
 1279865	0	object/static/structure/tatooine/debris_tatt_pipe_narrow_2.iff	0	682.506	26	206.115	0.453597	0	0.891207	0		$|
 1279916	0	object/building/military/military_outpost_guard_tower_1.iff	0	889.281	98	181.347	1	0	0	0		$|
-1279918	0	object/building/military/military_base_shed_imperial_style_01.iff	0	913.675	98	185.441	1	0	0	0		$|
+1279918	0	object/building/military/military_base_shed_imperial_style_01.iff	0	913.675	98	185.441	1	0	0	0	theme_park.tatooine.bestine.bestine_pfilbee_jhorn_spawner	$|
 1279925	0	object/building/military/military_outpost_guard_tower_1.iff	0	922.491	98	202.145	0.00579658	0	0.999983	0		$|
 1279939	0	object/static/structure/military/military_wall_strong_imperial_style_01.iff	0	890.421	97.9377	201.164	-0.703847	0	0.710351	0		$|
 1279940	0	object/static/structure/military/military_wall_strong_imperial_style_01.iff	0	890.505	98.0263	190.917	-0.703845	0	0.710354	0		$|
@@ -708,7 +708,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1404942	0	object/static/worldbuilding/sign/thm_sign_starport.iff	0	753.588	12	498.737	0.996802	0	0.0799147	0		$|
 1407923	0	object/static/structure/tatooine/pillar_pristine_large_style_01.iff	0	911.823	12	435.982	0.932328	0	0.361615	0		$|
 1414855	0	object/static/structure/tatooine/pillar_damaged_large_style_01.iff	0	1027.88	12	344.848	0.981048	0	0.193766	0		$|
-1528395	0	object/building/tatooine/housing_tatt_style01_med.iff	0	972.689	12	467.531	0.422132	0	0.906534	0		$|
+1528395	0	object/building/tatooine/housing_tatt_style01_med.iff	0	972.689	12	467.531	0.422132	0	0.906534	0	theme_park.tatooine.bestine.bestine_sean_questp_house_spawner	$|
 1631313	0	object/static/worldbuilding/sign/thm_sign_bank.iff	0	756.716	12	443.053	0.959662	0	0.281157	0		$|
 1631505	0	object/static/worldbuilding/sign/thm_sign_cantina.iff	0	586.721	12	424.335	0.985585	0	0.169182	0		$|
 1631508	0	object/static/worldbuilding/sign/thm_sign_cantina.iff	0	692.617	12	409.922	0.974794	0	0.223106	0		$|
@@ -872,7 +872,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 5565566	0	object/static/creature/tatooine_jawa.iff	0	946.019	12	390.485	0.949235	0	-0.314567	0		$|
 6016470	0	object/static/structure/tatooine/pillar_damaged_large_style_01.iff	0	772.725	12	611.971	0.9998	0	-0.0199986	0		$|
 6016471	0	object/static/structure/tatooine/pillar_damaged_large_style_01.iff	0	763.624	12	611.774	-0.696706	0	0.717356	0		$|
-6016767	0	object/tangible/furniture/modern/rug_rect_sml_s01.iff	0	931.166	12	409.331	0.808028	0	0.589144	0		$|
+6016767	0	object/tangible/furniture/modern/rug_rect_sml_s01.iff	0	931.166	12	409.331	0.808028	0	0.589144	0	city.bestine.marketplace_grandparent	$|
 6016769	0	object/static/structure/tatooine/jawa/tent_jawa_01_small.iff	0	931.071	12.0316	409.41	0.949235	0	0.314567	0		$|
 6016770	0	object/static/item/item_basket_shallow.iff	0	931.25	12.0316	411.522	1	0	0	0		$|
 6016771	0	object/static/item/item_bread_loaf.iff	0	931.421	12.0949	411.646	1	0	0	0		$|
@@ -886,7 +886,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 6076112	0	object/tangible/terminal/terminal_mission.iff	0	752.37	12	490.847	0.656219	0	0.754571	0		$|
 6595463	0	object/building/tatooine/shuttleport_tatooine.iff	0	969.396	12	530.27	0.998488	0	0.0549775	0	structure.municipal.starport:planet_map.map_loc	travel.cost|0|200|travel.ground_time|0|300|travel.is_shuttleport|0|1|travel.point_name|4|Bestine Shuttleport|travel.shuttle_available|0|1|travel.version|0|3|$|
 6714210	0	object/static/structure/tatooine/wall_gate_tatooine_wide_style_01.iff	0	738.661	12.0252	395.766	0.717911	0	0.696135	0		$|
-7265850	0	object/building/tatooine/salon_tatooine.iff	0	606.2	12.2702	396.435	-0.364131	0	0.931348	0		$|
+7265850	0	object/building/tatooine/salon_tatooine.iff	0	606.2	12.2702	396.435	-0.364131	0	0.931348	0	planet_map.map_loc	planetMap.category|4|salon|$|
 8216221	0	object/static/structure/general/banner_imperial_style_01.iff	0	918.451	12	435.475	0.914025	0	-0.405658	0		$|
 8216222	0	object/static/item/item_tech_console_sectional_b.iff	0	915.752	12	432.587	0.694768	0	0.719234	0		$|
 8885452	0	object/static/structure/tatooine/tato_imprv_flagpole_s01.iff	0	849.706	38.5502	424.14	1	0	0	0		$|
@@ -935,5 +935,6 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1250339	0	object/static/structure/general/droid_r3_head.iff	0	934.474	12	387.194	1	0	0	0		$|
 1250340	0	object/static/structure/general/droid_r4_leg.iff	0	930.458	12	384.91	1	0	0	0		$|
 3455378	0	object/static/structure/general/droid_r5_head.iff	0	1022.75	10	533.756	0.999392	-0.00489905	0.00331686	0.0343579		$|
-4005381	0	object/building/tatooine/hospital_tatooine_style02.iff	0	730.353	12	606.375	0.462485	0	0.886627	0		$|
+4005381	0	object/building/tatooine/hospital_tatooine_style02.iff	0	730.353	12	606.375	0.462485	0	0.886627	0	theme_park.tatooine.bestine.bestine_melios_purl_spawner	$|
 9755355	0	object/static/structure/general/droid_r5_head.iff	0	735.788	11.3043	478.064	0.958244	-0.28594	0.00252087	8.83E-05		$|
+9835358	0	object/tangible/planet_map_location/city.iff	0	755.4132	12	505.9001	0.958244	-0.28594	0.00252087	8.83E-05		$|

From 7051ff995b6431c2ebfeb0382b323becf61c9ef4 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:48:00 -0800
Subject: [PATCH 04/25] *Changed format of buildout table *Added Spawners for
 SafetyGiver Quest

---
 .../game/datatables/buildout/tatooine/tatooine_5_3.tab    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_3.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_3.tab
index 9f5882a67..850df5ddd 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_3.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_3.tab
@@ -1,3 +1,5 @@
-server_template_crc	cell_index	px	py	pz	qw	qx	qy	qz	scripts	objvars
-h	i	f	f	f	f	f	f	f	s	p
-object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff	0	0	0	0	0	0	0	0		$|
+objid	container	server_template_crc	cell_index	px	py	pz	qw	qx	qy	qz	scripts	objvars
+i	i	h	i	f	f	f	f	f	f	f	s	p
+7125597	0	object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff	0	0	0	0	0	0	0	0		$|
+7125595	0	object/tangible/ground_spawning/area_spawner.iff	0	1145.00	150.2	175.7	0	0	0	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|300.000000|fltMinSpawnTime|2|299.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|12|intSpawnSystem|0|1|registerWithController|0|1|strName|4|brigand_camp_1|strSpawnerType|4|area|strSpawns|4|brigand|$|
+7125598	0	object/tangible/ground_spawning/area_spawner.iff	0	1002.0	187.8	1077	0.992844	0.00050183	-0.119417	0.00032958	systems.spawning.spawner_area	fltMaxSpawnTime|2|600.000000|fltMinSpawnTime|2|299.000000|fltRadius|2|2.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|32|intSpawnSystem|0|1|registerWithController|0|1|strName|4|brigand_camp_2|strSpawnerType|4|area|strSpawns|4|brigand|$|

From ba82c1c9008fc47b2335f508f7bb7e09d312c483 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:48:12 -0800
Subject: [PATCH 05/25] *Added Spawners for SafetyGiver Quest

---
 .../compiled/game/datatables/buildout/tatooine/tatooine_5_4.tab | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_4.tab
index d07626957..9b13af9eb 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_4.tab
@@ -33,3 +33,5 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 7125587	7125559	object/cell/cell.iff	28	0	0	0	1	0	0	0		$|
 7125588	7125559	object/cell/cell.iff	29	0	0	0	1	0	0	0		$|
 -1648725923	0	object/building/faction_perk/hq/planet_base_register.iff	0	1.10811	195	2039.25	1	0	0	0	faction_perk.hq.planetary_base_register	$|
+7125590	0	object/tangible/ground_spawning/area_spawner.iff	0	1500.0	180.0	48.0	0.992844	0.00050183	-0.119417	0.00032958	systems.spawning.spawner_area	fltMaxSpawnTime|2|900.000000|fltMinSpawnTime|2|600.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|brigand_leader|strSpawnerType|4|area|strSpawns|4|brigand_leader|$|
+7125594	0	object/tangible/ground_spawning/area_spawner.iff	0	1503.0	180.0	48.0	0.992844	0.00050183	-0.119417	0.00032958	systems.spawning.spawner_area	fltMaxSpawnTime|2|900.000000|fltMinSpawnTime|2|600.000000|fltRadius|2|3.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|brigand_camp_3|strSpawnerType|4|area|strSpawns|4|brigand|$|

From 43b770ffd06b037aeb00093d1e9b08e6d0166d49 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:48:36 -0800
Subject: [PATCH 06/25] *Added Spawner for Bestine Election Smuggler Spawner

---
 .../spawning/clone_relic/ep3_bestine_cantina.tab         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/datatables/spawning/clone_relic/ep3_bestine_cantina.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/clone_relic/ep3_bestine_cantina.tab b/sku.0/sys.server/compiled/game/datatables/spawning/clone_relic/ep3_bestine_cantina.tab
old mode 100644
new mode 100755
index 4370a675f..54fa09741
--- a/sku.0/sys.server/compiled/game/datatables/spawning/clone_relic/ep3_bestine_cantina.tab
+++ b/sku.0/sys.server/compiled/game/datatables/spawning/clone_relic/ep3_bestine_cantina.tab
@@ -1,4 +1,5 @@
-spawns	name	room	loc_x	loc_y	loc_z	yaw	script	mood	animation_mood	respawn_time	spawn_objvar	special_room	special_room_script	room_objvar	room_objvar_name	room_objvar_value
-s	s	s	f	f	f	f	s	s	s	i	s	s	s	s	s	s
-clone_relics_qakkee		cantina	3	-0.9	5.7	176			npc_standing_drinking	10						
-bounty_guild_bounty_check_rep		cantina	4.2	-0.9	-4.8	-5			npc_standing_drinking	10						
+spawns	name	room	loc_x	loc_y	loc_z	yaw	script	mood	animation_mood	respawn_time	spawn_objvar	special_room	special_room_script	room_objvar	room_objvar_name	room_objvar_value
+s	s	s	f	f	f	f	s	s	s	i	s	s	s	s	s	s
+clone_relics_qakkee		cantina	3	-0.9	5.7	176			npc_standing_drinking	10						
+bounty_guild_bounty_check_rep		cantina	4.2	-0.9	-4.8	-5			npc_standing_drinking	10						
+object/tangible/ground_spawning/area_spawner.iff	Smuggler Spawner	alcove4	3.1	-0.9	22.6	-179	city.bestine.politician_event_spawner			10	"string:spawns=victor_questn_cantina,string:quest_script=conversation.victor_questn_cantina"					

From 18dc480d29c9e23089b2206c7a2eef9636da3d13 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:49:12 -0800
Subject: [PATCH 07/25] *Added Spawners for NPC's involved with the Bestine
 Museum Event

---
 .../poi_spawner/tatooine/bestine_artist_spawns.tab        | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.tab b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.tab
new file mode 100755
index 000000000..9eb32de1f
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.tab
@@ -0,0 +1,8 @@
+spawns	name	room	loc_x	loc_y	loc_z	yaw	script	mood	animation_mood	respawn_time	spawn_objvar	special_room	special_room_script	room_objvar	room_objvar_name	room_objvar_value
+s	s	s	f	f	f	f	s	s	s	i	s	s	s	s	s	s
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist01	world	3312	5	-4655	-147	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist01,string:quest_script=conversation.bestine_artist01"					
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist02	world	1521	7	3259	177	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist02,string:quest_script=conversation.bestine_artist02"					
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist03	world	-3101	5	2184	137	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist03,string:quest_script=conversation.bestine_artist03"					
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist04	world	3475.1	5	-4975.5	38	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist04,string:quest_script=conversation.bestine_artist04"					
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist05	world	-2768	5	2110	90	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist05,string:quest_script=conversation.bestine_artist05"					
+object/tangible/ground_spawning/area_spawner.iff	bestine_artist06	world	-5238.8	75	-6568.1	114	city.bestine.museum_event_spawner			1	"string:spawns=bestine_artist06,string:quest_script=conversation.bestine_artist06"					

From 70f55e26a2e33f1ac69849f46c8e787de0a8cfea Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:50:22 -0800
Subject: [PATCH 08/25] *Commented out persisting of objects in order to keep
 things working in buildout tables

---
 .../game/script/city/bestine/city_raid_grandparent.script     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.script b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.script
index 8422ff967..a0f35b69f 100644
--- a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.script
+++ b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.script
@@ -23,7 +23,7 @@ messageHandler bootStrap()
 		location locTest = getLocation(self);
 		locTest.x = locTest.x +1;
 		obj_id objRaidSpawner = createObject(MASTER_OBJECT_TEMPLATE, locTest);
-		persistObject(objRaidSpawner);
+		//persistObject(objRaidSpawner);
 
 		setObjVar(self, "objRaidSpawner", objRaidSpawner);				// Suppress linting - The lint script is incorrectly
 																		// catching this due to the similarly named array
@@ -31,4 +31,4 @@ messageHandler bootStrap()
 		setObjVar(objRaidSpawner, "strDataTable", strDataTable);
 	}
 	return SCRIPT_CONTINUE;
-}
\ No newline at end of file
+}

From a1be4daf1d4329fcf98b58d959154ee79fd69940 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:51:00 -0800
Subject: [PATCH 09/25] *Added a Spawner for Museum Curator *Commented out
 persisting of objects in order to keep things working in buildout tables

---
 .../bestine/museum_event_grandparent.script   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.script b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.script
index 903b0cd0c..43ccf6c2d 100644
--- a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.script
+++ b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.script
@@ -4,6 +4,7 @@
 // otherwise it makes a new one.
 
 include library.utils;
+include library.create;
 
 const string MASTER_OBJECT_TEMPLATE = "object/tangible/poi/tatooine/bestine/bestine_museum_event_master_object.iff";
 const string VARNAME_MUSEUM_STATUS = "strMuseumEventStatus";
@@ -17,6 +18,7 @@ const string DATATABLE_NAME = "datatables/city/bestine/bestine_museum_event.iff"
 trigger OnInitialize()
 {	
 	messageTo(self, "bootStrap", null, 2, false);
+	messageTo(self, "spawnCurator", null, 2, false);
 	return SCRIPT_CONTINUE;
 }
 
@@ -61,7 +63,7 @@ messageHandler bootStrap()
 		location locTest = getLocation(self);
 		locTest.x = locTest.x +1;
 		obj_id objMuseumEventMaster = createObject(MASTER_OBJECT_TEMPLATE, locTest);
-		persistObject(objMuseumEventMaster);
+		//persistObject(objMuseumEventMaster);
 		
 		dctScriptVars.put("objMasterObjectId", objMuseumEventMaster);
 		dctScriptVars.put(VARNAME_MUSEUM_STATUS, "museumEventStarted");
@@ -207,6 +209,25 @@ void updateMuseumEventStatus(obj_id self)
 	return;
 }
 
+messageHandler spawnCurator()
+{
+	//UPDATED 11/5/14: Added Museum Curator spawner to script.
+	//Originally, this NPC was spawned from the Gold DB,
+	//but now spawns here.
+	obj_id objMuseumRoom = getCellId (self, "livingroom2");
+	location locCuratorLocation = new location (22.6f, 0.19f, -0.15f, "tatooine", objMuseumRoom);
+		obj_id template = create.object("object/tangible/ground_spawning/area_spawner.iff", locCuratorLocation);
+		setObjVar(template, "spawns", "lilas_dinhint");
+		setObjVar(template, "npc_name", "Lilas Dinhint");
+		setObjVar(template, "quest_script", "conversation.lilas_dinhint");
+		string spawnerObjName = "Lilas Dinhint Spawner";
+		setName(template, spawnerObjName);
+		attachScript(template, "city.bestine.museum_event_spawner");
+	
+	return SCRIPT_CONTINUE;
+
+}
+
 // message from persisted master object when museum event ends or begins.
 messageHandler handleMuseumEventStateChange()
 {

From d516bfaa92d0b1561465699d5b5cada5d7853ffc Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:51:33 -0800
Subject: [PATCH 10/25] *Added OnAttach trigger in order to keep system working
 with buildout tables

---
 .../script/city/bestine/museum_event_spawner.script    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.script b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.script
index 6fccc9ba7..ee13a953a 100644
--- a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.script
+++ b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.script
@@ -13,6 +13,14 @@ trigger OnInitialize()
 	return SCRIPT_CONTINUE;
 }
 
+trigger OnAttach()
+{
+	deltadictionary dctScriptVars = self.getScriptVars();
+	dctScriptVars.put("numMuseumChecks", 1);
+	messageTo(self, "checkForMuseumBuilding", null, 60, false);
+	return SCRIPT_CONTINUE;
+}
+
 messageHandler checkForMuseumBuilding()
 {
 	location here = getLocation(self);
@@ -115,4 +123,4 @@ void spawnNpc(obj_id self)
 		attachScript(npc, "conversation.bestine_artist06");
 	
 	return;
-}
\ No newline at end of file
+}

From 933aa510789dec5ee55b5bdcbf256f0bc35e6bc5 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:52:59 -0800
Subject: [PATCH 11/25] *Commented out persisting of objects in order to keep
 things working in buildout tables *Changed template of NPC spawner in order
 to prevent persisting of spawner(this would cause multiple spawners to spawn
 each server reset and multiple NPCs as well)

---
 .../city/bestine/politician_event_grandparent.script | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.script b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.script
index 11d02df96..3c7073912 100644
--- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.script
+++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.script
@@ -34,7 +34,7 @@ messageHandler bootStrap()
 		location locTest = getLocation(self);
 		locTest.x = locTest.x +1;
 		obj_id objPoliticianEventMaster = createObject(MASTER_OBJECT_TEMPLATE, locTest);
-		persistObject(objPoliticianEventMaster);
+		//persistObject(objPoliticianEventMaster);
 		
 		dctScriptVars.put("objMasterObjectId", objPoliticianEventMaster);
 		dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionStarted");
@@ -50,10 +50,12 @@ messageHandler spawnMissingNpc()
 {
 	obj_id objCapitolLobby = getCellId (self, "lobby");
 	location locMissingNpcSpawnerLocation = new location (6.10f, 0.30f, -0.49f, "tatooine", objCapitolLobby);
-	obj_id[] objMissingNpcSpawnerIds = getAllObjectsWithTemplate(locMissingNpcSpawnerLocation, 10, MISSING_NPC_TEMPLATE);
-	
-	if ( objMissingNpcSpawnerIds == null || objMissingNpcSpawnerIds.length < 1 )
-		obj_id missingNpc = createObject(MISSING_NPC_TEMPLATE, locMissingNpcSpawnerLocation);
+	obj_id missingNpc = createObject("object/tangible/ground_spawning/area_spawner.iff", locMissingNpcSpawnerLocation);
+	setObjVar(missingNpc, "spawns", "victor_questn_capitol");
+	setObjVar(missingNpc, "quest_script", "conversation.victor_questn_capitol");
+	string spawnerObjName = "Trooper Spawner";
+	setName(missingNpc, spawnerObjName);
+	attachScript(missingNpc, "city.bestine.politician_event_spawner");
 	
 	return SCRIPT_CONTINUE;
 }

From bdb32be4f568be77719396c829e741ac50752023 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:53:34 -0800
Subject: [PATCH 12/25] *Added OnAttach trigger to keep system working in
 buildout tables

---
 .../city/bestine/politician_event_spawner.script       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.script b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.script
index 99984d29b..103487c78 100644
--- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.script
+++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.script
@@ -11,6 +11,14 @@ trigger OnInitialize()
 	return SCRIPT_CONTINUE;
 }
 
+trigger OnAttach()
+{
+	deltadictionary dctScriptVars = self.getScriptVars();
+	dctScriptVars.put("numCapitolChecks", 1);
+	messageTo(self, "checkForCapitolBuilding", null, 60, false);
+	return SCRIPT_CONTINUE;
+}
+
 messageHandler checkForCapitolBuilding()
 {
 	location here = getLocation(self);
@@ -120,4 +128,4 @@ void spawnNpc(obj_id self)
 		}
 	}
 	return;
-}
\ No newline at end of file
+}

From c0c2a3cda7188e3f9ca663ce67599908d2747ccd Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:55:58 -0800
Subject: [PATCH 13/25] *NPC now drinks out of cup rather than nothing

---
 .../game/script/conversation/bounty_check_reset.script        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/script/conversation/bounty_check_reset.script b/sku.0/sys.server/compiled/game/script/conversation/bounty_check_reset.script
index 122b2f3aa..98fc6a0fb 100644
--- a/sku.0/sys.server/compiled/game/script/conversation/bounty_check_reset.script
+++ b/sku.0/sys.server/compiled/game/script/conversation/bounty_check_reset.script
@@ -434,6 +434,8 @@ trigger OnInitialize ()
 		detachScript(self, "conversation.bounty_check_reset");
 
 	setCondition (self, CONDITION_CONVERSABLE);
+	obj_id cup1 = createObject ("object/tangible/item/con_drinking_glass_01.iff", self, "");
+	equip (cup1, self);
 
 	return SCRIPT_CONTINUE;
 }
@@ -441,6 +443,8 @@ trigger OnInitialize ()
 trigger OnAttach ()
 {
 	setCondition (self, CONDITION_CONVERSABLE);
+	obj_id cup1 = createObject ("object/tangible/item/con_drinking_glass_01.iff", self, "");
+	equip (cup1, self);
 
 	return SCRIPT_CONTINUE;
 }

From c39049b606670a128b08dad01e48894375f74581 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:56:16 -0800
Subject: [PATCH 14/25] *NPC now drinks out of cup rather than nothing

---
 .../script/conversation/ep3_clone_relics_hunter_qakkee.script | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.script b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.script
index b2818ed6c..4f99022cd 100644
--- a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.script
+++ b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.script
@@ -7599,6 +7599,8 @@ trigger OnInitialize ()
 	setCondition (self, CONDITION_CONVERSABLE);
 	setInvulnerable (self, true);
 	setName(self, new string_id( "ep3/npc_names", "clone_relics_qakkee" ));
+	obj_id cup1 = createObject ("object/tangible/item/con_drinking_glass_01.iff", self, "");
+	equip (cup1, self);
 
 	return SCRIPT_CONTINUE;
 }
@@ -7608,6 +7610,8 @@ trigger OnAttach ()
 	setCondition (self, CONDITION_CONVERSABLE);
 	setInvulnerable (self, true);
 	setName(self, new string_id( "ep3/npc_names", "clone_relics_qakkee" ));
+	obj_id cup1 = createObject ("object/tangible/item/con_drinking_glass_01.iff", self, "");
+	equip (cup1, self);
 
 	return SCRIPT_CONTINUE;
 }

From 94e2f386ab3b5b1d5521ada618514a5438fbd8f8 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:56:41 -0800
Subject: [PATCH 15/25] *Made Smuggler NPC sit

---
 .../game/script/conversation/victor_questn_cantina.script   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/script/conversation/victor_questn_cantina.script b/sku.0/sys.server/compiled/game/script/conversation/victor_questn_cantina.script
index 3c7c9c7f2..457c012af 100644
--- a/sku.0/sys.server/compiled/game/script/conversation/victor_questn_cantina.script
+++ b/sku.0/sys.server/compiled/game/script/conversation/victor_questn_cantina.script
@@ -166,6 +166,9 @@ trigger OnInitialize ()
 		detachScript(self, "npc.conversation.victor_questn_cantina");
 
 	setCondition (self, CONDITION_CONVERSABLE);
+	ai_lib.setDefaultCalmMood (self, "npc_sitting_chair");
+	int self_yaw = 179;
+	setYaw (self, self_yaw);
 
 	return SCRIPT_CONTINUE;
 }
@@ -173,6 +176,9 @@ trigger OnInitialize ()
 trigger OnAttach ()
 {
 	setCondition (self, CONDITION_CONVERSABLE);
+	ai_lib.setDefaultCalmMood (self, "npc_sitting_chair");
+	int self_yaw = 179;
+	setYaw (self, self_yaw);
 
 	return SCRIPT_CONTINUE;
 }

From ec04426c43d75a64b7455a028f229427d4973a90 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:57:28 -0800
Subject: [PATCH 16/25] *Added OnAttach trigger for celebrityspawner in order
 to keep compatible with buildout tables

---
 .../npc/celebrity/celebrity_spawner.script    | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.script b/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.script
index 60d2d5e96..449018c0f 100644
--- a/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.script
+++ b/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.script
@@ -38,4 +38,42 @@ trigger OnInitialize()
 	}		
 	
 	return SCRIPT_CONTINUE;
-}
\ No newline at end of file
+}
+
+trigger OnAttach()
+{
+	string spawn = getStringObjVar (self, "spawns");
+	
+	location here = getLocation(self);
+	here.y = here.y + 0.5f;
+	
+	obj_id celeb = create.object (spawn, here);
+	setInvulnerable(celeb, true);
+	ai_lib.setDefaultCalmBehavior( celeb, ai_lib.BEHAVIOR_SENTINEL );
+	
+	if (hasObjVar (self, "quest_script"))
+	{
+		string script = getStringObjVar (self, "quest_script");
+		attachScript (celeb, script);
+	}
+	if (hasObjVar (self, "quest_table"))
+	{
+		string table = getStringObjVar (self, "quest_table");
+		setObjVar (celeb, "quest_table", table);
+	}	
+	
+	if (hasObjVar (self, "npc_name"))
+	{
+		string name = getStringObjVar (self, "npc_name");
+		
+		if (name != null)
+		{
+			if (name != "")
+			{
+				setName (celeb, name);
+			}
+		}			
+	}		
+	
+	return SCRIPT_CONTINUE;
+}

From 9240bd0abcc047e75db7a537fa11a48b5cab1fb1 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:57:55 -0800
Subject: [PATCH 17/25] *Attached necessary scripts and variables to NPC

---
 .../script/npc/static_npc/wilhalm_skrim.script    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/script/npc/static_npc/wilhalm_skrim.script b/sku.0/sys.server/compiled/game/script/npc/static_npc/wilhalm_skrim.script
index b20cd0347..7d6ed6701 100644
--- a/sku.0/sys.server/compiled/game/script/npc/static_npc/wilhalm_skrim.script
+++ b/sku.0/sys.server/compiled/game/script/npc/static_npc/wilhalm_skrim.script
@@ -1,11 +1,26 @@
 include library.ai_lib;
 include library.hue;
 include library.colors;
+include library.factions;
+include library.chat;
+include library.skill;
 
 trigger OnAttach ()
 {
 
 	ai_lib.setDefaultCalmBehavior( self, ai_lib.BEHAVIOR_SENTINEL );
+	if (!hasScript (self, "npc.converse.npc_converse_menu"))
+	{
+		attachScript (self, "npc.converse.npc_converse_menu");
+	}
+	
+	if (!hasScript (self, "npc.static_quest.quest_convo"))
+	{
+		attachScript (self, "npc.static_quest.quest_convo");
+	}
+	
+	setObjVar (self, "quest_table", "wilhalm_skrim");
+	factions.setFaction (self, "Imperial");
 	setName (self, "Wilhalm Skrim");
 	return SCRIPT_CONTINUE;
 }

From 51773759a8adcfdf3eec37f258353da7c0a66ea5 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 01:58:30 -0800
Subject: [PATCH 18/25] *Added OnAttach trigger in order to keep compatible
 with buildout tables

---
 .../game/script/systems/gcw/flip_banner.script       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner.script b/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner.script
index 0f2641e56..522591a60 100644
--- a/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner.script
+++ b/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner.script
@@ -16,6 +16,18 @@ trigger OnInitialize()
 	return SCRIPT_CONTINUE;
 }
 
+//------------------------------------------------
+// OnAttach
+//------------------------------------------------
+
+trigger OnAttach()
+{
+//	messageTo( self, "spawnBanner", null, 1.f, false );
+	messageTo( self, "checkBannerImpulse", null, 1.f, false );
+
+	return SCRIPT_CONTINUE;
+}
+
 //------------------------------------------------
 // OnDestroy
 //------------------------------------------------

From 1456639e1f99ec0cb1f56ab011fd6808311b0316 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:00:16 -0800
Subject: [PATCH 19/25] *Added OnAttach trigger in order to keep compatible
 with buildout tables *Added missing code to triggers that should have
 inherited code from flip_banner.script, but did not. *Commented out
 onHearSpeech trigger due to no God Mode check. *Added messageHandler to
 CheckBannerImpulse.. should have inherited code from flip_banner.script, but
 did not.

---
 .../systems/gcw/flip_banner_onpole.script     | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner_onpole.script b/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner_onpole.script
index 600fe77b1..887690604 100644
--- a/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner_onpole.script
+++ b/sku.0/sys.server/compiled/game/script/systems/gcw/flip_banner_onpole.script
@@ -17,20 +17,45 @@ inherits systems.gcw.flip_banner;
 
 trigger OnInitialize()
 {
+//	messageTo( self, "spawnBanner", null, 1.f, false );
+	messageTo( self, "checkBannerImpulse", null, 1.f, false );
+
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+//	messageTo( self, "spawnBanner", null, 1.f, false );
+	messageTo( self, "checkBannerImpulse", null, 1.f, false );
+
 	return SCRIPT_CONTINUE;
 }
 
 trigger OnDestroy()
 {
+	if ( utils.hasScriptVar( self, "banner" ) )
+	{
+		obj_id banner = utils.getObjIdScriptVar( self, "banner" );
+		if ( isIdValid( banner ) )
+			destroyObject( banner );
+	}
+
 	return SCRIPT_CONTINUE;
 }
 
 trigger OnUnloadedFromMemory()
 {
+	if ( utils.hasScriptVar( self, "banner" ) )
+	{
+		obj_id banner = utils.getObjIdScriptVar( self, "banner" );
+		if ( isIdValid( banner ) )
+			destroyObject( banner );
+	}
+
 	return SCRIPT_CONTINUE;
 }
 
-trigger OnHearSpeech(obj_id speaker, string strText)
+/*trigger OnHearSpeech(obj_id speaker, string strText)
 {
 	string[] strCommands = split(strText, ' ');
 
@@ -43,6 +68,55 @@ trigger OnHearSpeech(obj_id speaker, string strText)
 
 	return SCRIPT_CONTINUE;
 }
+*/
+
+//------------------------------------------------
+// checkBannerImpulse
+//------------------------------------------------
+
+messageHandler checkBannerImpulse()
+{
+	// Determine who the winner is.
+	// float imp_r = gcw.getImperialRatio( self );
+	// float reb_r = gcw.getRebelRatio( self );
+
+	float imp_r = gcw.getImperialPercentileByRegion(self);
+	float reb_r = gcw.getRebelPercentileByRegion(self);
+
+	// LOG("gcw_region", "checkBannerImpulse imp_r: " + imp_r + " reb_r: " + reb_r);
+
+	if((imp_r > reb_r))// && (utils.getIntScriptVar(self, "faction" ) != 1))
+	{
+		// Switch to an Imp banner.
+		utils.setScriptVar( self, "faction", 1 );
+
+		// Destroy existing banner.
+		obj_id banner = utils.getObjIdScriptVar( self, "banner" );
+		if ( isIdValid( banner ) )
+			destroyObject( banner );
+
+		// Spawn a new banner.
+		spawnBanner( self, "imperial" );
+	}
+	else if((reb_r > imp_r))// && (utils.getIntScriptVar(self, "faction") != 2))
+	{
+		// Switch to a Reb banner.
+		utils.setScriptVar(self, "faction", 2);
+
+		// Destroy existing banner.
+		obj_id banner = utils.getObjIdScriptVar(self, "banner");
+
+		if(isIdValid(banner))
+			destroyObject(banner);
+
+		// Spawn a new banner.
+		spawnBanner(self, "rebel");
+	}
+
+	messageTo(self, "checkBannerImpulse", null, 3600.f, false);
+
+	return SCRIPT_CONTINUE;
+}
 
 //------------------------------------------------
 // spawnBanner

From 7112c5ee6a541364108f76e7f2716db9560f88a9 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:01:00 -0800
Subject: [PATCH 20/25] *Added Missing NPC Spawner and appropriate Variables

---
 .../bestine_farious_gletch_spawner.script     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.script

diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.script
new file mode 100644
index 000000000..747cc4d22
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.script
@@ -0,0 +1,28 @@
+include library.create;
+include library.locations;
+
+trigger OnInitialize()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+messageHandler spawnMissingNpc()
+{
+	//Spawns the Assassin Mission NPC for Bestine
+		obj_id spawnCell = getCellId (self, "livingroom1");
+		location locAsLocation = new location (2.0f, -0.4f, -5.3f, "tatooine", spawnCell);
+		obj_id template = create.object("farious_gletch", locAsLocation);
+		setObjVar(template, "quest_table", "farious_gletch");
+		attachScript(template, "npc.static_quest.quest_convo");
+		int as_yaw = -60;
+		setYaw(template, as_yaw);
+
+		return SCRIPT_CONTINUE;
+}

From 3849763aaf569b9ff952689058085f65178d5e0d Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:01:16 -0800
Subject: [PATCH 21/25] *Added Missing NPC Spawner and appropriate Variables

---
 .../bestine_melios_purl_spawner.script        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.script

diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.script
new file mode 100644
index 000000000..aec95952c
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.script
@@ -0,0 +1,28 @@
+include library.create;
+include library.locations;
+
+trigger OnInitialize()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+messageHandler spawnMissingNpc()
+{
+	//Spawns the Doctor NPC for Bestine
+		obj_id spawnCell = getCellId (self, "mainroom");
+		location locDocLocation = new location (-1.4f, 0.2f, 0.6f, "tatooine", spawnCell);
+		obj_id template = create.object("melios_purl", locDocLocation);
+		setObjVar(template, "quest_table", "melios_purl");
+		attachScript(template, "npc.static_quest.quest_convo");
+		int doc_yaw = 60;
+		setYaw(template, doc_yaw);
+
+		return SCRIPT_CONTINUE;
+}

From e8a9669af9cff40ab57752b402642b4cb18fddb3 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:01:47 -0800
Subject: [PATCH 22/25] *Added Missing NPC Spawner and appropriate
 Variables(Note: NPC will not spawn due to possible missing object template)

---
 .../bestine_pfilbee_jhorn_spawner.script      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.script

diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.script
new file mode 100644
index 000000000..ed2128d76
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.script
@@ -0,0 +1,28 @@
+include library.create;
+include library.locations;
+
+trigger OnInitialize()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+messageHandler spawnMissingNpc()
+{
+	//Spawns the Imperial NPC for Bestine
+		obj_id spawnCell = getCellId (self, "room2");
+		location locImpLocation = new location (5.3f, 0.1f, -3.7f, "tatooine", spawnCell);
+		obj_id template = create.object("pfilbee_jhorn", locImpLocation);
+		setObjVar(template, "quest_table", "pfilbee_jhorn");
+		attachScript(template, "npc.static_quest.quest_convo");
+		int imp_yaw = -87;
+		setYaw(template, imp_yaw);
+
+		return SCRIPT_CONTINUE;
+}

From 22379f5c95c5bfad5478d4663ac18ceb999a1835 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:02:07 -0800
Subject: [PATCH 23/25] *Added Missing NPC Spawner and appropriate Variables

---
 ...tine_sean_questn_university_spawner.script | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.script

diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.script
new file mode 100644
index 000000000..cb05a1fff
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.script
@@ -0,0 +1,51 @@
+include library.create;
+include library.locations;
+
+trigger OnInitialize()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	messageTo(self, "spawnInformantNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	messageTo(self, "spawnInformantNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+messageHandler spawnMissingNpc()
+{
+		//Spawns Sean's teacher for the Bestine Election
+		//TODO: spawn chair and table; make professor sit
+		obj_id spawnCell = getCellId (self, "mainroom");
+		location locTeacherLocation = new location (3.6f, 1.1f, -4.6f, "tatooine", spawnCell);
+		obj_id template = create.object("object/tangible/ground_spawning/area_spawner.iff", locTeacherLocation);
+		setObjVar(template, "spawns", "sean_questn_university");
+		setObjVar(template, "npc_name", "Ocket Abaot");
+		setObjVar(template, "quest_script", "conversation.sean_questn_university");
+		string spawnerObjName = "Ocket Abaot Spawner";
+		setName(template, spawnerObjName);
+		attachScript(template, "city.bestine.politician_event_spawner");
+
+		return SCRIPT_CONTINUE;
+
+
+
+}
+
+messageHandler spawnInformantNpc()
+{
+	
+		obj_id spawnCell = getCellId (self, "meetinge");
+		location locImpLocation = new location (-6.5f, 1.1f, -11.6f, "tatooine", spawnCell);
+		obj_id template = create.object("coa3_information_imperial", locImpLocation);
+		int inform_yaw = -90;
+		setYaw(template, inform_yaw);
+
+		return SCRIPT_CONTINUE;
+
+
+
+}

From 4221d4b9770e4dec4a0d75d4021bf8cf87680922 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:02:20 -0800
Subject: [PATCH 24/25] *Added Missing NPC Spawner and appropriate Variables

---
 .../bestine_sean_questp_house_spawner.script  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.script

diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.script
new file mode 100644
index 000000000..64bbcd334
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.script
@@ -0,0 +1,30 @@
+include library.create;
+include library.locations;
+
+trigger OnInitialize()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+trigger OnAttach()
+{
+	messageTo(self, "spawnMissingNpc", null, 2, false);
+	return SCRIPT_CONTINUE;
+}
+
+messageHandler spawnMissingNpc()
+{
+	//Spawns the housemaid for the Bestine Election
+		obj_id spawnCell = getCellId (self, "livingroom1");
+		location locMaidLocation = new location (3.0f, 0.4f, -0.2f, "tatooine", spawnCell);
+		obj_id template = create.object("object/tangible/ground_spawning/area_spawner.iff", locMaidLocation);
+		setObjVar(template, "spawns", "sean_questp_house");
+		setObjVar(template, "npc_name", "Edaekomeu Ossilei");
+		setObjVar(template, "quest_script", "conversation.sean_questp_house");
+		string spawnerObjName = "Edaekomeu Ossilei Spawner";
+		setName(template, spawnerObjName);
+		attachScript(template, "city.bestine.politician_event_spawner");
+
+		return SCRIPT_CONTINUE;
+}

From 829834eaefa4fdc664736871810bc73aa183d842 Mon Sep 17 00:00:00 2001
From: PrisonCamp <impcreationswg@gmail.com>
Date: Tue, 11 Nov 2014 02:03:05 -0800
Subject: [PATCH 25/25] *Added all Bestine Election NPCs, along with various
 other NPCs that spawn throughout Bestine

---
 .../tatooine/bestine_capitol_spawns.tab       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100755 sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.tab

diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.tab b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.tab
new file mode 100755
index 000000000..78ab33fec
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.tab
@@ -0,0 +1,26 @@
+spawns	name	room	loc_x	loc_y	loc_z	yaw	script	mood	animation_mood	respawn_time	spawn_objvar	special_room	special_room_script	room_objvar	room_objvar_name	room_objvar_value
+s	s	s	f	f	f	f	s	s	s	i	s	s	s	s	s	s
+object/tangible/ground_spawning/area_spawner.iff	Victor Visalis Spawner	meeting3	-26.4873	3.22324	20.2943	146	city.bestine.politician_event_spawner			1	"string:spawns=victor_visalis,string:npc_name=Victor Visalis,string:quest_script=conversation.victor_visalis"					
+object/tangible/ground_spawning/area_spawner.iff	Sean Trenwell Spawner	meeting6	19.4653	3.22324	-35.9776	10	city.bestine.politician_event_spawner			1	"string:spawns=sean_trenwell,string:npc_name=Sean Trenwell,string:quest_script=conversation.sean_trenwell"					
+object/tangible/ground_spawning/area_spawner.iff	Tour Aryon Spawner	meeting2	-37.3031	1.29422	0.713583	-125	city.bestine.politician_event_spawner			1	"string:spawns=tour_aryon,string:npc_name=Tour Aryon,string:quest_script=conversation.tour_aryon"					
+wilhalm_skrim		meeting5	28.8936	1.29568	-5.97518	60				1						
+prefect_talmont		lobby	-1.9	3	-10	-160			1						
+object/tangible/ground_spawning/area_spawner.iff	Keanna Liktna Spawner	meeting3	-18.8886	3.22324	20.608	-152	city.bestine.politician_event_spawner			1	"string:spawns=keanna_likyna,string:npc_name=Keanna Li`kyna,string:quest_script=conversation.keanna_likyna"					
+object/tangible/ground_spawning/area_spawner.iff	Indigo Siyan Spawner	meeting6	24.6402	3.22324	-30.7135	-12	city.bestine.politician_event_spawner			1	"string:spawns=indigo_siyan,string:npc_name=Indigo Siyan,string:quest_script=conversation.indigo_siyan"					
+object/tangible/ground_spawning/area_spawner.iff	Foofice Lightingrunner Spawner	world	-1357	26	-3871	-108	city.bestine.politician_event_spawner			1	"string:spawns=victor_questp_slums,string:npc_name=Foofice Lightingrunner,string:quest_script=conversation.victor_questp_slums"					
+object/tangible/ground_spawning/area_spawner.iff	Izosxisli Spawner	world	-1294	26	-3500	160	city.bestine.politician_event_spawner			1	"string:spawns=victor_questp_hospital,string:npc_name=Izosxisli,string:quest_script=conversation.victor_questp_hospital"					
+object/tangible/ground_spawning/area_spawner.iff	Orqiti Aneofo Spawner	world	-1104	12	-3705	-20	city.bestine.politician_event_spawner			1	"string:spawns=sean_questp_market,string:npc_name=Orqiti Aneofo,string:quest_script=conversation.sean_questp_market"					
+object/tangible/ground_spawning/area_spawner.iff	Hutt Informant Spawner	world	-1120	12	-3639	-20	city.bestine.politician_event_spawner			1	"string:spawns=hutt_informant_quest,string:quest_script=conversation.hutt_informant_quest"					
+junk_dealer		world	-1026	10	-3557	5				1	"int:ai.defaultCalmBehavior=1"					
+junk_dealer		world	-1135	12	-3683	-170				1	"int:ai.defaultCalmBehavior=1"					
+junk_dealer		world	-1118	12	-3687	-140				1	"int:ai.defaultCalmBehavior=1"					
+herald_tatooine_viconya	Vi`conya T`ili	world	-1101	10	-3549	-90	conversation.heraldtatooine1			1	"int:ai.defaultCalmBehavior=1"
+coa2_imperial_coordinator		world	-1131	12	-3659	-50				1	"int:ai.defaultCalmBehavior=1"
+death_watch_herald_imperial		world	-1160	12	-3525	-115	conversation.death_watch_imperial_herald			1	"int:ai.defaultCalmBehavior=1"
+kormund_thrylle		world	-1043	10	-3530	175	npc.static_quest.quest_convo			1	"string:quest_table=kormund_thrylle,int:ai.defaultCalmBehavior=1"
+commoner_human_male		world	-1252	12	-3617	-90	conversation.lf_safetyquestgiver			1	"int:ai.defaultCalmBehavior=1"
+imperial_recruiter		world	-1275	12	-3594	-80				1	"int:ai.defaultCalmBehavior=1"
+imperial_recruiter		world	-1138	98	-3897	-1				1	"int:ai.defaultCalmBehavior=1"
+imperial_recruiter		world	-1307	12	-3662	-130				1	"int:ai.defaultCalmBehavior=1"
+imperial_recruiter		world	-1299	12	-3507	45				1	"int:ai.defaultCalmBehavior=1"
+imperial_recruiter		world	-1072	12	-3594	-140				1	"int:ai.defaultCalmBehavior=1"