-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into recipe-realism
- Loading branch information
Showing
25 changed files
with
500 additions
and
232 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,31 +8,32 @@ | |
| "fill_ter": "t_rock_floor", | ||
| "rows": [ | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " |---------- ", | ||
| " |?..i|..LL| ", | ||
| " |/...+L...| ", | ||
| " |.ccc|L...| ", | ||
| "|-------------+---------", | ||
| "|{{{{{|bbbbbb|...rrccrr|", | ||
| "|.....|s....b|ff.......|", | ||
| "|___..|s.t..b|...cccccc|", | ||
| "|.....|a....b|.........|", | ||
| "|^..!.............s.t..|", | ||
| "|.................s.t..|", | ||
| "|%..@.............s.t..|", | ||
| "|................|-----|", | ||
| "|......|+-|++|...|&...i|", | ||
| "|......|.W|..|...+....C|", | ||
| "|..}...|.F|.<|...|.cc.*|", | ||
| "------------------------", | ||
| " |----------| ", | ||
| " |...___....| ", | ||
| " |..........| ", | ||
| " |..~~~~~~..| ", | ||
| " |---------|..~~~~~~..| ", | ||
| " |...__..i|L..~~~~~~..| ", | ||
| " |?.......|...~~~~~~..| ", | ||
| " |/.......+L..........| ", | ||
| " |.ccc.ccc|LL...___...| ", | ||
| " |------------+-------| ", | ||
| " |{{{{|bbbbbb|...rrccr| ", | ||
| " |....|s....b|ff......| ", | ||
| " |__..|s.t..b|...ccccc| ", | ||
| " |....|a....b|........| ", | ||
| " |^.!.............s..t| ", | ||
| " |................s..t| ", | ||
| " |%[email protected]..t| ", | ||
| " |...............|----| ", | ||
| " |.....|+-|++|...|&..i| ", | ||
| " |.....|.W|..|...+...C| ", | ||
| " |.}...|.F|.<|...|.cc*| ", | ||
| " ---------------------- ", | ||
| " " | ||
| ], | ||
| "palettes": [ "basement_game" ], | ||
| "terrain": { "~": "t_water_pool" }, | ||
| "furniture": { | ||
| "}": "f_pinball_machine", | ||
| "*": "f_shower", | ||
|
|
@@ -51,64 +52,64 @@ | |
| }, | ||
| "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, | ||
| "place_loot": [ | ||
| { "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] }, | ||
| { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 }, | ||
| { "group": "magazines", "x": 9, "y": 7, "chance": 30 }, | ||
| { "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "surgery", "x": [ 8, 9 ], "y": 3, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "bionics_common", "x": 7, "y": 3 }, | ||
| { "item": "anesthetic_kit", "x": 7, "y": 3 }, | ||
| { "item": "television", "x": 22, "y": 10, "chance": 95 }, | ||
| { "item": "soap", "x": 19, "y": 15, "chance": 80 }, | ||
| { "item": "towel", "x": 20, "y": 15, "chance": 80 }, | ||
| { "item": "towel", "x": 2, "y": 7, "chance": 60 }, | ||
| { "item": "stereo", "x": 1, "y": 7, "chance": 50 } | ||
| { "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] }, | ||
| { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 }, | ||
| { "group": "magazines", "x": 9, "y": 12, "chance": 30 }, | ||
| { "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "surgery", "x": [ 8, 9 ], "y": 9, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "bionics_common", "x": 7, "y": 9 }, | ||
| { "item": "anesthetic_kit", "x": 7, "y": 9 }, | ||
| { "item": "television", "x": 21, "y": 16, "chance": 95 }, | ||
| { "item": "soap", "x": 19, "y": 21, "chance": 80 }, | ||
| { "item": "towel", "x": 20, "y": 21, "chance": 80 }, | ||
| { "item": "towel", "x": 3, "y": 13, "chance": 60 }, | ||
| { "item": "stereo", "x": 2, "y": 13, "chance": 50 } | ||
| ], | ||
| "place_monster": [ { "monster": "mon_broken_cyborg", "x": 14, "y": 3, "chance": 100 } ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "om_terrain": [ "basement" ], | ||
| "om_terrain": [ "basement_bionic_decoy" ], | ||
| "weight": 100, | ||
| "object": { | ||
| "rotation": [ 0, 3 ], | ||
| "fill_ter": "t_rock_floor", | ||
| "rows": [ | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ------ ", | ||
| " |..LL| ", | ||
| " |L...| ", | ||
| " |L...| ", | ||
| "|-------------+---------", | ||
| "|{{{{{|bbbbbb|...rrccrr|", | ||
| "|.....|s....b|ff.......|", | ||
| "|___..|s.t..b|...cccccc|", | ||
| "|.....|a....b|.........|", | ||
| "|^..!.............s.t..|", | ||
| "|.................s.t..|", | ||
| "|%..@.............s.t..|", | ||
| "|................|-----|", | ||
| "|......|+-|++|...|&...i|", | ||
| "|......|.W|..|...+....C|", | ||
| "|..}...|.F|<<|...|.cc.*|", | ||
| "------------------------", | ||
| " |----------| ", | ||
| " |...___....| ", | ||
| " |..........| ", | ||
| " |..~~~~~~..| ", | ||
| " |---------|..~~~~~~..| ", | ||
| " |*|*|*|cc|L..~~~~~~..| ", | ||
| " |+|+|+|..|L..~~~~~~..| ", | ||
| " |........+...........| ", | ||
| " |cc&c&c&c|LL...___...| ", | ||
| " |------------+-------| ", | ||
| " |{{{{|bbbbbb|...rrccr| ", | ||
| " |....|s....b|ff......| ", | ||
| " |__..|s.t..b|...ccccc| ", | ||
| " |....|a....b|........| ", | ||
| " |^.!.............s..t| ", | ||
| " |................s..t| ", | ||
| " |%[email protected]..t| ", | ||
| " |...............|----| ", | ||
| " |.....|+-|++|...|&..i| ", | ||
| " |.....|.W|..|...+...C| ", | ||
| " |.}...|.F|.<|...|.cc*| ", | ||
| " ---------------------- ", | ||
| " " | ||
| ], | ||
| "palettes": [ "basement_game" ], | ||
| "terrain": { "~": "t_water_pool" }, | ||
| "furniture": { | ||
| "}": "f_pinball_machine", | ||
| "*": "f_shower", | ||
|
|
@@ -125,22 +126,22 @@ | |
| }, | ||
| "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, | ||
| "place_loot": [ | ||
| { "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] }, | ||
| { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 }, | ||
| { "group": "magazines", "x": 9, "y": 7, "chance": 30 }, | ||
| { "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "item": "television", "x": 22, "y": 10, "chance": 95 }, | ||
| { "item": "soap", "x": 19, "y": 15, "chance": 80 }, | ||
| { "item": "towel", "x": 20, "y": 15, "chance": 80 }, | ||
| { "item": "towel", "x": 2, "y": 7, "chance": 60 }, | ||
| { "item": "stereo", "x": 1, "y": 7, "chance": 50 } | ||
| { "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] }, | ||
| { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 }, | ||
| { "group": "magazines", "x": 9, "y": 12, "chance": 30 }, | ||
| { "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] }, | ||
| { "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] }, | ||
| { "item": "television", "x": 21, "y": 16, "chance": 95 }, | ||
| { "item": "soap", "x": 19, "y": 21, "chance": 80 }, | ||
| { "item": "towel", "x": 20, "y": 21, "chance": 80 }, | ||
| { "item": "towel", "x": 3, "y": 13, "chance": 60 }, | ||
| { "item": "stereo", "x": 2, "y": 13, "chance": 50 } | ||
| ], | ||
| "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 5, 17 ], "y": [ 9, 11 ], "chance": 2 } ] | ||
| } | ||
|
|
||
Oops, something went wrong.