Signed-off-by: Gregory PLANCHAT <[email protected]>

gplanchat · Jun 28, 2011 · 3fd8832 · 3fd8832
1 parent 61abbb3
commit 3fd8832
Show file tree

Hide file tree

Showing 138 changed files with 2,597 additions and 1,253 deletions.
diff --git a/admin/activeplanet.php b/admin/activeplanet.php
@@ -44,7 +44,7 @@
 		$AllActivPlanet = doquery("SELECT * FROM {{table}} WHERE `last_update` >= '". (time()-15 * 60) ."' ORDER BY `id` ASC", 'planets');
 		$Count          = 0;
 
-		while ($ActivPlanet = mysql_fetch_array($AllActivPlanet)) {
+		while ($ActivPlanet = $AllActivPlanet->fetch(PDO::FETCH_BOTH)) {
 			$parse['online_list'] .= "<tr>";
 			$parse['online_list'] .= "<td class=b><center><b>". $ActivPlanet['name'] ."</b></center></td>";
 			$parse['online_list'] .= "<td class=b><center><b>[". $ActivPlanet['galaxy'] .":". $ActivPlanet['system'] .":". $ActivPlanet['planet'] ."]</b></center></td>";

diff --git a/admin/chat.php b/admin/chat.php
@@ -48,7 +48,7 @@
 		// Affichage des messages
 		$query = doquery("SELECT * FROM {{table}} ORDER BY messageid DESC LIMIT 25", 'chat');
 		$i = 0;
-		while ($e = mysql_fetch_array($query)) {
+		while ($e = $query->fetch(PDO::FETCH_BOTH)) {
 			$i++;
 			$parse['msg_list'] .= stripslashes("<tr><th class=b>" . date('h:i:s', $e['timestamp']) . "</th>".
 			"<th class=b>". $e['user'] . "</th>".

diff --git a/admin/errors.php b/admin/errors.php
@@ -49,7 +49,7 @@
 		// Afficher les erreurs
 		$query = doquery("SELECT * FROM {{table}}", 'errors');
 		$i = 0;
-		while ($u = mysql_fetch_array($query)) {
+		while ($u = $query->fetch(PDO::FETCH_BOTH)) {
 			$i++;
 			$parse['errors_list'] .= "
 			<tr><td width=\"25\" class=n>". $u['error_id'] ."</td>

diff --git a/admin/messagelist.php b/admin/messagelist.php
@@ -123,7 +123,7 @@
 
 		$StartRec           = 1 + (($ViewPage - 1) * 25);
 		$Messages           = doquery("SELECT * FROM {{table}} WHERE `message_type` = '". $Selected ."' ORDER BY `message_time` DESC LIMIT ". $StartRec .",25;", 'messages');
-		while ($row = mysql_fetch_assoc($Messages)) {
+		while ($row = $Messages->fetch(PDO::FETCH_ASSOC)) {
 			$OwnerData = doquery ("SELECT `username` FROM {{table}} WHERE `id` = '". $row['message_owner'] ."';", 'users',true);
 			$bloc['mlst_id']      = $row['message_id'];
 			$bloc['mlst_from']    = $row['message_from'];

diff --git a/admin/messall.php b/admin/messall.php
@@ -57,7 +57,7 @@
 				$From    = "<font color=\"". $kolor ."\">". $ranga ." ".$user['username']."</font>";
 				$Subject = "<font color=\"". $kolor ."\">". $gameConfig['temat'] ."</font>";
 				$Message = "<font color=\"". $kolor ."\"><b>". $gameConfig['tresc'] ."</b></font>";
-				while ($u = mysql_fetch_array($sq)) {
+				while ($u = $sq->fetch(PDO::FETCH_BOTH)) {
 					SendSimpleMessage ( $u['id'], $user['id'], $Time, 97, $From, $Subject, $Message);
 				}
 				message("<font color=\"lime\">Wys�a�e� wiadomo�� do wszystkich graczy</font>", "Complete", "../overview." . PHPEXT, 3);

diff --git a/admin/moonlist.php b/admin/moonlist.php
@@ -38,7 +38,7 @@
 		$parse = $lang;
 		$query = doquery("SELECT * FROM {{table}} WHERE planet_type='3'", "planets");
 		$i = 0;
-		while ($u = mysql_fetch_array($query)) {
+		while ($u = $query->fetch(PDO::FETCH_BOTH)) {
 			$parse['moon'] .= "<tr>"
 			. "<td class=b><center><b>" . $u[0] . "</center></b></td>"
 			. "<td class=b><center><b>" . $u[1] . "</center></b></td>"

diff --git a/admin/multi.php b/admin/multi.php
@@ -45,7 +45,7 @@
 		$RowsTPL = gettemplate('admin/multi_rows');
 		$PageTPL = gettemplate('admin/multi_body');
 
-		while ($infos = mysql_fetch_assoc($query)) {
+		while ($infos = $query->fetch(PDO::FETCH_ASSOC)) {
 			$Bloc['player'] = $infos['player'];
 			$Bloc['text']   = $infos['text'];
 

diff --git a/admin/planetlist.php b/admin/planetlist.php
@@ -38,7 +38,7 @@
 		$parse = $lang;
 		$query = doquery("SELECT * FROM {{table}} WHERE planet_type='1'", "planets");
 		$i = 0;
-		while ($u = mysql_fetch_array($query)) {
+		while ($u = $query->fetch(PDO::FETCH_BOTH)) {
 			$parse['planetes'] .= "<tr>"
 			. "<td class=b><center><b>" . $u[0] . "</center></b></td>"
 			. "<td class=b><center><b>" . $u[1] . "</center></b></td>"

diff --git a/admin/statbuilder.php b/admin/statbuilder.php
@@ -47,7 +47,7 @@
 
 	$GameUsers  = doquery("SELECT * FROM {{table}} WHERE authlevel<3", 'users');
 
-	while ($CurUser = mysql_fetch_assoc($GameUsers)) {
+	while ($CurUser = $GameUsers->fetch(PDO::FETCH_ASSOC)) {
 		// Recuperation des anciennes statistiques
 		$OldStatRecord  = doquery ("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `id_owner` = '".$CurUser['id']."';",'statpoints');
 		if ($OldStatRecord) {
@@ -190,7 +190,7 @@
 	// Statistiques des alliances ...
 	$GameAllys  = doquery("SELECT * FROM {{table}}", 'alliance');
 
-	while ($CurAlly = mysql_fetch_assoc($GameAllys)) {
+	while ($CurAlly = $GameAllys->fetch(PDO::FETCH_ASSOC)) {
 		// Recuperation des anciennes statistiques
 		$OldStatRecord  = doquery ("SELECT * FROM {{table}} WHERE `stat_type` = '2' AND `id_owner` = '".$CurAlly['id']."';",'statpoints');
 		if ($OldStatRecord) {

diff --git a/alliance.php b/alliance.php
@@ -222,7 +222,7 @@
 			if (mysql_num_rows($search) != 0) {
 				$template = gettemplate('alliance_searchresult_row');
 
-				while ($s = mysql_fetch_array($search)) {
+				while ($s = $search->fetch(PDO::FETCH_BOTH)) {
 					$entry = array();
 					$entry['ally_tag'] = "[<a href=\"alliance.php?mode=apply&allyid={$s['id']}\">{$s['ally_tag']}</a>]";
 					$entry['ally_name'] = $s['ally_name'];
@@ -428,7 +428,7 @@
 		// Como es costumbre. un row template
 		$template = gettemplate('alliance_memberslist_row');
 		$page_list = '';
-		while ($u = mysql_fetch_array($listuser)) {
+		while ($u = $listuser->fetch(PDO::FETCH_BOTH)) {
 			$UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . $u['id'] . "';", 'statpoints', true);
 
 			$i++;
@@ -506,7 +506,7 @@
 			}
 			// looooooop
 			$list = '';
-			while ($u = mysql_fetch_array($sq)) {
+			while ($u = $sq->fetch(PDO::FETCH_BOTH)) {
 				doquery("INSERT INTO {{table}} SET
 				`message_owner`='{$u['id']}',
 				`message_sender`='{$user['id']}' ,
@@ -802,7 +802,7 @@
 	  } else {
 	$selection=doquery("SELECT * FROM {{table}} where ally_id='".$user['ally_id']."'",'users');
   $select='';
-while($data=mysql_fetch_array($selection)){
+while ($data = $selection->fetch(PDO::FETCH_BOTH)){
   $select.='<OPTION VALUE="'.$data['id'].'">'.$data['username'];
 }
   $page .= '<br><form method="post" action="alliance.php?mode=admin&edit=give"><table width="600" border="0" cellpadding="0" cellspacing="1" ALIGN="center">';
@@ -879,7 +879,7 @@
 		$page_list = '';
 		$lang['memberzahl'] = mysql_num_rows($listuser);
 
-		while ($u = mysql_fetch_array($listuser)) {
+		while ($u = $listuser->fetch(PDO::FETCH_BOTH)) {
 			$UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . $u['id'] . "';", 'statpoints', true);
 			$i++;
 			$u['i'] = $i;
@@ -1017,7 +1017,7 @@
 		$i = 0;
 		$parse = $lang;
 		$query = doquery("SELECT id,username,ally_request_text,ally_register_time FROM {{table}} WHERE ally_request='{$ally['id']}'", 'users');
-		while ($r = mysql_fetch_array($query)) {
+		while ($r = $query->fetch(PDO::FETCH_BOTH)) {
 			// recolectamos los datos del que se eligio.
 			if (isset($show) && $r['id'] == $show) {
 				$s['username'] = $r['username'];

diff --git a/annonce.php b/annonce.php
@@ -44,7 +44,7 @@
 	$cristalsouhait = $_POST['cristalsouhait'];
 	$deutsouhait = $_POST['deutsouhait'];
 
-	while ($v_annonce = mysql_fetch_array($users)) {
+	while ($v_annonce = $users->fetch(PDO::FETCH_BOTH)) {
 		$user = $v_annonce['username'];
 		$galaxie = $v_annonce['galaxy'];
 		$systeme = $v_annonce['system'];
@@ -87,7 +87,7 @@
 
 
 ";
-	while ($b = mysql_fetch_array($annonce)) {
+	while ($b = $annonce->fetch(PDO::FETCH_BOTH)) {
 		$page2 .= '<tr><th> ';
 		$page2 .= $b["user"] ;
 		$page2 .= '</th><th>';

diff --git a/banned.php b/banned.php
@@ -42,7 +42,7 @@
 
 $query = doquery("SELECT * FROM {{table}} ORDER BY `id`;",'banned');
 $i=0;
-while($u = mysql_fetch_array($query)){
+while ($u = $query->fetch(PDO::FETCH_BOTH)){
 	$parse['banned'] .=
         "<tr><td class=b><center><b>".$u[1]."</center></td></b>".
 	"<td class=b><center><b>".$u[2]."</center></b></td>".

diff --git a/common.php b/common.php
@@ -44,19 +44,21 @@
 
 defined('PHPEXT') || define('PHPEXT', require 'extension.inc');
 
-defined('VERSION') || define('VERSION', '2009.5');
+defined('VERSION') || define('VERSION', '2011.1');
 
 set_include_path(implode(PATH_SEPARATOR, array(
-    APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'core',
-    APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'community',
     APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'local',
+    APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'community',
+    APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'core',
     get_include_path()
     )));
 
 function __autoload($class) {
     include_once str_replace('_', '/', $class) . '.php';
 }
 
+Legacies_Core_Error::register();
+
 if (0 === filesize(ROOT_PATH . 'config.php')) {
     header('Location: install/');
     die();
@@ -84,10 +86,13 @@ function __autoload($class) {
 include(ROOT_PATH . 'includes/todofleetcontrol.' . PHPEXT);
 include(ROOT_PATH . 'language/' . DEFAULT_LANG . '/lang_info.cfg');
 include(ROOT_PATH . 'includes/vars.' . PHPEXT);
-include(ROOT_PATH . 'includes/db.' . PHPEXT);
+include(ROOT_PATH . 'db/mysql.' . PHPEXT);
 include(ROOT_PATH . 'includes/strings.' . PHPEXT);
 
 $gameConfig = Legacies_Core_Model_Config::getSingleton();
+if (isset($gameConfig['cookie_name']) && !empty($gameConfig['cookie_name'])) {
+    Legacies_Empire_Model_User::setCookieName($gameConfig['cookie_name']);
+}
 $user = Legacies_Empire_Model_User::getSingleton();
 
 if (!defined('DISABLE_IDENTITY_CHECK')) {
@@ -110,31 +115,30 @@ function __autoload($class) {
 $dpath = DEFAULT_SKINPATH;
 if (($user !== null && $user->getId())) {
     $dpath = $user->getSkinPath();
+
     if (empty($dpath)) {
         $dpath = DEFAULT_SKINPATH;
     }
+
     if (defined('IN_ADMIN')) {
         $dpath = '../' . $dpath;
     }
-    SetSelectedPlanet($user); // FIXME
 
-    foreach ($user->getVisibleFleets() as $fleet) {
-        FlyingFleetHandler($fleet); // FIXME
+    if (isset($_GET['cp']) && !empty($_GET['cp'])) {
+        $user->updateCurrentPlanet((int) $_GET['cp']);
     }
 
-    $planetrow = $user->getCurrentPlanet();
-    $galaxyrow = doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$planetrow['id']."';", 'galaxy', true);
+    foreach ($user->getPlanetCollection() as $planet) {
+        FlyingFleetHandler($planet); // TODO: implement logic into a refactored model
+    }
 
-    CheckPlanetUsedFields($planetrow); // FIXME
+    $planet = $user->getCurrentPlanet();
 
     /*
      * Update planet resources and constructions
      */
     Legacies::dispatchEvent('planet.update', array(
-        'planet' => $planetrow
+        'planet' => $planet
         ));
-    $planetrow->save();
-} else {
-    $planetrow = array();
-    $galaxyrow = array();
+    $planet->save();
 }
diff --git a/db/mysql.php b/db/mysql.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tis file is part of XNova:Legacies
+ * This file is part of XNova:Legacies
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @see http://www.xnova-ng.org/
@@ -28,38 +28,37 @@
  *
  */
 
-class Database
-{
-    static $dbHandle = NULL;
-    static $config = NULL;
-}
-
+/**
+ *
+ * Enter description here ...
+ * @deprecated
+ * @param string $query
+ * @param string $table
+ * @param bool $fetch
+ */
 function doquery($query, $table, $fetch = false)
 {
-    if (!isset(Database::$config)) {
-        $config = require dirname(dirname(__FILE__)) . '/config.php';
-    }
+    /**
+     * @var Legacies_Database $database
+     */
+    $database = Legacies_Database::getSingleton();
 
-    if(!isset(Database::$dbHandle))
-    {
-        Database::$dbHandle = mysql_connect(
-            $config['global']['database']['options']['hostname'],
-            $config['global']['database']['options']['username'],
-            $config['global']['database']['options']['password'])
-                or trigger_error(mysql_error() . "$query<br />" . PHP_EOL, E_USER_WARNING);
+    $sql = str_replace("{{table}}", $database->getTable($table), $query);
 
-        mysql_select_db($config['global']['database']['options']['database'], Database::$dbHandle)
-            or trigger_error(mysql_error()."$query<br />" . PHP_EOL, E_USER_WARNING);
-    }
-    $sql = str_replace("{{table}}", "{$config['global']['database']['table_prefix']}{$table}", $query);
+    /**
+     * @var PDOStatement $statement
+     */
+    try {
+        $statement = $database->prepare($sql);
 
-    if (false === ($sqlQuery = mysql_query($sql, Database::$dbHandle))) {
-        trigger_error(mysql_error() . PHP_EOL . "<br /><pre></code>$sql<code></pre><br />" . PHP_EOL, E_USER_WARNING);
+        $statement->execute(array());
+    } catch (PDOException $e) {
+        trigger_error($e->getMessage() . PHP_EOL . "<br /><pre></code>$sql<code></pre><br />" . PHP_EOL, E_USER_WARNING);
     }
 
-    if($fetch) {
-        return mysql_fetch_array($sqlQuery);
-    }else{
-        return $sqlQuery;
+    if ($fetch) {
+        return $statement->fetch(PDO::FETCH_BOTH);
+    } else {
+        return $statement;
     }
 }
diff --git a/fleet.php b/fleet.php
@@ -116,7 +116,7 @@
 	$i  = 0;
 
 
-	while ($f = mysql_fetch_array($fq)) {
+	while ($f = $fq->fetch(PDO::FETCH_BOTH)) {
 		$i++;
 		$page .= "<tr height=20>";
 		// (01) Fleet ID

diff --git a/floten1.php b/floten1.php
@@ -225,7 +225,7 @@
 		$i = 0;
 		$w = 0;
 		$tr = true;
-		while ($row = mysql_fetch_array($kolonien)) {
+		while ($row = $kolonien->fetch(PDO::FETCH_BOTH)) {
 			if ($w == 0 && $tr) {
 				$page .= "<tr height=\"20\">";
 				$tr = false;

diff --git a/floten2.php b/floten2.php
@@ -43,7 +43,7 @@
 	$UsedPlanet = false;
 	$select       = doquery("SELECT * FROM {{table}}", "planets");
 
-	while ($row = mysql_fetch_array($select)) {
+	while ($row = $select->fetch(PDO::FETCH_BOTH)) {
 		if ($galaxy     == $row['galaxy'] &&
 			$system     == $row['system'] &&
 			$planet     == $row['planet'] &&

diff --git a/includes/CombatEngine.php b/includes/CombatEngine.php
@@ -28,34 +28,7 @@
  *
  */
 
-$CombatCaps = array(
-202 => array ( 'shield' =>    10, 'attack' =>      5, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-203 => array ( 'shield' =>    25, 'attack' =>      5, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-204 => array ( 'shield' =>    10, 'attack' =>     50, 'sd' => array (202 =>   2, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-205 => array ( 'shield' =>    25, 'attack' =>    150, 'sd' => array (202 =>   3, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-206 => array ( 'shield' =>    50, 'attack' =>    400, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   6, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>  10, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-207 => array ( 'shield' =>   200, 'attack' =>   1000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   8, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-208 => array ( 'shield' =>   100, 'attack' =>     50, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-209 => array ( 'shield' =>    10, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-210 => array ( 'shield' =>     0, 'attack' =>      0, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    0, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0 )),
-211 => array ( 'shield' =>   500, 'attack' =>   1000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>  20, 402 =>  20, 403 =>  10, 404 =>   1, 405 =>  10, 406 =>   1, 407 =>   1, 408 =>   1 )),
-212 => array ( 'shield' =>    10, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    1, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-213 => array ( 'shield' =>   500, 'attack' =>   2000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   2, 401 =>   1, 402 =>  10, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-214 => array ( 'shield' => 50000, 'attack' => 200000, 'sd' => array (202 => 250, 203 => 250, 204 => 200, 205 => 100, 206 =>  33, 207 =>  30, 208 => 250, 209 => 250, 210 => 1250, 211 =>  25, 212 => 1250, 213 =>   5, 214 =>   1, 215 =>  15, 401 => 200, 402 => 200, 403 => 100, 404 =>  50, 405 => 100, 406 =>   1, 407 =>   1, 408 =>   1 )),
-215 => array ( 'shield' =>   400, 'attack' =>    700, 'sd' => array (202 =>   3, 203 =>   3, 204 =>   1, 205 =>   4, 206 =>   4, 207 =>   7, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1 )),
-
-401 => array ( 'shield' =>    20, 'attack' =>     80, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-402 => array ( 'shield' =>    25, 'attack' =>    100, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-403 => array ( 'shield' =>   100, 'attack' =>    250, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-404 => array ( 'shield' =>   200, 'attack' =>   1100, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-405 => array ( 'shield' =>   500, 'attack' =>    150, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-406 => array ( 'shield' =>   300, 'attack' =>   3000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-407 => array ( 'shield' =>  2000, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-408 => array ( 'shield' =>  2000, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1) ),
-
-502 => array ( 'shield' =>     1, 'attack' =>      1 ),
-503 => array ( 'shield' =>     1, 'attack' =>  12000 )
-);
+$CombatCaps = Legacies_Empire_Model_Game_Combat::getSingleton();
 
 $AtFleet = array ( 203 => 2 );
 $AtTechn = array ( 109 => 3, 110 => 5, 111 => 3 );