Instructions Jenkins Doxygen

[added] Missing npcs to Emperor's Retreat - mantis 4979 58/2258/5
authorMiztah <myztah@gmail.com>
Sat, 9 Aug 2014 21:27:16 +0000 (21:27 +0000)
committerMiztah <myztah@gmail.com>
Sat, 9 Aug 2014 21:28:33 +0000 (21:28 +0000)
[added] Mood string support to themepark logic quest givers

Change-Id: Ic09c8080deacb243701906e9c0dfb54044aa91e6

MMOCoreORB/bin/scripts/mobile/faction/imperial/royal_imperial_guard.lua [moved from MMOCoreORB/bin/scripts/mobile/misc/royal_imperial_guard.lua with 100% similarity]
MMOCoreORB/bin/scripts/mobile/faction/imperial/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/misc/mouse_droid.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/misc/serverobjects.lua
MMOCoreORB/bin/scripts/screenplays/themepark/imperial/emperors_retreat.lua
MMOCoreORB/bin/scripts/screenplays/themepark/imperial/themeParkImperial.lua
MMOCoreORB/bin/scripts/screenplays/themepark/themeParkLogic.lua
MMOCoreORB/src/server/zone/objects/creature/LuaCreatureObject.cpp
MMOCoreORB/src/server/zone/objects/creature/LuaCreatureObject.h

index 23ce984..bf59693 100644 (file)
@@ -107,6 +107,7 @@ includeFile("faction/imperial/master_prophet_of_the_dark_side.lua")
 includeFile("faction/imperial/prophet_of_the_dark_side.lua")
 includeFile("faction/imperial/relay_captain_coa2.lua")
 includeFile("faction/imperial/relay_guard_coa2.lua")
+includeFile("faction/imperial/royal_imperial_guard.lua")
 includeFile("faction/imperial/sand_trooper.lua")
 includeFile("faction/imperial/scout_trooper.lua")
 includeFile("faction/imperial/senior_prophet_of_the_dark_side.lua")
diff --git a/MMOCoreORB/bin/scripts/mobile/misc/mouse_droid.lua b/MMOCoreORB/bin/scripts/mobile/misc/mouse_droid.lua
new file mode 100644 (file)
index 0000000..ee1c6dc
--- /dev/null
@@ -0,0 +1,34 @@
+mouse_droid = Creature:new {
+       objectName = "@mob/creature_names:mouse_droid",
+       socialGroup = "",
+       pvpFaction = "",
+       faction = "",
+       level = 7,
+       chanceHit = 0.26,
+       damageMin = 55,
+       damageMax = 65,
+       baseXp = 147,
+       baseHAM = 270,
+       baseHAMmax = 330,
+       armor = 0,
+       resists = {0,0,40,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0.000000,
+       ferocity = 0,
+       pvpBitmask = NONE,
+       creatureBitmask = NONE,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/mouse_droid.iff"},
+       lootGroups = {},
+       weapons = {},
+       attacks = {}
+}
+
+CreatureTemplates:addCreatureTemplate(mouse_droid, "mouse_droid")
\ No newline at end of file
index 6d776ab..6b2a017 100644 (file)
@@ -49,6 +49,7 @@ includeFile("misc/junk_sneg.lua")
 includeFile("misc/klaatu.lua")
 includeFile("misc/lambda_shuttle.lua")
 includeFile("misc/morag.lua")
+includeFile("misc/mouse_droid.lua")
 includeFile("misc/muftak.lua")
 includeFile("misc/naboo_kidnapped_noble_01.lua")
 includeFile("misc/nikto.lua")
@@ -57,7 +58,6 @@ includeFile("misc/quarren.lua")
 includeFile("misc/record_keeper_imperial.lua")
 includeFile("misc/record_keeper_jabba.lua")
 includeFile("misc/record_keeper_rebel.lua")
-includeFile("misc/royal_imperial_guard.lua")
 includeFile("misc/seeker.lua")
 includeFile("misc/sullustan_male.lua")
 includeFile("misc/workshop_droid.lua")
index 9b79bf4..bb07395 100644 (file)
@@ -1,6 +1,8 @@
+local ObjectManager = require("managers.object.object_manager")
+
 EmperorsRetreatScreenPlay = ScreenPlay:new {
        numberOfActs = 1,
-       
+
        screenplayName = "EmperorsRetreatScreenPlay",
 }
 
@@ -9,7 +11,7 @@ registerScreenPlay("EmperorsRetreatScreenPlay", true)
 function EmperorsRetreatScreenPlay:start()
        if (isZoneEnabled("naboo")) then
                self:spawnMobiles()
-               self:spawnSceneObjects()        
+               self:spawnSceneObjects()
        end
 end
 
@@ -39,46 +41,69 @@ function EmperorElevatorMenuComponent:handleObjectMenuSelect(pSceneObject, pPlay
        end
 
        local obj = LuaSceneObject(pSceneObject)
-       
+
        if (creature:getParent() ~= obj:getParent()) then
                return
        end
-       
+
        local z = obj:getPositionZ() + 20
        local x = creature:getPositionX()
        local y = creature:getPositionY()
-       
-       creature:playEffect("clienteffect", "elevator_ascend.cef")      
+
+       creature:playEffect("clienteffect", "elevator_ascend.cef")
        creature:teleport(x, z, y, obj:getParentID())
 end
 
+function EmperorsRetreatScreenPlay:setMoodString(pNpc, mood)
+       ObjectManager.withCreatureObject(pNpc, function(npc)
+               npc:setMoodString(mood)
+       end)
+end
+
 function EmperorsRetreatScreenPlay:spawnMobiles()
 
+       -- Inside
+       spawnMobile("naboo", "royal_imperial_guard", 120, 11.2, 0.2, -31.5, 0, 1418874)
+       spawnMobile("naboo", "royal_imperial_guard", 120, 14.8, 0.2, -31.5, 0, 1418874)
+
+       spawnMobile("naboo", "royal_imperial_guard", 120, 10.8, 20, -27.2, 180, 1418886)
+       spawnMobile("naboo", "royal_imperial_guard", 120, 15.3, 20, -27.2, -13, 1418886)
+
+       spawnMobile("naboo", "ra7_bug_droid", 120, 4.0, 0.2, -45.7, 4, 1418876)
+
+       spawnMobile("naboo", "mouse_droid", 120, -8.6, 0.2, -14.2, -15, 1418879)
+       spawnMobile("naboo", "mouse_droid", 120, -39.9, 0.2, -12.4, -25, 1418879)
+
+       local pNpc = spawnMobile("naboo", "stormtrooper", 120, -0.5, 0.2, -23.6, 76, 1418874)
+       EmperorsRetreatScreenPlay:setMoodString(pNpc, "conversation")
+       local pNpc2 = spawnMobile("naboo", "stormtrooper", 120, 0.7, 0.2, -23.5, -20, 1418874)
+       EmperorsRetreatScreenPlay:setMoodString(pNpc2, "conversation")
+
        --Guard Towers
        spawnMobile("naboo", "stormtrooper", 450, 2536.8, 296, -3881.4, -90, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2536.8, 296, -3885.5, -90, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 2551, 352, -3647, -125, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2553.2, 352, -3650.7, -125, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 2342, 392, -3561.1, 145, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2345.3, 392, -3559, 145, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 2175.6, 362, -3698, 133, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2178, 362, -3695.1, 133, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 1711.5, 385, -3676, 130, 0)
        spawnMobile("naboo", "stormtrooper", 450, 1714.6, 385, -3673.6, 130, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 1909, 395, -4020.8, 20, 0)
        spawnMobile("naboo", "stormtrooper", 450, 1905.3, 395, -4018.9, 20, 0)
-               
+
        spawnMobile("naboo", "stormtrooper", 450, 2122.8, 294, -4180.9, -15, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2118.9, 294, -4181.4, -15, 0)
-       
+
        spawnMobile("naboo", "stormtrooper", 450, 2371.8, 325, -4095.5, 0, 0)
        spawnMobile("naboo", "stormtrooper", 450, 2367.7, 325, -4095.5, 0, 0)
-       
+
        --By the emperors retreat
        spawnMobile("naboo", "at_st", 900, 2436.4, 292, -3912.1, 167, 0)
        spawnMobile("naboo", "at_st", 900, 2429.9, 292, -3913.1, 167, 0)
index 5fa5b62..aaadc77 100644 (file)
@@ -2,796 +2,796 @@ THEME_PARK_IMPERIAL_BADGE = 106
 
 
 kaja_orzee_missions =
-{
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_moff", planetName = "naboo", npcName = "an Imperial Moff" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 75 } 
-               }
-       },
-          { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_rebel_sympathizer", planetName = "naboo", npcName = "a Rebel Sympathizer" }
-               }, 
-               secondarySpawns = 
-               {
-                       { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" }
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Documents" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 150 } 
-               }
-       },
+       {
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_moff", planetName = "naboo", npcName = "an Imperial Moff" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 75 }
+                       }
+               },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_rebel_sympathizer", planetName = "naboo", npcName = "a Rebel Sympathizer" }
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" }
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Documents" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 150 }
+                       }
+               },
+
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "an Assassin" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 225 }
+                       }
+               },
 
-          { 
-               missionType = "assassinate", 
-               primarySpawns = 
                {
-                       { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "an Assassin" }
-               }, 
-               secondarySpawns = 
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "a Droid Programmer" },
+                               { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "a Droid Programmer" }
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" }
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 300 }
+                       }
+               },
                {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 225 } 
-               }
-       },
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_droid", planetName = "naboo", npcName = "RA-7" }
+                       },
+                       secondarySpawns =
+                       {
 
-          { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "a Droid Programmer" },
-                       { npcTemplate = "theme_park_imperial_assassin", planetName = "naboo", npcName = "a Droid Programmer" }
-               }, 
-               secondarySpawns = 
-               {
-                       { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_corporal", planetName = "naboo", npcName = "" }
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 300 } 
-               }
-       },
-          { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_droid", planetName = "naboo", npcName = "RA-7" } 
-               }, 
-               secondarySpawns =
-               {
-
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 75 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_kaja"} ,
-                       { rewardType = "permission", permissionGroup = "emperors_retreat2" }
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 75 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_kaja"} ,
+                               { rewardType = "permission", permissionGroup = "emperors_retreat2" }
+                       }
                }
        }
-}
 
 loam_redge_missions =
-{
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_noble", planetName = "naboo", npcName = "a Noble" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 375 } 
-               }
-       },
+       {
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_noble", planetName = "naboo", npcName = "a Noble" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 375 }
+                       }
+               },
 
-               { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_rebel_leader", planetName = "naboo", npcName = "random" } 
-               }, 
-               secondarySpawns =
-               {
-                       { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" }
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 450 } 
-               }
-       },
-          { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_slicer", planetName = "naboo", npcName = "a Slicer" }
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = {
-                       { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Datapad" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 525 } 
-               }
-       },
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_rebel_leader", planetName = "naboo", npcName = "random" }
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_resistance_dissident", planetName = "naboo", npcName = "" }
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 450 }
+                       }
+               },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_slicer", planetName = "naboo", npcName = "a Slicer" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {
+                               { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Datapad" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 525 }
+                       }
+               },
 
-          { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Slicer" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 125 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_redge"}
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Slicer" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 125 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_redge"}
+                       }
                }
        }
-}
 
 lord_hethrir_missions =
-{
-          { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_counterfeiter", planetName = "naboo", npcName = "a Counterfeiter" }
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = {
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 600 } 
-               }
-         },
-
-          { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_alderaanian_leader", planetName = "naboo", npcName = "random" }
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = {
-                       { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Datapad" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 675 } 
-               }
-         },
-          { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               {
-                       { npcTemplate = "theme_park_imperial_rebels_father", planetName = "naboo", npcName = "random" }
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 750 } 
-               }
-       },
+       {
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_counterfeiter", planetName = "naboo", npcName = "a Counterfeiter" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 600 }
+                       }
+               },
 
-       { 
-               missionType = "deliver", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "random" } 
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 825 }  
-               }
-       },
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_rebel", planetName = "naboo", npcName = "random" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 175 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_hethrir"}
-               }
-       },
-}
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_alderaanian_leader", planetName = "naboo", npcName = "random" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {
+                               { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Datapad" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 675 }
+                       }
+               },
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_rebels_father", planetName = "naboo", npcName = "random" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 750 }
+                       }
+               },
+
+               {
+                       missionType = "deliver",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "random" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 825 }
+                       }
+               },
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_rebel", planetName = "naboo", npcName = "random" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 175 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_hethrir"}
+                       }
+               },
+       }
 
 thrawn_missions =
-{
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_commander", planetName = "naboo", npcName = "Commander Dolman" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 900 } 
-               }
-       },
+       {
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_commander", planetName = "naboo", npcName = "Commander Dolman" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 900 }
+                       }
+               },
 
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_thug", planetName = "naboo", npcName = "a Thug" } 
-               }, 
-               secondarySpawns = {}, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/component/item/quest_item/directional_sensor.iff", itemName = "Transponder" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 975 } 
-               }
-       },
-       { 
-               missionType = "deliver", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "Geg Winthasen" } 
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1050 }  
-               }
-       },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_thug", planetName = "naboo", npcName = "a Thug" }
+                       },
+                       secondarySpawns = {},
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/component/item/quest_item/directional_sensor.iff", itemName = "Transponder" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 975 }
+                       }
+               },
+               {
+                       missionType = "deliver",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "Geg Winthasen" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Holodisc" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1050 }
+                       }
+               },
 
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_fambaa", planetName = "naboo", npcName = "a Fambaa" } 
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/container/jar/jar_guts_s01.iff", itemName = "Jar of Fambaa Blood" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1125 } 
-               }
-       },
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_seller", planetName = "naboo", npcName = "Seldair Keeloo" } 
-               }, 
-               secondarySpawns = {}, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/loot/misc/firework_dud_s1.iff", itemName = "Rocket Launcher" }
-               },      
-                       rewards = 
-               { 
-                       { rewardType = "credits", amount = 1200 } 
-               }
-       },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_fambaa", planetName = "naboo", npcName = "a Fambaa" }
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/container/jar/jar_guts_s01.iff", itemName = "Jar of Fambaa Blood" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1125 }
+                       }
+               },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_seller", planetName = "naboo", npcName = "Seldair Keeloo" }
+                       },
+                       secondarySpawns = {},
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/loot/misc/firework_dud_s1.iff", itemName = "Rocket Launcher" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1200 }
+                       }
+               },
 
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "rebel_commando", planetName = "naboo", npcName = "a Rebel Commando" } 
-               }, 
-               secondarySpawns = {     
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "" },
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "" }
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 225 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_thrawn_helmets"},
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_thrawn_suits"}
-               }
-       },
-}
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "rebel_commando", planetName = "naboo", npcName = "a Rebel Commando" }
+                       },
+                       secondarySpawns = {
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "" },
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "" }
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 225 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_thrawn_helmets"},
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_thrawn_suits"}
+                       }
+               },
+       }
 
 veers_missions =
-{
-
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "borvos_thug", planetName = "naboo", npcName = "Borvo's Thug" },
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1275 } 
-               }
-       },
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1350 } 
-               }
-       },
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_borvos_thug", planetName = "naboo", npcName = "Borvo's Thug" },
-               }, 
-               secondarySpawns = {
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Shipping Manifest" }
-               },      
-                       rewards = 
-               { 
-                       { rewardType = "credits", amount = 1425 } 
-               }
-       },
+       {
 
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_twilek", planetName = "naboo", npcName = "Borvo the Twi'lek" } 
-               }, 
-               secondarySpawns =
-               {
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1500 } 
-               }
-       },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "borvos_thug", planetName = "naboo", npcName = "Borvo's Thug" },
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1275 }
+                       }
+               },
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1350 }
+                       }
+               },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_borvos_thug", planetName = "naboo", npcName = "Borvo's Thug" },
+                       },
+                       secondarySpawns = {
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Shipping Manifest" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1425 }
+                       }
+               },
 
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "mercenary_aggro", planetName = "naboo", npcName = "a Mercenary" },
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 275 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_veers"}
-               }
-       },
-}
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_twilek", planetName = "naboo", npcName = "Borvo the Twi'lek" }
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1500 }
+                       }
+               },
+
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "mercenary_aggro", planetName = "naboo", npcName = "a Mercenary" },
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 275 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_veers"}
+                       }
+               },
+       }
 
 palpatine_missions =
-{
-
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Thug Ringleader" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1575 } 
-               }
-       },
-       { 
-               missionType = "deliver", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Thug Ringleader" } 
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Plans" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1650 }
-               }
-       },
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "rsf_security_officer", planetName = "naboo", npcName = "a Security Officer" },
-               }, 
-               secondarySpawns = {     
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" }
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1725 } 
-               }
-       },
+       {
 
-       { 
-               missionType = "escort", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort_handmaiden", planetName = "naboo", npcName = "a Handmaiden" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {}, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1800 } 
-               }
-       },
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Thug Ringleader" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1575 }
+                       }
+               },
+               {
+                       missionType = "deliver",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Thug Ringleader" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Plans" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1650 }
+                       }
+               },
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "rsf_security_officer", planetName = "naboo", npcName = "a Security Officer" },
+                       },
+                       secondarySpawns = {
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" }
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1725 }
+                       }
+               },
 
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_thug_ringleader", planetName = "naboo", npcName = "a Thug Ringleader" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
-                       { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" }
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Plans" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1875 } 
-               }
-       },
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort_handmaiden", planetName = "naboo", npcName = "a Handmaiden" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1800 }
+                       }
+               },
 
-       { 
-               missionType = "deliver", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Parliament Courier" } 
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "a Holodisc" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 1950 }
-               }
-       },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_thug_ringleader", planetName = "naboo", npcName = "a Thug Ringleader" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" },
+                               { npcTemplate = "thug", planetName = "naboo", npcName = "a Thug" }
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Plans" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1875 }
+                       }
+               },
 
-       { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "rebel_general", planetName = "naboo", npcName = "a Rebel General" }
-               }, 
-               secondarySpawns = {     
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
-                       { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" }
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 325 },
-                       { rewardType = "loot", lootGroup = "theme_park_reward_imperial_emperor"}
+               {
+                       missionType = "deliver",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_escort", planetName = "naboo", npcName = "a Parliament Courier" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "a Holodisc" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 1950 }
+                       }
+               },
+
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "rebel_general", planetName = "naboo", npcName = "a Rebel General" }
+                       },
+                       secondarySpawns = {
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" },
+                               { npcTemplate = "rebel_trooper", planetName = "naboo", npcName = "a Rebel Trooper" }
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 325 },
+                               { rewardType = "loot", lootGroup = "theme_park_reward_imperial_emperor"}
+                       }
                }
-       }
 
-}
+       }
 
 darth_vader_missions =
-{
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_haro_whitesun", planetName = "naboo", npcName = "Haro Whitesun" },
-               }, 
-               secondarySpawns = {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 2025 } 
-               }
-       },
+       {
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_haro_whitesun", planetName = "naboo", npcName = "Haro Whitesun" },
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 2025 }
+                       }
+               },
 
-       { 
-               missionType = "retrieve", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "mara_jade", planetName = "naboo", npcName = "Mara Jade" } 
-               }, 
-               secondarySpawns =
-               {
-               }, 
-               itemSpawns = {
-                       { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Documents" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 2100 } 
-               }
-       },
+               {
+                       missionType = "retrieve",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "mara_jade", planetName = "naboo", npcName = "Mara Jade" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns = {
+                               { itemTemplate = "object/tangible/loot/misc/damaged_datapad.iff", itemName = "Documents" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 2100 }
+                       }
+               },
 
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_mellag_davin_lars", planetName = "naboo", npcName = "Mellag Davin-Lars" }
-               }, 
-               secondarySpawns = {     
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 2175 } 
-               }
-       },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_mellag_davin_lars", planetName = "naboo", npcName = "Mellag Davin-Lars" }
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 2175 }
+                       }
+               },
 
-       { 
-               missionType = "retrieve", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_mattias", planetName = "naboo", npcName = "Mattias Ve'Shra" } 
-               }, 
-               secondarySpawns = 
-               {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
-               }, 
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 2250 }
-               }
-       },
+               {
+                       missionType = "retrieve",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_mattias", planetName = "naboo", npcName = "Mattias Ve'Shra" }
+                       },
+                       secondarySpawns =
+                       {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 2250 }
+                       }
+               },
 
-               { 
-               missionType = "assassinate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_mattias_aggro", planetName = "naboo", npcName = "Mattias Ve'Shra" }
-               }, 
-               secondarySpawns = {     
-                       { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
-                       { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
-                       { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
-               }, 
-               itemSpawns = 
-               { 
-               },      
-               rewards = 
-               { 
-                       { rewardType = "credits", amount = 2325 }
-               }
-       },
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_mattias_aggro", planetName = "naboo", npcName = "Mattias Ve'Shra" }
+                       },
+                       secondarySpawns = {
+                               { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
+                               { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
+                               { npcTemplate = "brigand_assassin", planetName = "naboo", npcName = "an Assassin" },
+                       },
+                       itemSpawns =
+                       {
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 2325 }
+                       }
+               },
 
-       { 
-               missionType = "confiscate", 
-               primarySpawns = 
-               { 
-                       { npcTemplate = "theme_park_imperial_kayderr", planetName = "naboo", npcName = "Kayderr" }
-               }, 
-               secondarySpawns = {
-               }, 
-               itemSpawns = 
-               { 
-                       { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
-               },      
-               rewards = 
-               { 
-                       { rewardType = "faction", faction = "imperial", amount = 425 }, 
-                       { rewardType = "credits", amount = 2400 },
-                       { rewardType = "loot",  lootGroup = "theme_park_reward_imperial_vader" },
-                       { rewardType = "badge", badge = THEME_PARK_IMPERIAL_BADGE }     
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "theme_park_imperial_kayderr", planetName = "naboo", npcName = "Kayderr" }
+                       },
+                       secondarySpawns = {
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/mission_datadisk.iff", itemName = "Information" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "faction", faction = "imperial", amount = 425 },
+                               { rewardType = "credits", amount = 2400 },
+                               { rewardType = "loot",  lootGroup = "theme_park_reward_imperial_vader" },
+                               { rewardType = "badge", badge = THEME_PARK_IMPERIAL_BADGE }
+                       }
                }
        }
-}
 
-npcMapImperial = 
-{ 
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "kaja_orzee", x = -2, z = 0.5, y = -12.6, direction = 90, cellID = 1418872, position = STAND }, 
-               worldPosition = { x = 2407, y = -3941 }, 
-               npcNumber = 1,   
-               stfFile = "@theme_park_imperial/kaja_orzee",
-               stfWarning = "not_imperial",
-               missions = kaja_orzee_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "loam_redge", x = 19.8, z = 0.2, y = -41.9, direction = 54, cellID = 1418875, position = STAND }, 
-               worldPosition = { x = 2382, y = -3967 }, 
-               npcNumber = 2,   
-               stfFile = "@theme_park_imperial/loam_redge",
-               stfWarning = "kaja_orzee",
-               missions = loam_redge_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "lord_hethrir", x = 5.1, z = 0.2, y = -41.4, direction = -30, cellID = 1418876, position = STAND }, 
-               worldPosition = { x = 2380, y = -3952 }, 
-               npcNumber = 4,   
-               stfFile = "@theme_park_imperial/lord_hethrir",
-               stfWarning = "loam_redge",
-               missions = lord_hethrir_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "thrawn", x = 2372, z = 292, y = -3924, direction = 150, cellID = 0, position = STAND }, 
-               npcNumber = 8,   
-               stfFile = "@theme_park_imperial/thrawn",
-               stfWarning = "lord_hethrir",
-               missions = thrawn_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "veers", x = 2372, z = 292, y = -3917, direction = 90, cellID = 0, position = STAND }, 
-               npcNumber = 16,   
-               stfFile = "@theme_park_imperial/veers",
-               stfWarning = "lord_hethrir",
-               missions = veers_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "palpatine", x = 13, z = 21, y = -25, direction = 180, cellID = 1418886, position = STAND },
-               worldPosition = { x = 2397, y = -3958 },  
-               npcNumber = 32,   
-               stfFile = "@theme_park_imperial/emperor",
-               stfWarning = "emperor",
-               missions = palpatine_missions
-       },
-       { 
-               spawnData = { planetName = "naboo", npcTemplate = "darth_vader", x = -56, z = 0.2, y = -24, direction = 180, cellID = 1418884, position = STAND },
-               worldPosition = { x = 2387, y = -3889 },  
-               npcNumber = 64,   
-               stfFile = "@theme_park_imperial/darth_vader",
-               stfWarning = "vader",
-               missions = darth_vader_missions
+npcMapImperial =
+       {
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "kaja_orzee", x = 1.1, z = 0.2, y = -13.3, direction = 0, cellID = 1418872, position = STAND },
+                       worldPosition = { x = 2407, y = -3941 },
+                       npcNumber = 1,
+                       stfFile = "@theme_park_imperial/kaja_orzee",
+                       stfWarning = "not_imperial",
+                       missions = kaja_orzee_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "loam_redge", x = 19.8, z = 0.2, y = -41.9, direction = 54, cellID = 1418875, position = STAND },
+                       worldPosition = { x = 2382, y = -3967 },
+                       npcNumber = 2,
+                       stfFile = "@theme_park_imperial/loam_redge",
+                       stfWarning = "kaja_orzee",
+                       missions = loam_redge_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "lord_hethrir", x = 5.1, z = 0.2, y = -41.4, direction = -30, cellID = 1418876, position = STAND },
+                       worldPosition = { x = 2380, y = -3952 },
+                       npcNumber = 4,
+                       stfFile = "@theme_park_imperial/lord_hethrir",
+                       stfWarning = "loam_redge",
+                       missions = lord_hethrir_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "thrawn", x = 2371.1, z = 291.9, y = -3923.8, direction = -132, cellID = 0, position = STAND, mood = "conversation" },
+                       npcNumber = 8,
+                       stfFile = "@theme_park_imperial/thrawn",
+                       stfWarning = "lord_hethrir",
+                       missions = thrawn_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "veers", x = 2370.5, z = 291.9, y = -3923.1, direction = -136, cellID = 0, position = STAND, mood = "conversation" },
+                       npcNumber = 16,
+                       stfFile = "@theme_park_imperial/veers",
+                       stfWarning = "lord_hethrir",
+                       missions = veers_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "palpatine", x = 13, z = 21, y = -25.5, direction = 180, cellID = 1418886, position = STAND },
+                       worldPosition = { x = 2397, y = -3958 },
+                       npcNumber = 32,
+                       stfFile = "@theme_park_imperial/emperor",
+                       stfWarning = "emperor",
+                       missions = palpatine_missions
+               },
+               {
+                       spawnData = { planetName = "naboo", npcTemplate = "darth_vader", x = -57.5, z = 0.2, y = -24.1, direction = 90, cellID = 1418884, position = STAND },
+                       worldPosition = { x = 2387, y = -3889 },
+                       npcNumber = 64,
+                       stfFile = "@theme_park_imperial/darth_vader",
+                       stfWarning = "vader",
+                       missions = darth_vader_missions
+               }
        }
-}
 
 permissionMapImperial = {
        {
-               planetName = "naboo", 
-               regionName = "emperors_retreat",                
-               permissions = 
-               { 
-                       { 
+               planetName = "naboo",
+               regionName = "emperors_retreat",
+               permissions =
+               {
+                       {
                                cells = { 1418872, 1418873 },
-                               conditions = 
+                               conditions =
                                {
                                        { permissionType = "faction" }
                                }
                        },
                        {
                                cells = { 1418874, 1418875, 1418876, 1418877, 1418878, 1418879, 1418880, 1418881, 1418882, 1418883, 1418884, 1418885, 1418886 },
-                               conditions = 
+                               conditions =
                                {
                                        { permissionType = "missionState", mission = "theme_park_imperial", missionState = 1 },
                                        { permissionType = "faction" }
@@ -802,14 +802,14 @@ permissionMapImperial = {
 }
 
 permissionMapImperialWarp = {
-               { planetName = "naboo",  radius = 20,
-                       cells = { 1418874 },
-                               conditions = 
-                               {
-                                       { permissionType = "faction", faction = FACTIONIMPERIAL }
-                               },
-                               stfWarning = "not_imperial"
+       { planetName = "naboo",  radius = 20,
+               cells = { 1418874 },
+               conditions =
+               {
+                       { permissionType = "faction", faction = FACTIONIMPERIAL }
                },
+               stfWarning = "not_imperial"
+       },
 }
 
 ThemeParkImperial = ThemeParkLogic:new {
@@ -821,7 +821,7 @@ ThemeParkImperial = ThemeParkLogic:new {
        missionDescriptionStf = "@theme_park_imperial/quest_details:imperial_retreat_",
        missionCompletionMessageStf = "@theme_park/messages:imperial_completion_message",
        faction = FACTIONIMPERIAL
-       --warningMessageStf = "@theme_park_imperial/warning:"
+--warningMessageStf = "@theme_park_imperial/warning:"
 }
 
 registerScreenPlay("ThemeParkImperial", true)
index 3f89d44..3becb74 100644 (file)
@@ -36,6 +36,11 @@ function ThemeParkLogic:spawnNpcs()
                                local npc = LuaCreatureObject(pNpc)
                                npc:setState(STATESITTINGONCHAIR)
                        end
+                       if (npcSpawnData.mood ~= nil and npcSpawnData.mood ~= "") then
+                               ObjectManager.withCreatureObject(pNpc, function(npc)
+                                       npc:setMoodString(npcSpawnData.mood)
+                               end)
+                       end
                end
        end
 end
index 58d7d4e..6411549 100644 (file)
@@ -58,6 +58,7 @@ Luna<LuaCreatureObject>::RegType LuaCreatureObject::Register[] = {
                { "setLootRights", &LuaCreatureObject::setLootRights},
                { "getPosture", &LuaCreatureObject::getPosture},
                { "setPosture", &LuaCreatureObject::setPosture},
+               { "setMoodString", &LuaCreatureObject::setMoodString},
                { "hasSkill", &LuaCreatureObject::hasSkill},
                { "removeSkill", &LuaCreatureObject::removeSkill},
                { "getConversationSession", &LuaCreatureObject::getConversationSession},
@@ -163,6 +164,14 @@ int LuaCreatureObject::setPosture(lua_State* L) {
        return 0;
 }
 
+int LuaCreatureObject::setMoodString(lua_State* L) {
+       String value = lua_tostring(L, -1);
+
+       realObject->setMoodString(value);
+
+       return 0;
+}
+
 int LuaCreatureObject::setPvpStatusBitmask(lua_State* L) {
        int bitmask = lua_tonumber(L, -1);
        realObject->setPvpStatusBitmask(bitmask, true);
index a43f82c..db36dce 100644 (file)
@@ -54,6 +54,7 @@ namespace creature {
                int playEffect(lua_State* L);
                int setState(lua_State* L);
                int setPosture(lua_State* L);
+               int setMoodString(lua_State* L);
                int getPosture(lua_State* L);
                int hasSkill(lua_State* L);
                int removeSkill(lua_State* L);