Skip to content

Commit

Permalink
flag factory, national flags, layering updates
Browse files Browse the repository at this point in the history
-ultica_build_flags.cmd will turn flat flag images into layered sprites + item sprites
-top 30 national flags by population
-updates to layering.json to support better layering
  • Loading branch information
ShnitzelX2 authored and Fris0uman committed Dec 23, 2024
1 parent b496e29 commit 0d30dad
Show file tree
Hide file tree
Showing 133 changed files with 231 additions and 246 deletions.
386 changes: 140 additions & 246 deletions gfx/UltimateCataclysm/layering.json
Original file line number Diff line number Diff line change
@@ -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 }
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions tools/ultica_build_flags.cmd
Original file line number Diff line number Diff line change
@@ -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)"
Loading

0 comments on commit 0d30dad

Please sign in to comment.