Merge pull request CleverRaven#33 from CleverRaven/master

interesting

.appveyor.yml

@@ -7,6 +7,9 @@ clone_folder: C:\Projects\Cataclysm-DDA
 cache:
   - c:\tools\vcpkg\installed
   - c:\Users\appveyor\AppData\Local\vcpkg\
+install:
+ - cmd: vcpkg install yasm-tool:x86-windows
+ - cmd: vcpkg install mpg123:x64-windows-static
 build:
   project: /msvc-full-features/Cataclysm-vcpkg-static.sln
   parallel: true

.github/workflows/CBA.yml

@@ -29,7 +29,7 @@ jobs:
         cd build
         cmake -DCMAKE_BUILD_TYPE=RELEASE ..
         cmake --build . -- -j3
-        echo "::add-path::$PWD"
+        echo "${PWD}" >> $GITHUB_PATH
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: make
       run: |

LICENSE-OFL-Terminus-Font.txt

@@ -1,6 +1,9 @@
 Copyright (c) 2019 Dimitar Toshkov Zhekov,
 with Reserved Font Name "Terminus Font".
 
+Copyright (c) 2011 Tilman Blumenbach,
+with Reserved Font Name "Terminus (TTF)".
+
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
 http://scripts.sil.org/OFL

LICENSE.txt

@@ -1,8 +1,6 @@
 Cataclysm is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
 
-The Square font (data/font/square.ttf) is copyright Wouter van Oortmerssen, licensed under Creative Commons Attribution 3.0 Unported License. See http://strlen.com/square for more information.
-
-GNU Unifont (data/font/unitfont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
+GNU Unifont (data/font/unifont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
 
 Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
 

Makefile

@@ -924,7 +924,7 @@ $(CHKJSON_BIN): $(CHKJSON_SOURCES)
 json-check: $(CHKJSON_BIN)
 	./$(CHKJSON_BIN)
 
-clean: clean-tests
+clean: clean-tests clean-object_creator
 	rm -rf *$(TARGET_NAME) *$(TILES_TARGET_NAME)
 	rm -rf *$(TILES_TARGET_NAME).exe *$(TARGET_NAME).exe *$(TARGET_NAME).a
 	rm -rf *obj *objwin
@@ -1171,6 +1171,12 @@ check: version $(BUILD_PREFIX)cataclysm.a
 clean-tests:
 	$(MAKE) -C tests clean
 
+object_creator: version $(BUILD_PREFIX)cataclysm.a
+	$(MAKE) -C object_creator
+
+clean-object_creator:
+	$(MAKE) -C object_creator clean
+
 validate-pr:
 ifneq ($(CYGWIN),1)
 	@build-scripts/validate_pr_in_jenkins

android/app/build.gradle

@@ -327,9 +327,12 @@ android {
             }
             externalNativeBuild {
                 ndkBuild {
-                    cFlags "-DNDEBUG", "-DRELEASE", "-Os"
+                    cFlags "-DNDEBUG", "-DRELEASE", "-Os", "-g"
                 }
             }
+            ndk {
+                debugSymbolLevel 'SYMBOL_TABLE'
+            }
         }
 
         debug {
@@ -340,9 +343,12 @@ android {
             }
             externalNativeBuild {
                 ndkBuild {
-
+                    cFlags "-g"
                 }
             }
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
         }
     }
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {

android/app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
                   android:launchMode="singleInstance"
                   android:keepScreenOn="true"
                   android:screenOrientation="userLandscape"
-                  android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
+                  android:configChanges="keyboardHidden|keyboard|orientation|screenSize|navigation"
                   >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -55,7 +55,7 @@
                   android:launchMode="singleInstance"
                   android:keepScreenOn="true"
                   android:screenOrientation="userLandscape"
-                  android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
+                  android:configChanges="keyboardHidden|keyboard|orientation|screenSize|navigation"
                   >
         </activity>
     </application>

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

data/fontdata.json

@@ -2,15 +2,15 @@
   "//1": "If more than one font is specified for a typeface the list is treated as a fallback order.",
   "//2": "unifont will always be used as a 'last resort' fallback even if not listed here.",
   "typeface": [
-    "Terminus",
-    "unifont"
+    "data/font/Terminus.ttf",
+    "data/font/unifont.ttf"
   ],
   "map_typeface": [
-    "Terminus",
-    "unifont"
+    "data/font/Terminus.ttf",
+    "data/font/unifont.ttf"
   ],
   "overmap_typeface": [
-    "Terminus",
-    "unifont"
+    "data/font/Terminus.ttf",
+    "data/font/unifont.ttf"
   ]
 }

data/json/bionics.json

@@ -383,7 +383,7 @@
     "name": { "str": "Ethanol Burner" },
     "description": "You burn alcohol as fuel in an extremely efficient reaction.",
     "occupied_bodyparts": [ [ "torso", 26 ] ],
-    "fuel_options": [ "chem_ethanol", "chem_methanol", "denat_alcohol" ],
+    "fuel_options": [ "alcohol" ],
     "fuel_capacity": 500,
     "fuel_efficiency": 0.5,
     "exothermic_power_gen": true,

data/json/effects.json

@@ -467,6 +467,70 @@
     "show_in_info": true,
     "blood_analysis_description": "Poison"
   },
+  {
+    "id": "venom_dmg",
+    "type": "effect_type",
+    "name": [ "Poisoned Wound" ],
+    "desc": [ "The wound swells visibly and burns like hell." ],
+    "apply_message": "Ow, that stings!",
+    "remove_message": "The burning pain subsides, but the damage is done.",
+    "show_intensity": false,
+    "rating": "bad",
+    "resist_traits": [ "POISRESIST" ],
+    "pain_sizing": true,
+    "hurt_sizing": true,
+    "main_parts_only": true,
+    "max_intensity": 125,
+    "max_effective_intensity": 100,
+    "int_dur_factor": 18,
+    "max_duration": 2250,
+    "//": "30 m to max, 7,5 m overhead, dmg chance scales from 1/13 to 1/3, Pain from 1/20 to 1/5",
+    "base_mods": {
+      "pain_amount": [ 5, 2 ],
+      "pain_min": [ 0, -4 ],
+      "pain_chance": [ 20, 100 ],
+      "pain_max_val": [ 60, 20 ],
+      "hurt_amount": [ 5, 0 ],
+      "hurt_min": [ 2, 1 ],
+      "hurt_chance": [ 13, 100 ],
+      "hurt_tick": [ 30 ]
+    },
+    "scaling_mods": { "pain_min": [ 0.05, 0.01 ], "pain_chance": [ -0.15, -0.8 ], "hurt_chance": [ -0.11, -0.81 ] }
+  },
+  {
+    "id": "venom_weaken",
+    "type": "effect_type",
+    "name": [ "Weakening Poison" ],
+    "desc": [ "You feel feeble." ],
+    "apply_message": "The sting itself barely hurt, but suddenly you feel exhausted.",
+    "remove_message": "The weight on your chest lessens.",
+    "rating": "bad",
+    "resist_traits": [ "POISRESIST" ],
+    "max_intensity": 125,
+    "max_effective_intensity": 100,
+    "max_duration": 18000,
+    "int_dur_factor": 144,
+    "dur_add_perc": 500,
+    "show_intensity": false,
+    "//": "4h to max, 1h overhead; Str/Dex to -6/3; Stam chance 0,25-0,5 / 0,1-0,2; Vomit ~1 per max duration",
+    "base_mods": {
+      "str_mod": [ -2, 0 ],
+      "dex_mod": [ -2, 0 ],
+      "stamina_amount": [ -2000, -1000 ],
+      "stamina_min": [ -5 ],
+      "stamina_chance": [ 4.5, 10 ],
+      "speed_mod": [ -10, 0 ],
+      "vomit_chance": [ 15, 150 ],
+      "vomit_tick": [ 1200 ]
+    },
+    "scaling_mods": {
+      "str_mod": [ -0.05, -0.04 ],
+      "dex_mod": [ -0.05, -0.04 ],
+      "stamina_min": [ -0.351, -0.151 ],
+      "stamina_chance": [ -0.021, -0.051 ],
+      "speed_mod": [ -0.31, -0.21 ]
+    }
+  },
   {
     "type": "effect_type",
     "id": "foodpoison",
@@ -669,7 +733,7 @@
     "type": "effect_type",
     "id": "took_xanax_visible",
     "name": [ "Took Xanax" ],
-    "desc": [ "You took Xanax some time ago and you might still be under its influence." ]
+    "desc": [ "You took a fast-acting sedative some time ago and you might still be under its influence." ]
   },
   {
     "type": "effect_type",
@@ -685,7 +749,7 @@
     "type": "effect_type",
     "id": "took_prozac_visible",
     "name": [ "Took Prozac" ],
-    "desc": [ "You took Prozac some time ago and you might still be under its influence." ]
+    "desc": [ "You took an antidepressant some time ago and you might still be under its influence." ]
   },
   {
     "type": "effect_type",
@@ -708,7 +772,7 @@
     "type": "effect_type",
     "id": "took_thorazine_visible",
     "name": [ "Took Thorazine" ],
-    "desc": [ "You took Thorazine some time ago and you might still be under its influence." ]
+    "desc": [ "You took an antipsychotic some time ago and you might still be under its influence." ]
   },
   {
     "type": "effect_type",
@@ -855,12 +919,13 @@
     "type": "effect_type",
     "id": "bandaged",
     "name": [ "Bandaged" ],
-    "desc": [ "Your wounds are bandaged." ],
+    "desc": [ "The wounds on your %s are bandaged." ],
     "main_parts_only": true,
     "rating": "good",
     "int_dur_factor": "6 h",
     "max_intensity": 16,
     "max_effective_intensity": 8,
+    "part_descs": true,
     "max_duration": "4 d",
     "base_mods": { "healing_rate": [ 2 ], "healing_head": [ 50 ], "healing_torso": [ 150 ] },
     "scaling_mods": { "healing_rate": [ 2 ] }
@@ -869,12 +934,13 @@
     "type": "effect_type",
     "id": "disinfected",
     "name": [ "Disinfected" ],
-    "desc": [ "Your wounds are disinfected." ],
+    "desc": [ "The wounds on your %s are disinfected." ],
     "main_parts_only": true,
     "rating": "good",
     "int_dur_factor": "6 h",
     "max_intensity": 16,
     "max_effective_intensity": 8,
+    "part_descs": true,
     "max_duration": "4 d",
     "base_mods": { "healing_rate": [ 2 ], "healing_head": [ 50 ], "healing_torso": [ 150 ] },
     "scaling_mods": { "healing_rate": [ 2 ] }
@@ -1294,6 +1360,8 @@
       "tapeworm",
       "blind",
       "poison",
+      "venom_dmg",
+      "venom_weaken",
       "stung",
       "badpoison",
       "foodpoison",
@@ -1330,7 +1398,7 @@
     "rating": "good",
     "max_intensity": 2,
     "int_dur_factor": "50 s",
-    "removes_effects": [ "infected", "bite", "bleed", "fungus", "dermatik", "winded" ],
+    "removes_effects": [ "infected", "bite", "bleed", "fungus", "dermatik", "winded", "poison", "badpoison", "venom_dmg", "venom_weaken" ],
     "base_mods": { "str_mod": [ -1 ], "dex_mod": [ -2 ], "per_mod": [ -2 ], "int_mod": [ -1 ] },
     "scaling_mods": { "str_mod": [ 2 ], "dex_mod": [ 3 ], "per_mod": [ 3 ], "int_mod": [ 1 ] },
     "blood_analysis_description": "Healing Medication"

data/json/flags.json

@@ -389,8 +389,7 @@
   {
     "id": "MAG_DESTROY",
     "type": "json_flag",
-    "context": [ "MAGAZINE" ],
-    "info": "This food <neutral>melts when not in a very cold climate</neutral>, and tastes much <good>better</good> when <color_light_cyan>frozen</color>."
+    "context": [ "MAGAZINE" ]
   },
   {
     "id": "OUTER",

data/json/furniture_and_terrain/furniture-alien.json

@@ -186,7 +186,7 @@
         { "item": "antenna", "count": [ 0, 1 ] },
         { "item": "exodii_module", "count": [ 0, 1 ] },
         { "item": "exodii_motor", "count": [ 0, 1 ] },
-        { "item": "cable", "count": [ 0, 2 ] },
+        { "item": "cable", "charges": [ 0, 2 ] },
         { "item": "scrap_copper", "count": [ 2, 10 ] }
       ]
     }
@@ -244,7 +244,7 @@
         { "item": "scrap_copper", "count": [ 2, 10 ] },
         { "item": "exodii_computer", "count": [ 0, 1 ] },
         { "item": "exodii_motor", "count": [ 0, 1 ] },
-        { "item": "cable", "count": [ 0, 3 ] },
+        { "item": "cable", "charges": [ 0, 3 ] },
         { "item": "exodii_scanner_dish", "count": [ 0, 1 ] }
       ]
     }
@@ -273,7 +273,7 @@
         { "item": "scrap_copper", "count": [ 2, 10 ] },
         { "item": "amplifier", "count": [ 0, 5 ] },
         { "item": "power_supply", "count": [ 0, 1 ] },
-        { "item": "cable", "count": [ 0, 5 ] }
+        { "item": "cable", "charges": [ 0, 5 ] }
       ]
     }
   },
@@ -517,7 +517,7 @@
       "sound_fail": "crash!",
       "items": [
         { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
         { "item": "sheet_metal", "count": [ 0, 1 ] },
         { "item": "sheet_metal_small", "count": [ 4, 8 ] },
         { "item": "e_scrap", "count": [ 2, 6 ] },
@@ -549,7 +549,7 @@
       "sound_fail": "crash!",
       "items": [
         { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
         { "item": "sheet_metal", "count": [ 0, 1 ] },
         { "item": "sheet_metal_small", "count": [ 4, 8 ] },
         { "item": "e_scrap", "count": [ 2, 6 ] },
@@ -582,7 +582,7 @@
       "sound_fail": "crash!",
       "items": [
         { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
         { "item": "pipe", "count": [ 0, 4 ] },
         { "item": "circuit", "count": [ 2, 5 ] },
         { "item": "amplifier", "count": [ 2, 5 ] },
@@ -611,7 +611,7 @@
       "sound_fail": "crash!",
       "items": [
         { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
         { "item": "sheet_metal_small", "count": [ 0, 4 ] },
         { "item": "circuit", "count": [ 1, 3 ] },
         { "item": "amplifier", "count": [ 1, 3 ] },

data/json/furniture_and_terrain/furniture-industrial.json

@@ -457,9 +457,9 @@
       "str_max": 100,
       "sound": "shred!",
       "sound_fail": "thud!",
-      "items": [ { "item": "scrap_copper", "count": [ 1, 4 ] }, { "item": "cable", "count": [ 1, 4 ] } ]
+      "items": [ { "item": "scrap_copper", "count": [ 1, 4 ] }, { "item": "cable", "charges": [ 1, 4 ] } ]
     },
-    "deconstruct": { "items": [ { "item": "cable", "count": 4 } ] }
+    "deconstruct": { "items": [ { "item": "cable", "charges": [ 3, 4 ] } ] }
   },
   {
     "type": "furniture",
@@ -481,7 +481,7 @@
       "sound_fail": "crash!",
       "items": [
         { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "count": [ 1, 8 ] },
+        { "item": "cable", "charges": [ 100, 800 ] },
         { "item": "pipe", "count": [ 0, 4 ] },
         { "item": "circuit", "count": [ 0, 5 ] },
         { "item": "e_scrap", "count": [ 2, 8 ] },