From ae89130c9d9d482b60dcd956763ee1461d312eec Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 1 Oct 2023 09:14:12 +0200 Subject: [PATCH 1/4] updated version number --- build.ant.properties | 2 +- buildtools/mkdocs/mkdocs.yml | 2 +- runserver.bat | 2 +- runserver.sh | 2 +- src/games/stendhal/common/Debug.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.ant.properties b/build.ant.properties index f4c3b8a8d4..15eb188ed7 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -85,7 +85,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 1.43 -version = 1.43.5 +version = 1.44 # javac options javac.deprecation = true diff --git a/buildtools/mkdocs/mkdocs.yml b/buildtools/mkdocs/mkdocs.yml index d865a589af..69fb9e3606 100644 --- a/buildtools/mkdocs/mkdocs.yml +++ b/buildtools/mkdocs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Stendhal 1.43.5 Reference Documentation +site_name: Stendhal 1.44 Reference Documentation site_description: A fun, friendly, & free multiplayer online adventure game. copyright: Copyright © 2003-2023 Stendhal site_url: https://stendhalgame.org/ diff --git a/runserver.bat b/runserver.bat index 573cadca4d..98efdbc5c9 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,4 +1,4 @@ -set STENDHAL_VERSION=1.43.5 +set STENDHAL_VERSION=1.44 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l @pause \ No newline at end of file diff --git a/runserver.sh b/runserver.sh index 2982bc788e..0856d9dbc1 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="1.43.5" +STENDHAL_VERSION="1.44" LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index 88634b6de4..67b7631fad 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.43.5"; + public static final String VERSION = "1.44"; /** 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. From abd1095523f4fb20917fa3eac04d99ad8a744960 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 2 Oct 2023 20:11:12 +0200 Subject: [PATCH 2/4] fixed webclient build --- buildtools/ant_modules/dist.xml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 72373aed59..a36efa48ef 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -806,31 +806,16 @@ - + - - - - - - - - + From 654452d1a6a2a5c45ea647f7199355a7f467f17e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 3 Oct 2023 22:12:59 +0200 Subject: [PATCH 3/4] use two digit year for fametype (#388) --- src/games/stendhal/server/maps/quests/PaperChase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/games/stendhal/server/maps/quests/PaperChase.java b/src/games/stendhal/server/maps/quests/PaperChase.java index 25abb3376a..4616e22b9f 100644 --- a/src/games/stendhal/server/maps/quests/PaperChase.java +++ b/src/games/stendhal/server/maps/quests/PaperChase.java @@ -95,7 +95,7 @@ public class PaperChase extends AbstractQuest implements TeleportListener { private String getFameType() { String questSlot = QuestUtils.evaluateQuestSlotName(QUEST_SLOT); - return questSlot.substring(questSlot.length() - 1); + return questSlot.substring(questSlot.length() - 2); } From e3b9c22ff73896de48a03afee15f398a9a41dbbf Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 5 Oct 2023 10:22:48 -0700 Subject: [PATCH 4/4] Shorten achievement title to "Sowing Seeds" --- doc/CHANGES.txt | 2 +- .../rp/achievement/factory/ProductionAchievementFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt index 5007ab2f4a..13e9b64aa2 100644 --- a/doc/CHANGES.txt +++ b/doc/CHANGES.txt @@ -8,7 +8,7 @@ Changelog *world* - new achievements: - Fruit Salad: Harvest 3 of all fruit that grow in Faiumoni - - Sowing Seeds of Joy: Sow 1000 of each type of sowable flower seed + - Sowing Seeds: Sow 1000 of each type of sowable flower seed - Kirla sells copies for her memory pictures - quests now shown in travel log: - Adventure Island diff --git a/src/games/stendhal/server/core/rp/achievement/factory/ProductionAchievementFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/ProductionAchievementFactory.java index 9216326ae9..4e122ed8ca 100644 --- a/src/games/stendhal/server/core/rp/achievement/factory/ProductionAchievementFactory.java +++ b/src/games/stendhal/server/core/rp/achievement/factory/ProductionAchievementFactory.java @@ -101,7 +101,7 @@ public class ProductionAchievementFactory extends AbstractAchievementFactory { new PlayerProducedNumberOfItemsCondition(1000, "flour"))); achievements.add(createAchievement( - "production.sow.flowers.all", "Sowing Seeds of Joy", + "production.sow.flowers.all", "Sowing Seeds", "Sow 1000 of each type of sowable flower seed", Achievement.MEDIUM_BASE_SCORE, true, new ChatCondition() {