Merge pull request CleverRaven#26 from CleverRaven/master

include updated relics
John-Candlebury · Aug 8, 2020 · 30237d0 · 30237d0
2 parents c2430e3 + 6a34646
commit 30237d0
Show file tree

Hide file tree

Showing 502 changed files with 8,397 additions and 2,826 deletions.
diff --git a/.gitignore b/.gitignore
@@ -193,7 +193,7 @@ Xcode/
 /build-dir/
 
 # precompiled headers
-/pch/pch.hpp.gch
-/pch/pch.hpp.pch
-/tests/pch/pch.hpp.gch
-/tests/pch/pch.hpp.pch
+/pch/main-pch.hpp.gch
+/pch/main-pch.hpp.pch
+/tests/pch/tests-pch.hpp.gch
+/tests/pch/tests-pch.hpp.pch
diff --git a/Makefile b/Makefile
@@ -397,20 +397,20 @@ endif
 
 ifeq ($(PCH), 1)
   PCHFLAGS = -Ipch -Winvalid-pch
-  PCH_H = pch/pch.hpp
+  PCH_H = pch/main-pch.hpp
 
   ifeq ($(CLANG), 0)
-    PCHFLAGS += -fpch-preprocess -include pch.hpp
-    PCH_P = pch/pch.hpp.gch
+    PCHFLAGS += -fpch-preprocess -include main-pch.hpp
+    PCH_P = $(PCH_H).gch
   else
-    PCH_P = pch/pch.hpp.pch
+    PCH_P = $(PCH_H).pch
     PCHFLAGS += -include-pch $(PCH_P)
 
     # FIXME: dirty hack ahead
     # ccache won't wort with clang unless it supports -fno-pch-timestamp
     ifeq ($(CCACHE), 1)
-      CLANGVER := $(shell echo 'int main(void){return 0;}'|$(CXX) -Xclang -fno-pch-timestamp -x c++ -o $(ODIR)/__bla__.o - 2>&1)
-      ifneq ($(.SHELLSTATUS), 0)
+      CLANGVER := $(shell echo 'int main(void){return 0;}'|$(CXX) -Xclang -fno-pch-timestamp -x c++ -o _clang_ver.o -c - 2>&1 || echo fail)
+      ifneq ($(CLANGVER),)
         PCHFLAGS = ""
         PCH_H = ""
         PCH_P = ""
@@ -934,7 +934,7 @@ clean: clean-tests
 	rm -rf *$(BINDIST_DIR) *cataclysmdda-*.tar.gz *cataclysmdda-*.zip
 	rm -f $(SRC_DIR)/version.h
 	rm -f $(CHKJSON_BIN)
-	rm -f pch/pch.hpp.{gch,pch}
+	rm -f pch/*pch.hpp.{gch,pch,d}
 
 distclean:
 	rm -rf *$(BINDIST_DIR)
@@ -1118,7 +1118,7 @@ ifdef LANGUAGES
 endif
 	$(BINDIST_CMD)
 
-export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM CLANG PCH
+export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM CLANG PCH PCHFLAGS
 
 ctags: $(ASTYLE_SOURCES)
 	ctags $^

diff --git a/data/json/artifact/artifact_item_types.json b/data/json/artifact/artifact_item_types.json
@@ -0,0 +1,186 @@
+[
+  {
+    "id": "art_sphere",
+    "type": "GENERIC",
+    "name": { "str": "smooth sphere" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "1 L",
+    "weight": "1 kg",
+    "to_hit": -1,
+    "bashing": 3
+  },
+  {
+    "id": "art_rod",
+    "type": "GENERIC",
+    "name": { "str": "slim rod" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "|",
+    "volume": "235 ml",
+    "weight": "300 g",
+    "longest_side": "75 cm",
+    "to_hit": 1,
+    "bashing": 5
+  },
+  {
+    "id": "art_teardrop",
+    "type": "GENERIC",
+    "name": { "str": "teardrop-shaped stone" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "35 ml",
+    "weight": "50 g",
+    "to_hit": -2
+  },
+  {
+    "id": "art_lamp",
+    "type": "GENERIC",
+    "name": { "str": "hollow, transparent cube" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "[",
+    "volume": "1 L",
+    "weight": "80 g",
+    "to_hit": -2
+  },
+  {
+    "id": "art_snake",
+    "type": "GENERIC",
+    "name": { "str": "winding, flexible rod" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "S",
+    "volume": "215 ml",
+    "weight": "300 g",
+    "longest_side": "65 cm",
+    "to_hit": 1,
+    "bashing": 5
+  },
+  {
+    "id": "art_disc",
+    "type": "GENERIC",
+    "name": { "str": "smooth disc" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "340 ml",
+    "weight": "575 g",
+    "to_hit": -1,
+    "bashing": 3
+  },
+  {
+    "id": "art_beads",
+    "type": "GENERIC",
+    "name": { "str": "string of beads" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "76 ml",
+    "weight": "125 g",
+    "to_hit": -2
+  },
+  {
+    "id": "art_napkin",
+    "type": "GENERIC",
+    "name": { "str": "very thin sheet" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "[",
+    "volume": "2 ml",
+    "weight": "1 g",
+    "to_hit": -3
+  },
+  {
+    "id": "art_urchin",
+    "type": "GENERIC",
+    "name": { "str": "spiked sphere" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "1 L",
+    "weight": "800 g",
+    "to_hit": -2,
+    "cutting": 3
+  },
+  {
+    "id": "art_jelly",
+    "type": "GENERIC",
+    "name": { "str": "malleable blob" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "O",
+    "volume": "1 L",
+    "weight": "800 g",
+    "to_hit": -1
+  },
+  {
+    "id": "art_spiral",
+    "type": "GENERIC",
+    "name": { "str": "spiraling rod" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "@",
+    "volume": "3400 ml",
+    "weight": "300 g",
+    "longest_side": "30 cm",
+    "to_hit": -4,
+    "bashing": 4
+  },
+  {
+    "id": "art_pin",
+    "type": "GENERIC",
+    "name": { "str": "small pin" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "|",
+    "volume": "1 ml",
+    "weight": "50 mg",
+    "longest_side": "2 cm",
+    "to_hit": -5,
+    "cutting": 1
+  },
+  {
+    "id": "art_tube",
+    "type": "GENERIC",
+    "name": { "str": "hollow tube" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "|",
+    "volume": "188 ml",
+    "weight": "50 mg",
+    "longest_side": "15 cm",
+    "bashing": 3
+  },
+  {
+    "id": "art_pyramid",
+    "type": "GENERIC",
+    "name": { "str": "regular tetrahedron" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "A",
+    "volume": "1 L",
+    "weight": "1 kg",
+    "to_hit": -1,
+    "bashing": 3
+  },
+  {
+    "id": "art_crystal",
+    "type": "GENERIC",
+    "name": { "str": "transluscent crystal" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "A",
+    "volume": "500 ml",
+    "weight": "400 g",
+    "to_hit": -1,
+    "bashing": 3
+  },
+  {
+    "id": "art_knot",
+    "type": "GENERIC",
+    "name": { "str": "twisted, knotted cord" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "b",
+    "volume": "400 ml",
+    "weight": "400 g",
+    "bashing": 2
+  },
+  {
+    "id": "art_crescent",
+    "type": "GENERIC",
+    "name": { "str": "crescent-shaped stone" },
+    "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "symbol": "C",
+    "volume": "35 ml",
+    "weight": "50 g",
+    "to_hit": -2
+  }
+]
diff --git a/data/json/legacy_artifact_active.json → ...json/artifact/legacy_artifact_active.json b/data/json/legacy_artifact_active.json → ...json/artifact/legacy_artifact_active.json
diff --git a/data/json/legacy_artifact_passive.json → ...son/artifact/legacy_artifact_passive.json b/data/json/legacy_artifact_passive.json → ...son/artifact/legacy_artifact_passive.json