Instructions Jenkins Doxygen

[fixed] Various quest mob issues 02/1802/1
authorMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 23:09:01 +0000 (23:09 +0000)
committerMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 23:09:01 +0000 (23:09 +0000)
Change-Id: I3111ddc1de3767b712de09a78e2e5c0e0f46362b

MMOCoreORB/bin/scripts/mobile/quest/naboo/vana_thug.lua [moved from MMOCoreORB/bin/scripts/mobile/quest/yavin4/gins_thug.lua with 87% similarity]
MMOCoreORB/bin/scripts/mobile/quest/rori/raxa_stormtrooper.lua
MMOCoreORB/bin/scripts/mobile/quest/rori/raxa_stormtrooper_commando.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/rori/raxa_stormtrooper_squad_leader.lua
MMOCoreORB/bin/scripts/mobile/quest/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/quest/yavin4/gins_scientist.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/screenplays/tasks/dathomir/dolac_legasi.lua
MMOCoreORB/bin/scripts/screenplays/tasks/naboo/vana_sage.lua
MMOCoreORB/bin/scripts/screenplays/tasks/rori/raxa_binn.lua
MMOCoreORB/bin/scripts/screenplays/tasks/yavin4/gins_darone.lua
MMOCoreORB/bin/scripts/screenplays/tasks/yavin4/lian_byrne.lua

@@ -1,15 +1,15 @@
-gins_thug = Creature:new {
+vana_thug = Creature:new {
        objectName = "@mob/creature_names:thug",
        socialGroup = "thug",
        pvpFaction = "thug",
        faction = "thug",
-       level = 15,
+       level = 7,
        chanceHit = 0.26,
-       damageMin = 85,
-       damageMax = 105,
-       baseXp = 207,
-       baseHAM = 500,
-       baseHAMmax = 550,
+       damageMin = 55,
+       damageMax = 65,
+       baseXp = 187,
+       baseHAM = 270,
+       baseHAMmax = 330,
        armor = 0,
        resists = {0,0,0,0,0,0,0,-1,-1},
        meatType = "",
@@ -21,8 +21,8 @@ gins_thug = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = ATTACKABLE + ENEMY + AGGRESSIVE,
-       creatureBitmask = PACK,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
 
@@ -61,4 +61,4 @@ gins_thug = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(gins_thug, "gins_thug")
+CreatureTemplates:addCreatureTemplate(vana_thug, "vana_thug")
index cdb335d..218cc4b 100644 (file)
@@ -3,13 +3,13 @@ raxa_stormtrooper = Creature:new {
        socialGroup = "imperial",
        pvpFaction = "imperial",
        faction = "imperial",
-  level = 12,
-  chanceHit = 0.29,
-  damageMin = 130,
-  damageMax = 140,
-  baseXp = 514,
-  baseHAM = 1200,
-  baseHAMmax = 1400,
+       level = 25,
+       chanceHit = 0.36,
+       damageMin = 240,
+       damageMax = 250,
+       baseXp = 2637,
+       baseHAM = 7200,
+       baseHAMmax = 8800,
        armor = 0,
        resists = {15,15,40,15,15,15,15,-1,-1},
        meatType = "",
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/rori/raxa_stormtrooper_commando.lua b/MMOCoreORB/bin/scripts/mobile/quest/rori/raxa_stormtrooper_commando.lua
new file mode 100644 (file)
index 0000000..2700443
--- /dev/null
@@ -0,0 +1,52 @@
+raxa_stormtrooper_commando = Creature:new {
+       objectName = "@mob/creature_names:storm_commando",
+       socialGroup = "imperial",
+       pvpFaction = "imperial",
+       faction = "imperial",
+       level = 29,
+       chanceHit = 0.38,
+       damageMin = 280,
+       damageMax = 290,
+       baseXp = 3005,
+       baseHAM = 8300,
+       baseHAMmax = 10100,
+       armor = 0,
+       resists = {0,0,0,30,-1,30,-1,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0,
+       ferocity = 0,
+       pvpBitmask = ATTACKABLE,
+       creatureBitmask = PACK + KILLER + STALKER,
+       optionsBitmask = 128,
+       diet = HERBIVORE,
+
+       templates = {"object/mobile/dressed_stormtrooper_commando_m.iff"},
+       lootGroups = {
+               {
+                       groups = {
+                               {group = "color_crystals", chance = 100000},
+                               {group = "junk", chance = 5500000},
+                               {group = "rifles", chance = 550000},
+                               {group = "pistols", chance = 550000},
+                               {group = "melee_weapons", chance = 550000},
+                               {group = "carbines", chance = 550000},
+                               {group = "clothing_attachments", chance = 250000},
+                               {group = "armor_attachments", chance = 250000},
+                               {group = "stormtrooper_common", chance = 700000},
+                               {group = "wearables_common", chance = 1000000}
+                       },
+                       lootChance = 2800000
+               }                                               
+       },
+       weapons = {"stormtrooper_weapons"},
+       conversationTemplate = "",
+       attacks = merge(riflemanmaster,carbineermaster)
+}
+
+CreatureTemplates:addCreatureTemplate(raxa_stormtrooper_commando, "raxa_stormtrooper_commando")
index e5194a8..e85b448 100644 (file)
@@ -3,13 +3,13 @@ raxa_stormtrooper_squad_leader = Creature:new {
        socialGroup = "imperial",
        pvpFaction = "imperial",
        faction = "imperial",
-  level = 22,
-  chanceHit = 0.33,
-  damageMin = 190,
-  damageMax = 200,
-  baseXp = 2219,
-  baseHAM = 5000,
-  baseHAMmax = 6100,
+       level = 27,
+       chanceHit = 0.37,
+       damageMin = 260,
+       damageMax = 270,
+       baseXp = 2822,
+       baseHAM = 8100,
+       baseHAMmax = 9900,
        armor = 0,
        resists = {20,20,20,-1,30,-1,30,-1,-1},
        meatType = "",
index aad2901..db73f02 100644 (file)
@@ -196,6 +196,7 @@ includeFile("quest/naboo/thrawn.lua")
 includeFile("quest/naboo/vana_captain.lua")
 includeFile("quest/naboo/vana_pilot.lua")
 includeFile("quest/naboo/vana_sage.lua")
+includeFile("quest/naboo/vana_thug.lua")
 includeFile("quest/naboo/veers.lua")
 includeFile("quest/naboo/zazzi.lua")
 includeFile("quest/naboo/zim_zam_blattis.lua")
@@ -233,6 +234,7 @@ includeFile("quest/rori/oxil_art_dealer.lua")
 includeFile("quest/rori/oxil_sarban.lua")
 includeFile("quest/rori/raxa_binn.lua")
 includeFile("quest/rori/raxa_rebel_scout.lua")
+includeFile("quest/rori/raxa_stormtrooper_commando.lua")
 includeFile("quest/rori/raxa_stormtrooper_squad_leader.lua")
 includeFile("quest/rori/raxa_stormtrooper.lua")
 includeFile("quest/rori/rohd_gostervek.lua")
@@ -332,7 +334,7 @@ includeFile("quest/tatooine/wizzel.lua")
 includeFile("quest/yavin4/gins_darone.lua")
 includeFile("quest/yavin4/gins_rebel_specforce_sergeant.lua")
 includeFile("quest/yavin4/gins_stranded_rebel_officer.lua")
-includeFile("quest/yavin4/gins_thug.lua")
+includeFile("quest/yavin4/gins_scientist.lua")
 includeFile("quest/yavin4/jan_dodonna.lua")
 includeFile("quest/yavin4/lian_byrne.lua")
 includeFile("quest/yavin4/lian_imperial_courier.lua")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/yavin4/gins_scientist.lua b/MMOCoreORB/bin/scripts/mobile/quest/yavin4/gins_scientist.lua
new file mode 100644 (file)
index 0000000..1144f07
--- /dev/null
@@ -0,0 +1,56 @@
+gins_scientist = Creature:new {
+       objectName = "@mob/creature_names:thug",
+       socialGroup = "rebel",
+       pvpFaction = "rebel",
+       faction = "rebel",
+       level = 15,
+       chanceHit = 0.26,
+       damageMin = 85,
+       damageMax = 105,
+       baseXp = 207,
+       baseHAM = 500,
+       baseHAMmax = 550,
+       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 = ATTACKABLE + ENEMY + AGGRESSIVE,
+       creatureBitmask = PACK,
+       optionsBitmask = 128,
+       diet = HERBIVORE,
+
+       templates = {
+                                       "object/mobile/dressed_combatmedic_trainer_human_male_01.iff", 
+                                       "object/mobile/dressed_brigade_captain_human_male_01.iff",
+                                       "object/mobile/dressed_hutt_medic2_twilek_male_01.iff",
+                                       "object/mobile/dressed_combatmedic_trainer_human_female_01.iff",
+                                       "object/mobile/dressed_doctor_trainer_moncal_male_01.iff",
+                                       "object/mobile/dressed_combatmedic_trainer_rodian_male_01.iff",
+                                       "object/mobile/dressed_mercenary_medic_rodian_female_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 = 2600000
+               }
+       },
+       weapons = {"pirate_weapons_light"},
+       conversationTemplate = "",
+       attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
+}
+
+CreatureTemplates:addCreatureTemplate(gins_scientist, "gins_scientist")
index d5000c3..f957e07 100644 (file)
@@ -6,7 +6,10 @@ mozo_bondog_missions =
                        {
                                { npcTemplate = "mozo_escaped_tkm", planetName = "dathomir", npcName = "Escaped Prisoner" }
                        },
-                       secondarySpawns = {},
+                       secondarySpawns = 
+                       {
+                               { npcTemplate = "nightsister_rancor_tamer", planetName = "dathomir", npcName = "" }
+                       },
                        itemSpawns = {},
                        rewards =
                        {
index a53acd2..4b1b7a1 100644 (file)
@@ -8,8 +8,8 @@ vana_sage_missions =
                        },
                        secondarySpawns =
                        {
-                               { npcTemplate = "thug", planetName = "naboo", npcName = "Thug" },
-                               { npcTemplate = "thug", planetName = "naboo", npcName = "Thug" },
+                               { npcTemplate = "vana_thug", planetName = "naboo", npcName = "Thug" },
+                               { npcTemplate = "vana_thug", planetName = "naboo", npcName = "Thug" },
                        },
                        itemSpawns =
                        {
@@ -62,7 +62,7 @@ npcMapVanaSage =
        {
                {
                        spawnData = { planetName = "naboo", npcTemplate = "vana_sage", x = 1276.1, z = 13.0, y = 2744.8, direction = -82, cellID = 0, position = STAND },
-                       worldPosition = { x = 4973, y = 6709 },
+                       worldPosition = { x = 1276, y = 2744 },
                        npcNumber = 1,
                        stfFile = "@static_npc/naboo/vana_sage",
                        hasWaypointNames = "no",
index edc11fb..8f97955 100644 (file)
@@ -25,8 +25,8 @@ raxa_binn_missions =
         { npcTemplate = "raxa_rebel_scout", planetName = "rori", npcName = "Rebel Scout" }
       },
       secondarySpawns = {
-        { npcTemplate = "raxa_stormtrooper", planetName = "rori", npcName = "" },
-        { npcTemplate = "raxa_stormtrooper", planetName = "rori", npcName = "" }
+        { npcTemplate = "raxa_stormtrooper_commando", planetName = "rori", npcName = "" },
+        { npcTemplate = "raxa_stormtrooper_commando", planetName = "rori", npcName = "" }
       },
       itemSpawns = {},
       rewards =
index b3643b8..51466d1 100644 (file)
@@ -44,7 +44,7 @@ gins_darone_missions =
       missionType = "assassinate",
       primarySpawns =
       {
-        { npcTemplate = "gins_thug", planetName = "yavin4", npcName = "" }
+        { npcTemplate = "gins_scientist", planetName = "yavin4", npcName = "Rebel Scientist" }
       },
       secondarySpawns = {},
       itemSpawns = {},
index f4130bb..9a8c45a 100644 (file)
@@ -25,11 +25,11 @@ lian_byrne_missions =
       missionType = "escort",
       primarySpawns =
       {
-        { npcTemplate = "lian_imperial_operative", planetName = "yavin4", npcName = "" }
+        { npcTemplate = "lian_imperial_operative", planetName = "yavin4", npcName = "Imperial Operative" }
       },
       secondarySpawns = {
-        { npcTemplate = "lian_thief", planetName = "yavin4", npcName = "" },
-        { npcTemplate = "lian_thief", planetName = "yavin4", npcName = "" }
+        { npcTemplate = "lian_thief", planetName = "yavin4", npcName = "Scavenger" },
+        { npcTemplate = "lian_thief", planetName = "yavin4", npcName = "Scavenger" }
       },
       itemSpawns = {},
       rewards =
@@ -42,7 +42,7 @@ lian_byrne_missions =
       missionType = "confiscate",
       primarySpawns =
       {
-        { npcTemplate = "lian_spynet_operative", planetName = "yavin4", npcName = "" }
+        { npcTemplate = "lian_spynet_operative", planetName = "yavin4", npcName = "Rebel Spy" }
       },
       secondarySpawns = {},
       itemSpawns =