Reorg image paths and move unused to archive

11 files changed, 6 insertions, 6 deletions

diff --git a/sw-ui/src/main/resources/images/background-papyrus1.jpg b/img-archive/backgrounds/background-papyrus1.jpg
index 57bdffcf..57bdffcf 100644
--- a/sw-ui/src/main/resources/images/background-papyrus1.jpg
+++ b/img-archive/backgrounds/background-papyrus1.jpg
diff --git a/sw-ui/src/main/resources/images/background-papyrus2.jpg b/img-archive/backgrounds/background-papyrus2.jpg
index b6c8dc5f..b6c8dc5f 100644
--- a/sw-ui/src/main/resources/images/background-papyrus2.jpg
+++ b/img-archive/backgrounds/background-papyrus2.jpg
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpg b/img-archive/wonder-symbol-bright.jpg
index e02eac2f..e02eac2f 100644
--- a/sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpg
+++ b/img-archive/wonder-symbol-bright.jpg
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-symbol.png b/img-archive/wonder-symbol.png
index aa4551b4..aa4551b4 100644
--- a/sw-ui/src/main/resources/images/tokens/wonder-symbol.png
+++ b/img-archive/wonder-symbol.png
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-upgrade.png b/img-archive/wonder-upgrade.png
index 4b5d689a..4b5d689a 100644
--- a/sw-ui/src/main/resources/images/tokens/wonder-upgrade.png
+++ b/img-archive/wonder-upgrade.png
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
index 54cdd687..5d5cbcaa 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
@@ -52,7 +52,7 @@ private class GameScene(props: GameSceneProps) : RComponent<GameSceneProps, RSta
     override fun RBuilder.render() {
         styledDiv {
             css {
-                background = "url('images/background-papyrus3.jpg')"
+                background = "url('images/background/papyrus.jpg')"
                 backgroundSize = "cover"
                 +GlobalStyles.fullscreen
             }
@@ -179,7 +179,7 @@ private class GameScene(props: GameSceneProps) : RComponent<GameSceneProps, RSta
     }
 
     private fun StyledDOMBuilder<DIV>.upgradeWonderSymbol() {
-        styledImg(src = "/images/tokens/wonder-upgrade-bright.png") {
+        styledImg(src = "/images/wonder-upgrade-bright.png") {
             css {
                 width = 8.rem
                 position = Position.absolute
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
index ea80a827..a95da5ac 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
@@ -62,7 +62,7 @@ private fun RBuilder.fixedResources(resources: List<CountedResource>) {
             display = Display.flex
         }
         resources.forEach {
-            tokenWithCount(tokenName = getTokenName(it.type), count = it.count) {
+            tokenWithCount(tokenName = getResourceTokenName(it.type), count = it.count) {
                 attrs { key = it.type.toString() }
                 css { marginLeft = 1.rem }
             }
@@ -93,7 +93,7 @@ private fun RBuilder.resourceChoice(types: Set<ResourceType>, block: StyledDOMBu
         }
         block()
         for ((i, t) in types.withIndex()) {
-            tokenImage(tokenName = getTokenName(t)) {
+            tokenImage(tokenName = getResourceTokenName(t)) {
                 attrs { this.key = t.toString() }
             }
             if (i < types.indices.last) {
@@ -129,7 +129,7 @@ private fun RBuilder.tokenImage(tokenName: String, block: StyledDOMBuilder<IMG>.
 
 private fun getTokenImagePath(tokenName: String) = "/images/tokens/$tokenName.png"
 
-private fun getTokenName(resourceType: ResourceType) = "resources/${resourceType.toString().toLowerCase()}"
+private fun getResourceTokenName(resourceType: ResourceType) = "resources/${resourceType.toString().toLowerCase()}"
 
 private fun CSSBuilder.productionBarStyle() {
     alignItems = Align.center
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
index 624f430c..0fae650e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
@@ -6,7 +6,7 @@ import styled.StyleSheet
 object HomeStyles : StyleSheet("HomeStyles", isStatic = true) {
 
     val zeusBackground by css {
-        background = "url('images/background-zeus-temple.jpg') center no-repeat"
+        background = "url('images/background/zeus-temple.jpg') center no-repeat"
         backgroundSize = "cover"
     }
 
diff --git a/sw-ui/src/main/resources/images/background-papyrus3.jpg b/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg
index 90350045..90350045 100644
--- a/sw-ui/src/main/resources/images/background-papyrus3.jpg
+++ b/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg
diff --git a/sw-ui/src/main/resources/images/background-zeus-temple.jpg b/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg
index 5a28e933..5a28e933 100644
--- a/sw-ui/src/main/resources/images/background-zeus-temple.jpg
+++ b/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-upgrade-bright.png b/sw-ui/src/main/resources/images/wonder-upgrade-bright.png
index 0f59c068..0f59c068 100644
--- a/sw-ui/src/main/resources/images/tokens/wonder-upgrade-bright.png
+++ b/sw-ui/src/main/resources/images/wonder-upgrade-bright.png