Merge branch 'master-cr' into experimental

cataclysmbnteam · Nov 14, 2017 · 4eeb5ad · 4eeb5ad
2 parents 799477d + 23c1512
commit 4eeb5ad
Show file tree

Hide file tree

Showing 186 changed files with 4,831 additions and 4,467 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,10 +89,10 @@ IF (NOT DYNAMIC_LINKING)
 	SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
 	SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
 ELSE (NOT DYNAMIC_LINKING)
-	IF(MINGW)
+	IF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		# Avoid depending on MinGW runtime DLLs
 		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-	ENDIF(MINGW)
+	ENDIF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 ENDIF (NOT DYNAMIC_LINKING)
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES Windows)

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -101,6 +101,12 @@
     "name": "SPARE PARTS",
     "sort_rank": 8
   },
+  {
+    "id": "artifacts",
+    "type": "ITEM_CATEGORY",
+    "name": "ARTIFACTS",
+    "sort_rank": 10
+  },
   {
     "id": "armor",
     "type": "ITEM_CATEGORY",

diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -323,6 +323,7 @@
       ["holybook_granth", 2],
       ["holybook_mormon", 1],
       ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
       ["holybook_pastafarian", 1],
       ["holybook_slack", 1],
       ["holybook_kallisti", 1],
@@ -993,6 +994,7 @@
       ["holybook_granth", 2],
       ["holybook_mormon", 1],
       ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
       ["holybook_pastafarian", 1],
       ["holybook_slack", 1],
       ["holybook_kallisti", 1],
@@ -3099,8 +3101,9 @@
       [ "holybook_sutras", 1 ],
       [ "holybook_granth", 1 ],
       [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_pastafarian", 1 ],
+      ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
+      ["holybook_pastafarian", 1],
       [ "holybook_slack", 1 ],
       [ "holybook_kallisti", 1 ],
       [ "holybook_scientology", 1 ],
@@ -3154,8 +3157,9 @@
       [ "holybook_sutras", 2 ],
       [ "holybook_granth", 2 ],
       [ "holybook_mormon", 2 ],
-      [ "holybook_kojiki", 2 ],
-      [ "holybook_pastafarian", 2 ],
+      ["holybook_kojiki", 2],
+      ["holybook_havamal", 2],
+      ["holybook_pastafarian", 2],
       [ "holybook_slack", 2 ],
       [ "holybook_kallisti", 2 ],
       [ "holybook_scientology", 2 ],
@@ -3679,6 +3683,7 @@
       ["holybook_granth", 2],
       ["holybook_mormon", 1],
       ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
       ["holybook_pastafarian", 1],
       ["holybook_slack", 1],
       ["holybook_kallisti", 1],
@@ -4133,6 +4138,7 @@
       ["holybook_granth", 2],
       ["holybook_mormon", 1],
       ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
       ["holybook_pastafarian", 1],
       ["holybook_slack", 1],
       ["holybook_kallisti", 1],
@@ -5448,6 +5454,7 @@
       ["holybook_granth", 1],
       ["holybook_mormon", 1],
       ["holybook_kojiki", 1],
+      ["holybook_havamal", 1],
       ["holybook_pastafarian", 1],
       ["holybook_slack", 1],
       ["holybook_kallisti", 1],

diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json
@@ -56,7 +56,7 @@
     "id": "reloaded_762_25",
     "copy-from": "762_25hot",
     "type": "AMMO",
-    "name": "reloaded 7.62x25",
+    "name": "reloaded 7.62x25mm",
     "proportional": {
       "price": 0.7,
       "damage": 0.9,

diff --git a/data/json/items/archery.json b/data/json/items/archery.json
@@ -1,136 +1,4 @@
 [
-   {
-      "type" : "AMMO",
-      "id" : "arrowhead",
-      "price" : 300,
-      "name" : "arrowhead",
-      "symbol" : "=",
-      "color" : "light_gray",
-      "description" : "Steel heads for an arrow.  Placing these on arrows will make them more damaging and piercing.",
-      "material" : "steel",
-      "volume" : 1,
-      "weight" : 8,
-      "bashing" : 1,
-      "ammo_type" : "components",
-      "count" : 10,
-      "stack_size" : 20
-   },
-   {
-      "type" : "AMMO",
-      "id" : "shaft_wood",
-      "category" : "spare_parts",
-      "price" : 500,
-      "name" : "wooden arrow shaft",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A crude shaft made from wood.  It needs arrowheads and fletching to become a functional arrow.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 42,
-      "bashing" : 1,
-      "ammo_type" : "components",
-      "dispersion" : 510,
-      "count" : 10
-   },
-   {
-      "type" : "AMMO",
-      "id" : "shaft_wood_heavy",
-      "price" : 500,
-      "category" : "spare_parts",
-      "name" : "heavy wooden arrow shaft",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A heavy shaft made from wood.  It needs arrowheads and fletching to become a functional arrow.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 48,
-      "bashing" : 2,
-      "ammo_type" : "components",
-      "damage" : 2,
-      "range" : 1,
-      "dispersion" : 345,
-      "count" : 10
-   },
-   {
-      "type" : "AMMO",
-      "id" : "shaft_metal",
-      "price" : 1000,
-      "category" : "spare_parts",
-      "name" : "metal arrow shaft",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A heavy shaft made from scrap metal.  It needs arrowheads and fletching to become a functional arrow.",
-      "material" : "steel",
-      "volume" : 1,
-      "weight" : 54,
-      "bashing" : 3,
-      "ammo_type" : "components",
-      "damage" : 3,
-      "range" : 3,
-      "dispersion" : 360,
-      "count" : 10
-   },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_fire_hardened",
-      "price" : 500,
-      "category" : "spare_parts",
-      "name" : "unfletched fire-hardened wooden arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A simple arrow shaft that has had a point carved into it and then fire-hardened.  It needs fletching to be worth firing from a bow.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 42,
-      "bashing" : 2,
-      "ammo_type" : "components",
-      "damage" : 3,
-      "range" : 2,
-      "dispersion" : 435,
-      "count" : 10,
-      "effects" : ["RECOVER_5"]
-   },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_field_point",
-      "price" : 700,
-      "category" : "spare_parts",
-      "name" : "unfletched field point wooden arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A simple arrow shaft that has a crude arrowhead.  Useful for hunting small woodland creatures, but needs fletching before it is worth firing.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 44,
-      "bashing" : 3,
-      "ammo_type" : "components",
-      "damage" : 6,
-      "pierce" : 1,
-      "range" : 2,
-      "dispersion" : 435,
-      "count" : 10,
-      "effects" : ["RECOVER_5"]
-   },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_small_game",
-      "price" : 600,
-      "category" : "spare_parts",
-      "name" : "unfletched small game arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "A simple arrow shaft that has a wide blunt head.  Useful for hunting small woodland creatures without splattering them all over the ground, but needs fletching before it is worth firing.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 44,
-      "bashing" : 4,
-      "ammo_type" : "components",
-      "damage" : 2,
-      "range" : 2,
-      "dispersion" : 435,
-      "count" : 10,
-      "effects" : [ "RECOVER_5", "NOGIB" ]
-   },
    {
       "type" : "AMMO",
       "id" : "arrow_fire_hardened_fletched",
@@ -235,48 +103,6 @@
       "count" : 10,
       "effects" : ["RECOVER_10"]
    },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_heavy_fire_hardened",
-      "price" : 1000,
-      "category" : "spare_parts",
-      "name" : "unfletched heavy fire-hardened arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "This arrow is significantly sturdier than other wooden arrows.  It has a fire-hardened point, but needs fletching to be worth firing.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 49,
-      "bashing" : 4,
-      "ammo_type" : "components",
-      "damage" : 5,
-      "pierce" : 2,
-      "range" : 2,
-      "dispersion" : 375,
-      "count" : 10,
-      "effects" : ["RECOVER_10"]
-   },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_heavy_field_point",
-      "price" : 1000,
-      "category" : "spare_parts",
-      "name" : "unfletched heavy field point arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "This arrow is significantly sturdier than other wooden arrows.  It has a field point tip, but needs fletching before it is worth firing.",
-      "material" : "wood",
-      "volume" : 1,
-      "weight" : 49,
-      "bashing" : 4,
-      "ammo_type" : "components",
-      "damage" : 6,
-      "pierce" : 3,
-      "range" : 2,
-      "dispersion" : 325,
-      "count" : 10,
-      "effects" : ["RECOVER_10"]
-   },
    {
       "type" : "AMMO",
       "id" : "arrow_heavy_field_point_fletched",
@@ -319,27 +145,6 @@
       "loudness": 0,
       "count" : 10,
       "effects" : ["RECOVER_10"]
-   },
-   {
-      "type" : "AMMO",
-      "id" : "arrow_metal_sharpened",
-      "price" : 1000,
-      "category" : "spare_parts",
-      "name" : "unfletched sharpened metal arrow",
-      "symbol" : "=",
-      "color" : "green",
-      "description" : "This metal shaft has been carefully sharpened so that it has a crude point at the end.  It needs fletching to be worth firing from a bow.",
-      "material" : "steel",
-      "volume" : 1,
-      "weight" : 55,
-      "bashing" : 2,
-      "ammo_type" : "components",
-      "damage" : 5,
-      "pierce" : 3,
-      "range" : 5,
-      "dispersion" : 285,
-      "count" : 10,
-      "effects" : ["RECOVER_15"]
     },
     {
       "type" : "AMMO",
@@ -700,38 +505,6 @@
       "clip_size" : 1,
       "reload" : 80,
       "valid_mod_locations": [["underbarrel", 1],[ "sights", 1 ],[ "accessories", 2 ]]
-   },
-   {
-      "id":"shaft_plastic",
-      "type":"AMMO",
-      "symbol":"=",
-      "color":"green",
-      "name":"plastic shaft",
-      "description":"A crude shaft made from plastic.  It needs arrowheads and fletching to become a functional arrow.",
-      "price": 100,
-      "category" : "spare_parts",
-      "material":"plastic",
-      "bashing":1,
-      "weight":6,
-      "volume":1,
-      "ammo_type":"components",
-      "dispersion":600,
-      "count":10
-   },
-   {
-      "id":"arrowhead_plastic",
-      "type":"AMMO",
-      "color":"green",
-      "symbol":"=",
-      "name":"plastic arrowhead",
-      "description":"Plastic heads for an arrow.  Placing these on arrows will make them more damaging and piercing.",
-      "price": 100,
-      "material":"plastic",
-      "bashing":1,
-      "weight":1,
-      "volume":1,
-      "ammo_type":"components",
-      "count":10
    },
     {   "type" : "AMMO",
         "id" : "throwing_knife",

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -2943,7 +2943,7 @@
     "type": "ARMOR",
     "name": "pair of eclipse glasses",
     "name_plural": "pairs of eclipse glasses",
-    "description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminium coating. They allow safely staring at extremely bright and harmful sources of light like the sun during a solar eclipse.",
+    "description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminium coating.  They allow safely staring at extremely bright and harmful sources of light like the sun during a solar eclipse.",
     "weight": 27,
     "volume": 1,
     "price": 2500,

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -810,7 +810,7 @@
     "warmth": 20,
     "material_thickness": 3,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "ROLLER_INLINE" ]
   },
   {
     "id": "rollerskates",
@@ -832,7 +832,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "ROLLER_QUAD" ]
   },
   {
     "id": "shoes_birchbark",
@@ -947,7 +947,7 @@
     "encumbrance": 25,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "FIN" ]
   },
   {
     "id": "thigh_high_boots",