[Change] Renamed planets etc with star trek naming scheme.

This commit is contained in:
Allanis 2013-03-18 23:55:31 +00:00
parent 87b10759b4
commit ee8512c5ef
32 changed files with 14 additions and 13 deletions

View File

@ -20,8 +20,8 @@
</commodities> </commodities>
</general> </general>
<GFX> <GFX>
<space>konosphere.png</space> <space>M01.png</space>
<exterior>konosphere.png</exterior> <exterior>oceanic.png</exterior>
</GFX> </GFX>
</planet> </planet>
<planet name="SaraCraft"> <planet name="SaraCraft">
@ -44,8 +44,8 @@
</commodities> </commodities>
</general> </general>
<GFX> <GFX>
<space>saracraft.png</space> <space>H00.png</space>
<exterior>saracraft.png</exterior> <exterior>desertic.png</exterior>
</GFX> </GFX>
</planet> </planet>
<planet name="Omega Station"> <planet name="Omega Station">
@ -67,7 +67,7 @@
</commodities> </commodities>
</general> </general>
<GFX> <GFX>
<space>station00.png</space> <space>000.png</space>
<exterior>station00.png</exterior> <exterior>station00.png</exterior>
</GFX> </GFX>
</planet> </planet>
@ -82,7 +82,7 @@
<services>0</services> <services>0</services>
</general> </general>
<GFX> <GFX>
<space>station01.png</space> <space>001.png</space>
<exterior>station01.png</exterior> <exterior>station01.png</exterior>
</GFX> </GFX>
</planet> </planet>
@ -106,7 +106,7 @@
</commodities> </commodities>
</general> </general>
<GFX> <GFX>
<space>station02.png</space> <space>002.png</space>
<exterior>station02.png</exterior> <exterior>station02.png</exterior>
</GFX> </GFX>
</planet> </planet>

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
gfx/outfit/store/cannon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
gfx/outfit/store/laser.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
gfx/outfit/store/shield.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
gfx/outfit/store/solar.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
gfx/outfit/store/turret.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 275 KiB

View File

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
gfx/planet/space/H00.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
gfx/planet/space/M00.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
gfx/planet/space/M01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@ -198,8 +198,8 @@ static void outfit_parseSWeapon(Outfit* tmp, const xmlNodePtr parent) {
else if(xml_isNode(node, "accuracy")) tmp->u.blt.accuracy = xml_getFloat(node); else if(xml_isNode(node, "accuracy")) tmp->u.blt.accuracy = xml_getFloat(node);
else if(xml_isNode(node, "energy")) tmp->u.blt.energy = xml_getFloat(node); else if(xml_isNode(node, "energy")) tmp->u.blt.energy = xml_getFloat(node);
else if(xml_isNode(node, "gfx")) { else if(xml_isNode(node, "gfx")) {
snprintf(str, strlen(xml_get(node))+sizeof(OUTFIT_GFX)+4, snprintf(str, strlen(xml_get(node))+sizeof(OUTFIT_GFX)+10,
OUTFIT_GFX"%s.png", xml_get(node)); OUTFIT_GFX"space/%s.png", xml_get(node));
tmp->u.blt.gfx_space = gl_newSprite(str, 6, 6); tmp->u.blt.gfx_space = gl_newSprite(str, 6, 6);
} }
else if(xml_isNode(node, "spfx")) else if(xml_isNode(node, "spfx"))
@ -264,8 +264,8 @@ static void outfit_parseSAmmo(Outfit* tmp, const xmlNodePtr parent) {
else if(xml_isNode(node, "lockon")) else if(xml_isNode(node, "lockon"))
tmp->u.amm.lockon = (unsigned int)1000.*xml_getFloat(node); tmp->u.amm.lockon = (unsigned int)1000.*xml_getFloat(node);
else if(xml_isNode(node, "gfx")) { else if(xml_isNode(node, "gfx")) {
snprintf(str, strlen(xml_get(node))+sizeof(OUTFIT_GFX)+4, snprintf(str, strlen(xml_get(node))+sizeof(OUTFIT_GFX)+10,
OUTFIT_GFX"%s.png", xml_get(node)); OUTFIT_GFX"space/%s.png", xml_get(node));
tmp->u.amm.gfx_space = gl_newSprite(str, 6, 6); tmp->u.amm.gfx_space = gl_newSprite(str, 6, 6);
} }
else if(xml_isNode(node, "spfx")) else if(xml_isNode(node, "spfx"))
@ -343,7 +343,8 @@ static Outfit* outfit_parse(const xmlNodePtr parent) {
else if(xml_isNode(cur, "tech")) tmp->tech = xml_getInt(cur); else if(xml_isNode(cur, "tech")) tmp->tech = xml_getInt(cur);
else if(xml_isNode(cur, "mass")) tmp->mass = xml_getInt(cur); else if(xml_isNode(cur, "mass")) tmp->mass = xml_getInt(cur);
else if(xml_isNode(cur, "price")) tmp->price = xml_getInt(cur); else if(xml_isNode(cur, "price")) tmp->price = xml_getInt(cur);
else if(xml_isNode(cur, "description")) tmp->description = strdup(xml_get(cur)); else if(xml_isNode(cur, "description"))
tmp->description = strdup(xml_get(cur));
} while((cur = cur->next)); } while((cur = cur->next));
} }
else if(xml_isNode(node, "specific")) { else if(xml_isNode(node, "specific")) {

View File

@ -39,7 +39,7 @@ typedef struct Outfit_ {
unsigned int price; unsigned int price;
char* description; char* description;
glTexture gfx_store; // Store graphic. glTexture* gfx_store; // Store graphic.
int properties; // Properties stored bitwise. int properties; // Properties stored bitwise.