diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/rams/rams.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/rams/rams.json index 8ff92d7d73..d850697cb7 100644 --- a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/rams/rams.json +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/rams/rams.json @@ -5,18 +5,18 @@ "rotates": true }, { - "id": "vp_ram_military", + "id": "vp_ram_military_front", "fg": [ "vp_ram_military", "vp_ram_military_left", "vp_ram_military_down", "vp_ram_military_right" ], "rotates": true }, { - "id": "vp_ram_hardsteel", + "id": "vp_ram_hardsteel_front", "fg": [ "vp_ram_hardsteel", "vp_ram_hardsteel_left", "vp_ram_hardsteel_down", "vp_ram_hardsteel_right" ], "rotates": true } , { - "id": "vp_ram_alloy", + "id": "vp_ram_alloy_front", "fg": [ "vp_ram_alloy", "vp_ram_alloy_left", "vp_ram_alloy_down", "vp_ram_alloy_right" ], "rotates": true } diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_black_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_black.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_black_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_black.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_blond_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_blond.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_blond_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_blond.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_brown_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_brown.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_brown_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_female_mutation_hair_crewcut_var_brown.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_black_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_black.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_black_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_black.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_blond_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_blond.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_blond_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_blond.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_brown_crewcut.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_brown.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_brown_crewcut.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/hair/Crewcut/overlay_male_mutation_hair_crewcut_var_brown.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/acepleiades/overlay_wielded_acoustic_guitar.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/acepleiades/overlay_wielded_acoustic_guitar.json index 04987f21ba..0e5baf8802 100644 --- a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/acepleiades/overlay_wielded_acoustic_guitar.json +++ b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/acepleiades/overlay_wielded_acoustic_guitar.json @@ -1,12 +1,4 @@ -[ - { - "id": "overlay_wielded_acoustic_guitar", - "fg": "overlay_wielded_acoustic_guitar", - "bg": "" - }, - { - "id": "overlay_worn_acoustic_guitar", - "fg": "overlay_wielded_acoustic_guitar", - "bg": "" - } -] \ No newline at end of file +{ + "id": [ "overlay_wielded_acoustic_guitar", "overlay_worn_acoustic_guitar" ], + "fg": "overlay_wielded_acoustic_guitar" +} diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_armor.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_armor.json index 131954517e..76763394f2 100644 --- a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_armor.json +++ b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_armor.json @@ -43,45 +43,24 @@ }, { "id": [ - "overlay_female_worn_lc_chainmail_feet", - "overlay_female_worn_mc_chainmail_feet", - "overlay_female_worn_ch_chainmail_feet", - "overlay_female_worn_qt_chainmail_feet", - "overlay_female_worn_hc_chainmail_feet", - "overlay_female_worn_xs_mc_chainmail_feet", - "overlay_female_worn_xl_mc_chainmail_feet", - "overlay_female_worn_xl_lc_chainmail_feet", - "overlay_female_worn_xl_ch_chainmail_feet", - "overlay_female_worn_xs_ch_chainmail_feet", - "overlay_female_worn_xs_hc_chainmail_feet", - "overlay_female_worn_xl_qt_chainmail_feet", - "overlay_female_worn_xs_qt_chainmail_feet", - "overlay_female_worn_xl_hc_chainmail_feet", - "overlay_female_worn_xs_lc_chainmail_feet", - "overlay_female_worn_chainmail_junk_feet" + "overlay_worn_lc_chainmail_feet", + "overlay_worn_mc_chainmail_feet", + "overlay_worn_ch_chainmail_feet", + "overlay_worn_qt_chainmail_feet", + "overlay_worn_hc_chainmail_feet", + "overlay_worn_xs_mc_chainmail_feet", + "overlay_worn_xl_mc_chainmail_feet", + "overlay_worn_xl_lc_chainmail_feet", + "overlay_worn_xl_ch_chainmail_feet", + "overlay_worn_xs_ch_chainmail_feet", + "overlay_worn_xs_hc_chainmail_feet", + "overlay_worn_xl_qt_chainmail_feet", + "overlay_worn_xs_qt_chainmail_feet", + "overlay_worn_xl_hc_chainmail_feet", + "overlay_worn_xs_lc_chainmail_feet", + "overlay_worn_chainmail_junk_feet" ], - "fg": "chainmail_feet_f" - }, - { - "id": [ - "overlay_male_worn_lc_chainmail_feet", - "overlay_male_worn_mc_chainmail_feet", - "overlay_male_worn_ch_chainmail_feet", - "overlay_male_worn_qt_chainmail_feet", - "overlay_male_worn_hc_chainmail_feet", - "overlay_male_worn_xs_mc_chainmail_feet", - "overlay_male_worn_xl_mc_chainmail_feet", - "overlay_male_worn_xl_lc_chainmail_feet", - "overlay_male_worn_xl_ch_chainmail_feet", - "overlay_male_worn_xs_ch_chainmail_feet", - "overlay_male_worn_xs_hc_chainmail_feet", - "overlay_male_worn_xl_qt_chainmail_feet", - "overlay_male_worn_xs_qt_chainmail_feet", - "overlay_male_worn_xl_hc_chainmail_feet", - "overlay_male_worn_xs_lc_chainmail_feet", - "overlay_male_worn_chainmail_junk_feet" - ], - "fg": "chainmail_feet_m" + "fg": "chainmail_feet" }, { "id": [ diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet_f.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet_f.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet_m.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet_m.png deleted file mode 100644 index 2c56fd205a..0000000000 Binary files a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_antique/chainmail_feet_m.png and /dev/null differ diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves_m.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves_m.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves_f.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves_f.png deleted file mode 100644 index 64d94eb6aa..0000000000 Binary files a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_greaves_f.png and /dev/null differ diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_limbs.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_limbs.json index 43efdcba7e..f3fd6368ff 100644 --- a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_limbs.json +++ b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/armour_modern/robofac_limbs.json @@ -1,102 +1,32 @@ [ { - "id": "overlay_male_worn_robofac_nomex_vambraces", - "fg": "robofac_vambraces_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_basic_vambraces", - "fg": "robofac_vambraces_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_rubber_vambraces", - "fg": "robofac_vambraces_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_kevlar_vambraces", - "fg": "robofac_vambraces_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_military_vambraces", - "fg": "robofac_vambraces_m", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_nomex_vambraces", - "fg": "robofac_vambraces_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_basic_vambraces", - "fg": "robofac_vambraces_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_rubber_vambraces", - "fg": "robofac_vambraces_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_kevlar_vambraces", - "fg": "robofac_vambraces_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_military_vambraces", - "fg": "robofac_vambraces_f", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_nomex_greaves", - "fg": "robofac_greaves_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_basic_greaves", - "fg": "robofac_greaves_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_rubber_greaves", - "fg": "robofac_greaves_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_kevlar_greaves", - "fg": "robofac_greaves_m", - "bg": "" - }, - { - "id": "overlay_male_worn_robofac_military_greaves", - "fg": "robofac_greaves_m", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_nomex_greaves", - "fg": "robofac_greaves_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_basic_greaves", - "fg": "robofac_greaves_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_rubber_greaves", - "fg": "robofac_greaves_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_kevlar_greaves", - "fg": "robofac_greaves_f", - "bg": "" - }, - { - "id": "overlay_female_worn_robofac_military_greaves", - "fg": "robofac_greaves_f", - "bg": "" + "id": [ + "overlay_male_worn_robofac_nomex_vambraces", + "overlay_male_worn_robofac_basic_vambraces", + "overlay_male_worn_robofac_rubber_vambraces", + "overlay_male_worn_robofac_kevlar_vambraces", + "overlay_male_worn_robofac_military_vambraces" + ], + "fg": "robofac_vambraces_m" + }, + { + "id": [ + "overlay_female_worn_robofac_nomex_vambraces", + "overlay_female_worn_robofac_basic_vambraces", + "overlay_female_worn_robofac_rubber_vambraces", + "overlay_female_worn_robofac_kevlar_vambraces", + "overlay_female_worn_robofac_military_vambraces" + ], + "fg": "robofac_vambraces_f" + }, + { + "id": [ + "overlay_worn_robofac_nomex_greaves", + "overlay_worn_robofac_basic_greaves", + "overlay_worn_robofac_rubber_greaves", + "overlay_worn_robofac_kevlar_greaves", + "overlay_worn_robofac_military_greaves" + ], + "fg": "robofac_greaves" } ] diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_female_worn_spearsling.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_female_worn_spearsling.png new file mode 100644 index 0000000000..9f57fad686 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_female_worn_spearsling.png differ diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_male_worn_spearsling.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_male_worn_spearsling.png new file mode 100644 index 0000000000..cffd64bf59 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/worn/belts_and_strapped_items/overlay_male_worn_spearsling.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/powders/powders.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/powders/powders.json index bcf15a1c2b..75ce872baa 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/powders/powders.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/powders/powders.json @@ -1,136 +1,103 @@ [ { "id": "material_sand", - "fg": "powder_sand", - "bg": "" + "fg": "powder_sand" }, { "id": "material_soil", - "fg": "powder_soil", - "bg": "" + "fg": "powder_soil" }, { "id": "chem_aluminium_powder", - "fg": "powder_aluminum", - "bg": "" + "fg": "powder_aluminum" }, { "id": "chem_aluminium_sulphate", - "fg": "powder_aluminum_sulphate", - "bg": "" + "fg": "powder_aluminum_sulphate" }, { "id": "chem_ammonium_nitrate", - "fg": "powder_ammonium_nitrate", - "bg": "" + "fg": "powder_ammonium_nitrate" }, { "id": "chem_black_powder", - "fg": "powder_black_gunpowder", - "bg": "" + "fg": "powder_black_gunpowder" }, { "id": "cac2powder", - "fg": "powder_calcium_carbide", - "bg": "" + "fg": "powder_calcium_carbide" }, { "id": "chilly-p", - "fg": "powder_chili", - "bg": "" + "fg": "powder_chili" }, { "id": "meal_chitin_piece", - "fg": "powder_chitin", - "bg": "" + "fg": "powder_chitin" }, { "id": "chem_chromium_oxide", - "fg": "powder_chromium_oxide", - "bg": "" + "fg": "powder_chromium_oxide" }, { "id": "coffee_raw", - "fg": "powder_coffee", - "bg": "" + "fg": "powder_coffee" }, { "id": "curry_powder", - "fg": "powder_curry", - "bg": "" + "fg": "powder_curry" }, { "id": "powder_eggs", - "fg": "powder_eggs", - "bg": "" + "fg": "powder_eggs" }, { "id": "fungicide", - "fg": "powder_fungicide", - "bg": "" + "fg": "powder_fungicide" }, { "id": "insecticide", - "fg": "powder_insecticide", - "bg": "" + "fg": "powder_insecticide" }, { "id": "chem_hmtd", - "fg": "powder_hmtd", - "bg": "" + "fg": "powder_hmtd" }, { "id": "lemonade_powder", - "fg": "powder_lemonade", - "bg": "" + "fg": "powder_lemonade" }, { "id": "lye_powder", - "fg": "powder_lye", - "bg": "" + "fg": "powder_lye" }, { "id": "magnesium", - "fg": "powder_magnesium", - "bg": "" + "fg": "powder_magnesium" }, { "id": "chem_manganese_dioxide", - "fg": "powder_manganese", - "bg": "" + "fg": "powder_manganese" }, { "id": "chem_match_head_powder", - "fg": "powder_match_head", - "bg": "" + "fg": "powder_match_head" }, { "id": "mustard_powder", - "fg": "powder_mustard", - "bg": "" + "fg": "powder_mustard" }, { "id": "oxy_powder", - "fg": "powder_oxidizer", - "bg": "" + "fg": "powder_oxidizer" }, { "id": "chem_peptone_broth", - "fg": "powder_peptone", - "bg": "" + "fg": "powder_peptone" }, { "id": "protein_powder", - "fg": "powder_protein", - "bg": "" + "fg": "powder_protein" }, { "id": "material_quicklime", - "fg": "powder_quicklime", - "bg": "" + "fg": "powder_quicklime" }, { "id": "chem_rocket_fuel", - "fg": "powder_rocket_fuel", - "bg": "" + "fg": "powder_rocket_fuel" }, { "id": "chem_saltpetre", - "fg": "powder_salpetre", - "bg": "" + "fg": "powder_salpetre" }, { "id": "gunpowder", - "fg": "powder_smokeless", - "bg": "" + "fg": "powder_smokeless" }, { "id": "chem_thermite", - "fg": "powder_thermite", - "bg": "" + "fg": "powder_thermite" }, { "id": "tin", - "fg": "powder_tin", - "bg": "" + "fg": "powder_tin" }, { "id": "yeast", - "fg": "powder_yeast", - "bg": "" + "fg": "powder_yeast" }, { "id": "chem_zinc_powder", - "fg": "powder_zinc", - "bg": "" + "fg": "powder_zinc" }, { "id": [ "sugar", @@ -143,7 +110,6 @@ "quikclot", "chem_acrylamide" ], - "fg": "powder_white", - "bg": "" + "fg": "powder_white" } ] diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json index f922d64a1a..3da33bda29 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json @@ -1,6 +1,6 @@ [ { - "id": [ "vp_hddoor_trunk", "vp_hdhatch", "vp_hdhatch_opaque" ], + "id": [ "vp_hddoor_trunk_front", "vp_hdhatch_front", "vp_hdhatch_opaque" ], "fg": [ "vp_hddoor_trunk", "vp_hddoor_trunk_rotW", "vp_hddoor_trunk_rotS", "vp_hddoor_trunk_rotE" ], "multitile": true, "additional_tiles": [ @@ -16,7 +16,7 @@ ] }, { - "id": [ "vp_hddoor", "vp_hddoor_front" ], + "id": "vp_hddoor_front", "fg": [ "vp_hddoor_front_rotS", "vp_hddoor_front_rotW", "vp_hddoor_front_rotS", "vp_hddoor_front_rotE" ], "multitile": true, "additional_tiles": [ @@ -58,7 +58,7 @@ ] }, { - "id": [ "vp_hddoor_opaque", "vp_hddoor_opaque_front" ], + "id": "vp_hddoor_opaque_front", "fg": [ "vp_hddoor_opaque_front_rotS", "vp_hddoor_opaque_front_rotW", diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/external/rams.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/external/rams.json index 4bed66586e..bd6bcd3a4d 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/external/rams.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/external/rams.json @@ -1,6 +1,6 @@ [ { - "id": "vp_ram_spiked", + "id": "vp_ram_spiked_front", "fg": "vp_ram_spiked", "rotates": true, "multitile": true, @@ -13,7 +13,7 @@ ] }, { - "id": "vp_ram_steel", + "id": "vp_ram_steel_front", "fg": "vp_ram_steel", "rotates": true, "multitile": true, @@ -39,7 +39,7 @@ ] }, { - "id": "vp_ram_wood", + "id": "vp_ram_wood_front", "fg": "vp_ram_wood", "rotates": true, "multitile": true, diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/seats/car_seats/car_seats.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/seats/car_seats/car_seats.json index c62339c0cf..5ba207875e 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/seats/car_seats/car_seats.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/seats/car_seats/car_seats.json @@ -1,6 +1,6 @@ [ { - "id": [ "vp_folding_seat", "vp_reclining_seat", "vp_seat" ], + "id": [ "vp_folding_seat", "vp_reclining_seat_front", "vp_seat_front" ], "fg": [ "vp_seat_up", "vp_seat_left", "vp_seat_down", "vp_seat_right" ], "multitile": true, "additional_tiles": [ @@ -12,7 +12,7 @@ ] }, { - "id": "vp_seat_back", + "id": "vp_seat_back_front", "fg": [ "vp_seat_back", "vp_seat_back_rotW", "vp_seat_back_rotS", "vp_seat_back_rotE" ], "multitile": true, "additional_tiles": [ @@ -84,7 +84,7 @@ ] }, { - "id": [ "vp_seat_leather", "vp_reclining_seat_leather" ], + "id": [ "vp_seat_leather_front", "vp_reclining_seat_leather_front" ], "fg": [ "vp_seat_leather_up", "vp_seat_leather_left", "vp_seat_leather_down", "vp_seat_leather_right" ], "multitile": true, "additional_tiles": [ @@ -96,7 +96,7 @@ ] }, { - "id": "vp_seat_back_leather", + "id": "vp_seat_back_leather_front", "fg": [ "vp_seat_back_leather", "vp_seat_back_leather_rotW", "vp_seat_back_leather_rotS", "vp_seat_back_leather_rotE" ], "multitile": true, "additional_tiles": [ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/turrets/turrets.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/turrets/turrets.json index 79e761ebeb..5704e3cf42 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/turrets/turrets.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/turrets/turrets.json @@ -11,7 +11,8 @@ "vp_mounted_rm614", "vp_mounted_m240", "vp_mounted_m60", - "vp_mounted_m60_semi" + "vp_mounted_m60_semi", + "turret_generic" ], "//": "rifles and machineguns", "fg": "vp_machinegun_mounted_rotS", @@ -94,5 +95,17 @@ "bg": "vp_machinegun_mounted_rotS" } ] + }, + { + "id": "turret_mount", + "fg": "bg_crows_rotS", + "multitile": true, + "additional_tiles": [ + { + "id": "broken", + "fg": "crack_metal_center", + "bg": "bg_crows_rotS" + } + ] } ] diff --git a/gfx/UltimateCataclysm/pngs_incomplete_large_64x64/vehicle/vp_hatch/vp_hatch.json b/gfx/UltimateCataclysm/pngs_incomplete_large_64x64/vehicle/vp_hatch/vp_hatch.json index 014aae4188..8be21290d9 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_large_64x64/vehicle/vp_hatch/vp_hatch.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_large_64x64/vehicle/vp_hatch/vp_hatch.json @@ -1,6 +1,6 @@ [ { - "id": "vp_hatch", + "id": "vp_hatch_front", "fg": [ "vp_hatch", "vp_hatch_rotW", "vp_hatch_rotS", "vp_hatch_rotE" ], "multitile": true, "additional_tiles": [ @@ -16,7 +16,7 @@ ] }, { - "id": "vp_hatch_opaque", + "id": "vp_hatch_opaque_front", "fg": [ "vp_hatch_opaque", "vp_hatch_opaque_rotW", "vp_hatch_opaque_rotS", "vp_hatch_opaque_rotE" ], "multitile": true, "additional_tiles": [ diff --git a/gfx/UltimateCataclysm/pngs_large_64x64/monsters/mon_frog_giant/mon_gator.json b/gfx/UltimateCataclysm/pngs_large_64x64/monsters/mon_frog_giant/mon_frog_giant.json similarity index 100% rename from gfx/UltimateCataclysm/pngs_large_64x64/monsters/mon_frog_giant/mon_gator.json rename to gfx/UltimateCataclysm/pngs_large_64x64/monsters/mon_frog_giant/mon_frog_giant.json diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/gambeson.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/gambeson.json new file mode 100644 index 0000000000..a194b44a75 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/gambeson.json @@ -0,0 +1,4 @@ +{ + "id": [ "gambeson", "gambeson_xs", "xl_gambeson" ], + "fg": "gambeson" +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/aksemi.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/aksemi.json index 7e75940c98..d7928791ae 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/aksemi.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/aksemi.json @@ -1,5 +1,4 @@ { "id": [ "ak47", "aksemi" ], - "fg": "ak47", - "bg": "" -} \ No newline at end of file + "fg": "ak47" +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/carbine_flintlock.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/carbine_flintlock.json index f7137ba351..e3c4b50fff 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/carbine_flintlock.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/carbine_flintlock.json @@ -1,4 +1,4 @@ { "id": [ "carbine_flintlock", "carbine_flintlock_double" ], "fg": "carbine_flintlock" -} \ No newline at end of file +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m249.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m249.json index 5386f99c95..8e6a43a8f7 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m249.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m249.json @@ -1,5 +1,4 @@ { "id": [ "m249", "m249_semi" ], - "fg": "m249", - "bg": "" -} \ No newline at end of file + "fg": "m249" +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m60.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m60.json index 57528d5ca9..2f031cf911 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m60.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/m60.json @@ -1,5 +1,4 @@ { "id": [ "m60", "m60_semi" ], - "fg": "m60", - "bg": "" -} \ No newline at end of file + "fg": "m60" +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/mp40.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/mp40.json index 0cd6bb9596..5dc81673f2 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/mp40.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/aunt_su_guns/mp40.json @@ -1,5 +1,4 @@ { "id": [ "mp40", "mp40semi" ], - "fg": "mp40", - "bg": "" -} \ No newline at end of file + "fg": "mp40" +} diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/gravel/material_gravel.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/gravel/material_gravel.png index d546bbb7e6..08f6e6d5ff 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/gravel/material_gravel.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/gravel/material_gravel.png differ diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/books/novels.json b/gfx/UltimateCataclysm/pngs_small_20x20/items/books/novels.json index 3dc3464899..0826c75554 100644 --- a/gfx/UltimateCataclysm/pngs_small_20x20/items/books/novels.json +++ b/gfx/UltimateCataclysm/pngs_small_20x20/items/books/novels.json @@ -1,137 +1,110 @@ [ { "id": "book_fict_soft_tpl", - "fg": "novel_adventure", - "bg": "" + "fg": "novel_adventure" }, { "id": "novel_adventure", - "fg": "novel_adventure", - "bg": "" + "fg": "novel_adventure" }, { "id": "novel_buddy", - "fg": "novel_buddy", - "bg": "" + "fg": "novel_buddy" }, { "id": "novel_coa", - "fg": "novel_coa", - "bg": "" + "fg": "novel_coa" }, { "id": "novel_coa2", - "fg": "novel_coa2", - "bg": "" + "fg": "novel_coa2" }, { "id": "novel_crime", - "fg": "novel_crime", - "bg": "" + "fg": "novel_crime" }, { "id": "novel_crime2", - "fg": "novel_crime2", - "bg": "" + "fg": "novel_crime2" }, { "id": "novel_drama", - "fg": "novel_drama", - "bg": "" + "fg": "novel_drama" }, { "id": "novel_erotic", - "fg": "novel_erotic", - "bg": "" + "fg": "novel_erotic" }, { "id": "novel_experimental", - "fg": "novel_experimental", - "bg": "" + "fg": "novel_experimental" }, { "id": "novel_fantasy", - "fg": "novel_fantasy", - "bg": "" + "fg": "novel_fantasy" }, { "id": "novel_horror", - "fg": "novel_horror", - "bg": "" + "fg": "novel_horror" }, { "id": "novel_mystery", - "fg": "novel_mystery", - "bg": "" + "fg": "novel_mystery" }, { "id": "novel_pulp", - "fg": "novel_pulp", - "bg": "" + "fg": "novel_pulp" }, { "id": "novel_road", - "fg": "novel_road", - "bg": "" + "fg": "novel_road" }, { "id": "novel_romance", - "fg": "novel_romance", - "bg": "" + "fg": "novel_romance" }, { "id": "novel_samurai", - "fg": "novel_samurai", - "bg": "" + "fg": "novel_samurai" }, { "id": "novel_satire", - "fg": "novel_satire", - "bg": "" + "fg": "novel_satire" }, { "id": "novel_scifi", - "fg": "novel_scifi", - "bg": "" + "fg": "novel_scifi" }, { "id": "novel_sports", - "fg": "novel_sports", - "bg": "" + "fg": "novel_sports" }, { "id": "novel_spy", - "fg": "novel_spy", - "bg": "" + "fg": "novel_spy" }, { "id": "novel_swash", - "fg": "novel_swash", - "bg": "" + "fg": "novel_swash" }, { "id": "novel_thriller", - "fg": "novel_thriller", - "bg": "" + "fg": "novel_thriller" }, { "id": "novel_tragedy", - "fg": "novel_tragedy", - "bg": "" + "fg": "novel_tragedy" }, { "id": "novel_war", - "fg": "novel_war", - "bg": "" + "fg": "novel_war" }, { "id": "novel_war2", - "fg": "novel_war2", - "bg": "" + "fg": "novel_war2" }, { "id": "novel_western", - "fg": "novel_western", - "bg": "" + "fg": "novel_western" } ] diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/shutter/vp_door_shutter.json b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/shutter/vp_door_shutter.json index d5c0b1afe6..013c4a2de6 100644 --- a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/shutter/vp_door_shutter.json +++ b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/shutter/vp_door_shutter.json @@ -1,6 +1,6 @@ [ { - "id": "vp_door_shutter", + "id": "vp_door_shutter_front", "fg": [ "vp_door_shutter_faceS", "vp_door_shutter_faceE", "vp_door_shutter_faceN", "vp_door_shutter_faceW" ], "multitile": true, "additional_tiles": [ @@ -46,5 +46,21 @@ "bg": [ "vp_door_shutter_open_faceE", "vp_door_shutter_open_faceN", "vp_door_shutter_open_faceW", "vp_door_shutter_open_left_rotW_right_rotE" ] } ] + }, + { + "id": "vp_door_shutter_rear", + "fg": [ "vp_door_shutter_faceN", "vp_door_shutter_faceW", "vp_door_shutter_faceS", "vp_door_shutter_faceE" ], + "multitile": true, + "additional_tiles": [ + { + "id": "open", + "fg": [ "vp_door_shutter_open_faceN", "vp_door_shutter_open_faceW", "vp_door_shutter_open_faceS", "vp_door_shutter_open_faceE" ] + }, + { + "id": "broken", + "fg": [ "crack_metal_center_32x48", "crack_metal_center_32x48", "crack_metal_center_32x48", "crack_metal_center_32x48" ], + "bg": [ "vp_door_shutter_open_faceN", "vp_door_shutter_open_faceW", "vp_door_shutter_open_faceS", "vp_door_shutter_open_faceE" ] + } + ] } -] \ No newline at end of file +] diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left.png b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left.png new file mode 100644 index 0000000000..efaf5245c9 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left_open.png b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left_open.png new file mode 100644 index 0000000000..1296c808de Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_left_open.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_rear_left_open.png b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_rear_left_open.png new file mode 100644 index 0000000000..d2a715680f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/sliding/vp_door_sliding_rear_left_open.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/vp_door_32x64.json b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/vp_door_32x64.json index f713003006..15ac89be9a 100644 --- a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/vp_door_32x64.json +++ b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/doors/vp_door_32x64.json @@ -84,7 +84,7 @@ ] }, { - "id": "vp_door_sliding", + "id": "vp_door_sliding_front", "fg": [ "vp_door_full_left_rotS", "vp_door_opaque_rear_rotS", "vp_door_full_left", "vp_door_opaque_full_right_rotE" ], "multitile": true, "additional_tiles": [ @@ -98,5 +98,21 @@ "bg": [ "vp_door_sliding_open_faceE", "vp_door_sliding_open_faceN", "vp_door_sliding_open_faceW", "vp_door_sliding_vertical_left_open_rotW_right_open_rotE" ] } ] + }, + { + "id": "vp_door_sliding_left", + "fg": [ "vp_door_sliding_left", "vp_door_full_left", "vp_door_opaque_rear", "vp_door_full_left_rotS" ], + "multitile": true, + "additional_tiles": [ + { + "id": "open", + "fg": [ "vp_door_sliding_left_open", "vp_door_sliding_open_faceW", "vp_door_sliding_rear_left_open", "vp_door_sliding_open_faceE" ] + }, + { + "id": "broken", + "fg": [ "crack_metal_center_tall", "crack_metal_center_tall", "crack_metal_center_tall", "crack_metal_center_tall" ], + "bg": [ "vp_door_sliding_left_open", "vp_door_sliding_open_faceW", "vp_door_sliding_rear_left_open", "vp_door_sliding_open_faceE" ] + } + ] } ] diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/vp_door_trunk/vp_door_trunk.json b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/vp_door_trunk/vp_door_trunk.json index 65a2e50365..01fd7fcf76 100644 --- a/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/vp_door_trunk/vp_door_trunk.json +++ b/gfx/UltimateCataclysm/pngs_tall_32x64/vehicle/vp_door_trunk/vp_door_trunk.json @@ -1,6 +1,6 @@ [ { - "id": "vp_door_trunk", + "id": "vp_door_trunk_front", "fg": [ "vp_door_trunk", "vp_door_trunk_rotW", "vp_door_trunk_rotS", "vp_door_trunk_rotE" ], "multitile": true, "additional_tiles": [