Skip to content

Commit 35e75ca

Browse files
Kenan2000Kenan2000
committed
Update Cata++ thanks to CV's, Meelock's work
1 parent 1639faa commit 35e75ca

File tree

11 files changed

+459
-57
lines changed

11 files changed

+459
-57
lines changed

‎Kenan-Modpack/nocts_cata_mod_DDA/Char_creation/c_classes_bw.json‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"bio_str_enhancer",
165165
"bio_adrenaline",
166166
"bio_carbon",
167-
"bio_scent_vision",
167+
"bio_hazard_shield",
168168
"bio_ears",
169169
"bio_cqb",
170170
"bio_claws",
@@ -183,7 +183,7 @@
183183
"bio_power_storage_mkII",
184184
"bio_power_storage_mkII"
185185
],
186-
"items": { "both": [ "badge_bio_weapon", "subsuit_xl", "footrags" ], "male": [ "briefs" ], "female": [ "bra", "panties" ] },
186+
"items": { "both": [ "badge_bio_weapon", "subsuit_xl" ], "male": [ "briefs" ], "female": [ "bra", "panties" ] },
187187
"flags": [ "SCEN_ONLY" ]
188188
},
189189
{
@@ -223,7 +223,7 @@
223223
"bio_atomic_battery",
224224
"bio_int_enhancer",
225225
"bio_eye_enhancer",
226-
"bio_eye_optic",
226+
"bio_animal_empathy",
227227
"bio_night_vision",
228228
"bio_targeting",
229229
"bio_tools",
@@ -333,7 +333,7 @@
333333
"bio_int_enhancer",
334334
"bio_carbon",
335335
"bio_chain_lightning",
336-
"bio_emp",
336+
"bio_emp_armgun",
337337
"bio_magnet",
338338
"bio_nanobots",
339339
"bio_painkiller",
@@ -344,7 +344,7 @@
344344
"bio_railgun",
345345
"bio_remote",
346346
"bio_resonator",
347-
"bio_shock",
347+
"bio_cutting_torch",
348348
"bio_batteries",
349349
"bio_cable",
350350
"bio_tools",
@@ -401,8 +401,18 @@
401401
],
402402
"items": {
403403
"both": {
404-
"items": [ "helmet_liner", "thermal_shirt", "gloves_liner", "under_armor_shorts", "socks", "mil_armor", "molle_pack" ],
404+
"items": [
405+
"helmet_liner",
406+
"thermal_shirt",
407+
"gloves_liner",
408+
"under_armor_shorts",
409+
"socks",
410+
"mil_armor",
411+
"mil_helm",
412+
"molle_pack"
413+
],
405414
"entries": [
415+
{ "group": "charged_two_way_radio" },
406416
{ "item": "arc_laser_rifle", "ammo-item": "battery", "charges": 5000, "contents-item": "shoulder_strap" },
407417
{ "item": "knife_combat", "container-item": "sheath" },
408418
{ "item": "neo_laser_pistol_ups", "container-item": "XL_holster" }
@@ -456,6 +466,7 @@
456466
"under_armor_shorts",
457467
"socks",
458468
"lmil_armor",
469+
"lmil_helm",
459470
"rucksack",
460471
"dump_pouch",
461472
"2lcanteen",
@@ -467,6 +478,7 @@
467478
"rollmat"
468479
],
469480
"entries": [
481+
{ "group": "charged_two_way_radio" },
470482
{ "item": "mx_laser_sniper", "ammo-item": "battery", "charges": 5000, "contents-item": "shoulder_strap" },
471483
{ "item": "neo_laser_pistol_ups", "container-item": "XL_holster" },
472484
{ "item": "knife_combat", "container-item": "sheath" }
@@ -519,11 +531,13 @@
519531
"under_armor_shorts",
520532
"socks",
521533
"lmil_armor",
534+
"lmil_helm",
522535
"molle_pack",
523536
"id_science",
524537
"chemistry_set"
525538
],
526539
"entries": [
540+
{ "group": "charged_two_way_radio" },
527541
{ "item": "akro_laser_smg", "ammo-item": "battery", "charges": 1000, "contents-item": "shoulder_strap" },
528542
{ "item": "knife_combat", "container-item": "sheath" },
529543
{ "item": "neo_laser_pistol_ups", "container-item": "XL_holster" }
@@ -572,8 +586,9 @@
572586
],
573587
"items": {
574588
"both": {
575-
"items": [ "helmet_liner", "thermal_shirt", "gloves_liner", "under_armor_shorts", "socks", "hmil_armor" ],
589+
"items": [ "helmet_liner", "thermal_shirt", "gloves_liner", "under_armor_shorts", "socks", "hmil_armor", "hmil_helm" ],
576590
"entries": [
591+
{ "group": "charged_two_way_radio" },
577592
{ "item": "krx_laser_lmg", "ammo-item": "battery", "charges": 10000, "contents-item": "shoulder_strap" },
578593
{ "item": "knife_combat", "container-item": "sheath" }
579594
]

‎Kenan-Modpack/nocts_cata_mod_DDA/Char_creation/c_scenarios.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"type": "scenario",
44
"name": "Bio-Weapon Lab",
55
"description": "You woke up, where are you? Who are you? What are you?! That doesn't matter right now... you have a bad feeling...",
6-
"flags": [ "LONE_START", "SUR_START", "SUM_START" ],
6+
"flags": [ "LONE_START", "SUR_START" ],
7+
"custom_initial_date": { "season": "summer" },
78
"id": "bio_weapon_lab",
89
"points": 0,
910
"start_name": "Bio-Weapon Lab",
@@ -33,7 +34,8 @@
3334
"type": "scenario",
3435
"name": "Mycus B.W.M.D",
3536
"description": "After mycus assimilation was successful, our local system was instructed to claim more territory for the mycus. Hostile organisms are near, proceed with caution.",
36-
"flags": [ "LONE_START", "SUR_START", "AUT_START" ],
37+
"flags": [ "LONE_START", "SUR_START" ],
38+
"custom_initial_date": { "season": "autumn" },
3739
"id": "mycus_bwmd",
3840
"points": 2,
3941
"start_name": "Fungal Territory",

‎Kenan-Modpack/nocts_cata_mod_DDA/Monsters/c_monster_drops.json‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"entries": [
7474
{ "group": "mon_zombie_bio_common" },
7575
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
76+
{ "item": "mil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
7677
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
7778
{
7879
"distribution": [
@@ -94,6 +95,7 @@
9495
"entries": [
9596
{ "group": "mon_zombie_bio_common" },
9697
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
98+
{ "item": "mil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
9799
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
98100
{
99101
"distribution": [
@@ -115,6 +117,7 @@
115117
"entries": [
116118
{ "group": "mon_zombie_bio_common" },
117119
{ "item": "lmil_armor", "damage": [ 1, 4 ], "prob": 75 },
120+
{ "item": "lmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
118121
{ "item": "rucksack", "damage": [ 1, 4 ], "prob": 50 },
119122
{ "item": "dump_pouch", "damage": [ 1, 4 ], "prob": 50 },
120123
{
@@ -140,7 +143,8 @@
140143
"ammo": 100,
141144
"entries": [
142145
{ "group": "mon_zombie_bio_common" },
143-
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
146+
{ "item": "hmil_armor", "damage": [ 1, 4 ], "prob": 75 },
147+
{ "item": "hmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
144148
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
145149
{ "item": "dump_pouch", "damage": [ 1, 4 ], "prob": 50 },
146150
{
@@ -162,7 +166,8 @@
162166
"ammo": 100,
163167
"entries": [
164168
{ "group": "mon_zombie_bio_common" },
165-
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
169+
{ "item": "hmil_armor", "damage": [ 1, 4 ], "prob": 75 },
170+
{ "item": "hmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
166171
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
167172
{ "item": "dump_pouch", "damage": [ 1, 4 ], "prob": 50 },
168173
{
@@ -185,6 +190,7 @@
185190
"entries": [
186191
{ "group": "mon_zombie_bio_common" },
187192
{ "item": "lmil_armor", "damage": [ 1, 4 ], "prob": 75 },
193+
{ "item": "lmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
188194
{ "item": "molle_pack", "damage": [ 1, 4 ], "prob": 50 },
189195
{
190196
"distribution": [
@@ -212,6 +218,7 @@
212218
"entries": [
213219
{ "group": "mon_zombie_bio_common" },
214220
{ "item": "lmil_armor", "damage": [ 1, 4 ], "prob": 75 },
221+
{ "item": "lmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
215222
{ "item": "molle_pack", "damage": [ 1, 4 ], "prob": 50 },
216223
{
217224
"distribution": [
@@ -283,14 +290,16 @@
283290
{
284291
"collection": [
285292
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
293+
{ "item": "mil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
286294
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
287295
{ "item": "medium_atomic_battery_cell", "damage": [ 0, 1 ], "charges": [ 0, 5000 ], "prob": 20 }
288296
],
289297
"prob": 40
290298
},
291299
{
292300
"collection": [
293-
{ "item": "mil_armor", "damage": [ 1, 4 ], "prob": 75 },
301+
{ "item": "hmil_armor", "damage": [ 1, 4 ], "prob": 75 },
302+
{ "item": "hmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
294303
{ "item": "vest", "damage": [ 1, 4 ], "prob": 50 },
295304
{ "item": "dump_pouch", "damage": [ 1, 4 ], "prob": 50 },
296305
{
@@ -306,6 +315,7 @@
306315
{
307316
"collection": [
308317
{ "item": "lmil_armor", "damage": [ 1, 4 ], "prob": 75 },
318+
{ "item": "lmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
309319
{ "item": "rucksack", "damage": [ 1, 4 ], "prob": 50 },
310320
{ "item": "dump_pouch", "damage": [ 1, 4 ], "prob": 50 },
311321
{ "item": "medium_atomic_battery_cell", "damage": [ 0, 1 ], "charges": [ 0, 5000 ], "prob": 20 },
@@ -319,6 +329,7 @@
319329
{
320330
"collection": [
321331
{ "item": "lmil_armor", "damage": [ 1, 4 ], "prob": 75 },
332+
{ "item": "lmil_helm", "damage": [ 1, 4 ], "prob": 75, "charges": [ 0, 100 ] },
322333
{ "item": "molle_pack", "damage": [ 1, 4 ], "prob": 50 },
323334
{
324335
"distribution": [

‎Kenan-Modpack/nocts_cata_mod_DDA/Npc/NC_PREPPERS.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"subtype": "collection",
8484
"entries": [
8585
{ "item": "lmil_armor" },
86-
{ "item": "mask_lsurvivor", "prob": 50 },
86+
{ "item": "lmil_helm", "prob": 50 },
8787
{
8888
"distribution": [
8989
{ "item": "backpack", "prob": 30 },

‎Kenan-Modpack/nocts_cata_mod_DDA/Npc/NC_SUPER_SOLDIERS.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
{ "item": "under_armor_shorts" },
1212
{ "item": "socks" },
1313
{
14-
"distribution": [ { "item": "lmil_armor", "prob": 40 }, { "item": "mil_armor", "prob": 50 }, { "item": "hmil_armor", "prob": 10 } ]
14+
"distribution": [
15+
{ "collection": [ { "item": "lmil_armor" }, { "item": "lmil_helm", "prob": 75 } ], "prob": 40 },
16+
{ "collection": [ { "item": "mil_armor" }, { "item": "mil_helm", "prob": 75 } ], "prob": 50 },
17+
{ "collection": [ { "item": "hmil_armor" }, { "item": "hmil_helm", "prob": 75 } ], "prob": 10 }
18+
]
1519
},
1620
{ "item": "molle_pack" },
1721
{ "item": "vest", "prob": 50 },

‎Kenan-Modpack/nocts_cata_mod_DDA/Recipe/c_recipes.json‎

Lines changed: 66 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@
20462046
"skill_used": "fabrication",
20472047
"difficulty": 5,
20482048
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
2049-
"components": [ [ [ "rag", 20 ] ], [ [ "kevlar_plate", 10 ] ], [ [ "alloy_plate", 2 ] ], [ [ "alloy_sheet", 6 ] ] ]
2049+
"components": [ [ [ "rag", 18 ] ], [ [ "kevlar_plate", 9 ] ], [ [ "alloy_plate", 2 ] ], [ [ "alloy_sheet", 3 ] ] ]
20502050
},
20512051
{
20522052
"result": "mil_armor",
@@ -2057,22 +2057,58 @@
20572057
"difficulty": 6,
20582058
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
20592059
"components": [
2060-
[ [ "leather", 20 ] ],
2061-
[ [ "kevlar_plate", 15 ] ],
2062-
[ [ "alloy_plate", 4 ] ],
2063-
[ [ "alloy_sheet", 4 ] ],
2064-
[ [ "hard_steel_armor", 2 ] ]
2060+
[ [ "leather", 18 ] ],
2061+
[ [ "kevlar_plate", 12 ] ],
2062+
[ [ "alloy_plate", 3 ] ],
2063+
[ [ "alloy_sheet", 1 ] ],
2064+
[ [ "hard_steel_armor", 1 ] ]
20652065
]
20662066
},
20672067
{
2068-
"result": "mil_armor",
2068+
"result": "hmil_armor",
20692069
"type": "uncraft",
20702070
"activity_level": "LIGHT_EXERCISE",
20712071
"time": "30 m",
20722072
"skill_used": "fabrication",
20732073
"difficulty": 7,
20742074
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
2075-
"components": [ [ [ "kevlar_plate", 50 ] ], [ [ "alloy_plate", 8 ] ], [ [ "hard_steel_armor", 4 ] ] ]
2075+
"components": [ [ [ "kevlar_plate", 45 ] ], [ [ "alloy_plate", 6 ] ], [ [ "hard_steel_armor", 3 ] ] ]
2076+
},
2077+
{
2078+
"result": "lmil_helm",
2079+
"type": "uncraft",
2080+
"activity_level": "LIGHT_EXERCISE",
2081+
"time": "10 m",
2082+
"skill_used": "fabrication",
2083+
"difficulty": 5,
2084+
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
2085+
"components": [ [ [ "rag", 2 ] ], [ [ "kevlar_plate", 1 ] ], [ [ "alloy_sheet", 3 ] ] ]
2086+
},
2087+
{
2088+
"result": "mil_helm",
2089+
"type": "uncraft",
2090+
"activity_level": "LIGHT_EXERCISE",
2091+
"time": "10 m",
2092+
"skill_used": "fabrication",
2093+
"difficulty": 6,
2094+
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
2095+
"components": [
2096+
[ [ "leather", 2 ] ],
2097+
[ [ "kevlar_plate", 3 ] ],
2098+
[ [ "alloy_plate", 1 ] ],
2099+
[ [ "alloy_sheet", 2 ] ],
2100+
[ [ "hard_steel_armor", 1 ] ]
2101+
]
2102+
},
2103+
{
2104+
"result": "hmil_helm",
2105+
"type": "uncraft",
2106+
"activity_level": "LIGHT_EXERCISE",
2107+
"time": "10 m",
2108+
"skill_used": "fabrication",
2109+
"difficulty": 7,
2110+
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
2111+
"components": [ [ [ "kevlar_plate", 5 ] ], [ [ "alloy_plate", 2 ] ], [ [ "hard_steel_armor", 1 ] ] ]
20762112
},
20772113
{
20782114
"result": "flamethrower_surv",
@@ -2309,7 +2345,13 @@
23092345
"skills_required": [ [ "mechanics", 4 ], [ "firstaid", 4 ] ],
23102346
"difficulty": 6,
23112347
"time": "3 h",
2312-
"book_learn": [ [ "recipe_augs", 7 ], [ "recipe_mil_augs", 7 ], [ "recipe_lab_elec", 6 ] ],
2348+
"book_learn": [
2349+
[ "textbook_fabrication", 7 ],
2350+
[ "textbook_mechanics", 7 ],
2351+
[ "recipe_augs", 6 ],
2352+
[ "recipe_mil_augs", 6 ],
2353+
[ "recipe_lab_elec", 5 ]
2354+
],
23132355
"using": [ [ "welding_standard", 50 ] ],
23142356
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "WRENCH", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
23152357
"components": [
@@ -2322,6 +2364,21 @@
23222364
[ [ "thermometer", 1 ] ]
23232365
]
23242366
},
2367+
{
2368+
"type": "recipe",
2369+
"result": "pouch_autoclave",
2370+
"activity_level": "LIGHT_EXERCISE",
2371+
"category": "CC_OTHER",
2372+
"subcategory": "CSC_OTHER_MEDICAL",
2373+
"skill_used": "fabrication",
2374+
"skills_required": [ [ "firstaid", 5 ] ],
2375+
"difficulty": 5,
2376+
"time": "30 m",
2377+
"batch_time_factors": [ 20, 5 ],
2378+
"book_learn": [ [ "textbook_fabrication", 6 ], [ "recipe_augs", 5 ], [ "recipe_mil_augs", 5 ], [ "recipe_lab_elec", 4 ] ],
2379+
"tools": [ [ [ "vac_sealer", 15 ], [ "makeshift_sealer", 30 ] ] ],
2380+
"components": [ [ [ "bag_plastic", 1 ] ], [ [ "paper", 2 ] ] ]
2381+
},
23252382
{
23262383
"type": "recipe",
23272384
"result": "iv_mutagen_super_soldier",

0 commit comments

Comments
 (0)