Merge pull request #27 from CleverRaven/master

BathroomBreakOct2

.github/workflows/pr-validator.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
     - master
+    types: [opened, edited, synchronize]
 jobs:
   validate:
     name: Validate PR
@@ -12,3 +13,4 @@ jobs:
         uses: CleverRaven/pr-validator@master
         with:
           description-regex: '(\n|^)\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*(\n|$)'
+          description-regex-flags: 'i'

.gitignore

@@ -104,6 +104,7 @@ nbproject/
 *.vim
 *.session
 .ycm_extra_conf.py
+.vimrc
 
 # taskwarrior files
 *.task*

.travis.yml

@@ -45,6 +45,7 @@ branches:
 # - SANITIZE=address
 # - LOCALIZE=0
 # - A clang-tidy run
+# - Tests with important mods enabled (Magiclysm, RL_Classes)
 # We try to minimize the number of builds subject to those constraints.
 
 # To see what toolchains are available, consult the following:
@@ -66,8 +67,8 @@ jobs:
 
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
-      env: COMPILER=g++ LOCALIZE=0
-      name: "GCC 5.3 Make build with curses and no Localization"
+      env: COMPILER=g++ MODS=--mods=magiclysm LOCALIZE=0
+      name: "GCC 5.3 Make build with curses, Magiclysm, and no Localization"
       compiler: gcc
       addons: &gcc53
         apt:

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Main project build script
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.1.4)
 
 PROJECT(CataclysmDDA)
 
@@ -225,10 +225,12 @@ ELSE()
 		-Wpedantic")
 	# Compact the whitespace in the warning string
 	string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} -std=c++14")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
 	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 ENDIF()
 
+SET(CMAKE_CXX_STANDARD 14)
+
 # Force out-of-source build
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	MESSAGE(FATAL_ERROR

data/json/bionics.json

@@ -1086,6 +1086,7 @@
     "fuel_options": [ "gasoline" ],
     "fuel_capacity": 500,
     "fuel_efficiency": 0.25,
+    "exothermic_power_gen": true,
     "time": 1,
     "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
   },

data/json/construction.json

@@ -3003,5 +3003,90 @@
     ],
     "pre_special": "check_empty",
     "post_terrain": "f_arcfurnace_empty"
+  },
+  {
+    "type": "construction",
+    "skill": "fabrication",
+    "description": "Build a bellow.",
+    "//": "faction camp workshop recipe",
+    "category": "CONSTRUCT",
+    "difficulty": 1,
+    "time": "60m",
+    "on_display": false,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "wire", 8 ] ] ],
+    "pre_flags": [ "FLAT" ],
+    "post_terrain": "f_bellows"
+  },
+  {
+    "type": "construction",
+    "skill": "fabrication",
+    "description": "Build a drop hammer.",
+    "//": "faction camp workshop recipe",
+    "category": "CONSTRUCT",
+    "difficulty": 3,
+    "time": "120m",
+    "on_display": false,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "metal_tank", 2 ] ], [ [ "water_faucet", 2 ] ], [ [ "anvil", 1 ] ], [ [ "chain", 4 ] ], [ [ "pipe", 3 ] ] ],
+    "pre_flags": [ "FLAT" ],
+    "post_terrain": "f_drophammer"
+  },
+  {
+    "type": "construction",
+    "skill": "fabrication",
+    "description": "Build a radio tower.",
+    "//": "faction camp workshop recipe",
+    "category": "CONSTRUCT",
+    "difficulty": 3,
+    "time": "24h",
+    "on_display": false,
+    "qualities": [
+      { "id": "HAMMER", "level": 2 },
+      { "id": "SAW_M", "level": 1 },
+      { "id": "WRENCH", "level": 1 },
+      { "id": "SCREW", "level": 1 }
+    ],
+    "components": [
+      [
+        [ "wind_turbine", 4 ],
+        [ "xl_wind_turbine", 1 ],
+        [ "solar_panel", 4 ],
+        [ "reinforced_solar_panel", 4 ],
+        [ "solar_panel_v2", 2 ],
+        [ "reinforced_solar_panel_v2", 2 ],
+        [ "solar_panel_v3", 1 ]
+      ],
+      [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ],
+      [ [ "sheet_metal", 2 ], [ "wire", 8 ] ],
+      [ [ "pipe", 24 ] ]
+    ],
+    "pre_flags": [ "FLAT" ],
+    "post_terrain": "t_radio_tower"
+  },
+  {
+    "type": "construction",
+    "skill": "fabrication",
+    "description": "Build a radio tower console.",
+    "//": "faction camp workshop recipe",
+    "category": "CONSTRUCT",
+    "difficulty": 3,
+    "time": "24h",
+    "on_display": false,
+    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "processor", 2 ] ],
+      [ [ "RAM", 2 ] ],
+      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "e_scrap", 8 ] ],
+      [ [ "frame", 1 ] ],
+      [ [ "circuit", 4 ] ],
+      [ [ "power_supply", 2 ] ],
+      [ [ "amplifier", 2 ] ],
+      [ [ "cable", 80 ] ],
+      [ [ "motor_small", 1 ], [ "motor_tiny", 2 ] ]
+    ],
+    "pre_flags": [ "FLAT" ],
+    "post_terrain": "t_radio_controls"
   }
 ]

data/json/effects.json

@@ -177,6 +177,12 @@
     "name": [ "Pet" ],
     "desc": [ "AI tag used for pet critters.  This is a bug if you have it." ]
   },
+  {
+    "type": "effect_type",
+    "id": "paid",
+    "name": [ "Paid" ],
+    "desc": [ "AI tag used for paid critters.  This is a bug if you have it." ]
+  },
   {
     "type": "effect_type",
     "id": "pacified",
@@ -254,6 +260,13 @@
     "name": [ "Got a check-up" ],
     "desc": [ "Your received a complete check-up and are now aware of the state of your health." ]
   },
+  {
+    "type": "effect_type",
+    "id": "heating_bionic",
+    "name": [ "Heated" ],
+    "max_intensity": 1000,
+    "desc": [ "At least one of your bionics is producing heat and warming you." ]
+  },
   {
     "type": "effect_type",
     "id": "winded",

data/json/emit.json

@@ -198,6 +198,34 @@
     "qty": 3,
     "chance": 100
   },
+  {
+    "id": "emit_hot_air1_cbm",
+    "type": "emit",
+    "field": "fd_hot_air1",
+    "intensity": 3,
+    "qty": 1
+  },
+  {
+    "id": "emit_hot_air2_cbm",
+    "type": "emit",
+    "field": "fd_hot_air2",
+    "intensity": 3,
+    "qty": 1
+  },
+  {
+    "id": "emit_hot_air3_cbm",
+    "type": "emit",
+    "field": "fd_hot_air3",
+    "intensity": 3,
+    "qty": 1
+  },
+  {
+    "id": "emit_hot_air4_cbm",
+    "type": "emit",
+    "field": "fd_hot_air4",
+    "intensity": 3,
+    "qty": 1
+  },
   {
     "id": "emit_glimmer",
     "type": "emit",

data/json/field_type.json

@@ -180,9 +180,39 @@
     "type": "field_type",
     "legacy_enum_id": 12,
     "intensity_levels": [
-      { "name": "thin smoke", "sym": "8", "dangerous": true, "translucency": 1 },
-      { "name": "smoke", "color": "light_gray", "transparent": false, "translucency": 10 },
-      { "name": "thick smoke", "color": "dark_gray", "translucency": 0 }
+      {
+        "name": "thin smoke",
+        "sym": "8",
+        "dangerous": true,
+        "translucency": 1,
+        "effect_id": "smoke",
+        "effect_body_part": "MOUTH",
+        "effect_intensity": 1,
+        "effect_min_duration": "2 seconds",
+        "effect_max_duration": "2 seconds",
+        "inside_immune": true
+      },
+      {
+        "name": "smoke",
+        "color": "light_gray",
+        "transparent": false,
+        "translucency": 10,
+        "effect_id": "smoke",
+        "effect_body_part": "MOUTH",
+        "effect_intensity": 2,
+        "effect_min_duration": "7 seconds",
+        "effect_max_duration": "7 seconds"
+      },
+      {
+        "name": "thick smoke",
+        "color": "dark_gray",
+        "translucency": 0,
+        "effect_id": "smoke",
+        "effect_body_part": "MOUTH",
+        "effect_intensity": 4,
+        "effect_min_duration": "15 seconds",
+        "effect_max_duration": "15 seconds"
+      }
     ],
     "decay_amount_factor": 5,
     "gas_absorption_factor": 12,

data/json/flags.json

@@ -651,6 +651,18 @@
     "context": [ "SPELL" ],
     "description": "This spell requires focus to cast.  The lower your focus, the higher failure rate to cast."
   },
+  {
+    "id": "WONDER",
+    "type": "json_flag",
+    "context": [ "SPELL" ],
+    "description": "Chooses a spell at random to cast from extra_effects.  See MAGIC.md for details"
+  },
+  {
+    "id": "NON_THRESH",
+    "type": "json_flag",
+    "context": [ "mutation" ],
+    "description": "This mutation does not count toward thresholds at all."
+  },
   {
     "id": "EFFECT_FEATHER_FALL",
     "type": "json_flag"

data/json/furniture_and_terrain/furniture-appliances.json

@@ -382,5 +382,76 @@
         { "item": "pilot_light", "count": 1 }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_bellows",
+    "name": "blacksmith bellows",
+    "symbol": "#",
+    "description": "Used for delivering air to increase the combustion and heat output of a forge.  Doesn't look like it's working, although it still has parts.",
+    "color": "dark_gray",
+    "looks_like": "t_machinery_old",
+    "move_cost_mod": 2,
+    "coverage": 60,
+    "required_str": 10,
+    "flags": [ "TRANSPARENT" ],
+    "deconstruct": {
+      "items": [
+        { "item": "tanned_hide", "count": [ 1, 2 ] },
+        { "item": "2x4", "count": [ 2, 4 ] },
+        { "item": "scrap", "count": [ 2, 6 ] },
+        { "item": "wire", "count": [ 1, 4 ] }
+      ]
+    },
+    "max_volume": 160,
+    "bash": {
+      "str_min": 8,
+      "str_max": 30,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "leather", "count": [ 1, 4 ] },
+        { "item": "2x4", "count": [ 1, 2 ] },
+        { "item": "scrap", "count": [ 0, 6 ] },
+        { "item": "wire", "count": [ 1, 3 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_drophammer",
+    "name": "blacksmith drop hammer",
+    "symbol": "#",
+    "description": "Used for fast production of metal items.  Doesn't look like it's working, although it still has parts.",
+    "color": "white",
+    "looks_like": "t_machinery_old",
+    "move_cost_mod": 2,
+    "coverage": 60,
+    "required_str": 10,
+    "flags": [ "TRANSPARENT" ],
+    "deconstruct": {
+      "items": [
+        { "item": "metal_tank", "count": [ 1, 2 ] },
+        { "item": "water_faucet", "count": 2 },
+        { "item": "scrap", "count": [ 2, 6 ] },
+        { "item": "chain", "count": [ 2, 4 ] },
+        { "item": "anvil", "count": 1 },
+        { "item": "pipe", "count": [ 1, 3 ] }
+      ]
+    },
+    "max_volume": 160,
+    "bash": {
+      "str_min": 12,
+      "str_max": 30,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "water_faucet", "count": [ 1, 2 ] },
+        { "item": "anvil", "count": 1 },
+        { "item": "chain", "count": [ 1, 3 ] },
+        { "item": "scrap", "count": [ 10, 20 ] },
+        { "item": "pipe", "count": [ 1, 3 ] }
+      ]
+    }
   }
 ]

data/json/furniture_and_terrain/furniture-sleep.json

@@ -77,6 +77,30 @@
       "items": [ { "item": "rag", "count": [ 40, 55 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_down_mattress",
+    "name": "down_mattress",
+    "description": "A comfortable feather down mattress has been tossed on the floor for sleeping here.  It's not quite as comfy as a real bed, but it's pretty close.",
+    "symbol": "0",
+    "color": "magenta",
+    "move_cost_mod": 3,
+    "coverage": 40,
+    "comfort": 4,
+    "floor_bedding_warmth": 800,
+    "required_str": 7,
+    "deployed_item": "down_mattress",
+    "examine_action": "deployed_furniture",
+    "flags": [ "TRANSPARENT", "SHORT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE" ],
+    "deconstruct": { "items": [ { "item": "down_mattress", "count": 1 } ] },
+    "bash": {
+      "str_min": 8,
+      "str_max": 30,
+      "sound": "rrrrip!",
+      "sound_fail": "whump.",
+      "items": [ { "item": "rag", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_makeshift_bed",

data/json/furniture_and_terrain/furniture-surfaces.json

@@ -176,6 +176,7 @@
     "coverage": 40,
     "required_str": -1,
     "deployed_item": "tourist_table",
+    "looks_like": "f_table",
     "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": { "items": [ { "item": "tourist_table", "count": 1 } ] },
     "bash": {