Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests/piedpiper PathesBuildHelper.java, 1.5, 1.6 AwaitingPhase.java, 1.15, 1.16
|
From: yoriy <yo...@us...> - 2012-07-28 16:17:54
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper
In directory vz-cvs-4.sog:/tmp/cvs-serv13698/src/games/stendhal/server/maps/quests/piedpiper
Modified Files:
PathesBuildHelper.java AwaitingPhase.java
Log Message:
simplifying code
Index: AwaitingPhase.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper/AwaitingPhase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AwaitingPhase.java 12 Nov 2011 11:35:49 -0000 1.15
--- AwaitingPhase.java 28 Jul 2012 16:17:52 -0000 1.16
***************
*** 17,20 ****
--- 17,21 ----
import games.stendhal.server.core.events.TurnNotifier;
import games.stendhal.server.core.pathfinder.FixedPath;
+ import games.stendhal.server.core.pathfinder.RPZonePath;
import games.stendhal.server.core.pathfinder.MultiZonesFixedPath;
import games.stendhal.server.core.pathfinder.Node;
***************
*** 32,36 ****
import java.util.Observer;
- import marauroa.common.Pair;
public class AwaitingPhase extends TPPQuest {
--- 33,36 ----
***************
*** 39,46 ****
private final int minPhaseChangeTime;
private int maxPhaseChangeTime;
! private List<Pair<StendhalRPZone, List<Node>>> fullpathin =
! new LinkedList<Pair<StendhalRPZone, List<Node>>>();
! private List<Pair<StendhalRPZone, List<Node>>> fullpathout =
! new LinkedList<Pair<StendhalRPZone, List<Node>>>();
private void addConversations() {
--- 39,46 ----
private final int minPhaseChangeTime;
private int maxPhaseChangeTime;
! private List<RPZonePath> fullpathin =
! new LinkedList<RPZonePath>();
! private List<RPZonePath> fullpathout =
! new LinkedList<RPZonePath>();
private void addConversations() {
***************
*** 271,277 ****
*/
private void leadNPC() {
! final StendhalRPZone zone = fullpathin.get(0).first();
! final int x=fullpathin.get(0).second().get(0).getX();
! final int y=fullpathin.get(0).second().get(0).getY();
piedpiper.setPosition(x, y);
zone.add(piedpiper);
--- 271,277 ----
*/
private void leadNPC() {
! final StendhalRPZone zone = fullpathin.get(0).get().first();
! final int x=fullpathin.get(0).get().second().get(0).getX();
! final int y=fullpathin.get(0).get().second().get(0).getY();
piedpiper.setPosition(x, y);
zone.add(piedpiper);
Index: PathesBuildHelper.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper/PathesBuildHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PathesBuildHelper.java 12 Oct 2011 20:49:51 -0000 1.5
--- PathesBuildHelper.java 28 Jul 2012 16:17:52 -0000 1.6
***************
*** 13,30 ****
package games.stendhal.server.maps.quests.piedpiper;
! import games.stendhal.server.core.engine.SingletonRepository;
! import games.stendhal.server.core.engine.StendhalRPZone;
import games.stendhal.server.core.pathfinder.Node;
import java.util.LinkedList;
import java.util.List;
- import marauroa.common.Pair;
public class PathesBuildHelper {
-
- public static StendhalRPZone getZone(final String name) {
- return SingletonRepository.getRPWorld().getZone(name);
- }
/**
--- 13,25 ----
package games.stendhal.server.maps.quests.piedpiper;
!
import games.stendhal.server.core.pathfinder.Node;
+ import games.stendhal.server.core.pathfinder.RPZonePath;
import java.util.LinkedList;
import java.util.List;
public class PathesBuildHelper {
/**
***************
*** 32,38 ****
* @return - incoming path
*/
! public static List<Pair<StendhalRPZone, List<Node>>> getAwaitingPhasePathIn() {
! final List<Pair<StendhalRPZone, List<Node>>> fullPath =
! new LinkedList<Pair<StendhalRPZone, List<Node>>>();
final List<Node> localroute = new LinkedList<Node>();
--- 27,33 ----
* @return - incoming path
*/
! public static List<RPZonePath> getAwaitingPhasePathIn() {
! final List<RPZonePath> fullPath =
! new LinkedList<RPZonePath>();
final List<Node> localroute = new LinkedList<Node>();
***************
*** 58,63 ****
localroute.add(new Node(115,43));
localroute.add(new Node(127,43));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("0_ados_wall_n2"), new LinkedList<Node>(localroute)));
// market
--- 53,59 ----
localroute.add(new Node(115,43));
localroute.add(new Node(127,43));
! fullPath.add(
! new RPZonePath("0_ados_wall_n2",
! new LinkedList<Node>(localroute)));
// market
***************
*** 70,75 ****
localroute.add(new Node(35,107));
localroute.add(new Node(35,127));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("0_ados_city_n2"), new LinkedList<Node>(localroute)));
// city north part
--- 66,72 ----
localroute.add(new Node(35,107));
localroute.add(new Node(35,127));
! fullPath.add(
! new RPZonePath("0_ados_city_n2",
! new LinkedList<Node>(localroute)));
// city north part
***************
*** 112,117 ****
localroute.add(new Node(52,125));
localroute.add(new Node(52,127));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("0_ados_city_n"), new LinkedList<Node>(localroute)));
// city central
--- 109,115 ----
localroute.add(new Node(52,125));
localroute.add(new Node(52,127));
! fullPath.add(
! new RPZonePath("0_ados_city_n",
! new LinkedList<Node>(localroute)));
// city central
***************
*** 129,134 ****
localroute.add(new Node(42,97));
localroute.add(new Node(42,94));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("0_ados_city"), new LinkedList<Node>(localroute)));
// town hall
--- 127,133 ----
localroute.add(new Node(42,97));
localroute.add(new Node(42,94));
! fullPath.add(
! new RPZonePath("0_ados_city",
! new LinkedList<Node>(localroute)));
// town hall
***************
*** 139,144 ****
localroute.add(new Node(9,4));
localroute.add(new Node(5,4));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall"), new LinkedList<Node>(localroute)));
// 1 floor
--- 138,144 ----
localroute.add(new Node(9,4));
localroute.add(new Node(5,4));
! fullPath.add(
! new RPZonePath("int_ados_town_hall",
! new LinkedList<Node>(localroute)));
// 1 floor
***************
*** 151,156 ****
localroute.add(new Node(37,15));
localroute.add(new Node(37,3));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall_1"), new LinkedList<Node>(localroute)));
// 2 floor
--- 151,157 ----
localroute.add(new Node(37,15));
localroute.add(new Node(37,3));
! fullPath.add(
! new RPZonePath("int_ados_town_hall_1",
! new LinkedList<Node>(localroute)));
// 2 floor
***************
*** 161,166 ****
//localroute.add(new Node(26,14)); // very left point
//localroute.add(new Node(32,14)); // very right point
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall_2"), new LinkedList<Node>(localroute)));
return fullPath;
--- 162,168 ----
//localroute.add(new Node(26,14)); // very left point
//localroute.add(new Node(32,14)); // very right point
! fullPath.add(
! new RPZonePath("int_ados_town_hall_2",
! new LinkedList<Node>(localroute)));
return fullPath;
***************
*** 172,178 ****
* @return - outgoing path
*/
! public static List<Pair<StendhalRPZone, List<Node>>> getAwaitingPhasePathOut() {
! final List<Pair<StendhalRPZone, List<Node>>> fullPath =
! new LinkedList<Pair<StendhalRPZone, List<Node>>>();
final List<Node> localroute = new LinkedList<Node>();
--- 174,180 ----
* @return - outgoing path
*/
! public static List<RPZonePath> getAwaitingPhasePathOut() {
! final List<RPZonePath> fullPath =
! new LinkedList<RPZonePath>();
final List<Node> localroute = new LinkedList<Node>();
***************
*** 183,188 ****
localroute.add(new Node(26,3));
localroute.add(new Node(35,3));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall_2"), new LinkedList<Node>(localroute)));
// 1 floor
--- 185,191 ----
localroute.add(new Node(26,3));
localroute.add(new Node(35,3));
! fullPath.add(
! new RPZonePath("int_ados_town_hall_2",
! new LinkedList<Node>(localroute)));
// 1 floor
***************
*** 195,200 ****
localroute.add(new Node(2,4));
localroute.add(new Node(3,4));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall_1"), new LinkedList<Node>(localroute)));
// town hall
--- 198,204 ----
localroute.add(new Node(2,4));
localroute.add(new Node(3,4));
! fullPath.add(
! new RPZonePath("int_ados_town_hall_1",
! new LinkedList<Node>(localroute)));
// town hall
***************
*** 205,210 ****
localroute.add(new Node(22,8));
localroute.add(new Node(22,16));
! fullPath.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall"), new LinkedList<Node>(localroute)));
return fullPath;
--- 209,222 ----
localroute.add(new Node(22,8));
localroute.add(new Node(22,16));
! fullPath.add(
! new RPZonePath("int_ados_town_hall",
! new LinkedList<Node>(localroute)));
!
! // city central
! localroute.clear();
! localroute.add(new Node(42,94));
! fullPath.add(
! new RPZonePath("0_ados_city",
! new LinkedList<Node>(localroute)));
return fullPath;
***************
*** 216,237 ****
* @return - outgoing path
*/
! public static List<List<Pair<StendhalRPZone, List<Node>>>> getOutgoingPhasePathes() {
! final LinkedList<List<Pair<StendhalRPZone, List<Node>>>> fullPath =
! new LinkedList<List<Pair<StendhalRPZone, List<Node>>>>();
final List<Node> localroute = new LinkedList<Node>();
! final List<Pair<StendhalRPZone, List<Node>>> globalroute = new LinkedList<Pair<StendhalRPZone, List<Node>>>();
localroute.clear();
globalroute.clear();
! globalroute.add(new Pair<StendhalRPZone, List<Node>>(
! getZone("int_ados_town_hall_2"),
new LinkedList<Node>(localroute)));
fullPath.add(globalroute);
return fullPath;
}
-
}
--- 228,487 ----
* @return - outgoing path
*/
! public static List<List<RPZonePath>> getOutgoingPhasePathes() {
! final LinkedList<List<RPZonePath>> fullPath =
! new LinkedList<List<RPZonePath>>();
final List<Node> localroute = new LinkedList<Node>();
! final List<RPZonePath> globalroute = new LinkedList<RPZonePath>();
+ /*
+ * entrance
+ */
localroute.clear();
+ localroute.add(new Node(42,94));
globalroute.clear();
! globalroute.add(
! new RPZonePath("0_ados_city",
new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * 1st creature
+ */
+ localroute.clear();
+ localroute.add(new Node(42,97));
+
+ globalroute.clear();
+ globalroute.add(
+ new RPZonePath("0_ados_city",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * Susi's house
+ */
+ localroute.clear();
+ localroute.add(new Node(42,116));
+ localroute.add(new Node(34,116));
+
+ globalroute.clear();
+ globalroute.add(
+ new RPZonePath("0_ados_city",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * next house from Susi
+ */
+ localroute.clear();
+ localroute.add(new Node(22,116));
+ globalroute.clear();
+ globalroute.add(
+ new RPZonePath("0_ados_city",
+ new LinkedList<Node>(localroute)));
fullPath.add(globalroute);
+
+ /*
+ * left house in houses group at southleft part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(22,127));
+
+ globalroute.clear();
+ globalroute.add(
+ new RPZonePath("0_ados_city",
+ new LinkedList<Node>(localroute)));
+
+ localroute.clear();
+ localroute.add(new Node(22,0));
+ localroute.add(new Node(22,3));
+ localroute.add(new Node(9,3));
+ localroute.add(new Node(9,12));
+ localroute.add(new Node(8,12));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * middle house in houses group at southleft part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(16,12));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * right house in houses group at southleft part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(28,12));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * upperleft house in houses group at south part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(28,41));
+ localroute.add(new Node(31,41));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * bottomleft house in houses group at south part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(31,52));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * bottomright house in houses group at south part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(31,55));
+ localroute.add(new Node(50,55));
+ localroute.add(new Node(50,46));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * separate house in houses group at south part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(58,46));
+ localroute.add(new Node(58,51));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * upperright house in houses group at south part of ados
+ */
+ localroute.clear();
+ localroute.add(new Node(59,51));
+ localroute.add(new Node(59,52));
+ localroute.add(new Node(74,52));
+ localroute.add(new Node(74,40));
+ localroute.add(new Node(58,40));
+ localroute.add(new Node(58,46));
+ localroute.add(new Node(50,46));
+ localroute.add(new Node(50,37));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * ados church
+ */
+ localroute.clear();
+ localroute.add(new Node(50,32));
+ localroute.add(new Node(52,32));
+ localroute.add(new Node(52,28));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * long house
+ */
+ localroute.clear();
+ localroute.add(new Node(31,28));
+ localroute.add(new Node(31,0));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city_s",
+ new LinkedList<Node>(localroute)));
+
+ localroute.clear();
+ localroute.add(new Node(31,127));
+ localroute.add(new Node(31,118));
+ localroute.add(new Node(14,118));
+ localroute.add(new Node(14,97));
+ localroute.add(new Node(0,97));
+
+ globalroute.add(
+ new RPZonePath("0_ados_city",
+ new LinkedList<Node>(localroute)));
+
+ fullPath.add(globalroute);
+
+ /*
+ * ados house 77
+ */
+ localroute.clear();
+ localroute.add(new Node(127,97));
+ localroute.add(new Node(115,97));
+ localroute.add(new Node(115,95));
+
+ globalroute.add(
+ new RPZonePath("0_ados_wall",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * ados house 76
+ */
+ localroute.clear();
+ localroute.add(new Node(106,95));
+
+ globalroute.add(
+ new RPZonePath("0_ados_wall",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+ /*
+ * ados house 75
+ */
+ localroute.clear();
+ localroute.add(new Node(97,95));
+
+ globalroute.add(
+ new RPZonePath("0_ados_wall",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+
+ /*
+ * ados Farmers' family house
+ */
+ localroute.clear();
+ localroute.add(new Node(92,81));
+ localroute.add(new Node(122,81));
+ localroute.add(new Node(122,78));
+
+ globalroute.add(
+ new RPZonePath("0_ados_wall",
+ new LinkedList<Node>(localroute)));
+ fullPath.add(globalroute);
+
+
return fullPath;
}
}
|