Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/server/maps/semos/tavern BarMaidNPC.java, 1.3, 1.4 BowAndArrowSellerNPC.java, 1.3, 1.4 RareWeaponsSellerNPC.java, 1.3, 1.4 RichardStallmanNPC.java, 1.10, 1.11 TraderNPC.java, 1.4, 1.5
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25759/src/games/stendhal/server/maps/semos/tavern Modified Files: BarMaidNPC.java BowAndArrowSellerNPC.java RareWeaponsSellerNPC.java RichardStallmanNPC.java TraderNPC.java Log Message: Removed y+1 hack on NPC's. Corrected all Speaker NPC's y coordinates by 1. *** Note any NPC's that are out of place - There was A LOT to change. *** Index: BarMaidNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/BarMaidNPC.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BarMaidNPC.java 11 Jul 2007 15:36:57 -0000 1.3 --- BarMaidNPC.java 21 Aug 2007 01:14:11 -0000 1.4 *************** *** 39,53 **** protected void createPath() { List<Node> nodes = new LinkedList<Node>(); - nodes.add(new Node(17, 12)); nodes.add(new Node(17, 13)); ! nodes.add(new Node(16, 8)); ! nodes.add(new Node(13, 8)); ! nodes.add(new Node(13, 6)); ! nodes.add(new Node(13, 10)); ! nodes.add(new Node(23, 10)); ! nodes.add(new Node(23, 10)); ! nodes.add(new Node(23, 13)); ! nodes.add(new Node(23, 10)); ! nodes.add(new Node(17, 10)); setPath(new FixedPath(nodes, true)); } --- 39,53 ---- protected void createPath() { List<Node> nodes = new LinkedList<Node>(); nodes.add(new Node(17, 13)); ! nodes.add(new Node(17, 14)); ! nodes.add(new Node(16, 9)); ! nodes.add(new Node(13, 9)); ! nodes.add(new Node(13, 7)); ! nodes.add(new Node(13, 11)); ! nodes.add(new Node(23, 11)); ! nodes.add(new Node(23, 11)); ! nodes.add(new Node(23, 14)); ! nodes.add(new Node(23, 11)); ! nodes.add(new Node(17, 11)); setPath(new FixedPath(nodes, true)); } *************** *** 65,72 **** zone.assignRPObjectID(margaret); margaret.put("class", "tavernbarmaidnpc"); ! margaret.set(17, 12); margaret.initHP(100); zone.add(margaret); - } } --- 65,71 ---- zone.assignRPObjectID(margaret); margaret.put("class", "tavernbarmaidnpc"); ! margaret.set(17, 13); margaret.initHP(100); zone.add(margaret); } } Index: TraderNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/TraderNPC.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TraderNPC.java 11 Jul 2007 15:36:57 -0000 1.4 --- TraderNPC.java 21 Aug 2007 01:14:11 -0000 1.5 *************** *** 42,51 **** protected void createPath() { List<Node> nodes = new LinkedList<Node>(); - nodes.add(new Node(2, 13)); nodes.add(new Node(2, 14)); ! nodes.add(new Node(3, 14)); nodes.add(new Node(3, 15)); ! nodes.add(new Node(5, 15)); ! nodes.add(new Node(5, 13)); setPath(new FixedPath(nodes, true)); } --- 42,51 ---- protected void createPath() { List<Node> nodes = new LinkedList<Node>(); nodes.add(new Node(2, 14)); ! nodes.add(new Node(2, 15)); nodes.add(new Node(3, 15)); ! nodes.add(new Node(3, 16)); ! nodes.add(new Node(5, 16)); ! nodes.add(new Node(5, 14)); setPath(new FixedPath(nodes, true)); } *************** *** 80,88 **** zone.assignRPObjectID(xinBlanca); xinBlanca.put("class", "weaponsellernpc"); ! xinBlanca.setX(2); ! xinBlanca.setY(14); xinBlanca.initHP(100); zone.add(xinBlanca); - } } --- 80,86 ---- zone.assignRPObjectID(xinBlanca); xinBlanca.put("class", "weaponsellernpc"); ! xinBlanca.set(2, 15); xinBlanca.initHP(100); zone.add(xinBlanca); } } Index: BowAndArrowSellerNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/BowAndArrowSellerNPC.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BowAndArrowSellerNPC.java 11 Jul 2007 15:36:57 -0000 1.3 --- BowAndArrowSellerNPC.java 21 Aug 2007 01:14:11 -0000 1.4 *************** *** 39,48 **** protected void createPath() { List<Node> nodes = new LinkedList<Node>(); ! nodes.add(new Node(21, 2)); ! nodes.add(new Node(25, 2)); ! nodes.add(new Node(25, 4)); ! nodes.add(new Node(29, 4)); ! nodes.add(new Node(25, 4)); ! nodes.add(new Node(25, 2)); setPath(new FixedPath(nodes, true)); } --- 39,48 ---- protected void createPath() { List<Node> nodes = new LinkedList<Node>(); ! nodes.add(new Node(21, 3)); ! nodes.add(new Node(25, 3)); ! nodes.add(new Node(25, 5)); ! nodes.add(new Node(29, 5)); ! nodes.add(new Node(25, 5)); ! nodes.add(new Node(25, 3)); setPath(new FixedPath(nodes, true)); } *************** *** 60,67 **** zone.assignRPObjectID(ouchit); ouchit.put("class", "weaponsellernpc"); ! ouchit.set(21, 2); ouchit.initHP(100); zone.add(ouchit); - } } --- 60,66 ---- zone.assignRPObjectID(ouchit); ouchit.put("class", "weaponsellernpc"); ! ouchit.set(21, 3); ouchit.initHP(100); zone.add(ouchit); } } Index: RichardStallmanNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/RichardStallmanNPC.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RichardStallmanNPC.java 3 Jul 2007 18:00:03 -0000 1.10 --- RichardStallmanNPC.java 21 Aug 2007 01:14:11 -0000 1.11 *************** *** 55,63 **** zone.assignRPObjectID(stallman); stallman.put("class", "richardstallmannpc"); ! stallman.set(26, 10); stallman.setDirection(Direction.DOWN); stallman.initHP(100); zone.add(stallman); - } } --- 55,62 ---- zone.assignRPObjectID(stallman); stallman.put("class", "richardstallmannpc"); ! stallman.set(26, 11); stallman.setDirection(Direction.DOWN); stallman.initHP(100); zone.add(stallman); } } Index: RareWeaponsSellerNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/RareWeaponsSellerNPC.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RareWeaponsSellerNPC.java 11 Jul 2007 15:36:57 -0000 1.3 --- RareWeaponsSellerNPC.java 21 Aug 2007 01:14:11 -0000 1.4 *************** *** 43,50 **** protected void createPath() { List<Node> nodes = new LinkedList<Node>(); ! nodes.add(new Node(16, 2)); ! nodes.add(new Node(13, 2)); ! nodes.add(new Node(13, 1)); nodes.add(new Node(13, 2)); setPath(new FixedPath(nodes, true)); } --- 43,50 ---- protected void createPath() { List<Node> nodes = new LinkedList<Node>(); ! nodes.add(new Node(16, 3)); ! nodes.add(new Node(13, 3)); nodes.add(new Node(13, 2)); + nodes.add(new Node(13, 3)); setPath(new FixedPath(nodes, true)); } *************** *** 77,81 **** zone.assignRPObjectID(mcpegleg); mcpegleg.put("class", "pirate_sailornpc"); ! mcpegleg.set(16, 2); mcpegleg.initHP(100); zone.add(mcpegleg); --- 77,81 ---- zone.assignRPObjectID(mcpegleg); mcpegleg.put("class", "pirate_sailornpc"); ! mcpegleg.set(16, 3); mcpegleg.initHP(100); zone.add(mcpegleg); |