From: Hendrik <nh...@us...> - 2006-09-16 12:13:52
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6755/src/games/stendhal/server/maps/semos Modified Files: SemosCityInsideTavern.java Log Message: splitted code in multiple methods Index: SemosCityInsideTavern.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/SemosCityInsideTavern.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SemosCityInsideTavern.java 16 Sep 2006 11:53:39 -0000 1.1 --- SemosCityInsideTavern.java 16 Sep 2006 12:13:48 -0000 1.2 *************** *** 26,78 **** public void build() { ! StendhalRPWorld world = StendhalRPWorld.get(); ! ! buildSemosTavernArea(); } ! private void buildSemosTavernArea() { StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( ! "int_semos_tavern_1")); ! ! Portal portal = new Portal(); ! zone.assignRPObjectID(portal); ! portal.set(4, 4); ! portal.setNumber(0); ! portal.setDestination("int_semos_tavern_0", 1); ! zone.addPortal(portal); ! ! SpeakerNPC ouchit = new SpeakerNPC("Ouchit") { ! @Override ! protected void createPath() { ! List<Path.Node> nodes = new LinkedList<Path.Node>(); ! nodes.add(new Path.Node(21, 2)); ! nodes.add(new Path.Node(25, 2)); ! nodes.add(new Path.Node(25, 4)); ! nodes.add(new Path.Node(29, 4)); ! nodes.add(new Path.Node(25, 4)); ! nodes.add(new Path.Node(25, 2)); ! setPath(nodes, true); ! } ! ! @Override ! protected void createDialog() { ! addGreeting(); ! addJob("I sell bows and arrows."); ! addHelp("I sell several items, ask me for my #offer."); ! addSeller(new SellerBehaviour(shops.get("sellrangedstuff"))); ! addGoodbye(); ! } ! }; ! npcs.add(ouchit); ! zone.assignRPObjectID(ouchit); ! ouchit.put("class", "weaponsellernpc"); ! ouchit.set(21, 2); ! ouchit.initHP(100); ! zone.addNPC(ouchit); ! zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( ! "int_semos_tavern_0")); ! ! portal = new Portal(); zone.assignRPObjectID(portal); portal.setX(22); --- 26,41 ---- public void build() { ! buildSemosTavernPortals(); ! buildSemosTavernLevel0Margaret(); ! buildSemosTavernLevel0XinBlanca(); ! buildSemosTavernLevel0Ricardo(); ! buildSemosTavernLevel1Ouchit(); } ! private void buildSemosTavernPortals() { StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( ! "int_semos_tavern_0")); ! Portal portal = new Portal(); zone.assignRPObjectID(portal); portal.setX(22); *************** *** 81,85 **** portal.setDestination("0_semos_city", 0); zone.addPortal(portal); ! portal = new Portal(); zone.assignRPObjectID(portal); --- 44,48 ---- portal.setDestination("0_semos_city", 0); zone.addPortal(portal); ! portal = new Portal(); zone.assignRPObjectID(portal); *************** *** 88,91 **** --- 51,69 ---- portal.setDestination("int_semos_tavern_1", 0); zone.addPortal(portal); + + zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( + "int_semos_tavern_1")); + + portal = new Portal(); + zone.assignRPObjectID(portal); + portal.set(4, 4); + portal.setNumber(0); + portal.setDestination("int_semos_tavern_0", 1); + zone.addPortal(portal); + } + + private void buildSemosTavernLevel0Margaret() { + StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( + "int_semos_tavern_0")); SpeakerNPC margaret = new SpeakerNPC("Margaret") { *************** *** 122,126 **** margaret.initHP(100); zone.addNPC(margaret); ! SpeakerNPC xinBlanca = new SpeakerNPC("Xin Blanca") { @Override --- 100,108 ---- margaret.initHP(100); zone.addNPC(margaret); ! } ! ! private void buildSemosTavernLevel0XinBlanca() { ! StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( ! "int_semos_tavern_0")); SpeakerNPC xinBlanca = new SpeakerNPC("Xin Blanca") { @Override *************** *** 171,175 **** xinBlanca.setHP(xinBlanca.getBaseHP()); zone.addNPC(xinBlanca); ! Rectangle tableArea = new Rectangle(25, 4, 2, 3); SpeakerNPC ricardo = new CroupierNPC("Ricardo", tableArea) { --- 153,162 ---- xinBlanca.setHP(xinBlanca.getBaseHP()); zone.addNPC(xinBlanca); ! } ! ! private void buildSemosTavernLevel0Ricardo() { ! StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( ! "int_semos_tavern_0")); ! Rectangle tableArea = new Rectangle(25, 4, 2, 3); SpeakerNPC ricardo = new CroupierNPC("Ricardo", tableArea) { *************** *** 204,206 **** --- 191,226 ---- } + private void buildSemosTavernLevel1Ouchit() { + StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone(new IRPZone.ID( + "int_semos_tavern_1")); + + SpeakerNPC ouchit = new SpeakerNPC("Ouchit") { + @Override + protected void createPath() { + List<Path.Node> nodes = new LinkedList<Path.Node>(); + nodes.add(new Path.Node(21, 2)); + nodes.add(new Path.Node(25, 2)); + nodes.add(new Path.Node(25, 4)); + nodes.add(new Path.Node(29, 4)); + nodes.add(new Path.Node(25, 4)); + nodes.add(new Path.Node(25, 2)); + setPath(nodes, true); + } + + @Override + protected void createDialog() { + addGreeting(); + addJob("I sell bows and arrows."); + addHelp("I sell several items, ask me for my #offer."); + addSeller(new SellerBehaviour(shops.get("sellrangedstuff"))); + addGoodbye(); + } + }; + npcs.add(ouchit); + zone.assignRPObjectID(ouchit); + ouchit.put("class", "weaponsellernpc"); + ouchit.set(21, 2); + ouchit.initHP(100); + zone.addNPC(ouchit); + } } |