Instructions Jenkins Doxygen

[Renamed] LairTemplate's LairType member to MobType 69/1469/1
authorIvojedi <ivojedi@swgemu.com>
Sat, 8 Mar 2014 23:32:59 +0000 (15:32 -0800)
committerIvojedi <ivojedi@swgemu.com>
Sat, 8 Mar 2014 23:56:00 +0000 (15:56 -0800)
[Added] npc destroy missions now use npc mission titles and descriptions
instead of creature ones

Change-Id: I76de490546c7fa095ed62f836a4a6485b558212f

55 files changed:
MMOCoreORB/bin/scripts/mobile/lair/lair.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_dynamic/dantooine_janta_scout_neutral_none.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_dynamic/dantooine_kunga_scout_neutral_none.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_dynamic/dantooine_mokk_scout_neutral_none.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_dynamic/global_criminal_neutral_none.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_dynamic/tatooine_alkhara_bandit_patrol_neutral_none.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/borvos_camp.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/borvos_gang.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/criminal_base.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/imperial.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/imperial_banner.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/jabba_swooper_camp.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/mauler_gang.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/rebel.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/rebel_npc.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/valarian_camp.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/valarian_swooper_camp.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_mission/weequay_tribe_camp.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/corellia_drall_patriot_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/corellia_hidden_daggers_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/corellia_meatlump_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_janta_leader_camp_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_janta_rockshaper_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_janta_shaman_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_janta_warrior_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_kunga_leader_camp_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_kunga_rockshaper_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_kunga_warrior_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_mokk_leader_camp_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_mokk_shaman_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/dantooine_mokk_soothsayer_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_imperial_cadet_camp_imperial_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_imperial_cadet_senior_camp_imperial_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_imperial_cadet_squadleader_camp_imperial_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_rebel_patrol_camp_rebel_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_rebel_resistance_anarchist_camp_rebel_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_rebel_resistance_dissident_camp_rebel_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/global_stormtrooper.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/lok_blood_razor_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/lok_canyon_corsair_camp2_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/lok_canyon_corsair_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/naboo_gungan_hermit_neutral_small_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/naboo_gungan_mercenary_camp_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/rori_kobola_miner_base_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/rori_kobola_underboss_base_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/talus_sleemo_delinquent_camp_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/tatooine_evil_settlement_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/tatooine_moisture_settler_neutral_medium_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/tatooine_tusken_raider_village_neutral_large_theater.lua
MMOCoreORB/bin/scripts/mobile/lair/npc_theater/yavin4_hutt_expedition_force_camp_hutt_medium_theater.lua
MMOCoreORB/src/server/zone/managers/creature/LairObserver.idl
MMOCoreORB/src/server/zone/managers/creature/LairObserverImplementation.cpp
MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.cpp
MMOCoreORB/src/server/zone/objects/tangible/components/LairMenuComponent.cpp
MMOCoreORB/src/server/zone/templates/mobile/LairTemplate.h

index 3b27197..b96055a 100644 (file)
@@ -8,8 +8,9 @@ Lair = {
        buildingsMedium = {},
        buildingsHard = {},
        buildingsVeryHard = {},
+
        faction = "neutral",
-       lairType = "creature"
+       mobType = "creature"
 }
 
 function Lair:new (o)
index 27b56ce..0f33e8f 100644 (file)
@@ -6,7 +6,7 @@ dantooine_janta_scout_neutral_none = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_janta_scout_neutral_none", dantooine_janta_scout_neutral_none)
index 1d52d2f..191118a 100644 (file)
@@ -6,7 +6,7 @@ dantooine_kunga_scout_neutral_none = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_kunga_scout_neutral_none", dantooine_kunga_scout_neutral_none)
index 99c6d63..5940d82 100644 (file)
@@ -6,7 +6,7 @@ dantooine_mokk_scout_neutral_none = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_mokk_scout_neutral_none", dantooine_mokk_scout_neutral_none)
index 706d2f8..87fe317 100644 (file)
@@ -6,7 +6,7 @@ global_criminal_neutral_none = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_criminal_neutral_none", global_criminal_neutral_none)
index afddd73..cdd1868 100644 (file)
@@ -6,7 +6,7 @@ tatooine_alkhara_bandit_patrol_neutral_none = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_tatooine.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_tatooine.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_tatooine.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("tatooine_alkhara_bandit_patrol_neutral_none", tatooine_alkhara_bandit_patrol_neutral_none)
index 6c226a2..2585cfc 100644 (file)
@@ -6,7 +6,7 @@ borvos_camp = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("borvos_camp", borvos_camp)
index 8eeff9c..04db15d 100644 (file)
@@ -6,7 +6,7 @@ borvos_gang = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("borvos_gang", borvos_gang)
index 0f0de13..f676f23 100644 (file)
@@ -6,7 +6,7 @@ criminal_base = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("criminal_base", criminal_base)
index 81636a1..ead7906 100644 (file)
@@ -7,7 +7,7 @@ imperial = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 
 }
 
index 1132ca5..0391961 100644 (file)
@@ -7,7 +7,7 @@ imperial_banner = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("imperial_banner", imperial_banner)
index 7f68b1a..e8fd0aa 100644 (file)
@@ -6,7 +6,7 @@ jabba_swooper_camp = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("jabba_swooper_camp", jabba_swooper_camp)
index ae8d5f0..8680709 100644 (file)
@@ -6,7 +6,7 @@ mauler_gang = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_node.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_node.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_node.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("mauler_gang", mauler_gang)
index 4366940..c06213f 100644 (file)
@@ -7,7 +7,7 @@ rebel = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        faction = "rebel",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("rebel", rebel)
index 281fca6..ecb9856 100644 (file)
@@ -7,7 +7,7 @@ rebel_npc = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        faction = "rebel",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("rebel_npc", rebel_npc)
index 4c2db5a..a92c188 100644 (file)
@@ -6,7 +6,7 @@ valarian_camp = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("valarian_camp", valarian_camp)
index 825a848..54ed71d 100644 (file)
@@ -6,7 +6,7 @@ valarian_swooper_camp = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("valarian_swooper_camp", valarian_swooper_camp)
index 97527f0..6bb4f45 100644 (file)
@@ -6,7 +6,7 @@ weequay_tribe_camp = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("weequay_tribe_camp", weequay_tribe_camp)
index f751f3a..8fb02eb 100644 (file)
@@ -6,7 +6,7 @@ corellia_drall_patriot_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("corellia_drall_patriot_camp_neutral_medium_theater", corellia_drall_patriot_camp_neutral_medium_theater)
index a35c2a2..e872a38 100644 (file)
@@ -6,7 +6,7 @@ corellia_hidden_daggers_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_corellia.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_corellia.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_corellia.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("corellia_hidden_daggers_camp_neutral_medium_theater", corellia_hidden_daggers_camp_neutral_medium_theater)
index 0710c6e..9fea768 100644 (file)
@@ -6,7 +6,7 @@ corellia_meatlump_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_2.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("corellia_meatlump_camp_neutral_medium_theater", corellia_meatlump_camp_neutral_medium_theater)
index 21cdc98..8837ae6 100644 (file)
@@ -7,7 +7,7 @@ dantooine_janta_leader_camp_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_janta_leader_camp_neutral_large_theater", dantooine_janta_leader_camp_neutral_large_theater)
index d41c915..9d1dc85 100644 (file)
@@ -7,7 +7,7 @@ dantooine_janta_rockshaper_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_janta_rockshaper_camp_neutral_medium_theater", dantooine_janta_rockshaper_camp_neutral_medium_theater)
index c8ba173..29e16a9 100644 (file)
@@ -7,7 +7,7 @@ dantooine_janta_shaman_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_janta_shaman_camp_neutral_medium_theater", dantooine_janta_shaman_camp_neutral_medium_theater)
index 0629cb8..5b3c289 100644 (file)
@@ -7,7 +7,7 @@ dantooine_janta_warrior_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_janta_warrior_camp_neutral_medium_theater", dantooine_janta_warrior_camp_neutral_medium_theater)
index 0a2f4c6..50821d6 100644 (file)
@@ -7,7 +7,7 @@ dantooine_kunga_leader_camp_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_kunga_leader_camp_neutral_large_theater", dantooine_kunga_leader_camp_neutral_large_theater)
index f09e1d8..df86919 100644 (file)
@@ -7,7 +7,7 @@ dantooine_kunga_rockshaper_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_kunga_rockshaper_camp_neutral_medium_theater", dantooine_kunga_rockshaper_camp_neutral_medium_theater)
index c80f14e..0d7390e 100644 (file)
@@ -7,7 +7,7 @@ dantooine_kunga_warrior_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_kunga_warrior_camp_neutral_medium_theater", dantooine_kunga_warrior_camp_neutral_medium_theater)
index 1c01501..f6d4419 100644 (file)
@@ -7,7 +7,7 @@ dantooine_mokk_leader_camp_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_monolith.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_mokk_leader_camp_neutral_large_theater", dantooine_mokk_leader_camp_neutral_large_theater)
index 28e57a4..3b54241 100644 (file)
@@ -7,7 +7,7 @@ dantooine_mokk_shaman_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_mokk_shaman_camp_neutral_medium_theater", dantooine_mokk_shaman_camp_neutral_medium_theater)
index d02d692..98918fa 100644 (file)
@@ -7,7 +7,7 @@ dantooine_mokk_soothsayer_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_dantari_fire_pit.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("dantooine_mokk_soothsayer_camp_neutral_medium_theater", dantooine_mokk_soothsayer_camp_neutral_medium_theater)
index 05f8258..51aefd8 100644 (file)
@@ -7,7 +7,7 @@ global_imperial_cadet_camp_imperial_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_imperial_cadet_camp_imperial_small_theater", global_imperial_cadet_camp_imperial_small_theater)
index a3e3da7..df1813c 100644 (file)
@@ -7,7 +7,7 @@ global_imperial_cadet_senior_camp_imperial_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_imperial_cadet_senior_camp_imperial_small_theater", global_imperial_cadet_senior_camp_imperial_small_theater)
index ead7708..d912bbe 100644 (file)
@@ -7,7 +7,7 @@ global_imperial_cadet_squadleader_camp_imperial_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_imperial_cadet_squadleader_camp_imperial_small_theater", global_imperial_cadet_squadleader_camp_imperial_small_theater)
index f72d1a0..0c90372 100644 (file)
@@ -7,7 +7,7 @@ global_rebel_patrol_camp_rebel_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        faction = "rebel",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_rebel_patrol_camp_rebel_small_theater", global_rebel_patrol_camp_rebel_small_theater)
index f088049..025834a 100644 (file)
@@ -7,7 +7,7 @@ global_rebel_resistance_anarchist_camp_rebel_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        faction = "rebel",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_rebel_resistance_anarchist_camp_rebel_small_theater", global_rebel_resistance_anarchist_camp_rebel_small_theater)
index bd5bffe..2ddf619 100644 (file)
@@ -7,7 +7,7 @@ global_rebel_resistance_dissident_camp_rebel_small_theater = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_rebel.iff"},
        faction = "rebel",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_rebel_resistance_dissident_camp_rebel_small_theater", global_rebel_resistance_dissident_camp_rebel_small_theater)
index 2a03f48..d32fd19 100644 (file)
@@ -7,7 +7,7 @@ global_stormtrooper = Lair:new {
        buildingsHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_imperial.iff"},
        faction = "imperial",
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("global_stormtrooper", global_stormtrooper)
index 90cb0ec..534049b 100644 (file)
@@ -6,7 +6,7 @@ lok_blood_razor_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_banner_generic_1.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("lok_blood_razor_camp_neutral_medium_theater", lok_blood_razor_camp_neutral_medium_theater)
index 7eb583b..85d64e1 100644 (file)
@@ -6,7 +6,7 @@ lok_canyon_corsair_camp2_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("lok_canyon_corsair_camp2_neutral_medium_theater", lok_canyon_corsair_camp2_neutral_medium_theater)
index 165ee0f..5920101 100644 (file)
@@ -6,7 +6,7 @@ lok_canyon_corsair_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
-       lairType = "npc"
+       mobType = "npc"
 }
 
 addLairTemplate("lok_canyon_corsair_camp_neutral_medium_theater", lok_canyon_corsair_camp_neutral_medium_theater)
index a4b382a..e8c162e 100644 (file)
@@ -7,7 +7,7 @@ naboo_gungan_hermit_neutral_small_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_gungan_statue.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_gungan_statue.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_gungan_statue.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("naboo_gungan_hermit_neutral_small_theater", naboo_gungan_hermit_neutral_small_theater)
index c938c5c..67860b4 100644 (file)
@@ -7,7 +7,7 @@ naboo_gungan_mercenary_camp_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_gungan_statue.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_gungan_statue.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_gungan_statue.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("naboo_gungan_mercenary_camp_neutral_large_theater", naboo_gungan_mercenary_camp_neutral_large_theater)
index d6eba99..aa26fe2 100644 (file)
@@ -6,7 +6,7 @@ rori_kobola_miner_base_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_generator.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_generator.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("rori_kobola_miner_base_neutral_large_theater", rori_kobola_miner_base_neutral_large_theater)
index bef3560..8c37be1 100644 (file)
@@ -6,7 +6,7 @@ rori_kobola_underboss_base_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_node.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_node.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_node.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("rori_kobola_underboss_base_neutral_large_theater", rori_kobola_underboss_base_neutral_large_theater)
index 3f997c0..19a413a 100644 (file)
@@ -6,7 +6,7 @@ talus_sleemo_delinquent_camp_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("talus_sleemo_delinquent_camp_neutral_medium_theater", talus_sleemo_delinquent_camp_neutral_medium_theater)
index a8df37e..4a72b30 100644 (file)
@@ -7,7 +7,7 @@ tatooine_evil_settlement_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("tatooine_evil_settlement_neutral_medium_theater", tatooine_evil_settlement_neutral_medium_theater)
index b8b9030..be7a53d 100644 (file)
@@ -7,7 +7,7 @@ tatooine_moisture_settler_neutral_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/lair_base_hovel.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("tatooine_moisture_settler_neutral_medium_theater", tatooine_moisture_settler_neutral_medium_theater)
index c952aa2..959e324 100644 (file)
@@ -6,7 +6,7 @@ tatooine_tusken_raider_village_neutral_large_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/tusken_raider/lair_tusken_raider_npc.iff"},
        buildingsHard = {"object/tangible/lair/tusken_raider/lair_tusken_raider_npc.iff"},
        buildingsVeryHard = {"object/tangible/lair/tusken_raider/lair_tusken_raider_npc.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("tatooine_tusken_raider_village_neutral_large_theater", tatooine_tusken_raider_village_neutral_large_theater)
index 50c5290..50d9cec 100644 (file)
@@ -6,7 +6,7 @@ yavin4_hutt_expedition_force_camp_hutt_medium_theater = Lair:new {
        buildingsMedium = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
        buildingsVeryHard = {"object/tangible/lair/base/objective_power_transformer.iff"},
-       lairType = "npc",
+       mobType = "npc",
 }
 
 addLairTemplate("yavin4_hutt_expedition_force_camp_hutt_medium_theater", yavin4_hutt_expedition_force_camp_hutt_medium_theater)
index a230c85..2c5fbdc 100644 (file)
@@ -100,8 +100,8 @@ class LairObserver extends Observer implements Logger {
 
        public native int getLivingCreatureCount();
 
-       public int getLairType() {
-               return lairTemplate.getLairType();
+       public int getMobType() {
+               return lairTemplate.getMobType();
        }
 
        public int getSpawnNumber() {
index 7546e0b..9ce8ab4 100644 (file)
@@ -163,7 +163,7 @@ void LairObserverImplementation::doAggro(TangibleObject* lair, TangibleObject* a
 }
 
 void LairObserverImplementation::checkForHeal(TangibleObject* lair, TangibleObject* attacker, bool forceNewUpdate) {
-       if (lair->isDestroyed() || getLairType() == LairTemplate::NPC)
+       if (lair->isDestroyed() || getMobType() == LairTemplate::NPC)
                return;
 
        if (!(getLivingCreatureCount() > 0 && lair->getConditionDamage() > 0))
@@ -225,7 +225,7 @@ bool LairObserverImplementation::checkForNewSpawns(TangibleObject* lair, bool fo
 
        if (forceSpawn) {
                spawnNumber++;
-       } else if (lairTemplate->getLairType() == LairTemplate::NPC) {
+       } else if (getMobType() == LairTemplate::NPC) {
                return false;
        } else {
                int conditionDamage = lair->getConditionDamage();
@@ -259,7 +259,7 @@ bool LairObserverImplementation::checkForNewSpawns(TangibleObject* lair, bool fo
        VectorMap<String, int>* objectsToSpawn = lairTemplate->getMobiles();
        int amountToSpawn = 0;
 
-       if (lairTemplate->getLairType() == LairTemplate::CREATURE) {
+       if (getMobType() == LairTemplate::CREATURE) {
                amountToSpawn = System::random(3) + ((lairTemplate->getSpawnLimit() / 3) - 2);
        } else {
                amountToSpawn = System::random(lairTemplate->getSpawnLimit() / 2) + (lairTemplate->getSpawnLimit() / 2);
index c462685..df5c4c1 100644 (file)
@@ -639,6 +639,7 @@ void MissionManagerImplementation::randomizeGenericDestroyMission(CreatureObject
        }
 
        String messageDifficulty;
+       String missionType;
 
        if (difficulty <= 20)
                messageDifficulty = "_easy";
@@ -647,8 +648,13 @@ void MissionManagerImplementation::randomizeGenericDestroyMission(CreatureObject
        else
                messageDifficulty = "_hard";
 
-       mission->setMissionTitle("mission/mission_destroy_neutral" + messageDifficulty + "_creature", "m" + String::valueOf(randTexts) + "t");
-       mission->setMissionDescription("mission/mission_destroy_neutral" +  messageDifficulty + "_creature", "m" + String::valueOf(randTexts) + "d");
+       if (lairTemplateObject->getMobType() == LairTemplate::NPC)
+               missionType = "_npc";
+       else
+               missionType = "_creature";
+
+       mission->setMissionTitle("mission/mission_destroy_neutral" + messageDifficulty + missionType, "m" + String::valueOf(randTexts) + "t");
+       mission->setMissionDescription("mission/mission_destroy_neutral" +  messageDifficulty + missionType, "m" + String::valueOf(randTexts) + "d");
 
        switch (faction) {
                case MissionObject::FACTIONIMPERIAL:
index 25b7dcd..bb549a8 100644 (file)
@@ -33,7 +33,7 @@ void LairMenuComponent::fillObjectMenuResponse(SceneObject* sceneObject, ObjectM
                        break;
        }
 
-       if(player->hasSkill("outdoors_scout_novice") && player->getDistanceTo(sceneObject) < 8 && lairObserver && lairObserver->getLairType() != LairTemplate::NPC) {
+       if(player->hasSkill("outdoors_scout_novice") && player->getDistanceTo(sceneObject) < 8 && lairObserver && lairObserver->getMobType() != LairTemplate::NPC) {
                menuResponse->addRadialMenuItem(50, 3, "@lair_n:search_lair"); //Search Lair
        }
 
index fad97f0..96023c2 100644 (file)
@@ -18,7 +18,7 @@ namespace mobile {
 
 class LairTemplate : public Object {
 public:
-       enum LairType {CREATURE, NPC};
+       enum MobType {CREATURE, NPC};
 
 protected:
        VectorMap<String, int> mobiles;
@@ -30,7 +30,7 @@ protected:
 
        unsigned int faction;
 
-       LairType lairType;
+       MobType mobType;
 
 public:
        enum { VERYEASY = 0, EASY, MEDIUM, HARD, VERYHARD};
@@ -38,8 +38,11 @@ public:
        //      0-20 20-40 40-60 60-80 80+
 
        LairTemplate(const String& templateName) {
+               spawnLimit = 0;
                buildings.setAllowDuplicateInsertPlan();
                buildings.setNullValue(NULL);
+               faction = 0;
+               mobType = CREATURE;
 
                name = templateName;
        }
@@ -84,20 +87,12 @@ public:
                                faction = GCWManager::IMPERIALHASH;
                        } else if (factionString == "rebel") {
                                faction = GCWManager::REBELHASH;
-                       } else {
-                               faction = 0;
                        }
-               } else {
-                       faction = 0;
                }
 
-               if (templateData->getStringField("lairType").length() > 0) {
-                       if (templateData->getStringField("lairType") == "npc")
-                               lairType = NPC;
-                       else
-                               lairType = CREATURE;
-               } else {
-                       lairType = CREATURE;
+               if (templateData->getStringField("mobType").length() > 0) {
+                       if (templateData->getStringField("mobType") == "npc")
+                               mobType = NPC;
                }
 
                LuaObject mobs = templateData->getObjectField("mobiles");
@@ -213,8 +208,8 @@ public:
                return faction;
        }
 
-       LairType getLairType() {
-               return lairType;
+       MobType getMobType() {
+               return mobType;
        }
 
 };