Index: bin/scripts/screenplays/caves/dantooine_janta_cave.lua =================================================================== --- bin/scripts/screenplays/caves/dantooine_janta_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/dantooine_janta_cave.lua (working copy) @@ -1,11 +1,42 @@ JantaCaveScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "JantaCaveScreenPlay", + + lootContainers = { + 529346, + 529349, + 529353, + 529363, + 529368 + }, + + lootLevel = 26, + + lootGroups = { + { + groups = { + {group = "color_crystals", chance = 160000}, + {group = "junk", chance = 8240000}, + {group = "rifles", chance = 500000}, + {group = "pistols", chance = 500000}, + {group = "clothing_attachments", chance = 300000}, + {group = "armor_attachments", chance = 300000} + }, + lootChance = 8000000 + } + }, + + lootContainerRespawn = 1800 } registerScreenPlay("JantaCaveScreenPlay", true) function JantaCaveScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("dantooine")) then + self:spawnMobiles() + self:initializeLootContainers() + end end function JantaCaveScreenPlay:spawnMobiles() @@ -60,4 +91,4 @@ spawnMobile("dantooine", "janta_warrior",900,-93,-70.4,-123.2,-96,529330) spawnMobile("dantooine", "janta_warrior",900,-84.9,-100.1,-97.2,-109,529333) spawnMobile("dantooine", "janta_warrior",900,-98,-100.5,-100.5,79,529333) -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/dantooine_kunga_stronghold.lua =================================================================== --- bin/scripts/screenplays/caves/dantooine_kunga_stronghold.lua (revision 6323) +++ bin/scripts/screenplays/caves/dantooine_kunga_stronghold.lua (working copy) @@ -1,11 +1,41 @@ KungaStrongholdScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "KungaStrongholdScreenPlay", + + lootContainers = { + 529418, + 529425, + 529451, + 529435 + }, + + lootLevel = 26, + + lootGroups = { + { + groups = { + {group = "color_crystals", chance = 160000}, + {group = "junk", chance = 8240000}, + {group = "rifles", chance = 500000}, + {group = "pistols", chance = 500000}, + {group = "clothing_attachments", chance = 300000}, + {group = "armor_attachments", chance = 300000} + }, + lootChance = 8000000 + } + }, + + lootContainerRespawn = 1800 } registerScreenPlay("KungaStrongholdScreenPlay", true) function KungaStrongholdScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("dantooine")) then + self:spawnMobiles() + self:initializeLootContainers() + end end function KungaStrongholdScreenPlay:spawnMobiles() @@ -62,4 +92,4 @@ spawnMobile("dantooine", "kunga_soothsayer",900,12.9,-35.5,-79.3,0,529393) spawnMobile("dantooine", "kunga_soothsayer",900,-7.9,-35.4,-76.8,103,529393) spawnMobile("dantooine", "kunga_soothsayer",900,-9,-34.8,-66.2,147,529393) -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/dathomir_rancor_cave.lua =================================================================== --- bin/scripts/screenplays/caves/dathomir_rancor_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/dathomir_rancor_cave.lua (working copy) @@ -18,7 +18,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "rifles", chance = 500000}, {group = "pistols", chance = 500000}, {group = "clothing_attachments", chance = 300000}, @@ -28,13 +28,16 @@ } }, - lootContainerRespawn = 5 -- 30 minutes + lootContainerRespawn = 1800 -- 30 minutes } registerScreenPlay("RancorCaveScreenPlay", true) function RancorCaveScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("dathomir")) then + self:spawnMobiles() + self:initializeLootContainers() + end end function RancorCaveScreenPlay:spawnMobiles() Index: bin/scripts/screenplays/caves/dathomir_spider_clan_cave.lua =================================================================== --- bin/scripts/screenplays/caves/dathomir_spider_clan_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/dathomir_spider_clan_cave.lua (working copy) @@ -11,7 +11,9 @@ 5165586, 5165587, 5165588, - 5165591 + 5165591, + 5165592, + 5165593 }, lootLevel = 26, @@ -19,7 +21,7 @@ lootGroups = { { groups = { - {group = "color_crystals", chance = 100000}, + {group = "color_crystals", chance = 1000000}, {group = "junk", chance = 5000000}, {group = "rifles", chance = 500000}, {group = "pistols", chance = 500000}, @@ -38,6 +40,7 @@ function SpiderClanCaveScreenPlay:start() if (isZoneEnabled("dathomir")) then self:spawnMobiles() + self:initializeLootContainers() end end @@ -147,4 +150,4 @@ writeData("spiderclancave:kiindray", 0) return 1 -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/endor_orphaned_marauder_cave.lua =================================================================== --- bin/scripts/screenplays/caves/endor_orphaned_marauder_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/endor_orphaned_marauder_cave.lua (working copy) @@ -14,7 +14,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 7240000}, {group = "melee_weapons", chance = 1000000}, {group = "ranged_weapons", chance = 1000000}, {group = "clothing_attachments", chance = 300000}, Index: bin/scripts/screenplays/caves/naboo_narglatch_cave.lua =================================================================== --- bin/scripts/screenplays/caves/naboo_narglatch_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/naboo_narglatch_cave.lua (working copy) @@ -1,11 +1,42 @@ NarglatchCaveScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "NarglatchCaveScreenPlay", + + lootContainers = { + 6336292, + 6336293, + 6336295, + 6336297, + 6336298 + }, + + lootLevel = 16, + + lootGroups = { + { + groups = { + {group = "color_crystals", chance = 160000}, + {group = "junk", chance = 8240000}, + {group = "rifles", chance = 500000}, + {group = "pistols", chance = 500000}, + {group = "clothing_attachments", chance = 300000}, + {group = "armor_attachments", chance = 300000} + }, + lootChance = 8000000 + } + }, + + lootContainerRespawn = 1800 } registerScreenPlay("NarglatchCaveScreenPlay", true) function NarglatchCaveScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("naboo")) then + self:spawnMobiles() + self:initializeLootContainers() + end end function NarglatchCaveScreenPlay:spawnMobiles() @@ -84,4 +115,4 @@ spawnMobile("naboo", "narglatch_cub", 210, 84.7233, -66.4678, -137.191, 0, 5285901) spawnMobile("naboo", "narglatch_cub", 210, 84.3998, -66.4002, -137.437, 0, 5285901) spawnMobile("naboo", "narglatch_cub", 210, 85.8107, -66.6873, -136.395, 0, 5285901) -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/talus_aakuan_cave.lua =================================================================== --- bin/scripts/screenplays/caves/talus_aakuan_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_aakuan_cave.lua (working copy) @@ -15,7 +15,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 1000000}, {group = "clothing_attachments", chance = 300000}, {group = "armor_attachments", chance = 300000} Index: bin/scripts/screenplays/caves/talus_binayre_pirate_bunker.lua =================================================================== --- bin/scripts/screenplays/caves/talus_binayre_pirate_bunker.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_binayre_pirate_bunker.lua (working copy) @@ -18,7 +18,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 500000}, {group = "ranged_weapons", chance = 500000}, {group = "clothing_attachments", chance = 300000}, Index: bin/scripts/screenplays/caves/talus_chunker_bunker.lua =================================================================== --- bin/scripts/screenplays/caves/talus_chunker_bunker.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_chunker_bunker.lua (working copy) @@ -13,7 +13,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 500000}, {group = "ranged_weapons", chance = 500000}, {group = "clothing_attachments", chance = 300000}, Index: bin/scripts/screenplays/caves/talus_detainment_center.lua =================================================================== --- bin/scripts/screenplays/caves/talus_detainment_center.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_detainment_center.lua (working copy) @@ -5,8 +5,9 @@ registerScreenPlay("TalusDetainmentCenterScreenPlay", true) function TalusDetainmentCenterScreenPlay:start() - self:spawnMobiles() - + if (isZoneEnabled("talus")) then + self:spawnMobiles() + end end Index: bin/scripts/screenplays/caves/talus_erran_sif.lua =================================================================== --- bin/scripts/screenplays/caves/talus_erran_sif.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_erran_sif.lua (working copy) @@ -18,7 +18,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 500000}, {group = "ranged_weapons", chance = 500000}, {group = "clothing_attachments", chance = 300000}, Index: bin/scripts/screenplays/caves/talus_giant_decay_mite_cave.lua =================================================================== --- bin/scripts/screenplays/caves/talus_giant_decay_mite_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_giant_decay_mite_cave.lua (working copy) @@ -19,7 +19,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 1000000}, {group = "clothing_attachments", chance = 300000}, {group = "armor_attachments", chance = 300000} Index: bin/scripts/screenplays/caves/talus_giant_fynock_cave.lua =================================================================== --- bin/scripts/screenplays/caves/talus_giant_fynock_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_giant_fynock_cave.lua (working copy) @@ -16,7 +16,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 1000000}, {group = "clothing_attachments", chance = 300000}, {group = "armor_attachments", chance = 300000} Index: bin/scripts/screenplays/caves/talus_kahmurra_biogentic_research_station.lua =================================================================== --- bin/scripts/screenplays/caves/talus_kahmurra_biogentic_research_station.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_kahmurra_biogentic_research_station.lua (working copy) @@ -17,7 +17,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 1000000}, {group = "clothing_attachments", chance = 300000}, {group = "armor_attachments", chance = 300000} Index: bin/scripts/screenplays/caves/talus_lost_aqualish_cave.lua =================================================================== --- bin/scripts/screenplays/caves/talus_lost_aqualish_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_lost_aqualish_cave.lua (working copy) @@ -16,7 +16,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "melee_weapons", chance = 500000}, {group = "ranged_weapons", chance = 500000}, {group = "clothing_attachments", chance = 300000}, Index: bin/scripts/screenplays/caves/talus_weapons_depot.lua =================================================================== --- bin/scripts/screenplays/caves/talus_weapons_depot.lua (revision 6323) +++ bin/scripts/screenplays/caves/talus_weapons_depot.lua (working copy) @@ -1,11 +1,15 @@ TalusWeaponsDepotScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "TalusWeaponsDepotScreenPlay", } registerScreenPlay("TalusWeaponsDepotScreenPlay", true) function TalusWeaponsDepotScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("talus")) then + self:spawnMobiles() + end end function TalusWeaponsDepotScreenPlay:spawnMobiles() Index: bin/scripts/screenplays/caves/tatooine_sennex_cave.lua =================================================================== --- bin/scripts/screenplays/caves/tatooine_sennex_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/tatooine_sennex_cave.lua (working copy) @@ -17,7 +17,7 @@ { groups = { {group = "color_crystals", chance = 160000}, - {group = "junk", chance = 8600000}, + {group = "junk", chance = 8240000}, {group = "rifles", chance = 500000}, {group = "pistols", chance = 500000}, {group = "clothing_attachments", chance = 300000}, @@ -82,4 +82,4 @@ --spawnCreature(duneBeetle, 8, 6547.05, -1311.56) --spawnCreature(duneBeetle, 8, 6552.22, -1325.97) --spawnCreature(duneBeetle, 8, 6566.36, -1330.49) -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/tatooine_squill_cave.lua =================================================================== --- bin/scripts/screenplays/caves/tatooine_squill_cave.lua (revision 6323) +++ bin/scripts/screenplays/caves/tatooine_squill_cave.lua (working copy) @@ -1,11 +1,16 @@ SquillCaveScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "SquillCaveScreenPlay", + } registerScreenPlay("SquillCaveScreenPlay", true) function SquillCaveScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("tatooine")) then + self:spawnMobiles() + end end function SquillCaveScreenPlay:spawnMobiles() @@ -195,4 +200,4 @@ spawnMobile("tatooine", "mountain_squill", 200, -104.6, -42.4, -9.1, 179, 7125571) spawnMobile("tatooine", "female_mountain_squill", 200, -107.1, -42.0, -21.1, 9, 7125571) spawnMobile("tatooine", "mountain_squill", 200, -123.1, -47.9, -11.7, 66, 7125571) -end \ No newline at end of file +end Index: bin/scripts/screenplays/caves/tatooine_tusken_bunker.lua =================================================================== --- bin/scripts/screenplays/caves/tatooine_tusken_bunker.lua (revision 6323) +++ bin/scripts/screenplays/caves/tatooine_tusken_bunker.lua (working copy) @@ -1,11 +1,40 @@ TuskenBunkerScreenPlay = ScreenPlay:new { numberOfActs = 1, + + screenplayName = "TuskenBunkerScreenPlay", + + lootContainers = { + 5995601, + 5995605, + 5995608 + }, + + lootLevel = 24, + + lootGroups = { + { + groups = { + {group = "color_crystals", chance = 160000}, + {group = "junk", chance = 8240000}, + {group = "rifles", chance = 500000}, + {group = "pistols", chance = 500000}, + {group = "clothing_attachments", chance = 300000}, + {group = "armor_attachments", chance = 300000} + }, + lootChance = 8000000 + } + }, + + lootContainerRespawn = 1800 } registerScreenPlay("TuskenBunkerScreenPlay", true) function TuskenBunkerScreenPlay:start() - self:spawnMobiles() + if (isZoneEnabled("tatooine")) then + self:spawnMobiles() + self:initializeLootContainers() + end end function TuskenBunkerScreenPlay:spawnMobiles()