Merge branch 'spring-refactor' into test-release

.github/workflows/matrix.yml

@@ -7,6 +7,9 @@ on:
     paths-ignore:
       - doc/**
       - 'scripts/**'
+  merge_group:
+    branches:
+      - upload
   pull_request:
     branches:
       - upload

.gitignore

@@ -1,4 +1,3 @@
-!src/chkjson
 *.7z
 *.a
 *.d
@@ -41,7 +40,6 @@ cataclysm-tiles
 cataclysm-tiles.exe.manifest
 cataclysm-vcpkg
 cataclysmdda-*
-chkjson*
 debug.log
 logg.txt
 

CMakeLists.txt

@@ -390,9 +390,7 @@ endif ()
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(lang)
-if (NOT MSVC)
-    add_subdirectory(src/chkjson)
-endif ()
+
 add_subdirectory(tests)
 if (JSON_FORMAT)
     add_subdirectory(tools/format)

Makefile

@@ -163,7 +163,6 @@ else
 endif
 W32TILESTARGET = $(BUILD_PREFIX)$(TILES_TARGET_NAME).exe
 W32TARGET = $(BUILD_PREFIX)$(TARGET_NAME).exe
-CHKJSON_BIN = $(BUILD_PREFIX)chkjson
 BINDIST_DIR = $(BUILD_PREFIX)bindist
 BUILD_DIR = $(CURDIR)
 SRC_DIR = src
@@ -578,7 +577,6 @@ endif
 
 # Global settings for Windows targets
 ifeq ($(TARGETSYSTEM),WINDOWS)
-  CHKJSON_BIN = chkjson.exe
   TARGET = $(W32TARGET)
   BINDIST = $(W32BINDIST)
   BINDIST_CMD = $(W32BINDIST_CMD)
@@ -802,7 +800,6 @@ HEADERS := $(wildcard $(SRC_DIR)/*.h)
 TESTSRC := $(wildcard tests/*.cpp)
 TESTHDR := $(wildcard tests/*.h)
 JSON_FORMATTER_SOURCES := tools/format/format.cpp src/json.cpp
-CHKJSON_SOURCES := src/chkjson/chkjson.cpp src/json.cpp
 LUA_SOURCES := $(wildcard $(LUA_SRC_DIR)/*.c)
 CLANG_TIDY_PLUGIN_SOURCES := \
   $(wildcard tools/clang-tidy-plugin/*.cpp tools/clang-tidy-plugin/*/*.cpp)
@@ -814,7 +811,6 @@ ASTYLE_SOURCES := $(sort \
   $(TESTSRC) \
   $(TESTHDR) \
   $(JSON_FORMATTER_SOURCES) \
-  $(CHKJSON_SOURCES) \
   $(CLANG_TIDY_PLUGIN_SOURCES) \
   $(TOOLHDR))
 
@@ -961,19 +957,12 @@ src/version.cpp: src/version.h
 localization:
 	lang/compile_mo.sh $(LANGUAGES)
 
-$(CHKJSON_BIN): $(CHKJSON_SOURCES)
-	$(CXX) $(CXXFLAGS) $(TOOL_CXXFLAGS) -Isrc/chkjson -Isrc $(CHKJSON_SOURCES) -o $(CHKJSON_BIN)
-
-json-check: $(CHKJSON_BIN)
-	./$(CHKJSON_BIN)
-
 clean: clean-tests
 	rm -rf *$(TARGET_NAME) *$(TILES_TARGET_NAME)
 	rm -rf *$(TILES_TARGET_NAME).exe *$(TARGET_NAME).exe *$(TARGET_NAME).a
 	rm -rf *obj *objwin
 	rm -rf *$(BINDIST_DIR) *cataclysmbn-*.tar.gz *cataclysmbn-*.zip
 	rm -f $(SRC_DIR)/version.h
-	rm -f $(CHKJSON_BIN)
 	rm -f pch/*pch.hpp.gch
 	rm -f pch/*pch.hpp.pch
 	rm -f pch/*pch.hpp.d
@@ -1222,7 +1211,6 @@ cmake-format:
 		./CMakeLists.txt \
 		./data/CMakeLists.txt \
 		./lang/CMakeLists.txt \
-		./src/chkjson/CMakeLists.txt \
 		./src/CMakeLists.txt \
 		./src/version.cmake \
 		./tests/CMakeLists.txt \

build-scripts/build.sh

@@ -24,9 +24,6 @@ then
     make style-all-json-parallel RELEASE=1
 
     tools/dialogue_validator.py data/json/npcs/* data/json/npcs/*/* data/json/npcs/*/*/*
-    # Also build chkjson (even though we're not using it), to catch any
-    # compile errors there
-    make -j "$num_jobs" chkjson
 elif [ -n "$JUST_JSON" ]
 then
     echo "Early exit on just-json change"

data/json/construction.json

@@ -4200,6 +4200,62 @@
     "pre_special": "check_empty",
     "post_furniture": "f_battery_huge"
   },
+  {
+    "type": "construction",
+    "id": "constr_battery_small",
+    "group": "install_small_battery",
+    "category": "WORKSHOP",
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 1 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "soldering_standard", 10 ] ],
+    "components": [ [ [ "sheet_metal_small", 4 ] ], [ [ "cable", 5 ] ], [ [ "small_storage_battery", 1 ] ] ],
+    "pre_note": "Will only work if constructed in a building with an electric grid.",
+    "pre_special": "check_empty",
+    "post_furniture": "f_battery_small"
+  },
+  {
+    "type": "construction",
+    "id": "constr_battery_car",
+    "group": "install_car_battery",
+    "category": "WORKSHOP",
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 1 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "soldering_standard", 10 ] ],
+    "components": [ [ [ "sheet_metal_small", 4 ] ], [ [ "cable", 5 ] ], [ [ "battery_car", 1 ] ] ],
+    "pre_note": "Will only work if constructed in a building with an electric grid.",
+    "pre_special": "check_empty",
+    "post_furniture": "f_battery_car"
+  },
+  {
+    "type": "construction",
+    "id": "constr_battery_motorbike",
+    "group": "install_motorbike_battery",
+    "category": "WORKSHOP",
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 1 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "soldering_standard", 10 ] ],
+    "components": [ [ [ "sheet_metal_small", 4 ] ], [ [ "cable", 5 ] ], [ [ "battery_motorbike", 1 ] ] ],
+    "pre_note": "Will only work if constructed in a building with an electric grid.",
+    "pre_special": "check_empty",
+    "post_furniture": "f_battery_motorbike"
+  },
+  {
+    "type": "construction",
+    "id": "constr_battery_motorbike_small",
+    "group": "install_small_motorbike_battery",
+    "category": "WORKSHOP",
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 1 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "soldering_standard", 10 ] ],
+    "components": [ [ [ "sheet_metal_small", 4 ] ], [ [ "cable", 5 ] ], [ [ "battery_motorbike_small", 1 ] ] ],
+    "pre_note": "Will only work if constructed in a building with an electric grid.",
+    "pre_special": "check_empty",
+    "post_furniture": "f_battery_motorbike_small"
+  },
   {
     "type": "construction",
     "id": "constr_oven",

data/json/construction_group.json

@@ -964,6 +964,26 @@
     "id": "install_storage_battery",
     "name": "Install Storage Battery"
   },
+  {
+    "type": "construction_group",
+    "id": "install_small_battery",
+    "name": "Install Small Storage Battery"
+  },
+  {
+    "type": "construction_group",
+    "id": "install_car_battery",
+    "name": "Install Car Battery"
+  },
+  {
+    "type": "construction_group",
+    "id": "install_motorbike_battery",
+    "name": "Install Motorbike Battery"
+  },
+  {
+    "type": "construction_group",
+    "id": "install_small_motorbike_battery",
+    "name": "Install Small Motorbike Battery"
+  },
   {
     "type": "construction_group",
     "id": "install_upgraded_solar_panel",

data/json/external_tileset/External_Tileset_DP_Normal.json

@@ -43,7 +43,17 @@
             "fg": [ { "weight": 10, "sprite": 32 }, { "weight": 10, "sprite": 33 }, { "weight": 10, "sprite": 34 } ],
             "animated": false
           },
-          { "id": "corpse_mon_feral_human_chainsaw", "fg": 35 }
+          { "id": "corpse_mon_feral_human_chainsaw", "fg": 35 },
+          { "id": "shield_welded", "fg": 36 },
+          { "id": [ "overlay_worn_shield_welded", "overlay_wielded_shield_welded" ], "fg": 37 },
+          { "id": "shield_buckler", "fg": 38 },
+          { "id": [ "overlay_worn_shield_buckler", "overlay_wielded_shield_buckler" ], "fg": 39 },
+          { "id": "mask_cavalry_iron", "fg": 40 },
+          { "id": "overlay_worn_mask_cavalry_iron", "fg": 41 },
+          { "id": "mask_cavalry_bronze", "fg": 42 },
+          { "id": "overlay_worn_mask_cavalry_bronze", "fg": 43 },
+          { "id": "armguard_bronze", "fg": 44 },
+          { "id": "overlay_worn_armguard_bronze", "fg": 45 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

data/json/external_tileset/README.md

@@ -0,0 +1 @@
+../../../doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md