Resolved merge conflict

37 files changed, 241 insertions, 0 deletions

diff --git a/assets/sprites/SplashWall.png b/assets/sprites/SplashWall.png
deleted file mode 100644
index c0f0b1c..0000000
--- a/assets/sprites/SplashWall.png
+++ /dev/null
diff --git a/assets/sprites/black.png b/assets/sprites/black.png
deleted file mode 100644
index a974fd0..0000000
--- a/assets/sprites/black.png
+++ /dev/null
diff --git a/assets/sprites/brand.png b/assets/sprites/brand.png
deleted file mode 100644
index f5a67dc..0000000
--- a/assets/sprites/brand.png
+++ /dev/null
diff --git a/assets/sprites/brandOnline.png b/assets/sprites/brandOnline.png
deleted file mode 100644
index 1563779..0000000
--- a/assets/sprites/brandOnline.png
+++ /dev/null
diff --git a/assets/sprites/env/environment.atlas b/assets/sprites/env/environment.atlas
new file mode 100644
index 0000000..fb4ca23
--- /dev/null
+++ b/assets/sprites/env/environment.atlas
@@ -0,0 +1,27 @@
+
+environment.png
+size: 128, 16
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+leaf
+  rotate: false
+  xy: 0, 0
+  size: 9, 10
+  orig: 9, 10
+  offset: 0, 0
+  index: -1
+snowflake
+  rotate: false
+  xy: 9, 1
+  size: 9, 9
+  orig: 9, 9
+  offset: 0, 0
+  index: -1
+tile
+  rotate: false
+  xy: 18, 1
+  size: 9, 9
+  orig: 9, 9
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/env/environment.png b/assets/sprites/env/environment.png
new file mode 100644
index 0000000..d2fc990
--- /dev/null
+++ b/assets/sprites/env/environment.png
diff --git a/assets/sprites/gui/brand.atlas b/assets/sprites/gui/brand.atlas
new file mode 100644
index 0000000..111d193
--- /dev/null
+++ b/assets/sprites/gui/brand.atlas
@@ -0,0 +1,20 @@
+
+brand.png
+size: 1024, 512
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+brand
+  rotate: false
+  xy: 2, 175
+  size: 565, 175
+  orig: 565, 175
+  offset: 0, 0
+  index: -1
+brandOnline
+  rotate: false
+  xy: 2, 0
+  size: 565, 175
+  orig: 565, 175
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/gui/brand.png b/assets/sprites/gui/brand.png
new file mode 100644
index 0000000..2caa8c7
--- /dev/null
+++ b/assets/sprites/gui/brand.png
diff --git a/assets/sprites/gui/icons.atlas b/assets/sprites/gui/icons.atlas
new file mode 100644
index 0000000..93be8cd
--- /dev/null
+++ b/assets/sprites/gui/icons.atlas
@@ -0,0 +1,20 @@
+
+icons.png
+size: 256, 256
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+exclamination
+  rotate: false
+  xy: 2, 2
+  size: 33, 33
+  orig: 33, 33
+  offset: 0, 0
+  index: -1
+package
+  rotate: false
+  xy: 2, 37
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/gui/icons.png b/assets/sprites/gui/icons.png
new file mode 100644
index 0000000..47ad356
--- /dev/null
+++ b/assets/sprites/gui/icons.png
diff --git a/assets/sprites/gui/ilotterytea.atlas b/assets/sprites/gui/ilotterytea.atlas
new file mode 100644
index 0000000..d593285
--- /dev/null
+++ b/assets/sprites/gui/ilotterytea.atlas
@@ -0,0 +1,27 @@
+
+ilotterytea.png
+size: 256, 256
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+org
+  rotate: false
+  xy: 126, 38
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
+devOld
+  rotate: false
+  xy: 0, 24
+  size: 126, 37
+  orig: 126, 37
+  offset: 0, 0
+  index: -1
+dev
+  rotate: false
+  xy: 0, 0
+  size: 126, 24
+  orig: 126, 24
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/gui/ilotterytea.png b/assets/sprites/gui/ilotterytea.png
new file mode 100644
index 0000000..b139b8f
--- /dev/null
+++ b/assets/sprites/gui/ilotterytea.png
diff --git a/assets/sprites/gui/widgeticons.atlas b/assets/sprites/gui/widgeticons.atlas
new file mode 100644
index 0000000..bcb1ad5
--- /dev/null
+++ b/assets/sprites/gui/widgeticons.atlas
@@ -0,0 +1,20 @@
+
+widgeticons.png
+size: 256, 128
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+exit
+  rotate: false
+  xy: 128, 0
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+options
+  rotate: false
+  xy: 0, 0
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/gui/widgeticons.png b/assets/sprites/gui/widgeticons.png
new file mode 100644
index 0000000..2f83822
--- /dev/null
+++ b/assets/sprites/gui/widgeticons.png
diff --git a/assets/sprites/gui/widgets.atlas b/assets/sprites/gui/widgets.atlas
new file mode 100644
index 0000000..94c7bbd
--- /dev/null
+++ b/assets/sprites/gui/widgets.atlas
@@ -0,0 +1,49 @@
+
+widgets.png
+size: 128, 16
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+down
+  rotate: false
+  xy: 0, 0
+  size: 16, 16
+  split: 4, 4, 4, 4
+  pad: 4, 4, 4, 4
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+frame
+  rotate: false
+  xy: 16, 0
+  size: 16, 16
+  split: 3, 3, 3, 3
+  pad: 3, 3, 3, 3
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+over
+  rotate: false
+  xy: 32, 0
+  size: 16, 16
+  split: 4, 4, 4, 4
+  pad: 4, 4, 4, 4
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+tile
+  rotate: false
+  xy: 64, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+up
+  rotate: false
+  xy: 48, 0
+  size: 16, 16
+  split: 4, 4, 4, 4
+  pad: 4, 4, 4, 4
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
diff --git a/assets/sprites/gui/widgets.png b/assets/sprites/gui/widgets.png
new file mode 100644
index 0000000..8da55d9
--- /dev/null
+++ b/assets/sprites/gui/widgets.png
diff --git a/assets/sprites/gui/widgets.skin b/assets/sprites/gui/widgets.skin
new file mode 100644
index 0000000..6497438
--- /dev/null
+++ b/assets/sprites/gui/widgets.skin
@@ -0,0 +1,78 @@
+{
+
+  Color: {
+    blackSemitransparent: {hex: "#00000099"},
+    grey: {hex: "#5f574fff" },
+    lightgrey: {hex: "#c2c3c7ff" },
+    white: {hex: "#fff1e8ff" },
+    yellow: {hex: "#ffec27ff" }
+  },
+  com.badlogic.gdx.graphics.g2d.BitmapFont: {
+    default: {
+      file: fnt/MaxonTrebuchet.fnt,
+      scaledSize: 24
+    },
+    text: {
+      file: fnt/MaxonTrebuchet.fnt,
+      scaledSize: 18
+    }
+  }
+  TintedDrawable: {
+    plain_up: {
+      color: { hex: "#30303055" }
+      name: tile
+    },
+    plain_over: {
+      color: { hex: "#99999999" }
+      name: tile
+    },
+    plain_down: {
+      color: { hex: "#30303022" }
+      name: tile
+    },
+  }
+  com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
+    default: {
+      font: default,
+      up: up,
+      down: down,
+      over: over,
+      disabled: down
+    }
+  },
+  com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
+    default: {
+      up: up,
+      down: down,
+      over: over,
+      disabled: down
+    },
+    slot: {
+      up: plain_up,
+      down: plain_down,
+      over: plain_over,
+      disabled: plain_down
+    }
+  },
+  com.badlogic.gdx.scenes.scene2d.ui.TextTooltip$TextTooltipStyle: {
+    default: {
+      label: { font: default },
+      background: up,
+      wrapWidth: 400
+    }
+  },
+  com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
+    default: {
+      font: default,
+      fontColor: lightgrey,
+      focusedFontColor: yellow,
+      background: plain_up,
+      focusedBackground: plain_over,
+    }
+  },
+  com.badlogic.gdx.scenes.scene2d.ui.Table: {
+    default: {
+      background: plain_up
+    }
+  }
+}
\ No newline at end of file
diff --git a/assets/sprites/icons/exclamination.png b/assets/sprites/icons/exclamination.png
deleted file mode 100644
index a41dc44..0000000
--- a/assets/sprites/icons/exclamination.png
+++ /dev/null
diff --git a/assets/sprites/icons/package.png b/assets/sprites/icons/package.png
deleted file mode 100644
index 4364430..0000000
--- a/assets/sprites/icons/package.png
+++ /dev/null
diff --git a/assets/sprites/ilotterytea.png b/assets/sprites/ilotterytea.png
deleted file mode 100644
index 075dc08..0000000
--- a/assets/sprites/ilotterytea.png
+++ /dev/null
diff --git a/assets/sprites/menu/tile_1.png b/assets/sprites/menu/tile_1.png
deleted file mode 100644
index f3cf20e..0000000
--- a/assets/sprites/menu/tile_1.png
+++ /dev/null
diff --git a/assets/sprites/menu/tile_2.png b/assets/sprites/menu/tile_2.png
deleted file mode 100644
index b7bb214..0000000
--- a/assets/sprites/menu/tile_2.png
+++ /dev/null
diff --git a/assets/sprites/menu/tile_cat.png b/assets/sprites/menu/tile_cat.png
deleted file mode 100644
index 313e672..0000000
--- a/assets/sprites/menu/tile_cat.png
+++ /dev/null
diff --git a/assets/sprites/supadank.png b/assets/sprites/supadank.png
deleted file mode 100644
index c16aa93..0000000
--- a/assets/sprites/supadank.png
+++ /dev/null
diff --git a/assets/sprites/ui/button.9.png b/assets/sprites/ui/button.9.png
deleted file mode 100644
index f96acc5..0000000
--- a/assets/sprites/ui/button.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/button_clicked.9.png b/assets/sprites/ui/button_clicked.9.png
deleted file mode 100644
index 704a804..0000000
--- a/assets/sprites/ui/button_clicked.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/button_highlighted.9.png b/assets/sprites/ui/button_highlighted.9.png
deleted file mode 100644
index fae5e65..0000000
--- a/assets/sprites/ui/button_highlighted.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/button_over.9.png b/assets/sprites/ui/button_over.9.png
deleted file mode 100644
index 62d124f..0000000
--- a/assets/sprites/ui/button_over.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/button_pressed.9.png b/assets/sprites/ui/button_pressed.9.png
deleted file mode 100644
index d4f9d3b..0000000
--- a/assets/sprites/ui/button_pressed.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/button_static.9.png b/assets/sprites/ui/button_static.9.png
deleted file mode 100644
index 7da5fba..0000000
--- a/assets/sprites/ui/button_static.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/save_slot.9.png b/assets/sprites/ui/save_slot.9.png
deleted file mode 100644
index c4d6ef1..0000000
--- a/assets/sprites/ui/save_slot.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/save_slot_disabled.9.png b/assets/sprites/ui/save_slot_disabled.9.png
deleted file mode 100644
index 7f1508f..0000000
--- a/assets/sprites/ui/save_slot_disabled.9.png
+++ /dev/null
diff --git a/assets/sprites/ui/sqrbutton.png b/assets/sprites/ui/sqrbutton.png
deleted file mode 100644
index befe279..0000000
--- a/assets/sprites/ui/sqrbutton.png
+++ /dev/null
diff --git a/assets/sprites/ui/sqrbutton_disabled.png b/assets/sprites/ui/sqrbutton_disabled.png
deleted file mode 100644
index f7337e2..0000000
--- a/assets/sprites/ui/sqrbutton_disabled.png
+++ /dev/null
diff --git a/assets/sprites/ui/sqrbutton_down.png b/assets/sprites/ui/sqrbutton_down.png
deleted file mode 100644
index ab1dc32..0000000
--- a/assets/sprites/ui/sqrbutton_down.png
+++ /dev/null
diff --git a/assets/sprites/ui/sqrbutton_over.png b/assets/sprites/ui/sqrbutton_over.png
deleted file mode 100644
index eb47298..0000000
--- a/assets/sprites/ui/sqrbutton_over.png
+++ /dev/null
diff --git a/assets/sprites/white.png b/assets/sprites/white.png
deleted file mode 100644
index 04a434b..0000000
--- a/assets/sprites/white.png
+++ /dev/null