Commit f1d7ff82 authored by James Smith's avatar James Smith

added production facility sprites, changed singleplayer mission layout

parent 1ebff5d8
......@@ -416,22 +416,21 @@ public class LightRenderer extends RenderingSystem {
//do oxygen check
if(netSys.getEntityByNetID(te.getShipNetId()) > 0) {
Vector2 pp = p.cpy().scl(1f / Constants.PIXEL_SIZE);
// floor *after* unrotate in order to floor in right direction
int ix = MathUtils.floor(te.getX());
int iy = MathUtils.floor(te.getY());
int eRoomNetId = mRoomArray.get(netSys.getEntityByNetID(te.getShipNetId())).getFromMap(ix, iy);
int eRoom = netSys.getEntityByNetID(eRoomNetId);
if (eRoom >= 0 && mRoom.has(eRoom)) {
if (mRoom.get(eRoom).getHasOxygen())
lg.setEnabled(true);
else
lg.setEnabled(false);
int eShip = netSys.getEntityByNetID(te.getShipNetId());
Tile tile = shipSys.tileAtLocal(eShip, new Vector2(te.getX(), te.getX()));
if(tile.getEntity() > 0 && tile.getDef() != null && tile.getDef().getShape() != null && mTileEntity.has(tile.getEntity())) {
int tileW = tile.getDef().getShape().getW();
int tileH = tile.getDef().getShape().getH();
for (int i = 0; i < tileW; i++) {
for (int j = 0; j < tileH; j++) {
if (shipSys.isShipOxygenAt(eShip, new Vector2(i*16, j*16))) {
lg.setEnabled(true);
} else {
lg.setEnabled(false);
}
}
}
}
......
data/client/images/tiles/Production Facility/L0.png

128 Bytes | W: | H:

data/client/images/tiles/Production Facility/L0.png

130 Bytes | W: | H:

data/client/images/tiles/Production Facility/L0.png
data/client/images/tiles/Production Facility/L0.png
data/client/images/tiles/Production Facility/L0.png
data/client/images/tiles/Production Facility/L0.png
  • 2-up
  • Swipe
  • Onion skin
data/client/images/tiles/Production Facility/L1.png

128 Bytes | W: | H:

data/client/images/tiles/Production Facility/L1.png

130 Bytes | W: | H:

data/client/images/tiles/Production Facility/L1.png
data/client/images/tiles/Production Facility/L1.png
data/client/images/tiles/Production Facility/L1.png
data/client/images/tiles/Production Facility/L1.png
  • 2-up
  • Swipe
  • Onion skin
data/client/images/tiles/Production Facility/L2.png

128 Bytes | W: | H:

data/client/images/tiles/Production Facility/L2.png

130 Bytes | W: | H:

data/client/images/tiles/Production Facility/L2.png
data/client/images/tiles/Production Facility/L2.png
data/client/images/tiles/Production Facility/L2.png
data/client/images/tiles/Production Facility/L2.png
  • 2-up
  • Swipe
  • Onion skin
data/client/images/tiles/Production Facility/L3.png

128 Bytes | W: | H:

data/client/images/tiles/Production Facility/L3.png

130 Bytes | W: | H:

data/client/images/tiles/Production Facility/L3.png
data/client/images/tiles/Production Facility/L3.png
data/client/images/tiles/Production Facility/L3.png
data/client/images/tiles/Production Facility/L3.png
  • 2-up
  • Swipe
  • Onion skin
data/client/images/tiles/Production Facility/L4.png

128 Bytes | W: | H:

data/client/images/tiles/Production Facility/L4.png

130 Bytes | W: | H:

data/client/images/tiles/Production Facility/L4.png
data/client/images/tiles/Production Facility/L4.png
data/client/images/tiles/Production Facility/L4.png
data/client/images/tiles/Production Facility/L4.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -4,77 +4,43 @@
</table>
<table id="contentTable" row="true" width="780" height="485">
<table id="nav" width="150" height="485" create="setBackground" tableAlign="top">
<textButton id="tutorialsButton" create="setButton" row="true" width="140" pad="2" checked="true" disabled="true" click="selectTutorial">Tutorials</textButton>
<textButton id="skirmishButton" create="setButton" row="true" width="140" pad="2" checked="false" disabled="false" click="selectSkirmish">Skirmish</textButton>
<textButton id="campaignButton" create="setButton" row="true" width="140" pad="2" checked="false" disabled="false" click="selectCampaign">Campaign</textButton>
<!--<table id="nav" width="150" height="485" create="setBackground" tableAlign="top">-->
<!--<textButton id="tutorialsButton" create="setButton" row="true" width="140" pad="2" checked="true" disabled="true" click="selectTutorial">Tutorials</textButton>-->
<!--<textButton id="skirmishButton" create="setButton" row="true" width="140" pad="2" checked="false" disabled="false" click="selectSkirmish">Skirmish</textButton>-->
<!--<textButton id="campaignButton" create="setButton" row="true" width="140" pad="2" checked="false" disabled="false" click="selectCampaign">Campaign</textButton>-->
<!--<textButton id="keyBindButton" create="setButton" row="true" width="140" pad="2" checked="false" click="join">Join Game</textButton>-->
</table>
<!--</table>-->
</table>
<table row="true" width="780" height="20">
<textButton click="back" width="150" height="20" create="setStyle">Back</textButton>
<image create="setImage" padLeft="2" width="{=780-(150*2)}" height="20"/>
<textButton id="createButton" width="150" height="20" padLeft="2" create="setStyle" disabled="false" checked="false" click="createServer">Play Mission</textButton>
<image create="setImage" padLeft="2" width="{=780 - 150}" height="20"/>
<!--<textButton id="createButton" width="150" height="20" padLeft="2" create="setStyle" disabled="false" checked="false" click="createServer">Play Mission</textButton>-->
</table>
</window>
<!--<table id="singlePlayerBottomBar">-->
<!--<textButton click="back" width="150" height="20" create="setStyle">Back</textButton>-->
<!--<image create="setImage" padLeft="2" width="{=780-(150*2)}" height="20"/>-->
<!--<textButton id="createButton" width="150" height="20" padLeft="2" create="setStyle" disabled="false" checked="false" click="createServer">Play Mission</textButton>-->
<!--</table>-->
<!--<table id="hostBottomBar">-->
<!--<textButton click="back" width="150" height="20" create="setStyle">Back</textButton>-->
<!--<image create="setImage" padLeft="2" width="{=780-(150*2)}" height="20"/>-->
<!--<textButton id="createButton" width="150" height="20" padLeft="2" create="setStyle" disabled="false" checked="false" click="createServer">Play Mission</textButton>-->
<!--</table>-->
<!--<table id="hostTable" tablePad="0" create="setBackground" width="{=780-150}" visible="false" tableAlign="top">-->
<!--<scrollPane create="setScrollBG" width="{=780-150}" height="485">-->
<!--<table tableAlign="top">-->
<!--<textButton align="center" click="toggleDiscoverable" textAlign="Left" row="true"-->
<!--padTop="5" create="setButton" height="20" width="{=780-150-20}" disabled="true" row="true">-->
<!--Discoverable-->
<!--<checkBox id="discoverable" click="toggleDiscoverableBox" padRight="12"></checkBox>-->
<!--</textButton>-->
<!--<table>-->
<!--<selectBox selected=0 width="{=780-150-140}" height="20" padTop="5" create="populateMaps">-->
<!--&lt;!&ndash; maps are inserted here when window is created&ndash;&gt;-->
<!--</selectBox>-->
<!--<textButton align="center" click="toggleDiscoverable" padLeft="10" textAlign="Center" row="true"-->
<!--padTop="5" create="setButton" height="20" width="110" row="true">-->
<!--Custom-->
<!--</textButton>-->
<!--</table>-->
<!--</table>-->
<!--</scrollPane>-->
<!--</table>-->
<table id="tutorials" tablePad="2" create="setBackground" width="{=780-150}" visible="false" tableAlign="top">
<scrollPane id="createList" create="setScrollBG" width="{=780-150}" height="485">
<table id="tutorialmapList" create="createTutorialMapList" tableAlign="top">
</table>
</scrollPane>
</table>
<table id="skirmish" tablePad="2" create="setBackground" width="{=780-150}" visible="false" tableAlign="top">
<scrollPane id="createList" create="setScrollBG" width="{=780-150}" height="485">
<table id="skirmishMapList" create="createSkirmishMapList" tableAlign="top">
</table>
</scrollPane>
</table>
<table id="campaign" tablePad="2" create="setBackground" width="{=780-150}" visible="false" tableAlign="top">
<scrollPane id="createList" create="setScrollBG" width="{=780-150}" height="485">
<table id="campaignMapList" create="createCampaignMapList" tableAlign="top">
<table id="tutorials" tablePad="2" width="780" visible="false" tableAlign="top">
<scrollPane id="createList" create="setScrollBG" width="780" height="485">
<table id="tutorialmapList" height="485" tableAlign="top">
<:loop times="{numMaps}">
<table id="{loop:index}_table" row="true" width="{=780-20}" create="setBackgroundItem" padTop="10">
<table tableAlign="left" oneColumn="true">
<image id="{loop:index}" create="getMissionImage" width="64" height="64"/>
</table>
<table id="{loop:index}" tableAlign="left" width="200" padRight="140" padLeft="140" oneColumn="true">
<label id="{loop:index}" align="left" create="getMissionName" padBottom="10" padTop="5"></label>
<label id="{loop:index}" align="left" width="340" create="getMissionDesc" padBottom="5"></label>
</table>
<table width="120">
<textButton id="{loop:index}" width="100" padRight="5" padBottom="5" create="setButton" click="playMission" row="true">Play</textButton>
</table>
</table>
</:loop>
</table>
</scrollPane>
</table>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment