Menu
▾
▴
opengate-svn — List for Subversion commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
| 2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ult...@us...> - 2007-06-12 03:50:10
|
Revision: 551
http://svn.sourceforge.net/opengate/?rev=551&view=rev
Author: ultrasick
Date: 2007-06-11 20:50:11 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
uploading radar: knocker
Added Paths:
-----------
trunk/data/radars/knocker.blend
trunk/data/radars/knocker.xml
Added: trunk/data/radars/knocker.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/knocker.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/knocker.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/knocker.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-10 20:18:03
|
Revision: 550
http://svn.sourceforge.net/opengate/?rev=550&view=rev
Author: ultrasick
Date: 2007-06-10 13:18:02 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
removing old unnecessary files
Removed Paths:
-------------
trunk/data/misc/asteroids/asteroid1.blend
trunk/data/misc/asteroids/asteroid1.mesh
trunk/data/misc/asteroids/asteroid_normal.png
trunk/data/misc/asteroids/asteroids.material
Deleted: trunk/data/misc/asteroids/asteroid1.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/asteroid1.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/asteroid_normal.png
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/asteroids.material
===================================================================
--- trunk/data/misc/asteroids/asteroids.material 2007-06-10 20:17:25 UTC (rev 549)
+++ trunk/data/misc/asteroids/asteroids.material 2007-06-10 20:18:02 UTC (rev 550)
@@ -1,25 +0,0 @@
-material asteroid/TEXFACE/asteroid_normal.png
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture asteroid_normal.png
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-10 20:17:23
|
Revision: 549
http://svn.sourceforge.net/opengate/?rev=549&view=rev
Author: ultrasick
Date: 2007-06-10 13:17:25 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
uploading 5 normal oval asteroids and 5 ice asteroids (also oval shape)
Added Paths:
-----------
trunk/data/misc/asteroids/ice_oval.material
trunk/data/misc/asteroids/ice_oval.png
trunk/data/misc/asteroids/ice_oval_10.mesh
trunk/data/misc/asteroids/ice_oval_6.mesh
trunk/data/misc/asteroids/ice_oval_7.mesh
trunk/data/misc/asteroids/ice_oval_8.mesh
trunk/data/misc/asteroids/ice_oval_9.mesh
trunk/data/misc/asteroids/normal_oval.material
trunk/data/misc/asteroids/normal_oval.png
trunk/data/misc/asteroids/normal_oval_1.mesh
trunk/data/misc/asteroids/normal_oval_2.mesh
trunk/data/misc/asteroids/normal_oval_3.mesh
trunk/data/misc/asteroids/normal_oval_4.mesh
trunk/data/misc/asteroids/normal_oval_5.mesh
Added: trunk/data/misc/asteroids/ice_oval.material
===================================================================
--- trunk/data/misc/asteroids/ice_oval.material (rev 0)
+++ trunk/data/misc/asteroids/ice_oval.material 2007-06-10 20:17:25 UTC (rev 549)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/ice_oval.png
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture ice_oval.png
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Property changes on: trunk/data/misc/asteroids/ice_oval.material
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/misc/asteroids/ice_oval.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/ice_oval_10.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval_10.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/ice_oval_6.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval_6.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/ice_oval_7.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval_7.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/ice_oval_8.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval_8.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/ice_oval_9.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/ice_oval_9.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval.material
===================================================================
--- trunk/data/misc/asteroids/normal_oval.material (rev 0)
+++ trunk/data/misc/asteroids/normal_oval.material 2007-06-10 20:17:25 UTC (rev 549)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/normal_oval.png
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture normal_oval.png
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Property changes on: trunk/data/misc/asteroids/normal_oval.material
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/misc/asteroids/normal_oval.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval_1.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval_1.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval_2.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval_2.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval_3.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval_3.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval_4.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval_4.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/normal_oval_5.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/normal_oval_5.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-10 17:30:50
|
Revision: 548
http://svn.sourceforge.net/opengate/?rev=548&view=rev
Author: ultrasick
Date: 2007-06-10 10:30:51 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
uploading quantar rank matrix
Modified Paths:
--------------
trunk/data/rankings/quantar.xml
Modified: trunk/data/rankings/quantar.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 22:40:34
|
Revision: 547
http://svn.sourceforge.net/opengate/?rev=547&view=rev
Author: ultrasick
Date: 2007-06-06 15:40:36 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
moved the hud template to the templates directory
+ activated anti aliassing for the top and the bottom part of the green border of the HUD
Modified Paths:
--------------
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.png
Added Paths:
-----------
trunk/templates/data/GUI/undocked/HUD/
trunk/templates/data/GUI/undocked/HUD/default.odg
Removed Paths:
-------------
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.odg
Deleted: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.odg
===================================================================
(Binary files differ)
Modified: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.png
===================================================================
(Binary files differ)
Added: trunk/templates/data/GUI/undocked/HUD/default.odg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/GUI/undocked/HUD/default.odg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 20:20:49
|
Revision: 546
http://svn.sourceforge.net/opengate/?rev=546&view=rev
Author: spom_spom
Date: 2007-06-06 13:20:51 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 20:17:23
|
Revision: 545
http://svn.sourceforge.net/opengate/?rev=545&view=rev
Author: spom_spom
Date: 2007-06-06 13:17:16 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
add object_id to apti and storm
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 20:00:40 UTC (rev 544)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 20:17:16 UTC (rev 545)
@@ -4,6 +4,7 @@
<!-- Naming -->
<faction>octavius</faction>
<faction_id>3</faction_id>
+ <object_id>1</object_id>
<name>apteryx</name>
<!-- Generic Data -->
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-06-06 20:00:40 UTC (rev 544)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-06-06 20:17:16 UTC (rev 545)
@@ -2,8 +2,9 @@
<ship>
<!-- Naming -->
- <faction_id>4</faction_id>
- <name>storm</name>
+ <faction_id>2</faction_id>
+ <object_id>2</object_id>
+ <name>storm</name>
<!-- Generic Data -->
<class>Mining Trainer</class>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 20:00:39
|
Revision: 544
http://svn.sourceforge.net/opengate/?rev=544&view=rev
Author: spom_spom
Date: 2007-06-06 13:00:40 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removed: equipment.xml, commodities.xml, ship.xml the resources will be collect automatically
Modified Paths:
--------------
branches/ogsector/resources.cfg
branches/ogsector/src/BaseDialog.h
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/EntityManager.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/VesselManager.cpp
branches/ogsector/src/VesselManager.h
Removed Paths:
-------------
branches/ogsector/data/commodities.xml
branches/ogsector/data/equipment.xml
branches/ogsector/data/ships.xml
branches/ogsector/win32/ogsectorclient/commodities.xml
branches/ogsector/win32/ogsectorclient/equipment.xml
branches/ogsector/win32/ogsectorclient/ships.xml
Deleted: branches/ogsector/data/commodities.xml
===================================================================
--- branches/ogsector/data/commodities.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/data/commodities.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<commodities>
- <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>
Deleted: branches/ogsector/data/equipment.xml
===================================================================
--- branches/ogsector/data/equipment.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/data/equipment.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,32 +0,0 @@
-<?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" />
- <Resource id="28" location="../../trunk/data/power_plants/t-p-16.xml" />
- <Resource id="29" location="../../trunk/data/radars/night_watchman.xml" />
-</equipment>
Deleted: branches/ogsector/data/ships.xml
===================================================================
--- branches/ogsector/data/ships.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/data/ships.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<ships>
- <Resource id="1" location="./data/ships/squadrok/squid/squid.xml"/>
- <Resource id="2" location="../../trunk/data/ships/octavius/apteryx/apteryx.xml" />
- <Resource id="3" location="../../trunk/data/ships/quantar/storm/storm.xml" />
- <Resource id="4" location="../../trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml" />
-</ships>
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/resources.cfg 2007-06-06 20:00:40 UTC (rev 544)
@@ -4,6 +4,21 @@
# Resource locations to be added to the default path
[General]
+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
+FileSystem=../../trunk/data/stations/tauseti
+#FileSystem=../../trunk/data/GUI
+#FileSystem=../../trunk/data/client/data1.x/
+#FileSystem=../../trunk/data/client/data1.x/GUI
FileSystem=./data
FileSystem=./data/materials
FileSystem=./data/textures
@@ -20,18 +35,4 @@
FileSystem=./data/MediaFromOgre
#FileSystem=./data/MediaFromOgre/AdvancedMaterials/
#
-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
-FileSystem=../../trunk/data/stations/tauseti
-#FileSystem=../../trunk/data/GUI
-#FileSystem=../../trunk/data/client/data1.x/
-#FileSystem=../../trunk/data/client/data1.x/GUI
+
Modified: branches/ogsector/src/BaseDialog.h
===================================================================
--- branches/ogsector/src/BaseDialog.h 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/BaseDialog.h 2007-06-06 20:00:40 UTC (rev 544)
@@ -65,8 +65,8 @@
protected:
+ CEGUI::Window * rootWindow_;
DeviceManager * devices_;
- CEGUI::Window * rootWindow_;
bool visible_;
Modified: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/DeviceManager.h 2007-06-06 20:00:40 UTC (rev 544)
@@ -69,13 +69,12 @@
std::string factionName( int id ) const {
switch( id ){
case 0: return "neutral";
- case 1: return "neutral";
- case 2: return "tauseti";
+ case 1: return "tauseti";
+ case 2: return "quantar";
case 3: return "octavius";
- case 4: return "quantar";
- case 5: return "squadrok";
+ case 4: return "squadrok";
+ case 5: return "amanath";
case 6: return "hyperial";
- case 7: return "amanath";
}
return "unknown";
}
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/EntityManager.cpp 2007-06-06 20:00:40 UTC (rev 544)
@@ -21,6 +21,10 @@
#include "EntityManager.h"
#include "DeviceManager.h"
#include "tinyxml/tinyxml.h"
+#include <OgreArchive.h>
+#include <OgreArchiveManager.h>
+#include <OgreFileSystem.h>
+#include <OgreSharedPtr.h>
namespace OpenGate {
@@ -33,39 +37,48 @@
void EntityManager::load( const std::set < std::string > & resourcePaths, const std::string & resourceName ){
- for ( std::set < std::string >::iterator it = resourcePaths.begin(); it != resourcePaths.end(); it ++ ){
- std::string resourceFile( (*it) + "/" + resourceName );
+ Ogre::FileSystemArchive * pArch = new Ogre::FileSystemArchive( (*resourcePaths.begin()) + "/" + resourceName, "FileSystem" );
- TiXmlDocument doc( resourceFile );
- bool loadOkay = doc.LoadFile();
+ Ogre::StringVectorPtr files = pArch->find( "*.xml", true, false);
+ for ( int i = 0; i < (*files).size(); i ++ ){
+ log_->info( std::string( "Found ressource: " ) + (*files)[ i ] );
+ loadAndCreate( (*resourcePaths.begin()) + "/" + resourceName + "/" + (*files)[ i ] );
+ }
- std::map < int, std::string > entities;
+ delete pArch;
+// for ( std::set < std::string >::iterator it = resourcePaths.begin(); it != resourcePaths.end(); it ++ ){
+// std::string resourceFile( (*it) + "/" + resourceName );
- if ( loadOkay ) {
- log_->info( std::string( "open resource file: ") + resourceFile );
- TiXmlHandle docHandle( &doc );
- TiXmlElement* pElem;
- TiXmlHandle hRoot( 0 );
+// TiXmlDocument doc( resourceFile );
+// bool loadOkay = doc.LoadFile();
- pElem = docHandle.FirstChildElement().Element();
- hRoot = TiXmlHandle( pElem );
+// std::map < int, std::string > entities;
+
+// if ( loadOkay ) {
+// log_->info( std::string( "open resource file: ") + resourceFile );
+// TiXmlHandle docHandle( &doc );
+// TiXmlElement* pElem;
+// TiXmlHandle hRoot( 0 );
+
+// 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");
- }
- } else {
- log_->fatal( resourceFile + " cannot read first node." );
- }
- } else {
- // log_->info( resourceFile + " cannot open resourceFile." );
- }
+// 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." );
+// }
+// } 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 );
- }
- }
+// for ( std::map < int, std::string >::iterator it = entities.begin(); it != entities.end(); it ++ ){
+// loadAndCreate( it->first, it->second );
+// }
+// }
}
template<> EquipmentManager * Ogre::Singleton< EquipmentManager >::ms_Singleton = 0;
@@ -88,9 +101,9 @@
return ms_Singleton;
}
-Entity * EquipmentManager::loadAndCreate( int id, const std::string & fileName ){
+Entity * EquipmentManager::loadAndCreate( const std::string & fileName ){
- log_->info( "Read equipment: " + fileName );
+ log_->info( "Read equipment: " + fileName );
TiXmlDocument doc( fileName );
bool loadOkay = doc.LoadFile();
@@ -169,6 +182,15 @@
return NULL;
}
+ pElem = hRoot.ChildElement( "object_id", 0 ).Element();
+ if ( pElem ) {
+ entity->setID( toInt( pElem->FirstChild()->Value() ) );
+ } else {
+ log_->fatal( fileName + " has no object_id (mandatory)." );
+ return NULL;
+ }
+
+
pElem = hRoot.ChildElement( "faction_id", 0 ).Element();
if ( pElem ) {
entity->setFactionID( toInt( pElem->FirstChild()->Value() ) );
@@ -295,9 +317,8 @@
entity->setRequieredComponents( commodities );
if ( templatesByName_.count( entity->name() ) == 0 ){
- entity->setID( id );
templatesByName_[ entity->name() ] = entity;
- templatesByID_[ id ] = entity;
+ templatesByID_[ entity->id() ] = entity;
factions_.insert( entity->factionName() );
} else {
@@ -327,7 +348,7 @@
return ms_Singleton;
}
-Entity * CommodityManager::loadAndCreate( int id, const std::string & fileName ){
+Entity * CommodityManager::loadAndCreate( const std::string & fileName ){
log_->info( "Read commodity: " + fileName );
@@ -387,6 +408,15 @@
return NULL;
}
+ pElem = hRoot.ChildElement( "object_id", 0 ).Element();
+ if ( pElem ) {
+ entity->setID( toInt( pElem->FirstChild()->Value() ) );
+ } else {
+ log_->fatal( fileName + " has no object_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" ) ) );
@@ -428,9 +458,8 @@
//! \todo Add required components
if ( templatesByName_.count( entity->name() ) == 0 ){
- entity->setID( id );
templatesByName_[ entity->name() ] = entity;
- templatesByID_[ id ] = entity;
+ templatesByID_[ entity->id() ] = entity;
factions_.insert( entity->factionName() );
// log_->info( std::string( "Loaded Commodity: " ) + entity->factionName() + "/" + entity->name() );
Modified: branches/ogsector/src/EntityManager.h
===================================================================
--- branches/ogsector/src/EntityManager.h 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/EntityManager.h 2007-06-06 20:00:40 UTC (rev 544)
@@ -82,7 +82,7 @@
* \param filename The filename we load from the places-file. It's the
* filename of the defintion file.
*/
- virtual Entity * loadAndCreate( int id, const std::string & filename ) = 0;
+ virtual Entity * loadAndCreate( const std::string & filename ) = 0;
EntityManager() {
log_ = LogManager::getSingletonPtr();
@@ -119,7 +119,7 @@
/*! Destructor that free's all loaded vessels */
virtual ~EquipmentManager();
- virtual Entity * loadAndCreate( int id, const std::string & filename );
+ virtual Entity * loadAndCreate( const std::string & filename );
std::vector < Entity * > allByCategory( const std::string & category ){
EntityType rtti;
@@ -155,7 +155,7 @@
/*! Destructor that free's all loaded vessels */
virtual ~CommodityManager();
- virtual Entity * loadAndCreate( int id, const std::string & filename );
+ virtual Entity * loadAndCreate( const std::string & filename );
/*! This returns a commodity by it's given name \remarks The commodity needs to be loaded before \param commodityName The name of a commodity */
Commodity * findByName( const std::string & commodityName ){
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/GameStateManager.cpp 2007-06-06 20:00:40 UTC (rev 544)
@@ -316,13 +316,17 @@
devices_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." );
vesselManager_ = new VesselManager( );
- vesselManager_->load( resourcePaths_, "ships.xml" );
+ vesselManager_->load( resourcePaths_, "ships" );
commodityManager_ = new CommodityManager( );
- commodityManager_->load( resourcePaths_, "commodities.xml" );
+ commodityManager_->load( resourcePaths_, "commodities" );
equipmentManager_ = new EquipmentManager( );
- equipmentManager_->load( resourcePaths_, "equipment.xml" );
+ equipmentManager_->load( resourcePaths_, "engines" );
+ equipmentManager_->load( resourcePaths_, "capacitors" );
+ equipmentManager_->load( resourcePaths_, "radars" );
+ equipmentManager_->load( resourcePaths_, "shields" );
+ equipmentManager_->load( resourcePaths_, "power_plants" );
devices_.gameStateRoot = this;
Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/MarketDialog.cpp 2007-06-06 20:00:40 UTC (rev 544)
@@ -316,7 +316,6 @@
categoryIcon = CEGUI::String("set:opengate image:Icon" +
DeviceManager::getSingleton().categoryName( item->entityType() ) +
toStr( item->factionID() ) );
- std::cout <<categoryIcon<< std::endl;
}
win->setUserData( item );
win->setProperty( "Text", name );
Modified: branches/ogsector/src/VesselManager.cpp
===================================================================
--- branches/ogsector/src/VesselManager.cpp 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/VesselManager.cpp 2007-06-06 20:00:40 UTC (rev 544)
@@ -33,7 +33,7 @@
VesselManager::~VesselManager(){
}
-Entity * VesselManager::loadAndCreate( int vesselID, const std::string & fileName ){
+Entity * VesselManager::loadAndCreate( const std::string & fileName ){
TiXmlDocument doc( fileName );
bool loadOkay = doc.LoadFile();
@@ -77,6 +77,13 @@
log_->fatal( fileName + " has no name (mandatory)." );
return NULL;
}
+ pElem = hRoot.ChildElement( "object_id", 0 ).Element();
+ if ( pElem ) {
+ vessel->setID( toInt( pElem->FirstChild()->Value() ) );
+ } else {
+ log_->fatal( fileName + " has no object_id (mandatory)." );
+ return NULL;
+ }
pElem = hRoot.ChildElement( "class", 0 ).Element();
if ( pElem ) vessel->setClassName( pElem->FirstChild()->Value() );
@@ -141,9 +148,8 @@
}
if ( templatesByName_.count( vessel->name() ) == 0 ){
- vessel->setID( vesselID );
templatesByName_[ vessel->name() ] = vessel;
- templatesByID_[ vesselID ] = vessel;
+ templatesByID_[ vessel->id() ] = vessel;
factions_.insert( vessel->factionName() );
log_->info( std::string( "Loaded: " ) + vessel->factionName() + "/" + vessel->name() );
Modified: branches/ogsector/src/VesselManager.h
===================================================================
--- branches/ogsector/src/VesselManager.h 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/src/VesselManager.h 2007-06-06 20:00:40 UTC (rev 544)
@@ -59,7 +59,7 @@
/*! Destructor that free's all loaded vessels */
virtual ~VesselManager();
- virtual Entity * loadAndCreate( int id, const std::string & filename );
+ virtual Entity * loadAndCreate( const std::string & filename );
/*! This returns a vessel by it's given unique ID \remarks The vessel needs to be loaded before \param vesselID The unique ID of a vessel */
Vessel * vessel( int vesselID ){
Deleted: branches/ogsector/win32/ogsectorclient/commodities.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/commodities.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/win32/ogsectorclient/commodities.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<commodities>
- <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>
Deleted: branches/ogsector/win32/ogsectorclient/equipment.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/equipment.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/win32/ogsectorclient/equipment.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,32 +0,0 @@
-<?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" />
- <Resource id="28" location="../../../../trunk/data/power_plants/t-p-16.xml" />
- <Resource id="29" location="../../../../trunk/data/radars/night_watchman.xml" />
-</equipment>
Deleted: branches/ogsector/win32/ogsectorclient/ships.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/ships.xml 2007-06-06 19:04:27 UTC (rev 543)
+++ branches/ogsector/win32/ogsectorclient/ships.xml 2007-06-06 20:00:40 UTC (rev 544)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<ships>
- <Resource id="1" location="../../data/ships/squadrok/squid/squid.xml"/>
- <Resource id="2" location="../../../../trunk/data/ships/octavius/apteryx/apteryx.xml" />
- <Resource id="3" location="../../../../trunk/data/ships/quantar/storm/storm.xml" />
- <Resource id="4" location="../../../../trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml" />
-</ships>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 19:04:31
|
Revision: 543
http://svn.sourceforge.net/opengate/?rev=543&view=rev
Author: ultrasick
Date: 2007-06-06 12:04:27 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
adding object_id to the xml files
+ moving the stations from data/stations/tauseti to data/stations because they have the faction name in their name anyway
Modified Paths:
--------------
trunk/data/capacitors/deepol.xml
trunk/data/capacitors/mantra.xml
trunk/data/capacitors/outlet.xml
trunk/data/capacitors/sponge.xml
trunk/data/capacitors/summoner.xml
trunk/data/capacitors/t-c-15.xml
trunk/data/capacitors/tank.xml
trunk/data/commodities/aluminium.xml
trunk/data/commodities/ammunition.xml
trunk/data/commodities/antimony.xml
trunk/data/commodities/armor.xml
trunk/data/commodities/barium.xml
trunk/data/commodities/cesium.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/chromium.xml
trunk/data/commodities/conflux_biomass.xml
trunk/data/commodities/copper.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/gold.xml
trunk/data/commodities/helium.xml
trunk/data/commodities/ice.xml
trunk/data/commodities/iron.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/magnetic_components.xml
trunk/data/commodities/manufactured_foods.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/nitrogen.xml
trunk/data/commodities/octavia_light.xml
trunk/data/commodities/organic_foods.xml
trunk/data/commodities/plutonium.xml
trunk/data/commodities/rubber.xml
trunk/data/commodities/tauseti_flashback.xml
trunk/data/commodities/water.xml
trunk/data/commodities/xenon.xml
trunk/data/engines/money.xml
trunk/data/engines/t-e-15.xml
trunk/data/power_plants/contender.xml
trunk/data/power_plants/contender_xl.xml
trunk/data/power_plants/contender_xpr.xml
trunk/data/power_plants/gatherer.xml
trunk/data/power_plants/spud.xml
trunk/data/power_plants/t-p-16.xml
trunk/data/radars/cyclops.xml
trunk/data/radars/hall_monitor.xml
trunk/data/radars/night_watchman.xml
trunk/data/radars/outlook.xml
trunk/data/radars/t-r-9.xml
trunk/data/rankings/octavius.xml
trunk/data/rankings/tauseti.xml
trunk/data/shields/alpaa.xml
trunk/data/shields/flatiron.xml
trunk/data/shields/himelea.xml
trunk/data/shields/kydango.xml
trunk/data/shields/pod.xml
trunk/data/shields/shelter.xml
trunk/data/shields/t-s-13.xml
trunk/data/ships/squadrok/squid/s-1.xml
trunk/data/ships/squadrok/squid/s-2.xml
trunk/data/ships/squadrok/squid/s-3.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
Added Paths:
-----------
trunk/data/stations/tauseti_core.blend
trunk/data/stations/tauseti_wake.blend
trunk/data/stations/tauseti_wake.xml
Removed Paths:
-------------
trunk/data/stations/tauseti/
Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/t-p-16.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)
Modified: trunk/data/rankings/octavius.xml
===================================================================
(Binary files differ)
Modified: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)
Added: trunk/data/stations/tauseti_core.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_core.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_wake.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/tauseti_wake.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_wake.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 17:40:09
|
Revision: 542
http://svn.sourceforge.net/opengate/?rev=542&view=rev
Author: ultrasick
Date: 2007-06-06 10:40:09 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
uploading new image format
Modified Paths:
--------------
trunk/data/capacitors/deepol.blend
trunk/data/capacitors/mantra.blend
trunk/data/capacitors/outlet.blend
trunk/data/capacitors/sponge.blend
trunk/data/capacitors/summoner.blend
trunk/data/capacitors/t-c-15.blend
trunk/data/capacitors/tank.blend
Added Paths:
-----------
trunk/data/capacitors/deepol_290x290.png
trunk/data/capacitors/deepol_76x76.png
trunk/data/capacitors/mantra_290x290.png
trunk/data/capacitors/mantra_76x76.png
trunk/data/capacitors/outlet_290x290.png
trunk/data/capacitors/outlet_76x76.png
trunk/data/capacitors/sponge_290x290.png
trunk/data/capacitors/sponge_76x76.png
trunk/data/capacitors/summoner_290x290.png
trunk/data/capacitors/summoner_76x76.png
trunk/data/capacitors/t-c-15_290x290.png
trunk/data/capacitors/t-c-15_76x76.png
trunk/data/capacitors/tank_290x290.png
trunk/data/capacitors/tank_76x76.png
Removed Paths:
-------------
trunk/data/capacitors/deepol.png
trunk/data/capacitors/mantra.png
trunk/data/capacitors/outlet.png
trunk/data/capacitors/sponge.png
trunk/data/capacitors/summoner.png
trunk/data/capacitors/t-c-15.png
trunk/data/capacitors/tank.png
Modified: trunk/data/capacitors/deepol.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/deepol.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/deepol_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/deepol_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/deepol_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/deepol_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/mantra.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/mantra.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/mantra_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/mantra_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/mantra_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/mantra_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/outlet.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/outlet.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/outlet_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/outlet_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/outlet_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/outlet_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/sponge.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/sponge.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/sponge_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/sponge_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/sponge_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/sponge_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/summoner.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/summoner.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/summoner_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/summoner_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/summoner_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/summoner_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/t-c-15.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/t-c-15.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/t-c-15_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/t-c-15_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/t-c-15_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/t-c-15_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/capacitors/tank.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/tank.png
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/tank_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/tank_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/tank_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/tank_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 17:25:09
|
Revision: 541
http://svn.sourceforge.net/opengate/?rev=541&view=rev
Author: spom_spom
Date: 2007-06-06 10:25:10 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-06 17:23:19 UTC (rev 540)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-06 17:25:10 UTC (rev 541)
@@ -18,7 +18,7 @@
FileSystem=../../../../trunk/data/ships/octavius/apteryx
FileSystem=../../../../trunk/data/ships/quantar/storm
FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
-FileSystem=../.././../trunk/data/engines
+FileSystem=../../../../trunk/data/engines
FileSystem=../../../../trunk/data/capacitors
FileSystem=../../../../trunk/data/radars
FileSystem=../../../../trunk/data/shields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 17:23:17
|
Revision: 540
http://svn.sourceforge.net/opengate/?rev=540&view=rev
Author: spom_spom
Date: 2007-06-06 10:23:19 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 17:15:33 UTC (rev 539)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 17:23:19 UTC (rev 540)
@@ -3,6 +3,7 @@
<ship>
<!-- Naming -->
<faction>octavius</faction>
+ <faction_id>3</faction_id>
<name>apteryx</name>
<!-- Generic Data -->
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-06-06 17:15:33 UTC (rev 539)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-06-06 17:23:19 UTC (rev 540)
@@ -2,7 +2,7 @@
<ship>
<!-- Naming -->
- <faction>quantar</faction>
+ <faction_id>4</faction_id>
<name>storm</name>
<!-- Generic Data -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 17:15:33
|
Revision: 539
http://svn.sourceforge.net/opengate/?rev=539&view=rev
Author: ultrasick
Date: 2007-06-06 10:15:33 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removing because unnecessary. the rankings are now beeing save in tauseti.xml
Removed Paths:
-------------
trunk/data/rankings/tauseti/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 16:59:51
|
Revision: 538
http://svn.sourceforge.net/opengate/?rev=538&view=rev
Author: spom_spom
Date: 2007-06-06 09:59:51 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Add support for new image fileformat
Modified Paths:
--------------
branches/ogsector/data/equipment.xml
branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
branches/ogsector/data/gui/schemes/opengate/opengate.imageset
branches/ogsector/data/gui/schemes/opengate/opengate.png
branches/ogsector/src/Avatar.cpp
branches/ogsector/src/Console.cpp
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/Entity.cpp
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/VesselManager.cpp
branches/ogsector/win32/ogsectorclient/equipment.xml
Modified: branches/ogsector/data/equipment.xml
===================================================================
--- branches/ogsector/data/equipment.xml 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/data/equipment.xml 2007-06-06 16:59:51 UTC (rev 538)
@@ -27,4 +27,6 @@
<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" />
+ <Resource id="28" location="../../trunk/data/power_plants/t-p-16.xml" />
+ <Resource id="29" location="../../trunk/data/radars/night_watchman.xml" />
</equipment>
Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-06 16:59:51 UTC (rev 538)
@@ -45,13 +45,13 @@
</Window>
<Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Image">
<!-- Filled within game -->
- <Property Name="UnifiedPosition" Value="{{0.0, 20},{0.5, -120}}" />
- <Property Name="UnifiedSize" Value="{{0.0, 250},{0.0, 240}}" />
+ <Property Name="UnifiedPosition" Value="{{0.0, 20},{0.5, -145}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 290},{0.0, 290}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
</Window>
<Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/TextFrame">
- <Property Name="UnifiedPosition" Value="{{0.0, 290},{0.5, -120}}" />
+ <Property Name="UnifiedPosition" Value="{{0.0, 330},{0.5, -120}}" />
<Property Name="UnifiedSize" Value="{{0.0, 250},{0.0, 240}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
@@ -438,63 +438,133 @@
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,27}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Commodities" />
- <Window Type="opengate/StaticImage" Name="CategorieCom">
+ <Window Type="opengate/StaticImage" Name="CategorieCommodityIcon">
<Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
<Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:IconCommoditiesNormal" />
+ <Property Name="Image" Value="set:opengate image:IconCommodityNormal" />
</Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategoriePowerPlants">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,56}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Power Plants" />
+ <Window Type="opengate/StaticImage" Name="CategoriePowerplantIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconPowerplantNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieEngines">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,85}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Engines" />
+ <Window Type="opengate/StaticImage" Name="CategorieEngineIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconEngineNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieRadars">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,114}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Radars" />
+ <Window Type="opengate/StaticImage" Name="CategorieRadarIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconRadarNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieECM">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,143}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="ECM" />
+ <Window Type="opengate/StaticImage" Name="CategorieECMIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconECMNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieCapacitors">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,172}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Capacitors" />
+ <Window Type="opengate/StaticImage" Name="CategorieCapacitorIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconCapacitorNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieShields">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,201}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Shields" />
+ <Window Type="opengate/StaticImage" Name="CategorieShieldIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconShieldNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieGuns">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,230}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Guns" />
+ <Window Type="opengate/StaticImage" Name="CategorieGunIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconGunNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieMissiles">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,259}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="Missiles" />
+ <Window Type="opengate/StaticImage" Name="CategorieMissileIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconMissileNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieMODx">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,288}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="MODx" />
+ <Window Type="opengate/StaticImage" Name="CategorieMODxIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconMODxNormal" />
+ </Window>
</Window>
<Window Type="opengate/MarketButton" Name="CategorieAll">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,317}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
<Property Name="Text" Value="All" />
+ <Window Type="opengate/StaticImage" Name="CategorieStorageIcon">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconStorageNormal" />
+ </Window>
</Window>
</Window>
<!-- ********************* -->
Modified: branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout 2007-06-06 16:59:51 UTC (rev 538)
@@ -6,8 +6,8 @@
<Property Name="AlwaysOnTop" Value="true" />
<Property Name="Text" Value="ItemName" />
<Window Type="opengate/StaticGreenImage" Name="MarketShortItemImage">
- <Property Name="UnifiedPosition" Value="{{0.0,12},{0.0,15}}" />
- <Property Name="UnifiedSize" Value="{{1.0,-30},{1.0,-40}}" />
+ <Property Name="UnifiedPosition" Value="{{0.0,12},{0.0,7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 76},{0.0, 76}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="false" />
<Property Name="MousePassThroughEnabled" Value="true" />
Modified: branches/ogsector/data/gui/schemes/opengate/opengate.imageset
===================================================================
--- branches/ogsector/data/gui/schemes/opengate/opengate.imageset 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/data/gui/schemes/opengate/opengate.imageset 2007-06-06 16:59:51 UTC (rev 538)
@@ -65,12 +65,80 @@
<Image Name="StaticBlueBottom" XPos="410" YPos="175" Width="6" Height="6" />
<Image Name="StaticBlueBottomRight" XPos="424" YPos="175" Width="6" Height="6" />
- <Image Name="IconCommoditiesNormal" XPos="414" YPos="229" Width="15" Height="15" />
- <Image Name="IconCommoditiesHover" XPos="414" YPos="245" Width="15" Height="15" />
- <Image Name="IconCommoditiesNeutral" XPos="414" YPos="261" Width="15" Height="15" />
- <Image Name="IconCommoditiesOct" XPos="430" YPos="229" Width="15" Height="15" />
- <Image Name="IconCommoditiesTau" XPos="430" YPos="245" Width="15" Height="15" />
- <Image Name="IconCommoditiesQua" XPos="430" YPos="261" Width="15" Height="15" />
+ <Image Name="IconCommodityNormal" XPos="142" YPos="256" Width="15" Height="15" />
+ <Image Name="IconCommodityHover" XPos="142" YPos="272" Width="15" Height="15" />
+ <Image Name="IconCommodity0" XPos="142" YPos="288" Width="15" Height="15" />
+ <Image Name="IconCommodity1" XPos="142" YPos="288" Width="15" Height="15" />
+ <Image Name="IconCommodity2" XPos="142" YPos="304" Width="15" Height="15" />
+ <Image Name="IconCommodity3" XPos="142" YPos="320" Width="15" Height="15" />
+ <Image Name="IconCommodity4" XPos="142" YPos="336" Width="15" Height="15" />
+ <Image Name="IconPowerplantNormal" XPos="158" YPos="256" Width="15" Height="15" />
+ <Image Name="IconPowerplantHover" XPos="158" YPos="272" Width="15" Height="15" />
+ <Image Name="IconPowerplant0" XPos="158" YPos="288" Width="15" Height="15" />
+ <Image Name="IconPowerplant1" XPos="158" YPos="288" Width="15" Height="15" />
+ <Image Name="IconPowerplant2" XPos="158" YPos="304" Width="15" Height="15" />
+ <Image Name="IconPowerplant3" XPos="158" YPos="320" Width="15" Height="15" />
+ <Image Name="IconPowerplant4" XPos="158" YPos="336" Width="15" Height="15" />
+ <Image Name="IconEngineNormal" XPos="174" YPos="256" Width="16" Height="15" />
+ <Image Name="IconEngineHover" XPos="174" YPos="272" Width="16" Height="15" />
+ <Image Name="IconEngine0" XPos="174" YPos="288" Width="15" Height="15" />
+ <Image Name="IconEngine1" XPos="174" YPos="288" Width="15" Height="15" />
+ <Image Name="IconEngine2" XPos="174" YPos="304" Width="15" Height="15" />
+ <Image Name="IconEngine3" XPos="174" YPos="320" Width="15" Height="15" />
+ <Image Name="IconEngine4" XPos="174" YPos="336" Width="15" Height="15" />
+ <Image Name="IconRadarNormal" XPos="190" YPos="256" Width="15" Height="15" />
+ <Image Name="IconRadarHover" XPos="190" YPos="272" Width="15" Height="15" />
+ <Image Name="IconRadar0" XPos="190" YPos="288" Width="15" Height="15" />
+ <Image Name="IconRadar1" XPos="190" YPos="288" Width="15" Height="15" />
+ <Image Name="IconRadar2" XPos="190" YPos="304" Width="15" Height="15" />
+ <Image Name="IconRadar3" XPos="190" YPos="320" Width="15" Height="15" />
+ <Image Name="IconRadar4" XPos="190" YPos="336" Width="15" Height="15" />
+ <Image Name="IconECMNormal" XPos="206" YPos="256" Width="15" Height="15" />
+ <Image Name="IconECMHover" XPos="206" YPos="272" Width="15" Height="15" />
+ <Image Name="IconECM0" XPos="206" YPos="288" Width="15" Height="15" />
+ <Image Name="IconECM1" XPos="206" YPos="288" Width="15" Height="15" />
+ <Image Name="IconECM2" XPos="206" YPos="304" Width="15" Height="15" />
+ <Image Name="IconECM3" XPos="206" YPos="320" Width="15" Height="15" />
+ <Image Name="IconECM4" XPos="206" YPos="336" Width="15" Height="15" />
+ <Image Name="IconCapacitorNormal" XPos="222" YPos="256" Width="15" Height="15" />
+ <Image Name="IconCapacitorHover" XPos="222" YPos="272" Width="15" Height="15" />
+ <Image Name="IconCapacitor0" XPos="222" YPos="288" Width="15" Height="15" />
+ <Image Name="IconCapacitor1" XPos="222" YPos="288" Width="15" Height="15" />
+ <Image Name="IconCapacitor2" XPos="222" YPos="304" Width="15" Height="15" />
+ <Image Name="IconCapacitor3" XPos="222" YPos="320" Width="15" Height="15" />
+ <Image Name="IconCapacitor4" XPos="222" YPos="336" Width="15" Height="15" />
+ <Image Name="IconShieldNormal" XPos="238" YPos="256" Width="15" Height="15" />
+ <Image Name="IconShieldHover" XPos="238" YPos="272" Width="15" Height="15" />
+ <Image Name="IconShield0" XPos="238" YPos="288" Width="15" Height="15" />
+ <Image Name="IconShield1" XPos="238" YPos="288" Width="15" Height="15" />
+ <Image Name="IconShield2" XPos="238" YPos="304" Width="15" Height="15" />
+ <Image Name="IconShield3" XPos="228" YPos="320" Width="15" Height="15" />
+ <Image Name="IconShield4" XPos="238" YPos="336" Width="15" Height="15" />
+ <Image Name="IconGunNormal" XPos="254" YPos="256" Width="15" Height="15" />
+ <Image Name="IconGunHover" XPos="254" YPos="272" Width="15" Height="15" />
+ <Image Name="IconGun0" XPos="254" YPos="288" Width="15" Height="15" />
+ <Image Name="IconGun1" XPos="254" YPos="288" Width="15" Height="15" />
+ <Image Name="IconGun2" XPos="254" YPos="304" Width="15" Height="15" />
+ <Image Name="IconGun3" XPos="254" YPos="320" Width="15" Height="15" />
+ <Image Name="IconGun4" XPos="254" YPos="336" Width="15" Height="15" />
+ <Image Name="IconMissileNormal" XPos="270" YPos="256" Width="15" Height="15" />
+ <Image Name="IconMissileHover" XPos="270" YPos="272" Width="15" Height="15" />
+ <Image Name="IconMissile0" XPos="270" YPos="288" Width="15" Height="15" />
+ <Image Name="IconMissile1" XPos="270" YPos="288" Width="15" Height="15" />
+ <Image Name="IconMissile2" XPos="270" YPos="304" Width="15" Height="15" />
+ <Image Name="IconMissile3" XPos="270" YPos="320" Width="15" Height="15" />
+ <Image Name="IconMissile4" XPos="270" YPos="336" Width="15" Height="15" />
+ <Image Name="IconMODxNormal" XPos="286" YPos="256" Width="15" Height="15" />
+ <Image Name="IconMODxHover" XPos="286" YPos="272" Width="15" Height="15" />
+ <Image Name="IconMODx0" XPos="286" YPos="288" Width="15" Height="15" />
+ <Image Name="IconMODx1" XPos="286" YPos="288" Width="15" Height="15" />
+ <Image Name="IconMODx2" XPos="286" YPos="304" Width="15" Height="15" />
+ <Image Name="IconMODx3" XPos="286" YPos="320" Width="15" Height="15" />
+ <Image Name="IconMODx4" XPos="286" YPos="336" Width="15" Height="15" />
+
+ <Image Name="IconStorageNormal" XPos="410" YPos="256" Width="15" Height="15" />
+ <Image Name="IconStorageHover" XPos="426" YPos="256" Width="15" Height="15" />
+
<Image Name="IconSize1" XPos="473" YPos="223" Width="12" Height="26" />
<Image Name="IconSize2" XPos="460" YPos="223" Width="12" Height="26" />
<Image Name="IconSize3" XPos="447" YPos="223" Width="12" Height="26" />
Modified: branches/ogsector/data/gui/schemes/opengate/opengate.png
===================================================================
(Binary files differ)
Modified: branches/ogsector/src/Avatar.cpp
===================================================================
--- branches/ogsector/src/Avatar.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/Avatar.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -43,7 +43,7 @@
if ( items.size() > 0 ){
for ( std::list< std::deque< Entity * > >::iterator it = floorCargo_.begin(); it != floorCargo_.end(); it ++ ){
if ( (*it)[ 0 ]->id() == items[ 0 ]->id() ){
- for ( int i = 0; i < items.size(); i ++ ) {
+ for ( unsigned int i = 0; i < items.size(); i ++ ) {
if ( ( maxCargoHold_ - cargoHold_ ) >= items[ i ]->size() ){
(*it).push_back( items[ i ] );
cargoHold_ += items[ i ]->size();
@@ -56,7 +56,7 @@
}
std::deque< Entity * > newItem;
- for ( int i = 0; i < items.size(); i ++ ) {
+ for ( unsigned int i = 0; i < items.size(); i ++ ) {
if ( ( maxCargoHold_ - cargoHold_ ) >= items[ i ]->size() ){
newItem.push_back( items[ i ] );
cargoHold_ += items[ i ]->size();
Modified: branches/ogsector/src/Console.cpp
===================================================================
--- branches/ogsector/src/Console.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/Console.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -94,6 +94,7 @@
rootWindow_->setHeight( we.window->getParent()->getHeight() +
CEGUI::UDim( 0, we.window->getHeight().asAbsolute( 0 ) -3) );
listBox_->ensureItemIsVisible( listBox_->getItemCount( ) );
+ return true;
}
bool Console::handleEditTextAccepted( const CEGUI::EventArgs & args ){
@@ -123,8 +124,6 @@
if ( e.key == OIS::KC_LCONTROL) {
devices_->setGlobalKeyModifier( KEY_LCONTROL );
}
-
-
return true;
}
Modified: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/DeviceManager.h 2007-06-06 16:59:51 UTC (rev 538)
@@ -30,6 +30,8 @@
namespace OpenGate{
+enum EntityType{ENTITY,VESSEL,COMMODITY,POWERPLANT,ENGINE,RADAR,ECM,CAPACITOR,SHIELD,GUN,MISSILE,MODX};
+
/*!
* \brief This is a storage to handle current status of several things
*
@@ -66,16 +68,29 @@
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";
+ case 0: return "neutral";
+ 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";
}
+ std::string categoryName( EntityType rtti ) const {
+ switch( rtti ){
+ case COMMODITY: return "Commodity";
+ case POWERPLANT: return "Powerplant";
+ case CAPACITOR: return "Capacitor";
+ case ENGINE: return "Engine";
+ case SHIELD: return "Shield";
+ case RADAR: return "Radar";
+ default: return "unknown";
+ }
+ return "unknown";
+ }
Ogre::Root * ogreRoot;
Ogre::RenderWindow * renderWindow;
Modified: branches/ogsector/src/Entity.cpp
===================================================================
--- branches/ogsector/src/Entity.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/Entity.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -30,34 +30,70 @@
namespace OpenGate{
-void Entity::loadImage( const std::string & imageName ){
+Entity::Entity()
+ : name_( "unknown" ), className_( "unknown" ),
+ description_("Please fill in description"), imageFileName_("unknown"), ceguiImageName_( "unknownEntityImageset") {
+ id_ = 0;
+ techLevel_ = 0;
+ mass_ = 1;
+ size_ = 1;
+ rtti_ = ENTITY;
+ factionID_ = 1;
+ setFactionName_( DeviceManager::getSingleton().factionName( factionID_ ) );
+}
+
+void Entity::setFactionID( int id ){
+ factionID_ = id;
+ setFactionName_( DeviceManager::getSingleton().factionName( factionID_ ) );
+}
+
+void Entity::setImageName( const std::string & imageFileName ) {
+ imageFileName_ = imageFileName;
+
+ bool haveSmall = true;
+ haveSmall = initialiseImage( imageFileName + "_76x76.png", imageFileName + "Small" );
+ if ( haveSmall ){
+ ceguiSmallImageName_ = ceguiImageName_;
+ }
+
+ if ( !initialiseImage( imageFileName + "_290x290.png", imageFileName ) ){
+ //**fallback
+ initialiseImage( imageFileName + ".png", imageFileName, true );
+ }
+
+ if ( !haveSmall ) ceguiSmallImageName_ = ceguiImageName_;
+
+}
+
+
+bool Entity::initialiseImage( const std::string & imageName, const std::string & targetName, bool verbose ){
bool fail = false;
CEGUI::Texture * texture;
if ( imageName != "unknown" ){
+
try {
texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( DeviceManager::getSingleton().guiRenderer )->createTexture( imageName, "General");
} catch( CEGUI::Exception & e ){
- LogManager::getSingleton().warn( e.getMessage().c_str() ); fail = true;
+ if ( verbose ) LogManager::getSingleton().warn( e.getMessage().c_str() );
+ fail = true;
}
} else {
fail = true;
}
if ( !fail ){
- std::vector < std::string> subs( getSubstrings( name_ ) );
- std::string noBlankName;
- for ( int i = 0; i < subs.size(); i ++ ) noBlankName += subs[i];
- CEGUI::Imageset * imageSet = CEGUI::ImagesetManager::getSingleton().createImageset( noBlankName, texture );
- imageSet->defineImage( noBlankName, CEGUI::Point(0.0f, 0.0f),
+ CEGUI::Imageset * imageSet = CEGUI::ImagesetManager::getSingleton().createImageset( targetName, texture );
+ imageSet->defineImage( targetName, CEGUI::Point(0.0f, 0.0f),
CEGUI::Size( texture->getWidth(), texture->getHeight() ), CEGUI::Point(0.0f,0.0f));
- ceguiImageName_ = "set:" + noBlankName + " image:" + noBlankName;
+ ceguiImageName_ = "set:" + targetName + " image:" + targetName;
} else {
//** fallback image
// ceguiImageName_ = "set:" + name_ + " image:full_image";
}
// image_ = new CEGUI::Texture();
+ return !fail;
}
} // namespace OpenGate
Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/Entity.h 2007-06-06 16:59:51 UTC (rev 538)
@@ -26,6 +26,7 @@
#include <string>
#include "LogManager.h"
+#include "DeviceManager.h"
namespace OpenGate{
@@ -41,28 +42,20 @@
* \author Christoph Brill <eg...@us...>
*/
-enum EntityType{ENTITY,VESSEL,COMMODITY,POWERPLANT,ENGINE,RADAR,ECM,CAPACITOR,SHIELD,GUN,MISSILE,MODX};
-
class Entity{
public:
- Entity()
- : factionName_( "unknown" ), name_( "unknown" ), className_( "unknown" ),
- description_("Please fill in description"), imageFileName_("unknown"), ceguiImageName_( "unknownEntityImageset") {
- id_ = 0;
- techLevel_ = 0;
- mass_ = 1;
- size_ = 1;
- rtti_ = ENTITY;
- }
+ Entity();
virtual ~Entity(){ }
virtual EntityType entityType() const { return rtti_; }
- inline void setFactionName( const std::string & name ) { factionName_ = name; }
inline std::string factionName( ) const { return factionName_; }
+ void setFactionID( int id );
+ inline int factionID( ) const { return factionID_; }
+
inline void setName( const std::string & name ) { name_ = name; }
inline std::string name( ) const { return name_; }
@@ -84,12 +77,13 @@
inline void setDescription( const std::string & description ){ description_ = description; }
inline std::string description( ) const { return description_; }
- inline void setImageName( const std::string & imageFileName ) { imageFileName_ = imageFileName; loadImage(imageFileName_); }
+ void setImageName( const std::string & imageFileName );
inline std::string imageName() const { return imageFileName_; }
inline std::string ceguiImageName() const { return ceguiImageName_; }
+ inline std::string ceguiSmallImageName() const { return ceguiSmallImageName_; }
- void loadImage( const std::string & imageName );
+ bool initialiseImage( const std::string & imageName, const std::string & targetName, bool verbose = false );
inline void setProductionCenters( const std::set < std::string > & productionCenters ) {
productionCenters_ = productionCenters; }
@@ -100,15 +94,20 @@
inline std::set < Commodity * > requieredComponents( ) const { return requieredComponents_; }
protected:
+ inline void setFactionName_( const std::string & name ) { factionName_ = name; }
- std::string factionName_;
std::string name_;
std::string className_;
/*! A rather long description of this component */
std::string description_;
+ std::string factionName_;
+ int factionID_;
+
std::string imageFileName_;
+ std::string ceguiSmallImageName_;
std::string ceguiImageName_;
+
/*! The places where this part of equipment is built */
std::set < std::string > productionCenters_;
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/EntityManager.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -171,7 +171,7 @@
pElem = hRoot.ChildElement( "faction_id", 0 ).Element();
if ( pElem ) {
- entity->setFactionName( DeviceManager::getSingleton().factionName( toInt( pElem->FirstChild()->Value() ) ) );
+ entity->setFactionID( toInt( pElem->FirstChild()->Value() ) );
} else {
log_->fatal( fileName + " has no faction_id (mandatory)." );
return NULL;
@@ -179,7 +179,7 @@
//** 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" );
+ entity->setImageName( basename.substr( 0, basename.find( ".xml" ) ) );
//** Generic elements
pElem = hRoot.ChildElement( "class_id", 0 ).Element();
@@ -212,7 +212,13 @@
if ( !pElem ){ //** fallback to english
pElem = hRoot.ChildElement( "description_en", 0 ).Element();
}
- if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
+ if ( !pElem ){ //** fallback to english
+ pElem = hRoot.ChildElement( "description_en", 0 ).Element();
+ }
+ if ( pElem ) {
+ std::cout << entity->description() << std::endl;
+ entity->setDescription( pElem->FirstChild()->Value() );
+ }
//** Specific elements;
switch ( entity->entityType() ){
@@ -383,7 +389,7 @@
//** 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" );
+ entity->setImageName( basename.substr( 0, basename.find( ".xml" ) ) );
//** Generic data
pElem = hRoot.ChildElement( "class_id", 0 ).Element();
@@ -398,6 +404,9 @@
pElem = hRoot.ChildElement( "mass", 0 ).Element();
if ( pElem ) entity->setMass( toInt( pElem->FirstChild()->Value() ) );
+ pElem = hRoot.ChildElement( "faction_id", 0 ).Element();
+ if ( pElem ) entity->setFactionID( toInt( pElem->FirstChild()->Value() ) );
+
//** Additional Data
pElem = hRoot.ChildElement( "description_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/MarketDialog.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -306,12 +306,17 @@
CEGUI::String textPrice( "" );
CEGUI::String image( "" );
CEGUI::String icon( "" );
+ CEGUI::String categoryIcon( "" );
if ( item ){
name = item->name();
textAmount = CEGUI::String( toStr( amount ) );
textPrice = CEGUI::String( "c" + toStr( price ) );
- image = item->ceguiImageName();
+ image = item->ceguiSmallImageName();
icon = CEGUI::String("set:opengate image:IconSize" + toStr( item->size() ) );
+ categoryIcon = CEGUI::String("set:opengate image:Icon" +
+ DeviceManager::getSingleton().categoryName( item->entityType() ) +
+ toStr( item->factionID() ) );
+ std::cout <<categoryIcon<< std::endl;
}
win->setUserData( item );
win->setProperty( "Text", name );
@@ -323,6 +328,9 @@
->setProperty("Image", image );
CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemSizeIcon" )
->setProperty("Image", icon );
+ CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemTypIcon" )
+ ->setProperty("Image", categoryIcon );
+
}
void MarketDialog::updateSortIcons(){
@@ -448,6 +456,7 @@
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ItemDescription/Mass/Label")->show();
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ItemDescription/Text")->show();
}
+ return true;
}
bool MarketDialog::handleMarketItemMouseLeaves( const CEGUI::EventArgs & e ){
@@ -480,6 +489,7 @@
}
updateInventView();
updateMarketView();
+ return true;
}
bool MarketDialog::handleInventItemClicked( const CEGUI::EventArgs & e ){
@@ -501,6 +511,7 @@
}
updateInventView();
updateMarketView();
+ return true;
}
void MarketDialog::fillMarketItemDetailedView( CEGUI::Window * itemWindow ){
@@ -558,6 +569,7 @@
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketWindow")->show();
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"InventoryWindow")->show();
updateInventView();
+ return true;
}
bool MarketDialog::handleMarketItemViewAcceptButton( const CEGUI::EventArgs & e ){
@@ -570,6 +582,17 @@
if ( item ){
int amount = toInt( dynamic_cast< CEGUI::Editbox * >( CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Amount" ) )->getText( ).c_str() );
+ int size = toInt( CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Size/Text" )
+ ->getText( ).c_str() );
+
+ if ( buyMode_ ){
+ amount = min( amount, (int)floor(
+ ( toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryFloorSize/Text" )->getText( ).c_str() ) -
+ toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargo/Text" )->getText( ).c_str() ) ) / size ) );
+ } else {
+ amount = min( amount, toInt( CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Amount/Text" )->getText().c_str() ) );
+ }
+
if ( amount > 0 ){
if ( buyMode_ ){
buyItems( item, amount );
@@ -580,6 +603,7 @@
}
updateInventView();
+ return true;
}
bool MarketDialog::handleMarketItemChangeAmount( const CEGUI::EventArgs & e ){
@@ -617,16 +641,19 @@
CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton" )->hide();
CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton/Highlight" )->hide();
}
+ return true;
}
bool MarketDialog::buyItems( Entity * item , int amount ){
std::vector < Entity * > items( amount, item );
DeviceManager::getSingleton().avatar->addCargoToFloor( items );
+ return true;
}
bool MarketDialog::sellItems( Entity * item , int amount ){
std::vector < Entity * > items( amount, item );
DeviceManager::getSingleton().avatar->delCargoToFloor( items );
+ return true;
}
} // namespace OpenGate
Modified: branches/ogsector/src/VesselManager.cpp
===================================================================
--- branches/ogsector/src/VesselManager.cpp 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/src/VesselManager.cpp 2007-06-06 16:59:51 UTC (rev 538)
@@ -45,7 +45,6 @@
TiXmlHandle docHandle( &doc );
TiXmlElement* pElem;
-// TiXmlNode* pNode;
TiXmlHandle hRoot( 0 );
//** block: Ship;
@@ -64,11 +63,11 @@
Vessel *vessel = new Vessel();
- pElem = hRoot.ChildElement( "faction", 0 ).Element();
+ pElem = hRoot.ChildElement( "faction_id", 0 ).Element();
if ( pElem ) {
- vessel->setFactionName( pElem->FirstChild()->Value() );
+ vessel->setFactionID( toInt( pElem->FirstChild()->Value() ) );
} else {
- log_->fatal( fileName + " has no mandatory factionname (mandatory)." );
+ log_->fatal( fileName + " has no mandatory faction_id (mandatory)." );
return NULL;
}
pElem = hRoot.ChildElement( "name", 0 ).Element();
Modified: branches/ogsector/win32/ogsectorclient/equipment.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/equipment.xml 2007-06-06 02:57:17 UTC (rev 537)
+++ branches/ogsector/win32/ogsectorclient/equipment.xml 2007-06-06 16:59:51 UTC (rev 538)
@@ -27,4 +27,6 @@
<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" />
+ <Resource id="28" location="../../../../trunk/data/power_plants/t-p-16.xml" />
+ <Resource id="29" location="../../../../trunk/data/radars/night_watchman.xml" />
</equipment>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 02:57:15
|
Revision: 537
http://svn.sourceforge.net/opengate/?rev=537&view=rev
Author: ultrasick
Date: 2007-06-05 19:57:17 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
uploading the T-P-16, based on the contender
Added Paths:
-----------
trunk/data/power_plants/t-p-16.blend
trunk/data/power_plants/t-p-16.xml
trunk/data/power_plants/t-p-16_290x290.png
trunk/data/power_plants/t-p-16_76x76.png
Added: trunk/data/power_plants/t-p-16.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/t-p-16.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/t-p-16.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/t-p-16.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/power_plants/t-p-16_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/t-p-16_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/t-p-16_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/t-p-16_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-06 02:46:10
|
Revision: 536
http://svn.sourceforge.net/opengate/?rev=536&view=rev
Author: ultrasick
Date: 2007-06-05 19:46:10 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
another bugfix in the exporter
Modified Paths:
--------------
trunk/data/capacitors/deepol.xml
trunk/data/capacitors/mantra.xml
trunk/data/capacitors/outlet.xml
trunk/data/capacitors/sponge.xml
trunk/data/capacitors/summoner.xml
trunk/data/capacitors/t-c-15.xml
trunk/data/capacitors/tank.xml
trunk/data/commodities/ammunition.xml
trunk/data/commodities/armor.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/conflux_biomass.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/magnetic_components.xml
trunk/data/commodities/manufactured_foods.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/octavia_light.xml
trunk/data/commodities/organic_foods.xml
trunk/data/commodities/plutonium.xml
trunk/data/commodities/rubber.xml
trunk/data/commodities/tauseti_flashback.xml
trunk/data/commodities/water.xml
trunk/data/engines/money.xml
trunk/data/engines/t-e-15.xml
trunk/data/power_plants/contender.xml
trunk/data/power_plants/contender_xl.xml
trunk/data/power_plants/contender_xpr.xml
trunk/data/power_plants/gatherer.blend
trunk/data/power_plants/gatherer.xml
trunk/data/power_plants/spud.blend
trunk/data/power_plants/spud.xml
trunk/data/radars/cyclops.xml
trunk/data/radars/hall_monitor.xml
trunk/data/radars/night_watchman.xml
trunk/data/radars/outlook.xml
trunk/data/radars/t-r-9.xml
trunk/data/rankings/tauseti.xml
trunk/data/shields/alpaa.xml
trunk/data/shields/flatiron.xml
trunk/data/shields/himelea.xml
trunk/data/shields/kydango.xml
trunk/data/shields/pod.xml
trunk/data/shields/shelter.xml
trunk/data/shields/t-s-13.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
Added Paths:
-----------
trunk/data/power_plants/gatherer_290x290.png
trunk/data/power_plants/gatherer_76x76.png
trunk/data/power_plants/spud_290x290.png
trunk/data/power_plants/spud_76x76.png
Removed Paths:
-------------
trunk/data/power_plants/spud.png
Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/gatherer.blend
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)
Added: trunk/data/power_plants/gatherer_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/gatherer_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/gatherer_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/gatherer_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/power_plants/spud.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/spud.png
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)
Added: trunk/data/power_plants/spud_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/spud_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/spud_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/spud_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)
Modified: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-05 22:29:57
|
Revision: 535
http://svn.sourceforge.net/opengate/?rev=535&view=rev
Author: ultrasick
Date: 2007-06-05 15:29:25 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
uploading radar: night watchman
+ introducing new image format for the market screen
Added Paths:
-----------
trunk/data/radars/night_watchman.blend
trunk/data/radars/night_watchman.xml
trunk/data/radars/night_watchman_290x290.png
trunk/data/radars/night_watchman_76x76.png
Added: trunk/data/radars/night_watchman.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/night_watchman.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/night_watchman.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/radars/night_watchman_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/night_watchman_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/night_watchman_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/night_watchman_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-04 23:38:05
|
Revision: 534
http://svn.sourceforge.net/opengate/?rev=534&view=rev
Author: spom_spom
Date: 2007-06-04 16:38:04 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-04 23:15:15 UTC (rev 533)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-04 23:38:04 UTC (rev 534)
@@ -1,25 +1,25 @@
-[Bootstrap]
-
+[Bootstrap]
+
# Resource locations to be added to the default path
-[General]
-FileSystem=./
-FileSystem=../../data
-FileSystem=../../data/materials
-FileSystem=../../data/textures
-Zip=../../data/simpleSkybox.zip
-FileSystem=../../data/MediaFromOgre
-FileSystem=../../data/gui
-FileSystem=../../data/gui/schemes/
-FileSystem=../../data/gui/schemes/opengate
-FileSystem=../../data/gui/layouts/
-Zip=../../data/fonts.zip
-FileSystem=../../../../trunk/data/
-FileSystem=../../../../trunk/data/commodities
-FileSystem=../../../../trunk/data/ships/octavius/apteryx
-FileSystem=../../../../trunk/data/ships/quantar/storm
-FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
+[General]
+FileSystem=./
+FileSystem=../../data
+FileSystem=../../data/materials
+FileSystem=../../data/textures
+Zip=../../data/simpleSkybox.zip
+FileSystem=../../data/MediaFromOgre
+FileSystem=../../data/gui
+FileSystem=../../data/gui/schemes/
+FileSystem=../../data/gui/schemes/opengate
+FileSystem=../../data/gui/layouts/
+Zip=../../data/fonts.zip
+FileSystem=../../../../trunk/data/
+FileSystem=../../../../trunk/data/commodities
+FileSystem=../../../../trunk/data/ships/octavius/apteryx
+FileSystem=../../../../trunk/data/ships/quantar/storm
+FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
+FileSystem=../.././../trunk/data/engines
FileSystem=../../../../trunk/data/capacitors
-FileSystem=../..././../trunk/data/engines
FileSystem=../../../../trunk/data/radars
FileSystem=../../../../trunk/data/shields
FileSystem=../../../../trunk/data/ECMs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-04 23:15:13
|
Revision: 533
http://svn.sourceforge.net/opengate/?rev=533&view=rev
Author: spom_spom
Date: 2007-06-04 16:15:15 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
added images for commods and equipment
Modified Paths:
--------------
trunk/data/ECMs/ghost.xml
trunk/data/engines/money.xml
trunk/data/radars/cyclops.xml
Added Paths:
-----------
trunk/data/capacitors/deepol.png
trunk/data/capacitors/mantra.png
trunk/data/capacitors/outlet.png
trunk/data/capacitors/sponge.png
trunk/data/capacitors/summoner.png
trunk/data/capacitors/t-c-15.png
trunk/data/capacitors/tank.png
trunk/data/commodities/ammunition.png
trunk/data/commodities/armor.png
trunk/data/commodities/conflux_biomass.png
trunk/data/commodities/iron.png
trunk/data/commodities/magnetic_components.png
trunk/data/commodities/manufactured_foods.blend
trunk/data/commodities/manufactured_foods.png
trunk/data/commodities/organic_foods.png
trunk/data/commodities/plutonium.png
trunk/data/commodities/tauseti_flashback.png
trunk/data/commodities/water.png
trunk/data/engines/money.png
trunk/data/engines/t-e-15.png
trunk/data/power_plants/contender.png
trunk/data/power_plants/contender_xl.png
trunk/data/power_plants/contender_xpr.png
trunk/data/power_plants/spud.png
trunk/data/radars/cyclops.png
trunk/data/radars/hall_monitor.png
trunk/data/radars/outlook.png
trunk/data/radars/t-r-9.png
trunk/data/shields/alpaa.png
trunk/data/shields/flatiron.png
trunk/data/shields/himelea.png
trunk/data/shields/kydango.png
trunk/data/shields/pod.png
trunk/data/shields/shelter.png
trunk/data/shields/t-s-13.png
Removed Paths:
-------------
trunk/data/commodities/manufactured_food.blend
trunk/data/commodities/ram.xml
Modified: trunk/data/ECMs/ghost.xml
===================================================================
--- trunk/data/ECMs/ghost.xml 2007-06-04 23:14:31 UTC (rev 532)
+++ trunk/data/ECMs/ghost.xml 2007-06-04 23:15:15 UTC (rev 533)
@@ -14,7 +14,7 @@
<!-- Additional Data -->
<description>TODO</description>
- <image>ghost.jpg</image>
+ <image>ghost.png</image>
<model>ghost.blend</model>
<mesh>ghost.mesh</mesh>
Added: trunk/data/capacitors/deepol.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/deepol.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/mantra.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/mantra.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/outlet.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/outlet.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/sponge.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/sponge.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/summoner.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/summoner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/t-c-15.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/t-c-15.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/tank.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/tank.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/ammunition.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ammunition.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/armor.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/armor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/conflux_biomass.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/conflux_biomass.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/iron.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/iron.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/magnetic_components.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/magnetic_components.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/commodities/manufactured_food.blend
===================================================================
(Binary files differ)
Added: trunk/data/commodities/manufactured_foods.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/manufactured_foods.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/manufactured_foods.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/manufactured_foods.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/organic_foods.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/organic_foods.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/plutonium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/plutonium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/commodities/ram.xml
===================================================================
--- trunk/data/commodities/ram.xml 2007-06-04 23:14:31 UTC (rev 532)
+++ trunk/data/commodities/ram.xml 2007-06-04 23:15:15 UTC (rev 533)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<component type="Produced">
- <!-- Naming -->
- <name>RAM</name>
- <class>Computing Material</class>
- <image>ram.jpg</image>
- <model>ram.blend</model>
-
- <!-- Production Data -->
- <production-center>Amananth</production-center>
-
- <!-- Generic Data -->
- <techlevel>0</techlevel>
- <id>RAM</id>
- <mass>650</mass>
-
- <melting-point>varies</melting-point>
- <gravitic-sig>varies</gravitic-sig>
-
- <required-component>Copper</required-component>
- <required-component>Germanium </required-component>
- <required-component>Gold</required-component>
- <required-component>Silicon</required-component>
-</component>
Added: trunk/data/commodities/tauseti_flashback.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/tauseti_flashback.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/water.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/water.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/engines/money.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/engines/money.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Added: trunk/data/engines/t-e-15.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/engines/t-e-15.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/contender.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/contender.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/contender_xl.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/contender_xl.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/contender_xpr.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/contender_xpr.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/spud.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/spud.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/cyclops.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/cyclops.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Added: trunk/data/radars/hall_monitor.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/hall_monitor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/outlook.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/outlook.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/t-r-9.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/t-r-9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/alpaa.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/alpaa.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/flatiron.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/flatiron.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/himelea.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/himelea.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/kydango.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/kydango.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/pod.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/pod.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/shelter.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/shelter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/shields/t-s-13.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/t-s-13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <ult...@us...> - 2007-06-04 22:43:20
|
Revision: 531
http://svn.sourceforge.net/opengate/?rev=531&view=rev
Author: ultrasick
Date: 2007-06-04 15:43:21 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
list of class ids and german and english names + corresponding categorie id
Added Paths:
-----------
trunk/data/classes.xml
Added: trunk/data/classes.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/classes.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-04 22:35:27
|
Revision: 530
http://svn.sourceforge.net/opengate/?rev=530&view=rev
Author: ultrasick
Date: 2007-06-04 15:35:29 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
list of category ids and german and english names
Added Paths:
-----------
trunk/data/categories.xml
Added: trunk/data/categories.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/categories.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-04 22:15:42
|
Revision: 529
http://svn.sourceforge.net/opengate/?rev=529&view=rev
Author: ultrasick
Date: 2007-06-04 15:15:43 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
bugfix in the xml files
Modified Paths:
--------------
trunk/data/capacitors/deepol.xml
trunk/data/capacitors/mantra.xml
trunk/data/capacitors/outlet.xml
trunk/data/capacitors/sponge.xml
trunk/data/capacitors/summoner.xml
trunk/data/capacitors/t-c-15.xml
trunk/data/capacitors/tank.xml
trunk/data/commodities/aluminium.xml
trunk/data/commodities/ammunition.xml
trunk/data/commodities/antimony.xml
trunk/data/commodities/armor.xml
trunk/data/commodities/barium.xml
trunk/data/commodities/cesium.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/chromium.xml
trunk/data/commodities/copper.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/gold.xml
trunk/data/commodities/helium.xml
trunk/data/commodities/ice.xml
trunk/data/commodities/iron.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/magnetic_components.xml
trunk/data/commodities/manufactured_foods.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/nitrogen.xml
trunk/data/commodities/octavia_light.xml
trunk/data/commodities/organic_foods.xml
trunk/data/commodities/plutonium.xml
trunk/data/commodities/rubber.xml
trunk/data/commodities/tauseti_flashback.xml
trunk/data/commodities/water.xml
trunk/data/commodities/xenon.xml
trunk/data/engines/money.xml
trunk/data/engines/t-e-15.xml
trunk/data/power_plants/contender.xml
trunk/data/power_plants/contender_xl.xml
trunk/data/power_plants/contender_xpr.xml
trunk/data/power_plants/spud.xml
trunk/data/radars/cyclops.xml
trunk/data/radars/hall_monitor.xml
trunk/data/radars/outlook.xml
trunk/data/radars/t-r-9.xml
trunk/data/shields/alpaa.xml
trunk/data/shields/flatiron.xml
trunk/data/shields/himelea.xml
trunk/data/shields/kydango.xml
trunk/data/shields/pod.xml
trunk/data/shields/shelter.xml
trunk/data/shields/t-s-13.xml
trunk/data/ships/squadrok/squid/s-1.xml
trunk/data/ships/squadrok/squid/s-2.xml
trunk/data/ships/squadrok/squid/s-3.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
trunk/data/stations/tauseti/tauseti_wake.xml
Added Paths:
-----------
trunk/data/rankings/octavius.xml
trunk/data/rankings/quantar.xml
trunk/data/rankings/tauseti.xml
Removed Paths:
-------------
trunk/data/rankings/octavius_rankings.xml
Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)
Added: trunk/data/rankings/octavius.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/octavius.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Deleted: trunk/data/rankings/octavius_rankings.xml
===================================================================
--- trunk/data/rankings/octavius_rankings.xml 2007-06-04 19:24:08 UTC (rev 528)
+++ trunk/data/rankings/octavius_rankings.xml 2007-06-04 22:15:43 UTC (rev 529)
@@ -1,269 +0,0 @@
-<?xml version="1.0"?>
-
-<rank-matrix fatction="octavius">
- <rank>
- <level>0</level>
- <name>Recruit</name>
- <experience>0</experience>
- </rank>
- <rank type="Enlisted">
- <level>1</level>
- <name>Private</name>
- <experience>2000</experience>
- </rank>
- <rank type="Enlisted">
- <level>2</level>
- <name>Specialist</name>
- <experience>4000</experience>
- </rank>
- <rank type="Enlisted">
- <level>3</level>
- <name>Corporal</name>
- <experience>8800</experience>
- </rank>
- <rank type="Enlisted">
- <level>4</level>
- <name>Sergant</name>
- <experience>15700</experience>
- </rank>
- <rank type="Enlisted">
- <level>5</level>
- <name>Staff Sergant</name>
- <experience>25000</experience>
- </rank>
- <rank type="Enlisted">
- <level>6</level>
- <name>Master Sergant</name>
- <experience>37000</experience>
- </rank>
- <rank type="Enlisted">
- <level>7</level>
- <name>First Sergang</name>
- <experience>51600</experience>
- </rank>
- <rank type="Enlisted">
- <level>8</level>
- <name>Sergant Major</name>
- <experience>69000</experience>
- </rank>
- <rank type="Enlisted">
- <level>9</level>
- <name>Senior Sergant</name>
- <experience>89300</experience>
- </rank>
-
- <rank type="Officers">
- <level>10</level>
- <name>Lancer</name>
- <experience>112600</experience>
- </rank>
- <rank type="Officers">
- <level>11</level>
- <name>First Lancer</name>
- <experience>140000</experience>
- </rank>
- <rank type="Officers">
- <level>12</level>
- <name>Master Lancer</name>
- <experience>169000</experience>
- </rank>
- <rank type="Officers">
- <level>13</level>
- <name>Senior Lancer</name>
- <experience>202000</experience>
- </rank>
- <rank type="Officers">
- <level>14</level>
- <name>Marksman</name>
- <experience>240000</experience>
- </rank>
- <rank type="Officers">
- <level>14</level>
- <name>Marksman</name>
- <experience>240000</experience>
- </rank>
- <rank type="Officers">
- <level>15</level>
- <name>First Marksman</name>
- <experience>280000</experience>
- </rank>
- <rank type="Officers">
- <level>16</level>
- <name>Master Marksman</name>
- <experience>325000</experience>
- </rank>
- <rank type="Officers">
- <level>17</level>
- <name>Senior Marksman</name>
- <experience>372000</experience>
- </rank>
- <rank type="Officers">
- <level>18</level>
- <name>Gunner</name>
- <experience>424000</experience>
- </rank>
- <rank type="Officers">
- <level>19</level>
- <name>Master Gunner</name>
- <experience>480000</experience>
- </rank>
-
- <rank type="Commanders">
- <level>20</level>
- <name>Commander</name>
- <experience>540000</experience>
- </rank>
- <rank type="Commanders">
- <level>21</level>
- <name>First Commander</name>
- <experience>605000</experience>
- </rank>
- <rank type="Commanders">
- <level>22</level>
- <name>Master Commander</name>
- <experience>675000</experience>
- </rank>
- <rank type="Commanders">
- <level>23</level>
- <name>Senior Commander</name>
- <experience>750000</experience>
- </rank>
- <rank type="Commanders">
- <level>24</level>
- <name>Brigadier</name>
- <experience>828000</experience>
- </rank>
- <rank type="Commanders">
- <level>25</level>
- <name>First Brigadier</name>
- <experience>911000</experience>
- </rank>
- <rank type="Commanders">
- <level>26</level>
- <name>Master Brigadier</name>
- <experience>1000000</experience>
- </rank>
- <rank type="Commanders">
- <level>27</level>
- <name>Senior Brigadier</name>
- <experience>1100000</experience>
- </rank>
- <rank type="Commanders">
- <level>28</level>
- <name>Brigadier General</name>
- <experience>1200000</experience>
- </rank>
- <rank type="Commanders">
- <level>29</level>
- <name>General</name>
- <experience>1300000</experience>
- </rank>
-
- <rank type="Council Members">
- <level>30</level>
- <name>Mentor</name>
- <experience>1407000</experience>
- </rank>
- <rank type="Council Members">
- <level>31</level>
- <name>First Mentor</name>
- <experience>1520000</experience>
- </rank>
- <rank type="Council Members">
- <level>32</level>
- <name>Senior Mentor</name>
- <experience>1640000</experience>
- </rank>
- <rank type="Council Members">
- <level>33</level>
- <name>Preceptor</name>
- <experience>1770000</experience>
- </rank>
- <rank type="Council Members">
- <level>34</level>
- <name>First Preceptor</name>
- <experience>1910000</experience>
- </rank>
- <rank type="Council Members">
- <level>35</level>
- <name>High Preceptor</name>
- <experience>2065000</experience>
- </rank>
- <rank type="Council Members">
- <level>36</level>
- <name>Phaeton</name>
- <experience>2230000</experience>
- </rank>
- <rank type="Council Members">
- <level>37</level>
- <name>First Phaeton</name>
- <experience>2400000</experience>
- </rank>
- <rank type="Council Members">
- <level>38</level>
- <name>High Phaeton</name>
- <experience>2650000</experience>
- </rank>
- <rank type="Council Members">
- <level>39</level>
- <name>Empirius</name>
- <experience>3000000</experience>
- </rank>
-
- <rank type="High Heroes">
- <level>40</level>
- <name>Praetorius</name>
- <experience>3300000</experience>
- </rank>
- <rank type="High Heroes">
- <level>41</level>
- <name>First Praetorius</name>
- <experience>3700000</experience>
- </rank>
- <rank type="High Heroes">
- <level>42</level>
- <name>Higth Praetorius</name>
- <experience>4200000</experience>
- </rank>
- <rank type="High Heroes">
- <level>43</level>
- <name>Ardean</name>
- <experience>4700000</experience>
- </rank>
- <rank type="High Heroes">
- <level>44</level>
- <name>First Ardean</name>
- <experience>5300000</experience>
- </rank>
- <rank type="High Heroes">
- <level>45</level>
- <name>High Ardean</name>
- <experience>5900000</experience>
- </rank>
- <rank type="High Heroes">
- <level>46</level>
- <name>Vendictor</name>
- <experience>6500000</experience>
- </rank>
- <rank type="High Heroes">
- <level>47</level>
- <name>First Vendictor</name>
- <experience>7500000</experience>
- </rank>
- <rank type="High Heroes">
- <level>48</level>
- <name>High Vendictor</name>
- <experience>8500000</experience>
- </rank>
-
- <rank type="Premiers">
- <level>49</level>
- <name>Octavius Alterion</name>
- <experience>9500000</experience>
- </rank>
- <rank type="Premiers">
- <level>50</level>
- <name>Octavius Optimus</name>
- <experience>12000000</experience>
- </rank>
-</rank-matrix>
\ No newline at end of file
Added: trunk/data/rankings/quantar.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/quantar.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)
Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)
Modified: trunk/data/stations/tauseti/tauseti_wake.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-04 19:24:11
|
Revision: 528
http://svn.sourceforge.net/opengate/?rev=528&view=rev
Author: ultrasick
Date: 2007-06-04 12:24:08 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
moved the svg files to the templates dir. we still got the png files in the trunk/data/rankings dir
Added Paths:
-----------
trunk/templates/data/rankings/
trunk/templates/data/rankings/00.svg
trunk/templates/data/rankings/01.svg
trunk/templates/data/rankings/02.svg
trunk/templates/data/rankings/03.svg
trunk/templates/data/rankings/04.svg
trunk/templates/data/rankings/05.svg
trunk/templates/data/rankings/06.svg
trunk/templates/data/rankings/07.svg
trunk/templates/data/rankings/08.svg
trunk/templates/data/rankings/09.svg
trunk/templates/data/rankings/10.svg
trunk/templates/data/rankings/11.svg
trunk/templates/data/rankings/12.svg
trunk/templates/data/rankings/13.svg
trunk/templates/data/rankings/14.svg
trunk/templates/data/rankings/15.svg
trunk/templates/data/rankings/16.svg
trunk/templates/data/rankings/17.svg
trunk/templates/data/rankings/18.svg
trunk/templates/data/rankings/19.svg
trunk/templates/data/rankings/20.svg
trunk/templates/data/rankings/21.svg
trunk/templates/data/rankings/22.svg
trunk/templates/data/rankings/23.svg
trunk/templates/data/rankings/24.svg
trunk/templates/data/rankings/25.svg
trunk/templates/data/rankings/26.svg
trunk/templates/data/rankings/27.svg
trunk/templates/data/rankings/28.svg
trunk/templates/data/rankings/29.svg
trunk/templates/data/rankings/30.svg
trunk/templates/data/rankings/31.svg
trunk/templates/data/rankings/32.svg
trunk/templates/data/rankings/33.svg
trunk/templates/data/rankings/34.svg
trunk/templates/data/rankings/35.svg
trunk/templates/data/rankings/36.svg
trunk/templates/data/rankings/37.svg
trunk/templates/data/rankings/38.svg
trunk/templates/data/rankings/39.svg
trunk/templates/data/rankings/40.svg
trunk/templates/data/rankings/41.svg
trunk/templates/data/rankings/42.svg
trunk/templates/data/rankings/43.svg
trunk/templates/data/rankings/44.svg
trunk/templates/data/rankings/45.svg
trunk/templates/data/rankings/46.svg
trunk/templates/data/rankings/47.svg
trunk/templates/data/rankings/48.svg
trunk/templates/data/rankings/49.svg
trunk/templates/data/rankings/50.svg
Removed Paths:
-------------
trunk/data/rankings/00.svg
trunk/data/rankings/01.svg
trunk/data/rankings/02.svg
trunk/data/rankings/03.svg
trunk/data/rankings/04.svg
trunk/data/rankings/05.svg
trunk/data/rankings/06.svg
trunk/data/rankings/07.svg
trunk/data/rankings/08.svg
trunk/data/rankings/09.svg
trunk/data/rankings/10.svg
trunk/data/rankings/11.svg
trunk/data/rankings/12.svg
trunk/data/rankings/13.svg
trunk/data/rankings/14.svg
trunk/data/rankings/15.svg
trunk/data/rankings/16.svg
trunk/data/rankings/17.svg
trunk/data/rankings/18.svg
trunk/data/rankings/19.svg
trunk/data/rankings/20.svg
trunk/data/rankings/21.svg
trunk/data/rankings/22.svg
trunk/data/rankings/23.svg
trunk/data/rankings/24.svg
trunk/data/rankings/25.svg
trunk/data/rankings/26.svg
trunk/data/rankings/27.svg
trunk/data/rankings/28.svg
trunk/data/rankings/29.svg
trunk/data/rankings/30.svg
trunk/data/rankings/31.svg
trunk/data/rankings/32.svg
trunk/data/rankings/33.svg
trunk/data/rankings/34.svg
trunk/data/rankings/35.svg
trunk/data/rankings/36.svg
trunk/data/rankings/37.svg
trunk/data/rankings/38.svg
trunk/data/rankings/39.svg
trunk/data/rankings/40.svg
trunk/data/rankings/41.svg
trunk/data/rankings/42.svg
trunk/data/rankings/43.svg
trunk/data/rankings/44.svg
trunk/data/rankings/45.svg
trunk/data/rankings/46.svg
trunk/data/rankings/47.svg
trunk/data/rankings/48.svg
trunk/data/rankings/49.svg
trunk/data/rankings/50.svg
Deleted: trunk/data/rankings/00.svg
===================================================================
--- trunk/data/rankings/00.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/00.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="00.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\00.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.71875"
- inkscape:cx="32"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1280"
- inkscape:window-height="977"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata1923">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- d="M 6.21875,3.0001662 C 5.28267,3.0237236 4.53125,3.808209 4.53125,4.7501662 C 4.53125,5.7070753 5.32433,6.4689162 6.28125,6.4689162 L 7.53125,6.4689162 L 7.53125,57.468916 L 6.28125,57.468916 C 5.32434,57.468916 4.53125,58.230758 4.53125,59.187666 C 4.53125,60.144575 5.32433,60.937667 6.28125,60.937666 L 59.8125,60.937666 C 60.76941,60.937666 61.53125,60.144576 61.53125,59.187666 C 61.53125,58.230757 60.76942,57.468916 59.8125,57.468916 L 58.53125,57.468916 L 58.53125,6.4689162 L 59.8125,6.4689162 C 60.76941,6.4689162 61.53125,5.7070755 61.53125,4.7501662 C 61.53125,3.7932571 60.76942,3.0001662 59.8125,3.0001662 L 6.28125,3.0001662 C 6.2663,3.0001662 6.23361,2.9997923 6.21875,3.0001662 z "
- id="rect7223" />
- <rect
- style="opacity:1;fill:#302a08;fill-opacity:1;stroke:url(#linearGradient8994);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1926"
- width="50.999996"
- height="51"
- x="7"
- y="6"
- ry="0" />
- <rect
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8990);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1932"
- width="57"
- height="3.4545455"
- x="4"
- y="2.5454545"
- ry="1.7272727"
- rx="1.7272727" />
- <rect
- ry="0.64282435"
- y="11"
- x="12"
- height="41"
- width="41"
- id="rect4599"
- style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient8996);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- rx="0.64282435" />
- <rect
- rx="1.7272727"
- ry="1.7272727"
- y="57"
- x="4"
- height="3.4545455"
- width="57"
- id="rect4601"
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8992);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- </g>
-</svg>
Deleted: trunk/data/rankings/01.svg
===================================================================
--- trunk/data/rankings/01.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/01.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="01.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\01.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2808"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2812"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2816"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2824"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2826"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2828"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2836"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2838"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2840"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.71875"
- inkscape:cx="32"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1280"
- inkscape:window-height="977"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata1923">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- d="M 6.21875,3.0001662 C 5.28267,3.0237236 4.53125,3.808209 4.53125,4.7501662 C 4.53125,5.7070753 5.32433,6.4689162 6.28125,6.4689162 L 7.53125,6.4689162 L 7.53125,57.468916 L 6.28125,57.468916 C 5.32434,57.468916 4.53125,58.230758 4.53125,59.187666 C 4.53125,60.144575 5.32433,60.937667 6.28125,60.937666 L 59.8125,60.937666 C 60.76941,60.937666 61.53125,60.144576 61.53125,59.187666 C 61.53125,58.230757 60.76942,57.468916 59.8125,57.468916 L 58.53125,57.468916 L 58.53125,6.4689162 L 59.8125,6.4689162 C 60.76941,6.4689162 61.53125,5.7070755 61.53125,4.7501662 C 61.53125,3.7932571 60.76942,3.0001662 59.8125,3.0001662 L 6.28125,3.0001662 C 6.2663,3.0001662 6.23361,2.9997923 6.21875,3.0001662 z "
- id="rect7223" />
- <rect
- style="opacity:1;fill:#302a08;fill-opacity:1;stroke:url(#linearGradient8994);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1926"
- width="50.999996"
- height="51"
- x="7"
- y="6"
- ry="0" />
- <rect
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8990);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1932"
- width="57"
- height="3.4545455"
- x="4"
- y="2.5454545"
- ry="1.7272727"
- rx="1.7272727" />
- <rect
- ry="0.64282435"
- y="11"
- x="12"
- height="41"
- width="41"
- id="rect4599"
- style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient8996);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- rx="0.64282435" />
- <rect
- rx="1.7272727"
- ry="1.7272727"
- y="57"
- x="4"
- height="3.4545455"
- width="57"
- id="rect4601"
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8992);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- transform="matrix(0.978365,0,0,0.978365,10.31791,-4.205036)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2850"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2826);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2820"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,9.846161,-4.615374)" />
- </g>
-</svg>
Deleted: trunk/data/rankings/02.svg
===================================================================
--- trunk/data/rankings/02.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/02.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="02.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\03.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2808"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2812"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2816"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2824"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2826"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2828"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2836"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2838"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2840"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.71875"
- inkscape:cx="32"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1280"
- inkscape:window-height="977"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata1923">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- d="M 6.21875,3.0001662 C 5.28267,3.0237236 4.53125,3.808209 4.53125,4.7501662 C 4.53125,5.7070753 5.32433,6.4689162 6.28125,6.4689162 L 7.53125,6.4689162 L 7.53125,57.468916 L 6.28125,57.468916 C 5.32434,57.468916 4.53125,58.230758 4.53125,59.187666 C 4.53125,60.144575 5.32433,60.937667 6.28125,60.937666 L 59.8125,60.937666 C 60.76941,60.937666 61.53125,60.144576 61.53125,59.187666 C 61.53125,58.230757 60.76942,57.468916 59.8125,57.468916 L 58.53125,57.468916 L 58.53125,6.4689162 L 59.8125,6.4689162 C 60.76941,6.4689162 61.53125,5.7070755 61.53125,4.7501662 C 61.53125,3.7932571 60.76942,3.0001662 59.8125,3.0001662 L 6.28125,3.0001662 C 6.2663,3.0001662 6.23361,2.9997923 6.21875,3.0001662 z "
- id="rect7223" />
- <rect
- style="opacity:1;fill:#302a08;fill-opacity:1;stroke:url(#linearGradient8994);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1926"
- width="50.999996"
- height="51"
- x="7"
- y="6"
- ry="0" />
- <path
- transform="matrix(0.978365,0,0,0.978365,-1.682104,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2842"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <rect
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8990);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1932"
- width="57"
- height="3.4545455"
- x="4"
- y="2.5454545"
- ry="1.7272727"
- rx="1.7272727" />
- <rect
- ry="0.64282435"
- y="11"
- x="12"
- height="41"
- width="41"
- id="rect4599"
- style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient8996);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- rx="0.64282435" />
- <rect
- rx="1.7272727"
- ry="1.7272727"
- y="57"
- x="4"
- height="3.4545455"
- width="57"
- id="rect4601"
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8992);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2808);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path1927"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,-2.153845,-16.61539)" />
- <path
- transform="matrix(0.978365,0,0,0.978365,22.3179,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2854"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2836);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2830"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,21.84615,-16.61539)" />
- </g>
-</svg>
Deleted: trunk/data/rankings/03.svg
===================================================================
--- trunk/data/rankings/03.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/03.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="03.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\04.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2808"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2812"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2816"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2824"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2826"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2828"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2836"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2838"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2840"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.71875"
- inkscape:cx="32"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1280"
- inkscape:window-height="977"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata1923">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- d="M 6.21875,3.0001662 C 5.28267,3.0237236 4.53125,3.808209 4.53125,4.7501662 C 4.53125,5.7070753 5.32433,6.4689162 6.28125,6.4689162 L 7.53125,6.4689162 L 7.53125,57.468916 L 6.28125,57.468916 C 5.32434,57.468916 4.53125,58.230758 4.53125,59.187666 C 4.53125,60.144575 5.32433,60.937667 6.28125,60.937666 L 59.8125,60.937666 C 60.76941,60.937666 61.53125,60.144576 61.53125,59.187666 C 61.53125,58.230757 60.76942,57.468916 59.8125,57.468916 L 58.53125,57.468916 L 58.53125,6.4689162 L 59.8125,6.4689162 C 60.76941,6.4689162 61.53125,5.7070755 61.53125,4.7501662 C 61.53125,3.7932571 60.76942,3.0001662 59.8125,3.0001662 L 6.28125,3.0001662 C 6.2663,3.0001662 6.23361,2.9997923 6.21875,3.0001662 z "
- id="rect7223" />
- <rect
- style="opacity:1;fill:#302a08;fill-opacity:1;stroke:url(#linearGradient8994);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1926"
- width="50.999996"
- height="51"
- x="7"
- y="6"
- ry="0" />
- <path
- transform="matrix(0.978365,0,0,0.978365,-1.682104,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2842"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <rect
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8990);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1932"
- width="57"
- height="3.4545455"
- x="4"
- y="2.5454545"
- ry="1.7272727"
- rx="1.7272727" />
- <rect
- ry="0.64282435"
- y="11"
- x="12"
- height="41"
- width="41"
- id="rect4599"
- style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient8996);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- rx="0.64282435" />
- <rect
- rx="1.7272727"
- ry="1.7272727"
- y="57"
- x="4"
- height="3.4545455"
- width="57"
- id="rect4601"
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8992);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2808);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path1927"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,-2.153845,-16.61539)" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path2852"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,10.31791,7.794961)" />
- <path
- transform="matrix(0.978365,0,0,0.978365,22.3179,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2854"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.978365,0,0,0.978365,9.846161,7.384626)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2822"
- style="opacity:1;fill:url(#radialGradient2828);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2836);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2830"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,21.84615,-16.61539)" />
- </g>
-</svg>
Deleted: trunk/data/rankings/04.svg
===================================================================
--- trunk/data/rankings/04.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/04.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="04.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\05.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2808"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2812"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2816"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2824"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2826"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2828"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2836"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2838"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2840"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.71875"
- inkscape:cx="32"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1280"
- inkscape:window-height="977"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata1923">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- d="M 6.21875,3.0001662 C 5.28267,3.0237236 4.53125,3.808209 4.53125,4.7501662 C 4.53125,5.7070753 5.32433,6.4689162 6.28125,6.4689162 L 7.53125,6.4689162 L 7.53125,57.468916 L 6.28125,57.468916 C 5.32434,57.468916 4.53125,58.230758 4.53125,59.187666 C 4.53125,60.144575 5.32433,60.937667 6.28125,60.937666 L 59.8125,60.937666 C 60.76941,60.937666 61.53125,60.144576 61.53125,59.187666 C 61.53125,58.230757 60.76942,57.468916 59.8125,57.468916 L 58.53125,57.468916 L 58.53125,6.4689162 L 59.8125,6.4689162 C 60.76941,6.4689162 61.53125,5.7070755 61.53125,4.7501662 C 61.53125,3.7932571 60.76942,3.0001662 59.8125,3.0001662 L 6.28125,3.0001662 C 6.2663,3.0001662 6.23361,2.9997923 6.21875,3.0001662 z "
- id="rect7223" />
- <rect
- style="opacity:1;fill:#302a08;fill-opacity:1;stroke:url(#linearGradient8994);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1926"
- width="50.999996"
- height="51"
- x="7"
- y="6"
- ry="0" />
- <path
- transform="matrix(0.978365,0,0,0.978365,-1.682104,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2842"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <rect
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8990);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1932"
- width="57"
- height="3.4545455"
- x="4"
- y="2.5454545"
- ry="1.7272727"
- rx="1.7272727" />
- <rect
- ry="0.64282435"
- y="11"
- x="12"
- height="41"
- width="41"
- id="rect4599"
- style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient8996);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- rx="0.64282435" />
- <rect
- rx="1.7272727"
- ry="1.7272727"
- y="57"
- x="4"
- height="3.4545455"
- width="57"
- id="rect4601"
- style="opacity:1;fill:#696969;fill-opacity:1.0;stroke:url(#linearGradient8992);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2808);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path1927"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,-2.153845,-16.61539)" />
- <path
- transform="matrix(0.978365,0,0,0.978365,-1.682094,7.794961)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2846"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2816);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2814"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,-2.153835,7.384626)" />
- <path
- transform="matrix(0.978365,0,0,0.978365,22.3179,-16.20505)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2854"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2836);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2830"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,21.84615,-16.61539)" />
- <path
- transform="matrix(0.978365,0,0,0.978365,22.31791,7.794971)"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- sodipodi:ry="5.1105652"
- sodipodi:rx="5.1105652"
- sodipodi:cy="36.40295"
- sodipodi:cx="22.643734"
- id="path2858"
- style="opacity:1;fill:black;fill-opacity:0.50196078;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient2840);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078"
- id="path2834"
- sodipodi:cx="22.643734"
- sodipodi:cy="36.40295"
- sodipodi:rx="5.1105652"
- sodipodi:ry="5.1105652"
- d="M 27.754299 36.40295 A 5.1105652 5.1105652 0 1 1 17.533169,36.40295 A 5.1105652 5.1105652 0 1 1 27.754299 36.40295 z"
- transform="matrix(0.978365,0,0,0.978365,21.84616,7.384629)" />
- </g>
-</svg>
Deleted: trunk/data/rankings/05.svg
===================================================================
--- trunk/data/rankings/05.svg 2007-06-04 17:12:32 UTC (rev 527)
+++ trunk/data/rankings/05.svg 2007-06-04 19:24:08 UTC (rev 528)
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg1918"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- sodipodi:docbase="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings"
- sodipodi:docname="05.svg"
- inkscape:export-filename="C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\opengate\data\Rankings\06.png"
- inkscape:export-xdpi="45"
- inkscape:export-ydpi="45">
- <defs
- id="defs1920">
- <linearGradient
- id="linearGradient8984">
- <stop
- style="stop-color:#dfdfdf;stop-opacity:1;"
- offset="0"
- id="stop8986" />
- <stop
- style="stop-color:#929292;stop-opacity:1;"
- offset="1"
- id="stop8988" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8990"
- x1="29.181818"
- y1="2.6363635"
- x2="29.545454"
- y2="7"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8992"
- x1="29.636364"
- y1="57"
- x2="30.09091"
- y2="61.454544"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8994"
- x1="10.371205"
- y1="12.21527"
- x2="54.885921"
- y2="54.641678"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="linearGradient8996"
- x1="33.093365"
- y1="32.28624"
- x2="31.906633"
- y2="31.10688"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2808"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2812"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2816"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2824"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2826"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2828"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8984"
- id="radialGradient2836"
- gradientUnits="userSpaceOnUse"
- cx="22.014742"
- cy="35.380836"
- fx="22.014742"
- fy="35.380836"
- r="3.6167076" />
- ...
[truncated message content] |
|
From: <spo...@us...> - 2007-06-04 17:12:32
|
Revision: 527
http://svn.sourceforge.net/opengate/?rev=527&view=rev
Author: spom_spom
Date: 2007-06-04 10:12:32 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
remove blanks from filenames
Modified Paths:
--------------
trunk/data/commodities/aluminium.xml
trunk/data/commodities/conflux_biomass.xml
Added Paths:
-----------
trunk/data/commodities/conflux_biomass.blend
trunk/data/commodities/cpu.blend
trunk/data/commodities/cpu.png
trunk/data/commodities/organic_foods.blend
Removed Paths:
-------------
trunk/data/commodities/CPU.blend
trunk/data/commodities/CPU.png
trunk/data/commodities/Conflux_biomass.blend
trunk/data/commodities/organic foods.blend
Deleted: trunk/data/commodities/CPU.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/CPU.png
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/Conflux_biomass.blend
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)
Added: trunk/data/commodities/conflux_biomass.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/conflux_biomass.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)
Added: trunk/data/commodities/cpu.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/cpu.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/cpu.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/cpu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/commodities/organic foods.blend
===================================================================
(Binary files differ)
Added: trunk/data/commodities/organic_foods.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/organic_foods.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
