Skip to content

Commit

Permalink
Merge pull request #65399 from CleverRaven/tileset-updates
Browse files Browse the repository at this point in the history 
Routine tileset updates on 30 April 2023
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored May 2, 2023
2 parents 85cc8ac + edeb2d0 commit 0d71f54
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 101 deletions.
Binary file modified gfx/Cuteclysm/backdrop.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Cuteclysm/items.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
204 changes: 103 additions & 101 deletions gfx/Cuteclysm/tile_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,116 +715,120 @@
"sprite_offset_x": 0,
"sprite_offset_y": -8,
"tiles": [
{ "id": "corpse", "fg": 852 },
{ "id": "fire_ax", "fg": 841 },
{ "id": "ax", "fg": 843 },
{ "id": "hatchet", "fg": 842 },
{ "id": "corpse", "fg": 856 },
{ "id": "fire_ax", "fg": 845 },
{ "id": "ax", "fg": 847 },
{ "id": "hatchet", "fg": 846 },
{
"id": "can_food",
"fg": [
{ "weight": 1, "sprite": 844 },
{ "weight": 2, "sprite": 845 },
{ "weight": 2, "sprite": 846 },
{ "weight": 2, "sprite": 847 },
{ "weight": 1, "sprite": 848 }
{ "weight": 1, "sprite": 848 },
{ "weight": 2, "sprite": 849 },
{ "weight": 2, "sprite": 850 },
{ "weight": 2, "sprite": 851 },
{ "weight": 1, "sprite": 852 }
]
},
{ "id": "handrolled_cig", "fg": 858 },
{ "id": "joint", "fg": 858 },
{ "id": "newest_newspaper", "fg": 861 },
{ "id": "weeks_old_newspaper", "fg": 861 },
{ "id": "months_old_newspaper", "fg": 861 },
{ "id": "one_year_old_newspaper", "fg": 861 },
{ "id": "years_old_newspaper", "fg": 861 },
{ "id": "many_years_old_newspaper", "fg": 861 },
{ "id": "rock_flaking", "fg": [ { "weight": 1, "sprite": 866 }, { "weight": 1, "sprite": 867 } ] },
{ "id": "handrolled_cig", "fg": 862 },
{ "id": "joint", "fg": 862 },
{ "id": "newest_newspaper", "fg": 865 },
{ "id": "weeks_old_newspaper", "fg": 865 },
{ "id": "months_old_newspaper", "fg": 865 },
{ "id": "one_year_old_newspaper", "fg": 865 },
{ "id": "years_old_newspaper", "fg": 865 },
{ "id": "many_years_old_newspaper", "fg": 865 },
{ "id": "rock_flaking", "fg": [ { "weight": 1, "sprite": 870 }, { "weight": 1, "sprite": 871 } ] },
{ "id": "2x4", "fg": 768 },
{ "id": "anvil", "fg": 769 },
{ "id": "ash", "fg": 770 },
{ "id": "bag_plastic", "fg": 771 },
{ "id": "bb", "fg": 772 },
{ "id": "bearing", "fg": 773 },
{ "id": "blanket", "fg": 774 },
{ "id": "bottle_glass", "fg": 775 },
{ "id": "bottle_plastic", "fg": 776 },
{ "id": "bottle_plastic_small", "fg": 777 },
{ "id": "bottle_twoliter", "fg": 778 },
{ "id": "box_cigarette", "fg": 779 },
{ "id": "box_large", "fg": 780 },
{ "id": "box_medium", "fg": 781 },
{ "id": "box_small", "fg": 782 },
{ "id": "broom", "fg": 783 },
{ "id": "bucket", "fg": 784 },
{ "id": "can_drink", "fg": 785 },
{ "id": "ceramic_cup", "fg": 786 },
{ "id": "ceramic_mug", "fg": 787 },
{ "id": "chess", "fg": 788 },
{ "id": "clay_hydria", "fg": 789 },
{ "id": "clay_lump", "fg": 790 },
{ "id": "clay_watercont", "fg": 791 },
{ "id": "crucible_clay", "fg": 792 },
{ "id": "cutting_board", "fg": 793 },
{ "id": "digging_stick", "fg": 794 },
{ "id": "glass", "fg": 795 },
{ "id": "glass_shard", "fg": 796 },
{ "id": "hacksaw", "fg": 797 },
{ "id": "kettle", "fg": 798 },
{ "id": "knitting_needles", "fg": 799 },
{ "id": "ladle", "fg": 800 },
{ "id": "marble", "fg": 801 },
{ "id": "mop", "fg": 802 },
{ "id": "nail", "fg": 803 },
{ "id": "pan", "fg": 804 },
{ "id": "paper", "fg": 805 },
{ "id": "pebble", "fg": 806 },
{ "id": "pickaxe", "fg": 807 },
{ "id": "pillow", "fg": 808 },
{ "id": "pot", "fg": 809 },
{ "id": "rag", "fg": 810 },
{ "id": "rake", "fg": 811 },
{ "id": "rebar", "fg": 812 },
{ "id": "rock", "fg": 813 },
{ "id": "rock_large", "fg": 814 },
{ "id": "rolling_pin", "fg": 815 },
{ "id": "saw", "fg": 816 },
{ "id": "scrap", "fg": 817 },
{ "id": "sharp_rock", "fg": 818 },
{ "id": "sheet_metal", "fg": 819 },
{ "id": "sheet_metal_small", "fg": 820 },
{ "id": "sickle", "fg": 821 },
{ "id": "sickle_stone", "fg": 822 },
{ "id": "spear_knife", "fg": 823 },
{ "id": "spear_knife_superior", "fg": 824 },
{ "id": "splinter", "fg": 825 },
{ "id": "steel_pan", "fg": 826 },
{ "id": "stick", "fg": 827 },
{ "id": "stick_long", "fg": 828 },
{ "id": "string_36", "fg": 829 },
{ "id": "string_6", "fg": 830 },
{ "id": "television", "fg": 831 },
{ "id": "thread", "fg": 832 },
{ "id": "tonfa_wood", "fg": 833 },
{ "id": "tongs", "fg": 834 },
{ "id": "toolbox_empty", "fg": 835 },
{ "id": "washboard", "fg": 836 },
{ "id": "wood_panel", "fg": 837 },
{ "id": "wood_sheet", "fg": 838 },
{ "id": "wood_smoother", "fg": 839 },
{ "id": "wrapper", "fg": 840 },
{ "id": "cig", "fg": 849 },
{ "id": "cig_butt", "fg": 850 },
{ "id": "cig_lit", "fg": 851 },
{ "id": "corpse_mon_ant", "fg": 853 },
{ "id": "corpse_mon_dog", "fg": 854 },
{ "id": "corpse_mon_wasp", "fg": 855 },
{ "id": "corpse_mon_zombie_child", "fg": 856 },
{ "id": "corpse_mon_zombie_soldier", "fg": 857 },
{ "id": "joint_lit", "fg": 859 },
{ "id": "joint_roach", "fg": 860 },
{ "id": "radio", "fg": 862 },
{ "id": "radio_on", "fg": 863 },
{ "id": "ref_lighter", "fg": 864 },
{ "id": "ref_lighter_on", "fg": 865 }
{ "id": "bone", "fg": 775 },
{ "id": "bone_knife", "fg": 776 },
{ "id": "bottle_glass", "fg": 777 },
{ "id": "bottle_plastic", "fg": 778 },
{ "id": "bottle_plastic_small", "fg": 779 },
{ "id": "bottle_twoliter", "fg": 780 },
{ "id": "box_cigarette", "fg": 781 },
{ "id": "box_large", "fg": 782 },
{ "id": "box_medium", "fg": 783 },
{ "id": "box_small", "fg": 784 },
{ "id": "broom", "fg": 785 },
{ "id": "bucket", "fg": 786 },
{ "id": "can_drink", "fg": 787 },
{ "id": "ceramic_cup", "fg": 788 },
{ "id": "ceramic_mug", "fg": 789 },
{ "id": "chess", "fg": 790 },
{ "id": "clay_hydria", "fg": 791 },
{ "id": "clay_lump", "fg": 792 },
{ "id": "clay_watercont", "fg": 793 },
{ "id": "crucible_clay", "fg": 794 },
{ "id": "cutting_board", "fg": 795 },
{ "id": "digging_stick", "fg": 796 },
{ "id": "glass", "fg": 797 },
{ "id": "glass_shard", "fg": 798 },
{ "id": "hacksaw", "fg": 799 },
{ "id": "kettle", "fg": 800 },
{ "id": "knitting_needles", "fg": 801 },
{ "id": "ladle", "fg": 802 },
{ "id": "marble", "fg": 803 },
{ "id": "mop", "fg": 804 },
{ "id": "nail", "fg": 805 },
{ "id": "pan", "fg": 806 },
{ "id": "paper", "fg": 807 },
{ "id": "pebble", "fg": 808 },
{ "id": "pickaxe", "fg": 809 },
{ "id": "pillow", "fg": 810 },
{ "id": "pot", "fg": 811 },
{ "id": "primitive_shovel", "fg": 812 },
{ "id": "rag", "fg": 813 },
{ "id": "rake", "fg": 814 },
{ "id": "rebar", "fg": 815 },
{ "id": "rock", "fg": 816 },
{ "id": "rock_large", "fg": 817 },
{ "id": "rolling_pin", "fg": 818 },
{ "id": "saw", "fg": 819 },
{ "id": "scrap", "fg": 820 },
{ "id": "sharp_rock", "fg": 821 },
{ "id": "sheet_metal", "fg": 822 },
{ "id": "sheet_metal_small", "fg": 823 },
{ "id": "shovel", "fg": 824 },
{ "id": "sickle", "fg": 825 },
{ "id": "sickle_stone", "fg": 826 },
{ "id": "spear_knife", "fg": 827 },
{ "id": "spear_knife_superior", "fg": 828 },
{ "id": "splinter", "fg": 829 },
{ "id": "steel_pan", "fg": 830 },
{ "id": "stick", "fg": 831 },
{ "id": "stick_long", "fg": 832 },
{ "id": "string_36", "fg": 833 },
{ "id": "string_6", "fg": 834 },
{ "id": "television", "fg": 835 },
{ "id": "thread", "fg": 836 },
{ "id": "tonfa_wood", "fg": 837 },
{ "id": "tongs", "fg": 838 },
{ "id": "toolbox_empty", "fg": 839 },
{ "id": "washboard", "fg": 840 },
{ "id": "wood_panel", "fg": 841 },
{ "id": "wood_sheet", "fg": 842 },
{ "id": "wood_smoother", "fg": 843 },
{ "id": "wrapper", "fg": 844 },
{ "id": "cig", "fg": 853 },
{ "id": "cig_butt", "fg": 854 },
{ "id": "cig_lit", "fg": 855 },
{ "id": "corpse_mon_ant", "fg": 857 },
{ "id": "corpse_mon_dog", "fg": 858 },
{ "id": "corpse_mon_wasp", "fg": 859 },
{ "id": "corpse_mon_zombie_child", "fg": 860 },
{ "id": "corpse_mon_zombie_soldier", "fg": 861 },
{ "id": "joint_lit", "fg": 863 },
{ "id": "joint_roach", "fg": 864 },
{ "id": "radio", "fg": 866 },
{ "id": "radio_on", "fg": 867 },
{ "id": "ref_lighter", "fg": 868 },
{ "id": "ref_lighter_on", "fg": 869 }
]
},
{
Expand Down Expand Up @@ -1817,7 +1821,6 @@
{ "id": "primitive_axe", "fg": 1240, "rotates": false, "multitile": false },
{ "id": "primitive_hammer", "fg": 1239, "rotates": false, "multitile": false },
{ "id": "primitive_knife", "fg": 1209, "rotates": false, "multitile": false },
{ "id": "primitive_shovel", "fg": 1241, "rotates": false, "multitile": false },
{ "id": "processor", "fg": 1462, "rotates": false, "multitile": false },
{ "id": "protein_shake", "fg": 1825, "rotates": false, "multitile": false },
{ "id": "puck", "fg": 1455, "rotates": false, "multitile": false },
Expand Down Expand Up @@ -2016,7 +2019,6 @@
{ "id": "shotgun_s", "fg": 1066, "rotates": false, "multitile": false },
{ "id": "shotgun_trap", "fg": 1140, "rotates": false, "multitile": false },
{ "id": "shoulder_strap", "fg": 1427, "rotates": false, "multitile": false },
{ "id": "shovel", "fg": 1129, "rotates": false, "multitile": false },
{ "id": "sig_40", "fg": 1060, "rotates": false, "multitile": false },
{ "id": "sig_mosquito", "fg": 1060, "rotates": false, "multitile": false },
{ "id": "sig_p230", "fg": 1060, "rotates": false, "multitile": false },
Expand Down Expand Up @@ -3053,7 +3055,6 @@
{ "id": "blueberries_cooked", "fg": 1917, "rotates": false, "multitile": false },
{ "id": "boiled_egg", "fg": 1819, "rotates": false, "multitile": false },
{ "id": "bologna", "fg": 1870, "rotates": false, "multitile": false },
{ "id": "bone", "fg": 1464, "rotates": false, "multitile": false },
{ "id": "bone_human", "fg": 1464, "rotates": false, "multitile": false },
{ "id": "bone_tainted", "fg": 1330, "rotates": false, "multitile": false },
{ "id": "brandy", "fg": 1449, "rotates": false, "multitile": false },
Expand Down Expand Up @@ -3448,6 +3449,7 @@
{ "id": "1601_saw_0", "fg": 1212 },
{ "id": "1602_hatchet_0", "fg": 1213 },
{ "id": "1603_hacksaw_0", "fg": 1214 },
{ "id": "1634_primitive_shovel_0", "fg": 1241 },
{ "id": "1669_tongs_0", "fg": 1269 },
{ "id": "1884_vp_drive_by_wire_controls", "fg": 1347 },
{ "id": "mirror", "fg": 1477 },
Expand Down

0 comments on commit 0d71f54

Please sign in to comment.