From b9609255226160c698da1e3cbc41c95deaf6b1f4 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Sat, 2 Apr 2016 20:42:41 +1100 Subject: [PATCH] Fixes --- .../game/clans/tutorial/TutorialSession.java | 11 ++++++ .../clans/tutorial/TutorialWorldManager.java | 6 ++-- .../tutorial/map/TutorialMapRenderer.java | 35 +++++++++++++++++-- .../clans/tutorial/objective/Objective.java | 4 +-- .../tutorial/objective/ObjectiveGoal.java | 18 +++++----- .../tutorials/clans/ClansMainTutorial.java | 6 ++++ .../clans/objective/AttackEnemyObjective.java | 10 ++++++ .../clans/objective/ClassesObjective.java | 10 ++++++ .../clans/objective/EnergyObjective.java | 10 ++++++ .../clans/objective/FieldsObjective.java | 6 +++- .../clans/objective/FinalObjective.java | 10 ++++++ .../objective/PurchaseItemsObjective.java | 10 ++++++ .../clans/objective/ShopsObjective.java | 5 +++ .../clans/objective/goals/HoldItemGoal.java | 2 +- .../goals/attackenemy/BlowUpWallGoal.java | 3 ++ .../goals/attackenemy/GetMapGoal.java | 2 +- .../goals/attackenemy/MountCannonGoal.java | 5 +++ .../attackenemy/StealEnemyPotatoesGoal.java | 4 +++ .../objective/goals/clan/LeaveSpawnGoal.java | 2 +- .../goals/classes/EquipDefaultBuildGoal.java | 2 +- .../goals/energy/ExplainEnergyGoal.java | 2 +- .../goals/fields/SellDiamondsGoal.java | 5 ++- .../goals/finalobj/TpClanHomeGoal.java | 2 +- .../goals/shops/SellPotatoesGoal.java | 5 ++- 24 files changed, 152 insertions(+), 23 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java index 81190d0da..ced0ea35f 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java @@ -15,6 +15,7 @@ public class TutorialSession private Location _homeLocation; private int _colorTick; private int _textSeconds; + private Location _mapTargetLocation; public TutorialSession() { @@ -70,4 +71,14 @@ public class TutorialSession _textSeconds++; return _textSeconds; } + + public void setMapTargetLocation(Location location) + { + _mapTargetLocation = location; + } + + public Location getMapTargetLocation() + { + return _mapTargetLocation; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java index 09305475c..f3d5271ec 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java @@ -21,6 +21,8 @@ import mineplex.game.clans.tutorial.TutorialRegion; public class TutorialWorldManager extends MiniPlugin { + public static final int BLOCKS_BETWEEN_TUTORIALS = 1200; + private final World _tutorialWorld; private final Schematic _schematic; private Stack _regionStack; @@ -62,8 +64,8 @@ public class TutorialWorldManager extends MiniPlugin for (int z = 0; z < 4; z++) { long time = System.currentTimeMillis(); - double xLoc = (x) * 1200; // 1000x1000 regions - double zLoc = (z) * 1200; + double xLoc = (x) * BLOCKS_BETWEEN_TUTORIALS; // 1000x1000 regions + double zLoc = (z) * BLOCKS_BETWEEN_TUTORIALS; TutorialRegion region = new TutorialRegion(_schematic, new Location(_tutorialWorld, xLoc, 30, zLoc)); if (x == 0 && z == 0) _centerRegion = region; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/map/TutorialMapRenderer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/map/TutorialMapRenderer.java index cbb5f58ba..1132dd4ac 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/map/TutorialMapRenderer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/map/TutorialMapRenderer.java @@ -6,7 +6,9 @@ import java.util.List; import mineplex.core.recharge.Recharge; import mineplex.game.clans.tutorial.TutorialManager; import mineplex.game.clans.tutorial.TutorialRegion; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.TutorialType; +import mineplex.game.clans.tutorial.TutorialWorldManager; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import org.bukkit.Location; @@ -109,8 +111,8 @@ public class TutorialMapRenderer extends MapRenderer } Location l = player.getLocation().clone(); - l.setX((((int)l.getX()) % 1000) + (l.getX() - ((int) l.getX()))); - l.setZ((((int)l.getZ()) % 1000) + (l.getZ() - ((int) l.getZ()))); + l.setX((((int)l.getX()) % TutorialWorldManager.BLOCKS_BETWEEN_TUTORIALS) + (l.getX() - ((int) l.getX()))); + l.setZ((((int)l.getZ()) % TutorialWorldManager.BLOCKS_BETWEEN_TUTORIALS) + (l.getZ() - ((int) l.getZ()))); double mapX = (l.getX() - tutorialMap.getX()) / zoom; double mapZ = (l.getZ() - tutorialMap.getZ()) / zoom; @@ -126,6 +128,35 @@ public class TutorialMapRenderer extends MapRenderer cursors.addCursor(cursor); } + + // Add Tutorial Markers + TutorialSession session = _tutorial.getTutorialSession(player); + if (session != null) + { + if (session.getMapTargetLocation() != null) + { + Location point = session.getMapTargetLocation().clone(); + point.setX((((int)point.getX()) % TutorialWorldManager.BLOCKS_BETWEEN_TUTORIALS) + (point.getX() - ((int) point.getX()))); + point.setZ((((int)point.getZ()) % TutorialWorldManager.BLOCKS_BETWEEN_TUTORIALS) + (point.getZ() - ((int) point.getZ()))); + mapX = (point.getX() - tutorialMap.getX()) / zoom; + mapZ = (point.getZ() - tutorialMap.getZ()) / zoom; + + // To make these appear at the edges of the map, just change it from 64 to something like 128 for double the map size + if (mapX > -64 && mapX < 64 && mapZ > -64 && mapZ < 64) + { + byte b0 = (byte) (int) Math.min(127, (double) (mapX * 2.0F) + 0.5D); + byte b1 = (byte) (int) Math.max(-127, (double) (mapZ * 2.0F) + 0.5D); + + byte cursorType = 4; // http://i.imgur.com/wpH6PT8.png + // Those are byte 5 and 6 + byte rotation = (byte) ((int) Math.floor(System.currentTimeMillis() / 1000D) % 16); + + MapCursor cursor = new MapCursor(b0, b1, rotation, cursorType, true); + + cursors.addCursor(cursor); + } + } + } } private byte attemptDraw(boolean colorAll, byte color, Color color1, Color color2, int xRegion, int zRegion, MinMaxArea area, int mapX, int mapZ) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java index ffdc6a74d..6139a0cb1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java @@ -44,8 +44,8 @@ public abstract class Objective> implements Liste _description = description; _extraDescription = extraDescription; _displayStartMessage = true; - _startMessageDelay = 40; - _displayFinishMessage = true; + _startMessageDelay = 1;//40; + _displayFinishMessage = false; _finishMessageDelay = 1; _fireworkLocations = fireworkLocs; } @@ -208,9 +208,10 @@ public abstract class ObjectiveGoal > implements Liste _finishMessageDelay = finishMessageDelay; } -@EventHandler - public void update(UpdateEvent event) { - if(!event.getType().equals(UpdateType.SEC_05)) return; + @EventHandler + public void update(UpdateEvent event) + { + if (!event.getType().equals(UpdateType.SEC_05)) return; if (_fireworkLocations == null) return; for (UUID id : getActivePlayers()) @@ -218,12 +219,14 @@ public abstract class ObjectiveGoal > implements Liste if (Bukkit.getPlayer(id) == null) continue; List locations = getObjective().getPlugin().getRegion(Bukkit.getPlayer(id)).getLocationMap().getSpongeLocations(_fireworkLocations); if (locations == null) continue; - for(Location loc : locations) + for (Location loc : locations) { UtilFirework.playFirework(loc, FireworkEffect.Type.BURST, Color.AQUA, true, true); } } -@EventHandler + } + + @EventHandler public void activeCleaner(UpdateEvent event) { if (event.getType() != UpdateType.TICK) @@ -235,6 +238,5 @@ public abstract class ObjectiveGoal > implements Liste } _removeList.clear(); - } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java index 5791c2a6a..2867e4276 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java @@ -184,6 +184,12 @@ public class ClansMainTutorial extends Tutorial return false; } + public Location getCenter(TutorialRegion region, Bounds bounds) + { + List locs = region.getLocationMap().getGoldLocations(bounds.getDataLocColor()); + return UtilAlg.getMidpoint(locs.get(0), locs.get(1)); + } + public Location getSpawn(TutorialRegion region) { Location location = region.getLocationMap().getGoldLocations(Point.SPAWN.getDataLocColor()).get(0).clone(); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java index 06ebfbb19..e46eec287 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java @@ -6,6 +6,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.HoldItemGoal; @@ -46,6 +47,15 @@ public class AttackEnemyObjective extends OrderedObjective setStartMessageDelay(60); } + @Override + protected void customStart(Player player) + { + super.customStart(player); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getPlugin().getCenter(session.getRegion(), ClansMainTutorial.Bounds.ENEMY_LAND)); + } + @Override protected void customLeave(Player player) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java index 642b6a1c2..bef417c8d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java @@ -3,6 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes.EquipDefaultBuildGoal; @@ -22,6 +23,15 @@ public class ClassesObjective extends OrderedObjective setStartMessageDelay(60); } + @Override + protected void customStart(Player player) + { + super.customStart(player); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(null); + } + @Override protected void customLeave(Player player) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java index 5b1dc6dfb..5ded6a9b6 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java @@ -3,6 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.energy.BuyEnergyGoal; @@ -20,6 +21,15 @@ public class EnergyObjective extends OrderedObjective setStartMessageDelay(60); } + @Override + protected void customStart(Player player) + { + super.customStart(player); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getPlugin().getPoint(session.getRegion(), ClansMainTutorial.Point.ENERGY_SHOP)); + } + @Override protected void customLeave(Player player) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java index 2113b24c5..e1f060696 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.C; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.HoldItemGoal; @@ -30,7 +31,7 @@ public class FieldsObjective extends OrderedObjective addGoal(new MineDiamondsGoal(this)); addGoal(new SellDiamondsGoal(this)); - setStartMessageDelay(60); +// setStartMessageDelay(60); } @Override @@ -47,5 +48,8 @@ public class FieldsObjective extends OrderedObjective protected void customStart(Player player) { super.customStart(player); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getPlugin().getCenter(session.getRegion(), ClansMainTutorial.Bounds.FIELDS)); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java index 256580404..af1aa5dc9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java @@ -3,6 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.finalobj.DisbandClanGoal; @@ -20,6 +21,15 @@ public class FinalObjective extends OrderedObjective setStartMessageDelay(60); } + @Override + protected void customStart(Player player) + { + super.customStart(player); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(null); + } + @Override protected void customLeave(Player player) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java index 5e1c5c068..18c5e5d2b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.UnorderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.shops.PurchaseGoal; @@ -41,6 +42,15 @@ public class PurchaseItemsObjective extends UnorderedObjective npcs.add(spawnNpc(farmingShop, "Organic Produce")); npcs.add(spawnNpc(miningShop, "Mining Shop")); _npcMap.put(player.getUniqueId(), npcs); + + TutorialSession session = getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getPlugin().getCenter(session.getRegion(), ClansMainTutorial.Bounds.SHOPS)); + } private Npc spawnNpc(Location location, String name) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java index 6e46626eb..9412598d7 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java @@ -23,7 +23,7 @@ public class HoldItemGoal extends ObjectiveGoal> _material = material; - setStartMessageDelay(startDelay); +// setStartMessageDelay(startDelay); } public HoldItemGoal(Objective objective, Material material, String name, String description, String helpText) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java index be6b4ae61..8ff57b6b0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java @@ -17,6 +17,7 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.fallingblock.FallingBlocks; import mineplex.game.clans.clans.siege.events.SiegeWeaponExplodeEvent; import mineplex.game.clans.tutorial.TutorialRegion; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.AttackEnemyObjective; @@ -37,6 +38,8 @@ public class BlowUpWallGoal extends ObjectiveGoal @Override protected void customStart(Player player) { + TutorialSession session = getObjective().getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getObjective().getPlugin().getCenter(session.getRegion(), ClansMainTutorial.Bounds.ENEMY_ATTACK_AREA)); } @EventHandler diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java index 07062da50..86c2156b5 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java @@ -27,7 +27,7 @@ public class GetMapGoal extends ObjectiveGoal null ); - setStartMessageDelay(120); +// setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java index 1a5b3fcc0..280152aef 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java @@ -13,7 +13,9 @@ import mineplex.game.clans.clans.siege.SiegeManager; import mineplex.game.clans.clans.siege.events.MountSiegeWeaponEvent; import mineplex.game.clans.clans.siege.weapon.Cannon; import mineplex.game.clans.tutorial.TutorialRegion; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial.Point; import mineplex.game.clans.tutorial.tutorials.clans.objective.AttackEnemyObjective; @@ -36,6 +38,9 @@ public class MountCannonGoal extends ObjectiveGoal { getObjective().getCannons().put(player.getName(), SiegeManager.Instance.spawnCannon(player, getObjective().getPlugin().getPoint(getObjective().getPlugin().getRegion(player), Point.CANNON), false)); getObjective().getCannons().get(player.getName()).SetForcedVelocity(0.4, 2.45); + + TutorialSession session = getObjective().getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getObjective().getPlugin().getPoint(session.getRegion(), ClansMainTutorial.Point.CANNON)); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java index a13c6ba75..b046c693d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java @@ -18,6 +18,7 @@ import mineplex.core.common.DefaultHashMap; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.tutorial.TutorialRegion; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.AttackEnemyObjective; @@ -50,6 +51,9 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal { _playersMap.put(player.getUniqueId(), new AtomicInteger(0)); UtilPlayer.message(player, F.main("Clans", "Now that you have blown a hole in the enemy's base, go and steal their potatoes.")); + + TutorialSession session = getObjective().getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getObjective().getPlugin().getCenter(session.getRegion(), ClansMainTutorial.Bounds.ENEMY_LAND)); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java index 7c21f3757..7edeb2af4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java @@ -32,7 +32,7 @@ public class LeaveSpawnGoal extends ObjectiveGoal ); // 2 seconds after start message - setStartMessageDelay(20 * 3); +// setStartMessageDelay(20 * 3); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java index 637ffd2b3..9eb963c44 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java @@ -20,7 +20,7 @@ public class EquipDefaultBuildGoal extends ObjectiveGoal null ); - setStartMessageDelay(120); +// setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java index 64de4157d..2cab456ca 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java @@ -46,7 +46,7 @@ public class ExplainEnergyGoal extends ObjectiveGoal }, 20 * 10L); }, 20 * 3L); - setStartMessageDelay(120); +// setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java index 8c1792dd7..504bb3c35 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java @@ -9,7 +9,9 @@ import mineplex.core.common.util.F; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.FieldsObjective; public class SellDiamondsGoal extends ObjectiveGoal @@ -28,7 +30,8 @@ public class SellDiamondsGoal extends ObjectiveGoal @Override protected void customStart(Player player) { - + TutorialSession session = getObjective().getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getObjective().getPlugin().getPoint(session.getRegion(), ClansMainTutorial.Point.MINING_SHOP)); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java index 68e23571f..ef1827b93 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java @@ -27,7 +27,7 @@ public class TpClanHomeGoal extends ObjectiveGoal null ); - setStartMessageDelay(120); +// setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java index 38b79d222..40a76b4d9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java @@ -9,7 +9,9 @@ import mineplex.core.common.util.F; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent; +import mineplex.game.clans.tutorial.TutorialSession; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.ShopsObjective; public class SellPotatoesGoal extends ObjectiveGoal @@ -30,7 +32,8 @@ public class SellPotatoesGoal extends ObjectiveGoal @Override protected void customStart(Player player) { - + TutorialSession session = getObjective().getPlugin().getTutorialSession(player); + session.setMapTargetLocation(getObjective().getPlugin().getPoint(session.getRegion(), ClansMainTutorial.Point.FARMING_SHOP)); } @Override