1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
From 0f8ea67a352735ca1b12525b87b8d37b7fe0d284 Mon Sep 17 00:00:00 2001
From: 0Monet <146018959+0Monet@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:36:11 +0100
Subject: [PATCH] fix: campground mapgen (#3702)
* fix_campground
* fix_waterless_toilets
* style(autofix.ci): automated formatting
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
data/json/mapgen/campground.json | 124 ++++++++++------------
data/json/mapgen_palettes/campground.json | 4 +-
2 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/data/json/mapgen/campground.json b/data/json/mapgen/campground.json
index 0bd8910b1c4..b4e8ff694f3 100644
--- a/data/json/mapgen/campground.json
+++ b/data/json/mapgen/campground.json
@@ -1,68 +1,10 @@
[
{
+ "type": "mapgen",
"method": "json",
+ "om_terrain": [ [ "campground_1a", "campground_1b" ], [ "campground_2a", "campground_2b" ] ],
+ "weight": 100,
"object": {
- "items": {
- ";": [
- { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
- { "item": "creepy", "chance": 2 },
- { "item": "camping", "chance": 5 },
- { "item": "archery", "chance": 2 }
- ],
- ",": [
- { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
- { "item": "creepy", "chance": 2 },
- { "item": "camping", "chance": 5 },
- { "item": "archery", "chance": 2 }
- ],
- "t": [
- { "item": "barbecue", "chance": 5, "repeat": [ 1, 2 ] },
- { "item": "misc_smoking", "chance": 2 },
- { "item": "cannedfood", "chance": 2, "repeat": [ 1, 2 ] }
- ]
- },
- "place_monsters": [
- { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 8, 18 ], "y": [ 7, 22 ] },
- { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 2, 15 ], "repeat": [ 0, 2 ] },
- { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 3, 17 ], "y": [ 32, 46 ] },
- { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] },
- { "monster": "GROUP_PARK_ANIMAL", "x": [ 30, 46 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] }
- ],
- "place_vehicles": [
- { "chance": 25, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 2 },
- { "chance": 25, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
- { "chance": 50, "fuel": 20, "rotation": 0, "status": -1, "vehicle": "lux_rv", "x": 43, "y": 18 },
- {
- "chance": 25,
- "fuel": 15,
- "rotation": 180,
- "status": -1,
- "vehicle": "campground_vehicles",
- "x": 26,
- "y": 14
- },
- {
- "chance": 25,
- "fuel": 15,
- "rotation": 360,
- "status": -1,
- "vehicle": "campground_vehicles",
- "x": 18,
- "y": 32
- },
- { "chance": 25, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "campground_vehicles", "x": 7, "y": 34 },
- {
- "chance": 25,
- "fuel": -1,
- "rotation": 270,
- "status": -1,
- "vehicle": "campground_vehicles",
- "x": 17,
- "y": 40
- },
- { "chance": 10, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "rv", "x": 42, "y": 27 },
- { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 35, "y": 43 }
- ],
"rows": [
"_____________________ssssss_ss_......sssssssss__",
"_______sssssssssssssssbbbbs__ss......|ww||||||||",
@@ -113,11 +55,61 @@
"______________sssssss#####sssssssss____ssssss___",
"____________________ssssss______________________"
],
- "palettes": [ "campground_palette" ]
- },
- "om_terrain": [ [ "campground_1a", "campground_1b" ], [ "campground_2a", "campground_2b" ] ],
- "type": "mapgen",
- "weight": 100
+ "palettes": [ "campground_palette" ],
+ "items": {
+ ";": [
+ { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+ { "item": "creepy", "chance": 2 },
+ { "item": "camping", "chance": 5 },
+ { "item": "archery", "chance": 2 }
+ ],
+ ",": [
+ { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+ { "item": "creepy", "chance": 2 },
+ { "item": "camping", "chance": 5 },
+ { "item": "archery", "chance": 2 }
+ ],
+ "t": [
+ { "item": "barbecue", "chance": 5, "repeat": [ 1, 2 ] },
+ { "item": "misc_smoking", "chance": 2 },
+ { "item": "cannedfood", "chance": 2, "repeat": [ 1, 2 ] }
+ ]
+ },
+ "place_monsters": [
+ { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 8, 18 ], "y": [ 7, 22 ] },
+ { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 2, 15 ], "repeat": [ 0, 2 ] },
+ { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 3, 17 ], "y": [ 32, 46 ] },
+ { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] },
+ { "monster": "GROUP_PARK_ANIMAL", "x": [ 30, 46 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] }
+ ],
+ "place_vehicles": [
+ { "chance": 25, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 5 },
+ { "chance": 25, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
+ { "chance": 50, "fuel": 20, "rotation": 0, "status": -1, "vehicle": "lux_rv", "x": 42, "y": 18 },
+ {
+ "chance": 25,
+ "fuel": 15,
+ "rotation": 180,
+ "status": -1,
+ "vehicle": "campground_vehicles",
+ "x": 26,
+ "y": 14
+ },
+ { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 22, "y": 31 },
+ { "chance": 25, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "campground_vehicles", "x": 7, "y": 34 },
+ {
+ "chance": 25,
+ "fuel": -1,
+ "rotation": 270,
+ "status": -1,
+ "vehicle": "campground_vehicles",
+ "x": 17,
+ "y": 41
+ },
+ { "chance": 10, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "rv", "x": 42, "y": 27 },
+ { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 34, "y": 41 }
+ ]
+ }
},
{
"method": "json",
diff --git a/data/json/mapgen_palettes/campground.json b/data/json/mapgen_palettes/campground.json
index c14a2f34e06..3d659fb5018 100644
--- a/data/json/mapgen_palettes/campground.json
+++ b/data/json/mapgen_palettes/campground.json
@@ -32,7 +32,6 @@
"h": "f_chair",
"H": "f_camp_chair",
"#": "f_large_canvas_wall",
- "&": "f_toilet",
";": "f_large_groundsheet",
",": "f_center_groundsheet",
"B": "f_brazier",
@@ -42,6 +41,7 @@
"t": "f_table",
"n": "f_tourist_table",
"o": "f_firering"
- }
+ },
+ "toilets": { "&": { } }
}
]
--
2.42.0
|
