Merge branch 'I-am-Erk:master' into master

I-am-Erk · Nov 29, 2023 · 236a2a1 · 236a2a1
2 parents af4f8c8 + c3ef304
commit 236a2a1
Show file tree

Hide file tree

Showing 304 changed files with 318 additions and 20 deletions.
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_ne.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_ne.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_nw.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_nw.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_se.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_se.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_sw.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_sw.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ew.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ew.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ns.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ns.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_e.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_e.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_n.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_n.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_s.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_s.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_w.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_w.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json
@@ -0,0 +1,82 @@
+[
+  {
+    "id": [
+      "corpse_surface"
+    ],
+    "fg": "skull_light_red"
+  },
+  {
+    "id": [
+      "corpse_tentacle_surface_entry",
+      "corpse_tentacle_entry"
+    ],
+    "fg": "skull_blue"
+  },
+  {
+    "id": "corpse_tentacle",
+    "fg": "skull_light_blue",
+    "multitile": true,
+    "additional_tiles": [
+      {
+        "id": "corner",
+        "fg": [
+          "tentacle_corner_nw",
+          "tentacle_corner_sw",
+          "tentacle_corner_se",
+          "tentacle_corner_ne"
+        ]
+      },
+      {
+        "id": "edge",
+        "fg": [
+          "tentacle_edge_ns",
+          "tentacle_edge_ew"
+        ]
+      },
+      {
+        "id": "end_piece",
+        "fg": [
+          "tentacle_end_piece_n",
+          "tentacle_end_piece_w",
+          "tentacle_end_piece_s",
+          "tentacle_end_piece_e"
+        ]
+      }
+    ]
+  },
+  {
+    "id": [
+      "corpse_bowels_mid",
+      "corpse_bowels_empty_edge",
+      "corpse_bowels_lcorner",
+      "corpse_bowels_rcorner",
+      "corpse_bowels_neck_left",
+      "corpse_bowels_neck_right",
+      "corpse_bowels_neck_edge_center"
+    ],
+    "fg": "pond_light_red"
+  },
+  {
+    "id": [
+      "corpse_bowels_tentacle_edge"
+    ],
+    "fg": "pond_red"
+  },
+  {
+    "id": [
+      "corpse_neck",
+      "corpse_neck_center",
+      "corpse_head_neck_center",
+      "corpse_head_neck_l",
+      "corpse_head_neck_r",
+      "corpse_head",
+      "corpse_head_lcorner",
+      "corpse_head_rcorner",
+      "corpse_head_edge",
+      "corpse_under_brain",
+      "corpse_brain",
+      "corpse_head_fin"
+    ],
+    "fg": "skull_red"
+  }
+]
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json
@@ -1703,6 +1703,13 @@
     ],
     "fg": "shop_pink"
   },
+  {
+    "id": [
+      "barber_shop",
+      "barber_shop_roof"
+    ],
+    "fg": "shop_light_blue"
+  },
   {
     "id": [
       "farm_supply_looted_1",

diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json
@@ -86,8 +86,28 @@
     "fg": "cave_brown"
   },
   {
-    "id": "hive",
-    "fg": "hive_yellow"
+    "id": [
+      "hive",
+      "hive_edge_00",
+      "hive_edge_01",
+      "hive_edge_02",
+      "hive_edge_10",
+      "hive_edge_12",
+      "hive_edge_20",
+      "hive_edge_21",
+      "hive_edge_22",
+      "hive_roof",
+      "hive_edge_00_roof",
+      "hive_edge_01_roof",
+      "hive_edge_02_roof",
+      "hive_edge_10_roof",
+      "hive_edge_12_roof",
+      "hive_edge_20_roof",
+      "hive_edge_21_roof",
+      "hive_edge_22_roof"
+    ],
+    "fg": "hive_yellow",
+    "//": "i dont believe this is actually hardcoded terrain now"
   },
   {
     "id": "spider_pit",

diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json
@@ -1147,6 +1147,10 @@
     ],
     "fg": "big_building_red"
   },
+  {
+    "id": "solar_farm",
+    "fg": "square_yellow"
+  },
   {
     "id": [
       "wind_turbine_ground",

diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json
@@ -848,7 +848,9 @@
       "lodge_roof1",
       "lodge_roof2",
       "lodge_basement_residential1",
-      "lodge_basement_residential2"
+      "lodge_basement_residential2",
+      "lodge_basement_residential3",
+      "lodge_basement_residential4"
     ],
     "fg": "big_house_brown"
   },

diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_light_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_light_red.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_red.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_blue.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_blue.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_blue.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_blue.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_red.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_red.png
diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/square/square_yellow.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/square/square_yellow.png
diff --git a/gfx/NeoDays/layering.json b/gfx/NeoDays/layering.json
@@ -23,7 +23,15 @@
         "layer": 90,
         "offset_x": 3,
         "offset_y": -10
+      },
+      {
+        "item": "national_flag",
+        "sprite": [{"id": "national_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 3,
+        "offset_y": -10
       }
+
     ]
   },
 
@@ -51,6 +59,13 @@
         "layer": 90,
         "offset_x": 3,
         "offset_y": -10
+      },
+      {
+        "item": "national_flag",
+        "sprite": [{"id": "national_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 3,
+        "offset_y": -10
       }
     ]
   }

diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/acorns.json b/gfx/NeoDays/pngs_tiles_10x10/items/acorns.json
@@ -20,6 +20,9 @@
     "hickory_nut",
     "pistachio_roasted",
     "pistachio_unshelled",
+    "butternut",
+    "butternut_shelled",
+    "butternut_roasted",
     "seed_tobacco",
     "seed_beans",
     "seed_bell_pepper",

diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/boiled_egg.json b/gfx/NeoDays/pngs_tiles_10x10/items/boiled_egg.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "boiled_egg",
+    "egg_reptile"
+  ],
+  "fg": "boiled_egg"
+}
diff --git a/...gs_tiles_10x10/items/908_boiled_egg_0.png → ...ays/pngs_tiles_10x10/items/boiled_egg.png b/...gs_tiles_10x10/items/908_boiled_egg_0.png → ...ays/pngs_tiles_10x10/items/boiled_egg.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/boiled_egg_egg_reptile_egg_wasp_ant_egg_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/boiled_egg_egg_reptile_egg_wasp_ant_egg_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bone.json b/gfx/NeoDays/pngs_tiles_10x10/items/bone.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "bone",
+    "bone_human"
+  ],
+  "fg": "bone"
+}
diff --git a/...s_tiles_10x10/items/1038_bone_human_0.png → gfx/NeoDays/pngs_tiles_10x10/items/bone.png b/...s_tiles_10x10/items/1038_bone_human_0.png → gfx/NeoDays/pngs_tiles_10x10/items/bone.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bone_human_bone_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bone_human_bone_0.json
diff --git a/...oDays/pngs_tiles_10x10/items/brioche_toastem_toastem2_toastem3_toasterpastryfrozen_0.json b/...oDays/pngs_tiles_10x10/items/brioche_toastem_toastem2_toastem3_toasterpastryfrozen_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/cereal_cereal2_cereal3_can_peach_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/cereal_cereal2_cereal3_can_peach_0.json
diff --git a/.../pngs_tiles_10x10/items/3039_condom_0.png → ...NeoDays/pngs_tiles_10x10/items/condom.png b/.../pngs_tiles_10x10/items/3039_condom_0.png → ...NeoDays/pngs_tiles_10x10/items/condom.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/condom_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/condom_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/dahlia_root.json b/gfx/NeoDays/pngs_tiles_10x10/items/dahlia_root.json
@@ -0,0 +1,13 @@
+{
+  "id": [
+    "dahlia_root",
+    "dahlia_baked",
+    "cattail_rhizome",
+    "hickory_root",
+    "seed_hops",
+    "salsify_raw",
+    "salsify_baked",
+    "chicory_raw"
+  ],
+  "fg": "dahlia_root"
+}
diff --git a/..._tiles_10x10/items/1033_dahlia_root_0.png → ...ys/pngs_tiles_10x10/items/dahlia_root.png b/..._tiles_10x10/items/1033_dahlia_root_0.png → ...ys/pngs_tiles_10x10/items/dahlia_root.png
diff --git a/...baked_cattail_rhizome_hickory_root_seed_hops_salsify_raw_salsify_baked_chicory_raw_0.json b/...baked_cattail_rhizome_hickory_root_seed_hops_salsify_raw_salsify_baked_chicory_raw_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/egg_insect.png b/gfx/NeoDays/pngs_tiles_10x10/items/egg_insect.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/fish_canned_lutefisk_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/fish_canned_lutefisk_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/fish_cooked_fish_pickled_salted_fish_wool_staple_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/fish_cooked_fish_pickled_salted_fish_wool_staple_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/fish_fried_noodles_fast_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/fish_fried_noodles_fast_0.json
diff --git a/...s/pngs_tiles_10x10/items/fish_lunchmeat_fried_spam_meat_aspic_hflesh_aspic_sashimi_0.json b/...s/pngs_tiles_10x10/items/fish_lunchmeat_fried_spam_meat_aspic_hflesh_aspic_sashimi_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_afghan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_afghan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_albanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_albanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_algerian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_algerian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_andorran_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_andorran_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_angolan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_angolan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_antiguan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_antiguan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_argentinian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_argentinian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_armenian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_armenian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_australian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_australian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_austrian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_austrian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_azerbaijanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_azerbaijanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bahamanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bahamanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bahrainian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bahrainian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bangladeshi_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bangladeshi_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_barbadian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_barbadian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_basotho_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_basotho_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belarusian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belarusian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belgian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belgian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belizean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_belizean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_beninian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_beninian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bhutanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bhutanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bissau_guinean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bissau_guinean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bolivian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bolivian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bosnian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bosnian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_botswanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_botswanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_brazilian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_brazilian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bruneian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bruneian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bulgarian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_bulgarian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_burkina_faso_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_burkina_faso_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_burundian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_burundian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cabo_verde_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cabo_verde_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cambodian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cambodian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cameroon_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cameroon_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_canadian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_canadian_flag.png
diff --git a/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_central_african_flag.png b/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_central_african_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chad_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chad_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chilean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chilean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chinese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_chinese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_columbian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_columbian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_comoros_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_comoros_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_congo_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_congo_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_costa_rican_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_costa_rican_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_croatian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_croatian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cuban_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cuban_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cypriot_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_cypriot_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_czech_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_czech_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_danish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_danish_flag.png
diff --git a/...eoDays/pngs_tiles_10x10/items/flags/national_flag_var_democratic_congo_flag.png b/...eoDays/pngs_tiles_10x10/items/flags/national_flag_var_democratic_congo_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_djiboutian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_djiboutian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dominica_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dominica_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dominican_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dominican_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dutch_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_dutch_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ecuadorian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ecuadorian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_egyptian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_egyptian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_emirati_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_emirati_flag.png
diff --git a/...Days/pngs_tiles_10x10/items/flags/national_flag_var_equatorial_guinean_flag.png b/...Days/pngs_tiles_10x10/items/flags/national_flag_var_equatorial_guinean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_eritrean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_eritrean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_estonian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_estonian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ethiopian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ethiopian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_fijian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_fijian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_filipino_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_filipino_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_finnish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_finnish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_french_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_french_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_gabonese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_gabonese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_gambian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_gambian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_georgian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_georgian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_german_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_german_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ghanaian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ghanaian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_greek_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_greek_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_grenadian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_grenadian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guatemalan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guatemalan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guinean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guinean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guyanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_guyanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_haitian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_haitian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_holy_see_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_holy_see_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_honduran_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_honduran_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_hungarian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_hungarian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_icelandic_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_icelandic_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_indian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_indian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_indonesian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_indonesian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_iranian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_iranian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_iraqi_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_iraqi_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_irish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_irish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_israeli_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_israeli_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_italian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_italian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ivory_coast_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ivory_coast_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_jamaican_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_jamaican_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_japanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_japanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_jordanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_jordanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kazakhstani_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kazakhstani_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kenyan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kenyan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kiribati_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kiribati_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kuwaiti_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kuwaiti_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kyrgyz_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_kyrgyz_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_laotian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_laotian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_latvian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_latvian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_lebanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_lebanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_liberian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_liberian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_libyan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_libyan_flag.png
diff --git a/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_liechtensteiner_flag.png b/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_liechtensteiner_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_lithuanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_lithuanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_luxembourger_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_luxembourger_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_macedonian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_macedonian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_madagascan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_madagascan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malawian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malawian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malaysia_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malaysia_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_maldivian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_maldivian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_malian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_maltese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_maltese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_marshallese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_marshallese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mauritanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mauritanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mexican_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mexican_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_micronesian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_micronesian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_moldovan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_moldovan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_monegasque_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_monegasque_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mongolian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_mongolian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_montenegrin_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_montenegrin_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_moroccan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_moroccan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_myanma_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_myanma_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_namibian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_namibian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nauruan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nauruan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nepali_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nepali_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_new_zealand_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_new_zealand_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nicaraguan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nicaraguan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nigerian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nigerian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nigerien_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_nigerien_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_north_korean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_north_korean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_norwegian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_norwegian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_omani_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_omani_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_pakistani_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_pakistani_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_palauan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_palauan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_palestinian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_palestinian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_panamanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_panamanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_papuan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_papuan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_paraguayan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_paraguayan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_peruvian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_peruvian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_polish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_polish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_portugese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_portugese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_qatari_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_qatari_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_romanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_romanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_russian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_russian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_rwandan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_rwandan_flag.png
diff --git a/...s/pngs_tiles_10x10/items/flags/national_flag_var_saint_kitts_and_nevis_flag.png b/...s/pngs_tiles_10x10/items/flags/national_flag_var_saint_kitts_and_nevis_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_saint_lucian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_saint_lucian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_salvadoran_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_salvadoran_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sammarinese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sammarinese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_samoan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_samoan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sao_tomean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sao_tomean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_saudi_arabian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_saudi_arabian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_senegalese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_senegalese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_serbian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_serbian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_seychellois_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_seychellois_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sierra_leonean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sierra_leonean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_singaporean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_singaporean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_slovakian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_slovakian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_slovenian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_slovenian_flag.png
diff --git a/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_solomon_islands_flag.png b/...NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_solomon_islands_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_somali_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_somali_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_africa_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_africa_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_korea_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_korea_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_sudan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_south_sudan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_spanish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_spanish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sri_lankan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sri_lankan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sudanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_sudanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_surinamese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_surinamese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swazi_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swazi_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swedish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swedish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swiss_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_swiss_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_syrian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_syrian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_taiwanese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_taiwanese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tajikistani_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tajikistani_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tanzanian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tanzanian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_thai_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_thai_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_timorese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_timorese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_togolese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_togolese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tongan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tongan_flag.png
diff --git a/...ays/pngs_tiles_10x10/items/flags/national_flag_var_trinidad_and_tobago_flag.png b/...ays/pngs_tiles_10x10/items/flags/national_flag_var_trinidad_and_tobago_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tunisian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tunisian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_turkish_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_turkish_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_turkmen_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_turkmen_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tuvaluan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_tuvaluan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ugandan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ugandan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ukrainian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_ukrainian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_united_kingdom_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_united_kingdom_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_uruguayan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_uruguayan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_uzbek_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_uzbek_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vanuatuan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vanuatuan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_venezuelan_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_venezuelan_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vietnamese_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vietnamese_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vincentian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_vincentian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_yemenis_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_yemenis_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_zambian_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_zambian_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_zimbabwean_flag.png b/gfx/NeoDays/pngs_tiles_10x10/items/flags/national_flag_var_zimbabwean_flag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/baklava.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/baklava.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/cereal.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/cereal.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "cereal",
+    "cereal2",
+    "cereal3",
+    "popcorn3",
+    "can_peach"
+  ],
+  "fg": "cereal"
+}
diff --git a/...s/pngs_tiles_10x10/items/990_cereal_0.png → ...ys/pngs_tiles_10x10/items/food/cereal.png b/...s/pngs_tiles_10x10/items/990_cereal_0.png → ...ys/pngs_tiles_10x10/items/food/cereal.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/dry_wheat_stalks.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/dry_wheat_stalks.json
@@ -0,0 +1,12 @@
+{
+  "id": [
+    "dry_wheat_stalks",
+    "dry_barley_stalks",
+    "dry_oat_stalks",
+    "dry_canola_stalks",
+    "dry_lentil_stalks",
+    "dry_buckwheat_stalks",
+    "dry_wild_rice_stalks"
+  ],
+  "fg": "dry_wheat_stalks"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/dry_wheat_stalks.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/dry_wheat_stalks.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/cherries.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/cherries.json
@@ -2,6 +2,7 @@
   "id": [
     "cherries",
     "irradiated_cherries",
+    "brandied_fruit",
     "raspberries",
     "irradiated_raspberries"
   ],

diff --git a/...iles_10x10/items/1064_hfleshbologna_0.png → ..._tiles_10x10/items/food/meats/bologna.png b/...iles_10x10/items/1064_hfleshbologna_0.png → ..._tiles_10x10/items/food/meats/bologna.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json
@@ -0,0 +1,11 @@
+{
+  "id": [
+    "fish",
+    "lunchmeat",
+    "fried_spam",
+    "meat_aspic",
+    "hflesh_aspic",
+    "sashimi"
+  ],
+  "fg": "fish"
+}
diff --git a/...ays/pngs_tiles_10x10/items/983_fish_0.png → ...ngs_tiles_10x10/items/food/meats/fish.png b/...ays/pngs_tiles_10x10/items/983_fish_0.png → ...ngs_tiles_10x10/items/food/meats/fish.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_canned.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_canned.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "fish_canned",
+    "lutefisk"
+  ],
+  "fg": "fish_canned"
+}
diff --git a/...s_tiles_10x10/items/986_fish_canned_0.png → ...es_10x10/items/food/meats/fish_canned.png b/...s_tiles_10x10/items/986_fish_canned_0.png → ...es_10x10/items/food/meats/fish_canned.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_cooked.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_cooked.json
@@ -0,0 +1,9 @@
+{
+  "id": [
+    "fish_cooked",
+    "fish_pickled",
+    "salted_fish",
+    "wool_staple"
+  ],
+  "fg": "fish_cooked"
+}
diff --git a/...s_tiles_10x10/items/984_fish_cooked_0.png → ...es_10x10/items/food/meats/fish_cooked.png b/...s_tiles_10x10/items/984_fish_cooked_0.png → ...es_10x10/items/food/meats/fish_cooked.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_fried.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_fried.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "fish_fried",
+    "noodles_fast"
+  ],
+  "fg": "fish_fried"
+}
diff --git a/...gs_tiles_10x10/items/985_fish_fried_0.png → ...les_10x10/items/food/meats/fish_fried.png b/...gs_tiles_10x10/items/985_fish_fried_0.png → ...les_10x10/items/food/meats/fish_fried.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json
@@ -0,0 +1,13 @@
+{
+  "id": [
+    "fish_smoked",
+    "pemmican",
+    "hflesh_pemmican",
+    "toasterpastry",
+    "cloutie_dumpling",
+    "haggis",
+    "human_haggis",
+    "unfinished_charcoal"
+  ],
+  "fg": "fish_smoked"
+}
diff --git a/...pngs_tiles_10x10/items/982_pemmican_0.png → ...es_10x10/items/food/meats/fish_smoked.png b/...pngs_tiles_10x10/items/982_pemmican_0.png → ...es_10x10/items/food/meats/fish_smoked.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_casings.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_casings.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "sausage_casings",
+    "sausage_casings_artificial"
+  ],
+  "fg": "sausage_casings"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_casings.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_casings.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/popcorn.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/popcorn.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "popcorn",
+    "popcorn2"
+  ],
+  "fg": "popcorn"
+}
diff --git a/.../pngs_tiles_10x10/items/989_popcorn_0.png → ...s/pngs_tiles_10x10/items/food/popcorn.png b/.../pngs_tiles_10x10/items/989_popcorn_0.png → ...s/pngs_tiles_10x10/items/food/popcorn.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_bolognese.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_bolognese.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "spaghetti_bolognese",
+    "spaghetti_human",
+    "amatriciana_pasta",
+    "chili",
+    "chili_human"
+  ],
+  "fg": "spaghetti_bolognese"
+}
diff --git a/...0x10/items/1084_spaghetti_bolognese_0.png → ..._10x10/items/food/spaghetti_bolognese.png b/...0x10/items/1084_spaghetti_bolognese_0.png → ..._10x10/items/food/spaghetti_bolognese.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/threshed_wheat.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/threshed_wheat.json
@@ -0,0 +1,11 @@
+{
+  "id": [
+    "threshed_wheat",
+    "threshed_barley",
+    "threshed_oats",
+    "threshed_canola",
+    "threshed_lentils",
+    "threshed_buckwheat"
+  ],
+  "fg": "threshed_wheat"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/threshed_wheat.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/threshed_wheat.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/thyme.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/thyme.json
@@ -0,0 +1,13 @@
+{
+  "id": [
+    "thyme",
+    "wheat_stalks",
+    "barley_stalks",
+    "oat_stalks",
+    "canola_stalks",
+    "buckwheat_stalks",
+    "wild_rice_stalks",
+    "seed_veggy_wild"
+  ],
+  "fg": "thyme"
+}
diff --git a/...s/pngs_tiles_10x10/items/1029_thyme_0.png → ...ays/pngs_tiles_10x10/items/food/thyme.png b/...s/pngs_tiles_10x10/items/1029_thyme_0.png → ...ays/pngs_tiles_10x10/items/food/thyme.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/toastem.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/toastem.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "toastem",
+    "toastem2",
+    "toastem3",
+    "toasterpastryfrozen",
+    "brioche"
+  ],
+  "fg": "toastem"
+}
diff --git a/.../pngs_tiles_10x10/items/981_brioche_0.png → ...s/pngs_tiles_10x10/items/food/toastem.png b/.../pngs_tiles_10x10/items/981_brioche_0.png → ...s/pngs_tiles_10x10/items/food/toastem.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/bamboo_cooked.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/bamboo_cooked.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/bell_pepper.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/bell_pepper.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/celery.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/celery.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/eggplant.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/eggplant.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/fiddlehead_raw.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/fiddlehead_raw.png