From: yoriy <yo...@us...> - 2012-08-14 18:44:22
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper In directory vz-cvs-4.sog:/tmp/cvs-serv32152/src/games/stendhal/server/maps/quests/piedpiper Modified Files: PathsBuildHelper.java Log Message: fixed local ados city pathes of piper and rats Index: PathsBuildHelper.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper/PathsBuildHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PathsBuildHelper.java 14 Aug 2012 02:32:21 -0000 1.2 --- PathsBuildHelper.java 14 Aug 2012 18:44:19 -0000 1.3 *************** *** 236,247 **** */ public static List<List<RPZonePath>> getAdosCollectingRatsPaths() { ! final List<List<RPZonePath>> fullPath = ! new LinkedList<List<RPZonePath>>(); ! final List<Node> localroute = new LinkedList<Node>(); final List<RPZonePath> globalroute = new LinkedList<RPZonePath>(); /* ! * entrance */ localroute.clear(); --- 236,246 ---- */ public static List<List<RPZonePath>> getAdosCollectingRatsPaths() { ! final List<Node> localroute = new LinkedList<Node>(); final List<RPZonePath> globalroute = new LinkedList<RPZonePath>(); + final List<List<RPZonePath>> fullPath = new LinkedList<List<RPZonePath>>(); /* ! * 1st creature (town hall) */ localroute.clear(); *************** *** 251,260 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* ! * 1st creature */ localroute.clear(); --- 250,259 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* ! * Susi's house */ localroute.clear(); *************** *** 264,273 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* ! * Susi's house */ localroute.clear(); --- 263,272 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* ! * next house from Susi */ localroute.clear(); *************** *** 278,295 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); ! ! /* ! * next house from Susi ! */ ! localroute.clear(); ! localroute.add(new Node(22,116)); ! localroute.add(new Node(22,127)); ! ! globalroute.clear(); ! globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); --- 277,281 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", new LinkedList<Node>(localroute))); fullPath.add(new LinkedList<RPZonePath>(globalroute)); *************** *** 299,320 **** */ 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(new LinkedList<RPZonePath>(globalroute)); /* --- 285,307 ---- */ localroute.clear(); + localroute.add(new Node(22,116)); 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(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 322,332 **** */ localroute.clear(); localroute.add(new Node(16,12)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 309,320 ---- */ localroute.clear(); + localroute.add(new Node(8,12)); localroute.add(new Node(16,12)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 334,344 **** */ localroute.clear(); localroute.add(new Node(28,12)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 322,333 ---- */ localroute.clear(); + localroute.add(new Node(16,12)); localroute.add(new Node(28,12)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 346,349 **** --- 335,339 ---- */ localroute.clear(); + localroute.add(new Node(28,12)); localroute.add(new Node(28,41)); localroute.add(new Node(31,41)); *************** *** 351,357 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 341,347 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 359,369 **** */ localroute.clear(); localroute.add(new Node(31,52)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 349,360 ---- */ localroute.clear(); + localroute.add(new Node(31,41)); localroute.add(new Node(31,52)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 371,374 **** --- 362,366 ---- */ localroute.clear(); + localroute.add(new Node(31,52)); localroute.add(new Node(31,55)); localroute.add(new Node(50,55)); *************** *** 377,383 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 369,375 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 385,396 **** */ localroute.clear(); localroute.add(new Node(58,46)); ! localroute.add(new Node(58,51)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 377,389 ---- */ localroute.clear(); + localroute.add(new Node(50,46)); localroute.add(new Node(58,46)); ! localroute.add(new Node(58,51)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 398,401 **** --- 391,395 ---- */ localroute.clear(); + localroute.add(new Node(58,51)); localroute.add(new Node(59,51)); localroute.add(new Node(59,52)); *************** *** 404,415 **** 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.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 398,409 ---- 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.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 417,420 **** --- 411,415 ---- */ localroute.clear(); + localroute.add(new Node(50,37)); localroute.add(new Node(50,32)); localroute.add(new Node(52,32)); *************** *** 423,429 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 418,424 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 431,434 **** --- 426,430 ---- */ localroute.clear(); + localroute.add(new Node(52,28)); localroute.add(new Node(31,28)); localroute.add(new Node(31,0)); *************** *** 436,442 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! localroute.clear(); localroute.add(new Node(31,127)); --- 432,438 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city_s", ! new LinkedList<Node>(localroute))); ! localroute.clear(); localroute.add(new Node(31,127)); *************** *** 444,459 **** localroute.add(new Node(14,118)); localroute.add(new Node(14,97)); ! localroute.add(new Node(0,97)); ! ! globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_city", ! new LinkedList<Node>(localroute))); ! ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* * ados house 77 ! */ localroute.clear(); localroute.add(new Node(127,97)); --- 440,460 ---- localroute.add(new Node(14,118)); localroute.add(new Node(14,97)); ! globalroute.add( ! new RPZonePath("0_ados_city", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* * ados house 77 ! */ ! localroute.add(new Node(14,97)); ! localroute.add(new Node(0,97)); ! ! globalroute.clear(); ! globalroute.add( ! new RPZonePath("0_ados_city", ! new LinkedList<Node>(localroute))); ! localroute.clear(); localroute.add(new Node(127,97)); *************** *** 461,469 **** localroute.add(new Node(115,95)); - globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 462,469 ---- localroute.add(new Node(115,95)); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 471,481 **** */ localroute.clear(); localroute.add(new Node(106,95)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* --- 471,482 ---- */ localroute.clear(); + localroute.add(new Node(115,95)); localroute.add(new Node(106,95)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 483,494 **** */ localroute.clear(); localroute.add(new Node(97,95)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); ! /* --- 484,495 ---- */ localroute.clear(); + localroute.add(new Node(106,95)); localroute.add(new Node(97,95)); globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); /* *************** *** 496,499 **** --- 497,502 ---- */ localroute.clear(); + localroute.add(new Node(97,95)); + localroute.add(new Node(92,95)); localroute.add(new Node(92,81)); localroute.add(new Node(122,81)); *************** *** 502,511 **** globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); ! return fullPath; } --- 505,519 ---- globalroute.clear(); globalroute.add( ! new RPZonePath("0_ados_wall", ! new LinkedList<Node>(localroute))); ! fullPath.add(new LinkedList<RPZonePath>(globalroute)); ! ! ! /* ! * thats all :) ! */ ! return fullPath; } |