Skip to content

Commit e802893

Browse files
YellowbakaYellowbaka
committed
revert?
2 parents 1ecdebe + ee92347 commit e802893

102 files changed

Lines changed: 8299 additions & 3105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎data/json/furniture_and_terrain/terrain-windows.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,8 +1455,8 @@
14551455
]
14561456
},
14571457
"bash": {
1458-
"str_min": 5,
1459-
"str_max": 10,
1458+
"str_min": 10,
1459+
"str_max": 20,
14601460
"sound": "whump!",
14611461
"sound_fail": "whack!",
14621462
"sound_vol": 90,
@@ -1507,8 +1507,8 @@
15071507
]
15081508
},
15091509
"bash": {
1510-
"str_min": 5,
1511-
"str_max": 10,
1510+
"str_min": 10,
1511+
"str_max": 20,
15121512
"sound": "whump!",
15131513
"sound_fail": "whack!",
15141514
"sound_vol": 90,
@@ -1560,8 +1560,8 @@
15601560
]
15611561
},
15621562
"bash": {
1563-
"str_min": 5,
1564-
"str_max": 10,
1563+
"str_min": 10,
1564+
"str_max": 20,
15651565
"sound": "whump!",
15661566
"sound_fail": "whack!",
15671567
"sound_vol": 90,

‎data/json/items/ammo/8x40mm.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"price_postapoc": "500 USD",
9090
"count": 20,
9191
"loudness": 168,
92-
"speed": 1150,
92+
"speed": 1000,
9393
"//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
9494
"relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
9595
"proportional": { "dispersion": 1.5, "recoil": 1.5 }

‎data/json/items/gunmod/muzzle.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"copy-from": "suppressor",
129129
"type": "GUNMOD",
130130
"name": { "str": "RK6S34 suppressor" },
131-
"description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm. This RK6S34 Mustela is a rather advanced version integral to the RM11B rifle system. It works better with subsonic ammunition",
131+
"description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm. This RK6S34 Mustela is a rather advanced version which can turn standard rounds subsonic while not greatly impacting ballistic performance, and is integral to the RM11B rifle system.",
132132
"weight": "0 g",
133133
"volume": "0 ml",
134134
"price": "0 cent",
@@ -137,6 +137,7 @@
137137
"mod_target_category": [ [ "RIFLES" ], [ "MACHINE_GUNS" ], [ "GATLING_GUNS" ] ],
138138
"handling_modifier": 5,
139139
"loudness_modifier": -80,
140+
"speed": -660,
140141
"flags": [ "IRREMOVABLE" ]
141142
},
142143
{
@@ -216,6 +217,7 @@
216217
"integral_weight": "0 g",
217218
"loudness_modifier": -50,
218219
"range_modifier": -5,
220+
"speed": -30,
219221
"location": "barrel",
220222
"flags": [ "IRREMOVABLE" ]
221223
},

‎data/json/items/tool/cooking.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
"symbol": "%",
597597
"color": "green",
598598
"use_action": {
599-
"target": "dry_fish",
599+
"target": "dry_meat_tainted",
600600
"msg": "You harvest the tainted meat off of the tray.",
601601
"container": "dehydrator_tray",
602602
"target_charges": 20,

‎data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@
159159
"om_terrain": "office_tower_collapse_b_a0",
160160
"om_special": "office_tower_collapsed",
161161
"reveal_radius": 1,
162-
"random": true,
163-
"search_range": 180,
162+
"search_range": 500,
164163
"z": -1
165164
},
166165
"update_mapgen": [ { "place_nested": [ { "chunks": [ "robofac_mi3_photonics_chunk" ], "x": 10, "y": 22 } ] } ]

‎data/json/overmap/overmap_mutable/anthill.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"locations": [ "subterranean_empty" ],
152152
"city_distance": [ 4, -1 ],
153153
"city_sizes": [ 0, 20 ],
154-
"occurrences": [ 30, 100 ],
154+
"occurrences": [ 20, 100 ],
155155
"flags": [ "ANT", "UNIQUE" ],
156156
"connections": [ { "point": [ 0, -1, 0 ], "connection": "local_road" } ],
157157
"place_nested": [ { "point": [ 0, 0, -1 ], "special": "lab_basement" } ],

‎data/json/overmap/overmap_mutable/lab.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
"shared": { "size": [ 4, 4 ] },
6565
"phases": [
6666
[
67-
{ "overmap": "lab", "scale": "size", "max": { "poisson": 3 } },
67+
{ "overmap": "lab", "scale": "size", "max": { "poisson": 4 } },
6868
{
6969
"name": "stairs_and_core",
7070
"chunk": [ { "overmap": "lab_stairs", "pos": [ 0, 0, 0 ] }, { "overmap": "lab_core", "pos": [ 0, 0, -1 ] } ],
7171
"z": "bottom",
7272
"scale": "size",
73-
"max": { "poisson": 2 }
73+
"max": { "poisson": 4 }
7474
}
7575
],
7676
[
@@ -84,9 +84,9 @@
8484
"max": { "chance": 0.2 }
8585
}
8686
],
87-
[ { "overmap": "lab_train_depot", "z": -2, "scale": "size", "max": { "chance": 0.15 } } ],
88-
[ { "overmap": "lab_train_depot", "z": -4, "scale": "size", "max": { "chance": 0.05 } } ],
89-
[ { "overmap": "lab", "z": "bottom", "scale": "size", "max": { "poisson": 1 } } ],
87+
[ { "overmap": "lab_train_depot", "z": -2, "scale": "size", "max": { "chance": 1 } } ],
88+
[ { "overmap": "lab_train_depot", "z": -4, "scale": "size", "max": { "chance": 1 } } ],
89+
[ { "overmap": "lab", "z": "bottom", "scale": "size", "max": { "poisson": 2 } } ],
9090
[ { "overmap": "lab_finale", "z": "bottom", "max": 1 } ]
9191
]
9292
},
@@ -96,7 +96,7 @@
9696
"subtype": "mutable",
9797
"locations": [ "subterranean_empty" ],
9898
"city_distance": [ 10, -1 ],
99-
"occurrences": [ 1, 2 ],
99+
"occurrences": [ 50, 100 ],
100100
"flags": [ "LAB", "UNIQUE" ],
101101
"connections": [ { "point": [ 0, -1, 0 ], "connection": "local_road" } ],
102102
"check_for_locations": [
@@ -166,13 +166,13 @@
166166
"phases": [
167167
[ { "overmap": "ice_lab_core", "max": 1 } ],
168168
[
169-
{ "overmap": "ice_lab", "scale": "size", "max": { "poisson": 3 } },
169+
{ "overmap": "ice_lab", "scale": "size", "max": { "poisson": 4 } },
170170
{
171171
"name": "stairs_and_core",
172172
"chunk": [ { "overmap": "ice_lab_stairs", "pos": [ 0, 0, 0 ] }, { "overmap": "ice_lab_core", "pos": [ 0, 0, -1 ] } ],
173173
"z": "bottom",
174174
"scale": "size",
175-
"max": { "poisson": 2 }
175+
"max": { "poisson": 4 }
176176
}
177177
],
178178
[
@@ -186,9 +186,9 @@
186186
"max": { "chance": 0.2 }
187187
}
188188
],
189-
[ { "overmap": "lab_train_depot", "z": -2, "scale": "size", "max": { "chance": 0.15 } } ],
190-
[ { "overmap": "lab_train_depot", "z": -4, "scale": "size", "max": { "chance": 0.05 } } ],
191-
[ { "overmap": "ice_lab", "z": "bottom", "scale": "size", "max": { "poisson": 1 } } ],
189+
[ { "overmap": "lab_train_depot", "z": -2, "scale": "size", "max": { "chance": 1 } } ],
190+
[ { "overmap": "lab_train_depot", "z": -4, "scale": "size", "max": { "chance": 1 } } ],
191+
[ { "overmap": "ice_lab", "z": "bottom", "scale": "size", "max": { "poisson": 2 } } ],
192192
[ { "overmap": "ice_lab_finale", "z": "bottom", "max": 1 } ]
193193
]
194194
},

‎data/json/overmap/overmap_special/specials.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
"connections": [ { "point": [ 0, -1, 0 ], "connection": "local_road" } ],
705705
"place_nested": [ { "point": [ 0, 0, -1 ], "special": "lab_basement" } ],
706706
"city_distance": [ 4, -1 ],
707-
"occurrences": [ 0, 3 ],
707+
"occurrences": [ 1, 3 ],
708708
"flags": [ "LAB" ]
709709
},
710710
{

‎data/json/overmap/overmap_terrain/overmap_terrain_lab.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"sym": "L",
3737
"color": "light_blue",
3838
"see_cost": 5,
39+
"looks_like": "lab",
3940
"flags": [ "NO_ROTATE" ]
4041
},
4142
{
@@ -46,6 +47,7 @@
4647
"color": "light_blue",
4748
"spawns": { "group": "GROUP_LAB", "population": [ 1, 10 ], "chance": 50 },
4849
"see_cost": 5,
50+
"looks_like": "lab",
4951
"flags": [ "NO_ROTATE" ]
5052
},
5153
{
@@ -86,6 +88,7 @@
8688
"color": "light_blue",
8789
"spawns": { "group": "GROUP_LAB", "population": [ 1, 10 ], "chance": 50 },
8890
"see_cost": 5,
91+
"looks_like": "lab",
8992
"flags": [ "NO_ROTATE", "RISK_HIGH" ]
9093
},
9194
{
@@ -95,6 +98,7 @@
9598
"sym": "L",
9699
"color": "blue",
97100
"see_cost": 5,
101+
"looks_like": "lab_stairs",
98102
"spawns": { "group": "GROUP_LAB", "population": [ 1, 10 ], "chance": 50 },
99103
"flags": [ "KNOWN_DOWN", "NO_ROTATE" ]
100104
},
@@ -104,6 +108,7 @@
104108
"name": "science lab",
105109
"sym": "L",
106110
"color": "light_blue",
111+
"looks_like": "lab_core",
107112
"spawns": { "group": "GROUP_LAB", "population": [ 1, 10 ], "chance": 50 },
108113
"see_cost": 5,
109114
"flags": [ "NO_ROTATE" ]
@@ -114,6 +119,7 @@
114119
"name": "science lab",
115120
"sym": "L",
116121
"color": "cyan",
122+
"looks_like": "lab_finale",
117123
"spawns": { "group": "GROUP_LAB", "population": [ 4, 12 ], "chance": 90 },
118124
"see_cost": 5,
119125
"flags": [ "NO_ROTATE" ]

‎data/mods/Aftershock/mutations/mutations.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,7 @@
533533
"type": "mutation",
534534
"id": "HUGE_OK",
535535
"copy-from": "HUGE_OK",
536-
"extend": { "category": [ "MASTODON" ], "threshreq": [ "THRESH_MASTODON" ] },
537-
"profession": true
536+
"extend": { "category": [ "MASTODON" ], "threshreq": [ "THRESH_MASTODON" ] }
538537
},
539538
{
540539
"type": "mutation",

0 commit comments

Comments
 (0)