some fixes

EQdkpPlus · Mar 4, 2015 · 7e295fb · 7e295fb
1 parent 6390e34
commit 7e295fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 26 deletions.
diff --git a/eq.class.php b/eq.class.php
@@ -32,25 +32,13 @@ class eq extends game_generic {
 		public $langs				= array('english');
 
 		protected $class_dependencies = array(
-			array(
-				'name'		=> 'faction',
-				'type'		=> 'factions',
-				'admin' 	=> true,
-				'decorate'	=> false,
-				'parent'	=> false,
-			),
+
 			array(
 				'name'		=> 'race',
 				'type'		=> 'races',
 				'admin'		=> false,
 				'decorate'	=> true,
-				'parent'	=> array(
-					'faction' => array(
-						'neutral'	=> array(1,8,9,14,16),
-						'good'		=> array(2,3,4,5,7,12,15),
-						'evil'		=> array(6,10,11,12,13),
-					),
-				),
+				'parent'	=> false,
 			),
 			array(
 				'name'		=> 'class',
@@ -64,18 +52,18 @@ class eq extends game_generic {
 				'parent'	=> array(
 					'race' => array(
 						0	=> 'all',									// Unknown
-						1	=> array(15,4,5,7,8,10,11,13,14),			// Gnome
-						2	=> array(15,4,5,8,14),						// Human
+						1	=> array(4,5,7,8,10,11,13,14,15),			// Gnome
+						2	=> array(1,4,5,6,7,8,9,10,11,13,14,15,16),	// Human
 						3	=> array(2,3,10,12,13),						// Barbarian
 						4	=> array(3,15,8,10,13),						// Dwarf
 						5	=> array(15,4,5,8,14),						// High Elf
-						6	=> array(15,4,5,7,10,11,13,14),				// Dark Elf
-						7	=> array(1,16,9,10,13),						// Wood Elf
-						8	=> array(1,16,8,9,10,13),					// Half Elf
-						9	=> array(1,2,10,12,13),						// Vah Shir
+						6	=> array(4,5,7,10,11,13,14,15),				// Dark Elf
+						7	=> array(1,2,16,9,10,13),					// Wood Elf
+						8	=> array(1,4,8,9,10,13),					// Half Elf
+						9	=> array(1,2,3,10,12,13),					// Vah Shir
 						10	=> array(2,3,11,12,13),						// Troll
 						11	=> array(2,3,11,12,13),						// Ogre
-						12	=> array(15,7,8,10,11,12,13,14),			// Froglok
+						12	=> array(15,6,7,8,10,11,12,13,14),			// Froglok
 						13	=> array(2,6,7,11,12,13),					// Iksar
 						14	=> array(15,4,5,7,8,11,14),					// Erudite
 						15	=> array(15,16,8,9,10,13),					// Halfling

diff --git a/language/english.php b/language/english.php
@@ -59,11 +59,6 @@
 		15	=> 'Halfling',
 		16	=> 'Drakkin'
 	),
-	'factions' => array(
-		'neutral'	=> 'Neutral',
-		'good'		=> 'Good',
-		'evil'		=> 'Evil',
-	),
 	'lang' => array(
 		'eq'						=> 'EverQuest',
 		'plate'						=> 'Plate',