Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/server/entity Blood.java, 1.29, 1.30 Entity.java, 1.84, 1.85 GoldSource.java, 1.21, 1.22 PassiveEntity.java, 1.11, 1.12 Sign.java, 1.18, 1.19 WalkBlocker.java, 1.12, 1.13 WellSource.java, 1.13, 1.14
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24702/src/games/stendhal/server/entity Modified Files: Blood.java Entity.java GoldSource.java PassiveEntity.java Sign.java WalkBlocker.java WellSource.java Log Message: Hid most external references to class/subclass entity attributes with setEntity[Sub]Class(). Replaced remaining setObstacle() calls with setResistance(). Index: WellSource.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/WellSource.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** WellSource.java 18 Aug 2007 13:01:07 -0000 1.13 --- WellSource.java 26 Aug 2007 00:51:46 -0000 1.14 *************** *** 120,124 **** put("type", "well_source"); ! setObstacle(false); } --- 120,124 ---- put("type", "well_source"); ! setResistance(0); } *************** *** 129,133 **** put("type", "well_source"); ! setObstacle(false); } --- 129,133 ---- put("type", "well_source"); ! setResistance(0); } Index: Entity.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/Entity.java,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** Entity.java 25 Aug 2007 01:20:17 -0000 1.84 --- Entity.java 26 Aug 2007 00:51:46 -0000 1.85 *************** *** 326,340 **** } - /** - * Set this entity as an obstacle. - * - * TODO: Change calls to setResistance([0|100]) - * - * @param obstacle - * <code>true</code> if an obstacle. - */ - public void setObstacle(boolean obstacle) { - setResistance(obstacle ? 100 : 0); - } /** --- 326,329 ---- *************** *** 647,650 **** --- 636,657 ---- /** + * Set the entity class. + * + * @param clazz The class name. + */ + public void setEntityClass(final String clazz) { + put("class", clazz); + } + + /** + * Set the entity sub-class. + * + * @param subclazz The sub-class name. + */ + public void setEntitySubClass(final String subclazz) { + put("subclass", subclazz); + } + + /** * Set the entity position. * Index: PassiveEntity.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/PassiveEntity.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PassiveEntity.java 29 Jul 2007 19:21:31 -0000 1.11 --- PassiveEntity.java 26 Aug 2007 00:51:46 -0000 1.12 *************** *** 11,15 **** */ public PassiveEntity() { ! setObstacle(false); } --- 11,15 ---- */ public PassiveEntity() { ! setResistance(0); } *************** *** 23,27 **** super(object); ! setObstacle(false); } } --- 23,27 ---- super(object); ! setResistance(0); } } Index: Sign.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/Sign.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Sign.java 15 Aug 2007 21:56:15 -0000 1.18 --- Sign.java 26 Aug 2007 00:51:46 -0000 1.19 *************** *** 31,40 **** private static final Logger logger = Log4J.getLogger(Sign.class); - /** - * Classes of signs that players, NPCs etc. can walk over and where you can - * put items on if they are not placed on a collision tile. - */ - private static final List<String> NON_OBSTACLE_CLASSES = Arrays.asList( - "book_blue", "book_red", "transparent"); public static void generateRPClass() { --- 31,34 ---- *************** *** 56,60 **** put("type", "sign"); ! setObstacle(true); } --- 50,54 ---- put("type", "sign"); ! setResistance(100); } *************** *** 68,84 **** put("text", text); } - - /** - * States what type of sign this should be. This defines how it will look - * like in the client. - * - * @param clazz - * The sign class, e.g. "default" or "signpost". - */ - public void setClass(String clazz) { - put("class", clazz); - - // TODO: Set directly where setClass() is called - setObstacle(!NON_OBSTACLE_CLASSES.contains(clazz)); - } } --- 62,64 ---- Index: Blood.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/Blood.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Blood.java 17 Jul 2007 08:17:55 -0000 1.29 --- Blood.java 26 Aug 2007 00:51:46 -0000 1.30 *************** *** 54,58 **** setRPClass("blood"); put("type", "blood"); ! put("class", clazz); put("amount", amount); --- 54,58 ---- setRPClass("blood"); put("type", "blood"); ! setEntityClass(clazz); put("amount", amount); Index: GoldSource.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/GoldSource.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** GoldSource.java 15 Aug 2007 10:06:33 -0000 1.21 --- GoldSource.java 26 Aug 2007 00:51:46 -0000 1.22 *************** *** 94,98 **** put("type", "gold_source"); ! setObstacle(false); } --- 94,98 ---- put("type", "gold_source"); ! setResistance(0); } *************** *** 103,107 **** put("type", "gold_source"); ! setObstacle(false); } --- 103,107 ---- put("type", "gold_source"); ! setResistance(0); } Index: WalkBlocker.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/WalkBlocker.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** WalkBlocker.java 18 Aug 2007 13:01:07 -0000 1.12 --- WalkBlocker.java 26 Aug 2007 00:51:46 -0000 1.13 *************** *** 24,28 **** super(1, 1); ! setObstacle(false); } --- 24,28 ---- super(1, 1); ! setResistance(0); } |