Skip to content

Commit

Permalink
JSON comments rework (#17)
Browse files Browse the repository at this point in the history
* Major and minor fixes and changes in various mods

BL9 worldgen locations: since those are still unused and are part of future "secret expansion" I've changed their weight generation to zero so they don't spam into debug log every time.

Engineering Essentials: removed unnecessary separator in plasma_slug relatives; this one is critical.
Made little change for electric pump mod: removed it's acceptability for airspeargun, since this thing is for underwater use and shouldn't be used with electrical things (and it doesn't have mechanism slots anyway)

Fuji Structures: added zero weight generation for house template for it not to shown up in debug log.

Modern Weapon Pack: removed  .38 ammo type from compatible ammo list for automag. This is leftover from previous Issue #6 which I will close now.

PK's Rebalancing: replaced BFG field type effect from fd_rubble to fd_plasma since fd_rubble is obsolete since Cataclysm-BN release 1101, and it's more fitting for the BFG!
Also removed launchers from mod targets for underbarrel bomblet launcher, because there are no slots, and you probably shouldn't attach launcher onto your launcher.

* Update _house_template.json

* Revert "Merge branch 'master' of https://github.com/CV514/Bright-Nights-Kenan-Mod-Pack"

This reverts commit 72d9ab5, reversing
changes made to 4db38ae.

* Revert "Revert "Merge branch 'master' of https://github.com/CV514/Bright-Nights-Kenan-Mod-Pack""

This reverts commit 61428d8.

* Gunslinger Mod starting profession fix

S&W 629 tried to be loaded with .45 ACP instead of something of .44 and produced error on selecting Bionic Gunslinger profession.

* Salvaged Robots functionality update

Merged mechanics of Automations mod, marking it as depreciated.

* JSON formatting for SRFU

* Minor typo tweak

* README.md update

Formatting and adding some additional info

* Update README.md

* Engineering Essentials and AWDDA fixes

Gyrocopter BN adaptation and removing used chalice as obsolete item.

* Small lint, newline

* JSON comments rework

Co-authored-by: Kenan Mamedov <43505148+Kenan2000@users.noreply.github.com>
  • Loading branch information
vorpal-void and Kenan2000 authored Jan 27, 2021
1 parent 6522fda commit 86fdb6f
Show file tree
Hide file tree
Showing 43 changed files with 334 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"BOLTCUTTERS",
"GEIGER",
"HAMMER",
"PICK_LOCK",
"picklock",
"HOTPLATE",
"SIPHON",
{ "type": "firestarter", "moves": 5 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Kenan-BrightNights-Modpack/Aftershock/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[",
Expand Down
2 changes: 1 addition & 1 deletion Kenan-BrightNights-Modpack/BioCo-master/items/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down
4 changes: 2 additions & 2 deletions Kenan-BrightNights-Modpack/DracoDogMod/dog_monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
{
Expand Down Expand Up @@ -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" ]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] }
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" ]
},
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": "=",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions Kenan-BrightNights-Modpack/ETC_handguns_etc/items/gun/762ec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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" ] ] ]
},
{
Expand All @@ -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,
Expand All @@ -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 ] ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit 86fdb6f

Please sign in to comment.