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 index 9ffeaa084..cea3e390e 100755 --- 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,25 +69,37 @@ 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 theme_park.dungeon.generic_spawner spawn_table|4|datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.iff|$| +926472 0 object/building/tatooine/capitol_tatooine.iff 0 888.05 12 505.266 0.432613 0 0.90158 0 planet_map.map_loc:city.bestine.politician_event_grandparent:city.bestine.marketplace_grandparent:theme_park.dungeon.generic_spawner spawn_table|4|datatables/spawning/poi_spawner/tatooine/bestine_capitol_spawns.iff|$| 926473 926472 object/cell/cell.iff 1 0 0 0 1 0 0 0 $| 926474 926472 object/cell/cell.iff 2 0 0 0 1 0 0 0 $| 546457763 926474 object/tangible/collection/col_force_shui_painting_02.iff 2 -0.126236 4.13341 24.0755 -0.000790609 0.119712 0.992808 -9.53311e-05 $| +-47 926474 object/tangible/spawning/static_npc/bestine_capitol01.iff 2 -2.8 3.2 19.5 1 0 0 0 $| 926475 926472 object/cell/cell.iff 3 0 0 0 1 0 0 0 $| +-16 926475 object/tangible/npc/tatooine_spawn/prefect_talmont.iff 3 -1.9 3 -10 1 0 0 0 $| +-50 926475 object/tangible/spawning/static_npc/bestine_capitol04.iff 3 -0.9 7.9 -31.5 1 0 0 0 $| 926476 926472 object/cell/cell.iff 4 0 0 0 1 0 0 0 $| 926477 926472 object/cell/cell.iff 5 0 0 0 1 0 0 0 $| 926478 926472 object/cell/cell.iff 6 0 0 0 1 0 0 0 $| +-49 926478 object/tangible/spawning/static_npc/bestine_capitol03.iff 6 -20.8 3.2 -37.2 1 0 0 0 $| 926479 926472 object/cell/cell.iff 7 0 0 0 1 0 0 0 $| +-9 926479 object/tangible/npc/tatooine_spawn/tour_aryon.iff 7 -37.3 1.3 0.7 1 0 0 0 $| 926480 926472 object/cell/cell.iff 8 0 0 0 1 0 0 0 $| +-7 926480 object/tangible/spawning/static_npc/victor_visalis.iff 8 -26.5 3.2 20.3 1 0 0 0 $| +-8 926480 object/tangible/spawning/static_npc/keanna_likyna.iff 8 -18.9 3.2 20.6 1 0 0 0 $| 4892082 926480 object/tangible/collection/rare_pistol_kyd21.iff 8 -22.005 4.03342 26.0503 0.0111052 -0.70319 0.710826 0.0112306 $| 5565564 926480 object/tangible/terminal/terminal_bestine_quests_02.iff 8 -19.6625 3.22324 13.5289 1 0 0 0 $| 5565565 926480 object/tangible/furniture/modern/searchable_desk_01.iff 8 -21.6551 3.22324 25.5563 1 0 0 0 $| 926481 926472 object/cell/cell.iff 9 0 0 0 1 0 0 0 $| +-48 926481 object/tangible/spawning/static_npc/bestine_capitol02.iff 9 20.7 3.2 25 1 0 0 0 $| 5165613 926481 object/tangible/terminal/terminal_mission_imperial.iff 9 13.6185 3.22324 21.9119 0.707107 0 0.707107 0 $| 5165615 926481 object/tangible/terminal/terminal_mission_imperial.iff 9 28.3305 3.22324 21.7497 0.707107 0 -0.707106 0 $| 926482 926472 object/cell/cell.iff 10 0 0 0 1 0 0 0 $| +-15 926482 object/tangible/npc/tatooine_spawn/wilhalm_skrim.iff 10 28.8936 1.29568 -5.97518 1 0 0 0 $| 926483 926472 object/cell/cell.iff 11 0 0 0 1 0 0 0 $| +-10 926483 object/tangible/spawning/static_npc/indigo_siyan.iff 11 24.6 3.2 -30.7 1 0 0 0 $| +-11 926483 object/tangible/spawning/static_npc/sean_trenwell.iff 11 19.5 3.2 -36.0 1 0 0 0 $| 5565562 926483 object/tangible/furniture/modern/searchable_desk_02.iff 11 19.5487 3.22346 -23.8199 -0.703845 0 0.710353 0 $| +5565563 926483 object/tangible/terminal/terminal_bestine_quests_01.iff 11 28.246 3.19161 -28.4803 0.707388 0 -0.706826 0 $| 3795757 926480 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 3 -21.47 3.223 27.3 0 0 1 0 space.content_tools.npc_spawner $| 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|$| 1026825 1026824 object/cell/cell.iff 1 0 0 0 1 0 0 0 $| @@ -325,6 +337,7 @@ i i h i f f f f f f f s p 1028576 1028574 object/cell/cell.iff 2 0 0 0 1 0 0 0 $| 1028577 1028574 object/cell/cell.iff 3 0 0 0 1 0 0 0 $| 1028578 1028574 object/cell/cell.iff 4 0 0 0 1 0 0 0 $| +-6 1028578 object/tangible/spawning/static_npc/sean_questn_university.iff 4 3.6 1.1 -4.6 1 0 0 0 $| 1028579 1028574 object/cell/cell.iff 5 0 0 0 1 0 0 0 $| 1028580 1028574 object/cell/cell.iff 6 0 0 0 1 0 0 0 systems.crafting.station_cell $| 4887974 1028580 object/tangible/collection/rare_melee_hk_lance.iff 6 -8.01937 4.08892 2.10738 -0.479248 -0.480904 0.516908 0.521401 $| @@ -1049,6 +1062,7 @@ i i h i f f f f f f f s p 1528395 0 object/building/tatooine/housing_tatt_style01_med.iff 0 972.689 12 467.531 0.422132 0 0.906534 0 $| 1528396 1528395 object/cell/cell.iff 1 0 0 0 1 0 0 0 $| 1528397 1528395 object/cell/cell.iff 2 0 0 0 1 0 0 0 $| +-17 1528397 object/tangible/spawning/static_npc/sean_questp_house.iff 2 3.0 0.4 -0.2 1 0 0 0 $| 1528398 1528395 object/cell/cell.iff 3 0 0 0 1 0 0 0 $| 1528399 1528395 object/cell/cell.iff 4 0 0 0 1 0 0 0 $| 1528400 1528395 object/cell/cell.iff 5 0 0 0 1 0 0 0 $| @@ -1399,4 +1413,36 @@ i i h i f f f f f f f s p -1 0 object/tangible/poi/tatooine/bestine/bestine_marketplace_spawner_object.iff 12 1000 0 400 1 0 0 0 $| -2 0 object/tangible/poi/tatooine/bestine/bestine_city_raid_spawner_object.iff 12 1000 0 401 1 0 0 0 $| -3 0 object/tangible/creature_spawner/tusken_master_spawner.iff 0 1000 12 402 1 0 0 0 $| --4 0 object/tangible/poi/tatooine/bestine/bestine_museum_event_master_object.iff 0 953.5 14 435.1 1 0 0 0 bestine.objMuseumBuilding|0|1028167|$| +-4 0 object/tangible/poi/tatooine/bestine/bestine_city_raid_grandparent_object.iff 0 1065 12 353 1 0 0 0 $| +-12 0 object/tangible/spawning/static_npc/victor_questp_slums.iff 0 691 26 225 1 0 0 0 $| +-13 0 object/tangible/spawning/static_npc/victor_questp_hospital.iff 0 754 12 596 1 0 0 0 $| +-14 0 object/tangible/spawning/static_npc/sean_questp_market.iff 0 944 12 391 1 0 0 0 $| +-18 0 object/tangible/spawning/static_npc/hutt_informant_quest.iff 0 928.1 12 456.2 1 0 0 0 $| +-19 0 object/tangible/spawning/static_npc/sean_contact_quest.iff 0 600 10 331 1 0 0 0 $| +-20 0 object/tangible/spawning/static_npc/seans_historian.iff 0 1290 10 189 1 0 0 0 $| +-21 0 object/tangible/spawning/static_npc/bestine_rumor01.iff 0 837 12 458 1 0 0 0 $| +-22 0 object/tangible/spawning/static_npc/bestine_rumor02.iff 0 757 12 460 1 0 0 0 $| +-23 0 object/tangible/spawning/static_npc/bestine_rumor03.iff 0 860 12 471 1 0 0 0 $| +-24 0 object/tangible/spawning/static_npc/bestine_rumor04.iff 0 1037 12 400 1 0 0 0 $| +-25 0 object/tangible/spawning/static_npc/bestine_rumor05.iff 0 1042 12 382 1 0 0 0 $| +-26 0 object/tangible/spawning/static_npc/bestine_rumor06.iff 0 1000 12 437 1 0 0 0 $| +-27 0 object/tangible/spawning/static_npc/bestine_rumor07.iff 0 974 12 440 1 0 0 0 $| +-28 0 object/tangible/spawning/static_npc/bestine_rumor08.iff 0 980 12 428 1 0 0 0 $| +-29 0 object/tangible/spawning/static_npc/bestine_rumor09.iff 0 975 12 419 1 0 0 0 $| +-30 0 object/tangible/spawning/static_npc/bestine_rumor10.iff 0 968 12 400 1 0 0 0 $| +-31 0 object/tangible/spawning/static_npc/bestine_rumor11.iff 0 948 12 457 1 0 0 0 $| +-32 0 object/tangible/spawning/static_npc/bestine_rumor12.iff 0 900 12 440 1 0 0 0 $| +-33 0 object/tangible/spawning/static_npc/bestine_rumor01.iff 0 885 12 426 1 0 0 0 $| +-34 0 object/tangible/spawning/static_npc/bestine_rumor02.iff 0 885 12 453 1 0 0 0 $| +-35 0 object/tangible/spawning/static_npc/bestine_rumor03.iff 0 871 12 462 1 0 0 0 $| +-36 0 object/tangible/spawning/static_npc/bestine_rumor04.iff 0 755 12 480 1 0 0 0 $| +-37 0 object/tangible/spawning/static_npc/bestine_rumor05.iff 0 698 12 400 1 0 0 0 $| +-38 0 object/tangible/spawning/static_npc/bestine_rumor06.iff 0 652 12 318 1 0 0 0 $| +-39 0 object/tangible/spawning/static_npc/bestine_rumor07.iff 0 619 12 328 1 0 0 0 $| +-40 0 object/tangible/spawning/static_npc/bestine_rumor08.iff 0 845 12 557 1 0 0 0 $| +-41 0 object/tangible/spawning/static_npc/bestine_rumor09.iff 0 826 12 549 1 0 0 0 $| +-42 0 object/tangible/spawning/static_npc/bestine_rumor10.iff 0 852 12 543 1 0 0 0 $| +-43 0 object/tangible/spawning/static_npc/bestine_rumor11.iff 0 767 12 536 1 0 0 0 $| +-44 0 object/tangible/spawning/static_npc/bestine_rumor12.iff 0 783 12 537 1 0 0 0 $| +-45 0 object/tangible/spawning/static_npc/bestine_rumor01.iff 0 792 12 529 1 0 0 0 $| +-46 0 object/tangible/spawning/static_npc/bestine_rumor02.iff 0 798 12 551 1 0 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/planet_map/map_locations.tab b/sku.0/sys.server/compiled/game/datatables/planet_map/map_locations.tab index 0971c6669..1bee18702 100755 --- a/sku.0/sys.server/compiled/game/datatables/planet_map/map_locations.tab +++ b/sku.0/sys.server/compiled/game/datatables/planet_map/map_locations.tab @@ -6,7 +6,7 @@ object/building/tatooine/bank_tatooine.iff bank object/building/naboo/bank_naboo.iff bank object/building/corellia/bank_corellia.iff bank object/building/tatooine/cantina_tatooine.iff cantina 1 -object/building/tatooine/capitol_tatooine.iff capitol +object/building/tatooine/capitol_tatooine.iff @loc_n:bestine capitol object/building/tatooine/guild_combat_tatooine_style_01.iff guild guild_combat object/building/tatooine/guild_commerce_tatooine_style_01.iff guild guild_commerce object/building/tatooine/guild_theater_tatooine_style_01.iff guild guild_theater 1 @@ -107,4 +107,4 @@ object/building/naboo/rori_restuss_starport.iff starport object/building/naboo/rori_restuss_shuttleport.iff shuttleport object/building/dathomir/dathomir_quarantine_zone_starport.iff starport object/building/dathomir/dathomir_quarantine_zone_cantina.iff cantina -object/building/tatooine/bestine_museum.iff @map_loc_n:bestine museum +object/building/tatooine/bestine_museum.iff @loc_n:bestine museum 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 index 54fa09741..32e76bd7a 100755 --- 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 @@ -2,4 +2,4 @@ spawns name room loc_x loc_y loc_z yaw script mood animation_mood respawn_time s 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" +object/tangible/spawning/static_npc/victor_questn_cantina.iff alcove4 3.1 -0.9 22.6 -179 10 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 deleted file mode 100755 index 9eb32de1f..000000000 --- a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/bestine_artist_spawns.tab +++ /dev/null @@ -1,8 +0,0 @@ -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" 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 index 78ab33fec..a45a617d5 100755 --- 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 @@ -1,17 +1,6 @@ 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 -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" diff --git a/sku.0/sys.server/compiled/game/object/building/tatooine/bestine_museum.tpf b/sku.0/sys.server/compiled/game/object/building/tatooine/bestine_museum.tpf new file mode 100755 index 000000000..5988bc421 --- /dev/null +++ b/sku.0/sys.server/compiled/game/object/building/tatooine/bestine_museum.tpf @@ -0,0 +1,27 @@ +// Filename: housing_tatt_style01_large +// Directory: object/building/tatooine +// +// Description: +// Housing Tatooine Style01-small +// +// Notes: +// +// +// Category: Building +// Sub-Category: Tatooine +// Classification: Null +// + +@base object/building/base/base_housing.iff + +@class building_object_template 0 + + +@class tangible_object_template 0 + + +@class object_template 0 + +sharedTemplate = "object/building/tatooine/shared_housing_tatt_style01_large.iff" + +scripts = +["city.bestine.museum_event_grandparent"] diff --git a/sku.0/sys.server/compiled/game/script/base/remote_object.java b/sku.0/sys.server/compiled/game/script/base/remote_object.java old mode 100644 new mode 100755 index d3cfebfce..abde3b70e --- a/sku.0/sys.server/compiled/game/script/base/remote_object.java +++ b/sku.0/sys.server/compiled/game/script/base/remote_object.java @@ -1,13 +1,5 @@ package script.base; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - public class remote_object extends script.base_script { public remote_object() diff --git a/sku.0/sys.server/compiled/game/script/base/remote_object_creator.java b/sku.0/sys.server/compiled/game/script/base/remote_object_creator.java old mode 100644 new mode 100755 index 3e66a2d4d..f751bba3d --- a/sku.0/sys.server/compiled/game/script/base/remote_object_creator.java +++ b/sku.0/sys.server/compiled/game/script/base/remote_object_creator.java @@ -1,13 +1,6 @@ package script.base; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.create; import script.library.space_create; import script.library.space_quest; @@ -74,11 +67,9 @@ public class remote_object_creator extends script.base.remote_object if (params.containsKey(ATTACH_SCRIPTS)) { String[] scripts = split(params.getString(ATTACH_SCRIPTS), ':'); - for (int i = 0; i < scripts.length; ++i) - { - if (!hasScript(created, scripts[i])) - { - attachScript(created, scripts[i]); + for (String script : scripts) { + if (!hasScript(created, script)) { + attachScript(created, script); } } } diff --git a/sku.0/sys.server/compiled/game/script/base/remote_object_requester.java b/sku.0/sys.server/compiled/game/script/base/remote_object_requester.java old mode 100644 new mode 100755 index a85c4c783..87918000b --- a/sku.0/sys.server/compiled/game/script/base/remote_object_requester.java +++ b/sku.0/sys.server/compiled/game/script/base/remote_object_requester.java @@ -1,14 +1,8 @@ package script.base; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.utils; +import script.obj_id; public class remote_object_requester extends script.base.remote_object { @@ -93,8 +87,7 @@ public class remote_object_requester extends script.base.remote_object public int remoteCreate() throws InterruptedException { obj_id self = getSelf(); - int requestId = getClusterWideData(REMOTE_OBJECT_MANAGER, "*", false, self); - return requestId; + return getClusterWideData(REMOTE_OBJECT_MANAGER, "*", false, self); } public String getSceneNameVarName(int requestId) throws InterruptedException { @@ -170,7 +163,6 @@ public class remote_object_requester extends script.base.remote_object public obj_id getRemoteObjectCreator(obj_id self, int requestId, String[] elementNameList, dictionary[] dictionaryList) throws InterruptedException { int randomIndex = rand(0, dictionaryList.length); - obj_id remoteObjectCreator = dictionaryList[randomIndex].getObjId(CREATOR); - return remoteObjectCreator; + return dictionaryList[randomIndex].getObjId(CREATOR); } } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.java b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.java old mode 100644 new mode 100755 index ac867d09c..9a3f542d8 --- a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_grandparent.java @@ -1,12 +1,8 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.dictionary; +import script.location; +import script.obj_id; public class city_raid_grandparent extends script.base_script { @@ -31,6 +27,8 @@ public class city_raid_grandparent extends script.base_script location locTest = getLocation(self); locTest.x = locTest.x + 1; obj_id objRaidSpawner = createObject(MASTER_OBJECT_TEMPLATE, locTest); + persistObject(objRaidSpawner); + setObjVar(self, "objRaidSpawner", objRaidSpawner); String strDataTable = getStringObjVar(self, "strDataTable"); setObjVar(objRaidSpawner, "strDataTable", strDataTable); diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_mob.java b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_mob.java old mode 100644 new mode 100755 index 3d217e24b..b03ce7e47 --- a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_mob.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_mob.java @@ -1,12 +1,6 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.obj_id; public class city_raid_mob extends script.base_script { @@ -19,9 +13,8 @@ public class city_raid_mob extends script.base_script } public int OnDeath(obj_id self, obj_id killer, obj_id corpseId) throws InterruptedException { - obj_id objRaidSpawner = getObjIdObjVar(self, "objRaidSpawner"); setObjVar(self, "alreadySentDeathMessage", 1); - messageTo(objRaidSpawner, "elementDestroyed", null, 1, false); + messageTo(getObjIdObjVar(self, "objRaidSpawner"), "elementDestroyed", null, 1, false); return SCRIPT_CONTINUE; } public int OnDestroy(obj_id self) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_spawner.java old mode 100644 new mode 100755 index 88b258f90..0ae8d5f84 --- a/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/city_raid_spawner.java @@ -1,17 +1,11 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.factions; +import script.deltadictionary; +import script.dictionary; import script.library.create; -import script.library.hq; import script.library.utils; +import script.location; +import script.obj_id; public class city_raid_spawner extends script.base_script { @@ -70,7 +64,7 @@ public class city_raid_spawner extends script.base_script if (hasObjVar(self, "bestine.electionWinner")) { String electionWinner = getStringObjVar(self, "bestine.electionWinner"); - if (electionWinner.equals("Victor") || electionWinner.equals("victor")) + if (electionWinner.equalsIgnoreCase("Victor")) { intMinRecycleTime = dctInfo.getInt("intMinDefenseRecycleTime"); dctScriptVars.put("intMinRecycleTime", intMinRecycleTime); @@ -109,16 +103,13 @@ public class city_raid_spawner extends script.base_script location locSelf = getLocation(self); String strPlanet = locSelf.area; location locSpawnLocation = new location(coordX, coordY, coordZ, strPlanet, null); - if (locSpawnLocation != null) - { - int intSpawnChoice = rand(0, (strSpawns.length - 1)); - obj_id objMob = create.object(strSpawns[intSpawnChoice], locSpawnLocation); - if (isIdValid(objMob)) - { - attachScript(objMob, "city.bestine.city_raid_mob"); - setObjVar(objMob, "objRaidSpawner", self); - } - } + int intSpawnChoice = rand(0, (strSpawns.length - 1)); + obj_id objMob = create.object(strSpawns[intSpawnChoice], locSpawnLocation); + if (isIdValid(objMob)) + { + attachScript(objMob, "city.bestine.city_raid_mob"); + setObjVar(objMob, "objRaidSpawner", self); + } intIndex = intIndex + 1; dctScriptVars.put("intIndex", intIndex); if (intIndex < intWaveSize) @@ -146,16 +137,13 @@ public class city_raid_spawner extends script.base_script location locSelf = getLocation(self); String strPlanet = locSelf.area; location locSpawnLocation = new location(coordX, coordY, coordZ, strPlanet, null); - if (locSpawnLocation != null) - { - int intSpawnChoice = rand(0, (strSpawns.length - 1)); - obj_id objMob = create.object(strSpawns[intSpawnChoice], locSpawnLocation); - if (isIdValid(objMob)) - { - attachScript(objMob, "city.bestine.city_raid_mob"); - setObjVar(objMob, "objRaidSpawner", self); - } - } + int intSpawnChoice = rand(0, (strSpawns.length - 1)); + obj_id objMob = create.object(strSpawns[intSpawnChoice], locSpawnLocation); + if (isIdValid(objMob)) + { + attachScript(objMob, "city.bestine.city_raid_mob"); + setObjVar(objMob, "objRaidSpawner", self); + } intIndex = intIndex + 1; dctScriptVars.put("intIndex", intIndex); int intWaveSize = dctScriptVars.getInt("intWaveSize"); diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/hutt_informant_approach.java b/sku.0/sys.server/compiled/game/script/city/bestine/hutt_informant_approach.java old mode 100644 new mode 100755 index ef152778a..602a8d1f7 --- a/sku.0/sys.server/compiled/game/script/city/bestine/hutt_informant_approach.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/hutt_informant_approach.java @@ -1,15 +1,9 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.utils; import script.library.chat; +import script.library.utils; +import script.obj_id; +import script.string_id; public class hutt_informant_approach extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_grandparent.java b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_grandparent.java old mode 100644 new mode 100755 index 5fdfbc2a1..961b7be5a --- a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_grandparent.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_grandparent.java @@ -1,12 +1,8 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.dictionary; +import script.location; +import script.obj_id; public class marketplace_grandparent extends script.base_script { @@ -31,7 +27,10 @@ public class marketplace_grandparent extends script.base_script location locTest = getLocation(self); locTest.x = locTest.x + 1; obj_id objMarketplaceSpawner = createObject(MASTER_OBJECT, locTest); + persistObject(objMarketplaceSpawner); + setObjVar(self, "objMarketplaceSpawner", objMarketplaceSpawner); + String strDataTable = "datatables/city/bestine_marketplace.iff"; setObjVar(objMarketplaceSpawner, "strDataTable", strDataTable); } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_npc.java b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_npc.java old mode 100644 new mode 100755 index fd51a901f..38edb6f42 --- a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_npc.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_npc.java @@ -1,12 +1,7 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.dictionary; +import script.obj_id; public class marketplace_npc extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_spawner.java old mode 100644 new mode 100755 index f151e965f..f9c82e8ac --- a/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/marketplace_spawner.java @@ -1,15 +1,10 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.create; -import script.library.utils; +import script.location; +import script.obj_id; +import script.string_id; public class marketplace_spawner extends script.base_script { @@ -52,76 +47,29 @@ public class marketplace_spawner extends script.base_script if (hasObjVar(self, "bestine.electionWinner")) { String electionWinner = getStringObjVar(self, "bestine.electionWinner"); - if (electionWinner.equals("sean") || electionWinner.equals("Sean")) + if (electionWinner.equalsIgnoreCase("sean")) { - string_id merchant_titleId = new string_id("bestine", "merchant_title"); - String merchant_title = utils.packStringId(merchant_titleId); - location merchant01Location = new location(-1135.28f, 0.0f, -3688.03f, "tatooine", null); - obj_id merchant01 = create.staticObject("commoner", merchant01Location); - setYaw(merchant01, 61); - setInvulnerable(merchant01, true); - setCreatureStatic(merchant01, true); - String merchant01Template = getTemplateName(merchant01); - String merchant01Name = generateRandomName(merchant01Template); - string_id merchant01NameComplete = new string_id(STF, "merchant01"); - setName(merchant01, merchant01NameComplete); - setObjVar(merchant01, "marketplaceSpawner", self); - attachScript(merchant01, "city.bestine.marketplace_npc"); - location merchant02Location = new location(-1133.53f, 0.0f, -3693.98f, "tatooine", null); - obj_id merchant02 = create.staticObject("artisan", merchant02Location); - setYaw(merchant02, 90); - setInvulnerable(merchant02, true); - setCreatureStatic(merchant02, true); - String merchant02Template = getTemplateName(merchant02); - String merchant02Name = generateRandomName(merchant02Template); - string_id merchant02NameComplete = new string_id(STF, "merchant02"); - setName(merchant02, merchant02NameComplete); - setObjVar(merchant02, "marketplaceSpawner", self); - attachScript(merchant02, "city.bestine.marketplace_npc"); + createMerchant(self, "commoner", new location(-1135.28f, 0.0f, -3688.03f, "tatooine", null), 61, new string_id(STF, "merchant01")); + + createMerchant(self, "artisan", new location(-1133.53f, 0.0f, -3693.98f, "tatooine", null), 90, new string_id(STF, "merchant02")); + int merchant03Chance = rand(1, 5); if (merchant03Chance == 2) { - location merchant03Location = new location(-1126f, 0.0f, -3673.42f, "tatooine", null); - obj_id merchant03 = create.staticObject("artisan", merchant03Location); - setYaw(merchant03, -110); - setInvulnerable(merchant03, true); - setCreatureStatic(merchant03, true); - String merchant03Template = getTemplateName(merchant03); - String merchant03Name = generateRandomName(merchant03Template); - string_id merchant03NameComplete = new string_id(STF, "merchant03"); - setName(merchant03, merchant03NameComplete); - setObjVar(merchant03, "marketplaceSpawner", self); - attachScript(merchant03, "city.bestine.marketplace_npc"); + obj_id merchant03 = createMerchant(self, "artisan", new location(-1126f, 0.0f, -3673.42f, "tatooine", null), -110, new string_id(STF, "merchant03")); attachScript(merchant03, "conversation.bestine_stone_merchant"); } - location merchant04Location = new location(-1115.29f, 0.0f, -3709.47f, "tatooine", null); - obj_id merchant04 = create.staticObject("scientist", merchant04Location); - setYaw(merchant04, 7); - setInvulnerable(merchant04, true); - setCreatureStatic(merchant04, true); - String merchant04Template = getTemplateName(merchant04); - String merchant04Name = generateRandomName(merchant04Template); - string_id merchant04NameComplete = new string_id(STF, "merchant04"); - setName(merchant04, merchant04NameComplete); - setObjVar(merchant04, "marketplaceSpawner", self); - attachScript(merchant04, "city.bestine.marketplace_npc"); + createMerchant(self, "scientist", new location(-1115.29f, 0.0f, -3709.47f, "tatooine", null), 7, new string_id(STF, "merchant04")); + int SpecialChance = rand(1, 5); if (SpecialChance == 5) { - location merchantSpecialLocation = new location(-1136.64f, 0.0f, -3667.40f, "tatooine", null); - obj_id merchantSpecial = create.staticObject("noble", merchantSpecialLocation); - setYaw(merchantSpecial, -175); - setInvulnerable(merchantSpecial, true); - setCreatureStatic(merchantSpecial, true); - String merchantSpecialTemplate = getTemplateName(merchantSpecial); - String merchantSpecialName = generateRandomName(merchantSpecialTemplate); - string_id merchantSpecialNameComplete = new string_id(STF, "merchantSpecial"); - setName(merchantSpecial, merchantSpecialNameComplete); - setObjVar(merchantSpecial, "marketplaceSpawner", self); - attachScript(merchantSpecial, "city.bestine.marketplace_npc"); + createMerchant(self, "noble", new location(-1136.64f, 0.0f, -3667.40f, "tatooine", null), -175, new string_id(STF, "merchantSpecial")); } + location soundobjectLocation = new location(-1124.35f, 12.0f, -3695.85f, "tatooine", null); obj_id soundobject = createObject("object/soundobject/soundobject_marketplace_large.iff", soundobjectLocation); + setObjVar(soundobject, "marketplaceSpawner", self); attachScript(soundobject, "city.bestine.marketplace_npc"); setObjVar(self, "marketplaceSpawned", 1); @@ -160,4 +108,14 @@ public class marketplace_spawner extends script.base_script } return SCRIPT_CONTINUE; } + private obj_id createMerchant(obj_id self, String type, location loc, int yaw, string_id merchantName) throws InterruptedException{ + obj_id merchant = create.staticObject(type, loc); + setYaw(merchant, yaw); + setInvulnerable(merchant, true); + setCreatureStatic(merchant, true); + setName(merchant, merchantName); + setObjVar(merchant, "marketplaceSpawner", self); + attachScript(merchant, "city.bestine.marketplace_npc"); + return merchant; + } } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.java b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.java index 0f2dd73dc..b520852ab 100755 --- a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_grandparent.java @@ -1,7 +1,6 @@ package script.city.bestine; import script.*; -import script.library.create; import script.library.utils; import java.util.Vector; @@ -61,6 +60,7 @@ public class museum_event_grandparent extends script.base_script location locTest = getLocation(self); locTest.x = locTest.x + 1; obj_id objMuseumEventMaster = createObject(MASTER_OBJECT_TEMPLATE, locTest); + persistObject(objMuseumEventMaster); dctScriptVars.put("objMasterObjectId", objMuseumEventMaster); dctScriptVars.put(VARNAME_MUSEUM_STATUS, "museumEventStarted"); diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_npc.java b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_npc.java index dd76542d7..2be1e4264 100755 --- a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_npc.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_npc.java @@ -1,17 +1,8 @@ package script.city.bestine; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.ai_lib; -import script.library.chat; import script.library.planetary_map; -import script.library.utils; public class museum_event_npc extends script.base_script { @@ -60,8 +51,7 @@ public class museum_event_npc extends script.base_script } public int handleCuratorSetup(obj_id self, dictionary params) throws InterruptedException { - String creatureName = ai_lib.getCreatureName(self); - if (!creatureName.equals("lilas_dinhint")) + if (!ai_lib.getCreatureName(self).equals("lilas_dinhint")) { return SCRIPT_CONTINUE; } @@ -194,66 +184,62 @@ public class museum_event_npc extends script.base_script } else if (votesForEntry01 == votesForEntry02 && votesForEntry02 == votesForEntry03) { - int chance = rand(1, 3); - switch (chance) + switch (rand(1, 3)) { case 1: - museumEventWinner = entry01; - museumEventWinnerArtworkIndex = index01; - break; + museumEventWinner = entry01; + museumEventWinnerArtworkIndex = index01; + break; case 2: - museumEventWinner = entry02; - museumEventWinnerArtworkIndex = index02; - break; + museumEventWinner = entry02; + museumEventWinnerArtworkIndex = index02; + break; case 3: - museumEventWinner = entry03; - museumEventWinnerArtworkIndex = index03; - break; + museumEventWinner = entry03; + museumEventWinnerArtworkIndex = index03; + break; } } - else if (votesForEntry01 == votesForEntry02 && votesForEntry02 != votesForEntry03) + else if (votesForEntry01 == votesForEntry02) { - int chance = rand(1, 2); - switch (chance) + switch (rand(1, 2)) { case 1: - museumEventWinner = entry01; - museumEventWinnerArtworkIndex = index01; - break; + museumEventWinner = entry01; + museumEventWinnerArtworkIndex = index01; + break; case 2: - museumEventWinner = entry02; - museumEventWinnerArtworkIndex = index02; - break; + museumEventWinner = entry02; + museumEventWinnerArtworkIndex = index02; + break; } } - else if (votesForEntry01 == votesForEntry03 && votesForEntry03 != votesForEntry02) + else if (votesForEntry01 == votesForEntry03) { - int chance = rand(1, 2); - switch (chance) + switch (rand(1, 2)) { case 1: - museumEventWinner = entry01; - museumEventWinnerArtworkIndex = index01; - break; + museumEventWinner = entry01; + museumEventWinnerArtworkIndex = index01; + break; case 2: - museumEventWinner = entry03; - museumEventWinnerArtworkIndex = index03; - break; + museumEventWinner = entry03; + museumEventWinnerArtworkIndex = index03; + break; } } - else if (votesForEntry02 == votesForEntry03 && votesForEntry03 != votesForEntry01) + else if (votesForEntry02 == votesForEntry03) { - int chance = rand(1, 2); - switch (chance) + switch (rand(1, 2)) { case 1: - museumEventWinner = entry02; - museumEventWinnerArtworkIndex = index02; - break; + museumEventWinner = entry02; + museumEventWinnerArtworkIndex = index02; + break; case 2: - museumEventWinner = entry03; - museumEventWinnerArtworkIndex = index03; - break; + museumEventWinner = entry03; + museumEventWinnerArtworkIndex = index03; + break; } } else @@ -303,16 +289,14 @@ public class museum_event_npc extends script.base_script { messageTo(self, "handleCuratorSetup", null, 10, false); } - String museumEventStatusObjvar = "bestine." + museumEventStatus; - setObjVar(self, museumEventStatusObjvar, museumEventNum); + setObjVar(self, "bestine." + museumEventStatus, museumEventNum); setObjVar(self, "bestine.museumEventWinner", museumEventWinner); setObjVar(self, "bestine.museumEventWinnerArtworkIndex", museumEventWinnerArtworkIndex); msgData.put(VARNAME_MUSEUM_WINNER, museumEventWinner); msgData.put(VARNAME_MUSEUM_WINNER_ARTWORK_INDEX, museumEventWinnerArtworkIndex); - obj_id museumBuilding = getObjIdObjVar(self, OBJVAR_MUSEUM_BUILDING); - messageTo(museumBuilding, "handleSetMuseumEventWinner", msgData, 10, false); + messageTo(getObjIdObjVar(self, OBJVAR_MUSEUM_BUILDING), "handleSetMuseumEventWinner", msgData, 10, false); return SCRIPT_CONTINUE; } public int handleMuseumEventNpcSetup(obj_id self, dictionary params) throws InterruptedException @@ -372,8 +356,7 @@ public class museum_event_npc extends script.base_script { clearMuseumEventObjvars(self); String museumEventStatus = params.getString(VARNAME_MUSEUM_STATUS); - String museumEventStatusObjvar = "bestine." + museumEventStatus; - setObjVar(self, museumEventStatusObjvar, params.getInt(VARNAME_MUSEUM_NUM)); + setObjVar(self, "bestine." + museumEventStatus, params.getInt(VARNAME_MUSEUM_NUM)); setObjVar(self, "bestine.museumEventWinner", params.getString(VARNAME_MUSEUM_WINNER)); if (museumEventStatus.equals("museumEventStarted")) { diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.java index 0b8d2bb84..5667b3292 100755 --- a/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/museum_event_spawner.java @@ -22,23 +22,23 @@ public class museum_event_spawner extends script.base_script public int checkForMuseumBuilding(obj_id self, dictionary params) throws InterruptedException { LOG("museum","Starting to look for Bestine's museum."); - location here = getLocation(self); deltadictionary dctScriptVars = self.getScriptVars(); int numMuseumChecks = dctScriptVars.getInt("numMuseumChecks"); map_location[] allRegisteredMuseums = getPlanetaryMapLocations("museum", ""); + location here = getLocation(self); if (allRegisteredMuseums != null && allRegisteredMuseums.length != 0) { obj_id objMuseumBuilding = null; - for (int m = 0; m < allRegisteredMuseums.length; m++) - { - LOG("museum","Found " + allRegisteredMuseums.length + " registered museums."); - map_location registeredMuseum = allRegisteredMuseums[m]; - String museumNameCodeString = registeredMuseum.getLocationName(); - if (museumNameCodeString != null && museumNameCodeString.equals("Bestine")) - { + map_location registeredMuseum; + String museumName; + for (map_location allRegisteredMuseum : allRegisteredMuseums) { + LOG("museum", "Found " + allRegisteredMuseums.length + " registered museums."); + registeredMuseum = allRegisteredMuseum; + museumName = getString(utils.unpackString(registeredMuseum.getLocationName())); + if (museumName != null && museumName.equals("Bestine")) { objMuseumBuilding = registeredMuseum.getLocationId(); - LOG("museum","Found Bestine's museum - has objid of " + objMuseumBuilding); + LOG("museum", "Found Bestine's museum - has objid of " + objMuseumBuilding); } } if (!isIdValid(objMuseumBuilding)) diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.java b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.java old mode 100644 new mode 100755 index 0d0d17161..0e590a48f --- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_grandparent.java @@ -1,13 +1,6 @@ package script.city.bestine; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.utils; public class politician_event_grandparent extends script.base_script @@ -40,6 +33,8 @@ public class politician_event_grandparent extends script.base_script location locTest = getLocation(self); locTest.x = locTest.x + 1; obj_id objPoliticianEventMaster = createObject(MASTER_OBJECT_TEMPLATE, locTest); + persistObject(objPoliticianEventMaster); + dctScriptVars.put("objMasterObjectId", objPoliticianEventMaster); dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionStarted"); dctScriptVars.put(VARNAME_ELECTION_WINNER, "none"); @@ -52,18 +47,19 @@ public class politician_event_grandparent extends script.base_script { obj_id objCapitolLobby = getCellId(self, "lobby"); location locMissingNpcSpawnerLocation = new location(6.10f, 0.30f, -0.49f, "tatooine", objCapitolLobby); - 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"); + obj_id[] objMissingNpcSpawnerIds = getAllObjectsWithTemplate(locMissingNpcSpawnerLocation, 10, MISSING_NPC_TEMPLATE); + + if ( objMissingNpcSpawnerIds == null || objMissingNpcSpawnerIds.length < 1 ) { + createObject(MISSING_NPC_TEMPLATE, locMissingNpcSpawnerLocation); + } + return SCRIPT_CONTINUE; } public void updatePoliticianEventStatus(obj_id self) throws InterruptedException { deltadictionary dctScriptVars = self.getScriptVars(); obj_id masterObjectId = dctScriptVars.getObjId("objMasterObjectId"); + int intElectionNum = 1; obj_var_list varList = getObjVarList(masterObjectId, "bestine"); if (varList != null) @@ -73,56 +69,56 @@ public class politician_event_grandparent extends script.base_script { obj_var var = varList.getObjVar(i); String varName = var.getName(); - if (varName.equals("electionStarted")) - { - intElectionNum = var.getIntData(); - dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionStarted"); - dctScriptVars.put(VARNAME_ELECTION_NUM, intElectionNum); - } - else if (varName.equals("electionEnded")) - { - intElectionNum = var.getIntData(); - dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionEnded"); - dctScriptVars.put(VARNAME_ELECTION_NUM, intElectionNum); - } - else if (varName.equals("electionWinner")) - { - String strVarValue = var.getStringData(); - dctScriptVars.put(VARNAME_ELECTION_WINNER, strVarValue); - } - else if (varName.equals("votesForSean")) - { - int intVotesForSean = var.getIntData(); - dctScriptVars.put("intVotesForSean", intVotesForSean); - } - else if (varName.equals("votesForVictor")) - { - int intVotesForVictor = var.getIntData(); - dctScriptVars.put("intVotesForVictor", intVotesForVictor); - } - else if (varName.equals("timeNextElectionStarts")) - { - int timeNextElectionStarts = var.getIntData(); - dctScriptVars.put("timeNextElectionStarts", timeNextElectionStarts); + switch (varName) { + case "electionStarted": + intElectionNum = var.getIntData(); + dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionStarted"); + dctScriptVars.put(VARNAME_ELECTION_NUM, intElectionNum); + break; + case "electionEnded": + intElectionNum = var.getIntData(); + dctScriptVars.put(VARNAME_ELECTION_STATUS, "electionEnded"); + dctScriptVars.put(VARNAME_ELECTION_NUM, intElectionNum); + break; + case "electionWinner": + String strVarValue = var.getStringData(); + dctScriptVars.put(VARNAME_ELECTION_WINNER, strVarValue); + break; + case "votesForSean": + int intVotesForSean = var.getIntData(); + dctScriptVars.put("intVotesForSean", intVotesForSean); + break; + case "votesForVictor": + int intVotesForVictor = var.getIntData(); + dctScriptVars.put("intVotesForVictor", intVotesForVictor); + break; + case "timeNextElectionStarts": + int timeNextElectionStarts = var.getIntData(); + dctScriptVars.put("timeNextElectionStarts", timeNextElectionStarts); + break; } } } - return; } public int handlePoliticianEventStateChange(obj_id self, dictionary params) throws InterruptedException { updatePoliticianEventStatus(self); + deltadictionary dctScriptVars = self.getScriptVars(); obj_id objBestineGovernor = dctScriptVars.getObjId("objBestineGovernor"); + dictionary dctParams = new dictionary(); dctParams.put(VARNAME_ELECTION_STATUS, dctScriptVars.getString(VARNAME_ELECTION_STATUS)); dctParams.put(VARNAME_ELECTION_WINNER, dctScriptVars.getString(VARNAME_ELECTION_WINNER)); dctParams.put(VARNAME_ELECTION_NUM, dctScriptVars.getInt(VARNAME_ELECTION_NUM)); + if (utils.hasScriptVar(self, "timeNextElectionStarts")) { dctParams.put("timeNextElectionStarts", dctScriptVars.getInt("timeNextElectionStarts")); } + messageTo(objBestineGovernor, "handleElectionStateChangeGovernorAlert", dctParams, 1, false); + return SCRIPT_CONTINUE; } public int handleSetElectionWinner(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_master.java b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_master.java old mode 100644 new mode 100755 index 20519c237..70678184c --- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_master.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_master.java @@ -1,14 +1,8 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.utils; +import script.obj_id; public class politician_event_master extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_npc.java b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_npc.java old mode 100644 new mode 100755 index 315f85174..3067feb9e --- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_npc.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_npc.java @@ -101,8 +101,7 @@ public class politician_event_npc extends script.base_script { return SCRIPT_CONTINUE; } - String creatureName = ai_lib.getCreatureName(self); - if (!creatureName.equals("tour_aryon")) + if (!ai_lib.getCreatureName(self).equals("tour_aryon")) { return SCRIPT_CONTINUE; } @@ -230,10 +229,10 @@ public class politician_event_npc extends script.base_script public int checkForCapitolBuilding(obj_id self, dictionary params) throws InterruptedException { map_location tatooineCapitol = planetary_map.findClosestLocation(self, "capitol", ""); - obj_id tatooinCapitolObjId = tatooineCapitol.getLocationId(); + obj_id tatooineCapitolObjId = tatooineCapitol.getLocationId(); deltadictionary dctScriptVars = self.getScriptVars(); int numCapitolChecks = dctScriptVars.getInt("numCapitolChecks"); - if (!isIdValid(tatooinCapitolObjId)) + if (!isIdValid(tatooineCapitolObjId)) { if (numCapitolChecks < 4) { @@ -250,7 +249,7 @@ public class politician_event_npc extends script.base_script } else { - setObjVar(self, OBJVAR_TATOOINE_CAPITOL, tatooinCapitolObjId); + setObjVar(self, OBJVAR_TATOOINE_CAPITOL, tatooineCapitolObjId); messageTo(self, "handlePoliticianEventNpcSetup", null, 1, false); } return SCRIPT_CONTINUE; @@ -278,6 +277,5 @@ public class politician_event_npc extends script.base_script { removeObjVar(self, "bestine.electionWinner"); } - return; } } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.java old mode 100644 new mode 100755 index ef751acda..8de4064ce --- a/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/politician_event_spawner.java @@ -1,17 +1,9 @@ package script.city.bestine; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; import script.library.ai_lib; +import script.library.create; import script.library.utils; -import script.library.planetary_map; public class politician_event_spawner extends script.base_script { @@ -25,13 +17,6 @@ public class politician_event_spawner extends script.base_script messageTo(self, "checkForCapitolBuilding", null, 60, false); return SCRIPT_CONTINUE; } - public int OnAttach(obj_id self) throws InterruptedException - { - deltadictionary dctScriptVars = self.getScriptVars(); - dctScriptVars.put("numCapitolChecks", 1); - messageTo(self, "checkForCapitolBuilding", null, 60, false); - return SCRIPT_CONTINUE; - } public int checkForCapitolBuilding(obj_id self, dictionary params) throws InterruptedException { location here = getLocation(self); @@ -40,19 +25,15 @@ public class politician_event_spawner extends script.base_script map_location[] allRegisteredCapitols = getPlanetaryMapLocations("capitol", ""); if (allRegisteredCapitols != null && allRegisteredCapitols.length != 0) { - obj_id tatooinCapitolObjId = null; - for (int m = 0; m < allRegisteredCapitols.length; m++) - { - map_location tatooinCapitol = allRegisteredCapitols[m]; - String capitolNameCodeString = tatooinCapitol.getLocationName(); - string_id capitolNameStringId = utils.unpackString(capitolNameCodeString); - String capitolName = getString(capitolNameStringId); - if (capitolName != null && capitolName.equals("Bestine")) - { - tatooinCapitolObjId = tatooinCapitol.getLocationId(); + obj_id tatooineCapitolObjId = null; + String capitolName; + for (map_location tatooineCapitol : allRegisteredCapitols) { + capitolName = getString(utils.unpackString(tatooineCapitol.getLocationName())); + if (capitolName != null && capitolName.equals("Bestine")) { + tatooineCapitolObjId = tatooineCapitol.getLocationId(); } } - if (!isIdValid(tatooinCapitolObjId)) + if (!isIdValid(tatooineCapitolObjId)) { if (numCapitolChecks <= 30) { @@ -69,7 +50,7 @@ public class politician_event_spawner extends script.base_script } else { - dctScriptVars.put("tatooinCapitolObjId", tatooinCapitolObjId); + dctScriptVars.put("tatooineCapitolObjId", tatooineCapitolObjId); spawnNpc(self); } } @@ -102,8 +83,8 @@ public class politician_event_spawner extends script.base_script setCreatureStatic(npc, true); ai_lib.setDefaultCalmBehavior(npc, ai_lib.BEHAVIOR_SENTINEL); deltadictionary dctScriptVars = self.getScriptVars(); - obj_id tatooinCapitolObjId = dctScriptVars.getObjId("tatooinCapitolObjId"); - setObjVar(npc, "bestine.tatooineCapitolObjId", tatooinCapitolObjId); + obj_id tatooineCapitolObjId = dctScriptVars.getObjId("tatooineCapitolObjId"); + setObjVar(npc, "bestine.tatooineCapitolObjId", tatooineCapitolObjId); attachScript(npc, "city.bestine.politician_event_npc"); if (hasObjVar(self, "quest_script")) { @@ -126,6 +107,5 @@ public class politician_event_spawner extends script.base_script } } } - return; } } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/search_item.java b/sku.0/sys.server/compiled/game/script/city/bestine/search_item.java old mode 100644 new mode 100755 index ef9e2205d..9642fd88f --- a/sku.0/sys.server/compiled/game/script/city/bestine/search_item.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/search_item.java @@ -1,14 +1,10 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.utils; +import script.menu_info; +import script.menu_info_types; +import script.obj_id; +import script.string_id; public class search_item extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java b/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java old mode 100644 new mode 100755 index 5b5dec3a2..09a8475ff --- a/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java @@ -1,15 +1,7 @@ package script.city.bestine; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.utils; -import script.library.sui; public class terminal_items extends script.base_script { @@ -76,7 +68,7 @@ public class terminal_items extends script.base_script { if (canSearch(self, player)) { - int menuOption = mi.addRootMenu(menu_info_types.ITEM_USE, new string_id(CONVO, "download")); + mi.addRootMenu(menu_info_types.ITEM_USE, new string_id(CONVO, "download")); } } return SCRIPT_CONTINUE; @@ -124,9 +116,7 @@ public class terminal_items extends script.base_script boolean result = false; if (hasObjVar(self, "disk")) { - String objectTemplate = getStringObjVar(self, "disk"); - dictionary row = dataTableGetRow(DATATABLE_NAME, objectTemplate); - String gatingObjVar = row.getString("gatingObjVar"); + String gatingObjVar = dataTableGetRow(DATATABLE_NAME, getStringObjVar(self, "disk")).getString("gatingObjVar"); if (hasObjVar(player, gatingObjVar)) { result = true; diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/tusken_master_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/tusken_master_spawner.java old mode 100644 new mode 100755 index 81180ab49..5c92534b7 --- a/sku.0/sys.server/compiled/game/script/city/bestine/tusken_master_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/tusken_master_spawner.java @@ -1,15 +1,11 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.deltadictionary; +import script.dictionary; import script.library.create; import script.library.utils; +import script.location; +import script.obj_id; public class tusken_master_spawner extends script.base_script { @@ -45,31 +41,27 @@ public class tusken_master_spawner extends script.base_script deltadictionary tuskenSpawn = self.getScriptVars(); int count = tuskenSpawn.getInt("count"); obj_id building = getTopMostContainer(self); - location tusken01Location = new location(6.54f, 8.01f, -34.17f, "tatooine", getCellId(building, "r5")); - obj_id tusken01 = create.object("tusken_executioner", tusken01Location); - attachScript(tusken01, "city.bestine.tusken_spawner"); - setObjVar(tusken01, "spawner", self); - tuskenSpawn.put("count", count + 1); - location tusken02Location = new location(1.20f, 8.15f, -20.20f, "tatooine", getCellId(building, "r5")); - obj_id tusken02 = create.object("tusken_observer", tusken02Location); - attachScript(tusken02, "city.bestine.tusken_spawner"); - setObjVar(tusken02, "spawner", self); - tuskenSpawn.put("count", count + 1); - location tusken03Location = new location(-1.54f, 1.58f, -0.90f, "tatooine", getCellId(building, "r2")); - obj_id tusken03 = create.object("tusken_observer", tusken03Location); - attachScript(tusken03, "city.bestine.tusken_spawner"); - setObjVar(tusken03, "spawner", self); - tuskenSpawn.put("count", count + 1); - location tusken04Location = new location(3.07f, 8.31f, -39.26f, "tatooine", getCellId(building, "r5")); - obj_id tusken04 = create.object("tusken_observer", tusken04Location); - attachScript(tusken04, "city.bestine.tusken_spawner"); - setObjVar(tusken04, "spawner", self); - tuskenSpawn.put("count", count + 1); - location tusken05Location = new location(2.17f, 8.36f, -32.02f, "tatooine", getCellId(building, "r5")); - obj_id tusken05 = create.object("tusken_witch_doctor", tusken05Location); - attachScript(tusken05, "city.bestine.tusken_spawner"); - setObjVar(tusken05, "spawner", self); - tuskenSpawn.put("count", count + 1); + + try { + createSpawn(self, new location(6.54f, 8.01f, -34.17f, "tatooine", getCellId(building, "r5")), "tusken_executioner"); + count++; + + createSpawn(self, new location(1.20f, 8.15f, -20.20f, "tatooine", getCellId(building, "r5")), "tusken_observer"); + count++; + + createSpawn(self, new location(-1.54f, 1.58f, -0.90f, "tatooine", getCellId(building, "r2")), "tusken_observer"); + count++; + + createSpawn(self, new location(3.07f, 8.31f, -39.26f, "tatooine", getCellId(building, "r5")), "tusken_observer"); + count++; + + createSpawn(self, new location(2.17f, 8.36f, -32.02f, "tatooine", getCellId(building, "r5")), "tusken_witch_doctor"); + tuskenSpawn.put("count", ++count); + } + catch(Exception e){ + tuskenSpawn.put("count", ++count); + } + return SCRIPT_CONTINUE; } public int doDeathRespawn(obj_id self, dictionary params) throws InterruptedException @@ -80,4 +72,10 @@ public class tusken_master_spawner extends script.base_script messageTo(self, "checkSpawnStatus", null, 1, false); return SCRIPT_CONTINUE; } + private obj_id createSpawn(obj_id self, location spawnLoc, String template) throws InterruptedException{ + obj_id tusken = create.object(template, spawnLoc); + attachScript(tusken, "city.bestine.tusken_spawner"); + setObjVar(tusken, "spawner", self); + return tusken; + } } diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/tusken_spawner.java b/sku.0/sys.server/compiled/game/script/city/bestine/tusken_spawner.java old mode 100644 new mode 100755 index b1cc16fb1..c5d9a088c --- a/sku.0/sys.server/compiled/game/script/city/bestine/tusken_spawner.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/tusken_spawner.java @@ -1,19 +1,8 @@ package script.city.bestine; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.utils; -import script.library.ai_lib; -import script.library.xp; -import script.library.group; -import script.library.weapons; +import script.dictionary; +import script.library.*; +import script.obj_id; public class tusken_spawner extends script.base_script { @@ -51,14 +40,11 @@ public class tusken_spawner extends script.base_script } else { - obj_id looter = null; - for (int i = 0; i < permitted.length; i++) - { - looter = permitted[i]; - if (looter != null) - { - if (hasObjVar(looter, "bestine.tuskenquest")) - { + obj_id looter; + for (obj_id aPermitted : permitted) { + looter = aPermitted; + if (looter != null) { + if (hasObjVar(looter, "bestine.tuskenquest")) { createTheirLoot(self); return SCRIPT_CONTINUE; } @@ -75,10 +61,9 @@ public class tusken_spawner extends script.base_script { return; } - String creatureName = ai_lib.getCreatureName(self); - if (creatureName.equals("tusken_executioner")) + if (ai_lib.getCreatureName(self).equals("tusken_executioner")) { - obj_id item = createObject(HEAD, corpseInventory, ""); + createObject(HEAD, corpseInventory, ""); checkForLoot(self); } else @@ -96,18 +81,15 @@ public class tusken_spawner extends script.base_script int chance = rand(0, 7000); if ((chance >= 0) && (chance <= 70)) { - obj_id item = createObject(CARVED, corpseInventory, ""); - return; + createObject(CARVED, corpseInventory, ""); } - if ((chance >= 71) && (chance <= 300)) + else if ((chance >= 71) && (chance <= 300)) { - obj_id item = createObject(SMOOTH, corpseInventory, ""); - return; + createObject(SMOOTH, corpseInventory, ""); } - if ((chance >= 301) && (chance <= 500)) + else if ((chance >= 301) && (chance <= 500)) { - obj_id item = weapons.createWeapon(BATON, corpseInventory, rand(0.75f, 1.0f)); - return; + weapons.createWeapon(BATON, corpseInventory, rand(0.75f, 1.0f)); } } } diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.java deleted file mode 100644 index 3cbacff4c..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_farious_gletch_spawner.java +++ /dev/null @@ -1,40 +0,0 @@ -package script.theme_park.tatooine.bestine; - -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.locations; - -public class bestine_farious_gletch_spawner extends script.base_script -{ - public bestine_farious_gletch_spawner() - { - } - public int OnInitialize(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int OnAttach(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int spawnMissingNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } -} diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.java deleted file mode 100644 index b52f84690..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_melios_purl_spawner.java +++ /dev/null @@ -1,40 +0,0 @@ -package script.theme_park.tatooine.bestine; - -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.locations; - -public class bestine_melios_purl_spawner extends script.base_script -{ - public bestine_melios_purl_spawner() - { - } - public int OnInitialize(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int OnAttach(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int spawnMissingNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } -} diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_museum_owner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_museum_owner.java old mode 100644 new mode 100755 diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.java deleted file mode 100644 index 9e3494d53..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_pfilbee_jhorn_spawner.java +++ /dev/null @@ -1,40 +0,0 @@ -package script.theme_park.tatooine.bestine; - -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.locations; - -public class bestine_pfilbee_jhorn_spawner extends script.base_script -{ - public bestine_pfilbee_jhorn_spawner() - { - } - public int OnInitialize(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int OnAttach(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int spawnMissingNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } -} diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.java deleted file mode 100644 index 1afa644da..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questn_university_spawner.java +++ /dev/null @@ -1,53 +0,0 @@ -package script.theme_park.tatooine.bestine; - -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.locations; - -public class bestine_sean_questn_university_spawner extends script.base_script -{ - public bestine_sean_questn_university_spawner() - { - } - public int OnInitialize(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - messageTo(self, "spawnInformantNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int OnAttach(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - messageTo(self, "spawnInformantNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int spawnMissingNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } - public int spawnInformantNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } -} diff --git a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.java b/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.java deleted file mode 100644 index d014d01b4..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/tatooine/bestine/bestine_sean_questp_house_spawner.java +++ /dev/null @@ -1,42 +0,0 @@ -package script.theme_park.tatooine.bestine; - -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.create; -import script.library.locations; - -public class bestine_sean_questp_house_spawner extends script.base_script -{ - public bestine_sean_questp_house_spawner() - { - } - public int OnInitialize(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int OnAttach(obj_id self) throws InterruptedException - { - messageTo(self, "spawnMissingNpc", null, 2, false); - return SCRIPT_CONTINUE; - } - public int spawnMissingNpc(obj_id self, dictionary params) throws InterruptedException - { - 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; - } -}