updated eq2 game

GodMod · Nov 29, 2013 · 11ab02d · 11ab02d
1 parent a786b06
commit 11ab02d
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 99 deletions.
diff --git a/admin_data.php b/admin_data.php
@@ -26,6 +26,7 @@
 	'Storms',	//EU Francais
 	'Sebilis', //China
 	'Test', //Public Test Server
+	'Beta', //Public Beta Server
 	//US English
 	'Butcherblock',
 	'Nagafen',

diff --git a/classes/26.png b/classes/26.png
diff --git a/classes/26_b.png b/classes/26_b.png
diff --git a/eq2.class.php b/eq2.class.php
@@ -38,7 +38,7 @@ class eq2 extends game_generic {
 		protected $lang_file	= array();
 		protected $path			= '';
 		public $lang			= false;
-		public $version			= '2.2.3';
+		public $version			= '2.2.4';
 
 		public $importers 		= array(
 			'char_import'		=> 'charimporter.php',						// filename of the character import
@@ -72,16 +72,16 @@ protected function load_filters($langs){
 				$this->filters[$lang] = array_merge($this->filters[$lang], array(
 					array('name' => '-----------', 'value' => false),
 					array('name' => $this->glang('very_light', true, $lang), 'value' => 'class:5,6,11,15,23,24'),
-					array('name' => $this->glang('light', true, $lang), 'value' => 'class:4,9,13,22'),
+					array('name' => $this->glang('light', true, $lang), 'value' => 'class:26,4,9,13,22'),
 					array('name' => $this->glang('medium', true, $lang), 'value' => 'class:1,3,7,8,14,17,21,25'),
 					array('name' => $this->glang('heavy', true, $lang), 'value' => 'class:2,10,12,16,18,20'),
 					array('name' => '-----------', 'value' => false),
-					array('name' => $this->glang('healer', true, $lang), 'value' => 'class:7,9,12,14,20,22'),
+					array('name' => $this->glang('healer', true, $lang), 'value' => 'class:26,7,9,12,14,20,22'),
 					array('name' => $this->glang('fighter', true, $lang), 'value' => 'class:2,4,10,13,16,18'),
 					array('name' => $this->glang('mage', true, $lang), 'value' => 'class:5,6,11,15,23,24'),
 					array('name' => $this->glang('scout', true, $lang), 'value' => 'class:1,25,3,8,17,19,21'),
 					array('name' => '-----------', 'value' => false),
-					array('name' => $this->glang('healermage', true, $lang), 'value' => 'class:7,9,12,14,20,22,5,6,11,15,23,24'),
+					array('name' => $this->glang('healermage', true, $lang), 'value' => 'class:26,7,9,12,14,20,22,5,6,11,15,23,24'),
 					array('name' => $this->glang('fighterscout', true, $lang), 'value' => 'class:2,4,10,13,16,18,1,25,3,8,17,19,21'),
 
 				));
@@ -123,6 +123,7 @@ public function get_OnChangeInfos($install=false){
 				23 => '#0000E1',
 				24 => '#0000E1',
 				25 => '#E1E100',
+				26 => '#00E100',
 			);
 
             //lets do some tweak on the templates dependent on the game

diff --git a/language/english.php b/language/english.php
@@ -27,6 +27,7 @@
 		2 => 'Berserker',
 		3 => 'Brigand',
 		4 => 'Bruiser',
+		26 => 'Channeler',
 		5 => 'Coercer',
 		6 => 'Conjuror',
 		7 => 'Defiler',
@@ -77,7 +78,7 @@
 		'Neutral'
 	),
 	'roles' => array(
-		1 => array(7, 9, 12, 14, 20, 22),
+		1 => array(26, 7, 9, 12, 14, 20, 22),
 		2 => array(2, 4, 10, 13, 16, 18),
 		3 => array(5, 6, 11, 15, 23, 24),
 		4 => array(1, 25, 3, 8, 17, 19, 21)
@@ -165,53 +166,7 @@
 		'avatar'                        => 'Avatars',
 		'healermage'                    => 'Healer & Mage',
 		'fighterscout'                  => 'Fighter & Scout',
-		'total_completed'				=> 'Total completed',
-		'uc_showachieve'				=> 'Show Achievements',
-
-        //Events
-        'event1' => 'Abominable Laboratory',
-        'event2' => 'Betrayal of the Underdepths',
-        'event3' => 'Chamber of Destiny',
-        'event4' => 'Execution Throne Room',
-        'event5' => 'Harrow\'s End',
-        'event6' => 'Harrow\'s End (Heroic)',
-        'event7' => 'Icy Keep: Retribution',
-        'event8' => 'Kraytoc\'s Fortress',
-        'event9' => 'Kurn\'s Tower',
-        'event10' => 'Lair of the Dragon Queen',
-        'event11' => 'Miragul\'s Planar Shard',
-        'event12' => 'Munzok\'s Material Bastion',
-        'event13' => 'Palace of the Ancient One',
-        'event14' => 'Plane of War',
-        'event15' => 'Protectors Realm',
-        'event16' => 'Roehn Theer',
-        'event17' => 'Sevalak Awakened',
-        'event18' => 'Shard of Hate',
-        'event19' => 'Sleeper\'s Tomb',
-        'event20' => 'Sleeper\'s Tomb (Heroic)',
-        'event21' => 'Sullon\'s Spire',
-        'event22' => 'Sullon\'s Spire (Hardcore)',
-        'event23' => 'Tallon\'s Stronghold',
-        'event24' => 'Tallon\'s Stronghold (Hardcore)',
-        'event25' => 'Temple of Kor-Sha',
-        'event26' => 'Temple of Rallos Zek',
-        'event27' => 'Temple of Rallos Zek (Hardcore)',
-        'event28' => 'Temple of the Faceless',
-        'event29' => 'Temple of the Faceless (Heroic)',
-        'event30' => 'Throne of Storms',
-        'event31' => 'Throne of Storms (Hardcore)',
-        'event32' => 'Tomb of the Mad Cursader',
-        'event33' => 'Tomb of Thuuga',
-        'event34' => 'Trakanon\'s Lair',
-        'event35' => 'Underfoot Depths',
-        'event36' => 'Vallon\'s Tower',
-        'event37' => 'Vallon\'s Tower (Hardcore)',
-        'event38' => 'Veeshan\'s Peak',
-        'event39' => 'Venril Sathir\'s Lair',
-        'event40' => 'Vyskudra the Ancient',
-        'event41' => 'Ward of Elements',
-        'event42' => 'Ykesha\'s Inner Stronghold',
-        'event43' => 'Zarrakon\'s Abyssal Chamber',
+		'uc_showachieve'				=> 'Show Guild Achievements in Roster Page? (Can slow down loading time)'
 	),
 );
 ?>
diff --git a/objects/eq2_soe.class.php b/objects/eq2_soe.class.php
@@ -32,10 +32,10 @@ class eq2_soe {
 	protected $convert		= array(
 		'classes' => array(
 			40 => 1,//Assassin
-			42 => 25,//Beastlord
 			4 => 2,//Berserker
 			34 => 3,//Brigand
 			7 => 4,//Bruiser
+			44 => 26,//Channeler
 			27 => 5,//Coercer
 			29 => 6,//Conjuror
 			20 => 7,//Defiler
@@ -56,28 +56,29 @@ class eq2_soe {
 			16 => 22,//Warden
 			24 => 23,//Warlock
 			23 => 24,//Wizard
+			42 => 25,//Beastlord
 		),
 		'races' => array(
-			17 => 18, //Arasai
+			18 => 1, //Sarnak
+			5 => 2, //Gnome
+			9 => 3, //Human
 			0 => 4, //Barbarian
-			1 => 7, //Dark Elf
 			2 => 5, //Dwarf
-			3 => 14, //Erudite
-			16 => 19, //Fae
-			4 => 13, //Froglok
-			19 => 20, //Freeblood
-			5 => 2, //Gnome
-			7 => 17, //Halfling
-			6 => 9, //Half Elf
 			8 => 6, //High Elf
-			9 => 3, //Human
-			10 => 15, //Iksar
+			1 => 7, //Dark Elf
+			15 => 8, //Wood Elf
+			6 => 9, //Half Elf
 			11 => 10, //Kerran
+			14 => 11, //Troll
 			12 => 12, //Ogre
+			4 => 13, //Froglok
+			3 => 14, //Erudite
+			10 => 15, //Iksar
 			13 => 16, //Ratonga
-			18 => 1, //Sarnak
-			14 => 11, //Troll
-			15 => 8, //Wood Elf
+			7 => 17, //Halfling
+			17 => 18, //Arasai
+			16 => 19, //Fae
+			19 => 20, //Freeblood
 		),
 	);
 
@@ -154,17 +155,6 @@ public function achieves($achieveid, $force=false){
         return (!$errorchk) ? $achieves: $errorchk;
     }
 
-	public function spells($spelldata, $force=false){
-        $url    = $this->apiurl.'spell/'.$spelldata;
-        if(!$json    = $this->get_CachedData('spell_'.$spelldata)){
-            $json    = $this->read_url($url);
-            $this->set_CachedData($json, 'spell_'.$spelldata);
-        }
-        $spelldata    = json_decode($json, true);
-        $errorchk    = $this->CheckIfError($spelldata);
-        return (!$errorchk) ? $spelldata: $errorchk;
-    }
-
 	public function getGuildID($guild, $realm, $force=false){
 		$guild = rawurlencode($guild);
 		$realm = rawurlencode($realm);

diff --git a/profiles/images/achievebanner.jpg b/profiles/images/achievebanner.jpg
diff --git a/profiles/images/expansions/tov.png b/profiles/images/expansions/tov.png
diff --git a/profiles/profile_additions.php b/profiles/profile_additions.php
@@ -314,6 +314,12 @@
 									'4258537544','1549656268','2706878589','1186627693','1661336669'); $mastertot = 36;
 				$erspells = array('325090821','525825229'); $ericon1 = 664; $erbakg1 = 317; $ericon2 = 327; $erbakg2 = 317;
 				break;
+				case 'Channeler':
+				$masterlist = array('1967992241','2381793860','3518171711','1592172885','3432082492','2544306066','1992001547',
+									'2883155794','3954314227','4191715420','1507366243','4250142795','747707187','1056673948',
+									'3451741558','3755470553'); $mastertot = 12;
+				$erspells = array('320684470','1302094268'); $ericon1 = 220; $erbakg1 = 314; $ericon2 = 42; $erbakg2 = 317;
+				break;
 				case 'Coercer':
 				$masterlist = array('948198458','3443185326','1998517305','2467104654','3768290845','3224247923','373906512',
 									'1055998171','3317897376','710873371','354375561','4040163155','1041605889','3723063385',
@@ -515,13 +521,14 @@
 		$erico1 = 0; $erico2 = 0; $erbak1 = 0; $erbak2 = 0;
 		$emark = 'bad';
 		if (isset($erlist[0])) { $emark = 'good'; $erico1 = $ericon1; $erico2 = $ericon2; $erbak1 = $erbakg1; $erbak2 = $erbakg2; }
-		$debuff = count(array_intersect($debuffspells, $arrTmpSpells));
-		$debuffmatch = (array_intersect($debuffspells, $arrTmpSpells));
-		if ($debuff >= 1 ) { ($debuffcheck = 'X2 Debuff Completed'); $dmark = 'good'; }
-		if ($debuff == 0 ) { ($debuffcheck = 'X2 Debuff NOT Completed'); $dmark = 'bad'; }
-		$debuffmatch = array_shift($debuffmatch);
-		if ($debuffmatch == '674390489') { ($debufficon = '918'); }	if ($debuffmatch == '1616154856') { ($debufficon = '928'); }
-		if ($debuffmatch == '2917802350') { ($debufficon = '857'); } if ($debuffmatch == '612359111') { ($debufficon = '913'); }
+		 //ToFS X2 Debuff removed - Outdated content
+		//$debuff = count(array_intersect($debuffspells, $arrTmpSpells));
+		//$debuffmatch = (array_intersect($debuffspells, $arrTmpSpells));
+		//if ($debuff >= 1 ) { ($debuffcheck = 'X2 Debuff Completed'); $dmark = 'good'; }
+		//if ($debuff == 0 ) { ($debuffcheck = 'X2 Debuff NOT Completed'); $dmark = 'bad'; }
+		//$debuffmatch = array_shift($debuffmatch);
+		//if ($debuffmatch == '674390489') { ($debufficon = '918'); }	if ($debuffmatch == '1616154856') { ($debufficon = '928'); }
+		//if ($debuffmatch == '2917802350') { ($debufficon = '857'); } if ($debuffmatch == '612359111') { ($debufficon = '913'); }
 		 //Check if they have Singular Focus
 		$singular = count(array_intersect($singularfocus, $arrTmpSpells));
 		$singularmatch = (array_intersect($singularfocus, $arrTmpSpells));
@@ -541,7 +548,7 @@
 				'DEBUFF' => $debuffcheck,
 				'EICONID1'  => $erico1,
 				'EICONID2'  => $erico2,
-				'DICONID'   => $debufficon,
+				//'DICONID'   => $debufficon, //ToFS X2 Debuff Icon Removed - Outdated Content
 				'DEITY'     => $deity,
 				'DPIC'      => $dpic,
 				'SING'      => $singularcheck,

diff --git a/profiles/profile_view.html b/profiles/profile_view.html
@@ -352,10 +352,12 @@ <h1>{CHARDATA:name:prefix} {CHARDATA:name:first} {CHARDATA:name:last} {CHARDATA:
 													<td width="25%"><!-- IF raid_ready.EICONID1 != 0 --><div class="spellbkg1"><img src="{CHAR_IMGURL}icons/{raid_ready.EICONID1}/spell" /></div><!-- ENDIF -->
 													                <!-- IF raid_ready.EICONID2 != 0 --><div class="spellbkg2"><img src="{CHAR_IMGURL}icons/{raid_ready.EICONID2}/spell" /></div><!-- ENDIF --></td>
 												</div></tr>
+												<!-- removed
 												<tr>
 													<td width="25%"><img src="{EQDKP_ROOT_PATH}games/eq2/profiles/images/{raid_ready.DMARK}.png" />&nbsp;X2 Debuff:</td><td width="50%">{raid_ready.DEBUFF}</td>
-													<td width="25%"><!-- IF raid_ready.DICONID != 0 --><img src="{CHAR_IMGURL}icons/{raid_ready.DICONID}/spell" /><!-- ENDIF --></td>
+													<td width="25%"><!-- IF raid_ready.DICONID != 0 --> <!-- removed  <img src="{CHAR_IMGURL}icons/{raid_ready.DICONID}/spell" /><!-- ENDIF --> <!--removed     </td>
 												</tr> 
+												-->
 												<tr>
 													<td width="25%"><img src="{EQDKP_ROOT_PATH}games/eq2/profiles/images/{raid_ready.GMARK}.png" />&nbsp;Deity:</td><td width="50%">{raid_ready.DEITY}</td>
 													<td width="25%"><!-- IF raid_ready.DPIC --><img src="{EQDKP_ROOT_PATH}games/eq2/profiles/images/deity/{raid_ready.DPIC}.png" /><!-- ENDIF --></td>

diff --git a/roster/roster_additions.php b/roster/roster_additions.php
@@ -24,7 +24,7 @@
 		#guild_header_banner{
 			width:100%;
 			height:106px;
-			/*background: url('games/eq2/profiles/images/achievebanner.jpg') no-repeat scroll 0px 0px transparent;*/
+			background: url('games/eq2/profiles/images/achievebanner.jpg') no-repeat scroll 0px 0px transparent;
 			margin-top:20px;
 		}
 		#guild_emblem { 
@@ -56,13 +56,8 @@
 			width: 56px; height: 55px; z-index: 4; background:url('games/eq2/profiles/images/achbkg.png');
 		}
 	");
-
-
 
 if ($this->config->get('uc_showachieve') == 'yes') {
-//$showach = $this->config->get('uc_showachieve');
-
-
 # Amory Stuff
 		$this->game->new_object('eq2_soe', 'soe', array($this->config->get('uc_server_loc'), $this->config->get('uc_data_lang')));
 		if(!is_object($this->game->obj['soe'])) return "";
@@ -76,8 +71,8 @@
 		$avcount = 0; $avtotal = 19;
 		$classiccount = 0; $classictotal = 10; $sscount = 0; $sstotal = 2; $dofcount = 0; $doftotal = 10;
 		$koscount = 0; $kostotal = 8; $fdcount = 0; $fdtotal = 3; $eofcount = 0; $eoftotal = 5;
-		$rokcount = 0; $roktotal = 9; $sfcount = 0; $sftotal = 6; $tsocount = 0; $tsototal = 6;
-		$dovcount = 0; $dovtotal = 100; $coecount = 0; $coetotal = 33;
+		$rokcount = 0; $roktotal = 9; $sfcount = 0; $sftotal = 7; $tsocount = 0; $tsototal = 6;
+		$dovcount = 0; $dovtotal = 100; $coecount = 0; $coetotal = 33; $tovcount = 0; $tovtotal = 27;
 		if (isset($gdata)) {
 		foreach($achieves as $values){
 			$arrTmpGAchievs[$values['completedtimestamp']] = $values;
@@ -101,6 +96,7 @@
 		if ($expan == "The Shadow Odyssey") {($expans = "tso");($tsocount = $tsocount + 1);}
 		if ($expan == "Destiny of Velious") {($expans = "dov");($dovcount = $dovcount + 1);}
 		if ($expan == "Chains of Eternity") {($expans = "coe");($coecount = $coecount + 1);}
+		if ($expan == "Tears of Veeshan") {($expans = "tov");($tovcount = $tovcount + 1);}
 		if ($expan == "Avatars") {($expans = "av");($avcount = $avcount + 1);}
 		$clcomplete = ($classiccount != 0) ? intval(($classiccount / $classictotal) * 100) : 0;
 		$sscomplete = ($sscount != 0) ? intval(($sscount / $sstotal) * 100) : 0;
@@ -113,6 +109,7 @@
 		$tsocomplete = ($tsocount != 0) ? intval(($tsocount / $tsototal) * 100) : 0;
 		$dovcomplete = ($dovcount != 0) ? intval(($dovcount / $dovtotal) * 100) : 0;
 		$coecomplete = ($coecount != 0) ? intval(($coecount / $coetotal) * 100) : 0;
+		$tovcomplete = ($tovcount != 0) ? intval(($tovcount / $tovtotal) * 100) : 0;
 		$avcomplete = ($avcount != 0) ? intval(($avcount / $avtotal) * 100) : 0;
 		$this->tpl->assign_block_vars($expans.'_achievements', array(
 				'AICON' => $aic,
@@ -142,6 +139,8 @@
 				'BAR'	=> $this->jquery->ProgressBar('dovbar', $dovcomplete, $dovcount .' / ' . $dovtotal.' ('.$dovcomplete.'%)'),));
 		$this->tpl->assign_block_vars('coebar', array(		
 				'BAR'	=> $this->jquery->ProgressBar('coebar', $coecomplete, $coecount .' / ' . $coetotal.' ('.$coecomplete.'%)'),));
+		$this->tpl->assign_block_vars('tovbar', array(		
+				'BAR'	=> $this->jquery->ProgressBar('tovbar', $tovcomplete, $tovcount .' / ' . $tovtotal.' ('.$tovcomplete.'%)'),));		
 		$this->tpl->assign_block_vars('avbar', array(		
 				'BAR'	=> $this->jquery->ProgressBar('avbar', $avcomplete, $avcount .' / ' . $avtotal.' ('.$avcomplete.'%)'),));		
 		$this->jquery->Tab_header('eq2_roster');
@@ -165,6 +164,7 @@
 		'SF'			=> '<img src="games/eq2/profiles/images/expansions/sf.png"/>',
 		'DOV'			=> '<img src="games/eq2/profiles/images/expansions/dov.png"/>',
 		'COE'			=> '<img src="games/eq2/profiles/images/expansions/coe.png"/>',
+		'TOV'			=> '<img src="games/eq2/profiles/images/expansions/tov.png"/>',
 		'AV'			=> '<img src="games/eq2/profiles/images/expansions/avatars.png"/>',
 		'REALM'			=> $this->config->get('uc_servername'),
 		'GUILD'			=> $this->config->get('guildtag'),
@@ -177,7 +177,7 @@
 		foreach ($achieves as $achieve) 
 		{ $achievecount = $achievecount + 1; 
 		}
- 			$total = 211;
+ 			$total = 238;
 			$complete = ($achievecount != 0) ? intval(($achievecount / $total) * 100) : 0;
 			$this->tpl->assign_block_vars('guildachievs', array(
 				'TOTAL'	=> 'Total Completed',

diff --git a/roster/roster_view.html b/roster/roster_view.html
@@ -16,15 +16,15 @@
 	<div id="achievements">
 			<!-- BEGIN guildachievs -->
 			<div id="bar_guildachievs">
-			<center><h1>{GL_total_completed}</h1></center>
+			<center><h1>{guildachievs.TOTAL}</h1></center>
 			<center>{guildachievs.BAR}</center>
-			</div>
-			<br/>
+			</div>	
 			<!-- END guildachievs -->
 			<div class="clear"></div>
 		<div id="expansions">
 		<ul>
 		    <li><a href='#avatar'><span>{GL_avatar}</span></a></li>
+			<li><a href='#tears'><span>{GL_tears}</span></a></li>
 			<li><a href='#chains'><span>{GL_chains}</span></a></li>
 			<li><a href='#velious'><span>{GL_velious}</span></a></li>
 			<li><a href='#sentinel'><span>{GL_sentinel}</span></a></li>
@@ -58,6 +58,27 @@
 			<!-- END av_achievements -->
 			</table>
 			</div>
+			<div id="tears">
+			<br><center>{TOV}</center>
+			<center>
+			<!-- BEGIN tovbar -->
+			<div id="bar_guildachieves">{tovbar.BAR}</div>
+			<!-- END tovbar -->
+			</center>
+			<div class="clear"></div>
+			<table width="100%" class="colorswitch hoverrows" cellspacing="0" cellpadding="6">
+			<!-- BEGIN tov_achievements -->	
+			<tr>
+			<td class="nowrap"><div id='achicon'>{tov_achievements.AICON}</div>
+			</td>
+			<td class="nowrap">{tov_achievements.ANAME}<br /><i>{tov_achievements.ADESC}</i>
+			</td>
+			<td class="nowrap">{tov_achievements.ADATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			</td>
+			</tr>
+			<!-- END tov_achievements -->
+			</table>
+			</div>
 			<div id="chains">
 			<br><center>{COE}</center>
 			<center>