diff --git a/build.ant.properties b/build.ant.properties index 6d4f5e1e0e..98c11976f0 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 0.96 -version = 0.96.5 +version = 0.97 # javac options javac.deprecation = true diff --git a/data/conf/zones/semos.xml b/data/conf/zones/semos.xml index 54ef89fa98..1a471eff40 100644 --- a/data/conf/zones/semos.xml +++ b/data/conf/zones/semos.xml @@ -96,7 +96,7 @@ + file="Level 0/semos/mountain_n2.tmx"> Semos Mines @@ -114,83 +114,6 @@ Entrance just allowed for mine workers. - - - - Welcome to the Mine Town Revival Weeks 2011! - transparent - 0 - - - - - - Welcome to the Mine Town Revival Weeks 2011! - transparent - 0 - - - - - - Welcome to the Mine Town Revival Weeks 2011! - transparent - 0 - - - - - - - sellrevivalweeks - Carolines snacks and drinks shop (sells) - true - Caroline sells snacks and drinks during the Mine Town Revival weeks. - - - blackboard - - - - - - sellrevivalweeks - Carolines snacks and drinks shop (sells) - true - Caroline sells snacks and drinks during the Mine Town Revival weeks. - - - blackboard - - - - - - - You see a nice clean table for resting your drinks on. - 4 - 2 - - - - - You see a nice clean table for resting your drinks on. - 4 - 2 - - - - - You see a nice clean table for resting your drinks on. - 4 - 2 - - - - @@ -1287,7 +1210,7 @@ Mature sheep wanted: please speak to Sato. + file="Level 0/semos/city.tmx"> The City of Semos @@ -1593,40 +1516,6 @@ Ahh nice, you can already smell it. And in small letters below is added: "New! L transparent - - - - - Stendhal #Mine #Town #Revival #Weeks #2011 ! Enjoy the #third #festival and meet #Susi and her father while celebrating with snacks and drinks! Just take the path up to the #North #from #Semos #City to reach the #Mine #Town! Have you heard about the new #recolouring #feature already? Choose your most #favourite #colour and celebrate the festivals with your #selfmade #coloured #outfit! - 2 - 2 - transparent - - - - - Stendhal #Mine #Town #Revival #Weeks #2011 ! Enjoy the #third #festival and meet #Susi and her father while celebrating with snacks and drinks! Just take the path up to the #North #from #Semos #City to reach the #Mine #Town! Have you heard about the new #recolouring #feature already? Choose your most #favourite #colour and celebrate the festivals with your #selfmade #coloured #outfit! - 2 - 2 - transparent - - - - - Stendhal #Mine #Town #Revival #Weeks #2011 ! Enjoy the #third #festival and meet #Susi and her father while celebrating with snacks and drinks! Just take the path up to the #North #from #Semos #City to reach the #Mine #Town! Have you heard about the new #recolouring #feature already? Choose your most #favourite #colour and celebrate the festivals with your #selfmade #coloured #outfit! - 2 - 2 - transparent - - - - - Stendhal #Mine #Town #Revival #Weeks #2011 ! Enjoy the #third #festival and meet #Susi and her father while celebrating with snacks and drinks! Just take the path up to the #North #from #Semos #City to reach the #Mine #Town! Have you heard about the new #recolouring #feature already? Choose your most #favourite #colour and celebrate the festivals with your #selfmade #coloured #outfit! - 2 - 2 - transparent - - diff --git a/runserver.bat b/runserver.bat index 6811410fcd..5545212e3f 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,3 +1,3 @@ -set STENDHAL_VERSION=0.96.5 +set STENDHAL_VERSION=0.97 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 diff --git a/runserver.sh b/runserver.sh index 806e5d66a1..7071891f5a 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="0.96.5" +STENDHAL_VERSION="0.97" 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 00f993ea37..35d9977144 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 = "0.96.5"; + public static final String VERSION = "0.97"; public static final String PRE_RELEASE_VERSION = null; diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java index bf05c62a1d..4099bccf3c 100644 --- a/src/games/stendhal/server/core/engine/GenerateINI.java +++ b/src/games/stendhal/server/core/engine/GenerateINI.java @@ -271,7 +271,7 @@ public class GenerateINI { out.println(); out.println("server_typeGame=" + gameName); out.println("server_name=" + gameName + " Marauroa server"); - out.println("server_version=0.96.5"); + out.println("server_version=0.97"); out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse"); out.println(); out.println("# Extensions configured on the server. Enable at will."); diff --git a/src/games/stendhal/server/core/rp/StendhalQuestSystem.java b/src/games/stendhal/server/core/rp/StendhalQuestSystem.java index 6dac8e4121..8ffe0cab05 100644 --- a/src/games/stendhal/server/core/rp/StendhalQuestSystem.java +++ b/src/games/stendhal/server/core/rp/StendhalQuestSystem.java @@ -156,7 +156,7 @@ public class StendhalQuestSystem { loadQuest(new ZooFood()); if (System.getProperty("stendhal.minetown") != null) { - loadQuest(new SemosMineTownRevivalWeeks()); + loadQuest(new MineTownRevivalWeeks()); } TurnNotifier.get().notifyInTurns(10, new DumpSpeakerNPCtoDB()); diff --git a/src/games/stendhal/server/core/rp/achievement/factory/ObtainAchievementsFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/ObtainAchievementsFactory.java index b34e4fd687..aa9f6c55f1 100644 --- a/src/games/stendhal/server/core/rp/achievement/factory/ObtainAchievementsFactory.java +++ b/src/games/stendhal/server/core/rp/achievement/factory/ObtainAchievementsFactory.java @@ -11,7 +11,7 @@ import java.util.LinkedList; import java.util.List; /** - * factory for item related achievements. + * factory for obtaining items related achievements. * * @author madmetzger */ @@ -24,15 +24,15 @@ public class ObtainAchievementsFactory extends AbstractAchievementFactory { @Override public Collection createAchievements() { - List achievements = new LinkedList(); + final List achievements = new LinkedList(); achievements.add(createAchievement("obtain.wish", "A wish came true", "Get an item from the wishing well", Achievement.EASY_BASE_SCORE, true, new PlayerHasObtainedNumberOfItemsFromWellGreaterThanCondition(0))); - achievements.add(createAchievement("obtain.harvest.vegetable", "Farmer", "Harvest 3 of all vegetables in Faiumoni.", - Achievement.EASY_BASE_SCORE, true, new PlayerHasHarvestedNumberOfItemsGreaterThanCondition(3, "salad", - "spinach", "tomato", "leek", "courgette", "broccoli","carrot"))); + achievements.add(createAchievement("obtain.harvest.vegetable", "Farmer", "Harvest 3 of all vegetables that grow in Faiumoni.", + Achievement.EASY_BASE_SCORE, true, new PlayerHasHarvestedNumberOfItemsGreaterThanCondition(3, "carrot", + "salad", "broccoli", "cauliflower", "leek", "onion", "courgette", "spinach", "collard", "garlic", "artichoke"))); //ultimate collector quest achievement achievements.add(createAchievement("quest.special.collector", "Ultimate Collector", "Finish ultimate collector quest", - Achievement.HARD_BASE_SCORE, true, new QuestCompletedCondition("ultimate_collector"))); + Achievement.HARD_BASE_SCORE, true, new QuestCompletedCondition("ultimate_collector"))); return achievements; } diff --git a/src/games/stendhal/server/entity/item/Item.java b/src/games/stendhal/server/entity/item/Item.java index 7c157e063b..44810d27d3 100644 --- a/src/games/stendhal/server/entity/item/Item.java +++ b/src/games/stendhal/server/entity/item/Item.java @@ -13,7 +13,6 @@ package games.stendhal.server.entity.item; import games.stendhal.common.MathHelper; -import games.stendhal.common.Rand; import games.stendhal.common.constants.Nature; import games.stendhal.common.grammar.Grammar; import games.stendhal.server.core.engine.ItemLogger; @@ -31,8 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.log4j.Logger; - import marauroa.common.game.Definition; import marauroa.common.game.Definition.Type; import marauroa.common.game.RPClass; @@ -60,7 +57,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * mean time an item is constantly usable in hours */ private static final long MEAN_LIFETIME = 12 * MathHelper.MILLISECONDS_IN_ONE_HOUR; - + // 10 minutes public static final int DEGRADATION_TIMEOUT = 10 * MathHelper.SECONDS_IN_ONE_MINUTE; @@ -118,7 +115,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { private Item() { setRPClass("item"); put("type", "item"); - possibleSlots = new LinkedList(); + this.possibleSlots = new LinkedList(); update(); } @@ -131,9 +128,9 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { public Item(final Item item) { super(item); setRPClass("item"); - possibleSlots = new ArrayList(item.possibleSlots); - damageType = item.damageType; - susceptibilities = item.susceptibilities; + this.possibleSlots = new ArrayList(item.possibleSlots); + this.damageType = item.damageType; + this.susceptibilities = item.susceptibilities; } public static void generateRPClass() { @@ -220,7 +217,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { */ public void setEquipableSlots(final List slots) { // save slots - possibleSlots = slots; + this.possibleSlots = slots; } /** @@ -241,7 +238,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * @return PlantGrower or null */ public PassiveEntityRespawnPoint getPlantGrower() { - return plantGrower; + return this.plantGrower; } /** @@ -301,13 +298,13 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * Propose increase the degree of deterioration. If degree increases is decided by random */ public void deteriorate() { - double propabilityForMeanExp = Rand.propabilityForMeanExp(MEAN_LIFETIME / 300 * this.getAttackRate()); - if(Rand.flipCoin(propabilityForMeanExp) && getDeterioration() <= MAX_DETERIORATION) { - Logger.getLogger(getClass()).debug("The item"+ this.getName() +"deteriorated from "+this.getDeterioration()+"."); - this.add("deterioration", 1); - } else { - Logger.getLogger(getClass()).debug("The item"+ this.getName() +"did not deteriorate from "+this.getDeterioration()+"."); - } + // double propabilityForMeanExp = Rand.propabilityForMeanExp(MEAN_LIFETIME / 300 * this.getAttackRate()); + // if(Rand.flipCoin(propabilityForMeanExp) && getDeterioration() <= MAX_DETERIORATION) { + // Logger.getLogger(getClass()).debug("The item"+ this.getName() +"deteriorated from "+this.getDeterioration()+"."); + // this.add("deterioration", 1); + // } else { + // Logger.getLogger(getClass()).debug("The item"+ this.getName() +"did not deteriorate from "+this.getDeterioration()+"."); + // } } /** @@ -398,7 +395,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { /** @return the list of possible slots for this item */ public List getPossibleSlots() { - return possibleSlots; + return this.possibleSlots; } /** @@ -408,7 +405,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * @return The player name, or null. */ public String getBoundTo() { - return get("bound"); + return get("bound"); } public boolean isBound() { @@ -495,7 +492,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * @return type of damage */ public Nature getDamageType() { - return damageType; + return this.damageType; } /** @@ -503,8 +500,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * * @param type type of damage */ - public void setDamageType(Nature type) { - damageType = type; + public void setDamageType(final Nature type) { + this.damageType = type; } /** @@ -514,10 +511,10 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * @param type type of damage to be checked * @return susceptibility to damage of type type */ - public double getSusceptibility(Nature type) { + public double getSusceptibility(final Nature type) { double value = 1.0; - if (susceptibilities != null) { - Double sus = susceptibilities.get(type); + if (this.susceptibilities != null) { + final Double sus = this.susceptibilities.get(type); if (sus != null) { value = sus.doubleValue(); } @@ -531,7 +528,7 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * * @param susceptibilities susceptibilities to be used */ - public void setSusceptibilities(Map susceptibilities) { + public void setSusceptibilities(final Map susceptibilities) { this.susceptibilities = susceptibilities; } @@ -566,8 +563,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { public void onRemoveFromGround() { // stop the timer so that the item won't degrade anymore SingletonRepository.getTurnNotifier().dontNotify(this); - if (plantGrower != null) { - plantGrower.onFruitPicked(this); + if (this.plantGrower != null) { + this.plantGrower.onFruitPicked(this); } } @@ -583,8 +580,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { @Override public String describe() { String text = "You see " + Grammar.a_noun(getTitle()) + "."; - StringBuilder stats = new StringBuilder(); - String levelwarning = ""; + final StringBuilder stats = new StringBuilder(); + final String levelwarning = ""; if (hasDescription()) { text = getDescription(); } @@ -626,8 +623,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { stats.append(" LIFESTEAL: "); stats.append(get("lifesteal")); } - if ((susceptibilities != null) && !susceptibilities.isEmpty()) { - for (Entry entry : susceptibilities.entrySet()) { + if ((this.susceptibilities != null) && !this.susceptibilities.isEmpty()) { + for (final Entry entry : this.susceptibilities.entrySet()) { stats.append(" "); stats.append(entry.getKey()); stats.append(": "); @@ -659,14 +656,14 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { return true; } - return possibleSlots.contains(slot); + return this.possibleSlots.contains(slot); } public void removeFromWorld() { - + this.onUnequipped(); - + if (isContained()) { // We modify the base container if the object change. RPObject base = getContainer(); @@ -725,12 +722,12 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { } } - public void setFromCorpse(boolean fromCorpse) { + public void setFromCorpse(final boolean fromCorpse) { this.fromCorpse = fromCorpse; } public boolean isFromCorpse() { - return fromCorpse; + return this.fromCorpse; } /** @@ -745,8 +742,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { return 0; } } - - + + /** * opportunity to affect the player when equipped * @@ -754,11 +751,11 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { * * TODO: should this return some sort of undoable thing (if it can be undone?) */ - public boolean onEquipped(RPEntity equipper, String slot) { - + public boolean onEquipped(final RPEntity equipper, final String slot) { + // this.prevEntity = equipper; // this.prevSlot = slot; - + return false; } diff --git a/src/games/stendhal/server/entity/player/UpdatePendingAchievementsOnLogin.java b/src/games/stendhal/server/entity/player/UpdatePendingAchievementsOnLogin.java index 0292c6f144..98e5d05401 100644 --- a/src/games/stendhal/server/entity/player/UpdatePendingAchievementsOnLogin.java +++ b/src/games/stendhal/server/entity/player/UpdatePendingAchievementsOnLogin.java @@ -57,6 +57,7 @@ public class UpdatePendingAchievementsOnLogin implements LoginListener, TurnList updateItemLoots(player, command.getDetails("item.set.shadow")); updateItemLoots(player, command.getDetails("item.set.golden")); updateItemLoots(player, command.getDetails("item.set.red")); + updateItemLoots(player, command.getDetails("item.set.mainio")); // Could also check for reached achievements here. This is also checked on login but the order may vary due to the async access? diff --git a/src/games/stendhal/server/maps/ados/rosshouse/FatherNPC.java b/src/games/stendhal/server/maps/ados/rosshouse/FatherNPC.java index 9a1052729e..2521e71554 100644 --- a/src/games/stendhal/server/maps/ados/rosshouse/FatherNPC.java +++ b/src/games/stendhal/server/maps/ados/rosshouse/FatherNPC.java @@ -52,7 +52,7 @@ public class FatherNPC implements ZoneConfigurator { addJob("I'm looking after my daughter Susi."); addHelp("If you need help finding any buildings in Ados, the guard Julius will give you a map. He is by the city entrance."); addOffer("Sorry I do not have anything to offer you, but there are two places to eat in Ados - the tavern and a bar."); - addQuest("At the end of October we will be visiting the #Semos #Mine #Town #Revival #Weeks"); + addQuest("At the end of October we will be visiting the #Mine #Town #Revival #Weeks"); addGoodbye("Bye, nice to meet you."); // Revival Weeks diff --git a/src/games/stendhal/server/maps/ados/rosshouse/LittleGirlNPC.java b/src/games/stendhal/server/maps/ados/rosshouse/LittleGirlNPC.java index 520ee7eb98..35dfb19b83 100644 --- a/src/games/stendhal/server/maps/ados/rosshouse/LittleGirlNPC.java +++ b/src/games/stendhal/server/maps/ados/rosshouse/LittleGirlNPC.java @@ -69,7 +69,7 @@ public class LittleGirlNPC implements ZoneConfigurator { addJob("I am just a little girl."); addGoodbye("Have fun!"); - addQuest("I might see you some time at the #Semos #Mine #Town #Revival #Weeks."); + addQuest("I might see you some time at the #Mine #Town #Revival #Weeks."); // Revival Weeks add( diff --git a/src/games/stendhal/server/maps/quests/SemosMineTownRevivalWeeks.java b/src/games/stendhal/server/maps/quests/MineTownRevivalWeeks.java similarity index 98% rename from src/games/stendhal/server/maps/quests/SemosMineTownRevivalWeeks.java rename to src/games/stendhal/server/maps/quests/MineTownRevivalWeeks.java index ab26f95f3d..b93bdd6ff8 100644 --- a/src/games/stendhal/server/maps/quests/SemosMineTownRevivalWeeks.java +++ b/src/games/stendhal/server/maps/quests/MineTownRevivalWeeks.java @@ -31,7 +31,7 @@ import java.util.List; *

Creates a special version of Susi's father in a nearby house. *

Puts a sign by the tower to say why it is shut. */ -public class SemosMineTownRevivalWeeks extends AbstractQuest { +public class MineTownRevivalWeeks extends AbstractQuest { public static final String QUEST_NAME = "SemosMineTownRevivalWeeks"; private static final String QUEST_SLOT = "semos_mine_town_revival"; diff --git a/src/games/stendhal/server/maps/quests/revivalweeks/FoundGirl.java b/src/games/stendhal/server/maps/quests/revivalweeks/FoundGirl.java index ef66ccf0cf..cc909d5ef7 100644 --- a/src/games/stendhal/server/maps/quests/revivalweeks/FoundGirl.java +++ b/src/games/stendhal/server/maps/quests/revivalweeks/FoundGirl.java @@ -97,7 +97,7 @@ public class FoundGirl implements LoadableContent { // greeting addGreetingDependingOnQuestState(); - npc.addJob("I am just a litte girl waiting for my father to take me out of the house. We will have lots of fun here at the #Semos #Mine #Town #Revival #Weeks!"); + npc.addJob("I am just a litte girl waiting for my father to take me out of the house. We will have lots of fun here at the #Mine #Town #Revival #Weeks!"); npc.addGoodbye("Have fun!"); npc.addHelp("Just have fun."); npc.addOffer("I can offer you my #friendship."); @@ -139,14 +139,14 @@ public class FoundGirl implements LoadableContent { new AndCondition(new GreetingMatchesNameCondition(npc.getName()), noFriends), ConversationStates.ATTENDING, - "Guess what, we are having another #Semos #Mine #Town #Revival #Weeks.", null); + "Guess what, we are having another #Town #Revival #Weeks.", null); npc.add(ConversationStates.IDLE, ConversationPhrases.GREETING_MESSAGES, new AndCondition(new GreetingMatchesNameCondition(npc.getName()), anyFriends), ConversationStates.ATTENDING, null, new SayTextWithPlayerNameAction("Hello [name], nice to meet you again. " - + "Guess what, we are having another #Semos #Mine #Town #Revival #Weeks.")); + + "Guess what, we are having another #Town #Revival #Weeks.")); // TODO: Tell old friends about renewal } @@ -165,7 +165,7 @@ public class FoundGirl implements LoadableContent { ConversationPhrases.QUEST_MESSAGES, currentFriends, ConversationStates.ATTENDING, - "I have made a lot of friends during the #Semos #Mine #Town #Revival #Weeks.", + "I have made a lot of friends during the #Town #Revival #Weeks.", null); } diff --git a/src/games/stendhal/server/maps/quests/revivalweeks/NineSwitchesGame.java b/src/games/stendhal/server/maps/quests/revivalweeks/NineSwitchesGame.java index 8082c16a39..338ba6f75f 100644 --- a/src/games/stendhal/server/maps/quests/revivalweeks/NineSwitchesGame.java +++ b/src/games/stendhal/server/maps/quests/revivalweeks/NineSwitchesGame.java @@ -16,6 +16,7 @@ import games.stendhal.common.Direction; import games.stendhal.common.parser.Sentence; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; +import games.stendhal.server.entity.RPEntity; import games.stendhal.server.entity.mapstuff.game.NineSwitchesGameBoard; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationStates; @@ -66,6 +67,10 @@ public class NineSwitchesGame implements LoadableContent { "Good luck.", new PlayAction(board)); } + + protected void onGoodbye(RPEntity player) { + setDirection(Direction.DOWN); + } }; npc.setEntityClass("gamesupervisornpc"); npc.setPlayerChatTimeout(CHAT_TIMEOUT); diff --git a/src/games/stendhal/server/maps/quests/revivalweeks/TicTacToeGame.java b/src/games/stendhal/server/maps/quests/revivalweeks/TicTacToeGame.java index 5454af6f02..4ebc633b2d 100644 --- a/src/games/stendhal/server/maps/quests/revivalweeks/TicTacToeGame.java +++ b/src/games/stendhal/server/maps/quests/revivalweeks/TicTacToeGame.java @@ -88,7 +88,7 @@ public class TicTacToeGame implements LoadableContent { add(ConversationStates.IDLE, Arrays.asList("play", "game", "yes"), ConversationStates.IDLE, - "", + null, new PlayAction(board)); } }; diff --git a/src/games/stendhal/server/script/SemosMineTown.java b/src/games/stendhal/server/script/MineTown.java similarity index 77% rename from src/games/stendhal/server/script/SemosMineTown.java rename to src/games/stendhal/server/script/MineTown.java index 34155fa832..80d29616ec 100644 --- a/src/games/stendhal/server/script/SemosMineTown.java +++ b/src/games/stendhal/server/script/MineTown.java @@ -15,7 +15,7 @@ package games.stendhal.server.script; import games.stendhal.server.core.rp.StendhalQuestSystem; import games.stendhal.server.core.scripting.ScriptImpl; import games.stendhal.server.entity.player.Player; -import games.stendhal.server.maps.quests.SemosMineTownRevivalWeeks; +import games.stendhal.server.maps.quests.MineTownRevivalWeeks; import java.util.List; @@ -24,12 +24,12 @@ import java.util.List; * * @author hendrik */ -public class SemosMineTown extends ScriptImpl { +public class MineTown extends ScriptImpl { @Override public void execute(final Player admin, final List args) { if (args.size() != 1) { - admin.sendPrivateText("/script SemosMineTown.class {true|false}"); + admin.sendPrivateText("/script MineTown.class {true|false}"); return; } @@ -45,22 +45,22 @@ public class SemosMineTown extends ScriptImpl { * starts the Mine Town Revival Weeks */ private void startSemosMineTowns(Player admin) { - if (StendhalQuestSystem.get().getQuest(SemosMineTownRevivalWeeks.QUEST_NAME) != null) { + if (StendhalQuestSystem.get().getQuest(MineTownRevivalWeeks.QUEST_NAME) != null) { admin.sendPrivateText("Mine Town Revival Weeks are already active."); return; } - StendhalQuestSystem.get().loadQuest(new SemosMineTownRevivalWeeks()); + StendhalQuestSystem.get().loadQuest(new MineTownRevivalWeeks()); } /** * ends the Mine Town Revival Weeks */ private void stopSemosMineTowns(Player admin) { - if (StendhalQuestSystem.get().getQuest(SemosMineTownRevivalWeeks.QUEST_NAME) == null) { + if (StendhalQuestSystem.get().getQuest(MineTownRevivalWeeks.QUEST_NAME) == null) { admin.sendPrivateText("Mine Town Revival Weeks are not active."); return; } - StendhalQuestSystem.get().unloadQuest(SemosMineTownRevivalWeeks.QUEST_NAME); + StendhalQuestSystem.get().unloadQuest(MineTownRevivalWeeks.QUEST_NAME); } } diff --git a/stendhal.jnlp b/stendhal.jnlp index 43ae1aab1b..f9c379943d 100644 --- a/stendhal.jnlp +++ b/stendhal.jnlp @@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t - + diff --git a/tests/games/stendhal/server/maps/quests/BalloonForBobbyTest.java b/tests/games/stendhal/server/maps/quests/BalloonForBobbyTest.java index 58d01a450a..e1b1d6039f 100644 --- a/tests/games/stendhal/server/maps/quests/BalloonForBobbyTest.java +++ b/tests/games/stendhal/server/maps/quests/BalloonForBobbyTest.java @@ -128,7 +128,7 @@ public class BalloonForBobbyTest { assertTrue(player.isQuestCompleted(questSlot)); // Mine Town weeks are on: it should not matter if player has a balloon or not - StendhalQuestSystem.get().loadQuest(new SemosMineTownRevivalWeeks()); + StendhalQuestSystem.get().loadQuest(new MineTownRevivalWeeks()); // Player HAS balloon; Mine Town Weeks ARE ON player.setOutfit(outfitWithBalloon); @@ -144,12 +144,12 @@ public class BalloonForBobbyTest { en.step(player, "bye"); assertEquals("Good bye.", getReply(npc)); - StendhalQuestSystem.get().unloadQuest(SemosMineTownRevivalWeeks.QUEST_NAME); + StendhalQuestSystem.get().unloadQuest(MineTownRevivalWeeks.QUEST_NAME); // Player HAS NO balloon; Mine Town Weeks ARE ON player.setOutfit(outfitNoBalloon); - StendhalQuestSystem.get().loadQuest(new SemosMineTownRevivalWeeks()); + StendhalQuestSystem.get().loadQuest(new MineTownRevivalWeeks()); en.step(player, "hi"); assertEquals("Hm?", getReply(npc)); @@ -162,6 +162,6 @@ public class BalloonForBobbyTest { en.step(player, "bye"); assertEquals("Good bye.", getReply(npc)); - StendhalQuestSystem.get().unloadQuest(SemosMineTownRevivalWeeks.QUEST_NAME); + StendhalQuestSystem.get().unloadQuest(MineTownRevivalWeeks.QUEST_NAME); } } diff --git a/tiled/Level 0/semos/city_halloween.tmx b/tiled/Level 0/semos/city_halloween.tmx index 9b14b56cb0..45f74ea18a 100644 --- a/tiled/Level 0/semos/city_halloween.tmx +++ b/tiled/Level 0/semos/city_halloween.tmx @@ -1,266 +1,265 @@ - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - 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 diff --git a/tiled/Level 0/semos/mountain_n2_mine_town_weeks.tmx b/tiled/Level 0/semos/mountain_n2_mine_town_weeks.tmx index 174e341d02..c97e36d6aa 100644 --- a/tiled/Level 0/semos/mountain_n2_mine_town_weeks.tmx +++ b/tiled/Level 0/semos/mountain_n2_mine_town_weeks.tmx @@ -143,7 +143,7 @@ - H4sIAAAAAAAAC+3ZTU4CQRSFUfwbsA1ZtNvVREwMMYBNV91XVWdwRg583d/FGD0eDocjAAAAAAAAAAAAAAAAAAAAAE29XZG+jVx7/ed2q73+87qnvf5zure9/nPSf236r03/be+rwg17tNE/895btNJ/rHe/R5NH79C/zjt6pPuWG1pvazR7vf/Wn8M9vnePZxrJnu+/x2dx6/ftuekRtOre4/PY20hdKr7zCjdU759+RnL9089Hn/7p56BP//S99O+fvpH2/dN3AAAAAAAAAADzem0o/Wxk+9tITenmdrBmYzvQ3Za0ryDdSvs60u20ryPdcuTmL2fpO2beQPrd/O7cQvrZKu5g1tYjbaHVRtL3V20/4ha27CN9X7XOs21E+7W3ULH57O0r7aBa81W6V9lDtf7p919NuofWNaRb6V1buq3GNWiO3rTYQfp5yGwkfSP9+6fvItM/fQ/9+6dvABjB89mtr+8t/dyratXTHvLSDW1Be5vQ3h600j//jmanH5dbeHQf6ecY0V//b0nf9N8dpG8cWfX+17aQvmcGI/VHf/RHf/RHf2Cb05ePp2+nAvegP/qjP/rTvv/PBt4PNrCi3z8D/BxY018buJS+kb4buGQD87v8zNvA2mwAvx/i7wRr69X/E2QtR40AAAEA + H4sIAAAAAAAAC+3ZS04DMRRE0fAbZBuwaLYLiESKoohPp+16ts/gjBjwum8lQuJ4OByOAAAAAAAAAAAAAAAAAAAAADT18oP0beTa6z+339rrP6+/tNd/Tn9tr/+c9F+b/mvTf9v7qnDDHm30z7z3Fq30H+vd79Hk3jv0r/OO7um+5YbW2xrNXu+/9edwj9/d45lGsuf77/FZ3Pp7e256BK269/g89jZSl4rvvMIN1funn5Fc//Tz0ad/+jno0z99L/37p2+kff/0HQAAAAAAAADAvJ4bSj8b2f42UlO6uR2s2dgOdLcl7StIt9K+jnQ77etItxy5+dNJ+o6ZN5B+N5edW0g/W8UdzNp6pC202kj6/qrtR9zCln2k76vWebaNaL/2Fio2n719pR1Ua75K9yp7qNY//f6rSffQuoZ0K71rS7fVuAbN0ZsWO0g/D5mNpG+kf//0XWT6p++hf//0DQAjeDz57ed7Sz/3qlr1tIe8dENb0N4mtLcHrfTPv6PZ6cf1Fu7dR/o5RnTr/y3pm/67g/SNI6ve/6ctpO+ZwUj90R/90R/90R/Y5u3T+8O3twL3oD/6oz/6077/eQOvBxtY0eV3wJf0PeQ3cP5euJS+kb4buGYD87v+zNvA2myAW38bpG8itwH919Or/wctJID3AAABAA== @@ -153,7 +153,7 @@ - H4sIAAAAAAAAC+3YTU4UQRgG4B4WbEmAEK8FrAHFhYmIipfgFkAkcheQoIYjgNcAPpJmIRhoGqqqa/p5knczmZ9v+u3fahoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIZ2PSNG/bvJuUnub/apixVjVs2xpmrFUN27aGGQEAAAC66LrOsRxZiazmGowsuva/Flm/fX+uwcjCOiddvG/3jQ/2EcKfyMfYF7YinyLnpQciq7PIdvT+OfIl8rv0QFCpoxd+/jiOvxPX5Wq9tH/qpv9xy9n/UK4VuwOYYShKHf8/m3+f4b5Gdtp8i5wWmmtsSvV//xnuV/MwpOf6P276H7fH+r+I8/Jlm7+T/q9fu98arFzH/+xMph/iWXL1P6//QcrV/5L+BylX/3MJ+99P99VTL0f/C9H9YsL+93p+btN9aZb+37TdXyXa3n37J/Pzf6JzgP77m4b1H/33V0v/PyLfI4elB5kypfu/6/Wp6D2N0v07d5el/3G7XTvpcv5NlYPk/xAAXt8NN2VyMAAAAQA= + H4sIAAAAAAAAC+3YSU7cUBQFUBeDTJEgithWYAwJZIBEIDSbYBekhAR7oVEAsQRgG8BDMQMaQeHC//uXz5HupFTNK1/b33ZVAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQHt+DKrqZ53lQe5pXlfCjKUqYduWMGOpSti2JcwIAAAAMIpRn3N8j8xHFlINRhKj9r8YWXp4f6rBSMJzTkbxq943Vu0jhIvIWuwLvyPrkcvcA5HUv8hG9P4nshk5zz0QFOpwzM8fxfF3bF0u1rj9Uzb991vK/ruyVux2YIauyHX8n1RP7+G2Itt1diKnmebqm1z9P7+HO6tehvZZ//tN//32Vv9XcV6+rnMzaP76neutzkp1/H+ZSvRDfEiq/mf030mp+v+m/05K1f90i/3/be+rJ16K/mej+68t9r/X8HMrrkuT9D9Xd3/b0vZu2j+J7/9bOgfov7lJeP6j/+ZK6f/hGm8/Msw8x6TJ3f9B9b/X9zLMNN+ky92/c3de+u+3x3U1V4at/0MA+Hz3rOzfFwAAAQA= @@ -166,7 +166,7 @@ H4sIAAAAAAAAC+3OAQ0AAAgDoNt/djaGbkICEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7o2h4AAAAAAAAAAAAAAAAAAADXDQ14CaMAAAEA - + H4sIAAAAAAAAC+3c0W7jMAxE0fb/n/rHfQrguo4iShQ5Eu8BDGzT2KY5kux0u/vz/fX1w8bGxsYmu12tOu6T7OuuvqnI7sOu22my+7nDVkV2n7OyqZx5S3a25LEXcgYAAAAAAAAAAAAAAAAAAACAv/j96br4/fm6+PcTdZFxXWRfF9nXRva1kf+evJ7Lyd8u857p/dmM/G2iPhdH/f8G5N8v4ucjozmP1kD+/1l6v2ItHh1f1vPz2e+/0f7Prgnez3Mr7xkn8urT6L6eWZySfdR6tqIno2uHl5Oyn5172fMh+/y78V57s/uuUoealb1Q7Hn2+TMozkespXgPhj9yroeMayPz2sgZAAAAAAAAAAAAkWZ/J4G/09zXquwZI9qyc2ccrKXQe8ZBjp16zpria9fecL+Zd8L1RY+DnXt1ddr1eDh9LCjWr1BDj53HgELdJ63HKnW0ZPYs456sNhYi6lPszUhNu4+FjLqz+6CUhcoYicpfvd+ZVMbCTH29+0RT6WEv5XHQQ6nG7POvojge1Os5lcr6kNlvpXGXJXscqD2PVMr+iaU/ij1r1Uj2dr35Z/bPWiNZ21l6G1nLjmvUiSLGAeu3vhX3WzLfi0f+5L2/kfzJvSZyr4nMayN3m5nnppkt63qqG/k5R8QGH1459LyPsaBltNet/K9fW87rXSvaIvt4HTfvzv1U17vjWOrffSysWjMzezOa/9Nx3h1P4TqtVmet0pOne8n9e5b8W+eIvN7o/HbM3lPvdfSsNzM1ZObkVf/rz/fvPb1uuW5P93osx/eeGypz8tO+veew9tR7DFvOfd/P8v7ZTNTW1Na5V9aZMf+fapjZ97p/5Jz1NJK/Zb5d33vfN6tHo+uF5fjqub9kzTPv7EeuISIH1dxfLPN/9PVP510xT3rvxdVljUvLvaP3/a/39a4r5K+7Lo16lzPz/1nU/V9xnKnVk0Ep/+h1mfxjnv+Y/7qU5n/kORTHY4ZPfWg9O/W+vjr/3md+z8+Xpzhh/o8el/zPmf8YU3n+I2b+r0b+43Z5Dmo9t+1Qv6rs/HlWz5XdW3LNNfPZ2WtDnuzsPfJnDNXBmlEX943aFPP/BVxl5KEAAAEA diff --git a/tiled/Level 0/semos/village_w.tmx b/tiled/Level 0/semos/village_w.tmx index b4bf221829..75e7f3c0a3 100644 --- a/tiled/Level 0/semos/village_w.tmx +++ b/tiled/Level 0/semos/village_w.tmx @@ -1,158 +1,157 @@ - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - 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