Merge pull request #7 from CleverRaven/master

Catchup to Master
I-am-Erk · Dec 6, 2019 · f952ba7 · f952ba7
2 parents f439157 + b1cff02
commit f952ba7
Show file tree

Hide file tree

Showing 532 changed files with 77,110 additions and 38,923 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -22,6 +22,7 @@ exemptLabels:
   - "(P4 - Low)"
   - "(P5 - Long-term)"
   - "(S2 - Confirmed)"
+  - "0.E Feature Freeze"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -162,6 +162,16 @@ android {
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+    flavorDimensions "version"
+
+    productFlavors {
+        experimental {
+            dimension "version"
+            applicationIdSuffix ".experimental"
+        }
+    }
+
     signingConfigs {
         if (keystoreProperties.getProperty('storeFile') != null) {
             if (file(keystoreProperties.getProperty('storeFile')).exists()) {
@@ -221,7 +231,7 @@ android {
             variant.outputs.each { output ->
                 def outputFile = output.outputFile
                 if (outputFile != null && outputFile.name.endsWith(".aar")) {
-                    def fileName = "com.cleverraven.cataclysmdda.aar";
+                    def fileName = "$applicationId.aar";
                     output.outputFile = new File(outputFile.parent, fileName);
                 }
             }

diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -2124,17 +2124,24 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     //
     @Override
     public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // HACK: Make sure the SDL activity receives native events for back button, even if DummyEdit is in focus
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (event.getAction()==KeyEvent.ACTION_DOWN)
+                SDLActivity.onNativeKeyDown(keyCode);
+            else if (event.getAction()==KeyEvent.ACTION_UP)
+                SDLActivity.onNativeKeyUp(keyCode);
+        }
         // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
         // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
         // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
         // FIXME: A more effective solution would be to assume our Layout to be RelativeLayout or LinearLayout
         // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
         // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
-        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
-            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
-                SDLActivity.onNativeKeyboardFocusLost();
-            }
-        }
+        //if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+        //    if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+        //        SDLActivity.onNativeKeyboardFocusLost();
+        //    }
+        //}
         return super.onKeyPreIme(keyCode, event);
     }
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -41,5 +41,5 @@ deps=./deps.zip
 override_version=
 
 # This property controls path where overriden version number header should be generated
-# You can override this from the command line by passing "-pversion_header_path=#"
+# You can override this from the command line by passing "-Pversion_header_path=#"
 version_header_path=app/jni/src/version.h
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -2,7 +2,7 @@
 
 # Build script intended for use in Travis CI
 
-set -ex pipefail
+set -exo pipefail
 
 num_jobs=3
 

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2251,7 +2251,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 7000 ] ] ],
     "components": [ [ [ "2x4", 12 ], [ "log", 12 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_special": "check_down_OK",
     "pre_terrain": "t_rock_floor",
@@ -2307,7 +2307,7 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ],
+      [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 7000 ] ],
       [
         "miner_hat",
         "hat_hard",

diff --git a/data/json/dreams.json b/data/json/dreams.json
@@ -100,7 +100,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a strange dream.", "You feel... OK." ],
+    "messages": [ "You have a strange dream.", "You feel… OK." ],
     "category": "ALPHA",
     "strength": 1
   },
@@ -112,7 +112,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "You dream about the zoo, for some reason.", "Your dreams... are complex and multifaceted." ],
+    "messages": [ "You dream about the zoo, for some reason.", "Your dreams… are complex and multifaceted." ],
     "category": "CHIMERA",
     "strength": 1
   },
@@ -183,7 +183,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "You dream of foraging in the woods... mouth-first?", "Your dream-reflection is rather bearish." ],
+    "messages": [ "You dream of foraging in the woods… mouth-first?", "Your dream-reflection is rather bearish." ],
     "category": "URSINE",
     "strength": 2
   },
@@ -198,7 +198,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a disturbing dream of someone invading your territory.", "Your dream-self's muzzle looks... wait, muzzle?" ],
+    "messages": [ "You have a disturbing dream of someone invading your territory.", "Your dream-self's muzzle looks… wait, muzzle?" ],
     "category": "LUPINE",
     "strength": 2
   },
@@ -283,7 +283,7 @@
   {
     "type": "dream",
     "messages": [
-      "You can't quite work out what the dream is about... it just keeps changing.",
+      "You can't quite work out what the dream is about… it just keeps changing.",
       "Your dream is filled with creatures, and yet all seem like you."
     ],
     "category": "CHIMERA",
@@ -292,15 +292,15 @@
   {
     "type": "dream",
     "messages": [
-      "You dream of stalking some sort of lizard... no, that can't be right, can it?",
+      "You dream of stalking some sort of lizard… no, that can't be right, can it?",
       "For some reason you dream of your shoes.  They don't fit, and nothing seems to help..."
     ],
     "category": "RAPTOR",
     "strength": 2
   },
   {
     "type": "dream",
-    "messages": [ "You dream of... sneaking.", "You dream of a cold winter night.  Your jacket is too big to put on." ],
+    "messages": [ "You dream of… sneaking.", "You dream of a cold winter night.  Your jacket is too big to put on." ],
     "category": "MOUSE",
     "strength": 2
   },
@@ -352,7 +352,7 @@
   {
     "type": "dream",
     "messages": [
-      "Your dream of raiding a giant beehive has you licking your... muzzle in anticipation.",
+      "Your dream of raiding a giant beehive has you licking your… muzzle in anticipation.",
       "In your dream, you stalk and kill a young wolf, using only your teeth and claws."
     ],
     "category": "URSINE",
@@ -611,7 +611,7 @@
   {
     "type": "dream",
     "messages": [
-      "You excitedly web up an interloper and prepare to feast... nope, dream.",
+      "You excitedly web up an interloper and prepare to feast… nope, dream.",
       "Your dreams of having to live without a web frighten you."
     ],
     "category": "SPIDER",
@@ -646,7 +646,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "Your body flows slightly faster than you expected... oh, just a dream.", "FIGHT.  FEED.  FORWARD." ],
+    "messages": [ "Your body flows slightly faster than you expected… oh, just a dream.", "FIGHT.  FEED.  FORWARD." ],
     "category": "CHIMERA",
     "strength": 4
   },

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -16,6 +16,12 @@
     "name": [ "Ridden" ],
     "desc": [ "AI tag for when critter is being ridden. This is a bug if you have it." ]
   },
+  {
+    "type": "effect_type",
+    "id": "npc_suspend",
+    "name": [ "npc_suspend" ],
+    "desc": [ "AI tag for when an NPC needs to be rebooted after an infinite loop." ]
+  },
   {
     "type": "effect_type",
     "id": "harnessed",
@@ -719,7 +725,7 @@
     "name": [ "Infected", "Badly Infected", "Pus Filled" ],
     "desc": [ "You have an infected wound." ],
     "apply_memorial_log": "Contracted an infection.",
-    "remove_memorial_log": "Recovered from an infection... this time.",
+    "remove_memorial_log": "Recovered from an infection… this time.",
     "apply_message": "Your bite wound feels infected.",
     "resist_traits": [ "INFRESIST" ],
     "main_parts_only": true,
@@ -1309,7 +1315,7 @@
     "desc": [
       "You suffer from a respiratory disorder that makes breathing difficult.\nAn asthma attack can occur from time to time, so have your inhaler nearby."
     ],
-    "apply_message": "You can't breathe... asthma attack!",
+    "apply_message": "You can't breathe… asthma attack!",
     "rating": "bad",
     "max_intensity": 6,
     "int_dur_factor": "200 s",
@@ -1794,7 +1800,7 @@
     "id": "supercharged",
     "//": "not given to players by default",
     "name": [ "Supercharged" ],
-    "desc": [ "You've been struck by lightning, and feel... different." ],
+    "desc": [ "You've been struck by lightning, and feel… different." ],
     "base_mods": { "speed_mod": [ 50 ] }
   },
   {
@@ -1817,6 +1823,35 @@
     },
     "int_decay_step": 0
   },
+  {
+    "type": "effect_type",
+    "id": "migo_atmosphere",
+    "name": [ "Stinking air", "Disorienting air", "Disorienting air", "Smothering air", "Smothering air" ],
+    "desc": [
+      "The air in here smells like vinegar and mold.",
+      "The air in here smells like vinegar and mold.  It makes you feel soft-headed and confused.",
+      "The air in here smells like vinegar and mold.  It makes you feel soft-headed and confused.",
+      "The air in here smells like vinegar and mold.  It is closing in and smothering you, making it impossible to think clearly.",
+      "The air in here smells like vinegar and mold.  It is closing in and smothering you, making it impossible to think clearly."
+    ],
+    "apply_message": "The air in here smells like vinegar and mold, and hurts your lungs a bit.",
+    "max_intensity": 5,
+    "int_dur_factor": "5 seconds",
+    "rating": "bad",
+    "miss_messages": [ [ "You feel groggy in this sweltering, foul air.", 2 ] ],
+    "harmful_cough": false,
+    "base_mods": { "cough_chance": [ -1002 ] },
+    "scaling_mods": {
+      "str_mod": [ -0.25 ],
+      "per_mod": [ -0.5 ],
+      "dex_mod": [ -0.25 ],
+      "int_mod": [ -0.75 ],
+      "speed_mod": [ -10 ],
+      "vomit_chance": [ 10 ],
+      "cough_chance": [ 501 ]
+    },
+    "show_in_info": true
+  },
   {
     "type": "effect_type",
     "id": "has_og_comm_freq"

diff --git a/data/json/emit.json b/data/json/emit.json
@@ -226,6 +226,27 @@
     "intensity": 3,
     "qty": 1
   },
+  {
+    "id": "emit_hot_air_migo_seep",
+    "type": "emit",
+    "field": "fd_hot_air_sauna",
+    "intensity": 3,
+    "qty": 50
+  },
+  {
+    "id": "emit_hot_air_migo_blast",
+    "type": "emit",
+    "field": "fd_hot_air_sauna",
+    "intensity": 3,
+    "qty": 300
+  },
+  {
+    "id": "emit_migo_atmosphere",
+    "type": "emit",
+    "field": "fd_migo_atmosphere",
+    "intensity": 3,
+    "qty": 300
+  },
   {
     "id": "emit_glimmer",
     "type": "emit",

diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -1102,6 +1102,78 @@
     "phase": "gas",
     "display_field": true
   },
+  {
+    "id": "fd_hot_air_sauna",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "hot air sauna", "sym": "&", "convection_temperature_mod": 65 },
+      { "color": "yellow", "convection_temperature_mod": 68 },
+      { "color": "red", "convection_temperature_mod": 71 }
+    ],
+    "decay_amount_factor": 5,
+    "percent_spread": 100,
+    "outdoor_age_speedup": "100 minutes",
+    "priority": -1,
+    "half_life": "50 minutes",
+    "phase": "gas",
+    "display_field": true
+  },
+  {
+    "id": "fd_migo_atmosphere",
+    "type": "field_type",
+    "intensity_levels": [
+      {
+        "name": "foul-smelling air",
+        "sym": "8",
+        "dangerous": true,
+        "effects": [
+          {
+            "effect_id": "migo_atmosphere",
+            "body_part": "MOUTH",
+            "intensity": 1,
+            "min_duration": "5 seconds",
+            "max_duration": "10 seconds",
+            "immune_inside_vehicle": true
+          }
+        ]
+      },
+      {
+        "name": "foul-smelling air",
+        "translucency": 1,
+        "effects": [
+          {
+            "effect_id": "migo_atmosphere",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "10 seconds",
+            "max_duration": "25 seconds"
+          }
+        ]
+      },
+      {
+        "name": "foul-smelling air",
+        "effects": [
+          {
+            "effect_id": "migo_atmosphere",
+            "body_part": "MOUTH",
+            "intensity": 4,
+            "min_duration": "15 seconds",
+            "max_duration": "25 seconds"
+          }
+        ]
+      }
+    ],
+    "decay_amount_factor": 5,
+    "gas_absorption_factor": 15,
+    "percent_spread": 30,
+    "outdoor_age_speedup": "3 minutes",
+    "dirty_transparency_cache": true,
+    "has_fume": true,
+    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] },
+    "priority": 8,
+    "half_life": "10 minutes",
+    "phase": "gas"
+  },
   {
     "id": "fd_fungicidal_gas",
     "type": "field_type",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -701,11 +701,6 @@
     "id": "ELECTRIC_IMMUNE",
     "type": "json_flag"
   },
-  {
-    "id": "NO_CRAFT_INHERIT",
-    "type": "json_flag",
-    "//": "Crafted items with this flag won't inherit flags with craft_inherit from their components."
-  },
   {
     "id": "HIDDEN_HALLU",
     "type": "json_flag",
@@ -725,7 +720,15 @@
     "type": "json_flag",
     "context": [ "COMESTIBLE" ],
     "craft_inherit": true,
+    "taste_mod": -5,
     "//": "Has a bad taste or texture that can't be covered up through cooking.",
     "info": "This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up by most cooking</bad>."
+  },
+  {
+    "id": "RAW",
+    "type": "json_flag",
+    "context": [ "COMESTIBLE" ],
+    "//": "Decreases calories as they appear in JSON def by 25%. This penalty is removed if the item is used in a recipe that requires heating.",
+    "info": "This food is <info>raw</info>, and will be <good>more nutritious</good> if cooked."
   }
 ]