Instructions Jenkins Doxygen

[Fixed] Dantooine Screenplays, npc names faction etc 09/1109/1
authorCem Canatar <cemcanatar88@gmail.com>
Wed, 13 Nov 2013 12:08:26 +0000 (12:08 +0000)
committerCem Canatar <cemcanatar88@gmail.com>
Wed, 13 Nov 2013 12:08:26 +0000 (12:08 +0000)
Change-Id: I79090e496a353ca1558b624a4ebb71e401247e20

MMOCoreORB/bin/scripts/managers/spawn_manager/dantooine.lua
MMOCoreORB/bin/scripts/screenplays/cities/dantooine_agro_outpost.lua
MMOCoreORB/bin/scripts/screenplays/cities/dantooine_imperial_outpost.lua
MMOCoreORB/bin/scripts/screenplays/cities/dantooine_mining_outpost.lua

index f482d27..c056059 100644 (file)
@@ -235,12 +235,28 @@ dantooine_regions = {
 }
 
 dantooine_static_spawns = {
+       {"adwan_turoldine",60,-9.37871,0.625,2.98841,82.9313,6205565, "neutral", ""},
        {"dark_jedi_master",3600,-738.2,1.7,2103.9,55,0, "", ""},
-       {"quich_marae",60,1579.04,4,-6374.52,48.4898,0, "calm", "Quich Marae",JUNKJEDI,JUNKCONVQUICHDANTOOINE},
+       {"daiv_dekven",60,1603.42,4,-6434.54,102.877,0, "calm", "Daiv Dekven"},
+       {"fern_yarrow",60,-625.684,3,2481.19,119.665,0, "neutral", ""},
+       {"insurgent",60,0,0,-5.7,0,1365878, "npc_imperial", ""},
+       {"imperial_colonel",450,-588.773,3,2499.09,264.624,0, "", ""},
+       {"imperial_recruiter",0,-4197,0,-2411,270,0, "", ""},
+       {"kess_yarrow",60,-623.484,3,2481.77,149.192,0, "neutral", ""},
        {"noble",60,-4223.6,3,-2409.3,345,0, "npc_use_terminal_high", ""},
+       {"quich_marae",60,1579.04,4,-6374.52,48.4898,0, "calm", "Quich Marae",JUNKJEDI,JUNKCONVQUICHDANTOOINE},
+       {"rane_yarrow",60,-625.457,3,2479.41,86.8842,0, "neutral", ""},
+       {"r2",60,-635.747,3,2503.81,353.861,0, "calm", "R2-H5"},
+       {"r2",60,1583.12,4,-6407.59,69.2539,0, "calm", "R2-Y8"},
+       {"r3",60,1592.98,4,-6400.58,80.56,0, "calm", "R3-M0"},
+       {"r4",60,-643.739,3,2506.86,129.211,0, "calm", "R4-Y9"},
+       {"r4",60,-666.582,3,2494.33,121.479,0, "calm", "R4-A2"},
        {"r4",60,-4227.33,3,-2366.11,269.389,0, "calm", "R4-S7"},
        {"r5",60,-4228.33,3,-2367.11,48.8478,0, "calm", "R5-L5"},
-       {"insurgent",60,0,0,-5.7,0,1365878, "npc_imperial", ""},
+       {"stranded_imperial_soldier",60,-604.016,3,2538.15,200.426,0, "npc_imperial", "Lt Nilsson (a Planet record keeper)"},
+       {"ussox",60,1635.07,4,-6402.37,321.844,0, "calm", "Ussox"},
+       {"yras_shen_jen",60,1572.26,4,-6417.06,75.0582,0, "neutral", ""},       
+       {"ytzosh",60,1636.98,4,-6402.56,321.838,0, "calm", "Ytzosh"},
 }
 
 dantooine_badges = {
index 3eac548..6a9e4ec 100644 (file)
@@ -36,15 +36,18 @@ function DantooineAgroOutpostScreenPlay:spawnMobiles()
        spawnMobile("dantooine", "commoner", 60, 1635, 4, -6397, 57, 0)
        spawnMobile("dantooine", "commoner", 60, 1614, 4, -6428, 192, 0)
        spawnMobile("dantooine", "criminal", 300, 1601, 4, -6367, 109, 0)
-       spawnMobile("dantooine", "daiv_dekven", 60, 1603, 4, -6434, 102, 0)
        spawnMobile("dantooine", "noble", 60, 1558, 4, -6367, 143, 0)
        spawnMobile("dantooine", "pirate", 60, 1539, 4, -6407, 34, 0)
        spawnMobile("dantooine", "pirate", 60, 1556, 4, -6411, 188, 0)
-       spawnMobile("dantooine", "r2", 60, 1583, 4, -6407, 69, 0)
-       spawnMobile("dantooine", "r3", 60, 1592, 4, -6400, 80, 0)
        spawnMobile("dantooine", "scientist", 60, 1583, 4, -6439, 7, 0)
-       spawnMobile("dantooine", "ussox", 60, 1635, 4, -6402, 321, 0)
-       spawnMobile("dantooine", "yras_shen_jen", 60, 1572, 4, -6417, 75, 0)
-       spawnMobile("dantooine", "ytzosh", 60, 1636, 4, -6402, 321, 0)
+
+       ---Left these in dantooine.lua because of the custom name etc
+       --{"r2",60,1583.12,4,-6407.59,69.2539,0, "calm", "R2-Y8"},
+       --{"r3",60,1592.98,4,-6400.58,80.56,0, "calm", "R3-M0"}
+       --{"ytzosh",60,1636.98,4,-6402.56,321.838,0, "calm", "Ytzosh"}
+       --{"yras_shen_jen",60,1572.26,4,-6417.06,75.0582,0, "neutral", ""},
+       --{"ussox",60,1635.07,4,-6402.37,321.844,0, "calm", "Ussox"},
+       --{"daiv_dekven",60,1603.42,4,-6434.54,102.877,0, "calm", "Daiv Dekven"},
+       --{"quich_marae",60,1579.04,4,-6374.52,48.4898,0, "calm", "Quich Marae",JUNKJEDI,JUNKCONVQUICHDANTOOINE},
 
 end
index e347f74..fd3940e 100644 (file)
@@ -54,13 +54,14 @@ function DantooineImperialOutpostScreenPlay:spawnMobiles()
        spawnMobile("dantooine", "commoner", 60, -4186.81, 3, -2388.66, 141.892, 0)
        spawnMobile("dantooine", "juntah_herm", 60, -4222, 3, -2386.5, 300, 0)
        spawnMobile("dantooine", "noble", 60, -4261, 3, -2384, 200, 0)
-       spawnMobile("dantooine", "imperial_recruiter", 0, -4197, 0, -2411, 270, 0)
 
-               --Left these in dantooine.lua because of the custom name etc
+       --Left these in dantooine.lua because of the custom name etc
        --{"noble", 60,-4223.6,3,-2409.3,345,0, "npc_use_terminal_high", ""},
        --{"r4", 60,-4227.33,3,-2366.11,269.389,0, "calm", "R4-S7"},
+       --{"r5",60,-4228.33,3,-2367.11,48.8478,0, "calm", "R5-L5"},
+       --{"insurgent",60,0,0,-5.7,0,1365878, "npc_imperial", ""},
        --{"dantooine", "r5", 60,-4228.33,3,-2367.11,48.8478,0, "calm", "R5-L5"},
        --{"dantooine", "insurgent" ,60,0,0,-5.7,0,1365878, "npc_imperial", ""},
-       
+       --{"imperial_recruiter",0,-4197,0,-2411,270,0, "", ""},
 
 end
index 2cdfea8..d011f52 100644 (file)
@@ -15,7 +15,6 @@ end
 function DantooineMiningOutpostScreenPlay:spawnMobiles()
 
        --In The Cantina
-       spawnMobile("dantooine", "adwan_turoldine", 60, -9.3, 0.6, 3.1, 83, 6205565)
        spawnMobile("dantooine", "businessman", 60, -8, 0.6, -6, 83, 6205566)
 
        --Outside
@@ -42,21 +41,21 @@ function DantooineMiningOutpostScreenPlay:spawnMobiles()
        spawnMobile("dantooine", "commoner", 60, -602, 3, 2506, 285, 0)
        spawnMobile("dantooine", "commoner", 60, -568, 3, 2511, 51, 0)
        spawnMobile("dantooine", "criminal", 300, -620, 3, 2450, 281, 0)
-       spawnMobile("dantooine", "fern_yarrow", 60, -625, 3, 2481, 119, 0)
-       spawnMobile("dantooine", "kess_yarrow", 60, -623, 3, 2481, 149, 0)
        spawnMobile("dantooine", "mercenary", 300, -665, 3, 2462, 261, 0)
        spawnMobile("dantooine", "mercenary", 300, -594, 3, 2500, 47, 0)
        spawnMobile("dantooine", "mercenary", 300, -658, 3, 2480, 334, 0)
        spawnMobile("dantooine", "mercenary", 300, -665, 3, 2465, 120, 0)
-       spawnMobile("dantooine", "r2", 60, -635, 3, 2503, 353, 0)
-       spawnMobile("dantooine", "r4", 60, -643, 3, 2506, 129, 0)
-       spawnMobile("dantooine", "r4", 60, -666, 3, 2494, 121, 0)
-       spawnMobile("dantooine", "imperial_colonel", 450, -588, 3, 2499, 264, 0)
-       spawnMobile("dantooine", "rane_yarrow", 60, -625, 3, 2479, 86, 0)
-       spawnMobile("dantooine", "stranded_imperial_soldier", 60, -604, 3, 2538, 200, 0)
-
-               --Left this in dantooine.lua 
+       
+       --Left these in dantooine.lua because of the custom name etc
+       --{"adwan_turoldine",60,-9.37871,0.625,2.98841,82.9313,6205565, "neutral", ""},
        --{"quich_marae",60,1579.04,4,-6374.52,48.4898,0, "calm", "Quich Marae",JUNKJEDI,JUNKCONVQUICHDANTOOINE},
+       --{"kess_yarrow",60,-623.484,3,2481.77,149.192,0, "neutral", ""},
+       --{"rane_yarrow",60,-625.457,3,2479.41,86.8842,0, "neutral", ""},
+       --{"fern_yarrow",60,-625.684,3,2481.19,119.665,0, "neutral", ""},
+       --{"r2",60,-635.747,3,2503.81,353.861,0, "calm", "R2-H5"},
+       --{"r4",60,-643.739,3,2506.86,129.211,0, "calm", "R4-Y9"},
+       --{"r4",60,-666.582,3,2494.33,121.479,0, "calm", "R4-A2"},
+       --{"imperial_colonel", 450, -588.773, 3, 2499.09, 264.624, 0, "", ""},
 
 
 end