diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab index 2e873af0f..c54ba3ba8 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab @@ -268,14 +268,12 @@ i i h i f f f f f f f s p -821719718 0 object/tangible/ground_spawning/area_spawner.iff 0 2017.96 5.87111 960.343 0.903515 0 -0.428556 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troemans_lackeys_01|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -803565936 0 object/tangible/quest/corellia_murmur_shipment_datapad.iff 0 2014.15 28.588 1723.33 -0.507741 0.512436 -0.487439 -0.491946 quest.task.ground.retrieve_item_on_item $| -765763558 0 object/tangible/quest/u13_vengeance_archive_terminal.iff 0 1875.9 28 1700.32 1 0 0 0 quest.task.ground.retrieve_item_on_item $| --741107008 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -736617077 0 object/tangible/collection/rock_bubbling_03.iff 0 286.198 -0.348493 547.608 1 0 0 0 systems.collections.consume_click collection.slotName|4|col_rock_bubbling:bubbling_rock_03|$| -723865718 0 object/static/structure/general/data_terminal_s1.iff 0 1918.21 28 1387.08 -0.181293 0 0.983429 0 $| -702515714 0 object/tangible/ground_spawning/area_spawner.iff 0 1805.94 18.043 829.437 0.963058 0 -0.269295 0 systems.spawning.spawner_area fltMaxSpawnTime|2|420.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|10.000000|intDefaultBehavior|0|0|intGoodLocationSpawner|0|0|intSpawnCount|0|5|intSpawnSystem|0|1|registerWithController|0|1|strName|4|rogue3|strSpawnerType|4|area|strSpawns|4|corellia/murmur_rogue_corsec|$| -691727981 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1522.66 28 1680.94 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_3|registerWithController|0|1|$| -658546056 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1523.84 28 1679.44 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_1|registerWithController|0|1|$| -600580134 0 object/tangible/ground_spawning/area_spawner.iff 0 1875.68 28 1707.18 -0.279448 0 0.960161 0 systems.spawning.spawner_area fltMaxSpawnTime|2|5.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|mtp_corellia_times_vendor|strSpawnerType|4|area|strSpawns|4|mtp_corellia_times_vendor|$| --575435076 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -549090885 0 object/static/structure/corellia/corl_tent_small.iff 0 1919.09 28.2923 1385.18 0.998988 0 0 0.0449848 $| -530910864 0 object/tangible/ground_spawning/area_spawner.iff 0 2018.29 3.88241 898.71 0.95755 0 -0.288267 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troeman_lackeys_06|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -491828361 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1521.85 28 1585.31 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|100.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|smuggler_enemy_patrol|strPatrolPointNames|5|smuggler_enemy_patrol_10064712_1:smuggler_enemy_patrol_10064712_2:smuggler_enemy_patrol_10064712_3:smuggler_enemy_patrol_10064712_4:|strSpawnerType|4|patrol|strSpawns|4|corellia/smuggler_patrol_5|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab index 4b13e5526..6d0ad5bdb 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab @@ -154,7 +154,6 @@ i i h i f f f f f f f s p -1885810115 0 object/tangible/quest/naboo_theed_xharnoh_plant.iff 0 15.3193 -207.162 722.72 -0.620572 -0.0504755 0.777105 -0.0919225 quest.task.ground.retrieve_item_on_item $| -1876026501 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 812.828 6 268.495 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_enemy_patrol_10020833_3|registerWithController|0|1|$| -1875877557 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1379.48 -196.436 784.068 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|naboo_skaak_bruiser_11_12341383_2|registerWithController|0|1|$| --1873243646 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1237 6 47 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1872834889 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 828.453 6 447.561 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_4_10003339_5|registerWithController|0|1|$| -1870666513 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1114.56 6 140.893 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_2_10003142_3|registerWithController|0|1|$| -1859404836 0 object/tangible/collection/rare_melee_grooved_2h_sword.iff 0 1216.42 6.78291 133.377 0.703839 0.00344458 -0.00362418 0.710341 systems.collections.consume_click collection.slotName|4|col_rare_melee_01:grooved_sword_01|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab index 0ca29dda7..c272b8901 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab @@ -4,9 +4,9 @@ i i h i f f f f f f f s p 1418872 1418871 object/cell/cell.iff 1 0 0 0 1 1.401298E-45 0 0 $| 1418873 1418871 object/cell/cell.iff 2 0 0 0 1 2.802597E-45 0 0 $| 1418874 1418871 object/cell/cell.iff 3 0 0 0 1 4.203895E-45 0 0 $| -5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| -5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| -5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| +5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 1 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| +5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 2 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| +5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 3 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| 1418875 1418871 object/cell/cell.iff 4 0 0 0 1 5.605194E-45 0 0 $| 4295592 1418875 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 22.33858 0.2 -42.56847 0.38268 0 -0.92388 0 $| 1418876 1418871 object/cell/cell.iff 5 0 0 0 1 7.006492E-45 0 0 $| @@ -16,12 +16,12 @@ i i h i f f f f f f f s p 1418880 1418871 object/cell/cell.iff 9 0 0 0 1 1.261169E-44 0 0 $| 1418881 1418871 object/cell/cell.iff 10 0 0 0 1 1.401298E-44 0 0 $| 1418882 1418871 object/cell/cell.iff 11 0 0 0 1 1.541428E-44 0 0 $| -8865510 1418882 object/tangible/terminal/terminal_space.iff 11 -16.0263 0.200001 -33.2646 1 0 0 0 $| -8865511 1418882 object/tangible/terminal/terminal_space.iff 11 -13.1755 0.200001 -33.2581 1 0 0 0 $| -8865518 1418882 object/tangible/terminal/terminal_space.iff 11 -18.946 0.2 -33.2894 1 0 0 0 $| +8865510 1418882 object/tangible/terminal/terminal_space.iff 1 -16.0263 0.200001 -33.2646 1 0 0 0 $| +8865511 1418882 object/tangible/terminal/terminal_space.iff 2 -13.1755 0.200001 -33.2581 1 0 0 0 $| +8865518 1418882 object/tangible/terminal/terminal_space.iff 3 -18.946 0.2 -33.2894 1 0 0 0 $| 1418883 1418871 object/cell/cell.iff 12 0 0 0 1 1.681558E-44 0 0 $| 1418884 1418871 object/cell/cell.iff 13 0 0 0 1 1.821688E-44 0 0 $| -7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 13 -44.5 0.2 -31.0 1 0 0 0 $| +7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 -44.5 0.2 -31.0 1 0 0 0 $| 1418885 1418871 object/cell/cell.iff 14 0 0 0 1 1.961818E-44 0 0 $| 1418886 1418871 object/cell/cell.iff 15 0 0 0 1 2.101948E-44 0 0 $| 1418887 1418871 object/cell/cell.iff 16 0 0 0 1 2.242078E-44 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab index d560694e2..665759a92 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab @@ -2,7 +2,6 @@ objid container server_template_crc cell_index px py pz qw qx qy qz scripts objv i i h i f f f f f f f s p -2065830620 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1005.8 35.6222 102.531 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_7|registerWithController|0|1|$| -2014919809 0 object/tangible/ground_spawning/area_spawner.iff 0 1267.14 20.8576 41.8259 0.578749 0 0.815506 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| --1947770479 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1905547180 0 object/tangible/ground_spawning/area_spawner.iff 0 245.622 11.646 246.255 0.982156 0 0.188067 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1866569792 0 object/tangible/ground_spawning/area_spawner.iff 0 602.853 10 345.521 0.766702 0 0.642003 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|beast_master_trainer_tatooine_bestine|strSpawnerType|4|area|strSpawns|4|trainer_beast_master|$| -1826810507 0 object/tangible/ground_spawning/area_spawner.iff 0 202.3 8.88664 220.3 0.95283 0 -0.303503 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| @@ -13,7 +12,6 @@ i i h i f f f f f f f s p -1733406107 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 203.633 9.32885 225.993 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_1|registerWithController|0|1|$| -1628819013 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1032.2 28.8904 93.1309 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_6|registerWithController|0|1|$| -1614337274 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 679.806 12 446.737 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_1|registerWithController|0|1|$| --1561383607 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1534702832 0 object/tangible/ground_spawning/area_spawner.iff 0 212.705 8.27512 179.58 -0.55929 0 0.828972 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1503650413 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 246.826 7.64266 180.808 0.640997 0 0.767543 0 quest.task.ground.retrieve_item_on_item $| -1501410464 0 object/tangible/ground_spawning/patrol_spawner.iff 0 700.962 12 431.981 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|1.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|Smuggler_Enemy_Patrol|strPatrolPointNames|5|Smuggler_Enemy_Patrol_10028545_1:Smuggler_Enemy_Patrol_10028545_2:Smuggler_Enemy_Patrol_10028545_3:|strSpawnerType|4|patrol|strSpawns|4|tatooine/smuggler_patrol_bh_2|$| @@ -29,7 +27,6 @@ i i h i f f f f f f f s p -1215847131 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 210.79 8.43133 178.803 1 0 0 0 quest.task.ground.retrieve_item_on_item $| -1194217681 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1095.56 20.5278 82.0183 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_commando_10826018_2|registerWithController|0|1|$| -1189182743 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 987.378 42.6961 115.614 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_8|registerWithController|0|1|$| --1138262739 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1126463617 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1118.9 19.254 74.9883 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_2|registerWithController|0|1|$| -1114884077 0 object/tangible/ground_spawning/area_spawner.iff 0 1303 16.3169 34 -0.0479312 0 0.998851 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| -1109089490 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 199.077 8.51831 214.935 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_9|registerWithController|0|1|$| @@ -62,7 +59,6 @@ i i h i f f f f f f f s p -182208727 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 671.32 12 456.355 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_2|registerWithController|0|1|$| -180762470 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 201.446 9.00667 222.212 0.999343 -0.0353187 -0.000288859 0.00817327 quest.task.ground.retrieve_item_on_item $| -161984126 0 object/tangible/ground_spawning/area_spawner.iff 0 845.708 12 483.491 0.99158 0 0.129493 0 systems.spawning.spawner_area fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|1.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|fs_reward|strSpawnerType|4|area|strSpawns|4|tatooine/fs_11_reward|$| --156539612 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -76802086 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 680.746 12 448.936 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10027959_2|registerWithController|0|1|$| -26400255 0 object/tangible/theme_park/invisible_object.iff 0 772.241 12 505.011 0.862807 0 -0.505533 0 theme_park.controller_initialize scriptString|4|theme_park.restuss_event.stage_two_crier|$| -599 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 292.1 31.4761 772.685 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_head_hauler_10112410_6|registerWithController|0|1|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab index 5887585a7..22f16b828 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab @@ -282,7 +282,6 @@ i i h i f f f f f f f s p -1147174879 0 object/tangible/furniture/tatooine/frn_tato_table_small_style_01.iff 0 1221.59 5 1322.23 1 0 0 0 $| -1144708641 0 object/static/structure/tatooine/debris_tatt_drum_storage_1.iff 0 806.862 7.59167 1028.47 0.56848 0.364378 0.62099 0.398035 $| -1141460083 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1432.73 5 1137.62 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10043732_1|registerWithController|0|1|$| --1141197897 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1116958851 0 object/tangible/furniture/jedi/frn_all_light_chair_s02.iff 0 1219.67 5 1325.67 -0.557023 0 0.830497 0 occupied.limit|0|1|$| -1115558886 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1139.53 5 1483.5 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|270.000000|fltMinSpawnTime|2|90.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|patrolPathType|4|oscillate|registerWithController|0|1|strName|4|legacy_niko_thugs|strPatrolPointNames|5|legacy_niko_thugs_10024124_1:legacy_niko_thugs_10024124_2:legacy_niko_thugs_10024124_3:legacy_niko_thugs_10024124_4:legacy_niko_thugs_10024124_5:legacy_niko_thugs_10024124_6:legacy_niko_thugs_10024124_7:legacy_niko_thugs_10024124_8:legacy_niko_thugs_10024124_9:legacy_niko_thugs_10024124_10:|strSpawnerType|4|patrol|strSpawns|4|tatooine/tat_smuggler_15|$| -1107715798 0 object/tangible/collection/publish_gift_comlink_component_07.iff 0 1126.27 7.16043 1109.54 -0.0408745 0.0354367 0.685125 0.726414 systems.collections.consume_click collection.slotName|4|col_publish_com_link_component_01:publish_com_link_component_07|$| @@ -591,7 +590,6 @@ i i h i f f f f f f f s p -124994259 0 object/tangible/ground_spawning/area_spawner.iff 0 734.943 7.39358 1858 0.955494 0 -0.295012 0 systems.spawning.spawner_area fltMaxSpawnTime|2|200.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_gunrunner_05|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_newbie_gunrunner_sentry|$| -118803310 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1174.94 4.56121 1484.43 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_patrol_10029562_4|registerWithController|0|1|$| -117774221 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1066.6 8.95239 1381 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_nikos_thugs_10021354_6|registerWithController|0|1|$| --117732858 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -106832518 0 object/tangible/ground_spawning/area_spawner.iff 0 1635.8 5 1520.04 -0.65728 0 0.753646 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|2.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_rockmites|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_rockmites|$| -104803512 0 object/tangible/ground_spawning/area_spawner.iff 0 1053.49 10.0046 1215.65 0.548112 0 0.836405 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_scavenger_04|strSpawnerType|4|area|strSpawns|4|tatooine/scavenger|$| -91363171 0 object/tangible/furniture/tatooine/frn_tato_chair_cafe_style_01.iff 0 1222.61 5 1322.52 -0.609791 0 0.792563 0 occupied.limit|0|1|$| diff --git a/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab b/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab new file mode 100644 index 000000000..e51e3c1a6 --- /dev/null +++ b/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab @@ -0,0 +1,10 @@ +objVarName itvCommand +s s +privateerShip callforprivateerpickup +royalShip callforroyalpickup +junk callforrattletrappickup +tcg_itv_home callforsolarsailerpickup +tcg_itv_location callforg9riggerpickup +itv_snowspeeder callforsnowspeeder +itv_slave_1 callforslave1pickup +default_itv callforpickup diff --git a/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf b/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf index 4d5c9fd31..2073246b3 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf @@ -6,4 +6,5 @@ sharedTemplate = "object/tangible/veteran_reward/shared_instant_travel_terminal.iff" scripts = ["systems.veteran_reward.instant_travel_terminal_deed", "item.special.nomove"] +objvars = +["default_itv" = 1] persistByDefault = true diff --git a/sku.0/sys.server/compiled/game/script/.gitignore b/sku.0/sys.server/compiled/game/script/.gitignore index 841ead5fd..7553a6411 100755 --- a/sku.0/sys.server/compiled/game/script/.gitignore +++ b/sku.0/sys.server/compiled/game/script/.gitignore @@ -1 +1,2 @@ base_script.java +*.class \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java b/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java index 1c3d81529..d8a5ccc95 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java +++ b/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java @@ -137,6 +137,10 @@ public class rek_thelcar extends script.base_script { modifyCollectionSlotValue(player, "icon_nyms_master_collection_1_dna", 1); } + if(utils.playerHasStaticItemInBankOrInventory(player, "item_nym_themepark_dna_extractor")) { + obj_id dna_extractor = utils.getStaticItemInBankOrInventory(player, "item_nym_themepark_dna_extractor"); + if(isValidId(dna_extractor)) utils.destroyObject(dna_extractor); + } } public void rek_thelcar_action_completeQuestionQuest(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java index b8aad714f..7e139e5af 100755 --- a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java +++ b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java @@ -12,7 +12,7 @@ public class ig_88_head extends script.base_script } public static final string_id SID_MUST_BIO_LINK_FROM_INVENTORY = new string_id("base_player", "must_biolink_to_use_from_inventory"); public static final string_id SID_NOT_YET = new string_id("base_player", "not_yet"); - public static final float REUSE_TIME = 1800; + public static final int REUSE_TIME = 1800; public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); @@ -38,11 +38,11 @@ public class ig_88_head extends script.base_script } if (item == menu_info_types.ITEM_USE) { - float buffTime = getFloatObjVar(player, "clickItem.ig_head"); + float buffTime = getIntObjVar(player, "clickItem.ig_head"); if (getGameTime() > buffTime || isGod(player)) { setObjVar(player, "clickItem.ig_head", (getGameTime() + REUSE_TIME)); - sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), REUSE_TIME); + sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), (float) REUSE_TIME); playClientEffectObj(player, "clienteffect/medic_reckless_stimulation.cef", player, ""); activateHead(self, player); } diff --git a/sku.0/sys.server/compiled/game/script/player/base/base_player.java b/sku.0/sys.server/compiled/game/script/player/base/base_player.java index 56d07a09d..9585b829e 100755 --- a/sku.0/sys.server/compiled/game/script/player/base/base_player.java +++ b/sku.0/sys.server/compiled/game/script/player/base/base_player.java @@ -1656,6 +1656,10 @@ public class base_player extends script.base_script outparams.put("player", self); messageTo(cityHall, "msgCheckMyCityMotd", outparams, 0, false); } + if(groundquests.hasCompletedQuest(self, "u16_nym_themepark_miner_dna_collection") && utils.playerHasStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor")) { + obj_id dna_extractor = utils.getStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor"); + if(isValidId(dna_extractor)) utils.destroyObject(dna_extractor); + } return SCRIPT_CONTINUE; } public int disconnectPlayerCtsCompletedOrInProgress(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java new file mode 100755 index 000000000..16b339cfb --- /dev/null +++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java @@ -0,0 +1,38 @@ +package script.systems.veteran_reward; + +import script.menu_info; +import script.menu_info_types; +import script.obj_id; + +public class character_respec_reset_device extends script.base_script { + + public character_respec_reset_device() {} + + public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info item) throws InterruptedException { + item.addRootMenu(menu_info_types.ITEM_USE, null); + return SCRIPT_CONTINUE; + } + + public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException + { + if (item == menu_info_types.ITEM_USE) + { + // There is no way to know who the owner of this item is... expect that the container it is in is owned by the player. + if(!hasObjVar(player, "respecDeviceUsed")) { + if(getOwner(getTopMostContainer(self)) == player) { + // ok to reset respec. + if(destroyObject(self)) { + setObjVar(player, "respecDeviceUsed", 1); + setObjVar(player, "respecsBought", 0); + sendSystemMessage(player, "Your Respect Counter has been reset.", null); + }; + } else { + sendSystemMessage(player, "You are not the owner of this device.", null); + } + } else { + sendSystemMessage(player, "Your Respec Counter has already been reset on this character.", null); + } + } + return SCRIPT_CONTINUE; + } +} diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java index fad1ff20b..2862ad6ee 100755 --- a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java +++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java @@ -10,6 +10,7 @@ public class instant_travel_terminal_deed extends script.base_script public instant_travel_terminal_deed() { } + private static final String ITV_COMMAND_TABLE = "datatables/item/itv_command_list.iff"; public static final string_id LEARN_ABILITY = new string_id("item_n", "instant_travel_terminal_learn"); public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { @@ -27,46 +28,20 @@ public class instant_travel_terminal_deed extends script.base_script { if(getLevel(player) < minimumLevel){ sendSystemMessage(player, "Instant Travel vehicles may not be used until you have reached level " + minLevelSetting + ". Please use this deed again when you reach level " + minLevelSetting + " or higher.", null); + return SCRIPT_CONTINUE; } - else if (hasObjVar(self, "privateerShip")) - { - grantCommand(player, "callforprivateerpickup"); - destroyObject(self); - } - else if (hasObjVar(self, "royalShip")) - { - grantCommand(player, "callforroyalpickup"); - destroyObject(self); - } - else if (hasObjVar(self, "junk")) - { - grantCommand(player, "callforrattletrappickup"); - destroyObject(self); - } - else if (hasObjVar(self, "tcg_itv_home")) - { - grantCommand(player, "callforsolarsailerpickup"); - destroyObject(self); - } - else if (hasObjVar(self, "tcg_itv_location")) - { - grantCommand(player, "callforg9riggerpickup"); - destroyObject(self); - } - else if (hasObjVar(self, "itv_snowspeeder")) - { - grantCommand(player, "callforsnowspeeder"); - destroyObject(self); - } - else if (hasObjVar(self, "itv_slave_1")) - { - grantCommand(player, "callforslave1pickup"); - destroyObject(self); - } - else - { - grantCommand(player, "callforpickup"); - destroyObject(self); + // Make sure the default_itv is always at the bottom of the table else you will get false hits + int rows = dataTableGetNumRows(ITV_COMMAND_TABLE); + for (int i=0;i 2) phase = 2; diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java index faa0acdf2..cf3c5aca2 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java @@ -90,6 +90,7 @@ public class stage_two_crier extends script.base_script public int warningLoop(obj_id self, dictionary params) throws InterruptedException { obj_id herald = utils.getObjIdScriptVar(self, HERALD_ID); + if(!isValidId(herald) || !isValidId(self)) return SCRIPT_CONTINUE; chat.chat(herald, WARNING); messageTo(self, "warningLoop", null, 30.0f, false); return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/vector.java b/sku.0/sys.server/compiled/game/script/vector.java index 3192ff9c3..5ca50ecd5 100755 --- a/sku.0/sys.server/compiled/game/script/vector.java +++ b/sku.0/sys.server/compiled/game/script/vector.java @@ -1,5 +1,4 @@ -// vector.java - +//vector.java package script; import java.io.Serializable;