[Arianne-commits] stendhal/src/games/stendhal/server/maps/semos/mines DwarfGuardianNPC.java, 1.11, 1.12 HighPriestNPC.java, 1.10, 1.11

[ChadF <ch...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/mines
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30257/src/games/stendhal/server/maps/semos/mines

Modified Files:
	DwarfGuardianNPC.java HighPriestNPC.java 
Log Message:
Removed 'stop' idea from pet (using null instead).
Cleaned up sheep/pet get/set/remove code.
Added some attribute name constants.
Improved zone change code a little more.
Moved all <StendhalRPRuleProcessor>.addNPC() calls to zone.add().
Removed all assignRPObjectID() calls except zone.add()'s.
Reordered some code that needed ID's assigned first, but others could exist.


Index: DwarfGuardianNPC.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/mines/DwarfGuardianNPC.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DwarfGuardianNPC.java	2 Sep 2007 02:23:55 -0000	1.11
--- DwarfGuardianNPC.java	29 Sep 2007 03:52:01 -0000	1.12
***************
*** 51,55 ****
  		};
  
- 		zone.assignRPObjectID(npc);
  		npc.addInitChatMessage(null, new SpeakerNPC.ChatAction() {
  			@Override
--- 51,54 ----
***************
*** 68,72 ****
  		npc.initHP(25);
  		zone.add(npc);
- 
  	}
  }
--- 67,70 ----

Index: HighPriestNPC.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/mines/HighPriestNPC.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HighPriestNPC.java	2 Sep 2007 02:23:55 -0000	1.10
--- HighPriestNPC.java	29 Sep 2007 03:52:01 -0000	1.11
***************
*** 55,59 ****
  		};
  
- 		zone.assignRPObjectID(npc);
  		npc.addInitChatMessage(null, new SpeakerNPC.ChatAction() {
  			@Override
--- 55,58 ----