Merge pull request #513 from Thrax989/Classic-Version1.0

[Added] Latest Changes from Classic version1.0 to Master Branch
Thrax989 · Mar 7, 2019 · 6aa2a1e · 6aa2a1e
2 parents 7efafe1 + 2433816
commit 6aa2a1e
Show file tree

Hide file tree

Showing 38 changed files with 122 additions and 923 deletions.
diff --git a/MMOCoreORB/bin/conf/config.lua b/MMOCoreORB/bin/conf/config.lua
@@ -101,11 +101,12 @@ ZonesEnabled = {
 	"geonosis",
 	"hoth",
 	"hutta",
-	"kaas",
 	"jakku",
+	"kaas",
+	"korriban",
 	"lok",
 	"mandalore",
-	"korriban",
+	"mustafar",
 	"naboo",
 	"rori",
 	"taanab",

diff --git a/MMOCoreORB/bin/scripts/managers/planet_manager.lua b/MMOCoreORB/bin/scripts/managers/planet_manager.lua
@@ -307,7 +307,7 @@ geonosis = {
 	outpostRegionNames = { },
 
 	planetTravelPoints = {
-			{name = "Geonosis City", x = 0, z = 5, y = 0, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1}
+		{name = "Geonosis City", x = -8, z = 5, y = -24, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1}
 	},
 
 	badgeAreas = {
@@ -358,6 +358,7 @@ jakku = {
   gcwEnabled = 0,
 
   planetTravelPoints = {
+	{name = "Battle Of Jakku", x = -4263, z = 6, y = -2411, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1}
     },
 
   badgeAreas = {
@@ -369,8 +370,8 @@ kaas = {
   gcwEnabled = 1,
 
   planetTravelPoints = {
-    {name = "an Imperial Garrison", x = -5163, z = 80, y = -2238, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1},
-	{name = "a Smuggler Outpost", x = 2852, z = 125, y = 3896, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1},
+	{name = "an Imperial Garrison", x = -5163, z = 80, y = -2238, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1},
+	--{name = "a Smuggler Outpost", x = 2852, z = 125, y = 3896, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1},
     },
 
     badgeAreas = {   
@@ -403,7 +404,7 @@ korriban = {
   gcwEnabled = 1,
 
   planetTravelPoints = {
-    {name = "Archaeological Outpost", x = -1751, z = 91, y = -641, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1}
+    {name = "Korriban Starport", x = -1751, z = 91, y = -641, interplanetaryTravelAllowed = 1, incomingTravelAllowed = 1}
     },
 
     badgeAreas = {   

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/giant_wampa.lua b/MMOCoreORB/bin/scripts/mobile/hoth/giant_wampa.lua
@@ -27,44 +27,7 @@ giant_wampa = Creature:new {
 
 	templates = {"object/mobile/wampa.iff"},
 	scale = 2,
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000}				
-		},
-			lootChance = 7000000
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "loot_kit_parts", chance = 10000000}
-		},
-			lootChance = 2000000
-		}
-	},
+	lootGroups = {},
 	weapons = {},
 	conversationTemplate = "",
 	attacks = {

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/hoth_mynock.lua b/MMOCoreORB/bin/scripts/mobile/hoth/hoth_mynock.lua
@@ -27,44 +27,7 @@ hoth_mynock = Creature:new {
 
 	templates = {"object/mobile/salt_mynock_hue.iff"},
 	controlDeviceTemplate = "object/intangible/pet/salt_mynock_hue.iff",
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000}				
-		},
-			lootChance = 7000000
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "loot_kit_parts", chance = 10000000}
-		},
-			lootChance = 2000000
-		}
-	},
+	lootGroups = {},
 	weapons = {},
 	conversationTemplate = "",
 	attacks = {

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/rebel_snow_trooper.lua b/MMOCoreORB/bin/scripts/mobile/hoth/rebel_snow_trooper.lua
@@ -32,51 +32,7 @@ rebel_snow_trooper = Creature:new {
 		"object/mobile/rebel_snow_m_01.iff"		
 	},
 
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000},
-		},
-			lootChance = 500000 
-
-		},
-		{
-			groups = {
-				{group = "g_imperial_credit", chance = 10000000}
-		},
-			lootChance = 200000 
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "imppoints", chance = 10000000}
-		},
-			lootChance = 100000 
-		},
-	},
+	lootGroups = {},
 	weapons = {"rebel_weapons_heavy"},
 	conversationTemplate = "",
 	reactionStf = "@npc_reaction/military",

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/sherkar.lua b/MMOCoreORB/bin/scripts/mobile/hoth/sherkar.lua
@@ -27,44 +27,7 @@ sherkar = Creature:new {
 
 	templates = {"object/mobile/sher_kar.iff"},
 	scale = 1.1;
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000}				
-		},
-			lootChance = 7000000
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "loot_kit_parts", chance = 10000000}
-		},
-			lootChance = 2000000
-		}
-	},
+	lootGroups = {},
 	weapons = {},
 	conversationTemplate = "",
 	attacks = {

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/sherkarmini.lua b/MMOCoreORB/bin/scripts/mobile/hoth/sherkarmini.lua
@@ -27,45 +27,7 @@ sherkarmini = Creature:new {
 
 	templates = {"object/mobile/sher_kar.iff"},
 	scale = 0.1;
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000}				
-		},
-			lootChance = 7000000
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "loot_kit_parts", chance = 10000000}
-		},
-			lootChance = 2000000
-		}
-	},
-
+	lootGroups = {},
 	weapons = {},
 	conversationTemplate = "",
 	attacks = {

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/snow_trooper.lua b/MMOCoreORB/bin/scripts/mobile/hoth/snow_trooper.lua
@@ -28,51 +28,7 @@ snowtrooper = Creature:new {
 	scale = 1.05,
 
 	templates = {"object/mobile/snowtrooper_s01.iff"},
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000},
-		},
-			lootChance = 500000 
-
-		},
-		{
-			groups = {
-				{group = "g_rebel_credit", chance = 10000000}
-		},
-			lootChance = 200000 
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "rebpoints", chance = 10000000}
-		},
-			lootChance = 100000 
-		},
-	},
+	lootGroups = {},
 	weapons = {"stormtrooper_weapons"},
 	conversationTemplate = "",
 	reactionStf = "@npc_reaction/stormtrooper",

diff --git a/MMOCoreORB/bin/scripts/mobile/hoth/tauntaun.lua b/MMOCoreORB/bin/scripts/mobile/hoth/tauntaun.lua
@@ -29,44 +29,7 @@ tauntaun = Creature:new {
 	templates = {"object/mobile/tauntaun_hue.iff"},
 	controlDeviceTemplate = "object/intangible/pet/tauntaun_hue.iff",
 	scale = 1.1,
-	lootGroups = {
-		{
-			groups = {
-				{group = "junk", chance = 10000000}				
-		},
-			lootChance = 7000000
-		},
-		{
-			groups = {
-				{group = "artifact", chance = 10000000}			
-		},
-			lootChance = 1000000
-		},
-		{
-			groups = {
-				{group = "tierone", chance = 10000000}
-		},
-			lootChance = 750000
-		},
-		{
-			groups = {
-				{group = "tiertwo", chance = 10000000}
-		},
-			lootChance = 100000
-		},
-		{
-			groups = {
-				{group = "tierthree", chance = 10000000}
-		},
-			lootChance = 50000
-		},
-		{
-			groups = {
-				{group = "loot_kit_parts", chance = 10000000}
-		},
-			lootChance = 2000000
-		}
-	},
+	lootGroups = {},
 	weapons = {"creature_spit_small_yellow"},
 	attacks = {
 		{"stunattack",""}