Skip to content

Commit 8ca6930

Browse files
PatrikLundellkevingranadeMaleclypse
authored
parameterized field base camp ver 1 (CleverRaven#64304)
* parameterized field base camp ver 1 * second formatter path with tool gets files missed by first try --------- Co-authored-by: Kevin Granade <[email protected]> Co-authored-by: Maleclypse <[email protected]>
1 parent a8d4ad8 commit 8ca6930

28 files changed

+1752
-6007
lines changed

.github/vcpkg_ports/sdl2/vcpkg.json

+8-41
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,21 @@
55
"homepage": "https://www.libsdl.org/download-2.0.php",
66
"license": "Zlib",
77
"dependencies": [
8-
{
9-
"name": "vcpkg-cmake",
10-
"host": true
11-
},
12-
{
13-
"name": "vcpkg-cmake-config",
14-
"host": true
15-
}
8+
{ "name": "vcpkg-cmake", "host": true },
9+
{ "name": "vcpkg-cmake-config", "host": true }
1610
],
1711
"default-features": [
1812
"base"
1913
],
2014
"features": {
2115
"base": {
2216
"description": "Base functionality for SDL",
23-
"dependencies": [
24-
{
25-
"name": "sdl2",
26-
"default-features": false,
27-
"features": [
28-
"ibus",
29-
"wayland",
30-
"x11"
31-
],
32-
"platform": "linux"
33-
}
34-
]
35-
},
36-
"ibus": {
37-
"description": "Build with ibus IME support",
38-
"supports": "linux"
39-
},
40-
"samplerate": {
41-
"description": "Use libsamplerate for audio rate conversion",
42-
"dependencies": [
43-
"libsamplerate"
44-
]
45-
},
46-
"vulkan": {
47-
"description": "Vulkan functionality for SDL"
48-
},
49-
"wayland": {
50-
"description": "Build with Wayland support",
51-
"supports": "linux"
17+
"dependencies": [ { "name": "sdl2", "default-features": false, "features": [ "ibus", "wayland", "x11" ], "platform": "linux" } ]
5218
},
53-
"x11": {
54-
"description": "Build with X11 support",
55-
"supports": "!windows"
56-
}
19+
"ibus": { "description": "Build with ibus IME support", "supports": "linux" },
20+
"samplerate": { "description": "Use libsamplerate for audio rate conversion", "dependencies": [ "libsamplerate" ] },
21+
"vulkan": { "description": "Vulkan functionality for SDL" },
22+
"wayland": { "description": "Build with Wayland support", "supports": "linux" },
23+
"x11": { "description": "Build with X11 support", "supports": "!windows" }
5724
}
5825
}
+16-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
{
2-
"problemMatcher": [
2+
"problemMatcher": [
3+
{
4+
"owner": "cata-catch2",
5+
"pattern": [
36
{
4-
"owner": "cata-catch2",
5-
"pattern": [
6-
{
7-
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(?:\\.\\./)*([^:]*):(\\d+): .*FAILED:.*$",
8-
"file": 1,
9-
"line": 2
10-
},
11-
{
12-
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$",
13-
"code": 1
14-
},
15-
{
16-
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(with expansion|due to a fatal error condition):$"
17-
},
18-
{
19-
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$",
20-
"message": 1
21-
}
22-
]
23-
}
24-
]
7+
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(?:\\.\\./)*([^:]*):(\\d+): .*FAILED:.*$",
8+
"file": 1,
9+
"line": 2
10+
},
11+
{ "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$", "code": 1 },
12+
{
13+
"regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(with expansion|due to a fatal error condition):$"
14+
},
15+
{ "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$", "message": 1 }
16+
]
17+
}
18+
]
2519
}

data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"w.... ",
1414
"wwwww "
1515
],
16-
"palettes": [ "fbmh_log_palette" ]
16+
"palettes": [ "fbmh_0_log_palette" ]
1717
}
1818
},
1919
{
@@ -30,7 +30,7 @@
3030
"w.... ",
3131
"wwwww "
3232
],
33-
"palettes": [ "fbmh_metal_palette" ]
33+
"palettes": [ "fbmh_0_metal_palette" ]
3434
}
3535
},
3636
{
@@ -47,7 +47,7 @@
4747
"w.... ",
4848
"wwwww "
4949
],
50-
"palettes": [ "fbmh_migo_resin_palette" ]
50+
"palettes": [ "fbmh_0_migo_resin_palette" ]
5151
}
5252
},
5353
{
@@ -64,7 +64,7 @@
6464
"w.... ",
6565
"wwwww "
6666
],
67-
"palettes": [ "fbmh_rammed_earth_palette" ]
67+
"palettes": [ "fbmh_0_rammed_earth_palette" ]
6868
}
6969
},
7070
{
@@ -81,7 +81,7 @@
8181
"w.... ",
8282
"wwwww "
8383
],
84-
"palettes": [ "fbmh_rock_palette" ]
84+
"palettes": [ "fbmh_0_rock_palette" ]
8585
}
8686
},
8787
{
@@ -98,7 +98,7 @@
9898
"w.... ",
9999
"wwwww "
100100
],
101-
"palettes": [ "fbmh_wad_palette" ]
101+
"palettes": [ "fbmh_0_wad_palette" ]
102102
}
103103
},
104104
{
@@ -115,7 +115,7 @@
115115
"w.... ",
116116
"wwwww "
117117
],
118-
"palettes": [ "fbmh_wood_palette" ]
118+
"palettes": [ "fbmh_0_wood_palette" ]
119119
}
120120
},
121121
{

data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"w ...w",
1414
"ww+vww"
1515
],
16-
"palettes": [ "fbmh_migo_resin_palette" ]
16+
"palettes": [ "fbmh_0_migo_resin_palette" ]
1717
}
1818
},
1919
{

data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"w ...w",
1414
"ww+vww"
1515
],
16-
"palettes": [ "fbmh_wood_palette" ]
16+
"palettes": [ "fbmh_0_wood_palette" ]
1717
}
1818
},
1919
{

0 commit comments

Comments
 (0)