diff --git a/Assets/Scripts/Gui/activeGameState.lua b/Assets/Scripts/Gui/activeGameState.lua
index 0b20bd9..94a0388 100644
--- a/Assets/Scripts/Gui/activeGameState.lua
+++ b/Assets/Scripts/Gui/activeGameState.lua
@@ -4,9 +4,9 @@ sz = 210
s = 40
resTextScale = {x = .5, y = .5}
resIconBasePath = 'Icons/Resources/'
-pointerTex = 'pointer.jpg'
-attackTex = 'attack.jpg'
-garrisonTex = 'garrison.jpg'
+pointerTex = 'pointer.png'
+attackTex = 'attack.png'
+garrisonTex = 'garrison.png'
gui = {
{
@@ -52,13 +52,13 @@ gui = {
guiType = GuiType.GUI_RECTANGLE,
pos = {x = 200, y = 0, z = 0},
size = {x = s, y = s},
- imagePath = resIconBasePath .. 'wealth.jpg',
+ imagePath = resIconBasePath .. 'wealth.png',
},
{
guiType = GuiType.GUI_RECTANGLE,
pos = {x = 400, y = 0, z = 0},
size = {x = s, y = s},
- imagePath = resIconBasePath .. 'research.jpg',
+ imagePath = resIconBasePath .. 'research.png',
},
{
guiType = GuiType.TEXT,
diff --git a/Assets/Scripts/Gui/tradingHub.lua b/Assets/Scripts/Gui/tradingHub.lua
index 5904a5d..065387a 100644
--- a/Assets/Scripts/Gui/tradingHub.lua
+++ b/Assets/Scripts/Gui/tradingHub.lua
@@ -1,6 +1,6 @@
res = graphics.resolution
-HubSize = {x = res.x * .5, y = res.y * .8}
+HubSize = {x = res.x * .3, y = res.y * .8}
HubPos = {x = .5 * (res.x - HubSize.x), y = 10, z = .1}
HubMargin = {top = 10, left = 10, right = 10, bottom = 10}
diff --git a/Assets/Scripts/Gui/tradingPlayerGuiTray.lua b/Assets/Scripts/Gui/tradingPlayerGuiTray.lua
index 3452598..dccc609 100644
--- a/Assets/Scripts/Gui/tradingPlayerGuiTray.lua
+++ b/Assets/Scripts/Gui/tradingPlayerGuiTray.lua
@@ -12,7 +12,7 @@ gui = {
guiType = GuiType.TEXT,
name = 'playerName',
text = '',
- pos = {x = HubPos.x + HubMargin.left, y = height + 10, z = .11},
+ pos = {x = HubPos.x + HubMargin.left, y = height + 35, z = .11},
scale = {x = .2, y = .2},
font = 'batang.ttf',
fontFirstChar = 0,
@@ -21,12 +21,12 @@ gui = {
},
{
guiType = GuiType.GUI_RECTANGLE,
- pos = {x = HubPos.x + HubMargin.left + 20, y = height, z = .11},
- size = {x = 20, y = 20},
- color = {x = 0, y = 0, z = 0, w = .6}
+ pos = {x = HubPos.x + HubMargin.left + 100, y = height, z = .11},
+ size = {x = 50, y = 50},
+ imagePath = warIcon
},
{
- pos = {x = HubPos.x + HubMargin.left + 40, y = height, z = .11},
+ pos = {x = HubPos.x + HubMargin.left + 200, y = height + 25, z = .11},
size = textboxSize,
guiType = GuiType.LISTBOX,
listboxType = ListboxType.TRADE_OFFERS,
@@ -37,7 +37,7 @@ gui = {
buttonType = ButtonType.TRADING_SCREEN,
name = 'Trade',
guiScreen = 'tradingScreen.lua',
- pos = {x = HubPos.x + HubSize.x - buttonSize.x - HubMargin.right, y = height, z = .11},
+ pos = {x = HubPos.x + HubSize.x - buttonSize.x - HubMargin.right, y = height + 25, z = .11},
size = buttonSize,
trigger = 10,
dependencies = {{id = 2}}
diff --git a/Assets/Scripts/Gui/tradingScreen.lua b/Assets/Scripts/Gui/tradingScreen.lua
index 64b71e1..b62dd42 100644
--- a/Assets/Scripts/Gui/tradingScreen.lua
+++ b/Assets/Scripts/Gui/tradingScreen.lua
@@ -8,7 +8,7 @@ textboxSize = {x = 200, y = 25}
buttonSize = {x = 100, y = 20}
ResourceTrayGuiId = {ICON = 0, TEXTBOX = 1, INCREMENT = 2, DECREMENT = 3}
-IconPath = {WEALTH = 'Icons/Resources/wealth.jpg', RESEARCH = 'Icons/Resources/research.jpg', REFINEDS = 'Icons/Resources/refineds.jpg', TIME = 'Icons/Resources/time.jpg'}
+IconPath = {WEALTH = 'Icons/Resources/wealth.png', RESEARCH = 'Icons/Resources/research.png', REFINEDS = 'Icons/Resources/refineds.png', TIME = 'Icons/Resources/time.png'}
function createResourceTrayGui(cpuPlayer, lineId, guiId, imgPath)
height = HubMargin.top + lineId * iconSize.y
diff --git a/Assets/Textures/Icons/Cursors/attack.png b/Assets/Textures/Icons/Cursors/attack.png
new file mode 100644
index 0000000..3707cc9
Binary files /dev/null and b/Assets/Textures/Icons/Cursors/attack.png differ
diff --git a/Assets/Textures/Icons/Cursors/garrison.png b/Assets/Textures/Icons/Cursors/garrison.png
new file mode 100644
index 0000000..f11ba83
Binary files /dev/null and b/Assets/Textures/Icons/Cursors/garrison.png differ
diff --git a/Assets/Textures/Icons/Cursors/garrison.svg b/Assets/Textures/Icons/Cursors/garrison.svg
new file mode 100644
index 0000000..3d34a3c
--- /dev/null
+++ b/Assets/Textures/Icons/Cursors/garrison.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/refineds.jpg b/Assets/Textures/Icons/Cursors/pointer.png
similarity index 100%
rename from Assets/Textures/Icons/Resources/refineds.jpg
rename to Assets/Textures/Icons/Cursors/pointer.png
diff --git a/Assets/Textures/Icons/PlayerStates/alliance.png b/Assets/Textures/Icons/PlayerStates/alliance.png
old mode 100755
new mode 100644
index a1451cc..aaf75eb
Binary files a/Assets/Textures/Icons/PlayerStates/alliance.png and b/Assets/Textures/Icons/PlayerStates/alliance.png differ
diff --git a/Assets/Textures/Icons/PlayerStates/alliance.svg b/Assets/Textures/Icons/PlayerStates/alliance.svg
new file mode 100644
index 0000000..288989d
--- /dev/null
+++ b/Assets/Textures/Icons/PlayerStates/alliance.svg
@@ -0,0 +1,235 @@
+
+
diff --git a/Assets/Textures/Icons/PlayerStates/war.png b/Assets/Textures/Icons/PlayerStates/war.png
old mode 100755
new mode 100644
index a1451cc..3707cc9
Binary files a/Assets/Textures/Icons/PlayerStates/war.png and b/Assets/Textures/Icons/PlayerStates/war.png differ
diff --git a/Assets/Textures/Icons/PlayerStates/war.svg b/Assets/Textures/Icons/PlayerStates/war.svg
new file mode 100644
index 0000000..56dd3e7
--- /dev/null
+++ b/Assets/Textures/Icons/PlayerStates/war.svg
@@ -0,0 +1,73 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/refineds.png b/Assets/Textures/Icons/Resources/refineds.png
new file mode 100644
index 0000000..80bf7bd
Binary files /dev/null and b/Assets/Textures/Icons/Resources/refineds.png differ
diff --git a/Assets/Textures/Icons/Resources/refineds.svg b/Assets/Textures/Icons/Resources/refineds.svg
new file mode 100644
index 0000000..ad7be71
--- /dev/null
+++ b/Assets/Textures/Icons/Resources/refineds.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/refines.svg b/Assets/Textures/Icons/Resources/refines.svg
new file mode 100644
index 0000000..b224c12
--- /dev/null
+++ b/Assets/Textures/Icons/Resources/refines.svg
@@ -0,0 +1,95 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/research.jpg b/Assets/Textures/Icons/Resources/research.jpg
deleted file mode 100755
index d022b64..0000000
Binary files a/Assets/Textures/Icons/Resources/research.jpg and /dev/null differ
diff --git a/Assets/Textures/Icons/Resources/research.png b/Assets/Textures/Icons/Resources/research.png
new file mode 100644
index 0000000..4c3551e
Binary files /dev/null and b/Assets/Textures/Icons/Resources/research.png differ
diff --git a/Assets/Textures/Icons/Resources/research.svg b/Assets/Textures/Icons/Resources/research.svg
new file mode 100644
index 0000000..9564211
--- /dev/null
+++ b/Assets/Textures/Icons/Resources/research.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/time.jpg b/Assets/Textures/Icons/Resources/time.jpg
deleted file mode 100755
index c75936f..0000000
Binary files a/Assets/Textures/Icons/Resources/time.jpg and /dev/null differ
diff --git a/Assets/Textures/Icons/Resources/time.png b/Assets/Textures/Icons/Resources/time.png
new file mode 100644
index 0000000..ae1ba7c
Binary files /dev/null and b/Assets/Textures/Icons/Resources/time.png differ
diff --git a/Assets/Textures/Icons/Resources/time.svg b/Assets/Textures/Icons/Resources/time.svg
new file mode 100644
index 0000000..8462ec8
--- /dev/null
+++ b/Assets/Textures/Icons/Resources/time.svg
@@ -0,0 +1,66 @@
+
+
+
+
diff --git a/Assets/Textures/Icons/Resources/wealth.jpg b/Assets/Textures/Icons/Resources/wealth.jpg
deleted file mode 100755
index 1702b02..0000000
Binary files a/Assets/Textures/Icons/Resources/wealth.jpg and /dev/null differ
diff --git a/Assets/Textures/Icons/Resources/wealth.png b/Assets/Textures/Icons/Resources/wealth.png
new file mode 100644
index 0000000..e7104b5
Binary files /dev/null and b/Assets/Textures/Icons/Resources/wealth.png differ
diff --git a/Assets/Textures/Icons/Resources/wealth.svg b/Assets/Textures/Icons/Resources/wealth.svg
new file mode 100644
index 0000000..f4834cd
--- /dev/null
+++ b/Assets/Textures/Icons/Resources/wealth.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/activeGameState.cpp b/activeGameState.cpp
index 03bd960..d386d50 100755
--- a/activeGameState.cpp
+++ b/activeGameState.cpp
@@ -115,6 +115,7 @@ namespace battleship{
else
cursorState = CursorState::NORMAL;
+ cursorNode->setVisible(cursorState != CursorState::NORMAL);
Texture *tex = nullptr;
switch(cursorState){
@@ -124,9 +125,6 @@ namespace battleship{
case CursorState::GARRISON:
tex = garrisonTex;
break;
- default:
- tex = pointerTex;
- break;
}
cursorNode->getMesh(0)->getMaterial()->setTexUniform("diffuseMap", tex, false);