Instructions Jenkins Doxygen

[added] Xalox Guul quests (Talus) 98/1798/1
authorMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 21:22:47 +0000 (21:22 +0000)
committerMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 21:22:47 +0000 (21:22 +0000)
Change-Id: I1570ea5aeba0d87d75d4fbe76f0d4c84cfcceb6c

16 files changed:
MMOCoreORB/bin/scripts/loot/groups.lua
MMOCoreORB/bin/scripts/loot/groups/task_loot/task_loot_xalox_guul_datadisc.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/loot/items.lua
MMOCoreORB/bin/scripts/loot/items/task_loot/xalox_guul_datadisc.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/conversations/themepark/logic/mission_giver_conv.lua
MMOCoreORB/bin/scripts/mobile/conversations/themepark/logic/mission_target_conv.lua
MMOCoreORB/bin/scripts/mobile/quest/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_criminal.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_guul.lua [moved from MMOCoreORB/bin/scripts/mobile/talus/xolox_guul.lua with 77% similarity]
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_informant.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_slicer.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler2.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/talus/serverobjects.lua
MMOCoreORB/bin/scripts/screenplays/screenplays.lua
MMOCoreORB/bin/scripts/screenplays/tasks/talus/xalox_guul.lua [new file with mode: 0644]

index 3e11f0c..cb5e28e 100644 (file)
@@ -163,6 +163,7 @@ includeFile("groups/task_loot/task_loot_spice_jar.lua")
 includeFile("groups/task_loot/task_loot_squill_carcass.lua")
 includeFile("groups/task_loot/task_loot_vordin_sildor_datadisc.lua")
 includeFile("groups/task_loot/task_loot_womp_rat_hide.lua")
+includeFile("groups/task_loot/task_loot_xalox_guul_datadisc.lua")
 
 -- task_reward sub-folder
 includeFile("groups/task_reward/task_reward_drakka_judarrl.lua")
diff --git a/MMOCoreORB/bin/scripts/loot/groups/task_loot/task_loot_xalox_guul_datadisc.lua b/MMOCoreORB/bin/scripts/loot/groups/task_loot/task_loot_xalox_guul_datadisc.lua
new file mode 100644 (file)
index 0000000..4b42561
--- /dev/null
@@ -0,0 +1,10 @@
+task_loot_xalox_guul_datadisc = {
+  description = "",
+  minimumLevel = 0,
+  maximumLevel = 0,
+  lootItems = {
+    {itemTemplate = "xalox_guul_datadisc", weight = 10000000}
+  }
+}
+
+addLootGroupTemplate("task_loot_xalox_guul_datadisc", task_loot_xalox_guul_datadisc)
\ No newline at end of file
index 30e379c..bf9050f 100644 (file)
@@ -506,6 +506,7 @@ includeFile("items/task_loot/squill_carcass.lua")
 includeFile("items/task_loot/two_handed_sword_scythe_schematic.lua")
 includeFile("items/task_loot/vordin_sildor_datadisc.lua")
 includeFile("items/task_loot/womp_rat_hide.lua")
+includeFile("items/task_loot/xalox_guul_datadisc.lua")
 
 --task_reward sub-folder
 includeFile("items/task_reward/hedon_istee_treasure_map.lua")
diff --git a/MMOCoreORB/bin/scripts/loot/items/task_loot/xalox_guul_datadisc.lua b/MMOCoreORB/bin/scripts/loot/items/task_loot/xalox_guul_datadisc.lua
new file mode 100644 (file)
index 0000000..5214f20
--- /dev/null
@@ -0,0 +1,15 @@
+xalox_guul_datadisc = {
+  minimumLevel = 0,
+  maximumLevel = -1,
+  customObjectName = "",
+  directObjectTemplate = "object/tangible/mission/quest_item/xalox_guul_q2_needed.iff",
+  craftingValues = {
+  },
+  customizationStringNames = {},
+  customizationValues = {},
+  skillMods = {
+
+  }
+}
+
+addLootItemTemplate("xalox_guul_datadisc", xalox_guul_datadisc)
\ No newline at end of file
index 29366ff..c644507 100644 (file)
@@ -252,6 +252,7 @@ createMissionGiverConvoTemplate("vana_sage_mission_giver_convotemplate", "vana_s
 
 -- Talus
 createMissionGiverConvoTemplate("kathikiis_ruwahurr_mission_giver_convotemplate", "kathikiis_ruwahurr_mission_giver_conv_handler")
+createMissionGiverConvoTemplate("xalox_guul_mission_giver_convotemplate", "xalox_guul_mission_giver_conv_handler")
 
 
 -- Dantooine
index 5e9e42d..04ba61f 100644 (file)
@@ -114,6 +114,7 @@ createMissionTargetConvoTemplate("vana_sage_mission_target_convotemplate","vana_
 
 -- Talus
 createMissionTargetConvoTemplate("kathikiis_ruwahurr_mission_target_convotemplate","kathikiis_ruwahurr_mission_target_conv_handler")
+createMissionTargetConvoTemplate("xalox_guul_mission_target_convotemplate","xalox_guul_mission_target_conv_handler")
 
 
 -- Dantooine
index 817b8e9..aad2901 100644 (file)
@@ -262,6 +262,12 @@ includeFile("quest/talus/kathikiis_assist.lua")
 includeFile("quest/talus/kathikiis_bh.lua")
 includeFile("quest/talus/kathikiis_ruwahurr.lua")
 includeFile("quest/talus/kathikiis_thug.lua")
+includeFile("quest/talus/xalox_criminal.lua")
+includeFile("quest/talus/xalox_guul.lua")
+includeFile("quest/talus/xalox_informant.lua")
+includeFile("quest/talus/xalox_slicer.lua")
+includeFile("quest/talus/xalox_smuggler.lua")
+includeFile("quest/talus/xalox_smuggler2.lua")
 
 -- Tatooine
 includeFile("quest/tatooine/aaph_koden.lua")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_criminal.lua b/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_criminal.lua
new file mode 100644 (file)
index 0000000..f0b6e6a
--- /dev/null
@@ -0,0 +1,56 @@
+xalox_criminal = Creature:new {
+       objectName = "@mob/creature_names:criminal",
+       socialGroup = "thug",
+       pvpFaction = "thug",
+       faction = "thug",
+       level = 14,
+       chanceHit = 0.300000,
+       damageMin = 150,
+       damageMax = 160,
+       baseXp = 714,
+       baseHAM = 2000,
+       baseHAMmax = 3000,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = KILLER,
+       optionsBitmask = 128,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/dressed_criminal_thug_human_male_01.iff",
+                                       "object/mobile/dressed_criminal_thug_bothan_female_01.iff",
+                                       "object/mobile/dressed_goon_twk_male_01.iff",
+                                       "object/mobile/dressed_robber_twk_female_01.iff",
+                                       "object/mobile/dressed_goon_twk_female_01.iff",
+                                       "object/mobile/dressed_robber_human_female_01.iff",
+                                       "object/mobile/dressed_villain_trandoshan_male_01.iff",
+                                       "object/mobile/dressed_criminal_thug_bothan_male_01.iff",
+                                       "object/mobile/dressed_villain_trandoshan_female_01.iff"
+                                       },
+       lootGroups = {
+               {
+                       groups = {
+                               {group = "junk", chance = 4000000},
+                               {group = "wearables_common", chance = 2000000},                         
+                               {group = "pistols", chance = 1000000},
+                               {group = "tailor_components", chance = 1500000},
+                               {group = "loot_kit_parts", chance = 1500000}
+                       },
+                       lootChance = 2200000
+               }
+       },
+       weapons = {"pirate_weapons_light"},
+       conversationTemplate = "",
+       attacks = merge(marksmanmaster,brawlernovice)
+}
+
+CreatureTemplates:addCreatureTemplate(xalox_criminal, "xalox_criminal")
@@ -1,4 +1,4 @@
-xolox_guul = Creature:new {
+xalox_guul = Creature:new {
        objectName = "",
        customName = "Xalox Guul",
        socialGroup = "townsperson",
@@ -24,15 +24,15 @@ xolox_guul = Creature:new {
        ferocity = 0,
        pvpBitmask = NONE,
        creatureBitmask = PACK,
-       optionsBitmask = 128,
+       optionsBitmask = 136,
        diet = HERBIVORE,
 
        templates = {"object/mobile/dressed_commander_xalox_guul.iff"},
        lootGroups = {},
        weapons = {},
-       conversationTemplate = "",
+       conversationTemplate = "xalox_guul_mission_giver_convotemplate",
        attacks = {
        }
 }
 
-CreatureTemplates:addCreatureTemplate(xolox_guul, "xolox_guul")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(xalox_guul, "xalox_guul")
\ No newline at end of file
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_informant.lua b/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_informant.lua
new file mode 100644 (file)
index 0000000..a9a44a3
--- /dev/null
@@ -0,0 +1,36 @@
+xalox_informant = Creature:new {
+       objectName = "@mob/creature_names:criminal",
+       socialGroup = "thug",
+       pvpFaction = "thug",
+       faction = "thug",
+       level = 7,
+       chanceHit = 0.26,
+       damageMin = 55,
+       damageMax = 65,
+       baseXp = 187,
+       baseHAM = 270,
+       baseHAMmax = 330,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0,
+       ferocity = 0,
+       pvpBitmask = NONE,
+       creatureBitmask = NONE,
+       optionsBitmask = 136,
+       diet = HERBIVORE,
+
+       templates = { "object/mobile/dressed_criminal_thug_bothan_female_01.iff" },
+       lootGroups = { },
+       weapons = {"pirate_weapons_light"},
+       conversationTemplate = "xalox_guul_mission_target_convotemplate",
+       attacks = merge(marksmanmaster,brawlernovice)
+}
+
+CreatureTemplates:addCreatureTemplate(xalox_informant, "xalox_informant")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_slicer.lua b/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_slicer.lua
new file mode 100644 (file)
index 0000000..fd726cb
--- /dev/null
@@ -0,0 +1,47 @@
+xalox_slicer = Creature:new {
+       objectName = "@mob/creature_names:slicer",
+       socialGroup = "thug",
+       pvpFaction = "thug",
+       faction = "thug",
+       level = 23,
+       chanceHit = 0.33,
+       damageMin = 190,
+       damageMax = 200,
+       baseXp = 2443,
+       baseHAM = 5000,
+       baseHAMmax = 6100,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0.000000,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = KILLER,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/dressed_criminal_assassin_human_female_01.iff",
+                               "object/mobile/dressed_criminal_pirate_human_male_01.iff",
+                               "object/mobile/dressed_criminal_slicer_human_female_01.iff"
+                               },
+       lootGroups = {
+       {
+                       groups = {
+                               {group = "junk", chance = 4000000},
+                               {group = "wearables_common", chance = 3000000},
+                               {group = "loot_kit_parts", chance = 2000000},
+                               {group = "tailor_components", chance = 1000000},
+                       },
+                       lootChance = 3000000
+               }
+       },
+       weapons = {"pirate_weapons_light"},
+       attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
+}
+
+CreatureTemplates:addCreatureTemplate(xalox_slicer, "xalox_slicer")
\ No newline at end of file
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler.lua b/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler.lua
new file mode 100644 (file)
index 0000000..75107ca
--- /dev/null
@@ -0,0 +1,46 @@
+xalox_smuggler = Creature:new {
+       objectName = "@mob/creature_names:smuggler",
+       socialGroup = "Thug",
+       pvpFaction = "Thug",
+       faction = "",
+       level = 14,
+       chanceHit = 0.300000,
+       damageMin = 150,
+       damageMax = 160,
+       baseXp = 714,
+       baseHAM = 2000,
+       baseHAMmax = 3000,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0.000000,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = KILLER,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/dressed_criminal_slicer_human_male_01.iff"},
+       lootGroups = {
+               {
+               groups = {
+                       {group = "junk", chance = 4000000},
+                       {group = "wearables_common", chance = 2000000},                 
+                       {group = "rifles", chance = 1000000},
+                       {group = "pistols", chance = 1000000},
+                       {group = "melee_weapons", chance = 1000000},
+                       {group = "carbines", chance = 1000000},
+               },
+                       lootChance = 2100000
+               }
+       },
+       weapons = {"pirate_weapons_medium"},
+       attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
+}
+
+CreatureTemplates:addCreatureTemplate(xalox_smuggler, "xalox_smuggler")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler2.lua b/MMOCoreORB/bin/scripts/mobile/quest/talus/xalox_smuggler2.lua
new file mode 100644 (file)
index 0000000..9dd3729
--- /dev/null
@@ -0,0 +1,41 @@
+xalox_smuggler2 = Creature:new {
+       objectName = "@mob/creature_names:smuggler",
+       socialGroup = "Thug",
+       pvpFaction = "Thug",
+       faction = "",
+       level = 14,
+       chanceHit = 0.300000,
+       damageMin = 150,
+       damageMax = 160,
+       baseXp = 714,
+       baseHAM = 2000,
+       baseHAMmax = 3000,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0.000000,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = KILLER,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/dressed_criminal_slicer_human_male_01.iff"},
+  lootGroups = {
+    {
+      groups = {
+        {group = "task_loot_xalox_guul_datadisc", chance = 10000000}
+      },
+      lootChance = 10000000
+    }           
+  },
+       weapons = {"pirate_weapons_medium"},
+       attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
+}
+
+CreatureTemplates:addCreatureTemplate(xalox_smuggler2, "xalox_smuggler2")
index caa5aa8..c6e9ae2 100644 (file)
@@ -144,5 +144,4 @@ includeFile("talus/trandoshan_sif_02.lua")
 includeFile("talus/vicious_huf_dun.lua")
 includeFile("talus/voracious_rasp.lua")
 includeFile("talus/wolf_kima.lua")
-includeFile("talus/woodland_kima.lua")
-includeFile("talus/xolox_guul.lua")
+includeFile("talus/woodland_kima.lua")
\ No newline at end of file
index 21395e9..78dd2e2 100644 (file)
@@ -70,6 +70,7 @@ includeFile("tasks/rori/sloan_rusper.lua")
 includeFile("tasks/rori/vordin_sildor.lua")
 includeFile("tasks/rori/zeelius_kraymunder.lua")
 includeFile("tasks/talus/kathikiis_ruwahurr.lua")
+includeFile("tasks/talus/xalox_guul.lua")
 includeFile("tasks/tatooine/aaph_koden.lua")
 includeFile("tasks/tatooine/hedon_istee.lua")
 includeFile("tasks/tatooine/kitster_banai.lua")
diff --git a/MMOCoreORB/bin/scripts/screenplays/tasks/talus/xalox_guul.lua b/MMOCoreORB/bin/scripts/screenplays/tasks/talus/xalox_guul.lua
new file mode 100644 (file)
index 0000000..2784bf8
--- /dev/null
@@ -0,0 +1,92 @@
+xalox_guul_missions =
+       {
+               {
+                       missionType = "escort",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "xalox_informant", planetName = "talus", npcName = "Bothan Informant" }
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "xalox_smuggler", planetName = "talus", npcName = "a Smuggler" },
+                               { npcTemplate = "xalox_smuggler", planetName = "talus", npcName = "a Smuggler" },
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 75 },
+                               { rewardType = "faction", faction = "imperial", amount = 15 },
+                       }
+               },
+               {
+                       missionType = "confiscate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "xalox_smuggler2", planetName = "talus", npcName = "Smuggler" },
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                       },
+                       itemSpawns =
+                       {
+                               { itemTemplate = "object/tangible/mission/quest_item/xalox_guul_q2_needed.iff", itemName = "" }
+                       },
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 75 },
+                               { rewardType = "faction", faction = "imperial", amount = 15 },
+                       }
+               },
+               {
+                       missionType = "assassinate",
+                       primarySpawns =
+                       {
+                               { npcTemplate = "xalox_slicer", planetName = "talus", npcName = "Data Slicer" },
+                       },
+                       secondarySpawns =
+                       {
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                               { npcTemplate = "xalox_criminal", planetName = "talus", npcName = "a Criminal" },
+                       },
+                       itemSpawns = {},
+                       rewards =
+                       {
+                               { rewardType = "credits", amount = 75 },
+                               { rewardType = "faction", faction = "imperial", amount = 15 },
+                       }
+               },
+       }
+
+npcMapXaloxGuul =
+       {
+               {
+                       spawnData = { planetName = "talus", npcTemplate = "xalox_guul", x = 5.3, z = -0.1, y = -3.9, direction = -90, cellID = 4965435, position = SIT },
+                       worldPosition = { x = -2180, y = 2262 },
+                       npcNumber = 1,
+                       stfFile = "@static_npc/talus/talus_imperialoutpost_xalox_guul",
+                       missions = xalox_guul_missions
+               },
+       }
+
+XaloxGuul = ThemeParkLogic:new {
+       numberOfActs = 1,
+       npcMap = npcMapXaloxGuul,
+       className = "XaloxGuul",
+       screenPlayState = "xalox_guul_quest",
+       distance = 800,
+       missionCompletionMessageStf = "@theme_park/messages:static_completion_message",
+       faction = FACTIONIMPERIAL
+}
+
+registerScreenPlay("XaloxGuul", true)
+
+xalox_guul_mission_giver_conv_handler = mission_giver_conv_handler:new {
+       themePark = XaloxGuul
+}
+xalox_guul_mission_target_conv_handler = mission_target_conv_handler:new {
+       themePark = XaloxGuul
+}
\ No newline at end of file