diff --git a/android/assets/application/gfx/common/background_wooden.png b/android/assets/CZ/application/gfx/common/background_wooden.png
similarity index 100%
rename from android/assets/application/gfx/common/background_wooden.png
rename to android/assets/CZ/application/gfx/common/background_wooden.png
diff --git a/android/assets/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg b/android/assets/CZ/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg
similarity index 100%
rename from android/assets/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg
rename to android/assets/CZ/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg
diff --git a/android/assets/application/gfx/intro/screen_loader_background.png b/android/assets/CZ/application/gfx/intro/screen_loader_background.png
similarity index 100%
rename from android/assets/application/gfx/intro/screen_loader_background.png
rename to android/assets/CZ/application/gfx/intro/screen_loader_background.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/arrested.png b/android/assets/CZ/game/robbery/gfx/gamescreen/arrested.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/arrested.png
rename to android/assets/CZ/game/robbery/gfx/gamescreen/arrested.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png b/android/assets/CZ/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png
rename to android/assets/CZ/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png
diff --git a/android/assets/SK/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg b/android/assets/SK/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e3a650e2f4ed3277ee77f08cc3d59310ed58c5a8
Binary files /dev/null and b/android/assets/SK/application/gfx/gamemenu/screen_gamemenu_startmenu_background.jpg differ
diff --git a/android/assets/SK/application/gfx/intro/screen_loader_background.png b/android/assets/SK/application/gfx/intro/screen_loader_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbcbcbd2c1c94ae8a3709cdba144b2d878350647
Binary files /dev/null and b/android/assets/SK/application/gfx/intro/screen_loader_background.png differ
diff --git a/android/assets/SK/game/robbery/gfx/gamescreen/arrested.png b/android/assets/SK/game/robbery/gfx/gamescreen/arrested.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d3463b7590d4681aa74bcbcb29af54918c8d0ca
Binary files /dev/null and b/android/assets/SK/game/robbery/gfx/gamescreen/arrested.png differ
diff --git a/android/assets/SK/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png b/android/assets/SK/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..673c26907dd027eb118f47c1b9cf5aaf0f5841d5
Binary files /dev/null and b/android/assets/SK/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png differ
diff --git a/android/assets/application/font/Roboto-Bold.ttf b/android/assets/common/application/font/Roboto-Bold.ttf
similarity index 100%
rename from android/assets/application/font/Roboto-Bold.ttf
rename to android/assets/common/application/font/Roboto-Bold.ttf
diff --git a/android/assets/application/font/Roboto-Regular.ttf b/android/assets/common/application/font/Roboto-Regular.ttf
similarity index 100%
rename from android/assets/application/font/Roboto-Regular.ttf
rename to android/assets/common/application/font/Roboto-Regular.ttf
diff --git a/android/assets/application/gfx/mainmenu/background.png b/android/assets/common/application/gfx/mainmenu/background.png
similarity index 100%
rename from android/assets/application/gfx/mainmenu/background.png
rename to android/assets/common/application/gfx/mainmenu/background.png
diff --git a/android/assets/game/robbery/gfx/character/a_background_white.png b/android/assets/common/game/robbery/gfx/character/a_background_white.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/a_background_white.png
rename to android/assets/common/game/robbery/gfx/character/a_background_white.png
diff --git a/android/assets/game/robbery/gfx/character/f_beads_blue.png b/android/assets/common/game/robbery/gfx/character/f_beads_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_beads_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_beads_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_beads_grey.png b/android/assets/common/game/robbery/gfx/character/f_beads_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_beads_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_beads_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_beads_red.png b/android/assets/common/game/robbery/gfx/character/f_beads_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_beads_red.png
rename to android/assets/common/game/robbery/gfx/character/f_beads_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_braidhair_black.png b/android/assets/common/game/robbery/gfx/character/f_braidhair_black.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_braidhair_black.png
rename to android/assets/common/game/robbery/gfx/character/f_braidhair_black.png
diff --git a/android/assets/game/robbery/gfx/character/f_braidhair_brown.png b/android/assets/common/game/robbery/gfx/character/f_braidhair_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_braidhair_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_braidhair_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_braidhair_yellow.png b/android/assets/common/game/robbery/gfx/character/f_braidhair_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_braidhair_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_braidhair_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_coat_brown.png b/android/assets/common/game/robbery/gfx/character/f_coat_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_coat_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_coat_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_coat_green.png b/android/assets/common/game/robbery/gfx/character/f_coat_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_coat_green.png
rename to android/assets/common/game/robbery/gfx/character/f_coat_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_coat_grey.png b/android/assets/common/game/robbery/gfx/character/f_coat_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_coat_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_coat_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_glasses.png b/android/assets/common/game/robbery/gfx/character/f_glasses.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_glasses.png
rename to android/assets/common/game/robbery/gfx/character/f_glasses.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_blue.png b/android/assets/common/game/robbery/gfx/character/f_hat_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_green.png b/android/assets/common/game/robbery/gfx/character/f_hat_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_green.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_grey.png b/android/assets/common/game/robbery/gfx/character/f_hat_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_purple.png b/android/assets/common/game/robbery/gfx/character/f_hat_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_red.png b/android/assets/common/game/robbery/gfx/character/f_hat_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_red.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_hat_yellow.png b/android/assets/common/game/robbery/gfx/character/f_hat_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_hat_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_hat_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_head_1.png b/android/assets/common/game/robbery/gfx/character/f_head_1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_head_1.png
rename to android/assets/common/game/robbery/gfx/character/f_head_1.png
diff --git a/android/assets/game/robbery/gfx/character/f_head_2.png b/android/assets/common/game/robbery/gfx/character/f_head_2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_head_2.png
rename to android/assets/common/game/robbery/gfx/character/f_head_2.png
diff --git a/android/assets/game/robbery/gfx/character/f_longhair_black.png b/android/assets/common/game/robbery/gfx/character/f_longhair_black.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_longhair_black.png
rename to android/assets/common/game/robbery/gfx/character/f_longhair_black.png
diff --git a/android/assets/game/robbery/gfx/character/f_longhair_brown.png b/android/assets/common/game/robbery/gfx/character/f_longhair_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_longhair_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_longhair_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_longhair_yellow.png b/android/assets/common/game/robbery/gfx/character/f_longhair_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_longhair_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_longhair_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_blue.png b/android/assets/common/game/robbery/gfx/character/f_pants_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_brown.png b/android/assets/common/game/robbery/gfx/character/f_pants_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_green.png b/android/assets/common/game/robbery/gfx/character/f_pants_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_green.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_grey.png b/android/assets/common/game/robbery/gfx/character/f_pants_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_purple.png b/android/assets/common/game/robbery/gfx/character/f_pants_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_pants_red.png b/android/assets/common/game/robbery/gfx/character/f_pants_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_pants_red.png
rename to android/assets/common/game/robbery/gfx/character/f_pants_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_scarf_green.png b/android/assets/common/game/robbery/gfx/character/f_scarf_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_scarf_green.png
rename to android/assets/common/game/robbery/gfx/character/f_scarf_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_scarf_purple.png b/android/assets/common/game/robbery/gfx/character/f_scarf_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_scarf_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_scarf_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_scarf_yellow.png b/android/assets/common/game/robbery/gfx/character/f_scarf_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_scarf_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_scarf_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_blue.png b/android/assets/common/game/robbery/gfx/character/f_shirt_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_green.png b/android/assets/common/game/robbery/gfx/character/f_shirt_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_green.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_grey.png b/android/assets/common/game/robbery/gfx/character/f_shirt_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_purple.png b/android/assets/common/game/robbery/gfx/character/f_shirt_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_red.png b/android/assets/common/game/robbery/gfx/character/f_shirt_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_red.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_shirt_yellow.png b/android/assets/common/game/robbery/gfx/character/f_shirt_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_shirt_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_shirt_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_blue.png b/android/assets/common/game/robbery/gfx/character/f_skirt_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_green.png b/android/assets/common/game/robbery/gfx/character/f_skirt_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_green.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_grey.png b/android/assets/common/game/robbery/gfx/character/f_skirt_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_purple.png b/android/assets/common/game/robbery/gfx/character/f_skirt_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_red.png b/android/assets/common/game/robbery/gfx/character/f_skirt_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_red.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_skirt_yellow.png b/android/assets/common/game/robbery/gfx/character/f_skirt_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_skirt_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_skirt_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_brown.png b/android/assets/common/game/robbery/gfx/character/f_sweater_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_green.png b/android/assets/common/game/robbery/gfx/character/f_sweater_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_green.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_grey.png b/android/assets/common/game/robbery/gfx/character/f_sweater_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_purple.png b/android/assets/common/game/robbery/gfx/character/f_sweater_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_red.png b/android/assets/common/game/robbery/gfx/character/f_sweater_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_red.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_red.png
diff --git a/android/assets/game/robbery/gfx/character/f_sweater_yellow.png b/android/assets/common/game/robbery/gfx/character/f_sweater_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_sweater_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_sweater_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_blue.png b/android/assets/common/game/robbery/gfx/character/f_vest_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_blue.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_blue.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_brown.png b/android/assets/common/game/robbery/gfx/character/f_vest_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_brown.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_brown.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_green.png b/android/assets/common/game/robbery/gfx/character/f_vest_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_green.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_green.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_grey.png b/android/assets/common/game/robbery/gfx/character/f_vest_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_grey.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_grey.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_purple.png b/android/assets/common/game/robbery/gfx/character/f_vest_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_purple.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_purple.png
diff --git a/android/assets/game/robbery/gfx/character/f_vest_yellow.png b/android/assets/common/game/robbery/gfx/character/f_vest_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/f_vest_yellow.png
rename to android/assets/common/game/robbery/gfx/character/f_vest_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_coat_blue.png b/android/assets/common/game/robbery/gfx/character/m_coat_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_coat_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_coat_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_coat_brown.png b/android/assets/common/game/robbery/gfx/character/m_coat_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_coat_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_coat_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_coat_grey.png b/android/assets/common/game/robbery/gfx/character/m_coat_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_coat_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_coat_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_glasses.png b/android/assets/common/game/robbery/gfx/character/m_glasses.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_glasses.png
rename to android/assets/common/game/robbery/gfx/character/m_glasses.png
diff --git a/android/assets/game/robbery/gfx/character/m_hair_black.png b/android/assets/common/game/robbery/gfx/character/m_hair_black.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hair_black.png
rename to android/assets/common/game/robbery/gfx/character/m_hair_black.png
diff --git a/android/assets/game/robbery/gfx/character/m_hair_brown.png b/android/assets/common/game/robbery/gfx/character/m_hair_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hair_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_hair_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_hair_yellow.png b/android/assets/common/game/robbery/gfx/character/m_hair_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hair_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_hair_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_brown.png b/android/assets/common/game/robbery/gfx/character/m_hat_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_green.png b/android/assets/common/game/robbery/gfx/character/m_hat_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_green.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_grey.png b/android/assets/common/game/robbery/gfx/character/m_hat_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_purple.png b/android/assets/common/game/robbery/gfx/character/m_hat_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_purple.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_purple.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_red.png b/android/assets/common/game/robbery/gfx/character/m_hat_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_red.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_hat_yellow.png b/android/assets/common/game/robbery/gfx/character/m_hat_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_hat_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_hat_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_head_1.png b/android/assets/common/game/robbery/gfx/character/m_head_1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_head_1.png
rename to android/assets/common/game/robbery/gfx/character/m_head_1.png
diff --git a/android/assets/game/robbery/gfx/character/m_head_2.png b/android/assets/common/game/robbery/gfx/character/m_head_2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_head_2.png
rename to android/assets/common/game/robbery/gfx/character/m_head_2.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_blue.png b/android/assets/common/game/robbery/gfx/character/m_pants_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_brown.png b/android/assets/common/game/robbery/gfx/character/m_pants_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_green.png b/android/assets/common/game/robbery/gfx/character/m_pants_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_green.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_grey.png b/android/assets/common/game/robbery/gfx/character/m_pants_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_red.png b/android/assets/common/game/robbery/gfx/character/m_pants_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_red.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_pants_yellow.png b/android/assets/common/game/robbery/gfx/character/m_pants_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_pants_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_pants_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_scarf_blue.png b/android/assets/common/game/robbery/gfx/character/m_scarf_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_scarf_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_scarf_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_scarf_brown.png b/android/assets/common/game/robbery/gfx/character/m_scarf_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_scarf_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_scarf_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_scarf_yellow.png b/android/assets/common/game/robbery/gfx/character/m_scarf_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_scarf_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_scarf_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_blue.png b/android/assets/common/game/robbery/gfx/character/m_shirt_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_brown.png b/android/assets/common/game/robbery/gfx/character/m_shirt_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_green.png b/android/assets/common/game/robbery/gfx/character/m_shirt_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_green.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_grey.png b/android/assets/common/game/robbery/gfx/character/m_shirt_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_red.png b/android/assets/common/game/robbery/gfx/character/m_shirt_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_red.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_shirt_yellow.png b/android/assets/common/game/robbery/gfx/character/m_shirt_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shirt_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_shirt_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_blue.png b/android/assets/common/game/robbery/gfx/character/m_shorts_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_green.png b/android/assets/common/game/robbery/gfx/character/m_shorts_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_green.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_grey.png b/android/assets/common/game/robbery/gfx/character/m_shorts_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_purple.png b/android/assets/common/game/robbery/gfx/character/m_shorts_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_purple.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_purple.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_red.png b/android/assets/common/game/robbery/gfx/character/m_shorts_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_red.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_shorts_yellow.png b/android/assets/common/game/robbery/gfx/character/m_shorts_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_shorts_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_shorts_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_blue.png b/android/assets/common/game/robbery/gfx/character/m_sweater_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_brown.png b/android/assets/common/game/robbery/gfx/character/m_sweater_brown.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_brown.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_brown.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_green.png b/android/assets/common/game/robbery/gfx/character/m_sweater_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_green.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_grey.png b/android/assets/common/game/robbery/gfx/character/m_sweater_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_red.png b/android/assets/common/game/robbery/gfx/character/m_sweater_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_red.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_sweater_yellow.png b/android/assets/common/game/robbery/gfx/character/m_sweater_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_sweater_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_sweater_yellow.png
diff --git a/android/assets/game/robbery/gfx/character/m_tie_green.png b/android/assets/common/game/robbery/gfx/character/m_tie_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_tie_green.png
rename to android/assets/common/game/robbery/gfx/character/m_tie_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_tie_grey.png b/android/assets/common/game/robbery/gfx/character/m_tie_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_tie_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_tie_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_tie_red.png b/android/assets/common/game/robbery/gfx/character/m_tie_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_tie_red.png
rename to android/assets/common/game/robbery/gfx/character/m_tie_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_blue.png b/android/assets/common/game/robbery/gfx/character/m_vest_blue.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_blue.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_blue.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_green.png b/android/assets/common/game/robbery/gfx/character/m_vest_green.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_green.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_green.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_grey.png b/android/assets/common/game/robbery/gfx/character/m_vest_grey.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_grey.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_grey.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_purple.png b/android/assets/common/game/robbery/gfx/character/m_vest_purple.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_purple.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_purple.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_red.png b/android/assets/common/game/robbery/gfx/character/m_vest_red.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_red.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_red.png
diff --git a/android/assets/game/robbery/gfx/character/m_vest_yellow.png b/android/assets/common/game/robbery/gfx/character/m_vest_yellow.png
similarity index 100%
rename from android/assets/game/robbery/gfx/character/m_vest_yellow.png
rename to android/assets/common/game/robbery/gfx/character/m_vest_yellow.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s1.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s1.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s1.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s1_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s1_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s1_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s1_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s2.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s2.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s2.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s2_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s2_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s2_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s2_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s3.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s3.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s3.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s3.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s3_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s3_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s3_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s3_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s4.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s4.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s4.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s4.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s4_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s4_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s4_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s4_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s5.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s5.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s5.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s5.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/bank_s5_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/bank_s5_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/bank_s5_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/bank_s5_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/door_background_s1.png b/android/assets/common/game/robbery/gfx/gamescreen/door_background_s1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/door_background_s1.png
rename to android/assets/common/game/robbery/gfx/gamescreen/door_background_s1.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/door_background_s2.png b/android/assets/common/game/robbery/gfx/gamescreen/door_background_s2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/door_background_s2.png
rename to android/assets/common/game/robbery/gfx/gamescreen/door_background_s2.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/door_background_s3.png b/android/assets/common/game/robbery/gfx/gamescreen/door_background_s3.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/door_background_s3.png
rename to android/assets/common/game/robbery/gfx/gamescreen/door_background_s3.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/door_background_s4.png b/android/assets/common/game/robbery/gfx/gamescreen/door_background_s4.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/door_background_s4.png
rename to android/assets/common/game/robbery/gfx/gamescreen/door_background_s4.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/door_background_s5.png b/android/assets/common/game/robbery/gfx/gamescreen/door_background_s5.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/door_background_s5.png
rename to android/assets/common/game/robbery/gfx/gamescreen/door_background_s5.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/innocence.png b/android/assets/common/game/robbery/gfx/gamescreen/innocence.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/innocence.png
rename to android/assets/common/game/robbery/gfx/gamescreen/innocence.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s1.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s1.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s1.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s2.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s2.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s2.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s3.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s3.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s3.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s3.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s4.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s4.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s4.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s4.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s5.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s5.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s5.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s5.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s1.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s1.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s1.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s1.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s2.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s2.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s2.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s2.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s3.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s3.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s3.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s3.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s4.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s4.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s4.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s4.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s5.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s5.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s5.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s5.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png b/android/assets/common/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png
rename to android/assets/common/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png
diff --git a/android/assets/game/robbery/gfx/gamescreen/thief.png b/android/assets/common/game/robbery/gfx/gamescreen/thief.png
similarity index 100%
rename from android/assets/game/robbery/gfx/gamescreen/thief.png
rename to android/assets/common/game/robbery/gfx/gamescreen/thief.png
diff --git a/android/assets/game/robbery/sfx/alarm.mp3 b/android/assets/common/game/robbery/sfx/alarm.mp3
similarity index 100%
rename from android/assets/game/robbery/sfx/alarm.mp3
rename to android/assets/common/game/robbery/sfx/alarm.mp3
diff --git a/android/assets/game/robbery/sfx/chains.mp3 b/android/assets/common/game/robbery/sfx/chains.mp3
similarity index 100%
rename from android/assets/game/robbery/sfx/chains.mp3
rename to android/assets/common/game/robbery/sfx/chains.mp3
diff --git a/android/assets/game/robbery/sfx/error.mp3 b/android/assets/common/game/robbery/sfx/error.mp3
similarity index 100%
rename from android/assets/game/robbery/sfx/error.mp3
rename to android/assets/common/game/robbery/sfx/error.mp3
diff --git a/android/assets/application/text/application.properties b/android/assets/text/application/application.properties
similarity index 100%
rename from android/assets/application/text/application.properties
rename to android/assets/text/application/application.properties
diff --git a/android/assets/application/text/application_sk_SK.properties b/android/assets/text/application/application_sk_SK.properties
similarity index 100%
rename from android/assets/application/text/application_sk_SK.properties
rename to android/assets/text/application/application_sk_SK.properties
diff --git a/android/assets/application/text/language_sk_SK.properties b/android/assets/text/application/language_sk_SK.properties
similarity index 100%
rename from android/assets/application/text/language_sk_SK.properties
rename to android/assets/text/application/language_sk_SK.properties
diff --git a/android/assets/application/text/preferences.properties b/android/assets/text/application/preferences.properties
similarity index 100%
rename from android/assets/application/text/preferences.properties
rename to android/assets/text/application/preferences.properties
diff --git a/android/assets/game/robbery/text/robbery.properties b/android/assets/text/game/robbery/robbery.properties
similarity index 100%
rename from android/assets/game/robbery/text/robbery.properties
rename to android/assets/text/game/robbery/robbery.properties
diff --git a/android/assets/game/robbery/text/robbery_sk_SK.properties b/android/assets/text/game/robbery/robbery_sk_SK.properties
similarity index 100%
rename from android/assets/game/robbery/text/robbery_sk_SK.properties
rename to android/assets/text/game/robbery/robbery_sk_SK.properties
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index 0d89ba99bac0b412ef89a2a2c2785d594af6b5d6..63ab155fd72d0d18fc1a1394c1973d59fb97e54b 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -12,9 +12,9 @@ import java.util.Locale;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.ApplicationBus.ApplicationEvent;
-import cz.nic.tablexia.loader.ApplicationFontManager;
-import cz.nic.tablexia.loader.ApplicationTextManager;
-import cz.nic.tablexia.loader.ApplicationTextureManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.menu.MainMenu;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
import cz.nic.tablexia.screen.LoaderScreen;
@@ -25,8 +25,8 @@ import cz.nic.tablexia.util.Log;
public class Tablexia extends TablexiaApplication {
- public static final String LOADER_BACKGOURND = "application/gfx/intro/screen_loader_background.png";
- private static final float MAIN_MWNU_WIDTH_RATIO = 2f/7;
+ public static final String LOADER_BACKGROUND = "CZ/application/gfx/intro/screen_loader_background.png";
+ private static final float MAIN_MENU_WIDTH_RATIO = 2f/7;
private boolean loadingComplete = false;
@@ -47,7 +47,7 @@ public class Tablexia extends TablexiaApplication {
}
private void prepareMainMenu() {
- MainMenu menu = new MainMenu(getStage().getWidth() * MAIN_MWNU_WIDTH_RATIO, getStage().getHeight());
+ MainMenu menu = new MainMenu(getStage().getWidth() * MAIN_MENU_WIDTH_RATIO, getStage().getHeight());
menu.initMenuItems();
getStage().addActor(menu);
}
@@ -68,9 +68,9 @@ public class Tablexia extends TablexiaApplication {
// sync loading of first application image (loader background)
AssetManager loaderGraphicManager = new AssetManager();
- loaderGraphicManager.load(LOADER_BACKGOURND, Texture.class);
+ loaderGraphicManager.load(LOADER_BACKGROUND, Texture.class);
loaderGraphicManager.finishLoading();
- setScreenIfIsDifferent(new LoaderScreen(loaderGraphicManager.get(LOADER_BACKGOURND, Texture.class)));
+ setScreenIfIsDifferent(new LoaderScreen(loaderGraphicManager.get(LOADER_BACKGROUND, Texture.class)));
// async loading of remaining application assets
ApplicationTextureManager.getInstance().load();
diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index c72b372c07837a693343d8d561a2ccbb2cc10681..a543b62d893042fe61abd4b8c0618723d43973e9 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -5,7 +5,7 @@ import com.badlogic.gdx.Preferences;
import java.util.Locale;
-import cz.nic.tablexia.loader.ApplicationTextManager;
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
import cz.nic.tablexia.util.Log;
public class TablexiaSettings {
@@ -51,7 +51,8 @@ public class TablexiaSettings {
cs_CZ (new Locale("cs", "CZ"), "cs_CZ", ApplicationTextManager.LANGUAGE_CZECH),
sk_SK (new Locale("sk", "SK"), "sk_SK", ApplicationTextManager.LANGUAGE_SLOVAK);
- private final static LocaleDefinition FALLBACK_VARIANT = LocaleDefinition.SYSTEM;
+ public final static LocaleDefinition DEFAULT_LOCALE = LocaleDefinition.cs_CZ;
+ private final static LocaleDefinition FALLBACK_VARIANT = LocaleDefinition.SYSTEM;
private final Locale locale;
private final String localeKey;
diff --git a/core/src/cz/nic/tablexia/game/GameDefinition.java b/core/src/cz/nic/tablexia/game/GameDefinition.java
index 2a09ce288ea244599c2c692d1fe1eaf14ec13914..cf3c5c8a53053e9ef39df19aa39c0181ecc5da62 100644
--- a/core/src/cz/nic/tablexia/game/GameDefinition.java
+++ b/core/src/cz/nic/tablexia/game/GameDefinition.java
@@ -5,7 +5,7 @@ import cz.nic.tablexia.TablexiaApplication.ScreenTransaction;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.ApplicationBus.ApplicationEvent;
import cz.nic.tablexia.game.games.robbery.RobberyScreen;
-import cz.nic.tablexia.loader.ApplicationTextManager;
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
import cz.nic.tablexia.menu.IMenuItem;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
index 0619a27daa1bf5be5dd1bdd366d540296b19baaa..8df059034178fccaf80ec1ea631af06d16aea46a 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
@@ -51,151 +51,151 @@ public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
//////////////////////////// SCREEN LOADERS
@Override
- protected void prepareScreenTextureAssetNames(List<String> texturesFileNames) {
- texturesFileNames.add(CommonAssets.WOODEN_BACKGOURND);
+ protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
+ textureFileNames.add(CommonAssets.WOODEN_BACKGOURND);
- texturesFileNames.add(RobberyAssets.SCREEN_RULEMESSAGE_PAPER_S1);
- texturesFileNames.add(RobberyAssets.SCREEN_BANK_S1);
- texturesFileNames.add(RobberyAssets.SCREEN_NEWSSTAND_S5);
- texturesFileNames.add(RobberyAssets.SCREEN_NEWSSTAND_BOTTOM_S5);
- texturesFileNames.add(RobberyAssets.SCREEN_BACKGROUND_S5);
+ textureFileNames.add(RobberyAssets.SCREEN_RULEMESSAGE_PAPER_S1);
+ textureFileNames.add(RobberyAssets.SCREEN_BANK_S1);
+ textureFileNames.add(RobberyAssets.SCREEN_NEWSSTAND_S5);
+ textureFileNames.add(RobberyAssets.SCREEN_NEWSSTAND_BOTTOM_S5);
+ textureFileNames.add(RobberyAssets.SCREEN_BACKGROUND_S5);
- texturesFileNames.add(RobberyAssets.INFOITEM_ARRESTED);
- texturesFileNames.add(RobberyAssets.INFOITEM_INNOCENCE);
- texturesFileNames.add(RobberyAssets.INFOITEM_ALARM);
+ textureFileNames.add(RobberyAssets.INFOITEM_ARRESTED);
+ textureFileNames.add(RobberyAssets.INFOITEM_INNOCENCE);
+ textureFileNames.add(RobberyAssets.INFOITEM_ALARM);
- texturesFileNames.add(RobberyAssets.CREATURE_BACKGROUND_TEXTURE);
+ textureFileNames.add(RobberyAssets.CREATURE_BACKGROUND_TEXTURE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BEADS_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SCARF_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SCARF_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_TIE_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_PANTS_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SKIRT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_PANTS_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHORT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HAT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_COAT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SHIRT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_SWEATER_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_VEST_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_COAT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SHIRT_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_SWEATER_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_BLUE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_GREEN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_GREY);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_PURPLE);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_RED);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_BLUE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_GREEN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_GREY);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_PURPLE);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_RED);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_VEST_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_GLASSES);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_GLASSES);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_GLASSES);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_GLASSES);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_BLACK);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_BLACK);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_BRAIDHAIR_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_BLACK);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_BLACK);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_LONGHAIR_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_BLACK);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_BROWN);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_YELLOW);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_BLACK);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_BROWN);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HAIR_YELLOW);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HEAD_1);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_F_HEAD_2);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HEAD_1);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_F_HEAD_2);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HEAD_1);
- texturesFileNames.add(RobberyAssets.ATTRIBUTE_M_HEAD_2);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HEAD_1);
+ textureFileNames.add(RobberyAssets.ATTRIBUTE_M_HEAD_2);
}
@Override
@@ -379,7 +379,7 @@ public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
public static String getRobberyFormatedText(String key, Object... args) {
if (instance != null) {
- return instance.getFormatedText(key, args);
+ return instance.getFormattedText(key, args);
}
return null;
}
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java b/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
index a9bb9761ffd6ff0d50fe9ec74d76e7297a0ecece..2ae1eab7ab4f19135a6e5e577e1f2bb66b2845d0 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
@@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import cz.nic.tablexia.game.games.robbery.assets.RobberyAssets;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.loader.CommonAssets;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/assets/RobberyAssets.java b/core/src/cz/nic/tablexia/game/games/robbery/assets/RobberyAssets.java
index d9af6084f502f0fbda32eaad6c461de002dcbc38..c1d4b72d381120335d13bcd0a528439d20149d15 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/assets/RobberyAssets.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/assets/RobberyAssets.java
@@ -9,7 +9,7 @@ public final class RobberyAssets {
public static final String ROBBERY_PATH = "game/robbery/";
- public static final String TEXT_PATH = ROBBERY_PATH + "text/robbery";
+ public static final String TEXT_PATH = "text/game/robbery";
public static final String ROBBERY_SFX_PATH = ROBBERY_PATH + "sfx/";
diff --git a/core/src/cz/nic/tablexia/loader/TablexiaAssetManager.java b/core/src/cz/nic/tablexia/loader/TablexiaAssetManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..bcc4ebddccca8a1b911c69d74ed3904cdb1a4754
--- /dev/null
+++ b/core/src/cz/nic/tablexia/loader/TablexiaAssetManager.java
@@ -0,0 +1,42 @@
+package cz.nic.tablexia.loader;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.assets.AssetManager;
+
+import java.util.Locale;
+
+import cz.nic.tablexia.TablexiaSettings;
+
+public class TablexiaAssetManager extends AssetManager {
+
+ private final String LOCALISED_PATH;
+ private static final String LOCALISED_DEAFULT_PATH = TablexiaSettings.LocaleDefinition.DEFAULT_LOCALE.getLocale().getCountry() + "/";
+ private static final String COMMON_PATH = "common/";
+
+ protected TablexiaAssetManager(Locale locale) {
+ LOCALISED_PATH = locale.getCountry() + "/";
+ }
+
+ protected String prepareAssetPath(String assetPath) {
+ if (Gdx.files.internal(getLocalisedAssetName(assetPath)).exists()) {
+ return getLocalisedAssetName(assetPath);
+ } else if (Gdx.files.internal(getDefaultLocalisedAssetName(assetPath)).exists()) {
+ return getDefaultLocalisedAssetName(assetPath);
+ } else if (Gdx.files.internal(getCommonAssetName(assetPath)).exists()) {
+ return getCommonAssetName(assetPath);
+ }
+ return null;
+ }
+
+ private String getLocalisedAssetName(String assetName) {
+ return LOCALISED_PATH + assetName;
+ }
+
+ private String getDefaultLocalisedAssetName(String assetName) {
+ return LOCALISED_DEAFULT_PATH + assetName;
+ }
+
+ private String getCommonAssetName(String assetName) {
+ return COMMON_PATH + assetName;
+ }
+}
diff --git a/core/src/cz/nic/tablexia/loader/TablexiaTextureManager.java b/core/src/cz/nic/tablexia/loader/TablexiaTextureManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..f6d168b3054abb680877f08f80584764f9e9ffa9
--- /dev/null
+++ b/core/src/cz/nic/tablexia/loader/TablexiaTextureManager.java
@@ -0,0 +1,45 @@
+package cz.nic.tablexia.loader;
+
+import com.badlogic.gdx.graphics.Texture;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import cz.nic.tablexia.TablexiaSettings;
+import cz.nic.tablexia.util.Log;
+
+public class TablexiaTextureManager extends TablexiaAssetManager {
+
+ private Map<String, String> loadedTextures = new HashMap<String, String>();
+
+ public TablexiaTextureManager() {
+ super(TablexiaSettings.getInstance().getLocale());
+ }
+
+ public void loadTexture(String textureName) {
+ String textureFileName = prepareAssetPath(textureName);
+ if (textureFileName != null) {
+ loadedTextures.put(textureName, textureFileName);
+ load(textureFileName, Texture.class);
+ } else {
+ Log.err(getClass(), "Asset file for name: " + textureName + " was not found!");
+ }
+ }
+
+ public Texture getTexture(String textureName) {
+ if (!loadedTextures.containsKey(textureName)) {
+ String errorMessage = "Texture with name: " + textureName + " was not found!";
+ Log.err(getClass(), errorMessage);
+ throw new IllegalStateException(errorMessage);
+ }
+
+ String assetName = loadedTextures.get(textureName);
+ return get(assetName, Texture.class);
+ }
+
+ @Override
+ public synchronized void dispose() {
+ super.dispose();
+ loadedTextures.clear();
+ }
+}
diff --git a/core/src/cz/nic/tablexia/loader/ApplicationFontManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java
similarity index 92%
rename from core/src/cz/nic/tablexia/loader/ApplicationFontManager.java
rename to core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java
index 64731633f6952739d83b9f1942be55712f28ede6..14d65051df64eca81110fca1db0b3f60133a0c16 100644
--- a/core/src/cz/nic/tablexia/loader/ApplicationFontManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java
@@ -1,4 +1,4 @@
-package cz.nic.tablexia.loader;
+package cz.nic.tablexia.loader.application;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.assets.loaders.FileHandleResolver;
import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
@@ -9,6 +9,8 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGeneratorLoader;
import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader;
import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader.FreeTypeFontLoaderParameter;
+import cz.nic.tablexia.loader.IApplicationLoader;
+
/**
* Font loader and manager class for application context
*
@@ -19,7 +21,7 @@ public class ApplicationFontManager extends AssetManager implements IApplication
private static final int FONT_SIZE = 20;
private static final String CZECH_CHARACTERS = "ěřťůšÄžÄňĚŘŤŮŠĎŽČŇ";
- private static final String APPLICATION_FONT_PATH = "application/font/";
+ private static final String APPLICATION_FONT_PATH = "common/application/font/";
public static final String FONT_ROBOTO_REGULAR = APPLICATION_FONT_PATH + "Roboto-Regular.ttf";
public static final String FONT_ROBOTO_BOLD = APPLICATION_FONT_PATH + "Roboto-Bold.ttf";
diff --git a/core/src/cz/nic/tablexia/loader/ApplicationTextManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
similarity index 88%
rename from core/src/cz/nic/tablexia/loader/ApplicationTextManager.java
rename to core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
index 9c7d45da0c03e1009ff6770949949dc92122554b..35ad28fa43036d9cb76327d26764b068f2fa27ef 100644
--- a/core/src/cz/nic/tablexia/loader/ApplicationTextManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
@@ -1,4 +1,4 @@
-package cz.nic.tablexia.loader;
+package cz.nic.tablexia.loader.application;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.async.AsyncTask;
import java.util.Locale;
import cz.nic.tablexia.game.loader.AbstractDataManager;
+import cz.nic.tablexia.loader.IApplicationLoader;
import cz.nic.tablexia.util.Log;
/**
@@ -18,7 +19,7 @@ import cz.nic.tablexia.util.Log;
*/
public class ApplicationTextManager extends AbstractDataManager<I18NBundle> implements IApplicationLoader {
- private static final String APPLICATION_TEXT_RESOURCE_FILE = "application/text/application";
+ private static final String APPLICATION_TEXT_RESOURCE_FILE = "text/application/application";
public static final String LANGUAGE_SYSTEM = "language_system";
public static final String LANGUAGE_CZECH = "language_czech";
@@ -53,7 +54,6 @@ public class ApplicationTextManager extends AbstractDataManager<I18NBundle> impl
}
public void load(Locale locale) {
- Log.info(getClass(), "Loading application texts with locale: " + locale);
setAsyncTask(new ApplicationTextLoader(APPLICATION_TEXT_RESOURCE_FILE, locale));
}
diff --git a/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
similarity index 58%
rename from core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java
rename to core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
index 4dc383f41e4ba67dffb0392a5b740e03d197b34b..0349fdffaf19c4069eb6263b77164d4ac756fb18 100644
--- a/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
@@ -1,10 +1,10 @@
-package cz.nic.tablexia.loader;
+package cz.nic.tablexia.loader.application;
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.graphics.Texture;
+import cz.nic.tablexia.loader.IApplicationLoader;
+import cz.nic.tablexia.loader.TablexiaTextureManager;
-public class ApplicationTextureManager extends AssetManager implements IApplicationLoader {
+public class ApplicationTextureManager extends TablexiaTextureManager implements IApplicationLoader {
private static ApplicationTextureManager instance;
@@ -22,18 +22,17 @@ public class ApplicationTextureManager extends AssetManager implements IApplicat
super.dispose();
instance = null;
}
-
+
private static final String APPLICATION_PATH = "application/";
private static final String MAINMENU_PATH = APPLICATION_PATH + "gfx/mainmenu/";
public static final String MAINMENU_BACKGROUND = MAINMENU_PATH + "background.png";
private static final String GAMEMENU_PATH = APPLICATION_PATH + "gfx/gamemenu/";
- public static final String STARTMENU_BACKGOURND = GAMEMENU_PATH + "screen_gamemenu_startmenu_background.jpg";
-
-
- public void load() {
- load(MAINMENU_BACKGROUND, Texture.class);
- load(STARTMENU_BACKGOURND, Texture.class);
- }
+ public static final String STARTMENU_BACKGROUND = GAMEMENU_PATH + "screen_gamemenu_startmenu_background.jpg";
+
+ public void load() {
+ loadTexture(MAINMENU_BACKGROUND);
+ loadTexture(STARTMENU_BACKGROUND);
+ }
}
\ No newline at end of file
diff --git a/core/src/cz/nic/tablexia/menu/MainMenu.java b/core/src/cz/nic/tablexia/menu/MainMenu.java
index 037b682b20c9bc06f4da4340b8dba04c442fa261..020f2750bc2ea4735e0dd4722e87fb0703cfb95f 100644
--- a/core/src/cz/nic/tablexia/menu/MainMenu.java
+++ b/core/src/cz/nic/tablexia/menu/MainMenu.java
@@ -20,8 +20,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.graphics.ColorTexture;
-import cz.nic.tablexia.loader.ApplicationFontManager;
-import cz.nic.tablexia.loader.ApplicationTextureManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
/**
* MainMenu container
@@ -44,13 +44,13 @@ public class MainMenu extends Stack {
private boolean isMenuOpen;
private Button openCloseButton;
private float menuClosePositionX;
- private int menuOpenPositonX;
- private int menuPositionY;
+ private int menuOpenPositonX;
+ private int menuPositionY;
public MainMenu(float width, float height) {
setBounds(0, 0, width, height);
setDebug(TablexiaSettings.getInstance().isShowBoudingBoxes());
- Texture background = ApplicationTextureManager.getInstance().get(ApplicationTextureManager.MAINMENU_BACKGROUND, Texture.class);
+ Texture background = ApplicationTextureManager.getInstance().getTexture(ApplicationTextureManager.MAINMENU_BACKGROUND);
background.setFilter(TextureFilter.Linear, TextureFilter.Linear);
// menu layout
diff --git a/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java b/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
index 7573f42eb370f843d6e9297824538c00aa60beb6..d14a719be94a921b1d52a397e464624e2d3df4b0 100644
--- a/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
+++ b/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
@@ -3,7 +3,7 @@ package cz.nic.tablexia.menu;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.ApplicationBus.ApplicationEvent;
import cz.nic.tablexia.game.GameDefinition;
-import cz.nic.tablexia.loader.ApplicationTextManager;
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
public enum MainMenuDefinition implements ApplicationEvent, IMenuItem {
diff --git a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java
index 54f350cbe3995a99497a58dc0290b296b12eab77..2b0c123bf810261c19efe0457771e8073ef79d21 100644
--- a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java
+++ b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java
@@ -1,11 +1,5 @@
package cz.nic.tablexia.screen;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.moveTo;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.ScreenAdapter;
@@ -20,16 +14,22 @@ import com.badlogic.gdx.utils.I18NBundle;
import com.badlogic.gdx.utils.async.AsyncTask;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.ApplicationBus.ApplicationEvent;
import cz.nic.tablexia.game.loader.AbstractDataManager;
-import cz.nic.tablexia.loader.IApplicationLoader;
+import cz.nic.tablexia.loader.TablexiaTextureManager;
import cz.nic.tablexia.util.Log;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.moveTo;
+
public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
- public static class TextManager extends AbstractDataManager<I18NBundle> implements IApplicationLoader {
+ private static class TextManager extends AbstractDataManager<I18NBundle> {
private static class TextLoader implements AsyncTask<I18NBundle> {
@@ -55,7 +55,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
}
}
- public class DataManager extends AbstractDataManager<T> implements IApplicationLoader {
+ private class DataManager extends AbstractDataManager<T> {
public class DataLoader implements AsyncTask<T> {
@@ -94,7 +94,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
}
private Stage stage;
- private AssetManager textureManager;
+ private TablexiaTextureManager textureManager;
private AssetManager soundManager;
private TextManager textManager;
private DataManager dataManager;
@@ -105,7 +105,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
public AbstractTablexiaScreen() {
stage = prepareStage();
- textureManager = new AssetManager();
+ textureManager = new TablexiaTextureManager();
soundManager = new AssetManager();
textManager = new TextManager();
dataManager = new DataManager();
@@ -238,7 +238,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
protected void screenDisposed() {};
protected void screenResized(int width, int height) {};
- protected void prepareScreenTextureAssetNames(List<String> texturesFileNames) {}
+ protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {}
protected void prepareScreenSoundAssetNames(List<String> soundsFileNames) {}
protected String prepareScreenTextResourcesAssetName() {
return null;
@@ -255,11 +255,11 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
//////////////////////////// LOADERS
private void startTextureLoader() {
- List<String> texturesFileNames = new ArrayList<String>();
- prepareScreenTextureAssetNames(texturesFileNames);
- for (String textureFileName : texturesFileNames) {
- textureManager.load(textureFileName, Texture.class);
- }
+ List<String> textureFileNames = new ArrayList<String>();
+ prepareScreenTextureAssetNames(textureFileNames);
+ for (String textureFileName : textureFileNames) {
+ textureManager.loadTexture(textureFileName);
+ }
}
private void startSoundLoader() {
@@ -278,9 +278,8 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
dataManager.load();
}
-
public Texture getTexture(String textureName) {
- return textureManager.get(textureName, Texture.class);
+ return textureManager.getTexture(textureName);
}
public Sound getSound(String soundName) {
@@ -291,7 +290,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter {
return textManager.getResult().get(key);
}
- public String getFormatedText(String key, Object... args) {
+ public String getFormattedText(String key, Object... args) {
return textManager.getResult().format(key, args);
}
diff --git a/core/src/cz/nic/tablexia/screen/about/AboutScreen.java b/core/src/cz/nic/tablexia/screen/about/AboutScreen.java
index 49f105b42d6ca98edb540fe65b08e4919425ebbb..2ed436b28617f10d6bb79f2cbedbf9f7124f43c5 100644
--- a/core/src/cz/nic/tablexia/screen/about/AboutScreen.java
+++ b/core/src/cz/nic/tablexia/screen/about/AboutScreen.java
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class AboutScreen extends AbstractTablexiaScreen<Void> {
diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
index 7115d3d3e9082a672b717581af7de1afb520b2bd..ec70a710500cf103350b877d0969cbeb7a453bdb 100644
--- a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
+++ b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class EncyclopediaScreen extends AbstractTablexiaScreen<Void> {
diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java
index 67d8af3b0d9738a94fb910b4a448abd0be22a551..25b4779038e48b597121bc95105a364f96c5e28c 100644
--- a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java
+++ b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java
@@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.scenes.scene2d.Actor;
-import cz.nic.tablexia.loader.ApplicationTextureManager;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class GameMenuScreen extends AbstractTablexiaScreen<Void> {
@@ -17,7 +17,7 @@ public class GameMenuScreen extends AbstractTablexiaScreen<Void> {
private Texture backgroundTexture;
public GameMenuBackground() {
- backgroundTexture = ApplicationTextureManager.getInstance().get(ApplicationTextureManager.STARTMENU_BACKGOURND, Texture.class);
+ backgroundTexture = ApplicationTextureManager.getInstance().getTexture(ApplicationTextureManager.STARTMENU_BACKGROUND);
backgroundTexture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
}
diff --git a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java
index 7f133b4a4c3881cd330af10d63533e653522f92d..0400935582d706182fc3bb8680a9f0dbebe553d4 100644
--- a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java
+++ b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class HallOfFameScreen extends AbstractTablexiaScreen<Void> {
diff --git a/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java b/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
index 07247deb2a4b0fc55d530c1b86bc5c11aa830ae7..8e0db245bfe5534207adebd087daddeb4ccb1d89 100644
--- a/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
+++ b/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
@@ -15,21 +15,21 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.graphics.ColorTexture;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.loader.CommonAssets;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class PreferencesScreen extends AbstractTablexiaScreen<Void> {
private static final String BACKGROUND_TEXTURE = CommonAssets.WOODEN_BACKGOURND;
- public static final String TEXT_RESOURCES_FILE = "application/text/preferences";
+ public static final String TEXT_RESOURCES_FILE = "text/application/preferences";
public static final String LANGUAGE_LABEL_KEY = "language_label";
private Container<Table> preferencesContainer;
@Override
- protected void prepareScreenTextureAssetNames(java.util.List<String> texturesFileNames) {
- texturesFileNames.add(BACKGROUND_TEXTURE);
+ protected void prepareScreenTextureAssetNames(java.util.List<String> textureFileNames) {
+ textureFileNames.add(BACKGROUND_TEXTURE);
}
@Override
diff --git a/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java b/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
index 7c6edd3a99ec140cc69e36aaaeb7c08177538907..82078ec11ce6203338cc8156f0922823b9ac1c1d 100644
--- a/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
+++ b/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
@@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import cz.nic.tablexia.TablexiaSettings;
-import cz.nic.tablexia.loader.ApplicationFontManager;
+import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.loader.CommonAssets;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
@@ -22,8 +22,8 @@ public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
private Container<Label> backgroundLayout;
@Override
- protected void prepareScreenTextureAssetNames(List<String> texturesFileNames) {
- texturesFileNames.add(BACKGROUND_TEXTURE);
+ protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
+ textureFileNames.add(BACKGROUND_TEXTURE);
}
@Override