Instructions Jenkins Doxygen

[Removed] duplicate weak mercenary mobile 13/1913/1
authorIvojedi <ivojedi@swgemu.com>
Mon, 30 Jun 2014 20:25:49 +0000 (13:25 -0700)
committerIvojedi <ivojedi@swgemu.com>
Mon, 30 Jun 2014 20:25:49 +0000 (13:25 -0700)
[Added] enemy flag to a few Lok NPCs

Change-Id: I8429f35b539bcff77c7f06a38fd51f9bba54da50

15 files changed:
MMOCoreORB/bin/scripts/managers/spawn_manager/lok.lua
MMOCoreORB/bin/scripts/mobile/lok/elite_canyon_corsair.lua
MMOCoreORB/bin/scripts/mobile/lok/marooned_pirate.lua
MMOCoreORB/bin/scripts/mobile/lok/marooned_pirate_captain.lua
MMOCoreORB/bin/scripts/mobile/lok/marooned_pirate_engineer.lua
MMOCoreORB/bin/scripts/mobile/lok/marooned_pirate_first_mate.lua
MMOCoreORB/bin/scripts/mobile/lok/mercenary_commander.lua
MMOCoreORB/bin/scripts/mobile/lok/mercenary_destroyer.lua
MMOCoreORB/bin/scripts/mobile/lok/mercenary_elite.lua
MMOCoreORB/bin/scripts/mobile/lok/mercenary_messenger.lua
MMOCoreORB/bin/scripts/mobile/lok/mercenary_weak.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/lok/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/lok/sulfur_lake_pirate.lua
MMOCoreORB/bin/scripts/mobile/lok/weak_mercenary.lua
MMOCoreORB/bin/scripts/screenplays/cities/lok_nym_stronghold.lua

index 82d4308..64959dc 100644 (file)
@@ -259,8 +259,8 @@ lok_static_spawns = {
        {"mercenary",60,25.7848,-0.894993,-8.75091,180.009,8145378, "conversation", ""},
        {"mercenary",60,24.6848,-0.894992,-8.75091,135.009,8145378, "conversation", ""},
        {"mercenary",60,432.639,12,5218.48,0,0, "conversation", ""},
-       {"mercenary_weak",300,5.94117,-0.894992,21.7966,180.007,8145382, "conversation", ""},
-       {"mercenary_weak",300,23.1893,-0.894993,9.8231,180.01,8145378, "conversation", ""},
+       {"weak_mercenary",300,5.94117,-0.894992,21.7966,180.007,8145382, "conversation", ""},
+       {"weak_mercenary",300,23.1893,-0.894993,9.8231,180.01,8145378, "conversation", ""},
        {"miner",60,4.19353,13.5019,7.65925,360.011,2745876, "conversation", ""},
        {"miner",60,-13.7191,0.26,-10.4865,360.011,2745870, "conversation", ""},
        {"miner",60,-14.4486,0.26,6.76362,134.998,2745870, "conversation", ""},
index e79a990..9ff9348 100644 (file)
@@ -21,7 +21,7 @@ elite_canyon_corsair = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -39,4 +39,4 @@ elite_canyon_corsair = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(elite_canyon_corsair, "elite_canyon_corsair")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(elite_canyon_corsair, "elite_canyon_corsair")
index aa8cff5..b512dc7 100644 (file)
@@ -21,7 +21,7 @@ marooned_pirate = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -52,4 +52,4 @@ marooned_pirate = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(marooned_pirate, "marooned_pirate")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(marooned_pirate, "marooned_pirate")
index 64e5ad6..0ae20a9 100644 (file)
@@ -21,7 +21,7 @@ marooned_pirate_captain = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -49,4 +49,4 @@ marooned_pirate_captain = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(marooned_pirate_captain, "marooned_pirate_captain")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(marooned_pirate_captain, "marooned_pirate_captain")
index 6a3b77c..e40e9c9 100644 (file)
@@ -21,7 +21,7 @@ marooned_pirate_engineer = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -53,4 +53,4 @@ marooned_pirate_engineer = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(marooned_pirate_engineer, "marooned_pirate_engineer")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(marooned_pirate_engineer, "marooned_pirate_engineer")
index 4366db8..70aea9c 100644 (file)
@@ -21,7 +21,7 @@ marooned_pirate_first_mate = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -50,4 +50,4 @@ marooned_pirate_first_mate = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(marooned_pirate_first_mate, "marooned_pirate_first_mate")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(marooned_pirate_first_mate, "marooned_pirate_first_mate")
index ffa4c99..d6e7034 100644 (file)
@@ -21,7 +21,7 @@ mercenary_commander = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER + STALKER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -50,4 +50,4 @@ mercenary_commander = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(mercenary_commander, "mercenary_commander")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(mercenary_commander, "mercenary_commander")
index 4618471..9ad9e41 100644 (file)
@@ -21,7 +21,7 @@ mercenary_destroyer = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -49,4 +49,4 @@ mercenary_destroyer = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(mercenary_destroyer, "mercenary_destroyer")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(mercenary_destroyer, "mercenary_destroyer")
index 890ce7b..8b8df05 100644 (file)
@@ -21,7 +21,7 @@ mercenary_elite = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER + STALKER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -50,4 +50,4 @@ mercenary_elite = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(mercenary_elite, "mercenary_elite")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(mercenary_elite, "mercenary_elite")
index a38faad..8fc67af 100644 (file)
@@ -21,7 +21,7 @@ mercenary_messenger = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -49,4 +49,4 @@ mercenary_messenger = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(mercenary_messenger, "mercenary_messenger")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(mercenary_messenger, "mercenary_messenger")
diff --git a/MMOCoreORB/bin/scripts/mobile/lok/mercenary_weak.lua b/MMOCoreORB/bin/scripts/mobile/lok/mercenary_weak.lua
deleted file mode 100644 (file)
index e04da60..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-mercenary_weak = Creature:new {
-       objectName = "@mob/creature_names:mercenary_weak",
-       socialGroup = "lok_mercenaries",
-       pvpFaction = "lok_mercenaries",
-       faction = "lok_mercenaries",
-       level = 40,
-       chanceHit = 0.43,
-       damageMin = 335,
-       damageMax = 380,
-       baseXp = 4006,
-       baseHAM = 9100,
-       baseHAMmax = 11100,
-       armor = 0,
-       resists = {60,40,25,25,25,25,-1,-1,-1},
-       meatType = "",
-       meatAmount = 0,
-       hideType = "",
-       hideAmount = 0,
-       boneType = "",
-       boneAmount = 0,
-       milk = 0,
-       tamingChance = 0,
-       ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
-       creatureBitmask = PACK + KILLER + STALKER,
-       optionsBitmask = 128,
-       diet = HERBIVORE,
-
-       templates = {
-                       "object/mobile/dressed_mercenary_weak_hum_m.iff",
-                       "object/mobile/dressed_mercenary_weak_hum_f.iff",
-                       "object/mobile/dressed_mercenary_weak_rod_m.iff"
-                       },
-       lootGroups = {
-       {
-                       groups = {
-                               {group = "junk", chance = 3000000},
-                               {group = "wearables_common", chance = 2000000},
-                               {group = "loot_kit_parts", chance = 2000000},
-                               {group = "tailor_components", chance = 1000000},
-                               {group = "rifles", chance = 2000000}
-                       },
-                       lootChance = 3000000
-               }
-       },
-       weapons = {"rebel_weapons_heavy"},
-       conversationTemplate = "",
-       attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
-}
-
-CreatureTemplates:addCreatureTemplate(mercenary_weak, "mercenary_weak")
\ No newline at end of file
index a3953c9..57c8595 100644 (file)
@@ -89,7 +89,6 @@ includeFile("lok/mercenary_destroyer.lua")
 includeFile("lok/mercenary_elite.lua")
 includeFile("lok/mercenary_messenger.lua")
 includeFile("lok/mercenary_warlord.lua")
-includeFile("lok/mercenary_weak.lua")
 includeFile("lok/mountain_vesp.lua")
 includeFile("lok/nym_guard_elite.lua")
 includeFile("lok/nym_guard_strong.lua")
index 7598b7b..b273966 100644 (file)
@@ -21,7 +21,7 @@ sulfur_lake_pirate = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -33,4 +33,4 @@ sulfur_lake_pirate = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(sulfur_lake_pirate, "sulfur_lake_pirate")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(sulfur_lake_pirate, "sulfur_lake_pirate")
index 9e9c8fa..f06f418 100644 (file)
@@ -21,7 +21,7 @@ weak_mercenary = Creature:new {
        milk = 0,
        tamingChance = 0,
        ferocity = 0,
-       pvpBitmask = AGGRESSIVE + ATTACKABLE,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
        creatureBitmask = PACK + KILLER + STALKER,
        optionsBitmask = 128,
        diet = HERBIVORE,
@@ -37,4 +37,4 @@ weak_mercenary = Creature:new {
        attacks = merge(riflemanmaster,pistoleermaster,carbineermaster,brawlermaster)
 }
 
-CreatureTemplates:addCreatureTemplate(weak_mercenary, "weak_mercenary")
\ No newline at end of file
+CreatureTemplates:addCreatureTemplate(weak_mercenary, "weak_mercenary")
index 689b978..8b244ac 100644 (file)
@@ -184,8 +184,8 @@ function LokNymStrongholdScreenPlay:spawnMobiles()
        --{"mercenary",60,25.7848,-0.894993,-8.75091,180.009,8145378, "conversation", ""},
        --{"mercenary",60,24.6848,-0.894992,-8.75091,135.009,8145378, "conversation", ""},
        --{"mercenary",60,432.639,12,5218.48,0,0, "conversation", ""},
-       --{"mercenary_weak",300,5.94117,-0.894992,21.7966,180.007,8145382, "conversation", ""},
-       --{"mercenary_weak",300,23.1893,-0.894993,9.8231,180.01,8145378, "conversation", ""},
+       --{"weak_mercenary",300,5.94117,-0.894992,21.7966,180.007,8145382, "conversation", ""},
+       --{"weak_mercenary",300,23.1893,-0.894993,9.8231,180.01,8145378, "conversation", ""},
        --{"miner",60,4.19353,13.5019,7.65925,360.011,2745876, "conversation", ""},
        --{"miner",60,-13.7191,0.26,-10.4865,360.011,2745870, "conversation", ""},
        --{"miner",60,-14.4486,0.26,6.76362,134.998,2745870, "conversation", ""},