diff --git a/Kenan-BrightNights-Modpack/Abrahms_Recipes/items/tool/cooking.json b/Kenan-BrightNights-Modpack/Abrahms_Recipes/items/tool/cooking.json index a5bd90586..1510771a3 100644 --- a/Kenan-BrightNights-Modpack/Abrahms_Recipes/items/tool/cooking.json +++ b/Kenan-BrightNights-Modpack/Abrahms_Recipes/items/tool/cooking.json @@ -14,7 +14,6 @@ "symbol": ")", "color": "dark_gray", "container_data": { "contains": "2 L" }, - "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ], - "use_action": "HEAT_FOOD" + "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ] } ] diff --git a/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/gear/multitool.json b/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/gear/multitool.json index ca1429bdb..04fe1c95a 100644 --- a/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/gear/multitool.json +++ b/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/gear/multitool.json @@ -33,7 +33,7 @@ "BOLTCUTTERS", "GEIGER", "HAMMER", - "PICK_LOCK", + "picklock", "HOTPLATE", "SIPHON", { "type": "firestarter", "moves": 5 }, diff --git a/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/production/nanofactory.json b/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/production/nanofactory.json index 15252cc8f..dc87efb7a 100644 --- a/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/production/nanofactory.json +++ b/Kenan-BrightNights-Modpack/AdvancedGear-CDDA-Mod-master/items/production/nanofactory.json @@ -33,7 +33,7 @@ "cutting": 0, "to_hit": 0, "ammo_type": "3d_resin", - "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": 0 }, + "damage": { "damage_type": "stab", "amount": 0, "armor_penetration": 0 }, "range": 0, "dispersion": 0, "recoil": 0, @@ -58,7 +58,7 @@ "cutting": 0, "to_hit": 0, "ammo_type": "3d_resin", - "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": 0 }, + "damage": { "damage_type": "stab", "amount": 0, "armor_penetration": 0 }, "range": 0, "dispersion": 0, "recoil": 0, @@ -83,7 +83,7 @@ "cutting": 0, "to_hit": 0, "ammo_type": "3d_resin", - "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": 0 }, + "damage": { "damage_type": "stab", "amount": 0, "armor_penetration": 0 }, "range": 0, "dispersion": 0, "recoil": 0, diff --git a/Kenan-BrightNights-Modpack/Aftershock/items/armor.json b/Kenan-BrightNights-Modpack/Aftershock/items/armor.json index 76a500f3a..0ccc603e3 100644 --- a/Kenan-BrightNights-Modpack/Aftershock/items/armor.json +++ b/Kenan-BrightNights-Modpack/Aftershock/items/armor.json @@ -8,7 +8,7 @@ "volume": "3 L", "//": "sci-fantasy extradimensional gadget = pricey", "price": 1000000000, - "//": "because nobody would have that amount after the world ends, it's worth $1000 in barter", + "//1": "because nobody would have that amount after the world ends, it's worth $1000 in barter", "price_postapoc": 100000, "material": [ "glass", "superalloy", "platinum" ], "symbol": "[", diff --git a/Kenan-BrightNights-Modpack/BioCo-master/items/food.json b/Kenan-BrightNights-Modpack/BioCo-master/items/food.json index fbe08dfae..69a8a48b4 100644 --- a/Kenan-BrightNights-Modpack/BioCo-master/items/food.json +++ b/Kenan-BrightNights-Modpack/BioCo-master/items/food.json @@ -15,7 +15,7 @@ "charges": 3, "quench": -5, "vitamins": [ [ "calcium", 3 ], [ "iron", 4 ], [ "vitA", 3 ], [ "vitB", 3 ], [ "vitC", 4 ] ], - "//": "98.3224 ml~", + "//1": "98.3224 ml~", "volume": "300 ml" }, { diff --git a/Kenan-BrightNights-Modpack/DracoDogMod/dog_monsters.json b/Kenan-BrightNights-Modpack/DracoDogMod/dog_monsters.json index 7075a0ce1..182149018 100644 --- a/Kenan-BrightNights-Modpack/DracoDogMod/dog_monsters.json +++ b/Kenan-BrightNights-Modpack/DracoDogMod/dog_monsters.json @@ -413,7 +413,7 @@ "harvest": "mammal_fur", "revert_to_itype": "mon_dog_gpyrenees_crate", "reproduction": { "baby_monster": "mon_dog_gpyrenees_pup", "baby_count": 7, "baby_timer": 320 }, - "//": "1-7 puppies & 300-320 days per-litter for size medium canines", + "//1": "1-7 puppies & 300-320 days per-litter for size medium canines", "flags": [ "ANIMAL", "DOGFOOD", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ] }, { @@ -447,7 +447,7 @@ "harvest": "mammal_leather", "revert_to_itype": "mon_dog_rottweiler_crate", "reproduction": { "baby_monster": "mon_dog_rottweiler_pup", "baby_count": 7, "baby_timer": 300 }, - "//": "1-7 puppies & 300-320 days per-litter for size medium canines", + "//1": "1-7 puppies & 300-320 days per-litter for size medium canines", "flags": [ "ANIMAL", "DOGFOOD", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ] }, { diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/223.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/223.json index 8e53becd7..35471b4f5 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/223.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/223.json @@ -24,7 +24,7 @@ "material": [ "brass", "powder", "uranium" ], "//": "320 m/s muzzle velocity.", "weight": 13, - "//": "Less efficient than electrothermal ignition, needs more gunpowder", + "//1": "Less efficient than electrothermal ignition, needs more gunpowder", "price": 11160, "relative": { "damage": { "damage_type": "stab", "amount": -17, "armor_penetration": 26 }, "dispersion": 7 }, "proportional": { "range": 0.73, "recoil": 0.45 }, diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/22etc.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/22etc.json index 3165f777e..19f02c835 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/22etc.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/22etc.json @@ -13,7 +13,7 @@ "recoil": 200, "loudness": 64, "proportional": { "range": 0.75, "damage": { "damage_type": "stab", "amount": 1.75, "armor_penetration": 0.2 }, "dispersion": 0.8 }, - "//": "295 m/s. 282 J. Damage increased by 4", + "//1": "295 m/s. 282 J. Damage increased by 4", "looks_like": "22_cb", "extend": { "effects": [ "NOGIB" ] } }, diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/556etc.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/556etc.json index 8a04bbe40..6b2ce3dfe 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/556etc.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/556etc.json @@ -17,7 +17,7 @@ "casing": "223_casing", "range": 48, "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 51 }, - "//": "damage reduced by 20. Stopping power might still be too high for such a lightweight round, regardless of muzzle velocity.", + "//1": "damage reduced by 20. Stopping power might still be too high for such a lightweight round, regardless of muzzle velocity.", "dispersion": 15, "recoil": 2700, "looks_like": "556", @@ -32,7 +32,7 @@ "//": "270m/s muzzle velocity", "proportional": { "weight": 19, "price": 1000, "range": 0.83, "damage": { "damage_type": "stab", "amount": 1.52, "armor_penetration": 0.98 }, "dispersion": 1.66, "recoil": 0.92 }, "loudness": 35, - "//": "It is possible to override the round loudness calculations of the game with this, now for a more realistic, underpowered subsonic round.", + "//1": "It is possible to override the round loudness calculations of the game with this, now for a more realistic, underpowered subsonic round.", "looks_like": "556", "effects": [ "COOKOFF" ] }, @@ -43,7 +43,7 @@ "description": "5.56x45mm electrothermal-chemical ammunition with a depleted uranium 154gr subsonic armor piercing bullet. OCG quickly adapted this round to conventional 5.56 NATO and kept producing both before the Cataclysm.", "copy-from": "556dk", "material": [ "brass", "powder", "uranium" ], - "//": "320m/s muzzle velocity. Pitiful muzzle energy for a ETC rifle round but great ballistic coefficient, terminal ballistics and very dense round make up for it to an extent.", + "//1": "320m/s muzzle velocity. Pitiful muzzle energy for a ETC rifle round but great ballistic coefficient, terminal ballistics and very dense round make up for it to an extent.", "proportional": { "weight": 0.85, "price": 2, "range": 0.55, "damage": { "damage_type": "stab", "amount": 0.7, "armor_penetration": 0.55 }, "dispersion": 2.5, "recoil": 0.25 }, "loudness": 68, "looks_like": "223", diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/762ec.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/762ec.json index 7fa973c5a..8c3efcd7f 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/762ec.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/ammo/762ec.json @@ -8,7 +8,7 @@ "weight": 18, "volume": "250 ml", "price": 15000, - "//": "Contains plutonium and is very rare, therefore expensive", + "//1": "Contains plutonium and is very rare, therefore expensive", "material": [ "brass", "powder", "lead" ], "flags": [ "LEAK_DAM", "RADIOACTIVE" ], "symbol": "=", @@ -17,11 +17,11 @@ "stack_size": 20, "ammo_type": "762ec", "casing": "762_51_casing", - "//": "The spent plutonium microcell is useless. A survivor crazy enough to hand-load this would just extract it from the otherwise identical casing to 7.62x51mm M80.", + "//2": "The spent plutonium microcell is useless. A survivor crazy enough to hand-load this would just extract it from the otherwise identical casing to 7.62x51mm M80.", "range": 65, "damage": { "damage_type": "stab", "amount": 41, "armor_penetration": 72 }, - "//": "Damage reduced by 5. 2080 J when fired from most guns. 8KJ in hydrogen-filled barrel = 84", - "//": "Whether that could be enough to pierce through the thinner but still very tough rear armor of a main battle tank or not doesn't matter in this game.", + "//3": "Damage reduced by 5. 2080 J when fired from most guns. 8KJ in hydrogen-filled barrel = 84", + "//4": "Whether that could be enough to pierce through the thinner but still very tough rear armor of a main battle tank or not doesn't matter in this game.", "dispersion": 3, "recoil": 3500, "looks_like": "308", diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/22etc.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/22etc.json index e187a96be..e4edb8e4a 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/22etc.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/22etc.json @@ -20,7 +20,7 @@ "//": "Somewhat inefficient", "looks_like": "m134", "reload": 600, - "//": "faster cyclical RoF than the M134 minigun, can put down skeletal juggernauts and theoretically chicken walkers with micro-flechettes", + "//1": "faster cyclical RoF than the M134 minigun, can put down skeletal juggernauts and theoretically chicken walkers with micro-flechettes", "modes": [ [ "DEFAULT", "6 rd.", 6 ], [ "BURST", "low auto", 60 ], [ "AUTO", "high auto", 120 ] ], "valid_mod_locations": [ [ "accessories", 3 ], @@ -77,7 +77,7 @@ "recoil_shots": 4, "delay_percent": 80, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4, [ "SIMULTANEOUS" ] ], [ "AUTO", "auto", 20 ] ], - "//": "Keeping that flag in case DDA gets it implemented in the future", + "//1": "Keeping that flag in case DDA gets it implemented in the future", "valid_mod_locations": [ [ "accessories", 3 ], [ "barrel", 1 ], @@ -215,7 +215,7 @@ "durability": 7, "magazine_well": 1, "looks_like": "sig_mosquito", - "//": "The Russian PSM pistol would be the closest lookalike", + "//1": "The Russian PSM pistol would be the closest lookalike", "magazines": [ [ "22etc", [ "spistol_mag" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/308.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/308.json index 72815a13a..44ad930a3 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/308.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/308.json @@ -15,9 +15,9 @@ "color": "dark_gray", "ammo": [ "308", "300" ], "range": -25, - "//": "Like in the AKS-74U, the round remains lethal beyond the effective range but extremely unlikely to hit anything. This modifier doesn't matter much because the high dispersion makes firing it at long ranges wasteful.", + "//1": "Like in the AKS-74U, the round remains lethal beyond the effective range but extremely unlikely to hit anything. This modifier doesn't matter much because the high dispersion makes firing it at long ranges wasteful.", "ranged_damage": -5, - "//": "255 mm/10 in barrel", + "//2": "255 mm/10 in barrel", "dispersion": 300, "durability": 8, "loudness": 40, diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/556etc.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/556etc.json index 93181d64d..aa776d1ba 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/556etc.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/556etc.json @@ -8,7 +8,7 @@ "//": "This and specially the AMR are inspired by this fictional hand cannon: https://eyedivinecybermancy.fandom.com/wiki/444_Bear_Killer ", "weight": 1900, "volume": "1 L", - "//": "Longer barrel than the L2037 Backup: 330 mm/13 in", + "//1": "Longer barrel than the L2037 Backup: 330 mm/13 in", "price": 300000, "to_hit": -2, "bashing": 9, @@ -21,7 +21,7 @@ "range": -6, "durability": 8, "built_in_mods": "ad_capacitor", - "//": "very inefficient but can take down tank drones with about 8 shots.", + "//2": "very inefficient but can take down tank drones with about 8 shots.", "default_mods": "pistol_scope", "clip_size": 4, "looks_like": "raging_bull", diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/762ec.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/762ec.json index 3e8fc0177..6b078ffa8 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/762ec.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/762ec.json @@ -8,7 +8,7 @@ "//": "This and the ADR are inspired by this fictional hand cannon: https://eyedivinecybermancy.fandom.com/wiki/444_Bear_Killer", "weight": 2300, "volume": "1 L", - "//": "255 mm/10 in barrel", + "//1": "255 mm/10 in barrel", "price": 500000, "to_hit": -2, "bashing": 9, @@ -68,14 +68,14 @@ "default_mods": "holo_sight", "dispersion": 165, "range": -18, - "//": "Magazine position too close to the shooter's shoulder may hinder accuracy while its very short barrel for a 'full' 7.62mm caliber definitively does that. Its portability comes at a cost.", + "//1": "Magazine position too close to the shooter's shoulder may hinder accuracy while its very short barrel for a 'full' 7.62mm caliber definitively does that. Its portability comes at a cost.", "durability": 9, "recoil_shots": 2, "delay_percent": 30, - "//": "Balanced action, not as significant of an effect in delaying felt recoil", + "//2": "Balanced action, not as significant of an effect in delaying felt recoil", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 10 ] ], "looks_like": "steyr_aug", - "//": "Not really, just going for closest lookalikes", + "//3": "Not really, just going for closest lookalikes", "magazines": [ [ "762ec", [ "ocg762e_7", "ocg762e_20", "ocg762e_30", "ocg762e_40", "ocg762e_50", "ocg762e_66" ] ] ] }, { @@ -85,8 +85,8 @@ "name": "OCG OFG16k", "description": "The Orbital Force Gun is an anti-materiel light-gas rifle with a detachable, vacuum-sealable barrel which can be connected to a hydrogen canister yet works without one with drastically reduced muzzle energy. Its manual recommends avoiding hydrogen despite that due to reliability issues a future OFG16kA1 model would solve.", "//": "You'll need to carry a firearm/gunsmith repair kit and spare batteries/UPS if you want to use it optimally as it degrades very quickly when configured as a light-gas gun.", - "//": "Visual reference for damage under optimal muzzle velocities: https://en.wikipedia.org/wiki/File:SDIO_KEW_Lexan_projectile.jpg . Should be less powerful than that because it uses projectiles with lighter masses, but it is almost an anti-tank rifle.", - "//": "Implemented through a workaround. Gunmods can't have on/off states or finite charges as of the 0.D version.", + "//1": "Visual reference for damage under optimal muzzle velocities: https://en.wikipedia.org/wiki/File:SDIO_KEW_Lexan_projectile.jpg . Should be less powerful than that because it uses projectiles with lighter masses, but it is almost an anti-tank rifle.", + "//2": "Implemented through a workaround. Gunmods can't have on/off states or finite charges as of the 0.D version.", "weight": 2100, "volume": "1 L", "price": 9500000, @@ -97,7 +97,7 @@ "ammo": "762ec", "ranged_damage": -20, "range": -40, - "//": "It shouldn't really be able to fire with its barrel detached.", + "//3": "It shouldn't really be able to fire with its barrel detached.", "built_in_mods": [ "rifle_scope", "cheek_pad", "ocg_stabilizer", "barrel_ported" ], "default_mods": "hydrogen_gun_atm_barrel", "valid_mod_locations": [ [ "barrel", 1 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ] ], diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/9etc.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/9etc.json index 31b78e99f..401ed0821 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/9etc.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/9etc.json @@ -162,7 +162,7 @@ "color": "dark_gray", "ammo": "9etc", "ranged_damage": { "damage_type": "stab", "amount": 1, "armor_penetration": 18 }, - "//": "With 9mm ETC HAPM, can punch through tank drone armor, but dozens of rounds are required to destroy one. Muzzle velocity somewhere above 1100 and below 2000 m/s", + "//1": "With 9mm ETC HAPM, can punch through tank drone armor, but dozens of rounds are required to destroy one. Muzzle velocity somewhere above 1100 and below 2000 m/s", "recoil": 160, "range": 12, "dispersion": 80, diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/barrel.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/barrel.json new file mode 100644 index 000000000..7bbb7f575 --- /dev/null +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/barrel.json @@ -0,0 +1,163 @@ +[ + { + "id": "hydrogen_gun_atm_barrel", + "type": "TOOL", + "category": "mods", + "name": "OFG16k air-filled barrel", + "description": "The barrel of the OFG16k filled with atmospheric air, resulting in suboptimal muzzle velocity but far more reliable action, plus its gas loading and sealing mechanisms and emergency release. Remove from the OFG16k, load a canister and activate to fill it with hydrogen.", + "weight": 3100, + "volume": "2250 ml", + "price": 300000, + "to_hit": -1, + "bash": 12, + "material": [ "diamond", "superalloy", "steel" ], + "symbol": ":", + "color": "dark_gray", + "ammo": "plasma", + "initial_charges": 0, + "max_charges": 1, + "gunmod_data": { + "location": "barrel", + "volume": "2250 ml", + "integral_volume": 7, + "mod_targets": [ "rifle" ], + "dispersion_modifier": -855, + "damage_modifier": 45, + "range_modifier": 40, + "durability_modifier": 7 + }, + "use_action": { + "target": "hydrogen_gun_h_barrel", + "msg": "You prepare the canister to fill up the barrel and replace atmospheric air with pure hydrogen.", + "menu_text": "Prepare hydrogen", + "type": "transform", + "target_charges": 0, + "need_charges": 1 + }, + "looks_like": "barrel_big" + }, + { + "id": "hydrogen_gun_h_barrel", + "type": "TOOL", + "category": "mods", + "name": "OFG16k hydrogen-filled barrel", + "description": "The barrel of the OFG16k filled with pure hydrogen from an attached canister. The speed of sound is 3.8 times faster inside it, which drastically boosts muzzle velocity. Included with it are the gas loading and sealing mechanisms and emergency release. Activate to vent off all hydrogen and unseal it to the atmosphere.", + "weight": 3283, + "price": 300000, + "//": "including hydrogen canister mass because 'NO_UNLOAD' flag does the same as 'IRREMOVABLE' in a tool that also can be attached as gun mod", + "volume": "2250 ml", + "to_hit": -1, + "bash": 12, + "material": [ "diamond", "superalloy", "steel" ], + "symbol": ":", + "color": "dark_gray", + "ammo": "plasma", + "gunmod_data": { + "location": "barrel", + "volume": "2250 ml", + "integral_volume": 7, + "mod_targets": [ "rifle" ], + "dispersion_modifier": -900, + "damage_modifier": 83, + "handling_modifier": -15, + "//1": "More muzzle velocity = more recoil", + "ammo_effects": [ "TRAIL", "INCENDIARY" ], + "//2": "Gun mods can add ammo_effects, an interesting little feature for modding.", + "range_modifier": 40 + }, + "use_action": { + "target": "hydrogen_gun_atm_barrel", + "msg": "You vent off hydrogen, expose the barrel to atmospheric air and discard the now empty canister.", + "menu_text": "Vent off hydrogen", + "type": "transform" + }, + "//3": "gunmods that consume charges and can be switched on/off after attached are not supported by the game code yet, thus this does nothing", + "initial_charges": 0, + "max_charges": 0, + "turns_per_charge": 200000, + "//4": "not sure how long it should last, but for now it's not important at all for the reason mentioned above.", + "revert_to": "hydrogen_gun_atm_barrel", + "revert_msg": "The OFG16k barrel ran out of hydrogen.", + "looks_like": "barrel_big" + }, + { + "id": "ocg_er555_barrel", + "copy-from": "barrel_small", + "type": "GUNMOD", + "name": "OCG ER555 standard barrel", + "description": "An OCG standard 5.56mm barrel. Long enough for sniper rifles as it is when used together with electrothermal-chemical technology.", + "price": 0, + "volume": "1 L", + "integral_volume": 3, + "material": "superalloy", + "dispersion_modifier": 0, + "damage_modifier": 1, + "range_modifier": 0, + "flags": [ "IRREMOVABLE" ] + }, + { + "id": "ocg_er555_carbarrel", + "copy-from": "barrel_small", + "type": "GUNMOD", + "name": "OCG ER555 shortened barrel", + "description": "An OCG built in shortened 5.56mm barrel, making a gun easier to carry, maneuver and aim at the expense of damage, accuracy and range. Its handguard rails support two underbarrel attachments.", + "price": 0, + "volume": "500 ml", + "integral_volume": 1, + "material": "superalloy", + "dispersion_modifier": 25, + "damage_modifier": -4, + "range_modifier": -9, + "add_mod": [ [ "underbarrel", 1 ], [ "stock", 1 ] ], + "flags": [ "IRREMOVABLE" ] + }, + { + "id": "ocg_er555_cqbbarrel", + "copy-from": "barrel_small", + "type": "GUNMOD", + "name": "OCG ER555 CQB barrel", + "description": "An OCG built in very short 5.56mm barrel for close quarters battle, making a gun much easier to carry, maneuver and aim at the expense of damage, accuracy and range. Its handguard rails support two underbarrel attachments.", + "price": 0, + "volume": "250 ml", + "integral_volume": 0, + "material": "superalloy", + "dispersion_modifier": 50, + "damage_modifier": -5, + "range_modifier": -18, + "//": "because of accuracy loss, not because the round won't travel farther and still remain lethal, as in the AKS-74U", + "add_mod": [ [ "underbarrel", 1 ], [ "stock", 1 ] ], + "flags": [ "IRREMOVABLE" ] + }, + { + "id": "ocg_er555_lmgbarrel", + "copy-from": "barrel_small", + "type": "GUNMOD", + "name": "OCG ER555 reinforced barrel", + "description": "An OCG built in reinforced 5.56mm barrel for the E/QR555-SAW. Improves the gun's reliability.", + "price": 0, + "volume": "1 L", + "integral_volume": 3, + "material": "superalloy", + "dispersion_modifier": 0, + "damage_modifier": 1, + "range_modifier": 0, + "add_mod": [ [ "stock", 1 ] ], + "durability_modifier": 1, + "flags": [ "IRREMOVABLE" ] + }, + { + "id": "qr555_dmrbarrel", + "copy-from": "barrel_small", + "type": "GUNMOD", + "name": "OCG QR555 DMR barrel", + "description": "An OCG DMR 5.56mm match-grade barrel, extending the effective range of subsonic 5.56 OCG Blackout rounds beyond 300 meters and of regular 5.56 NATO beyond 400 while maintaining the the former subsonic.", + "price": 0, + "volume": "1250 ml", + "integral_volume": 4, + "material": "superalloy", + "dispersion_modifier": -20, + "damage_modifier": 3, + "range_modifier": 5, + "flags": [ "IRREMOVABLE" ] + } +] diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/magpin.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/magpin.json index 0860c23e2..39f301fae 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/magpin.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/magpin.json @@ -10,7 +10,7 @@ "//": "Short 90 mm/3.5 in barrel.", "price": 900000, "price_postapoc": 2700000, - "//": "Rare, milspec, mostly silent, plentiful ammo and made of some quite expensive materials. Its price would be inflated.", + "//1": "Rare, milspec, mostly silent, plentiful ammo and made of some quite expensive materials. Its price would be inflated.", "to_hit": -1, "bashing": 12, "material": [ "ceramic", "plastic", "steel" ], diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/shot.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/shot.json index 491371225..a9350283f 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/shot.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/shot.json @@ -28,13 +28,13 @@ "recoil_shots": 2, "delay_percent": 100, "reload": 150, - "//": "Shared gas port is as long as the barrels in this one, can't be sawn off. Same thing on the two gas ports of the 12-S.", + "//1": "Shared gas port is as long as the barrels in this one, can't be sawn off. Same thing on the two gas ports of the 12-S.", "modes": [ [ "DEFAULT", "double", 2, "SIMULTANEOUS" ], [ "AUTO", "auto", 8 ] ], "built_in_mods": [ "ocg_grippod_fg", "ocg_grippod_bipod", "ocg_stabilizer", "ocg_recoil_stock", "barrel_ported" ], "magazine_well": 2, "magazines": [ [ "shot", [ "excidia20mags12", "excidia40mag" ] ] ], "looks_like": "saiga_12", - "//": "No other magazine-loaded shotgun besides Rivtech ones." + "//2": "No other magazine-loaded shotgun besides Rivtech ones." }, { "id": "ocg12s_scuta", diff --git a/Kenan-BrightNights-Modpack/ETC_handguns_etc/professions.json b/Kenan-BrightNights-Modpack/ETC_handguns_etc/professions.json index b0708ccb6..bea8e4af2 100644 --- a/Kenan-BrightNights-Modpack/ETC_handguns_etc/professions.json +++ b/Kenan-BrightNights-Modpack/ETC_handguns_etc/professions.json @@ -87,7 +87,7 @@ "entries": [ { "item": "heels", "custom-flags": "no_auto_equip" } ] } }, - "//": "The red dot sight starts detached from the QR555 to allow STR 8 characters to wield it one-handed until a better means of storage than the starting briefcase is found." + "//1": "The red dot sight starts detached from the QR555 to allow STR 8 characters to wield it one-handed until a better means of storage than the starting briefcase is found." }, { "type": "profession", diff --git a/Kenan-BrightNights-Modpack/Make_a_Lot_of_Items_Mod/MLI_overmap_special.json b/Kenan-BrightNights-Modpack/Make_a_Lot_of_Items_Mod/MLI_overmap_special.json index b2ef5440d..c16820d32 100644 --- a/Kenan-BrightNights-Modpack/Make_a_Lot_of_Items_Mod/MLI_overmap_special.json +++ b/Kenan-BrightNights-Modpack/Make_a_Lot_of_Items_Mod/MLI_overmap_special.json @@ -8,12 +8,12 @@ { "point":[0,0,0], "overmap": "MLI_s_pasta_restaurant_north", "connect":"road"} ], "locations" : [ "wilderness" ], "//":"what special locations does it spawn", - "city_distance" : [0, 1], "//":"how far from a city it should be", - "city_sizes" : [1, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 1], "//":"how many per overmap", - "rotate" : true, "//":"allow rotation", - "unique" : false, "//":"only allow one per city", - "required" : false, "//":"is this special required for valid city sizes", + "city_distance" : [0, 1], "//1":"how far from a city it should be", + "city_sizes" : [1, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 1], "//3":"how many per overmap", + "rotate" : true, "//4":"allow rotation", + "unique" : false, "//5":"only allow one per city", + "required" : false, "//6":"is this special required for valid city sizes", "flags" : [ "CLASSIC" ] }, { @@ -24,12 +24,12 @@ { "point":[0,0,0], "overmap": "MLI_glass_workshop_north", "connect":"road"} ], "locations" : [ "wilderness" ], "//":"what special locations does it spawn", - "city_distance" : [0, 1], "//":"how far from a city it should be", - "city_sizes" : [1, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 1], "//":"how many per overmap", - "rotate" : true, "//":"allow rotation", - "unique" : false, "//":"only allow one per city", - "required" : false, "//":"is this special required for valid city sizes", + "city_distance" : [0, 1], "//1":"how far from a city it should be", + "city_sizes" : [1, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 1], "//3":"how many per overmap", + "rotate" : true, "//4":"allow rotation", + "unique" : false, "//5":"only allow one per city", + "required" : false, "//6":"is this special required for valid city sizes", "flags" : [ "CLASSIC" ] } ] \ No newline at end of file diff --git a/Kenan-BrightNights-Modpack/Merchant/overmap_special.json b/Kenan-BrightNights-Modpack/Merchant/overmap_special.json index 5b23d0a4c..7f824e15f 100644 --- a/Kenan-BrightNights-Modpack/Merchant/overmap_special.json +++ b/Kenan-BrightNights-Modpack/Merchant/overmap_special.json @@ -10,9 +10,9 @@ { "point" : [0,1,0], "terrain" : "road" } ], "locations" : [ "field" ], "//":"what special locations does it spawn", - "city_distance" : [7, 12], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 1], "//":"how many per overmap" + "city_distance" : [7, 12], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 1], "//3":"how many per overmap" },{ "type" : "overmap_special", "id" : "Safezone", @@ -38,9 +38,9 @@ { "point" : [0,1,0], "terrain" : "road" } ], "locations" : [ "field" ], "//":"what special locations does it spawn", - "city_distance" : [7, 12], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 1], "//":"how many per overmap" + "city_distance" : [7, 12], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 1], "//3":"how many per overmap" }, { "type" : "overmap_special", @@ -54,8 +54,8 @@ { "point" : [0,1,0], "terrain" : "road" } ], "locations" : [ "field" ], "//":"what special locations does it spawn", - "city_distance" : [6, -1], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 1], "//":"how many per overmap" + "city_distance" : [6, -1], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 1], "//3":"how many per overmap" } ] \ No newline at end of file diff --git a/Kenan-BrightNights-Modpack/Miscellaneous Magiclysm Expansions/enchanted/enchanted_mods.json b/Kenan-BrightNights-Modpack/Miscellaneous Magiclysm Expansions/enchanted/enchanted_mods.json index 22fb10eff..d8f842f72 100644 --- a/Kenan-BrightNights-Modpack/Miscellaneous Magiclysm Expansions/enchanted/enchanted_mods.json +++ b/Kenan-BrightNights-Modpack/Miscellaneous Magiclysm Expansions/enchanted/enchanted_mods.json @@ -13,7 +13,7 @@ "symbol": ".", "color": "dark_gray", "location": "accessories", - "mod_targets": [ "bow", "stave", "gstave", "crossbow", "rifle", "shotgun", "smg", "pistol", "rugerlcp", "kp32", "kp3at", "kpf9", "cop_38", "moss_brownie" ], + "mod_targets": [ "bow", "crossbow", "rifle", "shotgun", "smg", "pistol", "rugerlcp", "kp32", "kp3at", "kpf9", "cop_38", "moss_brownie" ], "dispersion_modifier": 0, "min_skills": [ [ "spellcraft", 1 ] ] } diff --git a/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_handgun/modern_handgun.json b/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_handgun/modern_handgun.json index 3914e9282..e3ef43c97 100644 --- a/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_handgun/modern_handgun.json +++ b/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_handgun/modern_handgun.json @@ -267,18 +267,18 @@ "copy-from": "pistol_revolver", "type": "GUN", "name": "High Standard Deluxe", - "description": "A common .22 revolver loved for its dependability and comfortable grip.", + "description": "A common 9mm revolver loved for its dependability and comfortable grip.", "weight": 1304, "volume": "500 ml", "price": 25000, "to_hit": -2, "bashing": 7, "material": [ "steel", "plastic" ], - "ammo": "22", + "ammo": "9mm", "ranged_damage": { "damage_type": "stab", "amount": -1 }, "dispersion": 90, "durability": 6, - "clip_size": 9, + "clip_size": 7, "magazines": [ [ "9mm", [ "ccw9mm_mag" ] ] ] diff --git a/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_rifle/modern_rifle_obsolete.json b/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_rifle/modern_rifle_obsolete.json index 5d4450cdf..fa4dc9169 100644 --- a/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_rifle/modern_rifle_obsolete.json +++ b/Kenan-BrightNights-Modpack/Modern-Weapons-Pack-Expanded/modern_rifle/modern_rifle_obsolete.json @@ -29,7 +29,7 @@ "symbol": "#", "color": "light_gray", "ammo_type": "223", - "//": "Capacity should be 5 but I added one to represent one in the chamber.", + "//1": "Capacity should be 5 but I added one to represent one in the chamber.", "capacity": 6, "reliability": 9, "flags": [ "MAG_COMPACT" ] @@ -47,7 +47,7 @@ "symbol": "#", "color": "light_gray", "ammo_type": "308", - "//": "Capacity should be 5 but I added one to represent one in the chamber.", + "//1": "Capacity should be 5 but I added one to represent one in the chamber.", "capacity": 6, "reliability": 9, "flags": [ "MAG_COMPACT" ] diff --git a/Kenan-BrightNights-Modpack/ProjectAPEX-master/items/tools/euler.json b/Kenan-BrightNights-Modpack/ProjectAPEX-master/items/tools/euler.json index 405894aef..9f3d34a07 100644 --- a/Kenan-BrightNights-Modpack/ProjectAPEX-master/items/tools/euler.json +++ b/Kenan-BrightNights-Modpack/ProjectAPEX-master/items/tools/euler.json @@ -9,7 +9,7 @@ "str_pl": "laptop computers with EulerOS" }, "description": "Working portable computer. Internal battery has been somewhat-crudely replaced to ensure as much. This one has EulerOS - a proprietary APEX design assistance system - installed.", - "//": "resets flags: EulerOS is not meant to even have an exposed clock", + "//1": "resets flags: EulerOS is not meant to even have an exposed clock", "flags": [] } ] \ No newline at end of file diff --git a/Kenan-BrightNights-Modpack/Ships/overmap_specials.json b/Kenan-BrightNights-Modpack/Ships/overmap_specials.json index 7be091f5d..7150c4f5d 100644 --- a/Kenan-BrightNights-Modpack/Ships/overmap_specials.json +++ b/Kenan-BrightNights-Modpack/Ships/overmap_specials.json @@ -31,8 +31,8 @@ {"point": [1,3,2], "overmap": "ws_cruise_ship_x1y3z2_north"} ], "locations": ["deep_water"], "//": "what special locations does it spawn", - "occurrences": [0,2], "//": "how many per overmap", - "rotate": true, "//": "allow rotation", + "occurrences": [0,2], "//1": "how many per overmap", + "rotate": true, "//2": "allow rotation", "flags": ["CLASSIC"] }, @@ -51,8 +51,8 @@ {"point": [0,2,2], "overmap": "ws_cargo_ship_y2z2_north"} ], "locations": ["deep_water"], "//": "what special locations does it spawn", - "occurrences": [0,2], "//": "how many per overmap", - "rotate": true, "//": "allow rotation", + "occurrences": [0,2], "//1": "how many per overmap", + "rotate": true, "//2": "allow rotation", "flags": ["CLASSIC"] } ] diff --git a/Kenan-BrightNights-Modpack/Tekitoumap/overmap_specials.json b/Kenan-BrightNights-Modpack/Tekitoumap/overmap_specials.json index a39bed387..3fd42765d 100644 --- a/Kenan-BrightNights-Modpack/Tekitoumap/overmap_specials.json +++ b/Kenan-BrightNights-Modpack/Tekitoumap/overmap_specials.json @@ -10,9 +10,9 @@ { "point":[0,1,-1], "overmap": "surv_bunk4_north"} ], "locations" : [ "wilderness" ], "//":"what special locations does it spawn", - "city_distance" : [5, -1], "//":"how far from a city it should be", - "city_sizes" : [1, 16], "//":"what city sizes should it spawn in", - "occurrences" : [0, 3], "//":"how many per overmap" + "city_distance" : [5, -1], "//1":"how far from a city it should be", + "city_sizes" : [1, 16], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 3], "//3":"how many per overmap" }, { "type" : "overmap_special", @@ -28,9 +28,9 @@ { "point" : [-1,1,0], "terrain" : "road" } ], "locations" : [ "forest" ], "//":"what special locations does it spawn", - "city_distance" : [-1, 15], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [1, 2], "//":"how many per overmap" + "city_distance" : [-1, 15], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [1, 2], "//3":"how many per overmap" }, { "type" : "overmap_special", @@ -40,8 +40,8 @@ { "point":[0,0,0], "overmap": "yamadojo_south"} ], "locations" : [ "forest" ], "//":"what special locations does it spawn", - "city_distance" : [5, -1], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [1, 3], "//":"how many per overmap" + "city_distance" : [5, -1], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [1, 3], "//3":"how many per overmap" } ] diff --git a/Kenan-BrightNights-Modpack/Tekitoumap/regional_overlay.json b/Kenan-BrightNights-Modpack/Tekitoumap/regional_overlay.json index 01cddc3fd..b78a7b117 100644 --- a/Kenan-BrightNights-Modpack/Tekitoumap/regional_overlay.json +++ b/Kenan-BrightNights-Modpack/Tekitoumap/regional_overlay.json @@ -2,9 +2,9 @@ { "type": "region_overlay", "id": "tm_overlay", "//": "unique identifier for this overlay", - "regions": [ "all" ], "//": "A list of regions to which this overlay should be applied", + "regions": [ "all" ], "//1": "A list of regions to which this overlay should be applied", "city": { - "shops": { "//": "weighted list of oterrains for commercial zoning", + "shops": { "backst": 5, "meat": 1, "vege": 1, @@ -13,7 +13,8 @@ "bicycle": 2, "petshop": 2, "smith": 1 - } + }, + "//2": "weighted list of oterrains for commercial zoning" } } ] diff --git a/Kenan-BrightNights-Modpack/Vorpal-Weapons-master/vo_recipes.json b/Kenan-BrightNights-Modpack/Vorpal-Weapons-master/vo_recipes.json index aab01b799..50c3b3cd3 100644 --- a/Kenan-BrightNights-Modpack/Vorpal-Weapons-master/vo_recipes.json +++ b/Kenan-BrightNights-Modpack/Vorpal-Weapons-master/vo_recipes.json @@ -259,7 +259,7 @@ "qualities":[ {"id":"HAMMER","level":1} ], - "//" : "Extra duct tape/string needed to attach the spikes; rag/leather for grip.", + "//1" : "Extra duct tape/string needed to attach the spikes; rag/leather for grip.", "components": [ [ [ "stick", 1 ], diff --git a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/npcs/npc.json b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/npcs/npc.json index b54897b20..edb3a6cca 100644 --- a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/npcs/npc.json +++ b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/npcs/npc.json @@ -3,22 +3,22 @@ "type": "npc", "id": "old_guard_rep", "comment": "Appears in the refugee center as a source of missions and info. Faction critical.", - "comment": "name+ is appended to the end of the npc's name. If you remove the comma it sets the name as is.", + "comment1": "name+ is appended to the end of the npc's name. If you remove the comma it sets the name as is.", "name+": ", Representative", - "comment": "Class is based on the enum in npc.h. The important ones are 0=NC_NONE, 2=NC_SHOPKEEP,", - "comment": "3=NC_HACKER, 4=NC_DOCTOR, 5=NC_TRADER, 6=NC_NINJA, 7=NC_COWBOY, 8=NC_SCIENTIST,", - "comment": "9=NC_BOUNTY_HUNTER, 10=NC_THUG, 11=NC_SCAVENGER, 13=NC_HUNTER, 14=NC_SOLDIER.", + "comment2": "Class is based on the enum in npc.h. The important ones are 0=NC_NONE, 2=NC_SHOPKEEP,", + "comment3": "3=NC_HACKER, 4=NC_DOCTOR, 5=NC_TRADER, 6=NC_NINJA, 7=NC_COWBOY, 8=NC_SCIENTIST,", + "comment4": "9=NC_BOUNTY_HUNTER, 10=NC_THUG, 11=NC_SCAVENGER, 13=NC_HUNTER, 14=NC_SOLDIER.", "class": 7, - "comment": "Attitude is based on the enum in npc.h. The important ones are 0=NPCATT_NULL, 1=NPCATT_TALK", - "comment": "3=NPCATT_FOLLOW, 7=NPCATT_DEFEND, 10=NPCATT_KILL, and 11=NPCATT_FLEE", + "comment5": "Attitude is based on the enum in npc.h. The important ones are 0=NPCATT_NULL, 1=NPCATT_TALK", + "comment6": "3=NPCATT_FOLLOW, 7=NPCATT_DEFEND, 10=NPCATT_KILL, and 11=NPCATT_FLEE", "attitude": 0, - "comment": "Mission is based on the enum in npc.h. The important ones are 0=NPC_MISSION_NUL, 3=NPC_MISSION_SHOPKEEP", - "comment": "and 7=NPC_MISSION_GUARD", + "comment7": "Mission is based on the enum in npc.h. The important ones are 0=NPC_MISSION_NUL, 3=NPC_MISSION_SHOPKEEP", + "comment8": "and 7=NPC_MISSION_GUARD", "mission": 7, "chat": "TALK_OLD_GUARD_REP", "faction": "old_guard", "mission_offered": 31, - "comment": "Mission_offered is based on the enum mission_id in mission.h. 0=MISSION_NULL" + "comment9": "Mission_offered is based on the enum mission_id in mission.h. 0=MISSION_NULL" }, { "type": "npc", diff --git a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/regional_map_settings.json b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/regional_map_settings.json index 2b4b14926..cfec71ee3 100644 --- a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/regional_map_settings.json +++ b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/regional_map_settings.json @@ -2,17 +2,18 @@ { "type": "region_settings", "id": "wastes", "//": "identifier, when region_map is in it will determine alternatives ('desert' etc)", - "house_basement_chance": 4, "//": "one_in(n) houses with basements", - "default_oter": "field", "//": "default oter_id (anything that isn't a house/road/etc) some become forests", - "default_groundcover": { "//": "biome settings for generic 'grass_or_dirt' (which is reproduced below", - "primary": "t_sand", "//": "default ter_id on ground", - "ratio": 5, "//": "one_in(n) chance that it becomes...", + "house_basement_chance": 4, "//1": "one_in(n) houses with basements", + "default_oter": "field", "//2": "default oter_id (anything that isn't a house/road/etc) some become forests", + "default_groundcover": { "//3": "biome settings for generic 'grass_or_dirt' (which is reproduced below", + "primary": "t_sand", "//4": "default ter_id on ground", + "ratio": 5, "//5": "one_in(n) chance that it becomes...", "secondary": "t_searth_test", "//": "...this instead" }, - "field_coverage": { "//": "biome settings for builtin field mapgen. The values below replicate results of hardcoded 'field' mapgen", - "percent_coverage": 0.9333, "//": "% of tiles that have a plant: one_in(120)", - "default_ter": "t_shrub", "//": "default plant", - "other": { "//": "% of plants/features that aren't default_ter", + "field_coverage": { "//6": "biome settings for builtin field mapgen. The values below replicate results of hardcoded 'field' mapgen", + "percent_coverage": 0.9333, "//7": "% of tiles that have a plant: one_in(120)", + "default_ter": "t_shrub", "//8": "default plant", + "//9": "% of plants/features that aren't default_ter", + "other": { "t_shrub_blueberry": 0.4166, "t_shrub_strawberry": 0.4166, "f_bluebell": 8.3333, @@ -23,9 +24,10 @@ "f_boulder_medium": 0.6666, "f_boulder_large": 0.3333 }, - "boost_chance": 0.833, "//": "% of fields with boosted plant growth", - "boosted_percent_coverage": 2.5, "//": "for the above: total percent coverage jumps to this amount", - "boosted_other": { "//": "...and the first non-default picked from this list...", + "boost_chance": 0.833, "//10": "% of fields with boosted plant growth", + "boosted_percent_coverage": 2.5, "//11": "for the above: total percent coverage jumps to this amount", + "//12": "...and the first non-default picked from this list...", + "boosted_other": { "t_shrub_blueberry": 40.0, "t_shrub_strawberry": 30.0, "f_mutpoppy": 6.6, @@ -34,12 +36,14 @@ "f_datura": 0.2, "f_dandelion": 6.6 }, - "boosted_other_percent": 50.0, "//": "...accounts for this % of total coverage" + "boosted_other_percent": 50.0, "//13": "...accounts for this % of total coverage" }, - "map_extras": { "//": "mapping for weighted lists of extras", + "//14": "mapping for weighted lists of extras", + "map_extras": { "field": { - "chance": 90, "//": "one in # chance of spawning an extra", - "extras": { "//": "weighted list", + "chance": 90, "//15": "one in # chance of spawning an extra", + "//16": "weighted list", + "extras": { "mx_helicopter": 40, "mx_military": 8, "mx_science": 20, @@ -51,8 +55,9 @@ } }, "road": { - "chance": 75, "//": "one in # chance of spawning an extra", - "extras": { "//": "weighted list", + "chance": 75, "//17": "one in # chance of spawning an extra", + "//18": "weighted list", + "extras": { "mx_helicopter": 40, "mx_military": 25, "mx_science": 40, @@ -65,8 +70,9 @@ } }, "building": { - "chance": 90, "//": "one in # chance of spawning an extra", - "extras": { "//": "weighted list", + "chance": 90, "//19": "one in # chance of spawning an extra", + "//20": "weighted list", + "extras": { "mx_military": 5, "mx_science": 12, "mx_collegekids": 15, @@ -75,29 +81,32 @@ } }, "subway": { - "chance": 75, "//": "one in # chance of spawning an extra", - "extras": { "//": "weighted list", + "chance": 75, "//21": "one in # chance of spawning an extra", + "//22": "weighted list", + "extras": { "mx_military": 5, "mx_science": 12, "mx_collegekids": 15 } } }, - "num_forests": 5, "//": "# of forest chunks", - "forest_size_min": 0, "//": "size range of forest chunk", - "forest_size_max": 5, "//": "note: 32400 tiles in omap, 250*minmax = 3750-10000 default_oters become forests", - "swamp_maxsize": 4, "//": "SWAMPINESS // Affects the size of a swamp", - "swamp_river_influence": 5, "//": "voodoo magic sauce: more increases swampyness of forests around rivers", - "swamp_spread_chance": 8500, "//": "one_in(n) chance a swampy forest makes a swamp in a non-forest. Apparently.", + "num_forests": 5, "//23": "# of forest chunks", + "forest_size_min": 0, "//24": "size range of forest chunk", + "forest_size_max": 5, "//25": "note: 32400 tiles in omap, 250*minmax = 3750-10000 default_oters become forests", + "swamp_maxsize": 4, "//26": "SWAMPINESS // Affects the size of a swamp", + "swamp_river_influence": 5, "//27": "voodoo magic sauce: more increases swampyness of forests around rivers", + "swamp_spread_chance": 8500, "//28": "one_in(n) chance a swampy forest makes a swamp in a non-forest. Apparently.", "city": { "type": "town", - "shop_radius": 60, "//": "determine radial frequency of shops / parks / houses for towns. tldr: less means more", - "park_radius": 130, "//": "this is not a cut and dry % but rather an inverse voodoo number; rng(0,99) > VOODOO * distance / citysize;", - "parks": { "//": "weighted list for park overmap terrains", + "shop_radius": 60, "//29": "determine radial frequency of shops / parks / houses for towns. tldr: less means more", + "park_radius": 130, "//30": "this is not a cut and dry % but rather an inverse voodoo number; rng(0,99) > VOODOO * distance / citysize;", + "//31": "weighted list for park overmap terrains", + "parks": { "park": 4, "pool": 1 }, - "shops": { "//": "weighted list of oterrains for commercial zoning", + "//32": "weighted list of oterrains for commercial zoning", + "shops": { "s_gas": 7, "s_pharm": 3, "s_grocery": 15, diff --git a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/wastes.json b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/wastes.json index d60b0f634..64372251c 100644 --- a/Kenan-BrightNights-Modpack/Wastelands_Mod-master/wastes.json +++ b/Kenan-BrightNights-Modpack/Wastelands_Mod-master/wastes.json @@ -123,7 +123,7 @@ "material": ["steel", "wood"], "flags": ["RELOAD_ONE", "NEVER_JAMS"], "skill": "launcher", - "ammo": "40mm", + "ammo": "40x46mm", "weight": 2267, "volume": "1250 ml", "bashing": 12, diff --git a/Kenan-BrightNights-Modpack/oa_early_game_mutations_mod-master/overmap_specials.json b/Kenan-BrightNights-Modpack/oa_early_game_mutations_mod-master/overmap_specials.json index e56f52fc9..3ca546e3f 100644 --- a/Kenan-BrightNights-Modpack/oa_early_game_mutations_mod-master/overmap_specials.json +++ b/Kenan-BrightNights-Modpack/oa_early_game_mutations_mod-master/overmap_specials.json @@ -10,10 +10,10 @@ {"point": [0,-1,0], "terrain": "road"} ], "locations": ["wilderness"], "//": "what special locations does it spawn", - "city_distance": [0,2], "//": "how far from a city it should be", - "city_sizes": [0,20], "//": "what city sizes should it spawn in", - "occurrences": [0,3], "//": "how many per overmap", - "rotate": true, "//": "allow rotation", + "city_distance": [0,2], "//1": "how far from a city it should be", + "city_sizes": [0,20], "//2": "what city sizes should it spawn in", + "occurrences": [0,3], "//3": "how many per overmap", + "rotate": true, "//4": "allow rotation", "flags": ["CLASSIC"] } ] diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Items/secro_guns.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Items/secro_guns.json index 8cc228bfc..72beb3f6a 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Items/secro_guns.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Items/secro_guns.json @@ -263,7 +263,7 @@ "weight": 6240, "volume": "2500 ml", "price": 2144000, - "//": "Didn't see a price for this.", + "//1": "Didn't see a price for this.", "to_hit": -1, "bashing": 12, "ups_charges": 120, @@ -275,7 +275,7 @@ "durability": 8, "reload": 400, "modes": [["DEFAULT", "auto", 80]], - "//": "4000 to 8000 RPM", + "//2": "4000 to 8000 RPM", "built_in_mods": ["bipod"], "valid_mod_locations": [["accessories", 4]], "magazines": [ diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic.json index c9c4233a7..00c3c38f4 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic.json @@ -1,7 +1,7 @@ [ { "//": "Every spell that a monster casts are explained here. There's no way of telling you the description in-game, and here we are, reading infos about 'em at this file!", - "//": "Since monsters can only have one spell in their special attacks (and idk if this is intentional to the devs), I tend to combine them... Combo (combination) spell and a regular one, casted in an instance!", + "//1": "Since monsters can only have one spell in their special attacks (and idk if this is intentional to the devs), I tend to combine them... Combo (combination) spell and a regular one, casted in an instance!", "id": "sacrifice_spell", "type": "SPELL", "name": "Sacrifice", @@ -12,7 +12,7 @@ "effect_str": "secro_sacrifice_effect", "min_damage": 100000000, "max_damage": 100000000, - "//": "There's a bug in which self-damaging spells are being 'reflected', so we'll use a damaging effect to apply to the caster (the effect requires a turn to apply the damage, and it's a bit unpleasant... but still a backup to prevent overcasting).", + "//2": "There's a bug in which self-damaging spells are being 'reflected', so we'll use a damaging effect to apply to the caster (the effect requires a turn to apply the damage, and it's a bit unpleasant... but still a backup to prevent overcasting).", "min_aoe": 1, "max_aoe": 1, "damage_type": "none" @@ -129,12 +129,12 @@ "flags": [ "SILENT" ], "valid_targets": [ "ground", "hostile" ], "effect": "target_attack", - "//": "Add an effect to spell. Monster won't cast a spell if it doesn't do anything to the target... I think?.", + "//1": "Add an effect to spell. Monster won't cast a spell if it doesn't do anything to the target... I think?.", "effect_str": "secro_magic_target", "min_range": 69, - "//": "As long as caster sees the target, it will cast (if its not on cooldown, ofc). Nice.", + "//2": "As long as caster sees the target, it will cast (if its not on cooldown, ofc). Nice.", "max_range": 69, - "//": "Nice.", + "//3": "Nice.", "min_duration": 1, "max_duration": 1 }, @@ -1103,7 +1103,7 @@ "description": "Target spell casted by a monster. If you're seeing this, then read this one instead:\n'Caster locks its line of sight onto the target, then casts the Spell(s).'", "extra_effects": [ { "//": "To successfully morph, it kills itself.", "id": "sacrifice_spell", "hit_self": true }, - { "//": "Then place the monster beside them.", "id": "mon_zombie_fake_poly_ichorus", "hit_self": true } + { "//1": "Then place the monster beside them.", "id": "mon_zombie_fake_poly_ichorus", "hit_self": true } ], "flags": [ "SILENT" ], "valid_targets": [ "ally", "hostile", "ground" ], @@ -2401,7 +2401,7 @@ "name": "Charge!", "description": "Spell casted by a monster. If you're seeing this, then read this one instead:\n'Caster gains momentum, increasing movement speed, hit chance and impact damage as it takes effect.'", "//": "Momentum's a short duration haste, accuracy and bonus bash damage. Max intensity after casting the spell.", - "//": "Momentum is also a unique stat modifier that differs to the type of charger.", + "//1": "Momentum is also a unique stat modifier that differs to the type of charger.", "flags": [ "SILENT" ], "valid_targets": [ "self" ], "effect": "projectile_attack", @@ -2410,7 +2410,7 @@ "max_aoe": 13, "min_duration": 100, "max_duration": 100, - "//": "Use field to stun DIRECTLY the PLAYER.", + "//2": "Use field to stun DIRECTLY the PLAYER.", "field_id": "fd_charger_stun", "min_field_intensity": 1, "max_field_intensity": 1 @@ -3517,7 +3517,7 @@ "max_aoe": 50, "//": "The reach of this spell is close to the reality bubble, incase of veinhole dies because of something else.", "base_casting_time": -1, - "//": "That being said, the spell is casted by you, and it's a bit unstable (like warnings about casting a spell while you are hurt)." + "//1": "That being said, the spell is casted by you, and it's a bit unstable (like warnings about casting a spell while you are hurt)." }, { "id": "mon_sflesh_sack_hatch", diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic_trans.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic_trans.json index 95bd921cf..a1bd9723c 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic_trans.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_magic_trans.json @@ -111,7 +111,7 @@ }, { "//": "Note that we are replacing the target, and in this process, we'll need to kill them... then they'll drop their loots (corpse included). There's no spell to prevent that, so flesh variants have special flag that absorbs items (which then clears dropped items immediately after the infection).", - "//": "This will convert normal (or has a minor ability/characteristics such as swimmer) zombies into a regular flesh zombie.", + "//1": "This will convert normal (or has a minor ability/characteristics such as swimmer) zombies into a regular flesh zombie.", "id": "mon_flesh_infect_zombie", "type": "SPELL", "name": "Infect", diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_monitem.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_monitem.json index 778a7c41f..0de713f88 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_monitem.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/-Essentials/secro_monitem.json @@ -45,7 +45,7 @@ }, { "//": "Eating this vile meat mends your body, even broken limbs! (not head and torso, ofc).", - "//": "Also has the effect of royal jelly, which cures most debuffs.", + "//1": "Also has the effect of royal jelly, which cures most debuffs.", "id": "sflesh_bio", "copy-from": "flesh", "type": "COMESTIBLE", diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Saddler.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Saddler.json index 90887cd43..066f32dda 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Saddler.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Saddler.json @@ -215,7 +215,7 @@ "color": "green", "aggression": 100, "morale": 100, - "//": "+4 melee skill for the living, +2 for zed.", + "//1": "+4 melee skill for the living, +2 for zed.", "melee_skill": 6, "melee_dice": 1, "melee_dice_sides": 6, @@ -225,7 +225,7 @@ "armor_cut": 2, "armor_stab": 4, "special_attacks": [ { "type": "bite", "cooldown": 25 }, [ "GRAB", 40 ], [ "scratch", 32 ], [ "PARROT", 22 ] ], - "//": "The saddler detaches from the host after its death.", + "//2": "The saddler detaches from the host after its death.", "death_drops": { "subtype": "collection", "groups": [ "default_zombie_death_drops", "mon_insect_saddler_death_drop" ] }, "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "BONES", "FILTHY", "GRABS" ] diff --git a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Worms.json b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Worms.json index 2b4dc5c23..75a7d61dc 100644 --- a/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Worms.json +++ b/Kenan-BrightNights-Modpack/secronom/Modification Files/Monsters/Insects/Worms.json @@ -56,7 +56,7 @@ "harvest": "zombie", "hp": 525, "speed": 30, - "//": "Super slow", + "//1": "Super slow", "material": ["flesh"], "symbol": "⚕", "color": "red", diff --git a/Kenan-BrightNights-Modpack/target_marking/spell.json b/Kenan-BrightNights-Modpack/target_marking/spell.json index 329d99224..c9ccbe847 100644 --- a/Kenan-BrightNights-Modpack/target_marking/spell.json +++ b/Kenan-BrightNights-Modpack/target_marking/spell.json @@ -16,7 +16,7 @@ "effect_str": "mon_target", "energy_source": "MANA", "base_energy_cost": 1, - "//": "one turn", + "//1": "one turn", "base_casting_time": 100, "min_range": 5, "max_range": 600, diff --git a/Kenan-BrightNights-Modpack/trailerparkmod-master/bandits/npc.json b/Kenan-BrightNights-Modpack/trailerparkmod-master/bandits/npc.json index 013e879bf..5a15e2ac0 100644 --- a/Kenan-BrightNights-Modpack/trailerparkmod-master/bandits/npc.json +++ b/Kenan-BrightNights-Modpack/trailerparkmod-master/bandits/npc.json @@ -4,19 +4,19 @@ "id" : "militia_warrior", "name_suffix" : "Militia Berzerker", "//" : "Class is based on the enum in npc.h. The important ones are 0=NC_NONE, 2=NC_SHOPKEEP,", - "//" : "3=NC_HACKER, 4=NC_DOCTOR, 5=NC_TRADER, 6=NC_NINJA, 7=NC_COWBOY, 8=NC_SCIENTIST,", - "//" : "9=NC_BOUNTY_HUNTER, 10=NC_THUG, 11=NC_SCAVENGER, 13=NC_HUNTER, 14=NC_SOLDIER.", + "//1" : "3=NC_HACKER, 4=NC_DOCTOR, 5=NC_TRADER, 6=NC_NINJA, 7=NC_COWBOY, 8=NC_SCIENTIST,", + "//2" : "9=NC_BOUNTY_HUNTER, 10=NC_THUG, 11=NC_SCAVENGER, 13=NC_HUNTER, 14=NC_SOLDIER.", "class" : "NC_BERZERKER", - "//" : "Attitude is based on the enum in npc.h. The important ones are 0=NPCATT_NULL, 1=NPCATT_TALK", - "//" : "3=NPCATT_FOLLOW, 7=NPCATT_DEFEND, 10=NPCATT_KILL, and 11=NPCATT_FLEE", + "//3" : "Attitude is based on the enum in npc.h. The important ones are 0=NPCATT_NULL, 1=NPCATT_TALK", + "//4" : "3=NPCATT_FOLLOW, 7=NPCATT_DEFEND, 10=NPCATT_KILL, and 11=NPCATT_FLEE", "attitude" : 10, - "//" : "Mission is based on the enum in npc.h. The important ones are 0=NPC_MISSION_NUL, 3=NPC_MISSION_SHOPKEEP", - "//" : "and 7=NPC_MISSION_GUARD", + "//5" : "Mission is based on the enum in npc.h. The important ones are 0=NPC_MISSION_NUL, 3=NPC_MISSION_SHOPKEEP", + "//6" : "and 7=NPC_MISSION_GUARD", "mission" : 0, - "//" : "Mission_offered is based on the enum mission_id in mission.h. 0=MISSION_NULL", + "//7" : "Mission_offered is based on the enum mission_id in mission.h. 0=MISSION_NULL", "chat" : "TALK_MUG", "faction" : "corrupt_militia", - "//" : "by_mood is hostile to faction when angry, otherwise neutral", + "//8" : "by_mood is hostile to faction when angry, otherwise neutral", "by_mood" : ["nether","wildlife","zombie"] }, { diff --git a/Kenan-BrightNights-Modpack/trailerparkmod-master/overmap_specials.json b/Kenan-BrightNights-Modpack/trailerparkmod-master/overmap_specials.json index 8d9b84807..3d5d2feab 100644 --- a/Kenan-BrightNights-Modpack/trailerparkmod-master/overmap_specials.json +++ b/Kenan-BrightNights-Modpack/trailerparkmod-master/overmap_specials.json @@ -9,9 +9,9 @@ { "point": [ 0, 0, -1 ], "overmap": "trailerpark_under_north" } ], "locations" : [ "wilderness" ], "//":"what special locations does it spawn", - "city_distance" : [1, 15], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [0, 0], "//":"how many per overmap" + "city_distance" : [1, 15], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [0, 0], "//3":"how many per overmap" }, { "type" : "overmap_special", @@ -23,8 +23,8 @@ { "point": [ 0, 0, -1 ], "overmap": "trailerpark_under_north" } ], "locations" : [ "wilderness" ], "//":"what special locations does it spawn", - "city_distance" : [1, 15], "//":"how far from a city it should be", - "city_sizes" : [4, 12], "//":"what city sizes should it spawn in", - "occurrences" : [1, 10], "//":"how many per overmap" + "city_distance" : [1, 15], "//1":"how far from a city it should be", + "city_sizes" : [4, 12], "//2":"what city sizes should it spawn in", + "occurrences" : [1, 10], "//3":"how many per overmap" } ] diff --git a/Kenan-BrightNights-Modpack/trailerparkmod-master/trailerpark1.json b/Kenan-BrightNights-Modpack/trailerparkmod-master/trailerpark1.json index c790e3b59..0e7a5e016 100644 --- a/Kenan-BrightNights-Modpack/trailerparkmod-master/trailerpark1.json +++ b/Kenan-BrightNights-Modpack/trailerparkmod-master/trailerpark1.json @@ -47,7 +47,7 @@ "rotation": [0,90,180,270], "status": -1, "vehicle": "tp_vehicles_driveway", - "//": "on pathway", + "//1": "on pathway", "x": 3, "y": 15 }, @@ -58,7 +58,7 @@ "rotation": [ 180 ], "status": -1, "vehicle": "tp_vehicles_fullmix", - "//": "right of pathway", + "//1": "right of pathway", "x": 15, "y": 16 }