Merge branch 'CleverRaven:master' into monster_conditions

.github/workflows/emscripten.yml

@@ -29,6 +29,7 @@ jobs:
       id: get-vars
       run: |
         echo "datetime=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
+        echo "datetime-seconds=$(/bin/date +%s)" >> $GITHUB_OUTPUT
         echo "ccache-path=$(echo '~/.cache/ccache')" >> $GITHUB_OUTPUT
 
     - name: ccache cache files
@@ -53,7 +54,7 @@ jobs:
         export EM_CONFIG=$EMSDK/.emscripten
         export CCACHE_COMPILERCHECK=string:3.1.51
         ccache --zero-stats
-        ccache -M 5G
+        ccache -M 20G
         ccache --show-stats
 
         ./build-scripts/build-emscripten.sh
@@ -63,7 +64,11 @@ jobs:
         emsdk activate ccache-git-emscripten-64bit
         export PATH="${PATH%%:*}/../../ccache/git-emscripten_64bit/bin":$PATH
         ccache --show-stats
-        ccache -M 5G
+        NOW=`/bin/date +%s`
+        DELTA=$(( $NOW - ${{ steps.get-vars.outputs.datetime-seconds }} ))
+        ccache --evict-older-than ${DELTA}s
+        ccache --show-stats
+        ccache -M 1G
         ccache -c
         ccache --show-stats
 

.github/workflows/matrix.yml

@@ -94,7 +94,7 @@ jobs:
             dont_skip_data_only_changes: 1
             mods: --mods=magiclysm
             title: Basic Build and Test (Clang 10, Ubuntu, Curses)
-            ccache_limit: 5G
+            ccache_limit: 4.5G
             ccache_key: linux-llvm-10-break1
 
           - compiler: clang++
@@ -106,7 +106,7 @@ jobs:
             sound: 1
             localize: 1
             title: Clang 14, macOS 12, Tiles, Sound, x64 and arm64 Universal Binary
-            ccache_limit: 6G
+            ccache_limit: 10G
             ccache_key: macos-llvm-14-universal-break1
 
           - compiler: g++-9
@@ -122,7 +122,7 @@ jobs:
             pch: 1
             cxxflags: -gsplit-dwarf
             title: GCC 9, Curses, LTO
-            ccache_limit: 4.5G
+            ccache_limit: 7.5G
             ccache_key: linux-gcc-9-lto
 
           - compiler: clang++-12
@@ -137,7 +137,7 @@ jobs:
             cxxflags: --gcc-toolchain=/opt/mock-gcc-11
             dont_skip_data_only_changes: 1
             title: Clang 12, Ubuntu, Tiles, ASan
-            ccache_limit: 4.5G
+            ccache_limit: 6G
             ccache_key: linux-llvm-12-asan
 
           - compiler: g++-11
@@ -150,7 +150,7 @@ jobs:
             pch: 1
             sanitize: address
             title: GCC 11, Ubuntu, Curses, ASan
-            ccache_limit: 6G
+            ccache_limit: 6.5G
             ccache_key: linux-gcc-11-asan
 
           - compiler: g++-9
@@ -162,7 +162,7 @@ jobs:
             native: linux64
             pch: 1
             title: GCC 9, Ubuntu, Tiles, Sound, CMake
-            ccache_limit: 3G
+            ccache_limit: 1G
             ccache_key: linux-gcc-9-cmake
 
     name: ${{ matrix.title }}
@@ -221,11 +221,12 @@ jobs:
       if: ${{ env.SKIP == 'false' && runner.os == 'Linux' && matrix.tiles == 1 }}
       run: |
           sudo apt-get install libflac-dev libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev libpulse-dev
-    - name: install recent ccache on ubuntu 20.04
-      if: ${{ env.SKIP == 'false' && runner.os == 'Linux' && matrix.os == 'ubuntu-20.04' }}
+    - name: install recent ccache on ubuntu
+      if: ${{ env.SKIP == 'false' && runner.os == 'Linux' }}
       run: |
+          ccache --version
           sudo apt-get remove --purge -y ccache
-          curl -sL https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3-linux-x86_64.tar.xz | sudo tar Jxvf - --strip-components 1 -C /usr/bin ccache-4.8.3-linux-x86_64/ccache
+          curl -sL https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz | sudo tar Jxvf - --strip-components 1 -C /usr/bin ccache-4.10.2-linux-x86_64/ccache
           ccache --version
     - name: install Clang 12 (Ubuntu)
       if: ${{ env.SKIP == 'false' && runner.os == 'Linux' && (matrix.compiler == 'clang++-12') }}
@@ -264,6 +265,7 @@ jobs:
       if: ${{ env.SKIP == 'false' }}
       run: |
         echo "datetime=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
+        echo "datetime-seconds=$(/bin/date +%s)" >> $GITHUB_OUTPUT
         echo "ccache-path=$([ "$RUNNER_OS" = "macOS" ] && echo '/Users/runner/Library/Caches/ccache' || echo '~/.cache/ccache')" >> $GITHUB_OUTPUT
       shell: bash
     - name: ccache cache files
@@ -282,6 +284,10 @@ jobs:
     - name: post-build ccache manipulation
       if: ${{ env.SKIP == 'false' && !failure() && (runner.os == 'Linux' || runner.os == 'macOS') }}
       run: |
+        ccache --show-stats --verbose
+        NOW=`/bin/date +%s`
+        DELTA=$(( $NOW - ${{ steps.get-vars.outputs.datetime-seconds }} ))
+        ccache --evict-older-than ${DELTA}s
         ccache --show-stats --verbose
         ccache -M ${{ env.CCACHE_LIMIT }}
         ccache -c

.github/workflows/msvc-full-features.yml

@@ -111,6 +111,7 @@ jobs:
       id: get-vars
       run: |
         echo "datetime=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
+        echo "datetime-seconds=$(/bin/date +%s)" >> $GITHUB_OUTPUT
         echo "ccache-path=$(echo "$APPDATA\\ccache")" >> $GITHUB_OUTPUT
       shell: bash
 
@@ -138,9 +139,19 @@ jobs:
       run: |
           msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static" msvc-full-features/Cataclysm-vcpkg-static.sln
 
+    - name: Get ccache cache age cutoff
+      id: get-cache-age
+      run: |
+        NOW=`/bin/date +%s`
+        DELTA=$(( $NOW - ${{ steps.get-vars.outputs.datetime-seconds }} ))
+        echo "ccache-age=$(( $NOW - ${{ steps.get-vars.outputs.datetime-seconds }} ))" >> $GITHUB_OUTPUT
+      shell: bash
+
     - name: Post-build ccache manipulation
       if: ${{ !failure() }}
       run: |
+        ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -s -v
+        ${{ env.CDDA_CCACHE_PATH }}\ccache.exe --evict-older-than ${{ steps.get-ccache-age.outputs.ccache-age }}
         ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -s -v
         ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -M ${{ env.CCACHE_LIMIT }}
         ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -c

build-scripts/build.sh

@@ -40,7 +40,7 @@ fi
 
 ccache --zero-stats
 # Increase cache size because debug builds generate large object files
-ccache -M 10G
+ccache -M 20G
 ccache --show-stats --verbose
 
 function run_test

build-scripts/gha_compile_only.sh

@@ -40,7 +40,7 @@ fi
 
 ccache --zero-stats
 # Increase cache size because debug builds generate large object files
-ccache -M 10G
+ccache -M 20G
 ccache --show-stats --verbose
 
 if [ "$CMAKE" = "1" ]

data/changelog.txt

@@ -196,6 +196,7 @@ Relaxing with Alonso is now fun
 Prompt before oxytorch activity if you don't have enough gas
 Ability to hide/unhide revealed wall wiring by examining it
 Special vision enchantment for Antennae mutation
+Add keybind to throw your wielded item
 
 
 ## Content:
@@ -415,6 +416,7 @@ Remade the 3x3 hospital
 Some houses are under construction
 Adds car crashes into existing buildings. Initial implementation includes three houses that can spawn with this variant.
 fungalize stages for rest of zombies
+Basic beach decorations
 
 
 ## Interface:
@@ -548,6 +550,8 @@ Migrate popups in pocket settings menu to ImGui
 Migrate martial arts details window to imgui
 Add sorting by price to weight ratio
 Filter items by can_contain `L:`, `V:`, `M:` (longest_side, volume, mass); affects AIM, inventory…
+Migrate compare item menu to imgui
+Various misc improvements to camp crafting flow and feedback
 
 
 ## Mods:
@@ -903,6 +907,13 @@ Aftershock: Shield bionics deploy Riemman shields
 [Magiclysm/Innawood] Allow troll caves to spawn innawood
 [Magiclysm] Rock trolls actually turn to stone
 [Xedra Evolved] Add Time Related Monsters
+[Magiclysm] Progressive Difficulty reduction the more spells of that school you know
+[Magiclysm/Innawood] Blacklist iron and plastic golems Innawood
+[Magiclysm] Add feral technomancers
+[Sky Island] Progressive autodoc improvement
+[Xedra Evolved] Add time magic class / scenario
+[Magiclysm] Spells cost 1/5 of their normal cost on spell failure
+[Magiclysm] The Great Damage Randomization and Normalization
 
 
 ## Balance:
@@ -1403,6 +1414,10 @@ Fix broken macOS build due removed folder
 Fix an EOC that was looping infinitely and starting more loops as you travel
 Allow attacking with CANNOT_MOVE flag
 Killing hostile NPCs won't give "Killed innocent" morale debuff anymore
+Fixes displaying of stats for ablative armor
+Fixes SegFault w/ flashlights & attached power
+Peeking out of elevated windows no longer causes you to fall
+Heat radiance now can spread through gas-permeable tiles like chain link fence
 
 
 ## Performance:
@@ -1556,6 +1571,12 @@ less verbose reading of layering.json
 Imgui input popups
 Retired mingw cross compile build
 Script for updating Translate Complex Dialogue mod
+Falling is no longer handled by traps
+Allow more customizable XP costs for spell leveling
+Improve test coverage of mod combinations with mod_interactions
+Tests now run in a guaranteed order (lexicographic) by default (can be overriden with cli argument)
+Streamline Vertical Movement While Levitating and Flying
+Make enchantment mutations work again
 
 ## Build:
 Support Mac arm64 build
@@ -1610,6 +1631,7 @@ Make Portugal Portugues appear in Options
 [Xedra Evolved] NO_I18N, dont extract monster/fake spells
 Restructure the template file
 [MoM] Dont extract monster/fake spells/effects for translation
+Miscellaneous NO_I18N additions
 
 
 # 0.G (Gaiman)

data/json/items/comestibles/raw_veggy.json

@@ -1255,7 +1255,8 @@
     "description": "A normal and healthy purple eggplant.  Needs to be disassembled before being useful for cooking.",
     "healthy": -1,
     "symbol": "e",
-    "flags": [ "RAW", "CATTLE", "RABBIT", "RAT", "MOUSE" ],
+    "flags": [ "RAW", "SMOKABLE", "CATTLE", "RABBIT", "RAT", "MOUSE" ],
+    "smoking_result": "dry_veggy",
     "vitamins": [ [ "vitC", "12100 μg" ], [ "iron", "1300 μg" ], [ "calcium", "49300 μg" ], [ "veggy_allergen", 1 ] ],
     "fun": -8
   },
@@ -1276,7 +1277,8 @@
     "healthy": -1,
     "symbol": "e",
     "looks_like": "eggplant",
-    "flags": [ "RAW" ],
+    "flags": [ "RAW", "SMOKABLE" ],
+    "smoking_result": "dry_veggy",
     "vitamins": [ [ "vitC", "60500 μg" ], [ "iron", "650 μg" ], [ "calcium", "24650 μg" ], [ "veggy_allergen", 1 ] ],
     "fun": -5
   },

data/json/items/comestibles/veggy_dishes.json

@@ -1094,6 +1094,8 @@
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "corn_kernels", "name": { "str_sp": "%s, corn kernels" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "cucumber", "name": { "str_sp": "%s, cucumber" } },
       { "type": "COMPONENT_ID", "condition": "dandelion_cooked", "name": { "str_sp": "%s, cooked dandelion greens" } },
+      { "type": "COMPONENT_ID", "condition": "eggplant", "name": { "str_sp": "%s, eggplant" } },
+      { "type": "COMPONENT_ID", "condition": "eggplant_cut", "name": { "str_sp": "%s, cut eggplant" } },
       { "type": "COMPONENT_ID", "condition": "grape_leaves", "name": { "str_sp": "%s, grape leaves" } },
       { "type": "COMPONENT_ID", "condition": "groundnut_prepared", "name": { "str_sp": "%s, ground nuts" } },
       { "type": "COMPONENT_ID", "condition": "horseradish_greens", "name": { "str_sp": "%s, horseradish greens" } },

data/json/mapgen/nested/road_nested.json

@@ -286,17 +286,6 @@
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
     }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "1x1_manhole",
-    "object": {
-      "mapgensize": [ 1, 1 ],
-      "rows": [ "O" ],
-      "palettes": [ "road_palette" ],
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",

data/json/mapgen/road.json

@@ -738,7 +738,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "road_four_way",
+    "om_terrain": [ "road_four_way", "road_nesw_manhole" ],
     "weight": { "global_val": "vanilla_road_weight", "default": 1000 },
     "object": {
       "fallback_predecessor_mapgen": "field",
@@ -1056,20 +1056,6 @@
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
     }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "road_nesw_manhole",
-    "//": "Need to fix magical teleportation with actual aligned manhole placement",
-    "object": {
-      "fill_ter": "t_region_grass",
-      "place_nested": [
-        { "chunks": [ "24x24_road_four_way_crossroad" ], "x": 0, "y": 0 },
-        { "chunks": [ "1x1_manhole" ], "x": [ 5, 18 ], "y": [ 5, 18 ] }
-      ],
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",

data/json/mapgen/sewer.json

@@ -1,13 +1,30 @@
 [
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "manhole_1x1",
+    "object": { "mapgensize": [ 1, 1 ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { " ": "t_manhole_cover" } }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "manhole_open_1x1",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "terrain": { " ": "t_manhole" },
+      "item": { " ": { "item": "manhole_cover" } }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
     "nested_mapgen_id": "ladder_1x1",
     "object": {
       "mapgensize": [ 1, 1 ],
-      "rows": [ "^" ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
-      "terrain": { "^": "t_ladder_up" }
+      "terrain": { " ": "t_ladder_up" },
+      "place_nested": [ { "chunks": [ [ "manhole_1x1", 11 ], [ "manhole_open_1x1", 1 ] ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {

data/json/mapgen_palettes/road.json

@@ -13,7 +13,6 @@
       "b": "t_concrete",
       "x": "t_concrete",
       "n": "t_concrete",
-      "O": "t_manhole_cover",
       "g": "t_region_grass",
       "f": "t_region_grass",
       "#": "t_sconc_wall_halfway",

data/json/recipes/recipe_food.json

@@ -98,7 +98,7 @@
     "charges": 4,
     "//": "See pur_tablets item definition for documentation and discussion",
     "autolearn": true,
-    "components": [ [ [ "water_murky", 1 ] ], [ [ "pur_tablets", 1 ] ] ]
+    "components": [ [ [ "water_murky", 4 ] ], [ [ "pur_tablets", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -8861,6 +8861,7 @@
         [ "seed_rose", 3 ],
         [ "seed_cattail", 3 ],
         [ "seed_dahlia", 3 ],
+        [ "seed_eggplant", 3 ],
         [ "seed_flower", 3 ],
         [ "seed_cactus", 3 ],
         [ "seed_hops", 3 ],

data/mods/DinoMod/items/egg.json

@@ -760,6 +760,13 @@
     "copy-from": "egg_dino_small",
     "rot_spawn": { "monster": "mon_nanosaurus_hatchling" }
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_fona",
+    "name": "fona egg",
+    "copy-from": "egg_dino_small",
+    "rot_spawn": { "monster": "mon_fona_hatchling" }
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_oryctodromeus",