diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_1_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_1_ws.tab old mode 100644 new mode 100755 index ded07b59a..c2d50ed15 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_1_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_1_ws.tab @@ -1,6 +1,6 @@ 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 -1514964 0 object/building/tatooine/poi_darklighter_estate.iff 0 1349.55 8 1440.07 1 0 0 0 $| +1514964 0 object/building/tatooine/poi_darklighter_estate.iff 0 1349.55 8 1440.07 1 0 0 0 theme_park.tatooine.darklighter_spawner.masterspawner $| 1514965 1514964 object/cell/cell.iff 1 0 0 0 1 0 0 0 $| 1514966 1514964 object/cell/cell.iff 2 0 0 0 1 0 0 0 $| 1514967 1514964 object/cell/cell.iff 3 0 0 0 1 0 0 0 $| 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 old mode 100644 new mode 100755 index 590b4dc78..a9c82cbab --- 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 @@ -913,7 +913,7 @@ i i h i f f f f f f f s p -198096895 -124 object/tangible/ground_spawning/patrol_waypoint.iff 5 7.22876 -12 39.7195 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_wt_tech_8_10118056_1|registerWithController|0|1|$| -132 -124 object/tangible/ground_spawning/area_spawner.iff 5 9.59662 -12 50.068 -0.00464533 0 0.999989 0 systems.spawning.spawner_area fltMaxSpawnTime|2|180.000000|fltMinSpawnTime|2|90.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|legacy_wh_guard_9|strSpawnerType|4|area|strSpawns|4|tatooine/whitehorse_guard_9|$| -131 -124 object/tangible/ground_spawning/area_spawner.iff 5 -3.24281 -12 50.1217 0.540973 0 0.84104 0 systems.spawning.spawner_area fltMaxSpawnTime|2|180.000000|fltMinSpawnTime|2|90.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|legacy_wh_guard_9|strSpawnerType|4|area|strSpawns|4|tatooine/whitehorse_guard_9|$| --126 -124 object/tangible/quest/frn_all_security_terminal_wall_01.iff 5 0.0578188 -12.2214 54.6759 3.2e-008 0 1 0 conversation.eisley_thranta_payroll_terminal $| +-126 -124 object/tangible/quest/frn_all_security_terminal_wall_01.iff 5 0.0578188 -12.2214 54.6759 0 0 1 0 conversation.eisley_thranta_payroll_terminal $| -125 -124 object/tangible/quest/database_terminal.iff 5 11.2667 -12.0316 27.7806 0.771246 0 -0.636537 0 conversation.eisley_thranta_directory_terminal $| -133 -119 object/cell/cell.iff 6 0 0 0 1 0 0 0 $| -134 -119 object/cell/cell.iff 7 0 0 0 1 0 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab index 7db852a23..aeac377f7 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab @@ -2276,14 +2276,14 @@ i i h i f f f f f f f s p 1095635 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 1756.85 180 1658.59 1 0 0 0 $| 1095636 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 1818.18 180 1615.12 1 0 0 0 $| 1095637 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 1835.15 180 1614 1 0 0 0 $| --1 0 object/tangible/poi/spawnegg/jawa_spawnegg.iff 0 1422 4 1616 -0.700285 0 0.713864 0 pop|0|1|$| +-1 0 object/tangible/poi/spawnegg/jawa_spawnegg.iff 0 1422 5 1616 -0.700285 0 0.713864 0 pop|0|1|$| -2 0 object/path_waypoint/path_waypoint_jawa1.iff 0 1478 5 1643 1 0 0 0 $| -3 0 object/path_waypoint/path_waypoint_jawa2.iff 0 1441 5 1565 1 0 0 0 $| -4 0 object/path_waypoint/path_waypoint_jawa3.iff 0 1465 5 1583 1 0 0 0 $| -5 0 object/path_waypoint/path_waypoint_jawa4.iff 0 1422 5 1596 1 0 0 0 $| -6 0 object/path_waypoint/path_waypoint_jawa5.iff 0 1409 5 1651 1 0 0 0 $| -7 0 object/path_waypoint/path_waypoint_jawa6.iff 0 1401 5 1635 1 0 0 0 $| --8 0 object/tangible/poi/spawnegg/jawa_spawnegg.iff 0 1610 4 1359 -0.700285 0 0.713864 0 pop|0|3|$| +-8 0 object/tangible/poi/spawnegg/jawa_spawnegg.iff 0 1610 5 1359 -0.700285 0 0.713864 0 pop|0|3|$| -9 0 object/path_waypoint/path_waypoint_jawa1.iff 0 1609 5 1344 1 0 0 0 $| -10 0 object/path_waypoint/path_waypoint_jawa2.iff 0 1605 5 1312 1 0 0 0 $| -11 0 object/path_waypoint/path_waypoint_jawa3.iff 0 1574 5 1379 1 0 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/darklighter_estate.tab b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/darklighter_estate.tab new file mode 100755 index 000000000..c79edeb1a --- /dev/null +++ b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/darklighter_estate.tab @@ -0,0 +1,11 @@ +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/npc/epic_quest/huff_darklighter_spawner.iff lobby 1 1 3.8 180 1800 +object/tangible/poi/tatooine/poi_city_convo.iff lobby 0 0.5 -8.2 0 300 +object/tangible/poi/tatooine/poi_city_convo.iff lobby 6.4 0.5 -7.4 0 300 +object/tangible/poi/tatooine/poi_city_convo.iff livingroom1 -16.5 0.2 7.2 0 300 +object/tangible/poi/tatooine/poi_city_convo.iff kitchen -22.9 1 -8.9 0 300 +commoner world -688.7 8 -6724 -163 npc.celebrity.celebrity_spawner 300 "int:ai.defaultCalmBehavior=1" +commoner world -672.0 8 -6728.8 -144 npc.celebrity.celebrity_spawner 300 "int:ai.defaultCalmBehavior=1" +commoner world -706.9 8 -6724.2 154 npc.celebrity.celebrity_spawner 300 "int:ai.defaultCalmBehavior=1" +commoner world -722.9 8 -6728.2 138 npc.celebrity.celebrity_spawner 300 "int:ai.defaultCalmBehavior=1" diff --git a/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/huff_guard.tpf b/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/huff_guard.tpf old mode 100644 new mode 100755 diff --git a/sku.0/sys.server/compiled/game/script/npc/celebrity/huff_guard.java b/sku.0/sys.server/compiled/game/script/npc/celebrity/huff_guard.java old mode 100644 new mode 100755 index 43bc38de4..40d1a1007 --- a/sku.0/sys.server/compiled/game/script/npc/celebrity/huff_guard.java +++ b/sku.0/sys.server/compiled/game/script/npc/celebrity/huff_guard.java @@ -19,6 +19,7 @@ public class huff_guard extends script.base_script } public int OnAttach(obj_id self) throws InterruptedException { + setInvulnerable(self, true); setName(self, "Huff Darklighter's Guard"); ai_lib.setDefaultCalmBehavior(self, ai_lib.BEHAVIOR_SENTINEL); attachScript(self, "npc.static_quest.quest_convo");