diff --git a/gfx/UltimateCataclysm/layering.json b/gfx/UltimateCataclysm/layering.json index 562f6e45fd..25120e7584 100644 --- a/gfx/UltimateCataclysm/layering.json +++ b/gfx/UltimateCataclysm/layering.json @@ -1,248 +1,142 @@ { -"variants": [ - { - "context": "f_flagpole", - "item_variants": [ - { - "item": "american_flag", - "sprite": [{"id": "american_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - }, - { - "item": "pride_flag", - "sprite": [{"id": "pride_flag_var_rainbow_pride_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - }, - { - "item": "state_flag", - "sprite": [{"id": "state_flag_var_massachusetts_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - } - ] - }, - { - "context": "f_wooden_flagpole", - "item_variants": [ - { - "item": "american_flag", - "sprite": [{"id": "american_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - }, - { - "item": "pride_flag", - "sprite": [{"id": "pride_flag_var_rainbow_pride_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - }, - { - "item": "state_flag", - "sprite": [{"id": "state_flag_var_massachusetts_flag_hoisted", "weight": 1}], - "layer": 90, - "offset_x": 16, - "offset_y": -37 - } - ] - }, - { - "context": "f_desk", - "item_variants": [ - { - "item": "laptop", - "sprite": [{"id": "desk_laptop", "weight": 1}], - "layer": 90 - }, - { - "item": "pen", - "sprite": [{"id": "desk_pen_1", "weight": 2}, {"id": "desk_pen_2", "weight": 2}], - "layer": 95 - }, - { - "item": "can_drink", - "sprite": [{"id": "desk_can_drink", "weight": 2}], - "layer": 100 - } - ] - }, - { - "context": "f_oven", - "item_variants": [ - { - "item": "pan", - "sprite": [{"id": "oven_pan_1", "weight": 1}, {"id": "oven_pan_2", "weight": 1}], - "layer": 100 - } - ] - }, - { - "context": "f_brazier", - "item_variants": [ - { - "item": "2x4", - "sprite": [{"id": "brazier_2x4", "weight": 1}], - "layer": 90 - }, - { - "item": "log", - "sprite": [{"id": "brazier_log", "weight": 1}], - "layer": 100 - } - ], - "field_variants": [ - { - "field": "fd_smoke", - "sprite": [{"id": "fd_smoke_overlay", "weight":2}] - } - ] - }, - { - "context": "f_toilet", - "item_variants": [ - { - "item": "water", - "sprite": [{"id": "toilet_water", "weight": 1}], - "layer": 90 - }, - { - "item": "water_clean", - "sprite": [{"id": "toilet_water", "weight": 1}], - "layer": 90 - } - ] - }, - { - "context": "f_fireplace", - "item_variants": [ - { - "item": "log", - "sprite": [{"id": "fireplace_log", "weight": 1}], - "layer": 100 - } - ] - }, - { - "context": "f_cupboard", - "item_variants": [ - { - "item": "battery_charger", - "sprite": [{"id": "cupboard_battery_charger", "weight": 1}], - "layer": 90 - }, - { - "item": "box_small", - "sprite": [{"id": "cupboard_box_small", "weight": 1}], - "layer": 90 - }, - { - "item": "candle", - "sprite": [{"id": "cupboard_candle", "weight": 1}], - "layer": 90 - }, - { - "item": "matches", - "sprite": [{"id": "cupboard_matches", "weight": 1}], - "layer": 90 - } - ] - }, - { - "context": "f_sink", - "item_variants": [ - { - "item": "box_small", - "sprite": [{"id": "sink_box_small", "weight": 1}], - "layer": 90 - }, - { - "item": "brush", - "sprite": [{"id": "sink_brush", "weight": 1}], - "layer": 90 - }, - { - "item": "dish_towel", - "sprite": [{"id": "sink_dish_towel", "weight": 1}], - "layer": 90 - }, - { - "item": "sponge", - "sprite": [{"id": "sink_sponge", "weight": 1}], - "layer": 90 - } - ] - }, - { - "context": "f_30gal_firebarrel", - "field_variants": [ - { - "field": "fd_fire", - "sprite": [{"id": "f_30gal_firebarrel_fd_fire", "weight": 2}] - }, - { - "field": "fd_smoke", - "sprite": [{"id": "fd_smoke_overlay", "weight":2}] - } - ] - }, - { - "context": "f_55gal_firebarrel", - "field_variants": [ - { - "field": "fd_fire", - "sprite": [{"id": "f_55gal_firebarrel_fd_fire", "weight": 2}] - }, - { - "field": "fd_smoke", - "sprite": [{"id": "fd_smoke_overlay", "weight":2}] - } - ] - }, - { - "context": "t_puddle", - "item_variants": [ - { - "item": "water", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - }, - { - "item": "water_clean", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - }, - { - "item": "water_murky", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - } - ] - }, - { - "context": "t_puddle_underground", - "item_variants": [ - { - "item": "water", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - }, - { - "item": "water_clean", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - }, - { - "item": "water_murky", - "sprite": [{"id": "puddle_water", "weight": 1}], - "layer": 90 - } - ] - } -] + "variants": [ + { + "context": [ "WALL" ], + "append_variants": "_postup", + "item_variants": [ + { "item": "american_flag", "layer": 90, "offset_x": 0, "offset_y": 0 }, + { "item": "national_flag", "layer": 90 }, + { + "item": "lab_postit_bio", + "sprite": [ { "id": "postit_01", "weight": 1 }, { "id": "postit_02", "weight": 1 }, { "id": "postit_03", "weight": 1 } ], + "layer": 90 + }, + { + "item": "lab_postit_blob", + "sprite": [ { "id": "postit_04", "weight": 1 }, { "id": "postit_05", "weight": 1 }, { "id": "postit_06", "weight": 1 } ], + "layer": 90 + }, + { + "item": "lab_postit_migo", + "sprite": [ { "id": "postit_07", "weight": 1 }, { "id": "postit_08", "weight": 1 }, { "id": "postit_09", "weight": 1 } ], + "layer": 90 + }, + { + "item": "lab_postit_portal", + "sprite": [ { "id": "postit_10", "weight": 1 }, { "id": "postit_11", "weight": 1 }, { "id": "postit_12", "weight": 1 } ], + "layer": 90 + }, + { + "item": "lab_postit_tech", + "sprite": [ { "id": "postit_13", "weight": 1 }, { "id": "postit_14", "weight": 1 }, { "id": "postit_15", "weight": 1 } ], + "layer": 90 + } + ] + }, + { + "context": "f_flagpole", + "append_variants": "_hoisted", + "item_variants": [ + { "item": "american_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "pride_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "state_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "national_flag", "layer": 90, "offset_x": 16, "offset_y": -37 } + ] + }, + { + "context": "f_wooden_flagpole", + "append_variants": "_hoisted", + "item_variants": [ + { "item": "american_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "pride_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "state_flag", "layer": 90, "offset_x": 16, "offset_y": -37 }, + { "item": "national_flag", "layer": 90, "offset_x": 16, "offset_y": -37 } + ] + }, + { + "context": "f_desk", + "item_variants": [ + { "item": "laptop", "sprite": [ { "id": "desk_laptop", "weight": 1 } ], "layer": 90 }, + { + "item": "pen", + "sprite": [ { "id": "desk_pen_1", "weight": 2 }, { "id": "desk_pen_2", "weight": 2 } ], + "layer": 95 + }, + { "item": "can_drink", "sprite": [ { "id": "desk_can_drink", "weight": 2 } ], "layer": 100 } + ] + }, + { + "context": "f_oven", + "item_variants": [ + { "item": "pan", "sprite": [ { "id": "oven_pan_1", "weight": 1 }, { "id": "oven_pan_2", "weight": 1 } ], "layer": 100 } + ] + }, + { + "context": "f_brazier", + "item_variants": [ + { "item": "2x4", "sprite": [ { "id": "brazier_2x4", "weight": 1 } ], "layer": 90 }, + { "item": "log", "sprite": [ { "id": "brazier_log", "weight": 1 } ], "layer": 100 } + ], + "field_variants": [ { "field": "fd_smoke", "sprite": [ { "id": "fd_smoke_overlay", "weight": 2 } ] } ] + }, + { + "context": "f_toilet", + "item_variants": [ + { "item": "water", "sprite": [ { "id": "toilet_water", "weight": 1 } ], "layer": 90 }, + { "item": "water_clean", "sprite": [ { "id": "toilet_water", "weight": 1 } ], "layer": 90 } + ] + }, + { + "context": "f_fireplace", + "item_variants": [ { "item": "log", "sprite": [ { "id": "fireplace_log", "weight": 1 } ], "layer": 100 } ] + }, + { + "context": "f_cupboard", + "item_variants": [ + { "item": "battery_charger", "sprite": [ { "id": "cupboard_battery_charger", "weight": 1 } ], "layer": 90 }, + { "item": "box_small", "sprite": [ { "id": "cupboard_box_small", "weight": 1 } ], "layer": 90 }, + { "item": "candle", "sprite": [ { "id": "cupboard_candle", "weight": 1 } ], "layer": 90 }, + { "item": "matches", "sprite": [ { "id": "cupboard_matches", "weight": 1 } ], "layer": 90 } + ] + }, + { + "context": "f_sink", + "item_variants": [ + { "item": "box_small", "sprite": [ { "id": "sink_box_small", "weight": 1 } ], "layer": 90 }, + { "item": "brush", "sprite": [ { "id": "sink_brush", "weight": 1 } ], "layer": 90 }, + { "item": "dish_towel", "sprite": [ { "id": "sink_dish_towel", "weight": 1 } ], "layer": 90 }, + { "item": "sponge", "sprite": [ { "id": "sink_sponge", "weight": 1 } ], "layer": 90 } + ] + }, + { + "context": "f_30gal_firebarrel", + "field_variants": [ + { "field": "fd_fire", "sprite": [ { "id": "f_30gal_firebarrel_fd_fire", "weight": 2 } ] }, + { "field": "fd_smoke", "sprite": [ { "id": "fd_smoke_overlay", "weight": 2 } ] } + ] + }, + { + "context": "f_55gal_firebarrel", + "field_variants": [ + { "field": "fd_fire", "sprite": [ { "id": "f_55gal_firebarrel_fd_fire", "weight": 2 } ] }, + { "field": "fd_smoke", "sprite": [ { "id": "fd_smoke_overlay", "weight": 2 } ] } + ] + }, + { + "context": "t_puddle", + "item_variants": [ + { "item": "water", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }, + { "item": "water_clean", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }, + { "item": "water_murky", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 } + ] + }, + { + "context": "t_puddle_underground", + "item_variants": [ + { "item": "water", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }, + { "item": "water_clean", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }, + { "item": "water_murky", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 } + ] + } + ] } diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag.png index 6c2917a42e..b73e738474 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_hoisted.png index 853c3853fa..e25ea68100 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_hoisted.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_postup.png new file mode 100644 index 0000000000..44c61a7d71 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/american_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag.png new file mode 100644 index 0000000000..293cffc0be Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_hoisted.png new file mode 100644 index 0000000000..47163009b1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_postup.png new file mode 100644 index 0000000000..4dd595c522 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_bangladeshi_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag.png new file mode 100644 index 0000000000..419de3005f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_hoisted.png new file mode 100644 index 0000000000..efde1cc10a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_postup.png new file mode 100644 index 0000000000..79f7b811e1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_brazilian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag.png new file mode 100644 index 0000000000..5fe09830d3 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_hoisted.png new file mode 100644 index 0000000000..c8464b8f64 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_postup.png new file mode 100644 index 0000000000..98d38e050e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_chinese_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag.png new file mode 100644 index 0000000000..03fea2c016 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_hoisted.png new file mode 100644 index 0000000000..679a5e1e9c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_postup.png new file mode 100644 index 0000000000..980ae5f259 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_colombian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag.png new file mode 100644 index 0000000000..a665d97bbb Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_hoisted.png new file mode 100644 index 0000000000..9b27ac0fc7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_postup.png new file mode 100644 index 0000000000..399bdc2802 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_democratic_congo_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag.png new file mode 100644 index 0000000000..e10213833b Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_hoisted.png new file mode 100644 index 0000000000..1d0de0386e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_postup.png new file mode 100644 index 0000000000..7afac4486f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_egyptian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag.png new file mode 100644 index 0000000000..0d111d1408 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_hoisted.png new file mode 100644 index 0000000000..c9549d946c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_postup.png new file mode 100644 index 0000000000..c7a9f1dd1a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_ethiopian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag.png new file mode 100644 index 0000000000..df9ef2425e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_hoisted.png new file mode 100644 index 0000000000..12becb9fe3 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_postup.png new file mode 100644 index 0000000000..f82b384a39 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_filipino_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag.png new file mode 100644 index 0000000000..5243094093 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_hoisted.png new file mode 100644 index 0000000000..64e72b71ef Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_postup.png new file mode 100644 index 0000000000..7d29fd433f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_french_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag.png new file mode 100644 index 0000000000..6c895bda2e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_hoisted.png new file mode 100644 index 0000000000..1ef6fdf110 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_postup.png new file mode 100644 index 0000000000..1aa8c1d1ef Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_german_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag.png new file mode 100644 index 0000000000..9bddbcc7e0 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_hoisted.png new file mode 100644 index 0000000000..fdb06a1f0b Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_postup.png new file mode 100644 index 0000000000..0cae4726b3 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag.png new file mode 100644 index 0000000000..5417e36ce3 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_hoisted.png new file mode 100644 index 0000000000..d52bf00ea5 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_postup.png new file mode 100644 index 0000000000..fa2f22db15 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_indonesian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag.png new file mode 100644 index 0000000000..0230a80d9f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_hoisted.png new file mode 100644 index 0000000000..2cef1984f7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_postup.png new file mode 100644 index 0000000000..f0426bf5c0 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_iranian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag.png new file mode 100644 index 0000000000..0a6c1f376a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_hoisted.png new file mode 100644 index 0000000000..c5b6c3ad61 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_postup.png new file mode 100644 index 0000000000..a739583efe Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_italian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag.png new file mode 100644 index 0000000000..dfc981c82a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_hoisted.png new file mode 100644 index 0000000000..87f0ecf63d Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_postup.png new file mode 100644 index 0000000000..bbef8a38b1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_japanese_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag.png new file mode 100644 index 0000000000..4c5a4febf8 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_hoisted.png new file mode 100644 index 0000000000..37bb148210 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_postup.png new file mode 100644 index 0000000000..cad74f9bc8 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_kenyan_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag.png new file mode 100644 index 0000000000..71d8f3e4b4 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_hoisted.png new file mode 100644 index 0000000000..807afa5c7c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_postup.png new file mode 100644 index 0000000000..c0c2b6e26e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_mexican_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag.png new file mode 100644 index 0000000000..87f9c5a145 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_hoisted.png new file mode 100644 index 0000000000..3f1e212889 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_postup.png new file mode 100644 index 0000000000..bb1ab74471 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_myanma_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag.png new file mode 100644 index 0000000000..9bdbdb047d Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_hoisted.png new file mode 100644 index 0000000000..825f5fd468 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_postup.png new file mode 100644 index 0000000000..40688b0ea7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_nigerian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag.png new file mode 100644 index 0000000000..d9c3da7972 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_hoisted.png new file mode 100644 index 0000000000..e9ebdfbb95 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_postup.png new file mode 100644 index 0000000000..49ff704c8c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_pakistani_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag.png new file mode 100644 index 0000000000..d1f7a92540 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_hoisted.png new file mode 100644 index 0000000000..d50ff6b160 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_postup.png new file mode 100644 index 0000000000..41d6f29c9e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_russian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag.png new file mode 100644 index 0000000000..4f57940923 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_hoisted.png new file mode 100644 index 0000000000..8d8543efe4 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_postup.png new file mode 100644 index 0000000000..e376915b09 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_africa_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag.png new file mode 100644 index 0000000000..88b11f31cf Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_hoisted.png new file mode 100644 index 0000000000..1d2c9a75b5 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_postup.png new file mode 100644 index 0000000000..f1001f58d9 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_african_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag.png new file mode 100644 index 0000000000..dc7ed572be Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_hoisted.png new file mode 100644 index 0000000000..7a986121ba Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_postup.png new file mode 100644 index 0000000000..e6918c9e48 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_south_korea_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag.png new file mode 100644 index 0000000000..722f9548e7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_hoisted.png new file mode 100644 index 0000000000..b20cb9487a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_postup.png new file mode 100644 index 0000000000..b1923754ee Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_sudanese_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag.png new file mode 100644 index 0000000000..47d9135960 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_hoisted.png new file mode 100644 index 0000000000..2b35fac721 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_postup.png new file mode 100644 index 0000000000..fcda623b3f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_tanzanian_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag.png new file mode 100644 index 0000000000..accd31effd Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_hoisted.png new file mode 100644 index 0000000000..edaae6abd1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_postup.png new file mode 100644 index 0000000000..3c8bc19227 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_thai_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag.png new file mode 100644 index 0000000000..cc310004ec Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_hoisted.png new file mode 100644 index 0000000000..e75c71b69f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_postup.png new file mode 100644 index 0000000000..b6598e4c68 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_turkish_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag.png new file mode 100644 index 0000000000..5b54db17b6 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_hoisted.png new file mode 100644 index 0000000000..c7d34702f4 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_postup.png new file mode 100644 index 0000000000..993c50cb47 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_united_kingdom_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag.png new file mode 100644 index 0000000000..f1b0cc74ed Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_hoisted.png new file mode 100644 index 0000000000..ef306e6d0b Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_postup.png new file mode 100644 index 0000000000..6e7d8fd5f4 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/national_flag_var_vietnamese_flag_postup.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag.png index 882e33efcc..fe15106a57 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_hoisted.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_hoisted.png index 83a8312c1d..dd51523f28 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_hoisted.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_hoisted.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_postup.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_postup.png new file mode 100644 index 0000000000..0601020c97 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_rainbow_pride_flag_postup.png differ diff --git a/scratch/UltimateCataclysm/items/flags/american_flag.png b/scratch/UltimateCataclysm/items/flags/american_flag.png new file mode 100644 index 0000000000..51776c77c7 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/american_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/flags.xcf b/scratch/UltimateCataclysm/items/flags/legacy_flags.xcf similarity index 100% rename from scratch/UltimateCataclysm/items/flags/flags.xcf rename to scratch/UltimateCataclysm/items/flags/legacy_flags.xcf diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_bangladeshi_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_bangladeshi_flag.png new file mode 100644 index 0000000000..60d4e2bb9c Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_bangladeshi_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_brazilian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_brazilian_flag.png new file mode 100644 index 0000000000..48ce150855 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_brazilian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_chinese_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_chinese_flag.png new file mode 100644 index 0000000000..5b121a6004 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_chinese_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_colombian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_colombian_flag.png new file mode 100644 index 0000000000..f18c36c659 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_colombian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_democratic_congo_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_democratic_congo_flag.png new file mode 100644 index 0000000000..91ae6ed9b7 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_democratic_congo_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_egyptian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_egyptian_flag.png new file mode 100644 index 0000000000..720ebf7031 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_egyptian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_ethiopian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_ethiopian_flag.png new file mode 100644 index 0000000000..bf6070967c Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_ethiopian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_filipino_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_filipino_flag.png new file mode 100644 index 0000000000..cc15b8ae49 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_filipino_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_french_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_french_flag.png new file mode 100644 index 0000000000..042be9fee3 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_french_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_german_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_german_flag.png new file mode 100644 index 0000000000..04c412bd19 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_german_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_indian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_indian_flag.png new file mode 100644 index 0000000000..2ffeb79884 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_indian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_indonesian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_indonesian_flag.png new file mode 100644 index 0000000000..023ed6cc9a Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_indonesian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_iranian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_iranian_flag.png new file mode 100644 index 0000000000..9461a88099 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_iranian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_italian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_italian_flag.png new file mode 100644 index 0000000000..1414600b3a Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_italian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_japanese_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_japanese_flag.png new file mode 100644 index 0000000000..17311d14c1 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_japanese_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_kenyan_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_kenyan_flag.png new file mode 100644 index 0000000000..6115a2ea41 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_kenyan_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_mexican_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_mexican_flag.png new file mode 100644 index 0000000000..8d5d126cf5 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_mexican_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_myanma_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_myanma_flag.png new file mode 100644 index 0000000000..86b6dae572 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_myanma_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_nigerian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_nigerian_flag.png new file mode 100644 index 0000000000..638504e5e9 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_nigerian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_pakistani_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_pakistani_flag.png new file mode 100644 index 0000000000..c0a54b893f Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_pakistani_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_russian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_russian_flag.png new file mode 100644 index 0000000000..fb8cba1408 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_russian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_south_africa_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_south_africa_flag.png new file mode 100644 index 0000000000..f5f923c884 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_south_africa_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_south_korea_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_south_korea_flag.png new file mode 100644 index 0000000000..7750bd33f6 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_south_korea_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_sudanese_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_sudanese_flag.png new file mode 100644 index 0000000000..88d7e81a5c Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_sudanese_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_tanzanian_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_tanzanian_flag.png new file mode 100644 index 0000000000..ae2dab9711 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_tanzanian_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_thai_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_thai_flag.png new file mode 100644 index 0000000000..bd4d0ed87a Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_thai_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_turkish_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_turkish_flag.png new file mode 100644 index 0000000000..7417ae21a1 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_turkish_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_united_kingdom_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_united_kingdom_flag.png new file mode 100644 index 0000000000..6f347c5d5f Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_united_kingdom_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/national_flag_var_vietnamese_flag.png b/scratch/UltimateCataclysm/items/flags/national_flag_var_vietnamese_flag.png new file mode 100644 index 0000000000..c372dc0b4a Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/national_flag_var_vietnamese_flag.png differ diff --git a/scratch/UltimateCataclysm/items/flags/shading/flag_hoisted_shading.png b/scratch/UltimateCataclysm/items/flags/shading/flag_hoisted_shading.png new file mode 100644 index 0000000000..b0975d0360 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/shading/flag_hoisted_shading.png differ diff --git a/scratch/UltimateCataclysm/items/flags/shading/flag_item_shadow.png b/scratch/UltimateCataclysm/items/flags/shading/flag_item_shadow.png new file mode 100644 index 0000000000..93b0ffbb34 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/shading/flag_item_shadow.png differ diff --git a/scratch/UltimateCataclysm/items/flags/shading/flag_postup_shading.png b/scratch/UltimateCataclysm/items/flags/shading/flag_postup_shading.png new file mode 100644 index 0000000000..9e04bf8525 Binary files /dev/null and b/scratch/UltimateCataclysm/items/flags/shading/flag_postup_shading.png differ diff --git a/tools/ultica_build_flags.cmd b/tools/ultica_build_flags.cmd new file mode 100644 index 0000000000..80198b8c21 --- /dev/null +++ b/tools/ultica_build_flags.cmd @@ -0,0 +1 @@ +gimp-2.10 -idf --batch-interpreter python-fu-eval -b "import sys;sys.path=['.']+sys.path;import ultica_build_flags;ultica_build_flags.run('../scratch/UltimateCataclysm/items/flags')" -b "pdb.gimp_quit(1)" \ No newline at end of file diff --git a/tools/ultica_build_flags.py b/tools/ultica_build_flags.py new file mode 100644 index 0000000000..ea36af46b3 --- /dev/null +++ b/tools/ultica_build_flags.py @@ -0,0 +1,90 @@ +#!/usr/bin/python + +import os, glob, sys, time +from gimpfu import * +""" +This script uses GIMP 2.10 to turn a flat flag sprite (e.g. "national_flag_var_chinese_flag_scratch") into three contextual sprites. +-"postup" for hanging flags on walls +-"hoisted" for hanging flags on flagpoles +-"", for a dropped flag variant item +""" +def process(infile): + file_split = os.path.split(infile) + dir = file_split[0] + save_dir = normal_path(os.path.join(dir, "output")) + base_name = file_split[1][:-4] + file_load = normal_path(infile) + file_hoisted_save = normal_path(os.path.join(save_dir,base_name+"_hoisted.png")) + file_item_save = normal_path(os.path.join(save_dir,base_name+".png")) + file_postup_save = normal_path(os.path.join(save_dir,base_name+"_postup.png")) + + file_hoisted_shading = normal_path(os.path.join(dir,"shading/flag_hoisted_shading.png")) + file_postup_shading = normal_path(os.path.join(dir,"shading/flag_postup_shading.png")) + file_item_shadow = normal_path(os.path.join(dir,"shading/flag_item_shadow.png")) + + #create the image + img=pdb.gimp_file_load(file_load, file_load) + + #post_up + pdb.gimp_image_select_rectangle(img, 0, 4, 5, 5, 18) + pdb.gimp_floating_sel_anchor(pdb.gimp_selection_float(pdb.gimp_image_get_active_layer(img), 0, 1)) + pdb.gimp_image_select_rectangle(img, 0, 9, 5, 15, 18) + pdb.gimp_floating_sel_anchor(pdb.gimp_selection_float(pdb.gimp_image_get_active_layer(img), 0, 2)) + pdb.gimp_image_select_rectangle(img, 0, 24, 5, 5, 18) + pdb.gimp_floating_sel_anchor(pdb.gimp_selection_float(pdb.gimp_image_get_active_layer(img), 0, 1)) + + postup_shading = pdb.gimp_file_load_layer(img, file_postup_shading) + pdb.gimp_image_insert_layer( img, postup_shading, None, -1) + pdb.gimp_image_merge_down( img, postup_shading, 0) + pdb.file_png_save(img, img.layers[0], file_postup_save, file_postup_save, 0, 9, 0, 0, 0, 0, 0) + + pdb.gimp_image_delete(img) + #hoisted + img=pdb.gimp_file_load(file_load, file_load) + + offsetx=[8,12,16,20,24,28] + offsety=[1,2,3,2,1,2] + + for i in range(0,6): + pdb.gimp_image_select_rectangle(img, 0, offsetx[i], 5, 4, 18) + pdb.gimp_floating_sel_anchor(pdb.gimp_selection_float(pdb.gimp_image_get_active_layer(img), 0, offsety[i])) + + shading = pdb.gimp_file_load_layer(img, file_hoisted_shading) + pdb.gimp_image_insert_layer( img, shading, None, -1) + pdb.gimp_image_merge_down( img, shading, 0) + pdb.file_png_save(img, img.layers[0], file_hoisted_save, file_hoisted_save, 0, 9, 0, 0, 0, 0, 0) + + #item + activeLayer = img.layers[0] + pdb.plug_in_map_object( + img, activeLayer, 0, + 0.5, 0.5, 1.0, + 0.455, 0.5, -0.06, + 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, + -24.0, -5.0, -40.0, + 2, (0,0,0), + 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, + 0.3, 1.0, 0.5, 0.5, 27.0, + 0, 0, 0, 1, + 0.0, 0.0, 0.0, 0.0, 0.0, + activeLayer, activeLayer, activeLayer, activeLayer, activeLayer, activeLayer, activeLayer, activeLayer); + pdb.plug_in_threshold_alpha(img, img.layers[0], 93.4) + shadow = pdb.gimp_file_load_layer(img, file_item_shadow) + pdb.gimp_image_insert_layer( img, shadow, None, -1) + pdb.gimp_image_merge_down( img, shadow, 0) + + pdb.file_png_save(img, img.layers[0], file_item_save, file_item_save, 0, 9, 0, 0, 0, 0, 0) + pdb.gimp_image_delete(img) +def normal_path(path): + return path.replace("\\","/") + +def run(directory): + start=time.time() + for infile in glob.glob(os.path.join(directory, '*.png')): + process(infile) + end=time.time() + +if __name__ == "__main__": + run("../scratch/UltimateCataclysm/items/flags") \ No newline at end of file