Skip to content

Commit fc3301e

Browse files
Standing-StormStanding-Storm
committed
Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-DDA into changeling-power
2 parents c9b4c4d + 782e73c commit fc3301e

File tree

33 files changed

+746
-405
lines changed

33 files changed

+746
-405
lines changed

‎data/json/effects.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5071,8 +5071,8 @@
50715071
"name": [ "Drank blood" ],
50725072
"desc": [ "The star vampire has drunk blood and is now visible." ],
50735073
"rating": "good",
5074-
"removes_effects": [ "invisibility" ],
5075-
"show_in_info": true
5074+
"show_in_info": true,
5075+
"flags": [ "SUPPRESS_INVISIBILITY" ]
50765076
},
50775077
{
50785078
"id": "star_vampire_blood_drink_feral",

‎data/json/effects_on_condition/misc_effect_on_condition.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
"u_add_morale": "morale_bile",
305305
"bonus": { "math": [ "MORALE_MULTIPLIER" ] },
306306
"max_bonus": { "math": [ "MORALE_MULTIPLIER * 2" ] },
307-
"duration": { "global_val": "BILE_STINK_DURATION / 2" },
307+
"duration": { "math": [ "BILE_STINK_DURATION / 2" ] },
308308
"decay_start": { "math": [ "BILE_STINK_DURATION / 4" ] }
309309
}
310310
]

‎data/json/itemgroups/Locations_MapExtras/locations.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,8 @@
15131513
{ "item": "claw_bar", "prob": 3 },
15141514
{ "item": "crowbar", "prob": 18 },
15151515
{ "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
1516-
{ "item": "software_hacking", "prob": 10 },
1516+
{ "group": "charged_laptop", "contents-item": "software_hacking", "prob": 10 },
1517+
{ "group": "charged_laptop", "contents-group": "efiles_contraband", "prob": 20 },
15171518
{ "item": "spray_can", "prob": 50, "charges": [ 0, 10 ] },
15181519
{ "item": "lsd", "prob": 2, "count": [ 1, 5 ] },
15191520
{ "item": "pocketwatch", "prob": 5 },

‎data/json/items/resources/metal.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@
13501350
"name": { "str_sp": "aluminum bar stock" },
13511351
"description": "A round bar of aluminum. Ready to be turned on the lathe.",
13521352
"//": "Bar is 5cm in diameter.",
1353-
"weight": "2538 mg",
1353+
"weight": "253800 mg",
13541354
"volume": "94 ml",
13551355
"longest_side": "5 cm",
13561356
"price": "2 USD",
@@ -1368,7 +1368,7 @@
13681368
"name": { "str_sp": "small aluminum bar stock" },
13691369
"description": "A small round bar of aluminum. Ready to be turned on the lathe.",
13701370
"//": "Bar is 3cm in diameter.",
1371-
"weight": "945 mg",
1371+
"weight": "94500 mg",
13721372
"volume": "35 ml",
13731373
"longest_side": "5 cm",
13741374
"price": "1 USD",

‎data/json/monster_special_attacks/spells.json‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,20 +1119,6 @@
11191119
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ],
11201120
"effect_str": "nausea"
11211121
},
1122-
{
1123-
"type": "SPELL",
1124-
"id": "star_vampire_invisibility_spell",
1125-
"name": { "str": "star vampire invisibility", "//~": "NO_I18N" },
1126-
"description": { "str": "Makes the star vampire invisible", "//~": "NO_I18N" },
1127-
"valid_targets": [ "self" ],
1128-
"effect": "attack",
1129-
"effect_str": "invisibility",
1130-
"shape": "blast",
1131-
"message": "",
1132-
"min_duration": 99999999999,
1133-
"max_duration": 99999999999,
1134-
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ]
1135-
},
11361122
{
11371123
"type": "SPELL",
11381124
"id": "sloth_attack",

‎data/json/monsters/insect_spider.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@
23702370
"weakpoints": [ { "id": "abdomen", "name": "the abdomen", "coverage": 30 } ],
23712371
"vision_night": 8,
23722372
"zombify_into": "mon_meat_cocoon_tiny",
2373-
"delete": { "weakpoints": [ { "id": "stinger" } ], "flags": [ "FLIES" ], "special_attacks": [ "DERMATIK" ] }
2373+
"delete": { "weakpoints": [ { "id": "stinger" } ], "flags": [ "FLIES" ], "special_attacks": [ "dermatik_impale" ] }
23742374
},
23752375
{
23762376
"id": "mon_dermatik_incubator_deer",

‎data/json/monsters/nether.json‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -690,15 +690,6 @@
690690
"miss_msg_npc": "%1$s tries to fasten onto <npcname>, but they dodge!",
691691
"no_dmg_msg_u": "%1$s tries to fasten onto your %2$s, but can't penetrate your armor.",
692692
"no_dmg_msg_npc": "%1$s tries to fasten onto <npcname>'s %2$s, but can't penetrate their armor."
693-
},
694-
{
695-
"id": "star_vampire_invisibility",
696-
"type": "spell",
697-
"spell_data": { "id": "star_vampire_invisibility_spell", "min_level": 3 },
698-
"cooldown": 1,
699-
"allow_no_target": true,
700-
"condition": { "or": [ { "not": { "u_has_effect": "invisibility" } }, { "not": { "u_has_effect": "star_vampire_blood_drank" } } ] },
701-
"monster_message": ""
702693
}
703694
],
704695
"bleed_rate": 40,
@@ -721,7 +712,8 @@
721712
"PLASTIC",
722713
"NO_BREATHE",
723714
"HARDTOSHOOT",
724-
"NOGIB"
715+
"NOGIB",
716+
"PERMANENT_INVISIBILITY"
725717
],
726718
"armor": { "bash": 8, "electric": 3 }
727719
},
@@ -886,15 +878,6 @@
886878
"miss_msg_npc": "%1$s tries to clutch onto you <npcname>, but they dodge!",
887879
"no_dmg_msg_u": "%1$s tries to clutch onto your %2$s, but can't penetrate your armor.",
888880
"no_dmg_msg_npc": "%1$s tries to clutch onto <npcname>'s %2$s, but can't penetrate their armor."
889-
},
890-
{
891-
"id": "star_vampire_invisibility",
892-
"type": "spell",
893-
"spell_data": { "id": "star_vampire_invisibility_spell", "min_level": 3 },
894-
"cooldown": 1,
895-
"allow_no_target": true,
896-
"condition": { "or": [ { "not": { "u_has_effect": "invisibility" } }, { "not": { "u_has_effect": "star_vampire_blood_drank" } } ] },
897-
"monster_message": ""
898881
}
899882
]
900883
},

‎data/json/monsters/zed_nomex.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"families": [ "prof_wp_syn_armored", "prof_wp_nat_armored" ],
3333
"flags": [ "ACIDPROOF", "FIREPROOF" ]
3434
},
35-
"delete": { "special_attacks": [ "bite_humanoid" ] }
35+
"delete": { "special_attacks": [ "bite" ] }
3636
},
3737
{
3838
"id": "mon_zombie_fireproof_grappler",

‎data/json/recipes/nested.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2572,6 +2572,18 @@
25722572
],
25732573
"difficulty": 5
25742574
},
2575+
{
2576+
"id": "nested_metal_bars",
2577+
"type": "nested_category",
2578+
"activity_level": "NO_EXERCISE",
2579+
"category": "CC_OTHER",
2580+
"subcategory": "CSC_OTHER_MATERIALS",
2581+
"name": "metal bars",
2582+
"description": "Recipes related to processing bar stock into smaller sizes.",
2583+
"skill_used": "fabrication",
2584+
"nested_category_data": [ "small_aluminum_bar_round", "small_lc_steel_bar_round", "small_mc_steel_bar_round", "small_hc_steel_bar_round" ],
2585+
"difficulty": 3
2586+
},
25752587
{
25762588
"id": "nested_lc_sabatons",
25772589
"type": "nested_category",

‎data/json/recipes/other/materials.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,6 +1398,66 @@
13981398
"tools": [ [ [ "boltcutters", -1 ], [ "pliers", -1 ], [ "toolset", -1 ], [ "multitool", -1 ] ] ],
13991399
"components": [ [ [ "wire_barbed", 1 ] ] ]
14001400
},
1401+
{
1402+
"result": "small_aluminum_bar_round",
1403+
"type": "recipe",
1404+
"activity_level": "NO_EXERCISE",
1405+
"category": "CC_*",
1406+
"subcategory": "CSC_*_NESTED",
1407+
"skill_used": "fabrication",
1408+
"difficulty": 3,
1409+
"autolearn": true,
1410+
"time": "30 m",
1411+
"tools": [ [ [ "fake_lathe", 30 ] ] ],
1412+
"components": [ [ [ "aluminum_bar_round", 1 ] ] ],
1413+
"byproducts": [ [ "scrap_aluminum", 3 ] ],
1414+
"proficiencies": [ { "proficiency": "prof_machining_basic" } ]
1415+
},
1416+
{
1417+
"result": "small_lc_steel_bar_round",
1418+
"type": "recipe",
1419+
"activity_level": "NO_EXERCISE",
1420+
"category": "CC_*",
1421+
"subcategory": "CSC_*_NESTED",
1422+
"skill_used": "fabrication",
1423+
"difficulty": 3,
1424+
"autolearn": true,
1425+
"time": "45 m",
1426+
"tools": [ [ [ "fake_lathe", 45 ] ] ],
1427+
"components": [ [ [ "lc_steel_bar_round", 1 ] ] ],
1428+
"byproducts": [ [ "scrap", 9 ] ],
1429+
"proficiencies": [ { "proficiency": "prof_machining_basic" } ]
1430+
},
1431+
{
1432+
"result": "small_mc_steel_bar_round",
1433+
"type": "recipe",
1434+
"activity_level": "NO_EXERCISE",
1435+
"category": "CC_*",
1436+
"subcategory": "CSC_*_NESTED",
1437+
"skill_used": "fabrication",
1438+
"difficulty": 3,
1439+
"autolearn": true,
1440+
"time": "50 m",
1441+
"tools": [ [ [ "fake_lathe", 50 ] ] ],
1442+
"components": [ [ [ "mc_steel_bar_round", 1 ] ] ],
1443+
"byproducts": [ [ "scrap", 9 ] ],
1444+
"proficiencies": [ { "proficiency": "prof_machining_basic" } ]
1445+
},
1446+
{
1447+
"result": "small_hc_steel_bar_round",
1448+
"type": "recipe",
1449+
"activity_level": "NO_EXERCISE",
1450+
"category": "CC_*",
1451+
"subcategory": "CSC_*_NESTED",
1452+
"skill_used": "fabrication",
1453+
"difficulty": 4,
1454+
"autolearn": true,
1455+
"time": "60 m",
1456+
"tools": [ [ [ "fake_lathe", 60 ] ] ],
1457+
"components": [ [ [ "hc_steel_bar_round", 1 ] ] ],
1458+
"byproducts": [ [ "scrap", 9 ] ],
1459+
"proficiencies": [ { "proficiency": "prof_machining_basic" } ]
1460+
},
14011461
{
14021462
"type": "recipe",
14031463
"activity_level": "LIGHT_EXERCISE",

0 commit comments

Comments
 (0)