Instructions Jenkins Doxygen

[Consolidated] different spawn group types into one 51/1751/2
authorIvojedi <ivojedi@swgemu.com>
Sat, 7 Jun 2014 02:02:10 +0000 (19:02 -0700)
committerIvojedi <ivojedi@swgemu.com>
Sat, 7 Jun 2014 17:21:41 +0000 (10:21 -0700)
[Removed] unused spawn groups

Change-Id: I8ad3d02f039e79c9ec81c277a5861ff9cafad544

63 files changed:
MMOCoreORB/bin/scripts/managers/spawn_manager/corellia.lua
MMOCoreORB/bin/scripts/mobile/spawn/butterfly_coro.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/capper_spineflap.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/corellia_starter_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/corellia_test.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/corellia_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/coro_newbie.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/coro_test.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/coro_world_easy.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/dantooine_hard_graul.lua
MMOCoreORB/bin/scripts/mobile/spawn/dantooine_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/dantooine_world_easy.lua
MMOCoreORB/bin/scripts/mobile/spawn/dantooine_world_npc.lua
MMOCoreORB/bin/scripts/mobile/spawn/dathomir_sarlacc_mutant.lua
MMOCoreORB/bin/scripts/mobile/spawn/dathomir_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/dathomir_world_easy.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/corellia_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/dantooine_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/dathomir_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/endor_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/factional_imperial_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/factional_neutral_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/factional_rebel_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/lok_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/naboo_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/rori_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/talus_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/tatooine_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/destroy_mission/yavin4_destroy_missions.lua
MMOCoreORB/bin/scripts/mobile/spawn/dynamic_capper_spineflap.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/endor_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/lok_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/naboo_medium_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/naboo_starter_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/naboo_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/naboo_world_easy.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/peko_albatross.lua
MMOCoreORB/bin/scripts/mobile/spawn/rori_medium_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/rori_starter_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/rori_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/spawn/talus_starter_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/talus_world_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/tatooine_creatures_world.lua
MMOCoreORB/bin/scripts/mobile/spawn/tatooine_starter_creatures.lua
MMOCoreORB/bin/scripts/mobile/spawn/tatooine_starter_small_town.lua
MMOCoreORB/bin/scripts/mobile/spawn/tatooine_test.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/test.lua [deleted file]
MMOCoreORB/bin/scripts/mobile/spawn/yavin_world_creatures.lua
MMOCoreORB/src/server/zone/managers/creature/CreatureTemplateManager.cpp
MMOCoreORB/src/server/zone/managers/creature/CreatureTemplateManager.h
MMOCoreORB/src/server/zone/managers/creature/DynamicSpawnGroup.h [deleted file]
MMOCoreORB/src/server/zone/managers/creature/LairSpawnGroup.h [deleted file]
MMOCoreORB/src/server/zone/managers/creature/SpawnGroup.h
MMOCoreORB/src/server/zone/managers/creature/StaticSpawnGroup.h [deleted file]
MMOCoreORB/src/server/zone/managers/mission/DestroyMissionSpawnGroup.h [deleted file]
MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.cpp
MMOCoreORB/src/server/zone/objects/area/DynamicSpawnAreaImplementation.cpp
MMOCoreORB/src/server/zone/objects/area/LairSpawnArea.idl
MMOCoreORB/src/server/zone/objects/area/LairSpawnAreaImplementation.cpp
MMOCoreORB/src/server/zone/objects/area/StaticSpawnAreaImplementation.cpp
MMOCoreORB/src/server/zone/objects/creature/aigroup/AiGroup.idl
MMOCoreORB/src/server/zone/objects/creature/aigroup/AiGroupImplementation.cpp

index cb40f44..73c95e1 100644 (file)
@@ -77,7 +77,7 @@ corellia_regions = {
        {"corellia_rebel_riverside_fort",0,0,{1,0},UNDEFINEDAREA,1},
        {"coronet_easy_newbie",-230,-4460,{1,2560},LAIRSPAWNAREA + WORLDSPAWNAREA,1,"corellia_starter_creatures"},
        {"coronet",0,0,{1,0},UNDEFINEDAREA,1},
-       {"coronet_medium_newbie",58,-4392,{1,512},LAIRSPAWNAREA,1,"coro_newbie"},
+       {"coronet_medium_newbie",58,-4392,{1,0},UNDEFINEDAREA,1},
         {"crystal_arch_hall",-6831,2200,{1,30},STATICSPAWNAREA + NOSPAWNAREA + NOBUILDZONEAREA,1},
        {"daoba_guerfel",0,0,{1,0},UNDEFINEDAREA,1},
        {"denendre_valley_1",0,0,{1,0},UNDEFINEDAREA,1},
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/butterfly_coro.lua b/MMOCoreORB/bin/scripts/mobile/spawn/butterfly_coro.lua
deleted file mode 100644 (file)
index bd847a3..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-butterfly_coro = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 15,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "capper_spineflap_easy",
-                       spawnLimit = -1,
-                       minDifficulty = 10,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "capper_spineflap_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 60,
-                       maxDifficulty = 80,
-                       numberToSpawn = 0,
-                       weighting = 25,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("butterfly_coro", butterfly_coro);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/capper_spineflap.lua b/MMOCoreORB/bin/scripts/mobile/spawn/capper_spineflap.lua
deleted file mode 100644 (file)
index 4099173..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-capper_spineflap = {
-       wanderRadius = 10,
-       commandLevel = 0,
-       
-       respawnTime = 60;
-       
-       type = HERD,
-       
-       x = 0.00,
-       y = 0.00,
-       z = 6.00,
-       cellID = 0,
-       
-       spawns = {
-               {"capper_spineflap",0.00,0.00,0.00,0.00,0.00,0.00,0.00},
-               {"capper_spineflap",1.00,1.00,0.00,0.00,0.00,0.00,0.00}
-       }
-}
-
-addStaticGroup("capper_spineflap", capper_spineflap);
\ No newline at end of file
index 2737157..e25bb1f 100644 (file)
@@ -162,4 +162,4 @@ corellia_starter_creatures = {
        }
 }
 
-addLairGroup("corellia_starter_creatures", corellia_starter_creatures);
+addSpawnGroup("corellia_starter_creatures", corellia_starter_creatures);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/corellia_test.lua b/MMOCoreORB/bin/scripts/mobile/spawn/corellia_test.lua
deleted file mode 100644 (file)
index a849e92..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-corellia_test = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 20,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "cu_pa_hard",
-                       spawnLimit = -1,
-                       minDifficulty = 90,
-                       maxDifficulty = 99,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("corellia_test", corellia_test);
index df1841e..33a5185 100644 (file)
@@ -261,4 +261,4 @@ corellia_world_creatures = {
        }
 }
 
-addLairGroup("corellia_world_creatures", corellia_world_creatures);
+addSpawnGroup("corellia_world_creatures", corellia_world_creatures);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/coro_newbie.lua b/MMOCoreORB/bin/scripts/mobile/spawn/coro_newbie.lua
deleted file mode 100644 (file)
index bb0f342..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-coro_newbie = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 50,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "corellian_butterfly_lair",
-                       spawnLimit = -1,
-                       minDifficulty = 7,
-                       maxDifficulty = 30,
-                       numberToSpawn = 5,
-                       weighting = 15,
-                       size = 15
-               },
-               {
-                       lairTemplateName = "capper_spineflap_easy",
-                       spawnLimit = -1,
-                       minDifficulty = 20,
-                       maxDifficulty = 30,
-                       numberToSpawn = 5,
-                       weighting = 15,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("coro_newbie", coro_newbie);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/coro_test.lua b/MMOCoreORB/bin/scripts/mobile/spawn/coro_test.lua
deleted file mode 100644 (file)
index c596ca1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-coro_test = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 5,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "cu_pa_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 60,
-                       maxDifficulty = 80,
-                       numberToSpawn = 0,
-                       weighting = 25,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("coro_test", coro_test);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/coro_world_easy.lua b/MMOCoreORB/bin/scripts/mobile/spawn/coro_world_easy.lua
deleted file mode 100644 (file)
index a82e050..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-coro_world_easy = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 2048,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "corellia_bageraset_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_carrion_spat_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellian_butterfly",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_dalyrake_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_durni_warren_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_gronda_lair_neutral_large",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_gubbur_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_gulginaw_nest_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_krahbu_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_murra_lair_neutral_none",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_plumed_rasp_nest_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_sharnaff_lair_neutral_none",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_slice_hound_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "corellia_vynock_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 20,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("coro_world_easy", coro_world_easy);
index e46f110..0821f7c 100644 (file)
@@ -27,4 +27,4 @@ dantooine_hard_graul = {
        }
 }
 
-addLairGroup("dantooine_hard_graul", dantooine_hard_graul);
+addSpawnGroup("dantooine_hard_graul", dantooine_hard_graul);
index 2016635..7e227de 100644 (file)
@@ -209,4 +209,4 @@ dantooine_world_creatures = {
        }
 }
 
-addLairGroup("dantooine_world_creatures", dantooine_world_creatures);
+addSpawnGroup("dantooine_world_creatures", dantooine_world_creatures);
index 8a4a3a7..921b981 100644 (file)
@@ -90,4 +90,4 @@ dantooine_world_easy = {
        }
 }
 
-addLairGroup("dantooine_world_easy", dantooine_world_easy);
+addSpawnGroup("dantooine_world_easy", dantooine_world_easy);
index 5863792..b27f7fa 100644 (file)
@@ -99,4 +99,4 @@ dantooine_world_npc = {
        }
 }
 
-addLairGroup("dantooine_world_npc", dantooine_world_npc);
+addSpawnGroup("dantooine_world_npc", dantooine_world_npc);
index 6dbb76c..11be84b 100644 (file)
@@ -72,4 +72,4 @@ dathomir_sarlacc_mutant = {
        }
 }
 
-addLairGroup("dathomir_sarlacc_mutant", dathomir_sarlacc_mutant);
+addSpawnGroup("dathomir_sarlacc_mutant", dathomir_sarlacc_mutant);
index ca977e5..51b37b1 100644 (file)
@@ -237,4 +237,4 @@ dathomir_world_creatures = {
        }
 }
 
-addLairGroup("dathomir_world_creatures", dathomir_world_creatures);
+addSpawnGroup("dathomir_world_creatures", dathomir_world_creatures);
index ad37435..0c4ae3e 100644 (file)
@@ -126,4 +126,4 @@ dathomir_world_easy = {
        }
 }
 
-addLairGroup("dathomir_world_easy", dathomir_world_easy);
+addSpawnGroup("dathomir_world_easy", dathomir_world_easy);
index a7719fe..372cb3e 100644 (file)
@@ -4,7 +4,7 @@ corellia_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "corellia_gubbur_lair_neutral_small",
                        minDifficulty = 5,
index 0887beb..92b345f 100644 (file)
@@ -4,7 +4,7 @@ dantooine_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "dantooine_bol_herd_neutral_none",
                        minDifficulty = 8,
index 22fe237..0c14f50 100644 (file)
@@ -4,7 +4,7 @@ dathomir_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "dathomir_verne_herd_neutral_none",
                        minDifficulty = 7,
index c6b85f4..9ed85ec 100644 (file)
@@ -4,7 +4,7 @@ endor_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "endor_squall_rabid_neutral_small",
                        minDifficulty = 8,
index 36fd75a..1522a1c 100644 (file)
@@ -4,7 +4,7 @@ factional_imperial_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        
                        lairTemplateName = "rebel_npc",
index 6076fb6..6fa56ba 100644 (file)
@@ -4,7 +4,7 @@ factional_neutral_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "global_criminal_neutral_none",
                        minDifficulty = 7,
index d13c999..766bd1c 100644 (file)
@@ -4,7 +4,7 @@ factional_rebel_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "imperial_banner",
                        minDifficulty = 14,
index 64751ce..7799b37 100644 (file)
@@ -4,7 +4,7 @@ lok_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "lok_pharple_lair_neutral_medium",
                        minDifficulty = 4,
index de4396e..8472f7d 100644 (file)
@@ -4,7 +4,7 @@ naboo_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "naboo_gnort_lair_neutral_small",
                        minDifficulty = 3,
index 89dbe42..a79767b 100644 (file)
@@ -4,7 +4,7 @@ rori_destroy_missions = {
 \r
        type = LAIR,\r
 \r
-       destroyMissionSpawns = {\r
+       lairSpawns = {\r
                {\r
                        lairTemplateName = "rori_squall_warren_neutral_medium",\r
                        minDifficulty = 5,\r
index d2e527e..f9700b6 100644 (file)
@@ -4,7 +4,7 @@ talus_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "talus_dalyrake_nest_neutral_medium",                
                        minDifficulty = 6,
index 289f410..980f83e 100644 (file)
@@ -4,7 +4,7 @@ tatooine_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "tatooine_kreetle_lair_neutral_small",
                        minDifficulty = 3,
index 454e484..af86108 100644 (file)
@@ -4,7 +4,7 @@ yavin4_destroy_missions = {
 
        type = LAIR,
 
-       destroyMissionSpawns = {
+       lairSpawns = {
                {
                        lairTemplateName = "yavin4_tanc_mite_lair_neutral_medium",
                        minDifficulty = 8,
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/dynamic_capper_spineflap.lua b/MMOCoreORB/bin/scripts/mobile/spawn/dynamic_capper_spineflap.lua
deleted file mode 100644 (file)
index 173fcc2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-dynamic_capper_spineflap = {
-       wanderRadius = 10,
-       commandLevel = 0,
-       
-       size = 1,
-       
-       type = PACK,
-       
-       scout = {},
-       scoutWeight = 0.00,
-       
-       protector = {"capper_spineflap"},
-       protectorWeight = 1.00,
-       
-       baby = {},
-       babyWeight = 0.00,
-       
-       lairTemplate = ""
-}
-
-addDynamicGroup("dynamic_capper_spineflap", dynamic_capper_spineflap);
index fc06854..56b9ac7 100644 (file)
@@ -216,4 +216,4 @@ endor_world_creatures = {
        }
 }
 
-addLairGroup("endor_world_creatures", endor_world_creatures);
+addSpawnGroup("endor_world_creatures", endor_world_creatures);
index 55ce093..4b9a8ea 100644 (file)
@@ -189,4 +189,4 @@ lok_world_creatures = {
        }
 }
 
-addLairGroup("lok_world_creatures", lok_world_creatures);
+addSpawnGroup("lok_world_creatures", lok_world_creatures);
index d22792c..5c3ea67 100644 (file)
@@ -144,4 +144,4 @@ naboo_medium_creatures = {
        }
 }
 
-addLairGroup("naboo_medium_creatures", naboo_medium_creatures);
+addSpawnGroup("naboo_medium_creatures", naboo_medium_creatures);
index 10ae94c..2a05347 100644 (file)
@@ -117,4 +117,4 @@ naboo_starter_creatures = {
        }
 }
 
-addLairGroup("naboo_starter_creatures", naboo_starter_creatures);
+addSpawnGroup("naboo_starter_creatures", naboo_starter_creatures);
index 085f587..596fe01 100644 (file)
@@ -369,4 +369,4 @@ naboo_world_creatures = {
        }
 }
 
-addLairGroup("naboo_world_creatures", naboo_world_creatures);
+addSpawnGroup("naboo_world_creatures", naboo_world_creatures);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/naboo_world_easy.lua b/MMOCoreORB/bin/scripts/mobile/spawn/naboo_world_easy.lua
deleted file mode 100644 (file)
index 20a0bca..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-naboo_world_easy = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 2048,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "naboo_capper_spineflap_nest_neutral_large",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_chuba_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_falumpaset_lair_neutral_large",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_fambaa_lair_neutral_large",
-                       spawnLimit = -1,
-                       minDifficulty = 19,
-                       maxDifficulty = 29,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_flewt_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_gnort_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_hermit_spider_lair_neutral_small",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_ikopi_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_kaadu_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_narglatch_male_neutral_none",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_nuna_lair_neutral_medium",
-                       spawnLimit = -1,
-                       minDifficulty = 5,
-                       maxDifficulty = 10,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               },
-               {
-                       lairTemplateName = "naboo_peko_peko_solitary_neutral_none",
-                       spawnLimit = -1,
-                       minDifficulty = 10,
-                       maxDifficulty = 15,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("naboo_world_easy", naboo_world_easy);
index 95d956b..ab9a2b8 100644 (file)
@@ -18,4 +18,4 @@ peko_albatross = {
        }
 }
 
-addLairGroup("peko_albatross", peko_albatross);
+addSpawnGroup("peko_albatross", peko_albatross);
index 29d53bd..80980b6 100644 (file)
@@ -153,4 +153,4 @@ rori_medium_creatures = {
        }
 }
 
-addLairGroup("rori_medium_creatures", rori_medium_creatures);
+addSpawnGroup("rori_medium_creatures", rori_medium_creatures);
index 4081166..5077db1 100644 (file)
@@ -108,4 +108,4 @@ rori_starter_creatures = {
        }
 }
 
-addLairGroup("rori_starter_creatures", rori_starter_creatures);
+addSpawnGroup("rori_starter_creatures", rori_starter_creatures);
index 837da40..94a2757 100644 (file)
@@ -369,4 +369,4 @@ rori_world_creatures = {
        }
 }
 
-addLairGroup("rori_world_creatures", rori_world_creatures);
+addSpawnGroup("rori_world_creatures", rori_world_creatures);
index 40251e6..4c07525 100644 (file)
@@ -14,7 +14,6 @@ includeFile("spawn/dantooine_hard_graul.lua")
 includeFile("spawn/dantooine_world_npc.lua")
 includeFile("spawn/dathomir_sarlacc_mutant.lua")
 includeFile("spawn/corellia_starter_creatures.lua")
-includeFile("spawn/coro_newbie.lua")
 includeFile("spawn/naboo_medium_creatures.lua")
 includeFile("spawn/naboo_starter_creatures.lua")
 includeFile("spawn/peko_albatross.lua")
@@ -24,14 +23,6 @@ includeFile("spawn/talus_starter_creatures.lua")
 includeFile("spawn/tatooine_starter_creatures.lua")
 includeFile("spawn/tatooine_starter_small_town.lua")
 
-includeFile("spawn/butterfly_coro.lua")
-includeFile("spawn/capper_spineflap.lua")
-includeFile("spawn/corellia_test.lua")
-includeFile("spawn/coro_test.lua")
-includeFile("spawn/dynamic_capper_spineflap.lua")
-includeFile("spawn/tatooine_test.lua")
-includeFile("spawn/test.lua")
-
 --destroy_mission
 includeFile("spawn/destroy_mission/corellia_destroy_missions.lua")
 includeFile("spawn/destroy_mission/dantooine_destroy_missions.lua")
index c376372..e756c28 100644 (file)
@@ -72,4 +72,4 @@ talus_starter_creatures = {
        }
 }
 
-addLairGroup("talus_starter_creatures", talus_starter_creatures);
+addSpawnGroup("talus_starter_creatures", talus_starter_creatures);
index 56da8a5..41fc149 100644 (file)
@@ -360,4 +360,4 @@ talus_world_creatures = {
        }
 }
 
-addLairGroup("talus_world_creatures", talus_world_creatures);
+addSpawnGroup("talus_world_creatures", talus_world_creatures);
index 4ab4f00..a1ab076 100644 (file)
@@ -243,4 +243,4 @@ tatooine_creatures_world = {
        }
 }
 
-addLairGroup("tatooine_creatures_world", tatooine_creatures_world);
+addSpawnGroup("tatooine_creatures_world", tatooine_creatures_world);
index e73fa4e..a192a49 100644 (file)
@@ -99,4 +99,4 @@ tatooine_starter_creatures = {
        }
 }
 
-addLairGroup("tatooine_starter_creatures", tatooine_starter_creatures);
+addSpawnGroup("tatooine_starter_creatures", tatooine_starter_creatures);
index 607118d..6be5478 100644 (file)
@@ -126,4 +126,4 @@ tatooine_starter_small_town = {
        }
 }
 
-addLairGroup("tatooine_starter_small_town", tatooine_starter_small_town);
+addSpawnGroup("tatooine_starter_small_town", tatooine_starter_small_town);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/tatooine_test.lua b/MMOCoreORB/bin/scripts/mobile/spawn/tatooine_test.lua
deleted file mode 100644 (file)
index 526a9df..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-tatooine_test = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 80,
-
-       lairSpawns = {
-               {
-                       lairTemplateName = "cu_pa_easy",
-                       spawnLimit = -1,
-                       minDifficulty = 10,
-                       maxDifficulty = 15,
-                       numberToSpawn = 0,
-                       weighting = 15,
-                       size = 25
-               }
-       }
-}
-
-addLairGroup("tatooine_test", tatooine_test);
diff --git a/MMOCoreORB/bin/scripts/mobile/spawn/test.lua b/MMOCoreORB/bin/scripts/mobile/spawn/test.lua
deleted file mode 100644 (file)
index 83adb46..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-test = {
-       wanderRadius = 10,
-       commandLevel = 0,
-
-       type = LAIR,
-       maxSpawnLimit = 0,
-
-       lairSpawns = {
-       }
-}
-
-addLairGroup("test", test);
index cc83efb..f37132d 100644 (file)
@@ -315,4 +315,4 @@ yavin_world_creatures = {
        }
 }
 
-addLairGroup("yavin_world_creatures", yavin_world_creatures);
+addSpawnGroup("yavin_world_creatures", yavin_world_creatures);
index 0cf9353..6d6c284 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #include "CreatureTemplateManager.h"
-#include "LairSpawnGroup.h"
+#include "SpawnGroup.h"
 #include "server/conf/ConfigManager.h"
 
 AtomicInteger CreatureTemplateManager::loadedMobileTemplates;
@@ -32,11 +32,9 @@ CreatureTemplateManager::CreatureTemplateManager() : Logger("CreatureTemplateMan
        lua_register(lua->getLuaState(), "includeFile", includeFile);
        lua_register(lua->getLuaState(), "addTemplate", addTemplate);
        lua_register(lua->getLuaState(), "addWeapon", addWeapon);
-       lua_register(lua->getLuaState(), "addDynamicGroup", addDynamicGroup);
-       lua_register(lua->getLuaState(), "addStaticGroup", addStaticGroup);
        lua_register(lua->getLuaState(), "addConversationTemplate", addConversationTemplate);
        lua_register(lua->getLuaState(), "addLairTemplate", addLairTemplate);
-       lua_register(lua->getLuaState(), "addLairGroup", addLairGroup);
+       lua_register(lua->getLuaState(), "addSpawnGroup", addSpawnGroup);
        lua_register(lua->getLuaState(), "addDestroyMissionGroup", addDestroyMissionGroup);
        lua_register(lua->getLuaState(), "addPatrolPathTemplate", addPatrolPathTemplate);
        lua_register(lua->getLuaState(), "addOutfitGroup", addOutfitGroup);
@@ -207,39 +205,7 @@ int CreatureTemplateManager::addWeapon(lua_State* L) {
        return 0;
 }
 
-int CreatureTemplateManager::addDynamicGroup(lua_State* L) {
-       if (checkArgumentCount(L, 2) == 1) {
-               instance()->error("incorrect number of arguments passed to CreatureTemplateManager::addDynamicGroup");
-               ERROR_CODE = INCORRECT_ARGUMENTS;
-               return 0;
-       }
-
-       String ascii = lua_tostring(L, -2);
-       uint32 crc = (uint32) ascii.hashCode();
-
-       LuaObject obj(L);
-       CreatureTemplateManager::instance()->dynamicGroupMap.put(crc, new DynamicSpawnGroup(ascii, obj));
-
-       return 0;
-}
-
-int CreatureTemplateManager::addStaticGroup(lua_State* L) {
-       if (checkArgumentCount(L, 2) == 1) {
-               instance()->error("incorrect number of arguments passed to CreatureTemplateManager::addStaticGroup");
-               ERROR_CODE = INCORRECT_ARGUMENTS;
-               return 0;
-       }
-
-       String ascii = lua_tostring(L, -2);
-       uint32 crc = (uint32) ascii.hashCode();
-
-       LuaObject obj(L);
-       CreatureTemplateManager::instance()->staticGroupMap.put(crc, new StaticSpawnGroup(ascii, obj));
-
-       return 0;
-}
-
-int CreatureTemplateManager::addLairGroup(lua_State* L) {
+int CreatureTemplateManager::addSpawnGroup(lua_State* L) {
        if (checkArgumentCount(L, 2) == 1) {
                instance()->error("incorrect number of arguments passed to CreatureTemplateManager::addLairGroup");
                ERROR_CODE = INCORRECT_ARGUMENTS;
@@ -250,7 +216,7 @@ int CreatureTemplateManager::addLairGroup(lua_State* L) {
        uint32 crc = (uint32) ascii.hashCode();
 
        LuaObject obj(L);
-       CreatureTemplateManager::instance()->lairSpawnGroupMap.put(crc, new LairSpawnGroup(ascii, obj));
+       CreatureTemplateManager::instance()->spawnGroupMap.put(crc, new SpawnGroup(ascii, obj));
 
        return 0;
 }
@@ -286,7 +252,7 @@ int CreatureTemplateManager::addDestroyMissionGroup(lua_State* L) {
        uint32 crc = (uint32) ascii.hashCode();
 
        LuaObject obj(L);
-       CreatureTemplateManager::instance()->destroyMissionGroupMap.put(crc, new DestroyMissionSpawnGroup(ascii, obj));
+       CreatureTemplateManager::instance()->destroyMissionGroupMap.put(crc, new SpawnGroup(ascii, obj));
 
        return 0;
 }
index 1188a4e..1653ef2 100644 (file)
 #include "server/zone/templates/mobile/PatrolPathTemplate.h"
 #include "server/zone/templates/mobile/MobileOutfitGroup.h"
 #include "SpawnGroup.h"
-#include "StaticSpawnGroup.h"
-#include "DynamicSpawnGroup.h"
-#include "LairSpawnGroup.h"
-#include "server/zone/managers/mission/DestroyMissionSpawnGroup.h"
 
 namespace server {
 namespace zone {
@@ -28,16 +24,14 @@ namespace creature {
 class CreatureTemplateManager : public Singleton<CreatureTemplateManager>, public Object, public Logger {
 protected:
        VectorMap<uint32, Vector<String> > weaponMap;
-       VectorMap<uint32, Reference<DynamicSpawnGroup*> > dynamicGroupMap;
-       VectorMap<uint32, Reference<StaticSpawnGroup*> > staticGroupMap;
        Reference<Lua*> lua;
        HashTable<uint32, Reference<CreatureTemplate*> > hashTable;
 
        HashTable<uint32, Reference<ConversationTemplate*> > conversations;
 
        HashTable<uint32, Reference<LairTemplate*> > lairTemplates;
-       HashTable<uint32, Reference<LairSpawnGroup*> > lairSpawnGroupMap;
-       HashTable<uint32, Reference<DestroyMissionSpawnGroup*> > destroyMissionGroupMap;
+       HashTable<uint32, Reference<SpawnGroup*> > spawnGroupMap;
+       HashTable<uint32, Reference<SpawnGroup*> > destroyMissionGroupMap;
        HashTable<String, Reference<PatrolPathTemplate*> > patrolPaths;
        HashTable<String, Reference<MobileOutfitGroup*> > outfits;
        static AtomicInteger loadedMobileTemplates;
@@ -55,9 +49,7 @@ public:
        static int includeFile(lua_State* L);
        static int addTemplate(lua_State* L);
        static int addWeapon(lua_State* L);
-       static int addDynamicGroup(lua_State* L);
-       static int addStaticGroup(lua_State* L);
-       static int addLairGroup(lua_State* L);
+       static int addSpawnGroup(lua_State* L);
        static int addDestroyMissionGroup(lua_State* L);
        static int addConversationTemplate(lua_State* L);
        static int addLairTemplate(lua_State* L);
@@ -110,31 +102,15 @@ public:
                return weaponMap.get(ascii.hashCode());
        }
 
-       DynamicSpawnGroup* getDynamicGroup(uint32 crc) {
-               return dynamicGroupMap.get(crc);
-       }
-
-       DynamicSpawnGroup* getDynamicGroup(String ascii) {
-               return dynamicGroupMap.get(ascii.hashCode());
-       }
-
-       StaticSpawnGroup* getStaticGroup(uint32 crc) {
-               return staticGroupMap.get(crc);
-       }
-
-       LairSpawnGroup* getLairGroup(uint32 crc) {
-               return lairSpawnGroupMap.get(crc);
-       }
-
-       StaticSpawnGroup* getStaticGroup(String ascii) {
-               return staticGroupMap.get(ascii.hashCode());
+       SpawnGroup* getSpawnGroup(uint32 crc) {
+               return spawnGroupMap.get(crc);
        }
 
        LairTemplate* getLairTemplate(uint32 crc) {
                return lairTemplates.get(crc);
        }
 
-       DestroyMissionSpawnGroup* getDestroyMissionGroup(uint32 crc) {
+       SpawnGroup* getDestroyMissionGroup(uint32 crc) {
                return destroyMissionGroupMap.get(crc);
        }
 
diff --git a/MMOCoreORB/src/server/zone/managers/creature/DynamicSpawnGroup.h b/MMOCoreORB/src/server/zone/managers/creature/DynamicSpawnGroup.h
deleted file mode 100644 (file)
index e0edbe6..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * DynamicSpawnGroup.h
- *
- *  Created on: Nov 13, 2010
- *      Author: da
- */
-
-#ifndef DYNAMICSPAWNGROUP_H_
-#define DYNAMICSPAWNGROUP_H_
-
-#include "SpawnGroup.h"
-
-namespace server {
-namespace zone {
-namespace managers {
-namespace creature {
-
-class DynamicSpawnGroup : public SpawnGroup {
-protected:
-       int size;
-
-       Vector<String> scoutTemplates;
-       float scoutWeight;
-
-       Vector<String> protectorTemplates;
-       float protectorWeight;
-
-       Vector<String> babyTemplates;
-       float babyWeight;
-
-       String lairTemplate;
-
-public:
-       DynamicSpawnGroup() {}
-
-       DynamicSpawnGroup(const DynamicSpawnGroup& ds) : SpawnGroup(ds) {
-               size = ds.size;
-
-               scoutTemplates = ds.scoutTemplates;
-
-               scoutWeight = ds.scoutWeight;
-
-               protectorTemplates = ds.protectorTemplates;
-               protectorWeight = ds.protectorWeight;
-
-               babyTemplates = ds.babyTemplates;
-               babyWeight = ds.babyWeight;
-
-               lairTemplate = ds.lairTemplate;
-       }
-
-       DynamicSpawnGroup(String tempName, LuaObject group) : SpawnGroup(tempName, group) {
-               size = group.getIntField("size");
-
-               LuaObject scouts(group.getObjectField("scout"));
-               if (scouts.isValidTable()) {
-                       for (int i = 1; i <= scouts.getTableSize(); ++i)
-                               scoutTemplates.add(scouts.getStringAt(i));
-               }
-
-               scouts.pop();
-
-               scoutWeight = group.getFloatField("scoutWeight");
-
-               LuaObject protectors(group.getObjectField("protector"));
-               if (protectors.isValidTable()) {
-                       for (int i = 1; i <= protectors.getTableSize(); ++i)
-                               protectorTemplates.add(protectors.getStringAt(i));
-               }
-
-               protectors.pop();
-
-               protectorWeight = group.getFloatField("protectorWeight");
-
-               LuaObject babies(group.getObjectField("baby"));
-               if (babies.isValidTable()) {
-                       for (int i = 1; i <= babies.getTableSize(); ++i)
-                               babyTemplates.add(babies.getStringAt(i));
-               }
-
-               babies.pop();
-
-               babyWeight = group.getFloatField("babyWeight");
-
-               lairTemplate = group.getStringField("lairTemplate");
-       }
-
-       virtual ~DynamicSpawnGroup() {}
-
-       DynamicSpawnGroup& operator=(const DynamicSpawnGroup& ds) {
-               if (this == &ds)
-                       return *this;
-
-               size = ds.size;
-
-               scoutTemplates = ds.scoutTemplates;
-
-               scoutWeight = ds.scoutWeight;
-
-               protectorTemplates = ds.protectorTemplates;
-               protectorWeight = ds.protectorWeight;
-
-               babyTemplates = ds.babyTemplates;
-               babyWeight = ds.babyWeight;
-
-               lairTemplate = ds.lairTemplate;
-
-               return *this;
-       }
-
-       Vector<String> getBabyTemplates() const {
-               return babyTemplates;
-       }
-
-       float getBabyWeight() const {
-               return babyWeight;
-       }
-
-       String getLairTemplate() const {
-               return lairTemplate;
-       }
-
-       Vector<String> getProtectorTemplates() const {
-               return protectorTemplates;
-       }
-
-       float getProtectorWeight() const {
-               return protectorWeight;
-       }
-
-       Vector<String> getScoutTemplates() const {
-               return scoutTemplates;
-       }
-
-       float getScoutWeight() const {
-               return scoutWeight;
-       }
-
-       int getSize() const {
-               return size;
-       }
-
-       void setBabyTemplates(Vector<String> babyTemplates) {
-               this->babyTemplates = babyTemplates;
-       }
-
-       void setBabyWeight(float babyWeight) {
-               this->babyWeight = babyWeight;
-       }
-
-       void setLairTemplate(String lairTemplate) {
-               this->lairTemplate = lairTemplate;
-       }
-
-       void setProtectorTemplates(Vector<String> protectorTemplates) {
-               this->protectorTemplates = protectorTemplates;
-       }
-
-       void setProtectorWeight(float protectorWeight) {
-               this->protectorWeight = protectorWeight;
-       }
-
-       void setScoutTemplates(Vector<String> scoutTemplates) {
-               this->scoutTemplates = scoutTemplates;
-       }
-
-       void setScoutWeight(float scoutWeight) {
-               this->scoutWeight = scoutWeight;
-       }
-
-       void setSize(int size) {
-               this->size = size;
-       }
-
-       bool isDynamicGroup() {
-               return true;
-       }
-};
-
-}
-}
-}
-}
-
-#endif /* DYNAMICSPAWNGROUP_H_ */
diff --git a/MMOCoreORB/src/server/zone/managers/creature/LairSpawnGroup.h b/MMOCoreORB/src/server/zone/managers/creature/LairSpawnGroup.h
deleted file mode 100644 (file)
index b414325..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * LairSpawnGroup.h
- *
- *  Created on: 11/12/2011
- *      Author: victor
- */
-
-#ifndef LAIRSPAWNGROUP_H_
-#define LAIRSPAWNGROUP_H_
-
-#include "SpawnGroup.h"
-#include "LairSpawn.h"
-
-namespace server {
-namespace zone {
-namespace managers {
-namespace creature {
-
-       class LairSpawnGroup : public SpawnGroup {
-       protected:
-               Vector<Reference<LairSpawn*> > lairList;
-               int maxSpawnLimit;
-
-       public:
-               LairSpawnGroup(const LairSpawnGroup& sp) : SpawnGroup(sp) {
-                       lairList = sp.lairList;
-                       maxSpawnLimit = sp.maxSpawnLimit;
-               }
-
-               LairSpawnGroup(const String& name, LuaObject& obj) : SpawnGroup(name, obj) {
-                       maxSpawnLimit = obj.getIntField("maxSpawnLimit");
-                       LuaObject lairSpawns = obj.getObjectField("lairSpawns");
-
-                       for (int i = 1; i <= lairSpawns.getTableSize(); ++i) {
-                               lua_rawgeti(lairSpawns.getLuaState(), -1, i);
-                               LuaObject spawn(lairSpawns.getLuaState());
-
-                               if (spawn.isValidTable()) {
-                                       Reference<LairSpawn*> lairSpawn = new LairSpawn();
-                                       lairSpawn->readObject(spawn);
-
-                                       lairList.add(lairSpawn);
-                               }
-
-                               spawn.pop();
-                       }
-
-                       lairSpawns.pop();
-               }
-
-               Vector<Reference<LairSpawn*> >* getLairList() {
-                       return &lairList;
-               }
-
-               int getMaxSpawnLimit() {
-                       return maxSpawnLimit;
-               }
-       };
-
-}
-}
-}
-}
-
-using namespace server::zone::managers::creature;
-
-
-#endif /* LAIRSPAWNGROUP_H_ */
index 6a58bc8..014e0f9 100644 (file)
@@ -9,6 +9,7 @@
 #define SPAWNGROUP_H_
 
 #include "engine/engine.h"
+#include "LairSpawn.h"
 
 namespace server {
 namespace zone {
@@ -24,6 +25,9 @@ protected:
 
        unsigned int type;
 
+       Vector<Reference<LairSpawn*> > spawnList;
+       int maxSpawnLimit;
+
 public:
        SpawnGroup() {}
 
@@ -32,6 +36,25 @@ public:
                wanderRadius = group.getFloatField("wanderRadius");
                commandLevel = group.getIntField("commandLevel");
                type = group.getIntField("type");
+               maxSpawnLimit = group.getIntField("maxSpawnLimit");
+               LuaObject lairSpawns = group.getObjectField("lairSpawns");
+
+               for (int i = 1; i <= lairSpawns.getTableSize(); ++i) {
+                       lua_rawgeti(lairSpawns.getLuaState(), -1, i);
+                       LuaObject spawn(lairSpawns.getLuaState());
+
+                       if (spawn.isValidTable()) {
+                               Reference<LairSpawn*> lairSpawn = new LairSpawn();
+                               lairSpawn->readObject(spawn);
+
+                               spawnList.add(lairSpawn);
+                       }
+
+                       spawn.pop();
+               }
+
+               lairSpawns.pop();
+
        }
 
        SpawnGroup(const SpawnGroup& gr) : Object() {
@@ -39,6 +62,8 @@ public:
                wanderRadius = gr.wanderRadius;
                commandLevel = gr.commandLevel;
                type = gr.type;
+               spawnList = gr.spawnList;
+               maxSpawnLimit = gr.maxSpawnLimit;
        }
 
        virtual ~SpawnGroup() {}
@@ -51,6 +76,8 @@ public:
                wanderRadius = gr.wanderRadius;
                commandLevel = gr.commandLevel;
                type = gr.type;
+               spawnList = gr.spawnList;
+               maxSpawnLimit = gr.maxSpawnLimit;
 
                return *this;
        }
@@ -71,6 +98,14 @@ public:
                return type;
        }
 
+       Vector<Reference<LairSpawn*> >* getSpawnList() {
+               return &spawnList;
+       }
+
+       int getMaxSpawnLimit() {
+               return maxSpawnLimit;
+       }
+
        void setWanderRadius(float wanderRadius) {
                this->wanderRadius = wanderRadius;
        }
@@ -83,17 +118,6 @@ public:
                this->commandLevel = commandLevel;
        }
 
-       void setType(unsigned int type) {
-               this->type = type;
-       }
-
-       virtual bool isStaticGroup() {
-               return false;
-       }
-
-       virtual bool isDynamicGroup() {
-               return false;
-       }
 };
 
 }
diff --git a/MMOCoreORB/src/server/zone/managers/creature/StaticSpawnGroup.h b/MMOCoreORB/src/server/zone/managers/creature/StaticSpawnGroup.h
deleted file mode 100644 (file)
index db5b1a9..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * StaticSpawnGroup.h
- *
- *  Created on: Nov 13, 2010
- *      Author: da
- */
-
-#ifndef STATICSPAWNGROUP_H_
-#define STATICSPAWNGROUP_H_
-
-#include "SpawnGroup.h"
-
-namespace server {
-namespace zone {
-namespace managers {
-namespace creature {
-
-class SpawnCoordinate : public Object {
-protected:
-       String templateName;
-       Coordinate coordinate;
-       Quaternion quaternion;
-
-public:
-       SpawnCoordinate() {}
-
-       SpawnCoordinate(const SpawnCoordinate& cr) : Object() {
-               templateName = cr.templateName;
-               coordinate = cr.coordinate;
-               quaternion = cr.quaternion;
-       }
-
-       virtual ~SpawnCoordinate() {}
-
-       SpawnCoordinate& operator=(const SpawnCoordinate& cr) {
-               if (this == &cr)
-                       return *this;
-
-               templateName = cr.templateName;
-               coordinate = cr.coordinate;
-               quaternion = cr.quaternion;
-
-               return *this;
-       }
-
-       Coordinate* getCoordinate() {
-               return &coordinate;
-       }
-
-       Quaternion* getDirection() {
-               return &quaternion;
-       }
-
-       void set(float a, float b, float c, float d) {
-               quaternion.set(a, b, c, d);
-       }
-
-       void setPosition(float x, float z, float y) {
-               coordinate.setPosition(x, z, y);
-       }
-
-       String getTemplateName() const {
-               return templateName;
-       }
-
-       void setTemplateName(String templateName) {
-               this->templateName = templateName;
-       }
-
-};
-
-class StaticSpawnGroup : public SpawnGroup {
-protected:
-       Vector<SpawnCoordinate> spawnMap;
-
-       int respawnTime;
-
-       float x, y, z;
-       uint64 cellID;
-
-public:
-       StaticSpawnGroup() {}
-
-       StaticSpawnGroup(const StaticSpawnGroup& gr) : SpawnGroup(gr) {
-               spawnMap = gr.spawnMap;
-               respawnTime = gr.respawnTime;
-               x = gr.x;
-               y = gr.y;
-               z = gr.z;
-               cellID = gr.cellID;
-       }
-
-       StaticSpawnGroup(const String& tempName, LuaObject& group) : SpawnGroup(tempName, group) {
-               respawnTime = group.getIntField("respawnTime");
-               x = group.getFloatField("x");
-               y = group.getFloatField("y");
-               z = group.getFloatField("z");
-               cellID = group.getLongField("cellID");
-
-               LuaObject spawns = group.getObjectField("spawns");
-               if (spawns.isValidTable()) {
-                       lua_State* L = spawns.getLuaState();
-
-                       for (int i = 1; i <= spawns.getTableSize(); ++i) {
-                               lua_rawgeti(L, -1, i);
-                               LuaObject templ(L);
-
-                               if (templ.isValidTable()) {
-                                       if (templ.getTableSize() >= 8) {
-                                               SpawnCoordinate coord;
-
-                                               coord.setTemplateName(templ.getStringAt(1));
-
-                                               coord.setPosition(templ.getFloatAt(2), templ.getFloatAt(4), templ.getFloatAt(3));
-
-                                               coord.set(templ.getFloatAt(5), templ.getFloatAt(6), templ.getFloatAt(7), templ.getFloatAt(8));
-
-                                               spawnMap.add(coord);
-                                       }
-                               }
-
-                               templ.pop();
-                       }
-               }
-
-               spawns.pop();
-       }
-
-       virtual ~StaticSpawnGroup() {}
-
-       StaticSpawnGroup& operator=(const StaticSpawnGroup& gr) {
-               if (this == &gr)
-                       return *this;
-
-               spawnMap = gr.spawnMap;
-               respawnTime = gr.respawnTime;
-               x = gr.x;
-               y = gr.y;
-               z = gr.z;
-               cellID = gr.cellID;
-
-               return *this;
-       }
-
-       Vector<SpawnCoordinate>* getSpawnList() {
-               return &spawnMap;
-       }
-
-       int getRespawnTime() const {
-               return respawnTime;
-       }
-
-       float getX() const {
-               return x;
-       }
-
-       float getY() const {
-               return y;
-       }
-
-       float getZ() const {
-               return z;
-       }
-
-       uint64 getCellID() const {
-               return cellID;
-       }
-
-       bool isStaticGroup() {
-               return true;
-       }
-};
-
-}
-}
-}
-}
-
-#endif /* STATICSPAWNGROUP_H_ */
diff --git a/MMOCoreORB/src/server/zone/managers/mission/DestroyMissionSpawnGroup.h b/MMOCoreORB/src/server/zone/managers/mission/DestroyMissionSpawnGroup.h
deleted file mode 100644 (file)
index 7fd4f4d..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#ifndef DESTROYMISSIONSPAWNGROUP_H_
-#define DESTROYMISSIONSPAWNGROUP_H_
-
-#include "server/zone/managers/creature/SpawnGroup.h"
-#include "server/zone/managers/creature/LairSpawn.h"
-
-namespace server {
-namespace zone {
-namespace managers {
-namespace mission {
-
-       class DestroyMissionSpawnGroup : public SpawnGroup {
-       protected:
-               Vector<Reference<LairSpawn*> > destroyMissionList;
-
-       public:
-               DestroyMissionSpawnGroup(const DestroyMissionSpawnGroup& sp) : SpawnGroup(sp) {
-                       destroyMissionList = sp.destroyMissionList;
-               }
-
-               DestroyMissionSpawnGroup(const String& name, LuaObject& obj) : SpawnGroup(name, obj) {
-                       LuaObject destroyMissionSpawns = obj.getObjectField("destroyMissionSpawns");
-
-                       for (int i = 1; i <= destroyMissionSpawns.getTableSize(); ++i) {
-                               lua_rawgeti(destroyMissionSpawns.getLuaState(), -1, i);
-                               LuaObject spawn(destroyMissionSpawns.getLuaState());
-
-                               if (spawn.isValidTable()) {
-                                       Reference<LairSpawn*> destroyMissionSpawn = new LairSpawn();
-                                       destroyMissionSpawn->readObject(spawn);
-
-                                       destroyMissionList.add(destroyMissionSpawn);
-                               }
-
-                               spawn.pop();
-                       }
-
-                       destroyMissionSpawns.pop();
-               }
-
-               Vector<Reference<LairSpawn*> >* getDestroyMissionList() {
-                       return &destroyMissionList;
-               }
-
-       };
-
-}
-}
-}
-}
-
-using namespace server::zone::managers::mission;
-
-
-#endif /* DESTROYMISSIONSPAWNGROUP_H_ */
index 70635a1..27ded64 100644 (file)
@@ -1498,13 +1498,13 @@ LairSpawn* MissionManagerImplementation::getRandomLairSpawn(CreatureObject* play
                        }
                }
 
-               DestroyMissionSpawnGroup* destroyMissionGroup = CreatureTemplateManager::instance()->getDestroyMissionGroup(missionGroup.hashCode());
+               SpawnGroup* destroyMissionGroup = CreatureTemplateManager::instance()->getDestroyMissionGroup(missionGroup.hashCode());
 
                if (destroyMissionGroup == NULL) {
                        return NULL;
                }
 
-               availableLairList = destroyMissionGroup->getDestroyMissionList();
+               availableLairList = destroyMissionGroup->getSpawnList();
 
        } else if (type == MissionObject::HUNTING) {
                CreatureManager* creatureManager = zone->getCreatureManager();
@@ -1525,13 +1525,13 @@ LairSpawn* MissionManagerImplementation::getRandomLairSpawn(CreatureObject* play
                }
 
                LairSpawnArea* lairSpawnArea = cast<LairSpawnArea*>(spawnArea.get());
-               LairSpawnGroup* lairSpawnGroup = lairSpawnArea->getSpawnGroup();
+               SpawnGroup* lairSpawnGroup = lairSpawnArea->getSpawnGroup();
 
                if (lairSpawnGroup == NULL) {
                        return NULL;
                }
 
-               availableLairList = lairSpawnGroup->getLairList();
+               availableLairList = lairSpawnGroup->getSpawnList();
        }
 
        if (availableLairList == NULL || availableLairList->size() == 0) {
index c6881af..0ccfc7d 100644 (file)
@@ -9,7 +9,7 @@
 #include "server/zone/objects/area/SpawnDynamicAreaCreatureTask.h"
 #include "server/zone/objects/area/SpawnAreaObserver.h"
 #include "server/zone/managers/creature/CreatureTemplateManager.h"
-#include "server/zone/managers/creature/DynamicSpawnGroup.h"
+#include "server/zone/managers/creature/SpawnGroup.h"
 #include "server/zone/managers/object/ObjectManager.h"
 #include "server/zone/objects/creature/CreatureFlag.h"
 #include "server/zone/objects/creature/aigroup/AiGroup.h"
@@ -117,7 +117,7 @@ void DynamicSpawnAreaImplementation::spawnCreature(uint32 templateCRC) {
        int numberOfSpawnsToGenerate = getNumberOfSpawnsToGenerate();
 
        while(numberOfSpawnsToGenerate-- > 0) {
-               DynamicSpawnGroup* templ = CreatureTemplateManager::instance()->getDynamicGroup(templateCRC);
+               SpawnGroup* templ = CreatureTemplateManager::instance()->getSpawnGroup(templateCRC);
 
                uint32 crc;
                switch (templ->getType()) {
@@ -153,7 +153,7 @@ void DynamicSpawnAreaImplementation::spawnCreature(uint32 templateCRC) {
                        //group->insertToZone(getZone());
                        getZone()->transferObject(group, -1, true);
 
-                       group->setup(templ);
+                       //group->setup(templ);
 
                        spawnedGroups.put(group);
                }
index 5056cf4..7d46161 100644 (file)
@@ -49,14 +49,14 @@ import system.util.VectorMap;
 import server.zone.objects.creature.aigroup.AiGroup;
 import server.zone.objects.area.SpawnArea;
 import engine.util.Observable;
-import server.zone.managers.creature.LairSpawnGroup;
+import server.zone.managers.creature.SpawnGroup;
 import server.zone.objects.area.SpawnAreaObserver;
 import system.util.HashTable;
 import system.lang.Time;
 
 class LairSpawnArea extends SpawnArea {
        
-       protected transient LairSpawnGroup spawnGroup;
+       protected transient SpawnGroup spawnGroup;
        protected int currentlySpawnedLairs;
        
        protected SpawnAreaObserver exitObserver;
@@ -98,10 +98,10 @@ class LairSpawnArea extends SpawnArea {
        }
        
        @local
-       public void setSpawnGroup(LairSpawnGroup group) {
+       public void setSpawnGroup(SpawnGroup group) {
                spawnGroup = group;
        }
        
        @local
-       public native LairSpawnGroup getSpawnGroup();
+       public native SpawnGroup getSpawnGroup();
 }
index 3d99e52..cd79658 100644 (file)
@@ -43,7 +43,7 @@ which carries forward this exception.
 
 #include "server/zone/objects/area/LairSpawnArea.h"
 #include "server/zone/objects/scene/SceneObject.h"
-#include "server/zone/managers/creature/LairSpawnGroup.h"
+#include "server/zone/managers/creature/SpawnGroup.h"
 #include "server/zone/managers/creature/CreatureManager.h"
 #include "server/zone/managers/creature/CreatureTemplateManager.h"
 #include "server/zone/managers/planet/PlanetManager.h"
@@ -111,11 +111,11 @@ int LairSpawnAreaImplementation::notifyObserverEvent(unsigned int eventType, Obs
        return 1;
 }
 
-LairSpawnGroup* LairSpawnAreaImplementation::getSpawnGroup() {
+SpawnGroup* LairSpawnAreaImplementation::getSpawnGroup() {
        if (spawnGroup == NULL && spawnCreatureTemplates.size() != 0) {
                uint32 templateGroupCRC = spawnCreatureTemplates.get(0);
 
-               spawnGroup = CreatureTemplateManager::instance()->getLairGroup(templateGroupCRC);
+               spawnGroup = CreatureTemplateManager::instance()->getSpawnGroup(templateGroupCRC);
        }
 
        return spawnGroup;
@@ -125,7 +125,7 @@ int LairSpawnAreaImplementation::trySpawnLair(SceneObject* object) {
        if (spawnGroup == NULL && spawnCreatureTemplates.size() != 0) {
                uint32 templateGroupCRC = spawnCreatureTemplates.get(0);
 
-               spawnGroup = CreatureTemplateManager::instance()->getLairGroup(templateGroupCRC);
+               spawnGroup = CreatureTemplateManager::instance()->getSpawnGroup(templateGroupCRC);
        }
 
        if (spawnGroup == NULL) {
@@ -133,7 +133,7 @@ int LairSpawnAreaImplementation::trySpawnLair(SceneObject* object) {
                return 1;
        }
 
-       Vector<Reference<LairSpawn*> >* lairs = spawnGroup->getLairList();
+       Vector<Reference<LairSpawn*> >* lairs = spawnGroup->getSpawnList();
 
        int totalSize = lairs->size();
 
index f24fb59..2a1f432 100644 (file)
@@ -7,7 +7,7 @@
 
 #include "server/zone/objects/area/StaticSpawnArea.h"
 #include "server/zone/objects/area/SpawnAreaObserver.h"
-#include "server/zone/managers/creature/StaticSpawnGroup.h"
+#include "server/zone/managers/creature/SpawnGroup.h"
 #include "server/zone/managers/creature/CreatureTemplateManager.h"
 #include "server/zone/managers/creature/CreatureManager.h"
 #include "server/zone/objects/scene/ObserverEventType.h"
@@ -20,7 +20,7 @@ void StaticSpawnAreaImplementation::spawnCreatures() {
        for (int i = 0; i < spawnCreatureTemplates.size(); ++i) {
                uint32 templateCRC = spawnCreatureTemplates.get(i);
 
-               StaticSpawnGroup* templ = CreatureTemplateManager::instance()->getStaticGroup(templateCRC);
+               SpawnGroup* templ = CreatureTemplateManager::instance()->getSpawnGroup(templateCRC);
 
                uint32 crc;
                switch (templ->getType()) {
@@ -42,16 +42,16 @@ void StaticSpawnAreaImplementation::spawnCreatures() {
                if (group == NULL)
                        continue;
 
-               float x = templ->getX() + getPositionX();
-               float y = templ->getY() + getPositionY();
-               float z = templ->getZ() + getPositionZ();
+               //float x = templ->getX() + getPositionX();
+               //float y = templ->getY() + getPositionY();
+               //float z = templ->getZ() + getPositionZ();
 
-               group->setPosition(x, z, y);
+               //group->setPosition(x, z, y);
 
                //group->insertToZone(getZone());
                getZone()->transferObject(group, -1, true);
 
-               group->setup(templ);
+               //group->setup(templ);
 
                groups.put(group);
        }
index 1705731..94b9f6b 100644 (file)
@@ -51,8 +51,6 @@ import engine.util.u3d.Coordinate;
 import system.util.SortedVector;
 import system.util.Vector;
 import server.zone.objects.creature.AiAgent;
-import server.zone.managers.creature.StaticSpawnGroup;
-import server.zone.managers.creature.DynamicSpawnGroup;
 import engine.util.Observable;
 import server.zone.objects.creature.aigroup.AiGroupObserver;
 
@@ -106,11 +104,11 @@ class AiGroup extends SceneObject {
        public native void setPatrolPoints();
        public native void setPatrolPoint(AiAgent member);
        
-       @local
-       public native void setup(StaticSpawnGroup templ);
+       //@local
+       //public native void setup(StaticSpawnGroup templ);
        
-       @local
-       public native void setup(DynamicSpawnGroup templ);
+       //@local
+       //public native void setup(DynamicSpawnGroup templ);
        
        public native int notifyObserverEvent(unsigned int eventType, Observable observable, ManagedObject arg1, long arg2);
        
index 206b2df..77ab98c 100644 (file)
@@ -13,8 +13,6 @@
 #include "server/zone/objects/creature/CreatureFlag.h"
 #include "server/zone/objects/creature/AiAgent.h"
 #include "server/zone/managers/creature/SpawnGroup.h"
-#include "server/zone/managers/creature/StaticSpawnGroup.h"
-#include "server/zone/managers/creature/DynamicSpawnGroup.h"
 #include "server/zone/managers/creature/CreatureManager.h"
 #include "server/zone/managers/planet/PlanetManager.h"
 #include "server/zone/objects/scene/SceneObject.h"
@@ -54,7 +52,7 @@ void AiGroupImplementation::setPatrolPoint(AiAgent* member) {
        member->activateWaitEvent();
 }
 
-void AiGroupImplementation::setup(StaticSpawnGroup* templ) {
+/*void AiGroupImplementation::setup(StaticSpawnGroup* templ) {
        // in static groups, all members are protectors
        // designate the first in the template as the leader
        isStatic = true;
@@ -182,7 +180,7 @@ void AiGroupImplementation::setup(DynamicSpawnGroup* templ) {
        }
 
        setPatrolPoints();
-}
+}*/
 
 int AiGroupImplementation::notifyObserverEvent(uint32 eventType, Observable* observable, ManagedObject* arg1, int64 arg2) {
        AiAgent* member = cast<AiAgent*>(observable);