diff --git a/android/assets/gfx/character/a_background_white.png b/android/assets/game/robbery/gfx/character/a_background_white.png similarity index 100% rename from android/assets/gfx/character/a_background_white.png rename to android/assets/game/robbery/gfx/character/a_background_white.png diff --git a/android/assets/gfx/character/f_beads_blue.png b/android/assets/game/robbery/gfx/character/f_beads_blue.png similarity index 100% rename from android/assets/gfx/character/f_beads_blue.png rename to android/assets/game/robbery/gfx/character/f_beads_blue.png diff --git a/android/assets/gfx/character/f_beads_grey.png b/android/assets/game/robbery/gfx/character/f_beads_grey.png similarity index 100% rename from android/assets/gfx/character/f_beads_grey.png rename to android/assets/game/robbery/gfx/character/f_beads_grey.png diff --git a/android/assets/gfx/character/f_beads_red.png b/android/assets/game/robbery/gfx/character/f_beads_red.png similarity index 100% rename from android/assets/gfx/character/f_beads_red.png rename to android/assets/game/robbery/gfx/character/f_beads_red.png diff --git a/android/assets/gfx/character/f_braidhair_black.png b/android/assets/game/robbery/gfx/character/f_braidhair_black.png similarity index 100% rename from android/assets/gfx/character/f_braidhair_black.png rename to android/assets/game/robbery/gfx/character/f_braidhair_black.png diff --git a/android/assets/gfx/character/f_braidhair_brown.png b/android/assets/game/robbery/gfx/character/f_braidhair_brown.png similarity index 100% rename from android/assets/gfx/character/f_braidhair_brown.png rename to android/assets/game/robbery/gfx/character/f_braidhair_brown.png diff --git a/android/assets/gfx/character/f_braidhair_yellow.png b/android/assets/game/robbery/gfx/character/f_braidhair_yellow.png similarity index 100% rename from android/assets/gfx/character/f_braidhair_yellow.png rename to android/assets/game/robbery/gfx/character/f_braidhair_yellow.png diff --git a/android/assets/gfx/character/f_coat_brown.png b/android/assets/game/robbery/gfx/character/f_coat_brown.png similarity index 100% rename from android/assets/gfx/character/f_coat_brown.png rename to android/assets/game/robbery/gfx/character/f_coat_brown.png diff --git a/android/assets/gfx/character/f_coat_green.png b/android/assets/game/robbery/gfx/character/f_coat_green.png similarity index 100% rename from android/assets/gfx/character/f_coat_green.png rename to android/assets/game/robbery/gfx/character/f_coat_green.png diff --git a/android/assets/gfx/character/f_coat_grey.png b/android/assets/game/robbery/gfx/character/f_coat_grey.png similarity index 100% rename from android/assets/gfx/character/f_coat_grey.png rename to android/assets/game/robbery/gfx/character/f_coat_grey.png diff --git a/android/assets/gfx/character/f_glasses.png b/android/assets/game/robbery/gfx/character/f_glasses.png similarity index 100% rename from android/assets/gfx/character/f_glasses.png rename to android/assets/game/robbery/gfx/character/f_glasses.png diff --git a/android/assets/gfx/character/f_hat_blue.png b/android/assets/game/robbery/gfx/character/f_hat_blue.png similarity index 100% rename from android/assets/gfx/character/f_hat_blue.png rename to android/assets/game/robbery/gfx/character/f_hat_blue.png diff --git a/android/assets/gfx/character/f_hat_green.png b/android/assets/game/robbery/gfx/character/f_hat_green.png similarity index 100% rename from android/assets/gfx/character/f_hat_green.png rename to android/assets/game/robbery/gfx/character/f_hat_green.png diff --git a/android/assets/gfx/character/f_hat_grey.png b/android/assets/game/robbery/gfx/character/f_hat_grey.png similarity index 100% rename from android/assets/gfx/character/f_hat_grey.png rename to android/assets/game/robbery/gfx/character/f_hat_grey.png diff --git a/android/assets/gfx/character/f_hat_purple.png b/android/assets/game/robbery/gfx/character/f_hat_purple.png similarity index 100% rename from android/assets/gfx/character/f_hat_purple.png rename to android/assets/game/robbery/gfx/character/f_hat_purple.png diff --git a/android/assets/gfx/character/f_hat_red.png b/android/assets/game/robbery/gfx/character/f_hat_red.png similarity index 100% rename from android/assets/gfx/character/f_hat_red.png rename to android/assets/game/robbery/gfx/character/f_hat_red.png diff --git a/android/assets/gfx/character/f_hat_yellow.png b/android/assets/game/robbery/gfx/character/f_hat_yellow.png similarity index 100% rename from android/assets/gfx/character/f_hat_yellow.png rename to android/assets/game/robbery/gfx/character/f_hat_yellow.png diff --git a/android/assets/gfx/character/f_head_1.png b/android/assets/game/robbery/gfx/character/f_head_1.png similarity index 100% rename from android/assets/gfx/character/f_head_1.png rename to android/assets/game/robbery/gfx/character/f_head_1.png diff --git a/android/assets/gfx/character/f_head_2.png b/android/assets/game/robbery/gfx/character/f_head_2.png similarity index 100% rename from android/assets/gfx/character/f_head_2.png rename to android/assets/game/robbery/gfx/character/f_head_2.png diff --git a/android/assets/gfx/character/f_longhair_black.png b/android/assets/game/robbery/gfx/character/f_longhair_black.png similarity index 100% rename from android/assets/gfx/character/f_longhair_black.png rename to android/assets/game/robbery/gfx/character/f_longhair_black.png diff --git a/android/assets/gfx/character/f_longhair_brown.png b/android/assets/game/robbery/gfx/character/f_longhair_brown.png similarity index 100% rename from android/assets/gfx/character/f_longhair_brown.png rename to android/assets/game/robbery/gfx/character/f_longhair_brown.png diff --git a/android/assets/gfx/character/f_longhair_yellow.png b/android/assets/game/robbery/gfx/character/f_longhair_yellow.png similarity index 100% rename from android/assets/gfx/character/f_longhair_yellow.png rename to android/assets/game/robbery/gfx/character/f_longhair_yellow.png diff --git a/android/assets/gfx/character/f_pants_blue.png b/android/assets/game/robbery/gfx/character/f_pants_blue.png similarity index 100% rename from android/assets/gfx/character/f_pants_blue.png rename to android/assets/game/robbery/gfx/character/f_pants_blue.png diff --git a/android/assets/gfx/character/f_pants_brown.png b/android/assets/game/robbery/gfx/character/f_pants_brown.png similarity index 100% rename from android/assets/gfx/character/f_pants_brown.png rename to android/assets/game/robbery/gfx/character/f_pants_brown.png diff --git a/android/assets/gfx/character/f_pants_green.png b/android/assets/game/robbery/gfx/character/f_pants_green.png similarity index 100% rename from android/assets/gfx/character/f_pants_green.png rename to android/assets/game/robbery/gfx/character/f_pants_green.png diff --git a/android/assets/gfx/character/f_pants_grey.png b/android/assets/game/robbery/gfx/character/f_pants_grey.png similarity index 100% rename from android/assets/gfx/character/f_pants_grey.png rename to android/assets/game/robbery/gfx/character/f_pants_grey.png diff --git a/android/assets/gfx/character/f_pants_purple.png b/android/assets/game/robbery/gfx/character/f_pants_purple.png similarity index 100% rename from android/assets/gfx/character/f_pants_purple.png rename to android/assets/game/robbery/gfx/character/f_pants_purple.png diff --git a/android/assets/gfx/character/f_pants_red.png b/android/assets/game/robbery/gfx/character/f_pants_red.png similarity index 100% rename from android/assets/gfx/character/f_pants_red.png rename to android/assets/game/robbery/gfx/character/f_pants_red.png diff --git a/android/assets/gfx/character/f_scarf_green.png b/android/assets/game/robbery/gfx/character/f_scarf_green.png similarity index 100% rename from android/assets/gfx/character/f_scarf_green.png rename to android/assets/game/robbery/gfx/character/f_scarf_green.png diff --git a/android/assets/gfx/character/f_scarf_purple.png b/android/assets/game/robbery/gfx/character/f_scarf_purple.png similarity index 100% rename from android/assets/gfx/character/f_scarf_purple.png rename to android/assets/game/robbery/gfx/character/f_scarf_purple.png diff --git a/android/assets/gfx/character/f_scarf_yellow.png b/android/assets/game/robbery/gfx/character/f_scarf_yellow.png similarity index 100% rename from android/assets/gfx/character/f_scarf_yellow.png rename to android/assets/game/robbery/gfx/character/f_scarf_yellow.png diff --git a/android/assets/gfx/character/f_shirt_blue.png b/android/assets/game/robbery/gfx/character/f_shirt_blue.png similarity index 100% rename from android/assets/gfx/character/f_shirt_blue.png rename to android/assets/game/robbery/gfx/character/f_shirt_blue.png diff --git a/android/assets/gfx/character/f_shirt_green.png b/android/assets/game/robbery/gfx/character/f_shirt_green.png similarity index 100% rename from android/assets/gfx/character/f_shirt_green.png rename to android/assets/game/robbery/gfx/character/f_shirt_green.png diff --git a/android/assets/gfx/character/f_shirt_grey.png b/android/assets/game/robbery/gfx/character/f_shirt_grey.png similarity index 100% rename from android/assets/gfx/character/f_shirt_grey.png rename to android/assets/game/robbery/gfx/character/f_shirt_grey.png diff --git a/android/assets/gfx/character/f_shirt_purple.png b/android/assets/game/robbery/gfx/character/f_shirt_purple.png similarity index 100% rename from android/assets/gfx/character/f_shirt_purple.png rename to android/assets/game/robbery/gfx/character/f_shirt_purple.png diff --git a/android/assets/gfx/character/f_shirt_red.png b/android/assets/game/robbery/gfx/character/f_shirt_red.png similarity index 100% rename from android/assets/gfx/character/f_shirt_red.png rename to android/assets/game/robbery/gfx/character/f_shirt_red.png diff --git a/android/assets/gfx/character/f_shirt_yellow.png b/android/assets/game/robbery/gfx/character/f_shirt_yellow.png similarity index 100% rename from android/assets/gfx/character/f_shirt_yellow.png rename to android/assets/game/robbery/gfx/character/f_shirt_yellow.png diff --git a/android/assets/gfx/character/f_skirt_blue.png b/android/assets/game/robbery/gfx/character/f_skirt_blue.png similarity index 100% rename from android/assets/gfx/character/f_skirt_blue.png rename to android/assets/game/robbery/gfx/character/f_skirt_blue.png diff --git a/android/assets/gfx/character/f_skirt_green.png b/android/assets/game/robbery/gfx/character/f_skirt_green.png similarity index 100% rename from android/assets/gfx/character/f_skirt_green.png rename to android/assets/game/robbery/gfx/character/f_skirt_green.png diff --git a/android/assets/gfx/character/f_skirt_grey.png b/android/assets/game/robbery/gfx/character/f_skirt_grey.png similarity index 100% rename from android/assets/gfx/character/f_skirt_grey.png rename to android/assets/game/robbery/gfx/character/f_skirt_grey.png diff --git a/android/assets/gfx/character/f_skirt_purple.png b/android/assets/game/robbery/gfx/character/f_skirt_purple.png similarity index 100% rename from android/assets/gfx/character/f_skirt_purple.png rename to android/assets/game/robbery/gfx/character/f_skirt_purple.png diff --git a/android/assets/gfx/character/f_skirt_red.png b/android/assets/game/robbery/gfx/character/f_skirt_red.png similarity index 100% rename from android/assets/gfx/character/f_skirt_red.png rename to android/assets/game/robbery/gfx/character/f_skirt_red.png diff --git a/android/assets/gfx/character/f_skirt_yellow.png b/android/assets/game/robbery/gfx/character/f_skirt_yellow.png similarity index 100% rename from android/assets/gfx/character/f_skirt_yellow.png rename to android/assets/game/robbery/gfx/character/f_skirt_yellow.png diff --git a/android/assets/gfx/character/f_sweater_brown.png b/android/assets/game/robbery/gfx/character/f_sweater_brown.png similarity index 100% rename from android/assets/gfx/character/f_sweater_brown.png rename to android/assets/game/robbery/gfx/character/f_sweater_brown.png diff --git a/android/assets/gfx/character/f_sweater_green.png b/android/assets/game/robbery/gfx/character/f_sweater_green.png similarity index 100% rename from android/assets/gfx/character/f_sweater_green.png rename to android/assets/game/robbery/gfx/character/f_sweater_green.png diff --git a/android/assets/gfx/character/f_sweater_grey.png b/android/assets/game/robbery/gfx/character/f_sweater_grey.png similarity index 100% rename from android/assets/gfx/character/f_sweater_grey.png rename to android/assets/game/robbery/gfx/character/f_sweater_grey.png diff --git a/android/assets/gfx/character/f_sweater_purple.png b/android/assets/game/robbery/gfx/character/f_sweater_purple.png similarity index 100% rename from android/assets/gfx/character/f_sweater_purple.png rename to android/assets/game/robbery/gfx/character/f_sweater_purple.png diff --git a/android/assets/gfx/character/f_sweater_red.png b/android/assets/game/robbery/gfx/character/f_sweater_red.png similarity index 100% rename from android/assets/gfx/character/f_sweater_red.png rename to android/assets/game/robbery/gfx/character/f_sweater_red.png diff --git a/android/assets/gfx/character/f_sweater_yellow.png b/android/assets/game/robbery/gfx/character/f_sweater_yellow.png similarity index 100% rename from android/assets/gfx/character/f_sweater_yellow.png rename to android/assets/game/robbery/gfx/character/f_sweater_yellow.png diff --git a/android/assets/gfx/character/f_vest_blue.png b/android/assets/game/robbery/gfx/character/f_vest_blue.png similarity index 100% rename from android/assets/gfx/character/f_vest_blue.png rename to android/assets/game/robbery/gfx/character/f_vest_blue.png diff --git a/android/assets/gfx/character/f_vest_brown.png b/android/assets/game/robbery/gfx/character/f_vest_brown.png similarity index 100% rename from android/assets/gfx/character/f_vest_brown.png rename to android/assets/game/robbery/gfx/character/f_vest_brown.png diff --git a/android/assets/gfx/character/f_vest_green.png b/android/assets/game/robbery/gfx/character/f_vest_green.png similarity index 100% rename from android/assets/gfx/character/f_vest_green.png rename to android/assets/game/robbery/gfx/character/f_vest_green.png diff --git a/android/assets/gfx/character/f_vest_grey.png b/android/assets/game/robbery/gfx/character/f_vest_grey.png similarity index 100% rename from android/assets/gfx/character/f_vest_grey.png rename to android/assets/game/robbery/gfx/character/f_vest_grey.png diff --git a/android/assets/gfx/character/f_vest_purple.png b/android/assets/game/robbery/gfx/character/f_vest_purple.png similarity index 100% rename from android/assets/gfx/character/f_vest_purple.png rename to android/assets/game/robbery/gfx/character/f_vest_purple.png diff --git a/android/assets/gfx/character/f_vest_yellow.png b/android/assets/game/robbery/gfx/character/f_vest_yellow.png similarity index 100% rename from android/assets/gfx/character/f_vest_yellow.png rename to android/assets/game/robbery/gfx/character/f_vest_yellow.png diff --git a/android/assets/gfx/character/m_coat_blue.png b/android/assets/game/robbery/gfx/character/m_coat_blue.png similarity index 100% rename from android/assets/gfx/character/m_coat_blue.png rename to android/assets/game/robbery/gfx/character/m_coat_blue.png diff --git a/android/assets/gfx/character/m_coat_brown.png b/android/assets/game/robbery/gfx/character/m_coat_brown.png similarity index 100% rename from android/assets/gfx/character/m_coat_brown.png rename to android/assets/game/robbery/gfx/character/m_coat_brown.png diff --git a/android/assets/gfx/character/m_coat_grey.png b/android/assets/game/robbery/gfx/character/m_coat_grey.png similarity index 100% rename from android/assets/gfx/character/m_coat_grey.png rename to android/assets/game/robbery/gfx/character/m_coat_grey.png diff --git a/android/assets/gfx/character/m_glasses.png b/android/assets/game/robbery/gfx/character/m_glasses.png similarity index 100% rename from android/assets/gfx/character/m_glasses.png rename to android/assets/game/robbery/gfx/character/m_glasses.png diff --git a/android/assets/gfx/character/m_hair_black.png b/android/assets/game/robbery/gfx/character/m_hair_black.png similarity index 100% rename from android/assets/gfx/character/m_hair_black.png rename to android/assets/game/robbery/gfx/character/m_hair_black.png diff --git a/android/assets/gfx/character/m_hair_brown.png b/android/assets/game/robbery/gfx/character/m_hair_brown.png similarity index 100% rename from android/assets/gfx/character/m_hair_brown.png rename to android/assets/game/robbery/gfx/character/m_hair_brown.png diff --git a/android/assets/gfx/character/m_hair_yellow.png b/android/assets/game/robbery/gfx/character/m_hair_yellow.png similarity index 100% rename from android/assets/gfx/character/m_hair_yellow.png rename to android/assets/game/robbery/gfx/character/m_hair_yellow.png diff --git a/android/assets/gfx/character/m_hat_brown.png b/android/assets/game/robbery/gfx/character/m_hat_brown.png similarity index 100% rename from android/assets/gfx/character/m_hat_brown.png rename to android/assets/game/robbery/gfx/character/m_hat_brown.png diff --git a/android/assets/gfx/character/m_hat_green.png b/android/assets/game/robbery/gfx/character/m_hat_green.png similarity index 100% rename from android/assets/gfx/character/m_hat_green.png rename to android/assets/game/robbery/gfx/character/m_hat_green.png diff --git a/android/assets/gfx/character/m_hat_grey.png b/android/assets/game/robbery/gfx/character/m_hat_grey.png similarity index 100% rename from android/assets/gfx/character/m_hat_grey.png rename to android/assets/game/robbery/gfx/character/m_hat_grey.png diff --git a/android/assets/gfx/character/m_hat_purple.png b/android/assets/game/robbery/gfx/character/m_hat_purple.png similarity index 100% rename from android/assets/gfx/character/m_hat_purple.png rename to android/assets/game/robbery/gfx/character/m_hat_purple.png diff --git a/android/assets/gfx/character/m_hat_red.png b/android/assets/game/robbery/gfx/character/m_hat_red.png similarity index 100% rename from android/assets/gfx/character/m_hat_red.png rename to android/assets/game/robbery/gfx/character/m_hat_red.png diff --git a/android/assets/gfx/character/m_hat_yellow.png b/android/assets/game/robbery/gfx/character/m_hat_yellow.png similarity index 100% rename from android/assets/gfx/character/m_hat_yellow.png rename to android/assets/game/robbery/gfx/character/m_hat_yellow.png diff --git a/android/assets/gfx/character/m_head_1.png b/android/assets/game/robbery/gfx/character/m_head_1.png similarity index 100% rename from android/assets/gfx/character/m_head_1.png rename to android/assets/game/robbery/gfx/character/m_head_1.png diff --git a/android/assets/gfx/character/m_head_2.png b/android/assets/game/robbery/gfx/character/m_head_2.png similarity index 100% rename from android/assets/gfx/character/m_head_2.png rename to android/assets/game/robbery/gfx/character/m_head_2.png diff --git a/android/assets/gfx/character/m_pants_blue.png b/android/assets/game/robbery/gfx/character/m_pants_blue.png similarity index 100% rename from android/assets/gfx/character/m_pants_blue.png rename to android/assets/game/robbery/gfx/character/m_pants_blue.png diff --git a/android/assets/gfx/character/m_pants_brown.png b/android/assets/game/robbery/gfx/character/m_pants_brown.png similarity index 100% rename from android/assets/gfx/character/m_pants_brown.png rename to android/assets/game/robbery/gfx/character/m_pants_brown.png diff --git a/android/assets/gfx/character/m_pants_green.png b/android/assets/game/robbery/gfx/character/m_pants_green.png similarity index 100% rename from android/assets/gfx/character/m_pants_green.png rename to android/assets/game/robbery/gfx/character/m_pants_green.png diff --git a/android/assets/gfx/character/m_pants_grey.png b/android/assets/game/robbery/gfx/character/m_pants_grey.png similarity index 100% rename from android/assets/gfx/character/m_pants_grey.png rename to android/assets/game/robbery/gfx/character/m_pants_grey.png diff --git a/android/assets/gfx/character/m_pants_red.png b/android/assets/game/robbery/gfx/character/m_pants_red.png similarity index 100% rename from android/assets/gfx/character/m_pants_red.png rename to android/assets/game/robbery/gfx/character/m_pants_red.png diff --git a/android/assets/gfx/character/m_pants_yellow.png b/android/assets/game/robbery/gfx/character/m_pants_yellow.png similarity index 100% rename from android/assets/gfx/character/m_pants_yellow.png rename to android/assets/game/robbery/gfx/character/m_pants_yellow.png diff --git a/android/assets/gfx/character/m_scarf_blue.png b/android/assets/game/robbery/gfx/character/m_scarf_blue.png similarity index 100% rename from android/assets/gfx/character/m_scarf_blue.png rename to android/assets/game/robbery/gfx/character/m_scarf_blue.png diff --git a/android/assets/gfx/character/m_scarf_brown.png b/android/assets/game/robbery/gfx/character/m_scarf_brown.png similarity index 100% rename from android/assets/gfx/character/m_scarf_brown.png rename to android/assets/game/robbery/gfx/character/m_scarf_brown.png diff --git a/android/assets/gfx/character/m_scarf_yellow.png b/android/assets/game/robbery/gfx/character/m_scarf_yellow.png similarity index 100% rename from android/assets/gfx/character/m_scarf_yellow.png rename to android/assets/game/robbery/gfx/character/m_scarf_yellow.png diff --git a/android/assets/gfx/character/m_shirt_blue.png b/android/assets/game/robbery/gfx/character/m_shirt_blue.png similarity index 100% rename from android/assets/gfx/character/m_shirt_blue.png rename to android/assets/game/robbery/gfx/character/m_shirt_blue.png diff --git a/android/assets/gfx/character/m_shirt_brown.png b/android/assets/game/robbery/gfx/character/m_shirt_brown.png similarity index 100% rename from android/assets/gfx/character/m_shirt_brown.png rename to android/assets/game/robbery/gfx/character/m_shirt_brown.png diff --git a/android/assets/gfx/character/m_shirt_green.png b/android/assets/game/robbery/gfx/character/m_shirt_green.png similarity index 100% rename from android/assets/gfx/character/m_shirt_green.png rename to android/assets/game/robbery/gfx/character/m_shirt_green.png diff --git a/android/assets/gfx/character/m_shirt_grey.png b/android/assets/game/robbery/gfx/character/m_shirt_grey.png similarity index 100% rename from android/assets/gfx/character/m_shirt_grey.png rename to android/assets/game/robbery/gfx/character/m_shirt_grey.png diff --git a/android/assets/gfx/character/m_shirt_red.png b/android/assets/game/robbery/gfx/character/m_shirt_red.png similarity index 100% rename from android/assets/gfx/character/m_shirt_red.png rename to android/assets/game/robbery/gfx/character/m_shirt_red.png diff --git a/android/assets/gfx/character/m_shirt_yellow.png b/android/assets/game/robbery/gfx/character/m_shirt_yellow.png similarity index 100% rename from android/assets/gfx/character/m_shirt_yellow.png rename to android/assets/game/robbery/gfx/character/m_shirt_yellow.png diff --git a/android/assets/gfx/character/m_shorts_blue.png b/android/assets/game/robbery/gfx/character/m_shorts_blue.png similarity index 100% rename from android/assets/gfx/character/m_shorts_blue.png rename to android/assets/game/robbery/gfx/character/m_shorts_blue.png diff --git a/android/assets/gfx/character/m_shorts_green.png b/android/assets/game/robbery/gfx/character/m_shorts_green.png similarity index 100% rename from android/assets/gfx/character/m_shorts_green.png rename to android/assets/game/robbery/gfx/character/m_shorts_green.png diff --git a/android/assets/gfx/character/m_shorts_grey.png b/android/assets/game/robbery/gfx/character/m_shorts_grey.png similarity index 100% rename from android/assets/gfx/character/m_shorts_grey.png rename to android/assets/game/robbery/gfx/character/m_shorts_grey.png diff --git a/android/assets/gfx/character/m_shorts_purple.png b/android/assets/game/robbery/gfx/character/m_shorts_purple.png similarity index 100% rename from android/assets/gfx/character/m_shorts_purple.png rename to android/assets/game/robbery/gfx/character/m_shorts_purple.png diff --git a/android/assets/gfx/character/m_shorts_red.png b/android/assets/game/robbery/gfx/character/m_shorts_red.png similarity index 100% rename from android/assets/gfx/character/m_shorts_red.png rename to android/assets/game/robbery/gfx/character/m_shorts_red.png diff --git a/android/assets/gfx/character/m_shorts_yellow.png b/android/assets/game/robbery/gfx/character/m_shorts_yellow.png similarity index 100% rename from android/assets/gfx/character/m_shorts_yellow.png rename to android/assets/game/robbery/gfx/character/m_shorts_yellow.png diff --git a/android/assets/gfx/character/m_sweater_blue.png b/android/assets/game/robbery/gfx/character/m_sweater_blue.png similarity index 100% rename from android/assets/gfx/character/m_sweater_blue.png rename to android/assets/game/robbery/gfx/character/m_sweater_blue.png diff --git a/android/assets/gfx/character/m_sweater_brown.png b/android/assets/game/robbery/gfx/character/m_sweater_brown.png similarity index 100% rename from android/assets/gfx/character/m_sweater_brown.png rename to android/assets/game/robbery/gfx/character/m_sweater_brown.png diff --git a/android/assets/gfx/character/m_sweater_green.png b/android/assets/game/robbery/gfx/character/m_sweater_green.png similarity index 100% rename from android/assets/gfx/character/m_sweater_green.png rename to android/assets/game/robbery/gfx/character/m_sweater_green.png diff --git a/android/assets/gfx/character/m_sweater_grey.png b/android/assets/game/robbery/gfx/character/m_sweater_grey.png similarity index 100% rename from android/assets/gfx/character/m_sweater_grey.png rename to android/assets/game/robbery/gfx/character/m_sweater_grey.png diff --git a/android/assets/gfx/character/m_sweater_red.png b/android/assets/game/robbery/gfx/character/m_sweater_red.png similarity index 100% rename from android/assets/gfx/character/m_sweater_red.png rename to android/assets/game/robbery/gfx/character/m_sweater_red.png diff --git a/android/assets/gfx/character/m_sweater_yellow.png b/android/assets/game/robbery/gfx/character/m_sweater_yellow.png similarity index 100% rename from android/assets/gfx/character/m_sweater_yellow.png rename to android/assets/game/robbery/gfx/character/m_sweater_yellow.png diff --git a/android/assets/gfx/character/m_tie_green.png b/android/assets/game/robbery/gfx/character/m_tie_green.png similarity index 100% rename from android/assets/gfx/character/m_tie_green.png rename to android/assets/game/robbery/gfx/character/m_tie_green.png diff --git a/android/assets/gfx/character/m_tie_grey.png b/android/assets/game/robbery/gfx/character/m_tie_grey.png similarity index 100% rename from android/assets/gfx/character/m_tie_grey.png rename to android/assets/game/robbery/gfx/character/m_tie_grey.png diff --git a/android/assets/gfx/character/m_tie_red.png b/android/assets/game/robbery/gfx/character/m_tie_red.png similarity index 100% rename from android/assets/gfx/character/m_tie_red.png rename to android/assets/game/robbery/gfx/character/m_tie_red.png diff --git a/android/assets/gfx/character/m_vest_blue.png b/android/assets/game/robbery/gfx/character/m_vest_blue.png similarity index 100% rename from android/assets/gfx/character/m_vest_blue.png rename to android/assets/game/robbery/gfx/character/m_vest_blue.png diff --git a/android/assets/gfx/character/m_vest_green.png b/android/assets/game/robbery/gfx/character/m_vest_green.png similarity index 100% rename from android/assets/gfx/character/m_vest_green.png rename to android/assets/game/robbery/gfx/character/m_vest_green.png diff --git a/android/assets/gfx/character/m_vest_grey.png b/android/assets/game/robbery/gfx/character/m_vest_grey.png similarity index 100% rename from android/assets/gfx/character/m_vest_grey.png rename to android/assets/game/robbery/gfx/character/m_vest_grey.png diff --git a/android/assets/gfx/character/m_vest_purple.png b/android/assets/game/robbery/gfx/character/m_vest_purple.png similarity index 100% rename from android/assets/gfx/character/m_vest_purple.png rename to android/assets/game/robbery/gfx/character/m_vest_purple.png diff --git a/android/assets/gfx/character/m_vest_red.png b/android/assets/game/robbery/gfx/character/m_vest_red.png similarity index 100% rename from android/assets/gfx/character/m_vest_red.png rename to android/assets/game/robbery/gfx/character/m_vest_red.png diff --git a/android/assets/gfx/character/m_vest_yellow.png b/android/assets/game/robbery/gfx/character/m_vest_yellow.png similarity index 100% rename from android/assets/gfx/character/m_vest_yellow.png rename to android/assets/game/robbery/gfx/character/m_vest_yellow.png diff --git a/android/assets/gfx/gamescreen/arrested.png b/android/assets/game/robbery/gfx/gamescreen/arrested.png similarity index 100% rename from android/assets/gfx/gamescreen/arrested.png rename to android/assets/game/robbery/gfx/gamescreen/arrested.png diff --git a/android/assets/gfx/gamescreen/bank_s1.png b/android/assets/game/robbery/gfx/gamescreen/bank_s1.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s1.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s1.png diff --git a/android/assets/gfx/gamescreen/bank_s1_bottom.png b/android/assets/game/robbery/gfx/gamescreen/bank_s1_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s1_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s1_bottom.png diff --git a/android/assets/gfx/gamescreen/bank_s2.png b/android/assets/game/robbery/gfx/gamescreen/bank_s2.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s2.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s2.png diff --git a/android/assets/gfx/gamescreen/bank_s2_bottom.png b/android/assets/game/robbery/gfx/gamescreen/bank_s2_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s2_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s2_bottom.png diff --git a/android/assets/gfx/gamescreen/bank_s3.png b/android/assets/game/robbery/gfx/gamescreen/bank_s3.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s3.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s3.png diff --git a/android/assets/gfx/gamescreen/bank_s3_bottom.png b/android/assets/game/robbery/gfx/gamescreen/bank_s3_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s3_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s3_bottom.png diff --git a/android/assets/gfx/gamescreen/bank_s4.png b/android/assets/game/robbery/gfx/gamescreen/bank_s4.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s4.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s4.png diff --git a/android/assets/gfx/gamescreen/bank_s4_bottom.png b/android/assets/game/robbery/gfx/gamescreen/bank_s4_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s4_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s4_bottom.png diff --git a/android/assets/gfx/gamescreen/bank_s5.png b/android/assets/game/robbery/gfx/gamescreen/bank_s5.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s5.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s5.png diff --git a/android/assets/gfx/gamescreen/bank_s5_bottom.png b/android/assets/game/robbery/gfx/gamescreen/bank_s5_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/bank_s5_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/bank_s5_bottom.png diff --git a/android/assets/gfx/gamescreen/door_background_s1.png b/android/assets/game/robbery/gfx/gamescreen/door_background_s1.png similarity index 100% rename from android/assets/gfx/gamescreen/door_background_s1.png rename to android/assets/game/robbery/gfx/gamescreen/door_background_s1.png diff --git a/android/assets/gfx/gamescreen/door_background_s2.png b/android/assets/game/robbery/gfx/gamescreen/door_background_s2.png similarity index 100% rename from android/assets/gfx/gamescreen/door_background_s2.png rename to android/assets/game/robbery/gfx/gamescreen/door_background_s2.png diff --git a/android/assets/gfx/gamescreen/door_background_s3.png b/android/assets/game/robbery/gfx/gamescreen/door_background_s3.png similarity index 100% rename from android/assets/gfx/gamescreen/door_background_s3.png rename to android/assets/game/robbery/gfx/gamescreen/door_background_s3.png diff --git a/android/assets/gfx/gamescreen/door_background_s4.png b/android/assets/game/robbery/gfx/gamescreen/door_background_s4.png similarity index 100% rename from android/assets/gfx/gamescreen/door_background_s4.png rename to android/assets/game/robbery/gfx/gamescreen/door_background_s4.png diff --git a/android/assets/gfx/gamescreen/door_background_s5.png b/android/assets/game/robbery/gfx/gamescreen/door_background_s5.png similarity index 100% rename from android/assets/gfx/gamescreen/door_background_s5.png rename to android/assets/game/robbery/gfx/gamescreen/door_background_s5.png diff --git a/android/assets/gfx/gamescreen/game_robbery_rulemessage_paper.png b/android/assets/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png similarity index 100% rename from android/assets/gfx/gamescreen/game_robbery_rulemessage_paper.png rename to android/assets/game/robbery/gfx/gamescreen/game_robbery_rulemessage_paper.png diff --git a/android/assets/gfx/gamescreen/innocence.png b/android/assets/game/robbery/gfx/gamescreen/innocence.png similarity index 100% rename from android/assets/gfx/gamescreen/innocence.png rename to android/assets/game/robbery/gfx/gamescreen/innocence.png diff --git a/android/assets/gfx/gamescreen/jewellery_s1.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s1.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s1.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s1.png diff --git a/android/assets/gfx/gamescreen/jewellery_s1_bottom.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s1_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s1_bottom.png diff --git a/android/assets/gfx/gamescreen/jewellery_s2.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s2.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s2.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s2.png diff --git a/android/assets/gfx/gamescreen/jewellery_s2_bottom.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s2_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s2_bottom.png diff --git a/android/assets/gfx/gamescreen/jewellery_s3.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s3.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s3.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s3.png diff --git a/android/assets/gfx/gamescreen/jewellery_s3_bottom.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s3_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s3_bottom.png diff --git a/android/assets/gfx/gamescreen/jewellery_s4.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s4.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s4.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s4.png diff --git a/android/assets/gfx/gamescreen/jewellery_s4_bottom.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s4_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s4_bottom.png diff --git a/android/assets/gfx/gamescreen/jewellery_s5.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s5.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s5.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s5.png diff --git a/android/assets/gfx/gamescreen/jewellery_s5_bottom.png b/android/assets/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/jewellery_s5_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/jewellery_s5_bottom.png diff --git a/android/assets/gfx/gamescreen/newsstand_s1.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s1.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s1.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s1.png diff --git a/android/assets/gfx/gamescreen/newsstand_s1_bottom.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s1_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s1_bottom.png diff --git a/android/assets/gfx/gamescreen/newsstand_s2.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s2.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s2.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s2.png diff --git a/android/assets/gfx/gamescreen/newsstand_s2_bottom.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s2_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s2_bottom.png diff --git a/android/assets/gfx/gamescreen/newsstand_s3.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s3.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s3.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s3.png diff --git a/android/assets/gfx/gamescreen/newsstand_s3_bottom.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s3_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s3_bottom.png diff --git a/android/assets/gfx/gamescreen/newsstand_s4.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s4.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s4.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s4.png diff --git a/android/assets/gfx/gamescreen/newsstand_s4_bottom.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s4_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s4_bottom.png diff --git a/android/assets/gfx/gamescreen/newsstand_s5.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s5.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s5.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s5.png diff --git a/android/assets/gfx/gamescreen/newsstand_s5_bottom.png b/android/assets/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png similarity index 100% rename from android/assets/gfx/gamescreen/newsstand_s5_bottom.png rename to android/assets/game/robbery/gfx/gamescreen/newsstand_s5_bottom.png diff --git a/android/assets/gfx/gamescreen/thief.png b/android/assets/game/robbery/gfx/gamescreen/thief.png similarity index 100% rename from android/assets/gfx/gamescreen/thief.png rename to android/assets/game/robbery/gfx/gamescreen/thief.png diff --git a/android/assets/text/robbery.properties b/android/assets/game/robbery/text/robbery.properties similarity index 100% rename from android/assets/text/robbery.properties rename to android/assets/game/robbery/text/robbery.properties 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 0808262e15dd239c9fd2b149507e84b65dfea510..807ec08aeab32c5ae68ad71dd82e375c74d50e5c 100644 --- a/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java +++ b/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java @@ -23,6 +23,7 @@ import cz.nic.tablexia.game.games.robbery.loader.RobberyDataManager; import cz.nic.tablexia.game.games.robbery.loader.RobberyTextManager; import cz.nic.tablexia.game.games.robbery.loader.RobberyTextureManager; import cz.nic.tablexia.loader.ApplicationFontManager; +import cz.nic.tablexia.loader.ApplicationTextureManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; public class RuleScreen extends AbstractTablexiaScreen { @@ -44,7 +45,7 @@ public class RuleScreen extends AbstractTablexiaScreen { private Texture backgroundTexture; public RuleBackground() { - backgroundTexture = RobberyTextureManager.getInstance().get(RobberyTextureManager.COMMON_BACKGOURND, Texture.class); + backgroundTexture = ApplicationTextureManager.getInstance().get(ApplicationTextureManager.COMMON_BACKGOURND, Texture.class); backgroundTexture.setFilter(TextureFilter.Linear, TextureFilter.Linear); } @@ -97,7 +98,7 @@ public class RuleScreen extends AbstractTablexiaScreen { if (!loadingComplete) { RobberyTextureManager.getInstance().load(); RobberyTextureManager.getInstance().finishLoading(); - RobberyTextManager.getInstance().load("text/robbery", new Locale("cs", "CZ")); + RobberyTextManager.getInstance().load(new Locale("cs", "CZ")); RobberyDataManager.getInstance().load(GameDifficulty.EASY, new RandomAccess()); loadingStart = true; } diff --git a/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextManager.java b/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextManager.java index 2181b3e2afef4ba251f4bd05250336d2ed667ec9..c006c3f8407cbb98bc5e11c527eb94d368ad0c0c 100644 --- a/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextManager.java +++ b/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextManager.java @@ -11,13 +11,15 @@ import cz.nic.tablexia.game.loader.AbstractDataManager; import cz.nic.tablexia.loader.IApplicationLoader; public class RobberyTextManager extends AbstractDataManager<I18NBundle> implements IApplicationLoader { + + private static final String ROBBERY_TEXT = "game/robbery/text/robbery"; - private static class BankRoberryTextResourcesLoader implements AsyncTask<I18NBundle> { + private static class RobberyTextLoader implements AsyncTask<I18NBundle> { private String textResourceFileName; private Locale locale; - public BankRoberryTextResourcesLoader(String textResourceFileName, Locale locale) { + public RobberyTextLoader(String textResourceFileName, Locale locale) { this.textResourceFileName = textResourceFileName; this.locale = locale; } @@ -40,8 +42,8 @@ public class RobberyTextManager extends AbstractDataManager<I18NBundle> implemen return instance; } - public void load(String textResourceFileName, Locale locale) { - setAsyncTask(new BankRoberryTextResourcesLoader(textResourceFileName, locale)); + public void load(Locale locale) { + setAsyncTask(new RobberyTextLoader(ROBBERY_TEXT, locale)); } public void dispose() { diff --git a/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextureManager.java b/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextureManager.java index 7e7c9e2a644ca64519ee2268505c6ddf105128fb..c6bbff548cefd0949862df31ca6462b082e29efd 100644 --- a/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextureManager.java +++ b/core/src/cz/nic/tablexia/game/games/robbery/loader/RobberyTextureManager.java @@ -24,10 +24,9 @@ public class RobberyTextureManager extends AssetManager implements IApplicationL instance = null; } - public static final String COMMON_PATH = "gfx/common/"; - public static final String COMMON_BACKGOURND = COMMON_PATH + "background_wooden.png"; + public static final String GAME_ROBBERY_GFX_PATH = "game/robbery/gfx/"; - public static final String SCREEN_PATH = "gfx/gamescreen/"; + public static final String SCREEN_PATH = GAME_ROBBERY_GFX_PATH + "gamescreen/"; public static final String SCREEN_RULEMESSAGE_PAPER_S1 = SCREEN_PATH + "game_robbery_rulemessage_paper.png"; @@ -41,7 +40,7 @@ public class RobberyTextureManager extends AssetManager implements IApplicationL public static final String INFOITEM_ALARM = SCREEN_PATH + "thief.png"; - public static final String CREATURE_PATH = "gfx/character/"; + public static final String CREATURE_PATH = GAME_ROBBERY_GFX_PATH + "character/"; public static final String CREATURE_BACKGROUND_TEXTURE = CREATURE_PATH + "a_background_white.png"; @@ -176,8 +175,6 @@ public class RobberyTextureManager extends AssetManager implements IApplicationL public static final String ATTRIBUTE_M_HEAD_2 = CREATURE_PATH + "m_head_2.png"; public void load() { - load(COMMON_BACKGOURND, Texture.class); - load(SCREEN_RULEMESSAGE_PAPER_S1, Texture.class); load(SCREEN_BANK_S1, Texture.class); load(SCREEN_NEWSSTAND_S5, Texture.class); diff --git a/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java b/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java index 420da116cf41244c13efee3e652836f9f7612a78..cb85e842a1b8aab9676bf9d26c4d6cfa8bb27be4 100644 --- a/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java +++ b/core/src/cz/nic/tablexia/loader/ApplicationTextureManager.java @@ -25,7 +25,11 @@ public class ApplicationTextureManager extends AssetManager implements IApplicat public static final String GAMEMENU_PATH = "gfx/gamemenu/"; public static final String STARTMENU_BACKGOURND = GAMEMENU_PATH + "screen_gamemenu_startmenu_background.jpg"; + public static final String COMMON_PATH = "gfx/common/"; + public static final String COMMON_BACKGOURND = COMMON_PATH + "background_wooden.png"; + public void load() { load(STARTMENU_BACKGOURND, Texture.class); + load(COMMON_BACKGOURND, Texture.class); } } \ No newline at end of file