Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/server GagManager.java, 1.4, 1.5 Jail.java, 1.23, 1.24 StendhalHttpServer.java, 1.13, 1.14 StendhalPlayerDatabase.java, 1.23, 1.24 StendhalQuestSystem.java, 1.99, 1.100 StendhalRPAction.java, 1.201, 1.202 StendhalRPRuleProcessor.java, 1.239, 1.240 StendhalRPZone.java, 1.185, 1.186
|
From: Miguel A. B. L. <ari...@us...> - 2007-09-17 20:28:28
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23143/src/games/stendhal/server Modified Files: GagManager.java Jail.java StendhalHttpServer.java StendhalPlayerDatabase.java StendhalQuestSystem.java StendhalRPAction.java StendhalRPRuleProcessor.java StendhalRPZone.java Log Message: Some comments on StendhalRPWorld Added TODO so I begin refactoring soon Index: GagManager.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/GagManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GagManager.java 15 Aug 2007 08:14:15 -0000 1.4 --- GagManager.java 17 Sep 2007 20:28:20 -0000 1.5 *************** *** 14,17 **** --- 14,22 ---- */ public class GagManager implements LoginListener { + /* + * TODO: Refactor + * Don't use a quest entry for it. + * Why tryExpire? just expire on turn reached. + */ private static final Logger logger = Log4J.getLogger(GagManager.class); Index: StendhalRPZone.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPZone.java,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** StendhalRPZone.java 25 Aug 2007 01:20:15 -0000 1.185 --- StendhalRPZone.java 17 Sep 2007 20:28:21 -0000 1.186 *************** *** 423,426 **** --- 423,432 ---- logger.debug("creating " + clazz + ":" + type + " at " + x + "," + y); + /* + * TODO: Refactor + * Stinky code... hardcoded... uuuaaarrgghh! + * No idea how to improve it... + */ + try { if (clazz.contains("logic/portal")) { Index: StendhalRPRuleProcessor.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPRuleProcessor.java,v retrieving revision 1.239 retrieving revision 1.240 diff -C2 -d -r1.239 -r1.240 *** StendhalRPRuleProcessor.java 17 Sep 2007 17:14:48 -0000 1.239 --- StendhalRPRuleProcessor.java 17 Sep 2007 20:28:21 -0000 1.240 *************** *** 131,134 **** --- 131,138 ---- private void registerActions() { + /* + * TODO: Refactor + * Autoregister? + */ AdministrationAction.register(); AttackAction.register(); Index: StendhalQuestSystem.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalQuestSystem.java,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** StendhalQuestSystem.java 24 Aug 2007 11:44:29 -0000 1.99 --- StendhalQuestSystem.java 17 Sep 2007 20:28:20 -0000 1.100 *************** *** 43,46 **** --- 43,51 ---- */ public void init() { + /* + * TODO: Refactor + * What about loading this from a XML file like zones? + */ + questInfos = QuestsXMLLoader.get(); loadQuest("AdosDeathmatch"); Index: Jail.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/Jail.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Jail.java 15 Aug 2007 08:14:16 -0000 1.23 --- Jail.java 17 Sep 2007 20:28:20 -0000 1.24 *************** *** 54,57 **** --- 54,61 ---- public void onTurnReached(int currentTurn, String message) { + /* + * TODO: Refactor + * If player is not present, we should be able to manipulate the db object. + */ if (!release(_name)) { *************** *** 68,71 **** --- 72,79 ---- private static Jail instance; + /* + * TODO: Refactor + * Bad smell, hard coded list of points in the jail zone for where to land. + */ private static List<Point> cellEntryPoints = Arrays.asList(new Point(3, 2), new Point(8, 2), *************** *** 78,81 **** --- 86,93 ---- new Rectangle(7, 10, 30, 12) }; + /* + * TODO: Refactor + * Don't use quest for this. + */ // TODO: make this persistent, e.g. by replacing this list with a // quest slot reserved for jail. *************** *** 121,124 **** --- 133,141 ---- } + /* + * TODO: Refactor + * Instantiate once, use many. + * Zone object is going to be the same during the whole server life. + */ IRPZone.ID zoneid = new IRPZone.ID("-1_semos_jail"); if (!world.hasRPZone(zoneid)) { *************** *** 147,150 **** --- 164,171 ---- + " minutes. Reason: " + reason + "."); + /* + * TODO: Refactor + * Creating 2 jailer objects, we could save one. + */ TurnNotifier.get().dontNotify(new Jailer(criminalName)); *************** *** 212,215 **** --- 233,241 ---- public void onLoggedIn(Player player) { + /* + * TODO: Refactor + * Use a better approach. + * We should be able to manipulate the offline object. + */ String name = player.getName(); if (namesOfPlayersToRelease.contains(name)) { Index: StendhalRPAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPAction.java,v retrieving revision 1.201 retrieving revision 1.202 diff -C2 -d -r1.201 -r1.202 *** StendhalRPAction.java 15 Sep 2007 13:05:05 -0000 1.201 --- StendhalRPAction.java 17 Sep 2007 20:28:20 -0000 1.202 *************** *** 38,41 **** --- 38,48 ---- import marauroa.server.game.rp.RPServerManager; + /* + * TODO: Refactor + * Remove this class. + * Move to a proper OOP approach. + * Replace RP with new RP once it is agreed. + */ + public class StendhalRPAction { Index: StendhalHttpServer.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalHttpServer.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** StendhalHttpServer.java 15 Aug 2007 08:14:16 -0000 1.13 --- StendhalHttpServer.java 17 Sep 2007 20:28:20 -0000 1.14 *************** *** 49,52 **** --- 49,60 ---- import simple.template.View; + /* + * TODO: Refactor + * - Remove Groovy + * - Make it work + * - Integrate with mblanch.homeip.net/stendhal_website + */ + + public class StendhalHttpServer extends StendhalServerExtension implements ProtocolHandler { Index: StendhalPlayerDatabase.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalPlayerDatabase.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** StendhalPlayerDatabase.java 15 Aug 2007 08:14:15 -0000 1.23 --- StendhalPlayerDatabase.java 17 Sep 2007 20:28:20 -0000 1.24 *************** *** 328,392 **** } - /* - * TODO: Remove once the above is done. - * - * - * @Override public synchronized int storeRPObject(Transaction trans, - * RPObject object) throws SQLException { Connection connection = - * ((JDBCTransaction) trans).getConnection(); - * - * int object_id = -1; - * - * ByteArrayOutputStream array = new ByteArrayOutputStream(); - * DeflaterOutputStream out_stream = new DeflaterOutputStream(array); - * OutputSerializer serializer = new OutputSerializer(out_stream); - * - * try { object.writeObject(serializer, DetailLevel.FULL); - * out_stream.close(); } catch (IOException e) { logger.error("Problem while - * serializing rpobject: " + object, e); throw new SQLException("Problem - * while serializing rpobject"); } byte[] content = array.toByteArray(); - * // setup stream for blob ByteArrayInputStream inStream = new - * ByteArrayInputStream(content); - * - * String objectid = null; - * - * if (object.has("#db_id")) { objectid = object.get("#db_id"); object_id = - * object.getInt("#db_id"); } - * - * String name = null; if (object.has("name")) { name = object.get("name"); } - * - * String outfit = "0"; if (object.has("outfit_org")) { outfit = - * object.get("outfit_org"); } else if (object.has("outfit")) { outfit = - * object.get("outfit"); } - * - * int level = 0; if (object.has("level")) { level = object.getInt("level"); } - * - * int xp = 0; if (object.has("xp")) { xp = object.getInt("xp"); } - * - * String query; - * - * if ((objectid != null) && hasRPObject(trans, object_id)) { query = - * "update avatars set name='" + name + "',outfit='" + outfit + "',level=" + - * level + ",xp=" + xp + ",data=? where object_id=" + objectid; } else { - * query = "insert into avatars(object_id,name,outfit,level,xp,data) - * values(" + objectid + ",'" + name + "','" + outfit + "'," + level + "," + - * xp + ",?)"; } logger.debug("storeRPObject is executing query " + query); - * - * PreparedStatement ps = connection.prepareStatement(query); - * ps.setBinaryStream(1, inStream, inStream.available()); - * ps.executeUpdate(); ps.close(); - * // If object is new, get the objectid we gave it. if (objectid == null) { - * Statement stmt = connection.createStatement(); query = "select - * LAST_INSERT_ID() as inserted_id from avatars"; - * logger.debug("storeRPObject is executing query " + query); ResultSet - * result = stmt.executeQuery(query); - * - * result.next(); object_id = result.getInt("inserted_id"); - * - * stmt.close(); } - * - * return object_id; } - */ - private static StendhalPlayerDatabase playerDatabase; --- 328,331 ---- *************** *** 459,462 **** --- 398,406 ---- } + /* + * TODO: Refactor + * We could make room for hall of fame points in the character_stats table itself. + */ + /** * Returns the points in the specified hall of fame |