From c6e7c86886762a2f9dbbe9c5254f27ebc0f95e4a Mon Sep 17 00:00:00 2001 From: scarf Date: Mon, 13 Nov 2023 22:02:17 +0900 Subject: [PATCH] fix: migrate from `NON-FOULING` to `NON_FOULING` see: https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3655 --- #_Twix_%/Aftershock/items/bioparts.json | 2 +- #_Twix_%/Aftershock/items/gun/laser.json | 6 +++--- #_Twix_%/Aftershock/items/weapons.json | 4 ++-- #_Twix_%/ETC_handguns_etc/items/ammo/magpin.json | 2 +- Military_ad.-ed._CBN/json/ammo_effects.json | 2 +- .../json/ammo_effects_simple.json | 2 +- Military_ad.-ed._CBN/json/classes/gun.json | 16 ++++++++-------- Military_ad.-ed._CBN/json/items/ammo.json | 12 ++++++------ .../json/items/ammo/metal_rail.json | 4 ++-- Military_ad.-ed._CBN/json/items/ammo/nail.json | 2 +- Military_ad.-ed._CBN/json/items/classes/gun.json | 16 ++++++++-------- .../json/items/gun/flammable.json | 2 +- Military_ad.-ed._CBN/json/items/gun/misc.json | 2 +- .../json/items/gun/paintball.json | 2 +- Military_ad.-ed._CBN/json/items/gunmod/rail.json | 2 +- .../json/items/ranged/spearguns.json | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/#_Twix_%/Aftershock/items/bioparts.json b/#_Twix_%/Aftershock/items/bioparts.json index a56c060..0b0f75a 100644 --- a/#_Twix_%/Aftershock/items/bioparts.json +++ b/#_Twix_%/Aftershock/items/bioparts.json @@ -103,6 +103,6 @@ "loudness": 4, "clip_size": 80, "ammo_effects": "ACIDBOMB", - "flags": [ "NO_UNLOAD", "NON-FOULING" ] + "flags": [ "NO_UNLOAD", "NON_FOULING" ] } ] diff --git a/#_Twix_%/Aftershock/items/gun/laser.json b/#_Twix_%/Aftershock/items/gun/laser.json index 9c77288..11fca69 100644 --- a/#_Twix_%/Aftershock/items/gun/laser.json +++ b/#_Twix_%/Aftershock/items/gun/laser.json @@ -15,7 +15,7 @@ "dispersion": 500, "ups_charges": 25, "ammo_effects": [ "LASER", "BEANBAG" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ] }, { "id": "afs_sentinel_laser", @@ -29,7 +29,7 @@ "ups_charges": 30, "modes": [ [ "MULTI", "trilaser", 3 ] ], "ammo_effects": [ "LASER" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ] }, { "id": "afs_sentinel_laser_mon", @@ -37,6 +37,6 @@ "copy-from": "afs_sentinel_laser", "name": { "str": "wrist-trilaser" }, "ups_charges": 0, - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ] } ] diff --git a/#_Twix_%/Aftershock/items/weapons.json b/#_Twix_%/Aftershock/items/weapons.json index 188adf9..cdb14e6 100644 --- a/#_Twix_%/Aftershock/items/weapons.json +++ b/#_Twix_%/Aftershock/items/weapons.json @@ -187,7 +187,7 @@ "reload": 500, "valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ], "ammo_effects": [ "LASER", "DRAW_AS_LINE" ], - "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ], + "flags": [ "NEVER_JAMS", "FIRE_20", "NON_FOULING" ], "magazines": [ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ] @@ -287,6 +287,6 @@ [ "underbarrel mount", 1 ] ], "ammo_effects": [ "LASER", "INCENDIARY" ], - "flags": [ "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + "flags": [ "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ] } ] diff --git a/#_Twix_%/ETC_handguns_etc/items/ammo/magpin.json b/#_Twix_%/ETC_handguns_etc/items/ammo/magpin.json index 1058ffc..f336b8d 100644 --- a/#_Twix_%/ETC_handguns_etc/items/ammo/magpin.json +++ b/#_Twix_%/ETC_handguns_etc/items/ammo/magpin.json @@ -19,6 +19,6 @@ "range": 18, "damage": { "damage_type": "bullet", "amount": 24, "armor_penetration": 9 }, "dispersion": 60, - "effects": [ "NON-FOULING" ] + "effects": [ "NON_FOULING" ] } ] diff --git a/Military_ad.-ed._CBN/json/ammo_effects.json b/Military_ad.-ed._CBN/json/ammo_effects.json index f0e1c10..7f6e562 100644 --- a/Military_ad.-ed._CBN/json/ammo_effects.json +++ b/Military_ad.-ed._CBN/json/ammo_effects.json @@ -368,7 +368,7 @@ "//": "Nearly-immeasurable chance to fail to fire." }, { - "id": "NON-FOULING", + "id": "NON_FOULING", "type": "ammo_effect", "//": "Doesn't cause gunk to build up." } diff --git a/Military_ad.-ed._CBN/json/ammo_effects_simple.json b/Military_ad.-ed._CBN/json/ammo_effects_simple.json index beb1191..29042cd 100644 --- a/Military_ad.-ed._CBN/json/ammo_effects_simple.json +++ b/Military_ad.-ed._CBN/json/ammo_effects_simple.json @@ -95,7 +95,7 @@ "//": "Doesn't overkill." }, { - "id": "NON-FOULING", + "id": "NON_FOULING", "type": "ammo_effect", "//": "Doesn't cause gunk to build up." }, diff --git a/Military_ad.-ed._CBN/json/classes/gun.json b/Military_ad.-ed._CBN/json/classes/gun.json index 2f4bda9..a3b73e1 100644 --- a/Military_ad.-ed._CBN/json/classes/gun.json +++ b/Military_ad.-ed._CBN/json/classes/gun.json @@ -163,7 +163,7 @@ "name": { "str": "energy pistol" }, "looks_like": "v29", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 2 ], [ "emitter", 1 ], @@ -185,7 +185,7 @@ "bashing": 7, "to_hit": -2, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 120, "reload": 600, "valid_mod_locations": [ @@ -287,7 +287,7 @@ "name": { "str": "energy rifle" }, "looks_like": "laser_rifle", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "emitter", 1 ], @@ -309,7 +309,7 @@ "name": { "str": "magnetic rifle" }, "looks_like": "laser_rifle", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -331,7 +331,7 @@ "bashing": 8, "to_hit": -2, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 90, "reload": 700, "valid_mod_locations": [ @@ -353,7 +353,7 @@ "name": { "str": "pneumatic rifle" }, "bashing": 8, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 350, "reload": 600, "valid_mod_locations": [ [ "accessories", 3 ], [ "sling", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "stock", 1 ], [ "rail mount", 1 ] ], @@ -499,7 +499,7 @@ "bashing": 8, "reload": 200, "handling": 40, - "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON-FOULING" ], + "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON_FOULING" ], "faults": [ ] }, { @@ -512,7 +512,7 @@ "bashing": 9, "skill": "launcher", "ammo": "chemical_spray", - "flags": [ "FIRE_50", "NEVER_JAMS", "NON-FOULING" ], + "flags": [ "FIRE_50", "NEVER_JAMS", "NON_FOULING" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], diff --git a/Military_ad.-ed._CBN/json/items/ammo.json b/Military_ad.-ed._CBN/json/items/ammo.json index dba8ba5..809b4d0 100644 --- a/Military_ad.-ed._CBN/json/items/ammo.json +++ b/Military_ad.-ed._CBN/json/items/ammo.json @@ -278,7 +278,7 @@ "to_hit": -1, "qualities": [ [ "HAMMER", 1 ] ], "dont_recover_one_in": 80, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] }, { "type": "AMMO", @@ -298,7 +298,7 @@ "dispersion": 14, "loudness": 0, "count": 10, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] }, { "type": "AMMO", @@ -362,7 +362,7 @@ "loudness": 0, "count": 50, "dont_recover_one_in": 1000, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] }, { "type": "AMMO", @@ -383,7 +383,7 @@ "count": 500, "stack_size": 200, "loudness": 9, - "effects": [ "NOGIB", "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NOGIB", "NEVER_MISFIRES", "NON_FOULING" ] }, { "type": "AMMO", @@ -1079,7 +1079,7 @@ "loudness": 0, "to_hit": -1, "dont_recover_one_in": 1000, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] }, { "type": "AMMO", @@ -1099,6 +1099,6 @@ "loudness": 0, "count": 30, "dont_recover_one_in": 1000, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] } ] diff --git a/Military_ad.-ed._CBN/json/items/ammo/metal_rail.json b/Military_ad.-ed._CBN/json/items/ammo/metal_rail.json index f4ac65c..ff40c3d 100644 --- a/Military_ad.-ed._CBN/json/items/ammo/metal_rail.json +++ b/Military_ad.-ed._CBN/json/items/ammo/metal_rail.json @@ -19,7 +19,7 @@ "range": 20, "damage": { "damage_type": "stab", "amount": 60, "armor_penetration": 10 }, "dispersion": 200, - "effects": [ "RECYCLED", "NON-FOULING" ] + "effects": [ "RECYCLED", "NON_FOULING" ] }, { "id": "steel_rail", @@ -35,7 +35,7 @@ "material": [ "steel" ], "color": "light_gray", "dispersion": 100, - "effects": [ "NEVER_MISFIRES", "NON-FOULING" ], + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ], "relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } } } ] diff --git a/Military_ad.-ed._CBN/json/items/ammo/nail.json b/Military_ad.-ed._CBN/json/items/ammo/nail.json index b90889c..33602a8 100644 --- a/Military_ad.-ed._CBN/json/items/ammo/nail.json +++ b/Military_ad.-ed._CBN/json/items/ammo/nail.json @@ -29,6 +29,6 @@ "range": 3, "damage": { "damage_type": "stab", "amount": 4, "armor_penetration": 3 }, "dispersion": 120, - "effects": [ "NON-FOULING" ] + "effects": [ "NON_FOULING" ] } ] diff --git a/Military_ad.-ed._CBN/json/items/classes/gun.json b/Military_ad.-ed._CBN/json/items/classes/gun.json index 2f4bda9..a3b73e1 100644 --- a/Military_ad.-ed._CBN/json/items/classes/gun.json +++ b/Military_ad.-ed._CBN/json/items/classes/gun.json @@ -163,7 +163,7 @@ "name": { "str": "energy pistol" }, "looks_like": "v29", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 2 ], [ "emitter", 1 ], @@ -185,7 +185,7 @@ "bashing": 7, "to_hit": -2, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 120, "reload": 600, "valid_mod_locations": [ @@ -287,7 +287,7 @@ "name": { "str": "energy rifle" }, "looks_like": "laser_rifle", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "emitter", 1 ], @@ -309,7 +309,7 @@ "name": { "str": "magnetic rifle" }, "looks_like": "laser_rifle", "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -331,7 +331,7 @@ "bashing": 8, "to_hit": -2, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 90, "reload": 700, "valid_mod_locations": [ @@ -353,7 +353,7 @@ "name": { "str": "pneumatic rifle" }, "bashing": 8, "//": "No conventional faults because it uses non-conventional systems.", - "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ], + "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ], "dispersion": 350, "reload": 600, "valid_mod_locations": [ [ "accessories", 3 ], [ "sling", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "stock", 1 ], [ "rail mount", 1 ] ], @@ -499,7 +499,7 @@ "bashing": 8, "reload": 200, "handling": 40, - "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON-FOULING" ], + "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON_FOULING" ], "faults": [ ] }, { @@ -512,7 +512,7 @@ "bashing": 9, "skill": "launcher", "ammo": "chemical_spray", - "flags": [ "FIRE_50", "NEVER_JAMS", "NON-FOULING" ], + "flags": [ "FIRE_50", "NEVER_JAMS", "NON_FOULING" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], diff --git a/Military_ad.-ed._CBN/json/items/gun/flammable.json b/Military_ad.-ed._CBN/json/items/gun/flammable.json index 2bece97..d334d8e 100644 --- a/Military_ad.-ed._CBN/json/items/gun/flammable.json +++ b/Military_ad.-ed._CBN/json/items/gun/flammable.json @@ -41,7 +41,7 @@ "durability": 9, "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 4 ] ], "valid_mod_locations": [ [ "accessories", 4 ], [ "rail", 1 ], [ "grip", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ], - "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON-FOULING" ] }, + "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON_FOULING" ] }, "delete": { "flags": [ "FIRE_100" ] }, "magazines": [ [ "flammable", [ "rm4502", "rm4504" ] ] ] } diff --git a/Military_ad.-ed._CBN/json/items/gun/misc.json b/Military_ad.-ed._CBN/json/items/gun/misc.json index 322d814..a99b852 100644 --- a/Military_ad.-ed._CBN/json/items/gun/misc.json +++ b/Military_ad.-ed._CBN/json/items/gun/misc.json @@ -32,7 +32,7 @@ "description": "A water cannon from a fire truck. Mounted on a vehicle, it could be used to stop fires or \"protesters\". Or it could be loaded with something more corrosive, for a lot less firefighting and a lot more excessive force.", "price": 50000, "material": "steel", - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON-FOULING" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON_FOULING" ], "ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES" ], "ammo": [ "water", "acid" ], "weight": "24500 g", diff --git a/Military_ad.-ed._CBN/json/items/gun/paintball.json b/Military_ad.-ed._CBN/json/items/gun/paintball.json index 339e788..5985456 100644 --- a/Military_ad.-ed._CBN/json/items/gun/paintball.json +++ b/Military_ad.-ed._CBN/json/items/gun/paintball.json @@ -11,7 +11,7 @@ "price": 8000, "price_postapoc": 50, "material": [ "aluminum", "plastic" ], - "flags": [ "NEVER_JAMS", "NON-FOULING" ], + "flags": [ "NEVER_JAMS", "NON_FOULING" ], "skill": "smg", "ammo": "paintball", "weight": "1600 g", diff --git a/Military_ad.-ed._CBN/json/items/gunmod/rail.json b/Military_ad.-ed._CBN/json/items/gunmod/rail.json index c579fea..f65304d 100644 --- a/Military_ad.-ed._CBN/json/items/gunmod/rail.json +++ b/Military_ad.-ed._CBN/json/items/gunmod/rail.json @@ -23,7 +23,7 @@ "clip_size": 1 }, "dispersion_modifier": 60, - "flags": [ "STR_RELOAD", "NON-FOULING" ] + "flags": [ "STR_RELOAD", "NON_FOULING" ] }, { "id": "gun_crossbow_mod", diff --git a/Military_ad.-ed._CBN/json/items/ranged/spearguns.json b/Military_ad.-ed._CBN/json/items/ranged/spearguns.json index 98b8180..d5737ff 100644 --- a/Military_ad.-ed._CBN/json/items/ranged/spearguns.json +++ b/Military_ad.-ed._CBN/json/items/ranged/spearguns.json @@ -74,7 +74,7 @@ "price": 25000, "price_postapoc": 1000, "material": [ "plastic", "steel" ], - "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NON-FOULING" ], + "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NON_FOULING" ], "skill": "rifle", "ammo": "fishspear", "weight": "3460 g",