Added planetary prefix to most dynamic spawn groups

Fixed nge.cfg.example (got deleted by accident in previous commit)
2026-01-17 00:05:17 -05:00 · 2014-11-03 22:37:56 +01:00
parent 339c5ec446
commit 5156682084
54 changed files with 104 additions and 127 deletions
--- a/nge.cfg.example
+++ b/nge.cfg.example
@@ -0,0 +1,15 @@
+#Tue Oct 30 18:21:38 CDT 2012
+ZONE.URL=
+ZONE.PORT=44463
+LOGIN.URL=
+LOGIN.PORT=44453
+LOGIN.SESSION_KEY_SIZE=24
+PING.PORT=44462
+DB.NAME=nge
+DB.USER=postgres
+DB.URL=localhost
+DB.PASS=nge
+GALAXY_ID=2
+GALAXY_NAME=Local Connection
+XPMULTIPLIER=1.0
+MAXNUMBEROFCHARACTERS=2
--- a/scripts/mobiles/dynamicgroups/dantooine_bol.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_bol.py
@@ -11,8 +11,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('bol_pack_runner')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(2)
-	dynamicGroup.setName('bol_group_1')
+	dynamicGroup.setName('dantooine_bol')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('bol_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_bol', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_force_sensitive.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_force_sensitive.py
@@ -13,8 +13,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('untrained_wielder_of_the_dark_side')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('force_sensitives_wild_1')
+	dynamicGroup.setName('dantooine_force_sensitive')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('force_sensitives_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_force_sensitive', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_frenzied_graul.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_frenzied_graul.py
@@ -10,8 +10,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('frenzied_graul')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('thunes_1')
+	dynamicGroup.setName('dantooine_frenzied_graul')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('frenzied_graul', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_frenzied_graul', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/graul_mauler_nw_group_1.py
+++ b/scripts/mobiles/dynamicgroups/graul_mauler_nw_group_1.py
@@ -10,8 +10,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('graul_mauler')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('graul_mauler_nw_group_1')
+	dynamicGroup.setName('dantooine_graul_mauler')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('graul_mauler_nw_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_graul_mauler', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_huurton.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_huurton.py
@@ -15,8 +15,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('huurton_reaper')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('huurton_group_1')
+	dynamicGroup.setName('dantooine_huurton')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('huurton_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_huurton', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/jantas_nw_group_1.py
+++ b/scripts/mobiles/dynamicgroups/jantas_nw_group_1.py
@@ -21,8 +21,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('janta_warrior')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('jantas_nw_group_1')
+	dynamicGroup.setName('dantooine_jantas')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('jantas_nw_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_jantas', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/kunga_central_group_1.py
+++ b/scripts/mobiles/dynamicgroups/kunga_central_group_1.py
@@ -21,8 +21,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('kunga_warrior')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('kunga_central_group_1')
+	dynamicGroup.setName('dantooine_kunga')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('kunga_central_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_kunga', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_mokk.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_mokk.py
@@ -21,8 +21,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('mokk_warrior')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('mokk_group_1')
+	dynamicGroup.setName('dantooine_mokk')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('mokk_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_mokk', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/piket_longhorn_group_1.py
+++ b/scripts/mobiles/dynamicgroups/piket_longhorn_group_1.py
@@ -11,8 +11,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('piket_longhorn_female')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('piket_longhorn_group_1')
+	dynamicGroup.setName('dantooine_piket')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('piket_longhorn_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_piket', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/piket_plains_walker_group.py
+++ b/scripts/mobiles/dynamicgroups/piket_plains_walker_group.py
@@ -13,8 +13,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('piket_plains_walker')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('piket_plains_walker_group')
+	dynamicGroup.setName('dantooine_piket_plains')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('piket_plains_walker_group', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_piket_plains', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/quenker_group_south_1.py
+++ b/scripts/mobiles/dynamicgroups/quenker_group_south_1.py
@@ -11,8 +11,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('quenker_relic_reaper')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('quenker_group_south_1')
+	dynamicGroup.setName('dantooine_quenker')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('quenker_group_south_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_quenker', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/quenker_relic_reaper_group.py
+++ b/scripts/mobiles/dynamicgroups/quenker_relic_reaper_group.py
@@ -10,8 +10,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('quenker_relic_reaper')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('quenker_relic_reaper_group')
+	dynamicGroup.setName('dantooine_quenker_relic')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('quenker_relic_reaper_group', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_quenker_relic', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_thune.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_thune.py
@@ -12,8 +12,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('thune_herd_leader')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('thune_group_2')
+	dynamicGroup.setName('dantooine_thune')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('thune_group_2', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_thune', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/voritors_east_group_1.py
+++ b/scripts/mobiles/dynamicgroups/voritors_east_group_1.py
@@ -14,8 +14,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('spiked_slasher')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('voritors_east_group_1')
+	dynamicGroup.setName('dantooine_voritor')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('voritors_east_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_voritor', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_voritor_1.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_voritor_1.py
@@ -10,8 +10,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('voritor_dasher')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('graul_mauler_nw_group_1')
+	dynamicGroup.setName('dantooine_voritor_1')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('voritor_nw_group_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_voritor_1', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dantooine_voritor_wild.py
+++ b/scripts/mobiles/dynamicgroups/dantooine_voritor_wild.py
@@ -10,9 +10,9 @@ def addDynamicGroup(core):
 	mobileTemplates.add('horned_voritor_jungle_lizard')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('voritors_wild_1')
+	dynamicGroup.setName('dantooine_voritor_wild')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setGroupMembersNumber(-5)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('voritors_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dantooine_voritor_wild', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/dathomir_nightsister.py
+++ b/scripts/mobiles/dynamicgroups/dathomir_nightsister.py
@@ -17,8 +17,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('nightsister_stalker')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-5)
-	dynamicGroup.setName('nightsisters_dyn_1')
+	dynamicGroup.setName('dathomir_nightsister')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(100)
-	core.spawnService.addDynamicGroup('nightsisters_dyn_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('dathomir_nightsister', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/huurton_group_2.py
+++ b/scripts/mobiles/dynamicgroups/huurton_group_2.py
@@ -1,20 +0,0 @@
-# Spawn Group file created with PSWG Planetary Spawn Tool
-import sys
-from java.util import Vector
-from services.spawn import DynamicSpawnGroup
-from services.spawn import MobileTemplate
-
-def addDynamicGroup(core):
-	dynamicGroup = DynamicSpawnGroup()
-	mobileTemplates = Vector()
-	mobileTemplates.add('huurton_bloodhunter')
-	mobileTemplates.add('huurton_howler')
-	mobileTemplates.add('huurton_huntress')
-	mobileTemplates.add('huurton_reaper')
-	dynamicGroup.setMobiles(mobileTemplates)
-	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('huurton_group_2')
-	dynamicGroup.setMaxSpawns(-1)
-	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('huurton_group_2', dynamicGroup)
-	return
--- a/scripts/mobiles/dynamicgroups/tatooine_adolescent_krayt.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_adolescent_krayt.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('adolescent_krayt_dragon')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('adolescent_krayt_wild_1')
+	dynamicGroup.setName('tatooine_adolescent_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('adolescent_krayt_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_adolescent_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/krayt_dragon_ancient_wild_1.py
+++ b/scripts/mobiles/dynamicgroups/krayt_dragon_ancient_wild_1.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('krayt_dragon_ancient')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('krayt_dragon_ancient_1')
+	dynamicGroup.setName('tatooine_ancient_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(5)
-	core.spawnService.addDynamicGroup('krayt_dragon_ancient_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_ancient_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_bantha.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_bantha.py
@@ -14,8 +14,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('dwarf_bantha')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-5)
-	dynamicGroup.setName('bantha')
+	dynamicGroup.setName('tatooine_bantha')
 	dynamicGroup.setMaxSpawns(-1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('bantha', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_bantha', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_canyon_krayt.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_canyon_krayt.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('canyon_krayt_dragon')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('canyon_krayt_wild_1')
+	dynamicGroup.setName('tatooine_canyon_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('canyon_krayt_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_canyon_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_giant_canyon_krayt.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_giant_canyon_krayt.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('giant_canyon_krayt_dragon')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('giant_canyon_krayt_dragon_1')
+	dynamicGroup.setName('tatooine_giant_canyon_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(60)
-	core.spawnService.addDynamicGroup('giant_canyon_krayt_dragon_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_giant_canyon_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_grand_canyon_krayt.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_grand_canyon_krayt.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('grand_canyon_krayt_dragon')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(1)
-	dynamicGroup.setName('grand_canyon_krayt_dragon_1')
+	dynamicGroup.setName('tatooine_grand_canyon_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(60)
-	core.spawnService.addDynamicGroup('grand_canyon_krayt_dragon_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_grand_canyon_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_juvenile_krayt.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_juvenile_krayt.py
@@ -9,8 +9,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('juvenile_canyon_krayt_dragon')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(6)
-	dynamicGroup.setName('juvenile_krayts_wild_1')
+	dynamicGroup.setName('tatooine_juvenile_krayt')
 	dynamicGroup.setMaxSpawns(1)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('juvenile_krayts_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_juvenile_krayt', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_tusken.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_tusken.py
@@ -15,8 +15,8 @@ def addDynamicGroup(core):
 	mobileTemplates.add('tusken_warlord')
 	dynamicGroup.setMobiles(mobileTemplates)
 	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('tusken_2')
+	dynamicGroup.setName('tatooine_tusken')
 	dynamicGroup.setMaxSpawns(15)
 	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('tusken_2', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_tusken', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/tatooine_tusken_wild.py
+++ b/scripts/mobiles/dynamicgroups/tatooine_tusken_wild.py
@@ -8,8 +8,8 @@ def addDynamicGroup(core):
 	mobileTemplates = Vector()
 	mobileTemplates.add('tusken_raider')
 	dynamicGroup.setMobiles(mobileTemplates)
-	dynamicGroup.setName('tuskens_wild_1')
+	dynamicGroup.setName('tatooine_tusken_wild')
 	dynamicGroup.setMaxSpawns(20)
 	dynamicGroup.setMinSpawnDistance(25)
-	core.spawnService.addDynamicGroup('tuskens_wild_1', dynamicGroup)
+	core.spawnService.addDynamicGroup('tatooine_tusken_wild', dynamicGroup)
 	return
--- a/scripts/mobiles/dynamicgroups/thunes_1.py
+++ b/scripts/mobiles/dynamicgroups/thunes_1.py
@@ -1,19 +0,0 @@
-# Spawn Group file created with PSWG Planetary Spawn Tool
-import sys
-from java.util import Vector
-from services.spawn import DynamicSpawnGroup
-from services.spawn import MobileTemplate
-
-def addDynamicGroup(core):
-	dynamicGroup = DynamicSpawnGroup()
-	mobileTemplates = Vector()
-	mobileTemplates.add('mammoth_thune')
-	mobileTemplates.add('thune')
-	mobileTemplates.add('thune_herd_leader')
-	dynamicGroup.setMobiles(mobileTemplates)
-	dynamicGroup.setGroupMembersNumber(-3)
-	dynamicGroup.setName('thunes_1')
-	dynamicGroup.setMaxSpawns(-1)
-	dynamicGroup.setMinSpawnDistance(150)
-	core.spawnService.addDynamicGroup('thunes_1', dynamicGroup)
-	return
--- a/scripts/mobiles/spawnareas/dantooine_central_mixed_2.py
+++ b/scripts/mobiles/spawnareas/dantooine_central_mixed_2.py
@@ -4,10 +4,10 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('kunga_central_group_1')
+	mixedGroups.add('dantooine_kunga')
 	mixedGroups.add('huurton_lair_group_1')
 	mixedGroups.add('thune_lair_group_1')
 	mixedGroups.add('graul_lair_group_1')
-	mixedGroups.add('huurton_group_2')
+	mixedGroups.add('dantooine_huurton')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 1044, -798, 2252, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_central_mixed_3.py
+++ b/scripts/mobiles/spawnareas/dantooine_central_mixed_3.py
@@ -4,10 +4,10 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('mokk_group_1')
+	mixedGroups.add('dantooine_mokk')
 	mixedGroups.add('piket_longhorn_lair_group_1')
 	mixedGroups.add('huurton_lair_group_1')
 	mixedGroups.add('bol_lair_group_1')
-	mixedGroups.add('huurton_group_1')
+	mixedGroups.add('dantooine_huurton')
 	core.spawnService.addMixedSpawnArea(mixedGroups, -1740, -3297, 1822, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_east_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_east_mixed_1.py
@@ -4,7 +4,7 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('voritors_east_group_1')
+	mixedGroups.add('dantooine_voritors')
 	mixedGroups.add('voritor_lair_group_1')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 5672, -1146, 2396, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_east_mixed_3.py
+++ b/scripts/mobiles/spawnareas/dantooine_east_mixed_3.py
@@ -5,7 +5,7 @@ from java.util import Vector
 def addSpawnArea(core):
 	mixedGroups = Vector()
 	mixedGroups.add('piket_plains_walker_lair_group')
-	mixedGroups.add('quenker_relic_reaper_group')
+	mixedGroups.add('dantooine_quenker_relic')
 	mixedGroups.add('thune_lair_group_1')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 3440, 1310, 2641, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_force_sensitives_dynamic_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_force_sensitives_dynamic_1.py
@@ -4,7 +4,7 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('force_sensitives_wild_1')
+	dynamicGroups.add('dantooine_force_sensitive')
 	dynamicGroups.add('dark_jedi_wild_1')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, 4362, 5488, 2560, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_mining_mixed.py
+++ b/scripts/mobiles/spawnareas/dantooine_mining_mixed.py
@@ -4,7 +4,7 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('piket_plains_walker_group')
+	mixedGroups.add('dantooine_piket_plains')
 	mixedGroups.add('mixed_lair_group_1')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 0, 2355, 1024, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_north_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_north_mixed_1.py
@@ -4,8 +4,8 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('force_sensitives_wild_1')
+	mixedGroups.add('dantooine_force_sensitive')
 	mixedGroups.add('graul_mauler_lair_group_1')
-	mixedGroups.add('graul_mauler_nw_group_1')
+	mixedGroups.add('dantooine_graul_mauler')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 20, 6574, 1966, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_north_mixed_2.py
+++ b/scripts/mobiles/spawnareas/dantooine_north_mixed_2.py
@@ -6,7 +6,7 @@ def addSpawnArea(core):
 	mixedGroups = Vector()
 	mixedGroups.add('huurton_lair_group_1')
 	mixedGroups.add('bol_lair_group_1')
-	mixedGroups.add('mokk_group_1')
+	mixedGroups.add('dantooine_mokk')
 	mixedGroups.add('quenker_lair_group_1')
 	core.spawnService.addMixedSpawnArea(mixedGroups, -1454, 3829, 1044, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_north_mixed_3.py
+++ b/scripts/mobiles/spawnareas/dantooine_north_mixed_3.py
@@ -7,6 +7,6 @@ def addSpawnArea(core):
 	mixedGroups.add('quenker_lair_group_1')
 	mixedGroups.add('huurton_lair_group_1')
 	mixedGroups.add('bol_lair_group_1')
-	mixedGroups.add('mokk_group_1')
+	mixedGroups.add('dantooine_mokk')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 757, 4321, 1167, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_nw_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_nw_mixed_1.py
@@ -5,6 +5,6 @@ from java.util import Vector
 def addSpawnArea(core):
 	mixedGroups = Vector()
 	mixedGroups.add('dantooine_nw_lair_group_1')
-	mixedGroups.add('jantas_nw_group_1')
+	mixedGroups.add('dantooine_jantas')
 	core.spawnService.addMixedSpawnArea(mixedGroups, -4751, 4935, 3200, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_south_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_south_mixed_1.py
@@ -4,9 +4,9 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('jantas_nw_group_1')
+	mixedGroups.add('dantooine_jantas')
 	mixedGroups.add('graul_mauler_lair_group_1')
-	mixedGroups.add('quenker_relic_reaper_group')
+	mixedGroups.add('dantooine_quenker_relic')
 	mixedGroups.add('voritor_lair_group_1')
 	mixedGroups.add('thune_lair_group_1')
 	mixedGroups.add('bol_lair_group_1')
--- a/scripts/mobiles/spawnareas/dantooine_south_mixed_3.py
+++ b/scripts/mobiles/spawnareas/dantooine_south_mixed_3.py
@@ -6,6 +6,6 @@ def addSpawnArea(core):
 	mixedGroups = Vector()
 	mixedGroups.add('quenker_lair_group_1')
 	mixedGroups.add('huurton_lair_group_1')
-	mixedGroups.add('quenker_group_south_1')
+	mixedGroups.add('dantooine_quenker')
 	core.spawnService.addMixedSpawnArea(mixedGroups, 1495, -3502, 2396, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_sw_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_sw_mixed_1.py
@@ -4,9 +4,9 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('mokk_group_1')
+	mixedGroups.add('dantooine_mokk')
 	mixedGroups.add('voritor_lair_group_1')
 	mixedGroups.add('graul_mauler_lair_group_1')
-	mixedGroups.add('quenker_relic_reaper_group')
+	mixedGroups.add('dantooine_quenker_relic')
 	core.spawnService.addMixedSpawnArea(mixedGroups, -5877, -4239, 2170, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dantooine_west_mixed_1.py
+++ b/scripts/mobiles/spawnareas/dantooine_west_mixed_1.py
@@ -4,9 +4,9 @@ from java.util import Vector

 def addSpawnArea(core):
 	mixedGroups = Vector()
-	mixedGroups.add('kunga_central_group_1')
-	mixedGroups.add('piket_longhorn_lair_group_1')
+	mixedGroups.add('dantooine_kunga')
+	mixedGroups.add('dantooine_piket')
 	mixedGroups.add('thune_lair_group_1')
-	mixedGroups.add('piket_longhorn_group_1')
+	mixedGroups.add('dantooine_piket')
 	core.spawnService.addMixedSpawnArea(mixedGroups, -6410, 0, 1986, 'dantooine')
 	return
--- a/scripts/mobiles/spawnareas/dathomir_ns_stronghold_dyn_1.py
+++ b/scripts/mobiles/spawnareas/dathomir_ns_stronghold_dyn_1.py
@@ -4,6 +4,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('nightsisters_dyn_1')
+	dynamicGroups.add('dathomir_nightsister')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, -4055, -81, 2300, 'dathomir')
 	return
--- a/scripts/mobiles/spawnareas/lok_mount_chaolt.py
+++ b/scripts/mobiles/spawnareas/lok_mount_chaolt.py
@@ -4,7 +4,7 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('adolescent_krayt_wild_1')
+	dynamicGroups.add('tatooine_adolescent_krayt')
 	dynamicGroups.add('lok_kimogila')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, 3091, -4638, 500, 'lok')
 	return
--- a/scripts/mobiles/spawnareas/rori_restuss.py
+++ b/scripts/mobiles/spawnareas/rori_restuss.py
@@ -6,5 +6,5 @@ def addSpawnArea(core):
 	dynamicGroups = Vector()
 	dynamicGroups.add('imperial')
 	dynamicGroups.add('rebel')
-	core.spawnService.addDynamicSpawnArea(dynamicGroups, 5378, 5674, 200, 'rori')
+	core.spawnService.addDynamicSpawnArea(dynamicGroups, 5378, 5674, 400, 'rori')
 	return
--- a/scripts/mobiles/spawnareas/talus_imp_vs_reb_battle.py
+++ b/scripts/mobiles/spawnareas/talus_imp_vs_reb_battle.py
@@ -4,6 +4,7 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('adolescent_krayt_wild_1')
+	dynamicGroups.add('imperial')
+	dynamicGroups.add('rebel')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, -2595, 3724, 500, 'talus')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_fort_tusken.py
+++ b/scripts/mobiles/spawnareas/tatooine_fort_tusken.py
@@ -4,6 +4,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('tusken_2')
+	dynamicGroups.add('tatooine_tusken')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, -4000, 6250, 300, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_1.py
+++ b/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_1.py
@@ -4,10 +4,10 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('adolescent_krayt_wild_1')
-	dynamicGroups.add('juvenile_krayts_wild_1')
-	dynamicGroups.add('canyon_krayt_wild_1')
-	dynamicGroups.add('giant_canyon_krayt_wild_1')
-	dynamicGroups.add('bantha')
+	dynamicGroups.add('tatooine_adolescent_krayt')
+	dynamicGroups.add('tatooine_juvenile_krayt')
+	dynamicGroups.add('tatooine_canyon_krayt')
+	dynamicGroups.add('tatooine_giant_canyon_krayt')
+	dynamicGroups.add('tatooine_bantha')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, 6471, 4267, 1024, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_2.py
+++ b/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_2.py
@@ -3,6 +3,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('grand_canyon_krayt_wild_1')
+	dynamicGroups.add('tatooine_grand_canyon_krayt')
 	#core.spawnService.addDynamicSpawnArea(dynamicGroups, 7431, 4762, 120, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_3.py
+++ b/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_3.py
@@ -3,6 +3,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('krayt_dragon_ancient_wild_1')
+	dynamicGroups.add('tatooine_ancient_krayt')
 	#core.spawnService.addDynamicSpawnArea(dynamicGroups, 7490, 4466, 10, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_4.py
+++ b/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_4.py
@@ -3,6 +3,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('krayt_dragon_ancient_wild_1')
+	dynamicGroups.add('tatooine_ancient_krayt')
 	#core.spawnService.addDynamicSpawnArea(dynamicGroups, 6794, 4307, 10, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_5.py
+++ b/scripts/mobiles/spawnareas/tatooine_krayt_graveyard_dynamic_5.py
@@ -3,6 +3,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('krayt_dragon_ancient_wild_1')
+	dynamicGroups.add('tatooine_ancient_krayt')
 	#core.spawnService.addDynamicSpawnArea(dynamicGroups, 7493, 5992, 10, 'tatooine')
 	return
--- a/scripts/mobiles/spawnareas/tatooine_tuskens_dynamic_1.py
+++ b/scripts/mobiles/spawnareas/tatooine_tuskens_dynamic_1.py
@@ -4,6 +4,6 @@ from java.util import Vector

 def addSpawnArea(core):
 	dynamicGroups = Vector()
-	dynamicGroups.add('tuskens_wild_1')
+	dynamicGroups.add('tatooine_tusken_wild')
 	core.spawnService.addDynamicSpawnArea(dynamicGroups, 4310, -4786, 250, 'tatooine')
 	return