diff --git a/app/android/client/build.gradle b/app/android/client/build.gradle index b9aa7bb01f..67a570bc87 100644 --- a/app/android/client/build.gradle +++ b/app/android/client/build.gradle @@ -10,13 +10,21 @@ android { applicationId namespace minSdk 21 targetSdk 32 - versionCode 1047005 - versionName "1.47.5" + versionCode 1048000 + versionName "1.48" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" targetSdkVersion 32 minSdkVersion 21 } + // F-Droid doesn't allow encrypted DependencyInfoBlock in APK + dependenciesInfo { + // disables dependency metadata when building APKs + includeInApk = false + // disables dependency metadata when building Android App Bundles + includeInBundle = false + } + // build output project.setProperty("archivesBaseName", "${namespace}-${defaultConfig.versionCode}") project.setProperty("buildDir", "${projectDir}/../../../build/build_android_client") diff --git a/app/android/client/src/main/play/release-notes/en-US/default.txt b/app/android/client/src/main/play/release-notes/en-US/default.txt index a2fc8271aa..6484572ca3 100644 --- a/app/android/client/src/main/play/release-notes/en-US/default.txt +++ b/app/android/client/src/main/play/release-notes/en-US/default.txt @@ -1,9 +1,7 @@ -Pizza is a popular meal of choice. With growing demand, Leander is looking to hire reliable workers to transport his hot and delicious cuisine to patrons. Couriers with reputations of on-time deliveries are being recognized for their work ethic. +The world has just gotten a little fancier. You may notice that the clouds have cleared in Kikareukin, revealing a beautiful view of Semos below. -Some adventurers may be distressed and feel that their quest for the title of "Ultimate Collector" is in vain. Well fret no more, as Balduin is offering a ray of hope. Requests to bring him a different item are now accepted afer some time has passed. +If luck has it, you may find a rare four-leaf clover. Keep your eyes peeled, they pop up in random locations that receive sunshine. Clover hunters will reward generously for such valuable trinkets. -Speaking of weapons, some creatures have once again taken up arms. For example the angel and dark angel have new swords. +Jef is still eager to hear from his mother, Amber. But don't expect to find her on her usual route as she has taken to wandering off the beaten path. Speaking of wandering, some creatures have become more unpredictable in their behavior. Be careful, as you may encounter them in unexpected places. -Last but not least: We released an official Android App, which is available in the download section of our website or on F-Droid. - -Please see the complete change log for further details: http://localhost/game/stendhal.html#changes \ No newline at end of file +Please see the complete change log for further details: https://arianne-project.org/game/stendhal.html#changes diff --git a/app/android/client/src/main/res/values/strings.xml b/app/android/client/src/main/res/values/strings.xml index 28e542b5df..c6c482d0de 100644 --- a/app/android/client/src/main/res/values/strings.xml +++ b/app/android/client/src/main/res/values/strings.xml @@ -5,6 +5,6 @@ Stendhal stendhalprod8gps5y99pu prod - 1.47.5 + 1.48 diff --git a/app/neutralinojs/neutralino.config.json b/app/neutralinojs/neutralino.config.json index 2f5abba653..b31a531ff7 100644 --- a/app/neutralinojs/neutralino.config.json +++ b/app/neutralinojs/neutralino.config.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/neutralinojs/neutralinojs/main/schemas/neutralino.config.schema.json", "applicationId": "org.stendhalgame.client", - "version": "1.47.5", + "version": "1.48", "defaultMode": "window", "port": 0, "documentRoot": "/resources/", diff --git a/bin/runserver.bat b/bin/runserver.bat index 7632e3f266..f79b805565 100644 --- a/bin/runserver.bat +++ b/bin/runserver.bat @@ -1,6 +1,6 @@ @echo off -set STENDHAL_VERSION=1.47.5 +set STENDHAL_VERSION=1.48 set SERVER_JAR=stendhal-server-%STENDHAL_VERSION%.jar :: change to server directory diff --git a/bin/runserver.sh b/bin/runserver.sh index b98113d3e9..1edba29428 100755 --- a/bin/runserver.sh +++ b/bin/runserver.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -STENDHAL_VERSION="1.47.5" +STENDHAL_VERSION="1.48" SERVER_JAR="stendhal-server-${STENDHAL_VERSION}.jar" # change to server directory diff --git a/build.ant.properties b/build.ant.properties index 17bc60ee79..5397b84baf 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -92,9 +92,9 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 1.47 -version = 1.47.5 +version = 1.48 +version.android = 1048000 # FIXME: dynamic method to set this property? -version.android = 1047005 # javac options javac.deprecation = true diff --git a/buildtools/mkdocs/mkdocs.yml b/buildtools/mkdocs/mkdocs.yml index 97dba5ee8d..d20b234f14 100644 --- a/buildtools/mkdocs/mkdocs.yml +++ b/buildtools/mkdocs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Stendhal 1.47.5 Reference Documentation +site_name: Stendhal 1.48 Reference Documentation site_description: A fun, friendly, & free multiplayer online adventure game. copyright: Copyright © 2003-2024 Stendhal site_url: https://stendhalgame.org/ diff --git a/data/sprites/entity/overlay/necro_flames.png b/data/sprites/entity/overlay/necro_flames.png index 0643d2f16d..ff7bbc29de 100644 Binary files a/data/sprites/entity/overlay/necro_flames.png and b/data/sprites/entity/overlay/necro_flames.png differ diff --git a/data/sprites/entity/overlay/necro_flames.xcf.bz2 b/data/sprites/entity/overlay/necro_flames.xcf.bz2 new file mode 100644 index 0000000000..b28980b15b Binary files /dev/null and b/data/sprites/entity/overlay/necro_flames.xcf.bz2 differ diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index a710cae385..69197224c7 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "1.47.5"; + public static final String VERSION = "1.48"; /** pre release suffix */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. diff --git a/src/games/stendhal/server/entity/creature/impl/idle/IdleBehaviourFactory.java b/src/games/stendhal/server/entity/creature/impl/idle/IdleBehaviourFactory.java index 3444b3c508..311bb40468 100644 --- a/src/games/stendhal/server/entity/creature/impl/idle/IdleBehaviourFactory.java +++ b/src/games/stendhal/server/entity/creature/impl/idle/IdleBehaviourFactory.java @@ -32,15 +32,14 @@ public class IdleBehaviourFactory { } else { behaviour = new WanderIdleBehaviour(); } - } else if (aiProfiles.containsKey("patrolling") && aiProfiles.containsKey("wander")) { - // randomly select between "patrolling" & "wander" for individual entity instance - behaviour = Rand.flipCoin() ? new Patroller() : behaviour; + if (aiProfiles.containsKey("patrolling")) { + // randomly select between "patrolling" & "wander" for individual entity instance + behaviour = Rand.flipCoin() ? new Patroller() : behaviour; + } } else if (aiProfiles.containsKey("patrolling")) { behaviour = new Patroller(); } else if (aiProfiles.containsKey("camouflage")) { behaviour = new CamouflagedIdleBehaviour(); - } else if (aiProfiles.containsKey("wander")) { - behaviour = new WanderIdleBehaviour(); } return behaviour; }