Merge pull request #2 from CleverRaven/master

updating fork
Kilvoctu · Dec 19, 2019 · 5dd9b34 · 5dd9b34
2 parents 9e7a6df + 5bbd2b5
commit 5dd9b34
Show file tree

Hide file tree

Showing 87 changed files with 1,589 additions and 625 deletions.
diff --git a/Makefile b/Makefile
@@ -63,6 +63,8 @@
 #  make DYNAMIC_LINKING=1
 # Use MSYS2 as the build environment on Windows
 #  make MSYS2=1
+# Turn off all optimizations, even debug-friendly optimizations
+#  make NOOPT=1
 # Astyle all source files.
 #  make astyle
 # Check if source files are styled properly.
@@ -303,10 +305,18 @@ ifdef RELEASE
 endif
 
 ifndef RELEASE
-  ifeq ($(shell $(CXX) -E -Og - < /dev/null > /dev/null 2>&1 && echo fog),fog)
-    OPTLEVEL = -Og
-  else
+  ifdef NOOPT
+    # While gcc claims to include all information required for
+    # debugging at -Og, at least with gcc 8.3, control flow
+    # doesn't move line-by-line at -Og.  Provide a command-line
+    # way to turn off optimization (make NOOPT=1) entirely.
     OPTLEVEL = -O0
+  else
+    ifeq ($(shell $(CXX) -E -Og - < /dev/null > /dev/null 2>&1 && echo fog),fog)
+      OPTLEVEL = -Og
+    else
+      OPTLEVEL = -O0
+    endif
   endif
   CXXFLAGS += $(OPTLEVEL)
 endif

diff --git a/build-scripts/get_all_mods.py b/build-scripts/get_all_mods.py
@@ -14,6 +14,6 @@
     mod_info = json.load(open(info))
     mods.extend(e["ident"] for e in mod_info if e["type"] == "MOD_INFO")
 
-mods_to_keep = [mod for mod in mods if mod not in blacklist]
+mods_to_keep = [mod for mod in mods if mod not in blacklist and mod != "dda"]
 
 print(','.join(mods_to_keep))
diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist
@@ -29,7 +29,6 @@ No_Anthills
 No_Bees
 no_faults
 no_filthy_clothing
-No_Fungi
 no_medieval_items
 no_npc_food
 No_Rail_Stations

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1117,6 +1117,30 @@
     "pre_terrain": "t_rock_wall_half",
     "post_terrain": "t_rock_wall"
   },
+  {
+    "type": "construction",
+    "description": "Build Dry Stone Wall",
+    "//": "Step 1: half the wall",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 1 ] ],
+    "time": "180 m",
+    "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
+    "components": [ [ [ "rock", 12 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "t_drystone_wall_half"
+  },
+  {
+    "type": "construction",
+    "description": "Build Dry Stone Wall",
+    "//": "Step 2: the full wall",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "180 m",
+    "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "rock", 16 ] ] ],
+    "pre_terrain": "t_drystone_wall_half",
+    "post_terrain": "t_drystone_wall"
+  },
   {
     "type": "construction",
     "description": "Build Pony Wall",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -666,6 +666,12 @@
     "context": [ "SPELL" ],
     "//": "Chooses a spell at random to cast from extra_effects.  See MAGIC.md for details"
   },
+  {
+    "id": "PAIN_NORESIST",
+    "type": "json_flag",
+    "context": [ "SPELL" ],
+    "//": "pain altering spells can't be resisted (like with the deadened trait)"
+  },
   {
     "id": "NON_THRESH",
     "type": "json_flag",

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -1323,5 +1323,46 @@
         { "item": "scrap", "count": [ 2, 4 ] }
       ]
     }
+  },
+  {
+    "type": "terrain",
+    "id": "t_drystone_wall",
+    "name": "field stone wall",
+    "description": "A sturdy dry stone wall.  Just rocks fitted together without mortar.",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "move_cost": 0,
+    "coverage": 100,
+    "roof": "t_flat_roof",
+    "flags": [ "NOITEM", "WALL", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "connects_to": "WALL",
+    "bash": {
+      "str_min": 50,
+      "str_max": 200,
+      "sound": "crash!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [ { "item": "rock", "count": [ 8, 18 ] }, { "item": "pebble", "count": [ 20, 38 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_drystone_wall_half",
+    "name": "field stone half-wall",
+    "description": "A half height sturdy dry stone wall.  Just rocks fitted together without mortar.  Complete as is or with extensive work it could be doubled in height.",
+    "symbol": "#",
+    "color": "light_gray",
+    "move_cost": 4,
+    "coverage": 60,
+    "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "MINEABLE" ],
+    "connects_to": "WALL",
+    "bash": {
+      "str_min": 30,
+      "str_max": 120,
+      "sound": "crash!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [ { "item": "rock", "count": [ 3, 8 ] }, { "item": "pebble", "count": [ 20, 38 ] } ]
+    }
   }
 ]
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -516,7 +516,93 @@
       [ "jade_brooch", 80 ],
       [ "pearl_collar", 50 ],
       [ "silver_bracelet", 30 ],
-      [ "gold_bracelet", 20 ]
+      [ "gold_bracelet", 20 ],
+      { "group": "earrings_silver", "prob": 10 },
+      { "group": "earrings_gold", "prob": 10 },
+      { "group": "earrings_platinum", "prob": 10 }
+    ]
+  },
+  {
+    "id": "dental_grills",
+    "type": "item_group",
+    "items": [
+      [ "gold_dental_grill", 50 ],
+      [ "platinum_dental_grill", 50 ],
+      [ "citrine_dental_grill", 50 ],
+      [ "diamond_dental_grill", 50 ],
+      [ "emerald_dental_grill", 50 ],
+      [ "peridot_dental_grill", 50 ],
+      [ "amethyst_dental_grill", 50 ],
+      [ "sapphire_dental_grill", 50 ],
+      [ "aquamarine_dental_grill", 50 ],
+      [ "blue_topaz_dental_grill", 50 ],
+      [ "tourmaline_dental_grill", 50 ],
+      [ "alexandrite_dental_grill", 50 ],
+      [ "ruby_dental_grill", 50 ],
+      [ "garnet_dental_grill", 50 ]
+    ]
+  },
+  {
+    "id": "earrings_silver",
+    "type": "item_group",
+    "items": [
+      [ "silver_ear", 50 ],
+      [ "citrine_silver_earring", 50 ],
+      [ "diamond_silver_earring", 50 ],
+      [ "emerald_silver_earring", 50 ],
+      [ "peridot_silver_earring", 50 ],
+      [ "amethyst_silver_earring", 50 ],
+      [ "sapphire_silver_earring", 50 ],
+      [ "aquamarine_silver_earring", 50 ],
+      [ "blue_topaz_silver_earring", 50 ],
+      [ "tourmaline_silver_earring", 50 ],
+      [ "alexandrite_silver_earring", 50 ],
+      [ "pearl_silver_earring", 50 ],
+      [ "opal_silver_earring", 50 ],
+      [ "ruby_silver_earring", 50 ],
+      [ "garnet_silver_earring", 50 ]
+    ]
+  },
+  {
+    "id": "earrings_gold",
+    "type": "item_group",
+    "items": [
+      [ "gold_ear", 50 ],
+      [ "citrine_gold_earring", 50 ],
+      [ "diamond_gold_earring", 50 ],
+      [ "emerald_gold_earring", 50 ],
+      [ "peridot_gold_earring", 50 ],
+      [ "amethyst_gold_earring", 50 ],
+      [ "sapphire_gold_earring", 50 ],
+      [ "aquamarine_gold_earring", 50 ],
+      [ "blue_topaz_gold_earring", 50 ],
+      [ "tourmaline_gold_earring", 50 ],
+      [ "alexandrite_gold_earring", 50 ],
+      [ "pearl_gold_earring", 50 ],
+      [ "opal_gold_earring", 50 ],
+      [ "ruby_gold_earring", 50 ],
+      [ "garnet_gold_earring", 50 ]
+    ]
+  },
+  {
+    "id": "earrings_platinum",
+    "type": "item_group",
+    "items": [
+      [ "platinum_ear", 50 ],
+      [ "citrine_platinum_earring", 50 ],
+      [ "diamond_platinum_earring", 50 ],
+      [ "emerald_platinum_earring", 50 ],
+      [ "peridot_platinum_earring", 50 ],
+      [ "amethyst_platinum_earring", 50 ],
+      [ "sapphire_platinum_earring", 50 ],
+      [ "aquamarine_platinum_earring", 50 ],
+      [ "blue_topaz_platinum_earring", 50 ],
+      [ "tourmaline_platinum_earring", 50 ],
+      [ "alexandrite_platinum_earring", 50 ],
+      [ "pearl_platinum_earring", 50 ],
+      [ "opal_platinum_earring", 50 ],
+      [ "ruby_platinum_earring", 50 ],
+      [ "garnet_platinum_earring", 50 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -4010,6 +4010,11 @@
     "type": "item_group",
     "id": "jewelry_front",
     "items": [
+      { "group": "earrings_silver", "prob": 30 },
+      { "group": "earrings_gold", "prob": 10 },
+      { "group": "earrings_platinum", "prob": 5 },
+      { "group": "dental_grills", "prob": 10 },
+      { "group": "gemstones", "prob": 30 },
       [ "gold_ring", 30 ],
       [ "gold_ear", 30 ],
       [ "gold_bracelet", 30 ],
@@ -4117,7 +4122,34 @@
   {
     "type": "item_group",
     "id": "jewelry_safe",
-    "items": [ [ "platinum_small", 80 ], [ "gold_small", 80 ], [ "silver_small", 85 ], [ "diamond", 75 ] ]
+    "items": [
+      [ "platinum_small", 80 ],
+      [ "gold_small", 80 ],
+      [ "silver_small", 85 ],
+      [ "diamond", 75 ],
+      [ "diamond", 75 ],
+      { "group": "gemstones", "prob": 75 }
+    ]
+  },
+  {
+    "id": "gemstones",
+    "type": "item_group",
+    "items": [
+      [ "citrine", 50 ],
+      [ "diamond", 50 ],
+      [ "emerald", 50 ],
+      [ "peridot", 50 ],
+      [ "amethyst", 50 ],
+      [ "sapphire", 50 ],
+      [ "aquamarine", 50 ],
+      [ "blue_topaz", 50 ],
+      [ "tourmaline", 50 ],
+      [ "alexandrite", 50 ],
+      [ "pearl", 50 ],
+      [ "opal", 50 ],
+      [ "ruby", 50 ],
+      [ "garnet", 50 ]
+    ]
   },
   {
     "type": "item_group",