Skip to content

Commit a8cdc40

Browse files
CAHEK7CAHEK7
authored
Merge branch 'CleverRaven:master' into autodrive_loops
2 parents cae2c1d + 310fa55 commit a8cdc40

File tree

113 files changed

+991
-438
lines changed

Some content is hidden

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

113 files changed

+991
-438
lines changed

‎data/json/artifact/altered_object_active.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
"type": "SPELL",
268268
"name": { "str": "Book far tp", "//~": "NO_I18N" },
269269
"description": { "str": "Teleports you to a distant location.", "//~": "NO_I18N" },
270-
"message": "You find the description of a distance place.",
270+
"message": "You find the description of a distant place.",
271271
"valid_targets": [ "self" ],
272272
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
273273
"effect": "effect_on_condition",

‎data/json/artifact/artifact_item_types.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
{
4242
"id": "uklm_si",
4343
"name": { "str_sp": "In Uklm-si" },
44-
"description": "The text is written in english, but every word takes incredible effort to comprehend.",
44+
"description": "The text is written in English, but every word takes incredible effort to comprehend.",
4545
"weight": 300
4646
},
4747
{

‎data/json/deconstruction.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"category": "DECONSTRUCT",
5656
"required_skills": [ [ "fabrication", 3 ] ],
5757
"time": "60 m",
58-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
58+
"using": [ [ "wood_removal_standard", 1 ] ],
5959
"byproducts": [ { "item": "2x4", "count": [ 7, 15 ] }, { "item": "nail", "charges": [ 15, 30 ] } ],
6060
"pre_terrain": "t_window_empty",
6161
"post_terrain": "t_floor"
@@ -185,7 +185,7 @@
185185
"category": "DECONSTRUCT",
186186
"required_skills": [ [ "fabrication", 3 ] ],
187187
"time": "30 m",
188-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
188+
"using": [ [ "wood_removal_standard", 1 ] ],
189189
"byproducts": [ { "item": "2x4", "count": [ 5, 10 ] }, { "item": "splinter", "count": [ 10, 20 ] } ],
190190
"pre_terrain": "t_floor",
191191
"post_terrain": "t_dirt"
@@ -198,7 +198,7 @@
198198
"category": "DECONSTRUCT",
199199
"required_skills": [ [ "fabrication", 3 ] ],
200200
"time": "30 m",
201-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
201+
"using": [ [ "wood_removal_standard", 1 ] ],
202202
"byproducts": [ { "item": "2x4", "count": [ 5, 10 ] }, { "item": "splinter", "count": [ 10, 20 ] } ],
203203
"pre_terrain": "t_floor_noroof",
204204
"post_terrain": "t_dirt"
@@ -211,7 +211,7 @@
211211
"category": "DECONSTRUCT",
212212
"required_skills": [ [ "fabrication", 3 ] ],
213213
"time": "30 m",
214-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
214+
"using": [ [ "wood_removal_standard", 1 ] ],
215215
"byproducts": [ { "item": "2x4", "count": [ 5, 10 ] }, { "item": "splinter", "count": [ 10, 20 ] } ],
216216
"pre_terrain": "t_floor_waxed_y",
217217
"post_terrain": "t_dirt"
@@ -224,7 +224,7 @@
224224
"category": "DECONSTRUCT",
225225
"required_skills": [ [ "fabrication", 3 ] ],
226226
"time": "30 m",
227-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
227+
"using": [ [ "wood_removal_standard", 1 ] ],
228228
"byproducts": [ { "item": "2x4", "count": [ 5, 10 ] }, { "item": "splinter", "count": [ 10, 20 ] } ],
229229
"pre_terrain": "t_floor_waxed",
230230
"post_terrain": "t_dirt"
@@ -572,7 +572,7 @@
572572
"category": "DECONSTRUCT",
573573
"required_skills": [ [ "fabrication", 5 ] ],
574574
"time": "90 m",
575-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
575+
"using": [ [ "wood_removal_standard", 1 ] ],
576576
"byproducts": "wall_deconstruction_results",
577577
"pre_terrain": "t_wall_wood",
578578
"post_terrain": "t_floor"
@@ -585,7 +585,7 @@
585585
"category": "DECONSTRUCT",
586586
"required_skills": [ [ "fabrication", 5 ] ],
587587
"time": "90 m",
588-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
588+
"using": [ [ "wood_removal_standard", 1 ] ],
589589
"byproducts": "wall_deconstruction_results",
590590
"pre_terrain": "t_wall_wood_chipped",
591591
"post_terrain": "t_floor"
@@ -598,7 +598,7 @@
598598
"category": "DECONSTRUCT",
599599
"required_skills": [ [ "fabrication", 5 ] ],
600600
"time": "40 m",
601-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
601+
"using": [ [ "wood_removal_standard", 1 ] ],
602602
"byproducts": "wall_deconstruction_results",
603603
"pre_terrain": "t_wall_wood_broken",
604604
"post_terrain": "t_floor"
@@ -611,7 +611,7 @@
611611
"category": "DECONSTRUCT",
612612
"required_skills": [ [ "fabrication", 5 ] ],
613613
"time": "90 m",
614-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
614+
"using": [ [ "wood_removal_standard", 1 ] ],
615615
"byproducts": "wall_deconstruction_results",
616616
"pre_terrain": "t_embrasure_wood",
617617
"post_terrain": "t_floor"
@@ -624,7 +624,7 @@
624624
"category": "DECONSTRUCT",
625625
"required_skills": [ [ "fabrication", 5 ] ],
626626
"time": "60 m",
627-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
627+
"using": [ [ "wood_removal_standard", 1 ] ],
628628
"byproducts": "wall_deconstruction_results",
629629
"pre_terrain": "t_wall_wood_widened",
630630
"post_terrain": "t_floor"
@@ -637,7 +637,7 @@
637637
"category": "DECONSTRUCT",
638638
"required_skills": [ [ "fabrication", 5 ] ],
639639
"time": "40 m",
640-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
640+
"using": [ [ "wood_removal_standard", 1 ] ],
641641
"byproducts": [
642642
{ "item": "nail", "charges": [ 2, 10 ] },
643643
{ "item": "splinter", "count": [ 0, 2 ] },
@@ -654,7 +654,7 @@
654654
"category": "DECONSTRUCT",
655655
"required_skills": [ [ "fabrication", 5 ] ],
656656
"time": "90 m",
657-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
657+
"using": [ [ "wood_removal_standard", 1 ] ],
658658
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
659659
"pre_terrain": "t_wall_log",
660660
"post_terrain": "t_dirt"
@@ -667,7 +667,7 @@
667667
"category": "DECONSTRUCT",
668668
"required_skills": [ [ "fabrication", 5 ] ],
669669
"time": "90 m",
670-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
670+
"using": [ [ "wood_removal_standard", 1 ] ],
671671
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
672672
"pre_terrain": "t_wall_log_chipped",
673673
"post_terrain": "t_dirt"
@@ -680,7 +680,7 @@
680680
"category": "DECONSTRUCT",
681681
"required_skills": [ [ "fabrication", 5 ] ],
682682
"time": "60 m",
683-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
683+
"using": [ [ "wood_removal_standard", 1 ] ],
684684
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
685685
"pre_terrain": "t_wall_log_broken",
686686
"post_terrain": "t_dirt"
@@ -693,7 +693,7 @@
693693
"category": "DECONSTRUCT",
694694
"required_skills": [ [ "fabrication", 5 ] ],
695695
"time": "90 m",
696-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
696+
"using": [ [ "wood_removal_standard", 1 ] ],
697697
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
698698
"pre_terrain": "t_embrasure_log",
699699
"post_terrain": "t_dirt"
@@ -706,7 +706,7 @@
706706
"category": "DECONSTRUCT",
707707
"required_skills": [ [ "fabrication", 5 ] ],
708708
"time": "60 m",
709-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
709+
"using": [ [ "wood_removal_standard", 1 ] ],
710710
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
711711
"pre_terrain": "t_wall_log_widened",
712712
"post_terrain": "t_dirt"
@@ -719,7 +719,7 @@
719719
"category": "DECONSTRUCT",
720720
"required_skills": [ [ "fabrication", 5 ] ],
721721
"time": "30 m",
722-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
722+
"using": [ [ "wood_removal_standard", 1 ] ],
723723
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
724724
"pre_terrain": "t_wall_log_half",
725725
"post_terrain": "t_dirt"
@@ -732,7 +732,7 @@
732732
"category": "DECONSTRUCT",
733733
"required_skills": [ [ "fabrication", 5 ] ],
734734
"time": "90 m",
735-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
735+
"using": [ [ "wood_removal_standard", 1 ] ],
736736
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
737737
"pre_terrain": "t_palisade",
738738
"post_terrain": "t_dirt"
@@ -745,7 +745,7 @@
745745
"category": "DECONSTRUCT",
746746
"required_skills": [ [ "fabrication", 5 ] ],
747747
"time": "90 m",
748-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
748+
"using": [ [ "wood_removal_standard", 1 ] ],
749749
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
750750
"pre_terrain": "t_palisade_embrasure",
751751
"post_terrain": "t_dirt"
@@ -758,7 +758,7 @@
758758
"category": "DECONSTRUCT",
759759
"required_skills": [ [ "fabrication", 5 ] ],
760760
"time": "90 m",
761-
"using": [ [ "wall_floor_glass_removal_standard", 1 ] ],
761+
"using": [ [ "wood_removal_standard", 1 ] ],
762762
"byproducts": [ { "item": "nail", "charges": [ 5, 10 ] }, { "item": "splinter", "count": [ 20, 40 ] } ],
763763
"pre_terrain": "t_palisade_gate",
764764
"post_terrain": "t_dirt"

‎data/json/field_type.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@
607607
"max_duration": "2 minutes",
608608
"immune_inside_vehicle": true,
609609
"immunity_data": { "body_part_env_resistance": [ [ "sensor", 15 ] ] },
610-
"message": "Your eyes itching from hazy cloud.",
610+
"message": "The hazy cloud makes your eyes itch.",
611611
"message_type": "bad"
612612
},
613613
{
@@ -638,7 +638,7 @@
638638
"max_duration": "3 minutes",
639639
"immune_inside_vehicle": true,
640640
"immunity_data": { "body_part_env_resistance": [ [ "sensor", 15 ] ] },
641-
"message": "Your eyes burn from toxic gas.",
641+
"message": "The toxic gas makes your eyes burn.",
642642
"message_type": "bad"
643643
},
644644
{

‎data/json/itemgroups/Clothing_Gear/gear_civilian.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
{ "prob": 10, "group": "licorice_bag_plastic_1_4" },
9999
{ "item": "mp3", "prob": 20, "charges": [ 0, 100 ] },
100100
{ "item": "portable_game", "prob": 30, "charges": [ 0, 100 ] },
101-
{ "group": "softdrinks_canned", "prob": 55 },
102-
{ "group": "softdrinks_bottled", "prob": 30 },
101+
{ "group": "soda_in_small_container", "prob": 55 },
102+
{ "group": "soda_in_container", "prob": 30 },
103103
[ "backpack", 48 ],
104104
[ "backpack_denim", 8 ],
105105
[ "purse", 20 ],
@@ -228,8 +228,8 @@
228228
{ "group": "kids_books", "prob": 15 },
229229
{ "group": "lunchbox_with_contents", "prob": 45 },
230230
{ "group": "candy_chocolate", "prob": 12 },
231-
{ "group": "softdrinks_canned", "prob": 5 },
232-
{ "group": "softdrinks_bottled", "prob": 7 },
231+
{ "group": "soda_in_small_container", "prob": 5 },
232+
{ "group": "soda_in_container", "prob": 7 },
233233
{ "group": "bugout_toys", "prob": 2 }
234234
]
235235
},

0 commit comments

Comments
 (0)