Merge pull request #33 from CleverRaven/master

SUS Bathroom Dec 20

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

android/app/build.gradle

@@ -42,6 +42,15 @@ def abi64 = getProperty("abi64").toBoolean()
 def deps = getProperty("deps")
 def override_version = getProperty("override_version")
 def version_header_path = getProperty("version_header_path")
+def override_compileSdkVersion = getProperty("override_compileSdkVersion").toInteger()
+def override_minSdkVersion = getProperty("override_minSdkVersion").toInteger()
+def override_targetSdkVersion = getProperty("override_targetSdkVersion").toInteger()
+def override_ndkBuildAppPlatform = getProperty("override_ndkBuildAppPlatform")
+
+println("Using compileSdkVersion: $override_compileSdkVersion")
+println("Using minSdkVersion: $override_minSdkVersion")
+println("Using targetSdkVersion: $override_targetSdkVersion")
+println("Using ndkBuildAppPlatform: $override_ndkBuildAppPlatform")
 
 if (!abi32 && !abi64) {
     throw new GradleException("Both `abi32` and `abi64` properties are set to false")
@@ -94,7 +103,7 @@ unzipDeps.dependsOn makeLocalization
 preBuild.dependsOn unzipDeps
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion override_compileSdkVersion
 
     if (override_version.isEmpty()) {
         println("Generating version number to $version_header_path")
@@ -127,14 +136,15 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion override_minSdkVersion
+        targetSdkVersion override_targetSdkVersion
         versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {
             applicationId "com.cleverraven.cataclysmdda"
             setProperty("archivesBaseName", "cataclysmdda-" + versionName)
         }
+        resValue "string", "app_name", "Cataclysm DDA"
 
         splits {
             // Configures multiple APKs based on ABI.
@@ -157,7 +167,7 @@ android {
 
         externalNativeBuild {
             ndkBuild {
-                arguments "APP_PLATFORM=android-16", "-j$njobs"
+                arguments "APP_PLATFORM=$override_ndkBuildAppPlatform", "-j$njobs"
             }
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -169,6 +179,7 @@ android {
         experimental {
             dimension "version"
             applicationIdSuffix ".experimental"
+            resValue "string", "app_name", "Cataclysm DDA (experimental)"
         }
     }
 

android/app/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Cataclysm DDA</string>
     <string name="installing">Installing game data...</string>
     <string name="upgrading">Upgrading game data...</string>
 </resources>

android/gradle.properties

@@ -43,3 +43,19 @@ 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=#"
 version_header_path=app/jni/src/version.h
+
+# This property controls which compileSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_compileSdkVersion=#"
+override_compileSdkVersion=28
+
+# This property controls which minSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_minSdkVersion=#"
+override_minSdkVersion=14
+
+# This property controls which targetSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_targetSdkVersion=#"
+override_targetSdkVersion=28
+
+# This property controls which ndkBuildAppPlatform should be used
+# You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#"
+override_ndkBuildAppPlatform=android-16

build-scripts/get_all_mods.py

@@ -8,12 +8,31 @@
 with open(blacklist_filename) as blacklist_file:
     blacklist = {s.rstrip('\n') for s in blacklist_file.readlines()}
 
-mods = []
+mods_to_keep = []
+
+def add_mods(mods):
+    for mod in mods:
+        if not mod in all_mod_dependecies:
+            # Either an invalid mod id, or blacklisted.
+            return False
+    for mod in mods:
+        if not mod in mods_to_keep:
+            mods_to_keep.append(mod)
+    return True
+
+all_mod_dependecies = {}
 
 for info in glob.glob('data/mods/*/modinfo.json'):
     mod_info = json.load(open(info))
-    mods.extend(e["ident"] for e in mod_info if e["type"] == "MOD_INFO")
+    for e in mod_info:
+        if e["type"] == "MOD_INFO":
+            ident = e["ident"]
+            if not ident in blacklist:
+                all_mod_dependecies[ident] = e.get("dependencies", [])
 
-mods_to_keep = [mod for mod in mods if mod not in blacklist]
+for mod in all_mod_dependecies:
+    if not mod in mods_to_keep:
+        if add_mods(all_mod_dependecies[mod]):
+            mods_to_keep.append(mod)
 
 print(','.join(mods_to_keep))

build-scripts/mod_test_blacklist

@@ -1,51 +1,15 @@
 aftershock
-alt_map_key
-Animatronics
-Battery_Overhaul_Legacy_Mode
 blazemod
-cbm_slots
-classic_zombies
 crazy_cataclysm
 crt_expansion
-desertpack
-DinoMod
-ew_pack
 FIC_Weapons
-FujiStruct
 generic_guns
 Graphical_Overmap
-growable-pots
-Heavy miners
-hydroponics
-magiclysm
-manualbionicinstall
 mapgen_demo
-Medieval_Stuff
-MMA
 modular_turrets
 more_locations
-More_Survival_Tools
-mutant_npcs
 my_sweet_cataclysm
 national_guard_camp
-No_Anthills
-No_Bees
-no_faults
-no_filthy_clothing
-No_Fungi
 no_medieval_items
-no_npc_food
-No_Rail_Stations
-No_Triffids
-novitamins
-realguns
-safeautodoc
-Salvaged_Robots
 sees_player_hitbutton
 sees_player_retro
-sleepdeprivation
-speedydex
-stats_through_kills
-Tanks
-Tolerate_This
-Urban_Development

data/changelog.txt

@@ -154,6 +154,22 @@ Allow martial arts techniques to target humanoids.
 Add querry to stop trying to fall of sleep after 30min of trying.
 Sleeping in a vehicle has the same features as sleeping on furnitures.
 Basecamps: add an emergency recall option.
+Allow shooting out lights in the lab.
+Add Auto start mode to power gen bionics.
+Introduces safe fuel mod and flags for bionics.
+Create template from already existing character.
+Allow extend to work for mutation_branch::category.
+Basecamp storage zone : to populate camp inventory.
+JSONize loot zones.
+Added an ability to geiger-scan NPCs.
+Dynamic NPC spawn anywhere on overmap - not just near player.
+Spawn some chemicals with random charges.
+Increase wind strength at higher z-levels.
+Added auto-picklock on examine.
+Vehicles: allow multiple vehicles on a bike rack.
+Vehicle autopilot part for patrolling / auto-farming etc.
+Allow auto targeting mode for turrets only with installed turret control unit.
+Running/crouching while swimming will result in faster/slower swim speed.
 
 ## Content:
 Adds refluffed and modified plasma gun.
@@ -258,6 +274,20 @@ Add Grocery bot to carry your groceries.
 Add blackpowder loads for some cartridges.
 Adds some islands for lakes.
 Expand randomly-generated music descriptions.
+Mi-go Camp Starting Scenario.
+Adds parrot speech options for more mi-go monsters.
+Move fungal tower map to JSON and redraw.
+Adds street light, traffic lights and utility pole.
+Gender-specific clothing on corpses.
+Replace outpost laser turrets with M2HB turrets.
+Changes CRT TVs to LCD TVs.
+NPCs: Update the NPC tutorial including faction camps.
+Add miniature railway location with small rails.
+Looks_like campaign to decrease tileset workload.
+Dozens of new epilogues.
+Tailoring system overhaul.
+Faction currency overhaul, no more dollars.
+Adds dimensional anchor item and some related fluff content.
 
 ## Interface:
 Corpses (not underwear) will be shown on top at the places of death in map extras.
@@ -333,6 +363,20 @@ Added ability to toggle minimap on and off in Look Around window.
 Add visual indicators for dead zombies that can still revive.
 Add run and crouch colors for the player's symbol in ASCII.
 Display status for all long activities.
+Add option to increase search radius in map view.
+Enable autosave by default.
+CBM Auto Start threshold options.
+Include placeholder text on job categories.
+Add 'n:' prefix for item filtering, to search through an items note.
+Make AIM window width customizable.
+Help players discover how to repair.
+Allow saving starting location as part of character template.
+Display power capacity in mJ in item description.
+Show acid and fire protection in the relayer armor screen.
+Adds pain and fatigue penalties on the morale screen, when applicable
+Display current power in bionic menu with appropriate unit.
+Bionic UI: power displayed in kJ, J or mJ.
+Eat menu: Display volume per serving.
 
 ## Mods:
 Re-adds fictional martial arts as a mod.
@@ -354,8 +398,12 @@ Add Blood Power Generator CBM to Magiclysm.
 My Sweet Cataclysm adds the ability to play as an humanoid made of sugar.
 Heavy mining mod added. Add a mining car.
 Adult Black Dragon lair.
+Adds Graphical Overmap mod.
+Adding a bionic prepper faction to Aftershock.
+Add Fuji's Military Professions Mod.
 
 ## Balance:
+Overhaul of all Martial arts.
 Remove reinforcement of non-cloth items.
 Allowed moving furniture over spilled liquids.
 Anesthetic kit is now a tool, it uses anesthesia as charges.
@@ -385,6 +433,27 @@ Cbms harvested from NPC are filthy and faulty.
 Changes game default start date to 30 days after Spring.
 Being grabbed drastically reduce your dodging ability.
 Allow zombies to push each other when blocked.
+Raw food provides fewer calories compared to cooked.
+Triple damage from falling.
+Adds controlled burst modes to machine guns.
+Exchanged M202A1_talon to M16A4 robots in military outpost.
+Adjusts joint servo cost to be realistic.
+More realistic temperature, precipitation, humidity, and pressure.
+Giant animals drop mutant meat, has negative effects if relied upon.
+Balanced bio repair nanobots.
+Standardized chemical powders for 1 unit = 1/100 mol.
+Apply item spawn scaling factor to monster drops.
+Balance bionic power use for realistic values.
+Allow large and huge creatures to move through underbrush.
+Mouse view was truncating last row of information.
+Draw debug vehicle autopilot AI and restore previous behaviour.
+Fix accidental IR vision.
+Can create camps in buildings that don't face North.
+Fixes martial arts initiate message when equipping an item.
+Fix error caused by missing array in More Survival Tools mod.
+Fixes crashes involving bayonet type items.
+Terranian sonar allow to see digging monsters behind walls.
+Stops large critters from using tight passages.
 
 ## Bugfixes:
 Fixed long overmap location name being overwritten by "Distance to target:" string.
@@ -419,6 +488,20 @@ Fix horses making engine sounds.
 Fix items lying in furniture get damaged if one is throwing something at them.
 Items piled up beyond a tile's limit can pass through walls.
 You are still stuck in rubble even if you clear it with a shovel after getting stuck in it.
+Correct magazine inside guns/monsters.
+Prevent counterattacks if tired or dead.
+Load migration ID strings from the right JSON object.
+Nerf Smoke field so that Filter mask protects from smoke.
+Mouth encumbrance doesn't drain stamina while walking.
+Stop basement parachuting zombies.
+Prevent bicycle archery.
+Fix for resuming after stamina recovery was interrupted.
+Fix starting season calculation.
+Maps: stop tunneling tree-felling.
+Fix damaged weapons having zero range.
+Fix hoe consistency.
+Fixed targeting UI issue for reach attack.
+Make environmental protection really protect from fields.
 
 ## Performance:
 Limit start location search radius.
@@ -454,6 +537,7 @@ Throttle NPC item search.
 Optimize vine growth special attack.
 Add adjustable 3D vision Z-level cap.
 Skip sunlight calculation on uniform z-levels.
+Speed up monster action planning.
 
 ## Infrastructure:
 Npctalk: Complete overhaul of NPC conversation infrastructure.
@@ -570,10 +654,23 @@ Create enchantment cache for use with enchantment values.
 Adds JSON capability to range_with_even_chance_of_good_hit.
 Uses the units::energy infrastructure for bionic power.
 Clarify some documentation relevant to monsters and basecamp recipes.
-Add table of contents to JSON_INFO.md
 Add a clang-tidy check to check for text style in the c++ code.
 Encapsulate bionic power and use setter and getter functions.
-Move player armor functions to Character scope.
+Partial migration of player logic to either character or avatar.
+Remove all of the legacy vehicleparts JSON.
+Refactor fields: allow multiple effects.
+Add regional terrain/furniture resolution to mapgen.
+Change snippets to use string ids instead of hashes.
+Adds support for different mending methods for a single fault.
+item: refactor info() to break it into multiple smaller functions.
+Changes scope of various martial arts data from player to a new class.
+adjust lighting debug overlay to show exact light values.
+Add the ability to load tilesets from user_dir/gfx.
+Detect unsed json object members when parsing json data
+Add infrastructure to support using vitamin system for toxins.
+Simplify generic multiple activity handler.
+JSONize scent neutralization for fields.
+tilesets: add tools to automatically create tilesheets.
 
 ## Build:
 Npctalk: add a python dialogue validator.
@@ -586,6 +683,10 @@ Android build updates.
 simplify and improve flatpak support.
 Allow building with Clang using MinGW-w64 libs.
 Check translator comments with clang-tidy.
+Check text style in json strings loaded with class translation.
+gfx tools improvements.
+Check text style in macro expansions.
+compose: handle multiple entries in a single `tile_entry.json` file
 
 ## I18N and A11Y:
 Use translation markers to increase performance.
@@ -1287,7 +1388,10 @@ Adds new mod Growable pots.
 Mainlined Tall Buildings mod.
 Add urban development buildings to city spawns.
 Salvaged Robots: More robot themed professions.
-USABLE_FIRE tag makes terrain or furniture usable as a nearby fire for crafting.
+Creates clairvoyance spells in magiclysm
+Adds the ability to pick letters in the spellcasting menu
+Magicylsm: NPCs can now teach spells
+Added hit_you_effect and hit_me_effect fields to enchantments
 
 ## Balance:
 
@@ -1890,6 +1994,7 @@ JSONnizing CBM slot feature.
 Land Use Codes infrastructure.
 Moves allergen handling vitamin absorption to JSON.
 Refactor advanced inventory item movement to use activities.
+USABLE_FIRE tag makes terrain or furniture usable as a nearby fire for crafting.
 
 ## Build: