Merge branch 'CleverRaven:master' into school-deficiencies

.github/workflows/format_emscripten.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           ref: gh-pages
 
-      - uses: actions/download-artifact@v3.1.4
+      - uses: actions/download-artifact@v4
         with:
           name: formatter
 

CMakePresets.json

@@ -23,7 +23,7 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "displayName": "Windows x64 MSVC",
       "description": "Target Windows (64-bit) with the Visual Studio development environment.",
-      "generator": "Visual Studio 16 2019",
+      "generator": "Visual Studio 17 2022",
       "environment": {
         "VCPKG_ROOT": "C:/vcpkg"
       },
@@ -53,7 +53,7 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "displayName": "Windows Tiles Sounds x64 MSVC",
       "description": "Target Windows (64-bit) with the Visual Studio development environment.",
-      "generator": "Visual Studio 16 2019",
+      "generator": "Visual Studio 17 2022",
       "inherits": "windows-tiles-sounds-x64",
       "environment": {
         "VCPKG_ROOT": "C:/vcpkg"
@@ -65,19 +65,19 @@
       }
     },
     {
-      "name": "windows-tiles-sounds-x64-llvm",
+      "name": "windows-tiles-sounds-x64-clang-cl",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "displayName": "Windows Tiles Sounds x64 LLVM",
-      "description": "Target Windows (64-bit) with the LLVM development environment.",
-      "inherits": "windows-tiles-sounds-x64",
+      "displayName": "Windows Tiles Sounds x64 ClangCL",
+      "description": "Target Windows (64-bit) with the ClangCL development environment.",
+      "inherits": "windows-tiles-sounds-x64-msvc",
+      "toolset": "CLangCL",
       "environment": {
-        "VCPKG_ROOT": "C:/vcpkg"
+        "CXXFLAGS": "-ftime-trace"
       },
       "cacheVariables": {
-        "LLVM_ROOT": "C:/Program Files/LLVM",
-        "CMAKE_PROJECT_INCLUDE_BEFORE": "${sourceDir}/build-scripts/windows-tiles-sounds-x64-msvc.cmake",
-        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/build-scripts/LLVM.cmake",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-static",
+        "CMAKE_PROJECT_INCLUDE_BEFORE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_TOOLCHAIN_FILE": null,
+        "VCPKG_MANIFEST_DIR": "${sourceDir}/msvc-full-features",
         "VCPKG_APPLOCAL_DEPS": "False"
       }
     },
@@ -157,9 +157,12 @@
       "configuration": "RelWithDebInfo"
     },
     {
-      "name": "windows-tiles-sounds-x64-llvm",
-      "configurePreset": "windows-tiles-sounds-x64-llvm",
-      "configuration": "RelWithDebInfo"
+      "name": "windows-tiles-sounds-x64-clang-cl",
+      "configurePreset": "windows-tiles-sounds-x64-clang-cl",
+      "configuration": "RelWithDebInfo",
+      "environment": {
+        "UseMultiToolTask":  "true"
+      }
     }
   ],
   "testPresets": [

build-scripts/MSVC.cmake

@@ -7,47 +7,6 @@ Toolchain file for Microsoft Visual C++.
 
 Used by CMakePresets.json -> "toolchainFile".
 
-C++ flags used by all builds:
-
-/MP     cl.exe build with multiple processes
-/utf-8  set source and execution character sets to UTF-8
-/bigobj increase # of sections in object files
-/permissive-   enforce more standards compliant behavior
-/sdl-   disable additional security checks
-/FC     full path in compiler messages
-/Gd     __cdecl
-/GS-    disable buffer security checks
-/Gy     Enable Function-Level Linking
-/GF     Eliminate Duplicate Strings
-/wd4068 unknown pragma
-/wd4146 negate unsigned
-/wd4661 explicit template undefined
-/wd4819 codepage?
-/wd6237 short-circuit eval
-/wd6319 a, b: unused a
-/wd26444 unnamed objects
-/wd26451 overflow
-/wd26495 uninitialized member
-/WX- (do not) Treat Warnings as Errors
-/W1  Warning Level
-/TP  every file is a C++ file
-/Zc:forScope  Force Conformance in for Loop Scope
-/Zc:inline    Remove unreferenced COMDAT
-/Zc:wchar_t   wchar_t Is Native Type
-
-Additional C++ flags used by RelWithDebInfo builds:
-
-/Ob1 Inline Function Expansion (1 = only when marked as such)
-/Oi  Generate Intrinsic Functions
-
-Linker flags used by all builds:
-
-/OPT:REF  remove unreferenced COMDATs
-/OPT:ICF  folds identical COMDATs
-/DYNAMICBASE  does this app really need ASLR ?
-/NXCOMPAT     same as above
-No need to force /TLBID:1 because is default
-
 CMake defaults seen in generators:
 CMAKE_CXX_FLAGS=/DWIN32 /D_WINDOWS /EHsc
 CMAKE_CXX_FLAGS_DEBUG=/Zi /Ob0 /Od /RTC1
@@ -68,13 +27,35 @@ Remove /RTC1
 # Path has changed, so this configure run will find cl.exe
 set(CMAKE_C_COMPILER   cl.exe)
 set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_CXX_FLAGS_INIT "\
-/MP /utf-8 /bigobj /permissive- /sdl- /FC /Gd /GS- /Gy /GF \
-/wd4068 /wd4146 /wd4661 /wd4819 /wd6237 /wd6319 /wd26444 /wd26451 /wd26495 /WX- /W1 \
-/TP /Zc:forScope /Zc:inline /Zc:wchar_t"
-)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
-"/Oi"
+
+# C++ flags used by all builds
+add_compile_options(
+    /MP    # cl.exe build with multiple processes
+    /utf-8 # set source and execution character sets to UTF-8
+    /bigobj # increase # of sections in object files
+    /permissive- # enforce more standards compliant behavior
+    /sdl-  # disable additional security checks
+    /FC    # full path in compiler messages
+    /Gd    # __cdecl
+    /GS-   #  disable buffer security checks
+    /Gy    #  enable function-level linking
+    /GF    #  eliminate duplicate strings
+    /wd4068 # unknown pargam
+    /wd4146 # negate unsigned
+    /wd4661 # explicit template undefined
+    /wd4819 # codepage?
+    /wd6237 # short-circuit eval
+    /wd6319 # a, b: unused a
+    /wd26444 # unnamed objects
+    /wd26451 # overflow
+    /wd26495 # uninitialized mamber
+    /WX-     # do not tread warnings as errors
+    /W1      # warning level
+    /TP      # every source file is a C++ file
+    /Zc:forScope # force conformace in for loop scope
+    /Zc:inline   # remove unreferenced COMDAT
+    /Zc:wchar_t  # wchar_t is native type
+    $<$<CONFIG:RelWithDebInfo>:/Oi> # inline function expansions (1 = only when marked as such)
 )
 
 add_compile_definitions(
@@ -85,16 +66,19 @@ add_compile_definitions(
     USE_VCPKG
 )
 
+
+# Linker flags used by all builds:
 add_link_options(
-    /OPT:REF
-    /OPT:ICF
+    /OPT:REF # remove unreferenced COMDATs
+    /OPT:ICF # force identical COMDATs
     /LTCG:OFF
     /INCREMENTAL:NO
-    /DYNAMICBASE
-    /NXCOMPAT
+    /DYNAMICBAS  # does this app realy need ASLR ?
+    /NXCOMPAT    # same as above
     "$<$<CONFIG:Debug>:/NODEFAULTLIB:LIBCMT>"
     "$<$<CONFIG:RelWithDebInfo>:/NODEFAULTLIB:LIBCMTD>"
 )
+# Note: no need to force /TLBID:1 because is default
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 

data/changelog.txt

@@ -141,6 +141,8 @@ Add option to make the bleeding of a pet stop
 Add different levels of vision to the overmap
 Google Maps
 Dynamic trait purifiability
+Add drugs and mutagens to your faction camp stores.
+Allow military night vision goggles to attach to combat exoskeleton head armors
 
 
 ## Content:
@@ -313,6 +315,10 @@ Added a way to fix cyborgs at rubic's castle
 Added mashed potatoes.
 Allow cephalopods to gain the ability to eat, sleep underwater
 Alpha Social trait
+A few new reptiles to populate the world
+A bunch of new mutant arthropods underground
+Make dermatik pregnancy and birth suck significantly more
+Add painkiller eyedrops
 
 
 ## Interface:
@@ -397,6 +403,9 @@ Allow ebooks in read command
 format `uilist` menu entries with a table
 Prevent automatically assigning keys to passive mutations
 Fix ImGui Demo in curses
+make ImTui render text as text, so that the players can read our spiffy new menus
+toggle to only draw overmap during autotravel
+mouse input in uilists does not block keyboard navigation
 
 
 ## Mods:
@@ -628,6 +637,12 @@ MOM: Add Reality Tear Teleporter Power
 [Xedra Evolved] Add Homullus must wake up near humans fae ban + eating restrictions
 [Sky Island] Make Beta security containers and better ones obtainable.
 [Xedra Evolved] More Paraclesian restrictions
+Isolation Protocol: Add roguelike style health regen and pain reduction
+[Xedra Evolved] Add the "XEDRA Operative, Department of Extra-Normal Capabilities, SATOR Division" profession
+[Xedra] Inventor: (Re)Add Dimensional Research
+[MoM] Add Illuminate Photokinetic power
+[MoM] Add Headblind trait and Latent Psion trait
+[Xedra Evolved] Extend hedge magic research system
 
 
 ## Balance:
@@ -718,6 +733,11 @@ rebalance beverage quench based on oral hydration index
 Greatly reduce weak point proficiency learning times.
 Adjust martial arts to have crit techs that do not require stun
 Exclude PARROT special attack from monster difficulty calculations
+Remove CLAWS from Judo, Aikido, Eskrima and Biojutsu
+Change Frame, Heavy duty frame, steel plating, sheet metal, and related vehicle parts material to mild steel
+Wielded items behave the same as ranged weapons when driving
+Small changes to Quenching and tempering proficiency
+Battery tools sanification
 
 
 ## Bugfixes:
@@ -949,6 +969,12 @@ ImGui doesn't respect font settings #73019
 Superglue isn't super dense anymore
 Adds jack-o'-lantern recipe byproducts
 Reach attack around corners
+Reach attack around corners
+Fix NPC butchering requirements
+Fixed segfault when monster tries to grab-drag another monster out of reality bubble
+Prevent being teleported beyond OVERMAP_DEPTH
+NPC flee from being run over by vehicles
+fix the crash in select_language by building the font atlas first
 
 
 ## Performance:
@@ -978,6 +1004,7 @@ Decrease memory overhead by about 200MB or about 15% by slimming down mapgen dat
 Faster ascii overmap drawing
 Optimize item::stacks as well as allocation patterns in item and elsewhere
 cache available recipe list in craft menu
+NPCs take less time to check for enemies.
 
 
 ## Infrastructure:
@@ -1047,6 +1074,7 @@ Add Flathub download button and Flatpak manifest
 [EOC] Support user-input text in EOC (similar to num_input in `math`)
 Added support for multiple randomized field sprite variants
 JSON-ify sleep-affecting mutations
+Extend/delete support for harvest lists
 
 
 ## Build:
@@ -1077,6 +1105,7 @@ Add percentage-translated statistic to language selection
 Make furniture->lockpick_message translatable
 Add check to ensure translator comments are correctly located and extracted
 Add more English names and their translations to Simplified Chinese and Japanese
+Expand the Russian name list with translated English names
 
 
 # 0.G (Gaiman)

data/json/effects_on_condition/item_eocs.json

@@ -166,7 +166,10 @@
       { "u_lose_trait": "hair_braid" },
       { "u_lose_trait": "hair_detective" },
       { "u_lose_trait": "hair_super_princess" },
-      { "u_lose_trait": "hair_twintails" }
+      { "u_lose_trait": "hair_twintails" },
+      { "u_lose_trait": "hair_bald" },
+      { "u_lose_trait": "hair_fro" },
+      { "u_lose_trait": "hair_ponytail" }
     ]
   },
   {