Skip to content

Commit e83ce16

Browse files
waveylwaveyl
committed
auto update
1 parent c985e49 commit e83ce16

File tree

24 files changed

+520
-81
lines changed

24 files changed

+520
-81
lines changed

‎Kenan-Structured-Modpack/Arcana/items/tool_armor.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -550,16 +550,7 @@
550550
}
551551
]
552552
},
553-
"flags": [
554-
"ALLOWS_NATURAL_ATTACKS",
555-
"OVERSIZE",
556-
"STURDY",
557-
"UNBREAKABLE_MELEE",
558-
"BLOCK_WHILE_WORN",
559-
"NO_SALVAGE",
560-
"AURA",
561-
"POWERARMOR_COMPATIBLE"
562-
],
553+
"flags": [ "ALLOWS_NATURAL_ATTACKS", "OVERSIZE", "STURDY", "BLOCK_WHILE_WORN", "NO_SALVAGE", "AURA", "POWERARMOR_COMPATIBLE" ],
563554
"max_worn": 1,
564555
"sided": true,
565556
"material_thickness": 4,
@@ -594,7 +585,8 @@
594585
"WATERPROOF",
595586
"ZERO_WEIGHT",
596587
"ELECTRIC_IMMUNE",
597-
"DIMENSIONAL_ANCHOR"
588+
"DIMENSIONAL_ANCHOR",
589+
"UNBREAKABLE"
598590
]
599591
}
600592
},
@@ -663,7 +655,7 @@
663655
"ammo_scale": 0
664656
},
665657
"qualities": [ [ "GLARE", 1 ] ],
666-
"extend": { "flags": [ "GAS_PROOF", "RAD_PROOF", "SUN_GLASSES", "BULLET_IMMUNE", "STAB_IMMUNE", "HEAT_IMMUNE" ] }
658+
"extend": { "flags": [ "GAS_PROOF", "RAD_PROOF", "SUN_GLASSES", "BULLET_IMMUNE", "STAB_IMMUNE", "HEAT_IMMUNE", "UNBREAKABLE" ] }
667659
},
668660
{
669661
"id": "armor_wyrm_berserker",

‎Kenan-Structured-Modpack/PM_World/AnomalousThings/BookThatDontBelongToYou/Owner/EGO effects.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"type": "effect_on_condition",
44
"id": "EOC_location_test",
55
"effect": [
6-
{ "set_string_var": { "mutator": "u_loc_relative", "target": "(0,0,0)" }, "target_var": { "context_val": "u_loc" } },
76
{ "u_location_variable": { "context_val": "u_search_loc" }, "field": "fd_fire", "target_max_radius": 1 }
87
]
98
},
@@ -15,10 +14,9 @@
1514
"deactivate_condition": { "not": { "u_has_trait": "EGO_92_mutation_stage_3" } },
1615
"effect": [
1716
{ "u_location_variable": { "context_val": "fire_place" }, "field": "fd_fire", "target_max_radius": 25 },
18-
{ "math": [ "u_fire_stamina_boost", "=", "field_strength('fd_fire', 'location': fire_place)" ] },
1917
{
2018
"if": { "map_field_id": "fd_fire", "loc": { "context_val": "fire_place" } },
21-
"then": { "u_add_effect": "stamina_regen_boost_small", "duration": "2 s", "intensity": "u_fire_stamina_boost" }
19+
"then": { "u_add_effect": "stamina_regen_boost_small", "duration": "2 s", "intensity": { "math": [ "field_strength('fd_fire', 'location': fire_place)" ] } }
2220
}
2321
]
2422
},
@@ -41,10 +39,9 @@
4139
"deactivate_condition": { "not": { "u_has_trait": "EGO_92_mutation_stage_4" } },
4240
"effect": [
4341
{ "u_location_variable": { "context_val": "fire_place" }, "field": "fd_fire", "target_max_radius": 25 },
44-
{ "math": [ "u_fire_stamina_boost", "=", "field_strength('fd_fire', 'location': fire_place)" ] },
4542
{
4643
"if": { "map_field_id": "fd_fire", "loc": { "context_val": "fire_place" } },
47-
"then": { "u_add_effect": "stamina_regen_boost_big", "duration": "2 s", "intensity": "u_fire_stamina_boost" }
44+
"then": { "u_add_effect": "stamina_regen_boost_big", "duration": "2 s", "intensity": { "math": [ "field_strength('fd_fire', 'location': fire_place)" ] } }
4845
}
4946
]
5047
},

‎Kenan-Structured-Modpack/PM_World/AnomalousThings/Ordeals/Green Dawn/GreenDawnEoC.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"and": [
99
{ "math": [ "time_since('cataclysm', 'unit':'days') >= 18" ] },
1010
{ "not": { "compare_string": [ "yes", { "u_val": "u_ordeal_lock" } ] } },
11-
{ "not": { "math": [ "time_since('cataclysm', 'unit':'days') <= 42" ] } },
11+
{ "math": [ "time_since('cataclysm', 'unit':'days') <= 42" ] },
1212
"u_is_avatar"
1313
]
1414
},

‎Kenan-Structured-Modpack/PM_World/Items/Item_group.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,26 @@
143143
"subtype": "collection",
144144
"copy-from": "SUS_junk_drawer",
145145
"extend": { "entries": [ { "item": "zweiflyer_item", "prob": 12 } ] }
146+
},
147+
{
148+
"id": "SUS_office_desk",
149+
"type": "item_group",
150+
"subtype": "collection",
151+
"copy-from": "SUS_office_desk",
152+
"extend": { "entries": [ { "item": "internet_sim_card", "prob": 5 } ] }
153+
},
154+
{
155+
"id": "SUS_science_personal_effects",
156+
"type": "item_group",
157+
"subtype": "collection",
158+
"copy-from": "SUS_science_personal_effects",
159+
"extend": { "entries": [ { "item": "internet_sim_card", "prob": 3 } ] }
160+
},
161+
{
162+
"id": "supplies_electronics",
163+
"type": "item_group",
164+
"subtype": "collection",
165+
"copy-from": "supplies_electronics",
166+
"extend": { "entries": [ { "item": "internet_sim_card", "prob": 7 } ] }
146167
}
147168
]

‎Kenan-Structured-Modpack/PM_World/Items/StigmaWorkshop/weapons.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"MACES"
4545
],
4646
"charges_per_use": 1,
47-
"ammo": [
47+
"tool_ammo": [
4848
"battery"
4949
],
5050
"flags": [
@@ -114,7 +114,7 @@
114114
"MACES"
115115
],
116116
"charges_per_use": 1,
117-
"ammo": [
117+
"tool_ammo": [
118118
"battery"
119119
],
120120
"flags": [
@@ -219,7 +219,7 @@
219219
"MEDIUM_SWORDS"
220220
],
221221
"charges_per_use": 1,
222-
"ammo": [
222+
"tool_ammo": [
223223
"battery"
224224
],
225225
"flags": [
@@ -301,7 +301,7 @@
301301
"MEDIUM_SWORDS"
302302
],
303303
"charges_per_use": 1,
304-
"ammo": [
304+
"tool_ammo": [
305305
"battery"
306306
],
307307
"flags": [
@@ -385,7 +385,7 @@
385385
"GREAT_AXES"
386386
],
387387
"charges_per_use": 1,
388-
"ammo": [
388+
"tool_ammo": [
389389
"battery"
390390
],
391391
"flags": [
@@ -465,7 +465,7 @@
465465
"GREAT_AXES"
466466
],
467467
"charges_per_use": 1,
468-
"ammo": [
468+
"tool_ammo": [
469469
"battery"
470470
],
471471
"flags": [

‎Kenan-Structured-Modpack/PM_World/Items/internet/EOC_internet.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,15 @@
33
"type": "effect_on_condition",
44
"id": "EOC_internet_access",
55
"effect": [ { "open_dialogue": { "topic": "TALK_INTERNET_MENU_MAIN" } } ]
6-
}
6+
},
7+
{
8+
"type": "effect_on_condition",
9+
"id": "EOC_SETUP_CREDIT",
10+
"eoc_type": "EVENT",
11+
"required_event": "game_begin",
12+
"condition": { "not": { "math": [ "has_var(u_credit)" ] } },
13+
"effect": [
14+
{ "math": [ "u_credit = 0" ] }
15+
]
16+
}
717
]

‎Kenan-Structured-Modpack/PM_World/Items/internet/internet_access.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"type": "TOOL",
2020
"name": { "str": "smartphone (SIM)" },
2121
"material": [ { "type": "aluminum", "portion": 75 }, { "type": "plastic", "portion": 25 } ],
22-
"ammo": [ "battery" ],
22+
"tool_ammo": [ "battery" ],
2323
"charges_per_use": 1,
2424
"etransfer_rate": "30 MB",
2525
"e_port": "phone",
@@ -86,7 +86,7 @@
8686
"type": "TOOL",
8787
"name": { "str": "smartphone (SIM) - Flashlight", "str_pl": "smartphones (SIM) - Flashlight" },
8888
"material": [ { "type": "aluminum", "portion": 75 }, { "type": "plastic", "portion": 25 } ],
89-
"ammo": [ "battery" ],
89+
"tool_ammo": [ "battery" ],
9090
"charges_per_use": 1,
9191
"etransfer_rate": "30 MB",
9292
"e_port": "phone",
@@ -153,7 +153,7 @@
153153
"type": "TOOL",
154154
"name": { "str": "laptop computer (SIM)" },
155155
"material": [ { "type": "aluminum", "portion": 75 }, { "type": "plastic", "portion": 25 } ],
156-
"ammo": [ "battery" ],
156+
"tool_ammo": [ "battery" ],
157157
"charges_per_use": 1,
158158
"etransfer_rate": "30 MB",
159159
"e_port": "laptop",
@@ -207,7 +207,7 @@
207207
"type": "TOOL",
208208
"name": { "str": "laptop computer (SIM) - lit screen", "str_pl": "laptop computers (SIM) - lit screen" },
209209
"material": [ { "type": "aluminum", "portion": 75 }, { "type": "plastic", "portion": 25 } ],
210-
"ammo": [ "battery" ],
210+
"tool_ammo": [ "battery" ],
211211
"charges_per_use": 1,
212212
"etransfer_rate": "30 MB",
213213
"e_port": "laptop",

0 commit comments

Comments
 (0)