Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aerin-of-the-Toast
Aerin-of-the-Toast committed Feb 19, 2022
2 parents 5b95c35 + 27ab2a5 commit 8f0b0d5
Show file tree
Hide file tree
Showing 130 changed files with 7,078 additions and 1,650 deletions.
82 changes: 82 additions & 0 deletions data/json/artifact/relic_procgen_data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,88 @@
{ "weight": 100, "item": "art_crescent" }
]
},
{
"type": "relic_procgen_data",
"id": "held_passive_bad",
"passive_add_procgen_values": [
{
"weight": 100,
"min_value": 1,
"max_value": 2,
"type": "STRENGTH",
"increment": 1,
"power_per_increment": 250,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": 1,
"max_value": 2,
"type": "DEXTERITY",
"increment": 1,
"power_per_increment": 250,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": 1,
"max_value": 2,
"type": "PERCEPTION",
"increment": 1,
"power_per_increment": 250,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": 1,
"max_value": 2,
"type": "INTELLIGENCE",
"increment": 1,
"power_per_increment": 250,
"ench_has": "HELD"
}
],
"passive_mult_procgen_values": [
{
"weight": 100,
"min_value": 0.4,
"max_value": 1,
"type": "THIRST",
"increment": 0.1,
"power_per_increment": -50,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": 0.5,
"max_value": 1,
"type": "HUNGER",
"increment": 0.1,
"power_per_increment": -100,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": -0.8,
"max_value": -0.3,
"type": "REGEN_HP",
"increment": 0.1,
"power_per_increment": 100,
"ench_has": "HELD"
},
{
"weight": 100,
"min_value": 0.3,
"max_value": 0.8,
"type": "FATIGUE",
"increment": 0.1,
"power_per_increment": -100,
"ench_has": "HELD"
}
],
"type_weights": [ { "weight": 100, "value": "passive_enchantment_mult" }, { "weight": 50, "value": "passive_enchantment_add" } ],
"items": [ { "weight": 100, "item": "monolith_disc" }, { "weight": 100, "item": "monolith_brick" } ]
},
{
"type": "relic_procgen_data",
"id": "altered_object",
Expand Down
86 changes: 84 additions & 2 deletions data/json/body_parts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@
"base_hp": 60,
"drench_capacity": 3,
"smash_message": "You smash the %s with your fist.",
"bionic_slots": 5
"bionic_slots": 5,
"sub_parts": [ "hand_wrist_l", "hand_palm_l", "hand_back_l", "hand_fingers_l" ]
},
{
"id": "hand_r",
Expand Down Expand Up @@ -235,7 +236,8 @@
"base_hp": 60,
"drench_capacity": 3,
"smash_message": "You smash the %s with your fist.",
"bionic_slots": 5
"bionic_slots": 5,
"sub_parts": [ "hand_wrist_r", "hand_palm_r", "hand_back_r", "hand_fingers_r" ]
},
{
"id": "leg_l",
Expand Down Expand Up @@ -615,5 +617,85 @@
"opposite": "leg_lower_r",
"name_multiple": "lower legs",
"name": "left lower leg"
},
{
"id": "hand_wrist_r",
"type": "sub_body_part",
"max_coverage": 10,
"parent": "hand_r",
"side": 1,
"opposite": "hand_wrist_l",
"name_multiple": "wrists",
"name": "right wrist"
},
{
"id": "hand_palm_r",
"type": "sub_body_part",
"max_coverage": 20,
"parent": "hand_r",
"side": 1,
"opposite": "hand_palm_l",
"name_multiple": "palms",
"name": "right palm"
},
{
"id": "hand_back_r",
"type": "sub_body_part",
"max_coverage": 20,
"parent": "hand_r",
"side": 1,
"opposite": "hand_back_l",
"name_multiple": "back of hands",
"name": "right back of hand"
},
{
"id": "hand_fingers_r",
"type": "sub_body_part",
"max_coverage": 50,
"parent": "hand_r",
"side": 1,
"opposite": "hand_fingers_l",
"name_multiple": "wrists",
"name": "right fingers"
},
{
"id": "hand_wrist_l",
"type": "sub_body_part",
"max_coverage": 10,
"parent": "hand_l",
"side": 1,
"opposite": "hand_wrist_r",
"name_multiple": "wrists",
"name": "left wrist"
},
{
"id": "hand_palm_l",
"type": "sub_body_part",
"max_coverage": 20,
"parent": "hand_l",
"side": 1,
"opposite": "hand_palm_r",
"name_multiple": "palms",
"name": "left palm"
},
{
"id": "hand_back_l",
"type": "sub_body_part",
"max_coverage": 20,
"parent": "hand_l",
"side": 1,
"opposite": "hand_back_r",
"name_multiple": "back of hands",
"name": "left back of hand"
},
{
"id": "hand_fingers_l",
"type": "sub_body_part",
"max_coverage": 50,
"parent": "hand_l",
"side": 1,
"opposite": "hand_fingers_r",
"name_multiple": "fingers",
"name": "left fingers"
}
]
58 changes: 20 additions & 38 deletions data/json/effect_on_condition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
{
"type": "effect_on_condition",
"id": "thunder",
"recurrence_min": 1,
"recurrence_max": 1,
"recurrence": 1,
"global": true,
"condition": {
"and": [
Expand All @@ -58,8 +57,7 @@
{
"type": "effect_on_condition",
"id": "lightning",
"recurrence_min": 1,
"recurrence_max": 1,
"recurrence": 1,
"global": true,
"condition": {
"and": [
Expand All @@ -73,14 +71,13 @@
{ "u_message": "A flash of lightning illuminates your surroundings!" },
{ "sound_effect": "thunder_near", "id": "environment" },
"lightning",
{ "custom_light_level": 100, "length_min": "1 seconds", "length_max": "1 seconds" }
{ "custom_light_level": 100, "length": [ "1 seconds", "1 seconds" ] }
]
},
{
"type": "effect_on_condition",
"id": "acid_drizzle",
"recurrence_min": 1,
"recurrence_max": 1,
"recurrence": 1,
"global": true,
"run_for_npcs": true,
"condition": {
Expand All @@ -95,8 +92,7 @@
{
"type": "effect_on_condition",
"id": "acid_rain",
"recurrence_min": 1,
"recurrence_max": 1,
"recurrence": 1,
"global": true,
"run_for_npcs": true,
"condition": {
Expand All @@ -115,8 +111,7 @@
{
"type": "effect_on_condition",
"id": "snow",
"recurrence_min": 6,
"recurrence_max": 6,
"recurrence": 6,
"global": true,
"run_for_npcs": true,
"condition": { "and": [ { "is_weather": "snowing" }, "u_is_outside" ] },
Expand All @@ -126,8 +121,7 @@
{
"type": "effect_on_condition",
"id": "snowstorm",
"recurrence_min": 6,
"recurrence_max": 6,
"recurrence": 6,
"global": true,
"run_for_npcs": true,
"condition": { "and": [ { "is_weather": "snowstorm" }, "u_is_outside" ] },
Expand All @@ -137,8 +131,7 @@
{
"type": "effect_on_condition",
"id": "bio_drain",
"recurrence_min": "30 minutes",
"recurrence_max": "1 hours 30 minutes",
"recurrence": [ "30 minutes", "1 hours 30 minutes" ],
"condition": { "and": [ { "u_has_bionics": "bio_drain" }, { "compare_int": [ { "u_val": "power" }, ">=", { "power": "25 kJ" } ] } ] },
"deactivate_condition": { "not": { "u_has_bionics": "bio_drain" } },
"effect": [
Expand All @@ -160,17 +153,15 @@
{
"type": "effect_on_condition",
"id": "ambient_subway",
"recurrence_min": "1 hours",
"recurrence_max": "2 hours",
"recurrence": [ "1 hours", "2 hours" ],
"global": true,
"condition": { "or": [ { "u_at_om_location": "subway_ns" }, { "u_at_om_location": "subway_ew" } ] },
"effect": [ { "u_message": "<AMBIENT_SUBWAY>", "snippet": true, "sound": true } ]
},
{
"type": "effect_on_condition",
"id": "ambient_lab_subway",
"recurrence_min": "1 hours",
"recurrence_max": "2 hours",
"recurrence": [ "1 hours", "2 hours" ],
"global": true,
"condition": { "or": [ { "u_at_om_location": "lab_subway_ns" }, { "u_at_om_location": "lab_subway_ew" } ] },
"effect": [ { "u_message": "AMBIENT_LAB_SUBWAY", "snippet": true, "sound": true } ]
Expand All @@ -182,14 +173,13 @@
"deactivate_condition": { "not": { "or": [ { "u_has_trait": "PROF_HUB01_ANCILLIARY" }, { "u_has_effect": "robofac_surveillance" } ] } },
"effect": [
{ "u_spawn_monster": "mon_robofac_camspy", "real_count": 1, "min_radius": 15, "max_radius": 40, "outdoor_only": true },
{ "queue_eocs": "eoc_robofac_surveillance", "time_in_future_min": "1 days", "time_in_future_max": "7 days" }
{ "queue_eocs": "eoc_robofac_surveillance", "time_in_future": [ "1 days", "7 days" ] }
]
},
{
"type": "effect_on_condition",
"id": "bio_trip",
"recurrence_min": "25 minutes",
"recurrence_max": "1 hours 15 minutes",
"recurrence": [ "25 minutes", "1 hours 15 minutes" ],
"condition": {
"and": [
{ "u_has_bionics": "bio_trip" },
Expand All @@ -206,8 +196,7 @@
{
"type": "effect_on_condition",
"id": "mut_eyestalk",
"recurrence_min": "2 hours 15 minutes",
"recurrence_max": "10 hours 15 minutes",
"recurrence": [ "2 hours 15 minutes", "10 hours 15 minutes" ],
"condition": {
"and": [
{ "u_has_trait": "EYESTALKS1" },
Expand All @@ -224,8 +213,7 @@
{
"type": "effect_on_condition",
"id": "bio_spasm",
"recurrence_min": "2 hours 30 minutes",
"recurrence_max": "7 hours 30 minutes",
"recurrence": [ "2 hours 30 minutes", "7 hours 30 minutes" ],
"condition": {
"and": [
{ "u_has_bionics": "bio_spasm" },
Expand All @@ -244,8 +232,7 @@
{
"type": "effect_on_condition",
"id": "bio_shakes",
"recurrence_min": "1 hours",
"recurrence_max": "3 hours",
"recurrence": [ "1 hours", "3 hours" ],
"condition": {
"and": [ { "u_has_bionics": "bio_shakes" }, { "compare_int": [ { "u_val": "power" }, ">=", { "power": "25 kJ" } ] } ]
},
Expand All @@ -260,8 +247,7 @@
{
"type": "effect_on_condition",
"id": "bio_glowy",
"recurrence_min": "25 minutes",
"recurrence_max": "1 hours 15 minutes",
"recurrence": [ "25 minutes", "1 hours 15 minutes" ],
"condition": {
"and": [
{ "u_has_bionics": "bio_glowy" },
Expand All @@ -279,17 +265,15 @@
{
"type": "effect_on_condition",
"id": "bio_sleepy",
"recurrence_min": "25 minutes",
"recurrence_max": "1 hours 15 minutes",
"recurrence": [ "25 minutes", "1 hours 15 minutes" ],
"condition": { "and": [ { "u_has_bionics": "bio_sleepy" }, { "not": { "u_has_effect": "sleep" } } ] },
"deactivate_condition": { "not": { "u_has_bionics": "bio_sleepy" } },
"effect": [ { "arithmetic": [ { "u_val": "fatigue" }, "++" ] } ]
},
{
"type": "effect_on_condition",
"id": "bio_itchy",
"recurrence_min": "25 minutes",
"recurrence_max": "1 hours 15 minutes",
"recurrence": [ "25 minutes", "1 hours 15 minutes" ],
"condition": { "and": [ { "u_has_bionics": "bio_itchy" }, { "not": { "u_has_effect": "formication" } } ] },
"deactivate_condition": { "not": { "u_has_bionics": "bio_itchy" } },
"effect": [
Expand All @@ -300,8 +284,7 @@
{
"type": "effect_on_condition",
"id": "bio_noise",
"recurrence_min": "30 minutes",
"recurrence_max": "1 hours 30 minutes",
"recurrence": [ "30 minutes", "1 hours 30 minutes" ],
"condition": { "and": [ { "u_has_bionics": "bio_noise" }, { "not": { "u_has_effect": "narcosis" } } ] },
"deactivate_condition": { "not": { "u_has_bionics": "bio_noise" } },
"effect": [
Expand Down Expand Up @@ -331,8 +314,7 @@
{
"type": "effect_on_condition",
"id": "bio_leaky",
"recurrence_min": "3 minutes",
"recurrence_max": "9 minutes",
"recurrence": [ "3 minutes", "9 minutes" ],
"condition": { "u_has_bionics": "bio_leaky" },
"deactivate_condition": { "not": { "u_has_bionics": "bio_leaky" } },
"effect": [ { "u_mod_healthy": -1, "cap": -200 } ]
Expand Down
Loading

0 comments on commit 8f0b0d5

Please sign in to comment.