Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [532] branches/ogsector
|
From: <spo...@us...> - 2007-06-04 23:14:31
|
Revision: 532
http://svn.sourceforge.net/opengate/?rev=532&view=rev
Author: spom_spom
Date: 2007-06-04 16:14:31 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
consider new xml format
Modified Paths:
--------------
branches/ogsector/ToDo
branches/ogsector/data/commodities.xml
branches/ogsector/data/equipment.xml
branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/DeviceManager.cpp
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/Entity.cpp
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/EntityManager.h
branches/ogsector/win32/ogsectorclient/commodities.xml
branches/ogsector/win32/ogsectorclient/resources.cfg
Added Paths:
-----------
branches/ogsector/win32/ogsectorclient/equipment.xml
Modified: branches/ogsector/ToDo
===================================================================
--- branches/ogsector/ToDo 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/ToDo 2007-06-04 23:14:31 UTC (rev 532)
@@ -148,6 +148,6 @@
-Leuchtfeuer, manuel und als sectorobject
- -Fire: Funke, Brand, Leuchtfeuer, Phoenix, Fl\xE4chenbrand, Feuerball, Hephaistos, Vulkanus, Hitze, Flamme, Sonne, Plasma, Hestia = (griech.) G\xF6ttin des Herdfeuers, Loki = (germ.) Gott des Feuers, Pele = (polyn.) G\xF6ttin der Vulkane und des Feuers, Asche
+ -Fire: "Spark, " Funke, Brand, Leuchtfeuer, Phoenix, Fl\xE4chenbrand, Feuerball, Hephaistos, Vulkanus, Hitze, Flamme, Sonne, Plasma, Hestia = (griech.) G\xF6ttin des Herdfeuers, Loki = (germ.) Gott des Feuers, Pele = (polyn.) G\xF6ttin der Vulkane und des Feuers, Asche, irrlicht
- -Wave: Brandung,Tsunami,Kr\xE4usel, Rayleigh waves, Love wave, Gicht, Monsterwelle, Aegir = (germ.) Gott des Meeres,Poseidon = (griech.) Gott des Wassers und Meeres, Sedna = (innuit) G\xF6ttin des Meeres, Woge, Brecher, D\xFCnung, Seegang, See, Wellenschlag, Ebbe, Flut, Str\xF6mung, leises Pl\xE4tschern,
+ -Wave: "Frizzle, " Brandung,Tsunami,Kr\xE4usel, Rayleigh waves, Love wave, Gicht, Monsterwelle, Aegir = (germ.) Gott des Meeres,Poseidon = (griech.) Gott des Wassers und Meeres, Sedna = (innuit) G\xF6ttin des Meeres, Woge, Brecher, D\xFCnung, Seegang, See, Wellenschlag, Ebbe, Flut, Str\xF6mung, leises Pl\xE4tschern, crystal
Modified: branches/ogsector/data/commodities.xml
===================================================================
--- branches/ogsector/data/commodities.xml 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/data/commodities.xml 2007-06-04 23:14:31 UTC (rev 532)
@@ -2,22 +2,31 @@
<commodities>
<Resource id="1" location="../../trunk/data/commodities/aluminium.xml"/>
- <Resource id="2" location="../../trunk/data/commodities/antimony.xml"/>
- <Resource id="3" location="../../trunk/data/commodities/barium.xml"/>
- <Resource id="4" location="../../trunk/data/commodities/cesium.xml"/>
- <Resource id="5" location="../../trunk/data/commodities/chemicals.xml"/>
- <Resource id="6" location="../../trunk/data/commodities/chromium.xml"/>
- <Resource id="7" location="../../trunk/data/commodities/copper.xml"/>
- <Resource id="8" location="../../trunk/data/commodities/cpu.xml"/>
- <Resource id="9" location="../../trunk/data/commodities/fuel_cells.xml"/>
- <Resource id="10" location="../../trunk/data/commodities/gold.xml"/>
- <Resource id="11" location="../../trunk/data/commodities/helium.xml"/>
- <Resource id="12" location="../../trunk/data/commodities/iron.xml"/>
- <Resource id="12" location="../../trunk/data/commodities/laser_components.xml"/>
- <Resource id="13" location="../../trunk/data/commodities/medical_supplies.xml"/>
- <Resource id="14" location="../../trunk/data/commodities/nitrogen.xml"/>
- <Resource id="15" location="../../trunk/data/commodities/octavia_light.xml"/>
- <Resource id="16" location="../../trunk/data/commodities/rubber.xml"/>
- <Resource id="17" location="../../trunk/data/commodities/xenon.xml"/>
- <Resource id="18" location="../../trunk/data/commodities/ice.xml"/>
+ <Resource id="2" location="../../trunk/data/commodities/ammunition.xml"/>
+ <Resource id="3" location="../../trunk/data/commodities/antimony.xml"/>
+ <Resource id="4" location="../../trunk/data/commodities/armor.xml"/>
+ <Resource id="5" location="../../trunk/data/commodities/barium.xml"/>
+ <Resource id="6" location="../../trunk/data/commodities/cesium.xml"/>
+ <Resource id="7" location="../../trunk/data/commodities/chemicals.xml"/>
+ <Resource id="8" location="../../trunk/data/commodities/chromium.xml"/>
+ <Resource id="9" location="../../trunk/data/commodities/conflux_biomass.xml"/>
+ <Resource id="10" location="../../trunk/data/commodities/copper.xml"/>
+ <Resource id="11" location="../../trunk/data/commodities/cpu.xml"/>
+ <Resource id="12" location="../../trunk/data/commodities/fuel_cells.xml"/>
+ <Resource id="13" location="../../trunk/data/commodities/gold.xml"/>
+ <Resource id="14" location="../../trunk/data/commodities/helium.xml"/>
+ <Resource id="15" location="../../trunk/data/commodities/ice.xml"/>
+ <Resource id="16" location="../../trunk/data/commodities/iron.xml"/>
+ <Resource id="17" location="../../trunk/data/commodities/laser_components.xml"/>
+ <Resource id="18" location="../../trunk/data/commodities/magnetic_components.xml"/>
+ <Resource id="19" location="../../trunk/data/commodities/manufactured_foods.xml"/>
+ <Resource id="20" location="../../trunk/data/commodities/medical_supplies.xml"/>
+ <Resource id="21" location="../../trunk/data/commodities/nitrogen.xml"/>
+ <Resource id="22" location="../../trunk/data/commodities/octavia_light.xml"/>
+ <Resource id="23" location="../../trunk/data/commodities/organic_foods.xml"/>
+ <Resource id="24" location="../../trunk/data/commodities/plutonium.xml"/>
+ <Resource id="26" location="../../trunk/data/commodities/rubber.xml"/>
+ <Resource id="27" location="../../trunk/data/commodities/tauseti_flashback.xml"/>
+ <Resource id="28" location="../../trunk/data/commodities/water.xml"/>
+ <Resource id="29" location="../../trunk/data/commodities/xenon.xml"/>
</commodities>
Modified: branches/ogsector/data/equipment.xml
===================================================================
--- branches/ogsector/data/equipment.xml 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/data/equipment.xml 2007-06-04 23:14:31 UTC (rev 532)
@@ -1,7 +1,30 @@
<?xml version="1.0"?>
<equipment>
- <Resource id="1" location="../../trunk/data/capacitors/s_c_15.xml" />
- <Resource id="2" location="../../trunk/data/ECMs/ghost.xml" />
- <Resource id="3" location="../../trunk/data/capacitors/deepol.xml" />
+ <Resource id="1" location="../../trunk/data/engines/money.xml" />
+ <Resource id="2" location="../../trunk/data/engines/t-e-15.xml" />
+ <Resource id="3" location="../../trunk/data/power_plants/contender.xml" />
+ <Resource id="4" location="../../trunk/data/power_plants/contender_xl.xml" />
+ <Resource id="5" location="../../trunk/data/power_plants/contender_xpr.xml" />
+ <Resource id="6" location="../../trunk/data/power_plants/gatherer.xml" />
+ <Resource id="7" location="../../trunk/data/power_plants/spud.xml" />
+ <Resource id="8" location="../../trunk/data/capacitors/deepol.xml" />
+ <Resource id="9" location="../../trunk/data/capacitors/mantra.xml" />
+ <Resource id="10" location="../../trunk/data/capacitors/outlet.xml" />
+ <Resource id="12" location="../../trunk/data/capacitors/sponge.xml" />
+ <Resource id="13" location="../../trunk/data/capacitors/summoner.xml" />
+ <Resource id="14" location="../../trunk/data/capacitors/t-c-15.xml" />
+ <Resource id="15" location="../../trunk/data/capacitors/tank.xml" />
+ <Resource id="16" location="../../trunk/data/ECMs/ghost.xml" />
+ <Resource id="17" location="../../trunk/data/radars/cyclops.xml" />
+ <Resource id="18" location="../../trunk/data/radars/hall_monitor.xml" />
+ <Resource id="19" location="../../trunk/data/radars/outlook.xml" />
+ <Resource id="20" location="../../trunk/data/radars/t-r-9.xml" />
+ <Resource id="21" location="../../trunk/data/shields/alpaa.xml" />
+ <Resource id="22" location="../../trunk/data/shields/flatiron.xml" />
+ <Resource id="23" location="../../trunk/data/shields/himelea.xml" />
+ <Resource id="24" location="../../trunk/data/shields/kydango.xml" />
+ <Resource id="25" location="../../trunk/data/shields/pod.xml" />
+ <Resource id="26" location="../../trunk/data/shields/shelter.xml" />
+ <Resource id="27" location="../../trunk/data/shields/t-s-13.xml" />
</equipment>
Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-04 23:14:31 UTC (rev 532)
@@ -146,6 +146,7 @@
<Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease100">
<Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="Visible" Value="False" />
<Property Name="NormalImage" Value="set:opengate image:MarketDecrease100Normal" />
<Property Name="HoverImage" Value="set:opengate image:MarketDecrease100Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketDecrease100Pushed" />
@@ -153,6 +154,7 @@
<Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease10">
<Property Name="UnifiedPosition" Value="{{0.0, 25},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="Visible" Value="False" />
<Property Name="NormalImage" Value="set:opengate image:MarketDecrease10Normal" />
<Property Name="HoverImage" Value="set:opengate image:MarketDecrease10Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketDecrease10Pushed" />
@@ -186,6 +188,7 @@
<Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase10">
<Property Name="UnifiedPosition" Value="{{0.0, 145},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="Visible" Value="False" />
<Property Name="NormalImage" Value="set:opengate image:MarketIncrease10Normal" />
<Property Name="HoverImage" Value="set:opengate image:MarketIncrease10Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketIncrease10Pushed" />
@@ -193,6 +196,7 @@
<Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase100">
<Property Name="UnifiedPosition" Value="{{0.0, 170},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="Visible" Value="False" />
<Property Name="NormalImage" Value="set:opengate image:MarketIncrease100Normal" />
<Property Name="HoverImage" Value="set:opengate image:MarketIncrease100Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketIncrease100Pushed" />
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/ogre.cfg 2007-06-04 23:14:31 UTC (rev 532)
@@ -5,4 +5,4 @@
Full Screen=No
RTT Preferred Mode=FBO
Refresh Rate=Not applicable
-Video Mode=800 x 600
+Video Mode=1024 x 768
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/resources.cfg 2007-06-04 23:14:31 UTC (rev 532)
@@ -23,6 +23,11 @@
FileSystem=../../trunk/data/
FileSystem=../../trunk/data/commodities
FileSystem=../../trunk/data/capacitors
+FileSystem=../../trunk/data/engines
+FileSystem=../../trunk/data/radars
+FileSystem=../../trunk/data/shields
+FileSystem=../../trunk/data/ECMs
+FileSystem=../../trunk/data/power_plants
FileSystem=../../trunk/data/ships/octavius/apteryx
FileSystem=../../trunk/data/ships/quantar/storm
FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
Modified: branches/ogsector/src/DeviceManager.cpp
===================================================================
--- branches/ogsector/src/DeviceManager.cpp 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/DeviceManager.cpp 2007-06-04 23:14:31 UTC (rev 532)
@@ -34,7 +34,7 @@
network = NULL;
gameStateRoot = NULL;
avatar = NULL;
-
+ languageSuffix_ = "en";
}
DeviceManager::~DeviceManager( ) {
Modified: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/DeviceManager.h 2007-06-04 23:14:31 UTC (rev 532)
@@ -61,7 +61,22 @@
void setGlobalKeyModifier( GlobalKeyModifier modifier ){ modifier_ = modifier; }
GlobalKeyModifier globalKeyModifier( ) const { return modifier_; }
-
+
+ std::string languageSuffix() const { return languageSuffix_; }
+ std::string className( int id ) const { return "unknown"; }
+ std::string factionName( int id ) const {
+ switch( id ){
+ case 1: return "Neutral";
+ case 2: return "Tauseti";
+ case 3: return "Octavius";
+ case 4: return "Quantar";
+ case 5: return "Squadrok";
+ case 6: return "Hyperial";
+ case 7: return "Amanath";
+ }
+ return "unknown";
+ }
+
Ogre::Root * ogreRoot;
Ogre::RenderWindow * renderWindow;
CEGUI::OgreCEGUIRenderer * guiRenderer;
@@ -74,6 +89,7 @@
protected:
GlobalKeyModifier modifier_;
+ std::string languageSuffix_;
};
} //namespace OpenGate
Modified: branches/ogsector/src/Entity.cpp
===================================================================
--- branches/ogsector/src/Entity.cpp 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/Entity.cpp 2007-06-04 23:14:31 UTC (rev 532)
@@ -23,6 +23,7 @@
#include <OgreException.h>
#include <OgreCEGUITexture.h>
#include <CEGUIImageset.h>
+#include <CEGUIExceptions.h>
#include <CEGUIBase.h>
#include "DeviceManager.h"
@@ -36,13 +37,9 @@
if ( imageName != "unknown" ){
try {
texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( DeviceManager::getSingleton().guiRenderer )->createTexture( imageName, "General");
- } catch( Ogre::Exception & e ){
- LogManager::getSingleton().warn( e.what() );
- fail = true;
- } catch( ... ){
- LogManager::getSingleton().warn( "unknown exception occured while create texture: " + imageName );
- fail = true;
- }
+ } catch( CEGUI::Exception & e ){
+ LogManager::getSingleton().warn( e.getMessage().c_str() ); fail = true;
+ }
} else {
fail = true;
}
Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/Entity.h 2007-06-04 23:14:31 UTC (rev 532)
@@ -51,8 +51,8 @@
description_("Please fill in description"), imageFileName_("unknown"), ceguiImageName_( "unknownEntityImageset") {
id_ = 0;
techLevel_ = 0;
- mass_ = 0;
- size_ = 0;
+ mass_ = 1;
+ size_ = 1;
rtti_ = ENTITY;
}
@@ -91,6 +91,14 @@
void loadImage( const std::string & imageName );
+ inline void setProductionCenters( const std::set < std::string > & productionCenters ) {
+ productionCenters_ = productionCenters; }
+ inline std::set < std::string > productionCenters( ) const { return productionCenters_; }
+
+ inline void setRequieredComponents( const std::set < Commodity * > & requieredComponents ) {
+ requieredComponents_ = requieredComponents; }
+ inline std::set < Commodity * > requieredComponents( ) const { return requieredComponents_; }
+
protected:
std::string factionName_;
@@ -101,6 +109,12 @@
std::string imageFileName_;
std::string ceguiImageName_;
+ /*! The places where this part of equipment is built */
+ std::set < std::string > productionCenters_;
+
+ /*! The components required to build this equipment part */
+ std::set < Commodity * > requieredComponents_;
+
/*! A unique ID to find this object \todo maybe push to a string and merge with Commodity.commodityID_ */
int id_;
/*! The required tech level to interact with this object */
@@ -131,28 +145,102 @@
inline void setManufacturer( const std::string & manufacturer ) { manufacturer_ = manufacturer; }
inline std::string manufacturer( ) const { return manufacturer_; }
- inline void setProductionCenters( const std::set < std::string > & productionCenter ) { productionCenter_ = productionCenter; }
- inline std::set < std::string> productionCenters( ) const { return productionCenter_; }
+ /*! Sets the Efficiency of this Equipment between 0(min) and 1(max) */
+ inline void setEfficiency( double efficiency ) { efficiency_ = efficiency; }
+ inline double efficiency( ) const { return efficiency_; }
- inline void setRequieredComponents( const std::set < Commodity * > & requieredComponents ) { requieredComponents_ = requieredComponents; }
- inline std::set < Commodity * > requieredComponents( ) const { return requieredComponents_; }
+ inline void setPowerConsumption( double powerConsumption ) { powerConsumption_ = powerConsumption; }
+ virtual inline double powerConsumption( ) { return powerConsumption_; }
protected:
Equipment() : Entity(), manufacturer_( "unkown" ) {
size_ = 0;
+ efficiency_ = 1.0;
+ powerConsumption_ = 0.0;
}
virtual ~Equipment() { }
/*! Name of the company that produces this equipment */
std::string manufacturer_;
- /*! The places where this part of equipment is built */
- std::set < std::string > productionCenter_;
- /*! The components required to build this equipment part */
- std::set < Commodity * > requieredComponents_;
+
+ /*! Stores the efficiency of this equipment */
+ double efficiency_;
+
+ /*! Stores the power consumption of this equipment */
+ double powerConsumption_;
};
/*!
+ * \brief This class stores the basical information of a PowerPlant
+ *
+ * This class, like all other equipment classes, is filled by loading the
+ * information from an XML file. It defines the details for a PowerPlant, which
+ * is a component that is plugged into the ship.
+ * \author Christoph Brill <eg...@us...>
+ */
+class PowerPlant : public Equipment {
+public:
+ PowerPlant() : Equipment(){
+ rtti_ = POWERPLANT;
+ powerOutput_ = 0.0;
+ }
+ void setPowerOutput( double power ) { powerOutput_ = power; }
+ double powerOutput( ) const { return powerOutput_; }
+
+protected:
+ double powerOutput_;
+};
+
+/*!
+ * \brief This class stores the basical information of a Shield
+ *
+ * This class, like all other equipment classes, is filled by loading the
+ * information from an XML file. It defines the details for a shield, which
+ * is a component that is plugged into the ship.
+ * \author Christoph Brill <eg...@us...>
+ */
+class Shield : public Equipment {
+public:
+ Shield() : Equipment(){
+ rtti_ = SHIELD;
+ }
+
+ void setMaximumDeflection( double deflection ){ setMaximumDeflection_ = deflection; }
+ double maximumDeflection( ) const { return setMaximumDeflection_; }
+
+ void setRegenerationRate( double regenRate ){ regenerationRate_ = regenRate; }
+ double regenerationRate( ) const { return regenerationRate_; }
+
+ double powerConsumption( ) const { return regenerationRate_ / efficiency_; }
+
+protected:
+ double regenerationRate_;
+ double setMaximumDeflection_;
+
+};
+
+/*!
+ * \brief This class stores the basical information of a radar
+ *
+ * This class, like all other equipment classes, is filled by loading the
+ * information from an XML file. It defines the details for a radar, which
+ * is a component that is plugged into the ship.
+ * \author Christoph Brill <eg...@us...>
+ */
+class Radar : public Equipment {
+public:
+ Radar() : Equipment(){
+ rtti_ = RADAR;
+ }
+ void setMaximumRange( double range ){ range_ = range; }
+ double maximumRange() const{ return range_; }
+
+protected:
+ double range_;
+};
+
+/*!
* \brief This class stores the basical information of a capactitor
*
* This class, like all other equipment classes, is filled by loading the
@@ -164,20 +252,14 @@
public:
Capacitor() : Equipment() {
- efficiency_ = 0;
+ rtti_ = CAPACITOR;
capacity_ = 0;
- rtti_ = CAPACITOR;
}
- inline void setEfficiency( long efficiency ) { efficiency_ = efficiency; }
- inline long efficiency( ) { return efficiency_; }
-
inline void setCapacity( long capacity ) { capacity_ = capacity; }
inline long capacity( ) { return capacity_; }
private:
- /*! Stores the efficiency of a capacitor */
- long efficiency_;
/*! Stores the capacity of a capacitor */
long capacity_;
};
@@ -194,22 +276,16 @@
public:
Ecm() : Equipment() {
+ rtti_ = ECM;
sensorLevel_ = 0;
- powerConsumption_ = 0;
- rtti_ = ECM;
}
inline void setSensorLevel( short sensorLevel ) { sensorLevel_ = sensorLevel; }
inline short sensorLevel( ) { return sensorLevel_; }
- inline void setPowerConsumption( long powerConsumption ) { powerConsumption_ = powerConsumption; }
- inline long powerConsumption( ) { return powerConsumption_; }
-
private:
/*! Stores the sensorlevel of this Ecm */
short sensorLevel_;
- /*! Stores the power consumption of this Ecm */
- long powerConsumption_;
};
/*!
@@ -224,20 +300,16 @@
public:
Engine(): Equipment() {
- efficiency_ = 0.0;
+ rtti_ = ENGINE;
maxThrust_ = 0;
- rtti_ = ENGINE;
}
- inline void setEfficiency( double efficiency ) { efficiency_ = efficiency; }
- inline double efficiency( ) { return efficiency_; }
-
inline void setMaxThrust( long maxThrust ) { maxThrust_ = maxThrust; }
inline long maxThrust( ) { return maxThrust_; }
+ double powerConsumption( ) const { return ( maxThrust_ / 1000 ) / efficiency_; }
+
private:
- /*! Stores the efficiency of this engine */
- double efficiency_;
/*! Stores the maximum thrust of this engine */
long maxThrust_;
};
@@ -254,15 +326,11 @@
public:
Commodity(): Entity(), commodityID_( "unknownID" ) {
+ rtti_ = COMMODITY;
meltingPoint_ = 0;
- size_ = 0;
graviticSig_ = 0.0;
- rtti_ = COMMODITY;
}
- inline void setProductionCenters( const std::set < std::string > & productionCenters ) { productionCenters_ = productionCenters; }
- inline std::set < std::string > productionCenters( ) const { return productionCenters_; }
-
inline void setMeltingPoint( int meltingPoint ){ meltingPoint_ = meltingPoint; }
inline int meltingPoint( ) const { return meltingPoint_; }
@@ -273,8 +341,6 @@
inline std::string commodityID( ) const { return commodityID_; }
protected:
- /*! A list of all stations that produce this commodity */
- std::set < std::string > productionCenters_;
/*! The unique name of this commodity \todo check if that can be merged with EntityTemlpate.id_ */
std::string commodityID_;
/*! The specific melting point of this commodity */
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/EntityManager.cpp 2007-06-04 23:14:31 UTC (rev 532)
@@ -19,6 +19,7 @@
***************************************************************************/
#include "EntityManager.h"
+#include "DeviceManager.h"
#include "tinyxml/tinyxml.h"
namespace OpenGate {
@@ -46,21 +47,21 @@
TiXmlElement* pElem;
TiXmlHandle hRoot( 0 );
- pElem = docHandle.FirstChildElement().Element();
+ pElem = docHandle.FirstChildElement().Element();
hRoot = TiXmlHandle( pElem );
-
- if ( pElem ) {
- for ( pElem = hRoot.FirstChild( "Resource" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
- log_->info( std::string( "Found ressource: " ) + pElem->Attribute("location") );
- entities[ toInt( pElem->Attribute("id") ) ] = pElem->Attribute("location");
- }
+
+ if ( pElem ) {
+ for ( pElem = hRoot.FirstChild( "Resource" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+ log_->info( std::string( "Found ressource: " ) + pElem->Attribute("location") );
+ entities[ toInt( pElem->Attribute("id") ) ] = pElem->Attribute("location");
+ }
} else {
- log_->fatal( resourceFile + " cannot read first node." );
+ log_->fatal( resourceFile + " cannot read first node." );
}
} else {
// log_->info( resourceFile + " cannot open resourceFile." );
}
-
+
for ( std::map < int, std::string >::iterator it = entities.begin(); it != entities.end(); it ++ ){
loadAndCreate( it->first, it->second );
}
@@ -89,19 +90,20 @@
Entity * EquipmentManager::loadAndCreate( int id, const std::string & fileName ){
+ log_->info( "Read equipment: " + fileName );
+
TiXmlDocument doc( fileName );
bool loadOkay = doc.LoadFile();
if ( !loadOkay ) {
- log_->fatal( std::string( "Failed to load file: " + fileName ) );
+ log_->fatal( std::string( "Failed to load equipment file: " + fileName ) );
return NULL;
}
TiXmlHandle docHandle( &doc );
- TiXmlElement* pElem;
+ TiXmlElement *pElem;
TiXmlHandle hRoot( 0 );
- //** block: equipment;
pElem = docHandle.FirstChildElement().Element();
hRoot = TiXmlHandle( pElem );
@@ -110,81 +112,148 @@
return NULL;
}
- if ( strcmp( "equipment", pElem->Value() ) != 0 ){
+ if ( strcmp( "equipment", pElem->Value() ) != 0 && strcmp( "container", pElem->Value() ) != 0 ) {
log_->fatal( fileName + " is no equipment description" );
return NULL;
}
- Equipment * entity = 0;
- std::string equipmentType = pElem->Attribute("type");
+// Equipment * entity = 0;
+// std::string equipmentType = pElem->Attribute("type");
- if ( equipmentType == "Engine" ) entity = new Engine();
- else if ( equipmentType == "ECM" ) entity = new Ecm();
- else if ( equipmentType == "Capacitor" ) entity = new Capacitor();
- else {
- log_->fatal( fileName + " has no type of equipment defined" );
+
+// if ( equipmentType == "Engine" ) entity = new Engine();
+// else if ( equipmentType == "ECM" ) entity = new Ecm();
+// else if ( equipmentType == "Capacitor" ) entity = new Capacitor();
+// else {
+// log_->fatal( fileName + " has no type of equipment defined" );
+// return NULL;
+// }
+
+
+ Entity * entity;
+
+ //** Mandatory elements;
+ pElem = hRoot.ChildElement( "category_id", 0 ).Element();
+ if ( !pElem ) { //** fallback
+ pElem = hRoot.ChildElement( "categorie_id", 0 ).Element();
+ }
+
+ if ( pElem ) {
+ int category = toInt( pElem->FirstChild()->Value() );
+
+ switch( category ){
+ case 1: entity = new Commodity(); break;
+ case 2: entity = new PowerPlant(); break;
+ case 4: entity = new Capacitor(); break;
+ case 6: entity = new Engine(); break;
+ case 7: entity = new Shield(); break;
+ case 8: entity = new Radar(); break;
+ default:
+ log_->fatal( fileName + " category_id " + toStr( category ) + " unknown." );
+ return NULL;
+ }
+ } else {
+ log_->fatal( fileName + " has no category_id (mandatory)." );
return NULL;
}
//** Mandatory elements;
- pElem = hRoot.ChildElement( "name", 0 ).Element();
+ pElem = hRoot.ChildElement( "name_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ if ( !pElem ){ //** fallback to english
+ pElem = hRoot.ChildElement( "name_en", 0 ).Element();
+ }
if ( pElem ) {
entity->setName( pElem->FirstChild()->Value() );
} else {
- log_->fatal( fileName + " has no name (mandatory)." );
+ log_->fatal( fileName + " has no name_en (mandatory)." );
return NULL;
}
- pElem = hRoot.ChildElement( "faction", 0 ).Element();
+
+ pElem = hRoot.ChildElement( "faction_id", 0 ).Element();
if ( pElem ) {
- entity->setFactionName( pElem->FirstChild()->Value() );
+ entity->setFactionName( DeviceManager::getSingleton().factionName( toInt( pElem->FirstChild()->Value() ) ) );
} else {
- log_->fatal( fileName + " has no factionname (mandatory)." );
+ log_->fatal( fileName + " has no faction_id (mandatory)." );
return NULL;
}
+ //** Image name for the entity is derived from filename;
+ std::string basename( fileName.substr( fileName.rfind( "/" ) + 1 ) );
+ entity->setImageName( basename.substr( 0, basename.find( ".xml" ) ) + ".png" );
+
//** Generic elements
- pElem = hRoot.ChildElement( "class", 0 ).Element();
- if ( pElem ) entity->setClassName( pElem->FirstChild()->Value() );
+ pElem = hRoot.ChildElement( "class_id", 0 ).Element();
+ if ( pElem ) entity->setClassName( DeviceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
+ pElem = hRoot.ChildElement( "required_rank", 0 ).Element();
+ if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "size", 0 ).Element();
if ( pElem ) entity->setSize( toInt( pElem->FirstChild()->Value() ) );
pElem = hRoot.ChildElement( "mass", 0 ).Element();
if ( pElem ) entity->setMass( toInt( pElem->FirstChild()->Value() ) );
- pElem = hRoot.ChildElement( "description", 0 ).Element();
- if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
+ double efficiency = 1.0;
+ pElem = hRoot.ChildElement( "efficiency", 0 ).Element();
+ if ( pElem ) {
+ efficiency = toDouble( pElem->FirstChild()->Value() );
+ if ( efficiency > 1 ) efficiency /= 100;
+ }
- pElem = hRoot.ChildElement( "image", 0 ).Element();
- if ( pElem ) entity->setImageName( pElem->FirstChild()->Value() );
+ double powerConsumption = 0.0;
+ pElem = hRoot.ChildElement( "power_input", 0 ).Element();
+ if ( pElem ) powerConsumption = toDouble( pElem->FirstChild()->Value() );
+ pElem = hRoot.ChildElement( "description_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ if ( !pElem ){ //** fallback to english
+ pElem = hRoot.ChildElement( "description_en", 0 ).Element();
+ }
+ if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
//** Specific elements;
switch ( entity->entityType() ){
case POWERPLANT:
+ pElem = hRoot.ChildElement( "power_output", 0 ).Element();
+ if ( pElem ) dynamic_cast< PowerPlant * >( entity )->setPowerOutput( toDouble( pElem->FirstChild()->Value() ) );
break;
case ENGINE:
+ dynamic_cast< Engine * >( entity )->setEfficiency( efficiency );
break;
case RADAR:
+ dynamic_cast< Radar * >( entity )->setEfficiency( efficiency );
+ dynamic_cast< Radar * >( entity )->setPowerConsumption( powerConsumption );
+
+ pElem = hRoot.ChildElement( "maximum_range", 0 ).Element();
+ if ( pElem ) dynamic_cast< Radar * >( entity )->setMaximumRange( toDouble( pElem->FirstChild()->Value() ) );
+
break;
case ECM:
+ dynamic_cast< Ecm * >( entity )->setPowerConsumption( powerConsumption );
+
pElem = hRoot.ChildElement( "sensorlevel", 0 ).Element();
- if ( pElem ) static_cast<Ecm*>(entity)->setSensorLevel( toInt( pElem->FirstChild()->Value() ) );
+ if ( pElem ) dynamic_cast< Ecm * >( entity )->setSensorLevel( toInt( pElem->FirstChild()->Value() ) );
pElem = hRoot.ChildElement( "power", 0 ).Element();
- if ( pElem ) static_cast<Ecm*>(entity)->setPowerConsumption( toInt( pElem->FirstChild()->Value() ) );
+ if ( pElem ) dynamic_cast< Ecm * >( entity )->setPowerConsumption( toInt( pElem->FirstChild()->Value() ) );
break;
case CAPACITOR:
- pElem = hRoot.ChildElement( "efficiency", 0 ).Element();
- if ( pElem ) static_cast<Capacitor*>(entity)->setEfficiency( toInt( pElem->FirstChild()->Value() ) );
+ dynamic_cast< Capacitor * >( entity )->setEfficiency( efficiency );
pElem = hRoot.ChildElement( "capacity", 0 ).Element();
- if ( pElem ) static_cast<Capacitor*>(entity)->setCapacity( toInt( pElem->FirstChild()->Value() ) );
+ if ( pElem ) dynamic_cast< Capacitor * >( entity )->setCapacity( toInt( pElem->FirstChild()->Value() ) );
break;
case SHIELD:
+ dynamic_cast< Shield * >( entity )->setEfficiency( efficiency );
+
+ pElem = hRoot.ChildElement( "regeneration_rate", 0 ).Element();
+ if ( pElem ) dynamic_cast< Shield * >( entity )->setRegenerationRate( toInt( pElem->FirstChild()->Value() ) );
+ pElem = hRoot.ChildElement( "maximum_deflection", 0 ).Element();
+ if ( pElem ) dynamic_cast< Shield * >( entity )->setMaximumDeflection( toInt( pElem->FirstChild()->Value() ) );
+
break;
case GUN:
break;
@@ -196,7 +265,6 @@
break;
}
- //** Additonal elements;
//** Production Data;
std::set < std::string > productionCenters;
for ( pElem = hRoot.FirstChild( "production-center" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
@@ -226,7 +294,6 @@
templatesByID_[ id ] = entity;
factions_.insert( entity->factionName() );
- log_->info( std::string( "Loaded " ) + equipmentType + std::string( ": ") + entity->factionName() + "/" + entity->name() );
} else {
log_->warn( std::string( "Equipment with name: " ) + entity->factionName() + "/" + entity->name() +
" already loaded" );
@@ -256,6 +323,8 @@
Entity * CommodityManager::loadAndCreate( int id, const std::string & fileName ){
+ log_->info( "Read commodity: " + fileName );
+
TiXmlDocument doc( fileName );
bool loadOkay = doc.LoadFile();
@@ -265,10 +334,9 @@
}
TiXmlHandle docHandle( &doc );
- TiXmlElement* pElem;
+ TiXmlElement * pElem;
TiXmlHandle hRoot( 0 );
- //** block: equipment;
pElem = docHandle.FirstChildElement().Element();
hRoot = TiXmlHandle( pElem );
@@ -277,39 +345,64 @@
return NULL;
}
- if ( strcmp( "component", pElem->Value() ) != 0 ){
+ if ( strcmp( "component", pElem->Value() ) != 0 && strcmp( "container", pElem->Value() ) != 0 ){
log_->fatal( fileName + " is no commodity description" );
return NULL;
}
- Commodity *entity = new Commodity;
+ Commodity *entity;
- // Naming
- pElem = hRoot.ChildElement( "name_en", 0 ).Element();
+ //** Mandatory elements;
+ pElem = hRoot.ChildElement( "category_id", 0 ).Element();
+ if ( !pElem ) { //** fallback
+ pElem = hRoot.ChildElement( "categorie_id", 0 ).Element();
+ }
if ( pElem ) {
+ if ( toInt( pElem->FirstChild()->Value() ) == 1 ){
+ entity = new Commodity;
+ } else {
+ log_->warn( fileName + " category_id is not 1, so I set them to 1." );
+ entity = new Commodity;
+ }
+ } else {
+ log_->fatal( fileName + " has no category_id (mandatory)." );
+ return NULL;
+ }
+
+ pElem = hRoot.ChildElement( "name_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ if ( !pElem ){
+ //** Fallback to english
+ pElem = hRoot.ChildElement( "name_en", 0 ).Element();
+ }
+ if ( pElem ) {
entity->setName( pElem->FirstChild()->Value() );
} else {
- log_->fatal( fileName + " has no name (mandatory)." );
+ log_->fatal( fileName + " has no name_en (mandatory)." );
return NULL;
}
- // Generic Data
- pElem = hRoot.ChildElement( "class", 0 ).Element();
- if ( pElem ) entity->setClassName( pElem->FirstChild()->Value() );
+ //** Image name for the entity is derived from filename;
+ std::string basename( fileName.substr( fileName.rfind( "/" ) + 1 ) );
+ entity->setImageName( basename.substr( 0, basename.find( ".xml" ) ) + ".png" );
+
+ //** Generic data
+ pElem = hRoot.ChildElement( "class_id", 0 ).Element();
+ if ( pElem ) entity->setClassName( DeviceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
+
pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "size", 0 ).Element();
if ( pElem ) entity->setSize( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "mass", 0 ).Element();
if ( pElem ) entity->setMass( toInt( pElem->FirstChild()->Value() ) );
- // Additional Data
- pElem = hRoot.ChildElement( "description_en", 0 ).Element();
+ //** Additional Data
+ pElem = hRoot.ChildElement( "description_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
- pElem = hRoot.ChildElement( "image", 0 ).Element();
- if ( pElem ) entity->setImageName( pElem->FirstChild()->Value() );
-
- // Specific Data
+
+ //** Specific Data
pElem = hRoot.ChildElement( "id", 0 ).Element();
if ( pElem ) entity->setCommodityID( pElem->FirstChild()->Value() );
pElem = hRoot.ChildElement( "melting-point", 0 ).Element();
@@ -317,7 +410,7 @@
pElem = hRoot.ChildElement( "gravitic-sig", 0 ).Element();
if ( pElem ) entity->setGraviticSig( toFloat( pElem->FirstChild()->Value() ) );
- // Production Data
+ //** Production Data
std::set < std::string > productionCenters;
for ( pElem = hRoot.FirstChild( "production-center" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
productionCenters.insert( pElem->FirstChild()->Value() ); //!< \todo check return value!
@@ -331,7 +424,7 @@
templatesByID_[ id ] = entity;
factions_.insert( entity->factionName() );
- log_->info( std::string( "Loaded Commodity: " ) + entity->factionName() + "/" + entity->name() );
+// log_->info( std::string( "Loaded Commodity: " ) + entity->factionName() + "/" + entity->name() );
} else {
log_->warn( std::string( "Equipment with name: " ) + entity->factionName() + "/" + entity->name() +
" allready loaded" );
Modified: branches/ogsector/src/EntityManager.h
===================================================================
--- branches/ogsector/src/EntityManager.h 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/src/EntityManager.h 2007-06-04 23:14:31 UTC (rev 532)
@@ -122,7 +122,8 @@
virtual Entity * loadAndCreate( int id, const std::string & filename );
std::vector < Entity * > allByCategory( const std::string & category ){
- EntityType rtti = categoryType( category );
+ EntityType rtti;
+ if ( category != "All" ) rtti = categoryType( category );
std::vector < Entity * > items;
for ( std::map < std::string, Entity * >::iterator it = templatesByName_.begin(); it != templatesByName_.end(); it ++ ){
if ( ( category == "All" ) || ( it->second->entityType() == rtti ) ){
Modified: branches/ogsector/win32/ogsectorclient/commodities.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/commodities.xml 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/win32/ogsectorclient/commodities.xml 2007-06-04 23:14:31 UTC (rev 532)
@@ -1,23 +1,32 @@
<?xml version="1.0"?>
<commodities>
- <Resource id="1" location="../../../../trunk/data/commodities/aluminium.xml"/>
- <Resource id="2" location="../../../../trunk/data/commodities/antimony.xml"/>
- <Resource id="3" location="../../../../trunk/data/commodities/barium.xml"/>
- <Resource id="4" location="../../../../trunk/data/commodities/cesium.xml"/>
- <Resource id="5" location="../../../../trunk/data/commodities/chemicals.xml"/>
- <Resource id="6" location="../../../../trunk/data/commodities/chromium.xml"/>
- <Resource id="7" location="../../../../trunk/data/commodities/copper.xml"/>
- <Resource id="8" location="../../../../trunk/data/commodities/cpu.xml"/>
- <Resource id="9" location="../../../../trunk/data/commodities/fuel_cells.xml"/>
- <Resource id="10" location="../../../../trunk/data/commodities/gold.xml"/>
- <Resource id="11" location="../../../../trunk/data/commodities/helium.xml"/>
- <Resource id="12" location="../../../../trunk/data/commodities/iron.xml"/>
- <Resource id="12" location="../../../../trunk/data/commodities/laser_components.xml"/>
- <Resource id="13" location="../../../../trunk/data/commodities/medical_supplies.xml"/>
- <Resource id="14" location="../../../../trunk/data/commodities/nitrogen.xml"/>
- <Resource id="15" location="../../../../trunk/data/commodities/octavia_light.xml"/>
- <Resource id="16" location="../../../../trunk/data/commodities/rubber.xml"/>
- <Resource id="17" location="../../../../trunk/data/commodities/xenon.xml"/>
- <Resource id="18" location="../../../../trunk/data/commodities/ice.xml"/>
+ <Resource id="1" location="../../../../trunk/data/commodities/aluminium.xml"/>
+ <Resource id="2" location="../../../../trunk/data/commodities/ammunition.xml"/>
+ <Resource id="3" location="../../../../trunk/data/commodities/antimony.xml"/>
+ <Resource id="4" location="../../../../trunk/data/commodities/armor.xml"/>
+ <Resource id="5" location="../../../../trunk/data/commodities/barium.xml"/>
+ <Resource id="6" location="../../../../trunk/data/commodities/cesium.xml"/>
+ <Resource id="7" location="../../../../trunk/data/commodities/chemicals.xml"/>
+ <Resource id="8" location="../../../../trunk/data/commodities/chromium.xml"/>
+ <Resource id="9" location="../../../../trunk/data/commodities/conflux_biomass.xml"/>
+ <Resource id="10" location="../../../../trunk/data/commodities/copper.xml"/>
+ <Resource id="11" location="../../../../trunk/data/commodities/cpu.xml"/>
+ <Resource id="12" location="../../../../trunk/data/commodities/fuel_cells.xml"/>
+ <Resource id="13" location="../../../../trunk/data/commodities/gold.xml"/>
+ <Resource id="14" location="../../../../trunk/data/commodities/helium.xml"/>
+ <Resource id="15" location="../../../../trunk/data/commodities/ice.xml"/>
+ <Resource id="16" location="../../../../trunk/data/commodities/iron.xml"/>
+ <Resource id="17" location="../../../../trunk/data/commodities/laser_components.xml"/>
+ <Resource id="18" location="../../../../trunk/data/commodities/magnetic_components.xml"/>
+ <Resource id="19" location="../../../../trunk/data/commodities/manufactured_foods.xml"/>
+ <Resource id="20" location="../../../../trunk/data/commodities/medical_supplies.xml"/>
+ <Resource id="21" location="../../../../trunk/data/commodities/nitrogen.xml"/>
+ <Resource id="22" location="../../../../trunk/data/commodities/octavia_light.xml"/>
+ <Resource id="23" location="../../../../trunk/data/commodities/organic_foods.xml"/>
+ <Resource id="24" location="../../../../trunk/data/commodities/plutonium.xml"/>
+ <Resource id="26" location="../../../../trunk/data/commodities/rubber.xml"/>
+ <Resource id="27" location="../../../../trunk/data/commodities/tauseti_flashback.xml"/>
+ <Resource id="28" location="../../../../trunk/data/commodities/water.xml"/>
+ <Resource id="29" location="../../../../trunk/data/commodities/xenon.xml"/>
</commodities>
Added: branches/ogsector/win32/ogsectorclient/equipment.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/equipment.xml (rev 0)
+++ branches/ogsector/win32/ogsectorclient/equipment.xml 2007-06-04 23:14:31 UTC (rev 532)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<equipment>
+ <Resource id="1" location="../../../../trunk/data/engines/money.xml" />
+ <Resource id="2" location="../../../../trunk/data/engines/t-e-15.xml" />
+ <Resource id="3" location="../../../../trunk/data/power_plants/contender.xml" />
+ <Resource id="4" location="../../../../trunk/data/power_plants/contender_xl.xml" />
+ <Resource id="5" location="../../../../trunk/data/power_plants/contender_xpr.xml" />
+ <Resource id="6" location="../../../../trunk/data/power_plants/gatherer.xml" />
+ <Resource id="7" location="../../../../trunk/data/power_plants/spud.xml" />
+ <Resource id="8" location="../../../../trunk/data/capacitors/deepol.xml" />
+ <Resource id="9" location="../../../../trunk/data/capacitors/mantra.xml" />
+ <Resource id="10" location="../../../../trunk/data/capacitors/outlet.xml" />
+ <Resource id="12" location="../../../../trunk/data/capacitors/sponge.xml" />
+ <Resource id="13" location="../../../../trunk/data/capacitors/summoner.xml" />
+ <Resource id="14" location="../../../../trunk/data/capacitors/t-c-15.xml" />
+ <Resource id="15" location="../../../../trunk/data/capacitors/tank.xml" />
+ <Resource id="16" location="../../../../trunk/data/ECMs/ghost.xml" />
+ <Resource id="17" location="../../../../trunk/data/radars/cyclops.xml" />
+ <Resource id="18" location="../../../../trunk/data/radars/hall_monitor.xml" />
+ <Resource id="19" location="../../../../trunk/data/radars/outlook.xml" />
+ <Resource id="20" location="../../../../trunk/data/radars/t-r-9.xml" />
+ <Resource id="21" location="../../../../trunk/data/shields/alpaa.xml" />
+ <Resource id="22" location="../../../../trunk/data/shields/flatiron.xml" />
+ <Resource id="23" location="../../../../trunk/data/shields/himelea.xml" />
+ <Resource id="24" location="../../../../trunk/data/shields/kydango.xml" />
+ <Resource id="25" location="../../../../trunk/data/shields/pod.xml" />
+ <Resource id="26" location="../../../../trunk/data/shields/shelter.xml" />
+ <Resource id="27" location="../../../../trunk/data/shields/t-s-13.xml" />
+</equipment>
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-04 22:43:21 UTC (rev 531)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-04 23:14:31 UTC (rev 532)
@@ -18,3 +18,9 @@
FileSystem=../../../../trunk/data/ships/octavius/apteryx
FileSystem=../../../../trunk/data/ships/quantar/storm
FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
+FileSystem=../../../../trunk/data/capacitors
+FileSystem=../..././../trunk/data/engines
+FileSystem=../../../../trunk/data/radars
+FileSystem=../../../../trunk/data/shields
+FileSystem=../../../../trunk/data/ECMs
+FileSystem=../../../../trunk/data/power_plants
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
