diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6.tab b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6.tab index 15dffe342..513f02835 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6.tab @@ -1,5 +1,5 @@ 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 --1599525695 0 object/tangible/ground_spawning/random_spawner.iff 0 920.8489 21.759626 1135.813 0.99836236 0 -0.057169475 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/theme_park/wod/basket_rubina_ns.iff|$| --1599525696 0 object/tangible/ground_spawning/random_spawner.iff 0 917.1272 21.954918 1135.8625 0.9993231 0 -0.036728695 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/theme_park/wod/basket_rubina_sm.iff|$| +-1599525695 0 object/tangible/ground_spawning/random_spawner.iff 0 920.8489 21.759626 1135.813 0.99836236 0 -0.057169475 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/theme_park/wod/basket_rubina_sm.iff|$| +-1599525696 0 object/tangible/ground_spawning/random_spawner.iff 0 917.1272 21.954918 1135.8625 0.9993231 0 -0.036728695 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/theme_park/wod/basket_rubina_ns.iff|$| -1599525697 0 object/tangible/ground_spawning/random_spawner.iff 0 912.1272 21.954918 1130.8625 0.9993231 0 -0.036728695 0 systems.spawning.spawner_random_proxy fltMaxSpawnTime|0|10|fltMinSpawnTime|0|5|intSpawnCount|0|120|registerWithController|0|1|strName|4|randomHerbSpawner|strSpawnTable|4|datatables/spawning/theme_park/wod_herbs.iff|strSpawnType|4|random|strSpawns|4|object/tangible/spawning/event/wod_themepark_herb_spawner.iff|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6_ws.tab index 4cc60d42b..17baaa36c 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_3_6_ws.tab @@ -1,20 +1,20 @@ -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 -1105986 0 object/static/particle/pt_flocking_glowzees.iff 0 908.969 6.15465 1106.59 1 0 0 0 $| -1105987 0 object/static/particle/pt_lair_evil_fire_large_red.iff 0 910.654 16.1763 1108.07 1 0 0 0 $| -1105988 0 object/static/particle/pt_flocking_glowzees.iff 0 910.863 20.6208 1108.31 1 0 0 0 $| -2716125 0 object/tangible/npc/tatooine_special/sarlacc.iff 0 2015.21 13.6917 1095.14 1 0 0 0 $| -4548487 0 object/tangible/collection/rare_rifle_proton.iff 0 2008.67 20.5017 1084.96 -0.651185 -0.275866 0.190782 0.680778 $| -6705434 0 object/static/terrain/tatooine/poi_sarlacc_collision_floor.iff 0 2014.94 -7.39829 1094.75 1 0 0 0 $| -9725692 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.755 13.8116 1112.7 0.92388 0.382683 0 0 $| -9725693 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 914.376 13.7432 1108.61 0.656798 0.290212 0.649746 -0.249446 $| -9725696 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 906.932 13.6276 1108.7 -0.675992 -0.280005 0.629752 -0.260852 $| -9725699 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.276 13.1543 1104.98 0.0223591 0.00926143 0.923609 -0.382571 $| -9725707 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.769 6.89748 1109.26 1 0 0 0 $| -9725713 0 object/static/item/item_bowl_shallow.iff 0 910.703 16.2644 1108.08 1 0 0 0 $| -9725721 0 object/static/structure/general/campfire_burnt.iff 0 910.675 16.5883 1108.05 1 0 0 0 $| -9725726 0 object/static/structure/general/streetlamp_small_red_style_01.iff 0 910.752 16.3813 1108.15 1 0 0 0 $| -1105989 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 918.57373 21.82620049 1136.126221 1 0 0 0 $| -1105990 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 910.498779 22.92370224 1137.802734 1 0 0 0 $| --1 0 object/tangible/poi/tatooine/explore_dathomir_sarlaac.iff 0 2008 19 1103 1 0 0 0 $| --9725726 0 object/tangible/ground_spawning/area_spawner.iff 0 919 21 1136 1 0 1.0 0 systems.spawning.spawner_area fltMaxSpawnTime|2|1.000000|fltMinSpawnTime|2|0.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|gray_witch|strSpawnerType|4|area|strSpawns|4|gray_witch|$| +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 +1105986 0 object/static/particle/pt_flocking_glowzees.iff 0 908.969 6.15465 1106.59 1 0 0 0 $| +1105987 0 object/static/particle/pt_lair_evil_fire_large_red.iff 0 910.654 16.1763 1108.07 1 0 0 0 $| +1105988 0 object/static/particle/pt_flocking_glowzees.iff 0 910.863 20.6208 1108.31 1 0 0 0 $| +2716125 0 object/tangible/npc/tatooine_special/sarlacc.iff 0 2015.21 13.6917 1095.14 1 0 0 0 $| +4548487 0 object/tangible/collection/rare_rifle_proton.iff 0 2008.67 20.5017 1084.96 -0.651185 -0.275866 0.190782 0.680778 $| +6705434 0 object/static/terrain/tatooine/poi_sarlacc_collision_floor.iff 0 2014.94 -7.39829 1094.75 1 0 0 0 $| +9725692 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.755 13.8116 1112.7 0.92388 0.382683 0 0 $| +9725693 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 914.376 13.7432 1108.61 0.656798 0.290212 0.649746 -0.249446 $| +9725696 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 906.932 13.6276 1108.7 -0.675992 -0.280005 0.629752 -0.260852 $| +9725699 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.276 13.1543 1104.98 0.0223591 0.00926143 0.923609 -0.382571 $| +9725707 0 object/static/structure/dathomir/mtn_clan_pillar_s01.iff 0 910.769 6.89748 1109.26 1 0 0 0 $| +9725713 0 object/static/item/item_bowl_shallow.iff 0 910.703 16.2644 1108.08 1 0 0 0 $| +9725721 0 object/static/structure/general/campfire_burnt.iff 0 910.675 16.5883 1108.05 1 0 0 0 $| +9725726 0 object/static/structure/general/streetlamp_small_red_style_01.iff 0 910.752 16.3813 1108.15 1 0 0 0 $| +1105989 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 918.57373 21.82620049 1136.126221 1 0 0 0 $| +1105990 0 object/tangible/poi/spawnegg/exterior_spawnegg.iff 0 910.498779 22.92370224 1137.802734 1 0 0 0 $| +-1 0 object/tangible/poi/tatooine/explore_dathomir_sarlaac.iff 0 2008 19 1103 1 0 0 0 $| +-9725726 0 object/tangible/ground_spawning/area_spawner.iff 0 919.5 21 1136 1 0 1 0 systems.spawning.spawner_area fltMaxSpawnTime|2|1.000000|fltMinSpawnTime|2|0.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|gray_witch|strSpawnerType|4|area|strSpawns|4|gray_witch|$| diff --git a/sku.0/sys.server/compiled/game/script/conversation/wod_rubina.java b/sku.0/sys.server/compiled/game/script/conversation/wod_rubina.java index 1bd44559a..8970a0520 100644 --- a/sku.0/sys.server/compiled/game/script/conversation/wod_rubina.java +++ b/sku.0/sys.server/compiled/game/script/conversation/wod_rubina.java @@ -2253,11 +2253,13 @@ public class wod_rubina extends script.base_script detachScript(self, "conversation.wod_rubina"); } setCondition(self, CONDITION_CONVERSABLE); + setCondition(self, CONDITION_INTERESTING); return SCRIPT_CONTINUE; } public int OnAttach(obj_id self) throws InterruptedException { setCondition(self, CONDITION_CONVERSABLE); + setCondition(self, CONDITION_INTERESTING); return SCRIPT_CONTINUE; } public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info menuInfo) throws InterruptedException @@ -2266,11 +2268,13 @@ public class wod_rubina extends script.base_script menu_info_data menuInfoData = menuInfo.getMenuItemById(menu); menuInfoData.setServerNotify(false); setCondition(self, CONDITION_CONVERSABLE); + setCondition(self, CONDITION_INTERESTING); return SCRIPT_CONTINUE; } public int OnIncapacitated(obj_id self, obj_id killer) throws InterruptedException { clearCondition(self, CONDITION_CONVERSABLE); + setCondition(self, CONDITION_INTERESTING); detachScript(self, "conversation.wod_rubina"); return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.shared/compiled/game/object/tangible/theme_park/wod/shared_basket_rubina_sm.tpf b/sku.0/sys.shared/compiled/game/object/tangible/theme_park/wod/shared_basket_rubina_sm.tpf index c2f3eaf2c..8c7685f93 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/theme_park/wod/shared_basket_rubina_sm.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/theme_park/wod/shared_basket_rubina_sm.tpf @@ -6,4 +6,4 @@ objectName = "theme_park_wod/messages" "pro_sm_herb_storage_n" detailedDescription = "theme_park_wod/messages" "pro_sm_herb_storage_d" appearanceFilename = "appearance/edb_con_tato_basket_s01.apt" -clientDataFile = "clientdata/item/client_shared_item_gem_blue_s01.cdf" \ No newline at end of file +clientDataFile = "clientdata/item/client_shared_item_gem_purple_s01.cdf" \ No newline at end of file