Update DaybreakDemo to use unaltered colors.

Well, until you're damaged!

SquidSquad/DaybreakDemo/core/src/main/java/com/github/tommyettinger/DaybreakDemo.java

@@ -146,10 +146,10 @@ private boolean onGrid(int screenX, int screenY) {
      */
     private static final int OKLAB_BLOOD = DescriptiveColor.describeOklab("darkest brick");
     /**
-     * Used as the color for remembered cells that can't be currently seen. Slightly-yellow-brown,
-     * with about 30% lightness; fully opaque.
+     * Used as the color for remembered cells that can't be currently seen.
+     * Gray with about 30% lightness; fully opaque.
      */
-    private static final int OKLAB_MEMORY = 0xFF848350;
+    private static final int OKLAB_MEMORY = 0xFF808060;
 
     public DaybreakDemo() {
         this(1L);
@@ -159,7 +159,7 @@ public DaybreakDemo(long seed) {
         this.seed = seed;
         for(Color c : Colors.getColors().values()) {
             final int f = DescriptiveColor.fromRGBA(c.r, c.g, c.b, c.a);
-            c.set(channelL(f) * 0.5f, channelA(f), channelB(f), c.a);
+            c.set(channelL(f), channelA(f), channelB(f), c.a);
         }
 
     }
@@ -296,7 +296,7 @@ public void restart(long seed) {
             monsters.put(monPos, monster);
             vision.lighting.addLight(monPos, new Radiance(rng.nextFloat(3f) + 2f,
 //                    FullPalette.COLOR_WHEEL_PALETTE_LIGHT[rng.nextInt(FullPalette.COLOR_WHEEL_PALETTE_LIGHT.length)], 0f, 0f));
-                    FullPalette.COLOR_WHEEL_PALETTE_MID[rng.nextInt(FullPalette.COLOR_WHEEL_PALETTE_LIGHT.length)], 0.5f, 0f));
+                    FullPalette.COLOR_WHEEL_PALETTE_MID[rng.nextInt(FullPalette.COLOR_WHEEL_PALETTE_MID.length)], 0.5f, 0f));
         }
 //        monsterDirector = new Director<>((e) -> e.getValue().getLocation(), monsters, 125);
         monsterDirector = new Director<>(c -> monsters.get(c).getLocation(), monsters.order(), 150);
@@ -352,7 +352,7 @@ public void create() {
         font.getData().setScale(2f / cellWidth, 2f / cellHeight);
         font.getData().markupEnabled = true;
 
-        vision.rememberedOklabColor = OKLAB_MEMORY;
+        vision.rememberedColor = OKLAB_MEMORY;
 
 //        Pixmap pCursor = new Pixmap(cellWidth, cellHeight, Pixmap.Format.RGBA8888);
 //        Pixmap pAtlas = new Pixmap(Gdx.files.classpath("dawnlike/Dawnlike.png"));
@@ -696,8 +696,8 @@ public void render() {
         mainViewport.apply(false);
         batch.setProjectionMatrix(camera.combined);
         batch.begin();
-        batch.getShader().setUniformf("u_globalMul", 1f, 0.9f, 0.9f); // slightly desaturates everything
-        batch.getShader().setUniformf("u_globalAdd", 0f, 0f, 0.01f); // tints everything yellowish-brown
+        batch.getShader().setUniformf("u_globalMul", 1f, 0.8f, 0.9f);
+        batch.getShader().setUniformf("u_globalAdd", 0f, 0.1f - health * 0.0115f, 0.08f - health * 0.0111f);
 
         // you done bad. you done real bad.
         if (health <= 0) {

SquidSquad/DaybreakDemo/gradle.properties

@@ -4,18 +4,16 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 android.enableR8.fullMode=false
 gdxVersion=1.12.1
 #gdxBackendsVersion=9ab8bfe3bb
-gdxBackendsVersion=1.1210.0
+gdxBackendsVersion=1.1210.1
 enableGraalNative=true
 graalHelperVersion=2.0.1
 graalvmVersion=22.3.1
-gwtFrameworkVersion=2.10.0
+gwtFrameworkVersion=2.11.0
 gwtPluginVersion=1.1.29
-digitalVersion=0.4.5
-juniperVersion=0.4.3
-jdkgdxdsVersion=1.4.4
+digitalVersion=0.4.7
+juniperVersion=0.5.0
+jdkgdxdsVersion=1.4.8
 #freetypeGwtVersion=1.9.10.1
 regexodusVersion=0.1.15
 
-#squidSquadVersion=c3265779f9
-#squidSquadVersion=68ea701b09
-squidSquadVersion=751cf919cf
+squidSquadVersion=f09b288412

SquidSquad/DaybreakDemo/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

SquidSquad/DaybreakDemo/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

SquidSquad/DaybreakDemo/html/build.gradle

@@ -30,7 +30,7 @@ gwt {
 dependencies {
 //	implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
 //	implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
-    implementation "com.google.jsinterop:jsinterop-annotations:2.0.2:sources"
+//    implementation "com.google.jsinterop:jsinterop-annotations:2.0.2:sources"
 
 	implementation "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
 
@@ -79,14 +79,14 @@ dependencies {
 
 	implementation project(':core')
 
-//// You can use the lines below instead of the "com.badlogicgames.gdx:gdx-backend-gwt" dependencies.
-//// If you do, follow the steps at https://github.com/tommyettinger/gdx-backends#gwt-2902100-support
-//// and you can use GWT 2.10.0, which gives you access to Java 11 language features.
+//// You can use the lines below instead of the "com.badlogicgames.gdx:gdx-backend-gwt" dependencies. If you do,
+//// follow the steps at https://github.com/tommyettinger/gdx-backends?tab=readme-ov-file#gwt-29021002110-support
+//// and you can use GWT 2.11.0, which gives you access to Java 11 language features.
 //// Make sure that in the gwt block, you change gwtVersion so it is:
-//// gwtVersion = "2.10.0"
+//// gwtVersion = "2.11.0"
     implementation "com.github.tommyettinger:gdx-backend-gwt:$gdxBackendsVersion"
     implementation "com.github.tommyettinger:gdx-backend-gwt:$gdxBackendsVersion:sources"
-//    implementation "com.google.jsinterop:jsinterop-annotations:2.0.2:sources"
+    implementation "com.google.jsinterop:jsinterop-annotations:2.0.2:sources"
 
 //    implementation "com.github.tommyettinger.gdx-backends:gdx-backend-gwt:$gdxBackendsVersion"
 //    implementation "com.github.tommyettinger.gdx-backends:gdx-backend-gwt:$gdxBackendsVersion:sources"

SquidSquad/DungeonDemo/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

SquidSquad/DungeonDemo/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

SquidSquad/DungeonDemo/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

docs/squidsquad/daybreak/html/compilation-mappings.txt

@@ -1,7 +1,7 @@
-D63A06513B99097BE248D86E5128767E.cache.js
+AF570BD58A6A83994E451A221F406E9E.cache.js
 user.agent gecko1_8
 
-D63A06513B99097BE248D86E5128767E.cache.js
+AF570BD58A6A83994E451A221F406E9E.cache.js
 user.agent safari
 
 Devmode:devmode.js

docs/squidsquad/daybreak/html/html.devmode.js

@@ -2,7 +2,7 @@ var $wnd = $wnd || window.parent;
 var __gwtModuleFunction = $wnd.html;
 var $sendStats = __gwtModuleFunction.__sendStats;
 $sendStats('moduleStartup', 'moduleEvalStart');
-var $gwt_version = "2.10.0";
+var $gwt_version = "2.11.0";
 var $strongName = '';
 var $gwt = {};
 var $doc = $wnd.document;