Changeset 5fa248011061e1436ae212075879aeed6634c0d9

Timestamp:

06/17/07 17:23:21 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1182093801 +0200

git-parent:

[3a4d21b128e99eca998913a19f89740275988fd2]

git-author:

Christopher Jung <bktheg@web.de> 1182093801 +0200

Message:

Erster Teil des Modul 'Schiff' auf die neue Schiffsklasse umgestellt

Files:

• src/net/driftingsouls/ds2/server/framework/db/HibernateFacade.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/DeutAllController.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/SchiffController.java (modified) (62 diffs)
• src/net/driftingsouls/ds2/server/modules/SchiffeController.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/UeberController.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/ADocksDefault.java (modified) (6 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/CargoDefault.java (modified) (10 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/JDocksDefault.java (modified) (9 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/JumpdriveShivan.java (modified) (7 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/NavigationDefault.java (modified) (13 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/Parameters.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/SensorsDefault.java (modified) (38 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/WerftDefault.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/scripting/Quests.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/scripting/ScriptParser.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/ships/Ship.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/ships/Ships.java (modified) (5 diffs)
• templates/schiff.html (modified) (1 diff)

src/net/driftingsouls/ds2/server/framework/db/HibernateFacade.java

@@ -25 +25 @@
-import net.driftingsouls.ds2.server.framework.xml.XMLUtils;
-
+import org.hibernate.Hibernate;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
+import org.hibernate.dialect.function.StandardSQLFunction;
-import org.hibernate.stat.Statistics;
-import org.w3c.dom.Document;
@@ -46 +48 @@
-                conf = new AnnotationConfiguration();
-                conf.configure(new File(Configuration.getSetting("configdir")+"hibernate.xml"));
+                conf.addSqlFunction("pow", new StandardSQLFunction("pow", Hibernate.DOUBLE));
+                conf.addSqlFunction("floor", new StandardSQLFunction("floor", Hibernate.LONG));
-                
-                try {

src/net/driftingsouls/ds2/server/modules/DeutAllController.java

@@ -85 +85 @@
-                        if( (lastcoords == null) || !lastcoords.sameSector(0, Location.fromResult(ship), 0) ) {
-                                t.set_var(      "ship.newcoords",               1,
-ship
+Location.fromResult(ship)
-                                                        "ship.newcoords.break", lastcoords != null );
-

src/net/driftingsouls/ds2/server/modules/SchiffController.java

@@ -23 +23 @@
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
@@ -28 +29 @@
-
-import net.driftingsouls.ds2.server.ContextCommon;
-import net.driftingsouls.ds2.server.Location;
-import net.driftingsouls.ds2.server.Offizier;
-import net.driftingsouls.ds2.server.cargo.Cargo;
@@ -55 +55 @@
-import net.driftingsouls.ds2.server.ships.Ship;
-import net.driftingsouls.ds2.server.ships.ShipClasses;
+import net.driftingsouls.ds2.server.ships.ShipFleet;
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.ShipTypes;
@@ -70 +71 @@
- */
-public class SchiffController extends DSGenerator implements Loggable {
-QLResultRow
+hip
-        private ShipTypeData shiptype = null;
-        private Offizier offizier = null;
@@ -122 +123 @@
-                User user = (User)getUser();
-                TemplateEngine t = getTemplateEngine();
-Database db = getDatabase
+org.hibernate.Session db = getDB
-                
-                t.set_var( "user.tooltips", user.getUserValue("TBLORDER/schiff/tooltips") );
@@ -128 +129 @@
-                int shipid = getInteger("ship");
-                
-db.first("SELECT * FROM ships WHERE id>0 AND owner='",user.getID(),"' AND id=",
-ship.isEmpty(
+(Ship)db.get(Ship.class, 
+(ship == null) || (ship.getId() < 0) || (ship.getOwner() != user
-                        addError("Das angegebene Schiff existiert nicht", Common.buildUrl(getContext(),"default", "module", "schiffe") );
-                        return false;
-                }
-
-Int("battle"
-Int("battle"
+Battle(
+Battle(
-                        return false;
-                }
-
-
-Ship.getShipType(ship
-
-nt("id"
-
-!ship.getString("lock"
+ship.getTypeData(
+
+d(
+
+(ship.getLock() != null) && !ship.getLock(
-                        ScriptParser scriptparser = getContext().get(ContextCommon.class).getScriptParser( ScriptParser.NameSpace.QUEST );
-                        scriptparser.setShip(ship);
@@ -151 +152 @@
-                        }
-                        
-String("lock"
+Lock(
-                }
-                
@@ -205 +206 @@
-                
-                if( (alarm >= 0) && (alarm <= 1) ) { 
-nt("id"
+d(
-                        
-                        getTemplateEngine().set_var("ship.message", "Alarmstufe erfolgreich ge&auml;ndert<br />");
-                }
-                
-nt("id"
+d(
-                
-                redirect();
@@ -222 +223 @@
-         */
-        public void consignAction() {
-Database db = getDatabase
+org.hibernate.Session db = getDB
-                TemplateEngine t = getTemplateEngine();
-                User user = (User)getUser();
@@ -229 +230 @@
-                int newownerID = getInteger("newowner");
-                
-getDB()
+db
-                
-                parameterNumber("conf");
@@ -235 +236 @@
-                
-                if( conf == 0 ) {
-String("name"))+" ("+ship.getInt("id"
-nt("id"
+Name())+" ("+ship.getId(
+d(
-                        t.set_var( "ship.message", text );
-                        
@@ -243 +244 @@
-                }
-                
-int fleet = ship.getInt("fleet"
-
-Ships.consign(user, ship, newowner, false 
+ShipFleet fleet = ship.getFleet(
+
+ship.consign(newowner, false
-                        
-                if( result ) {
@@ -253 +254 @@
-                }
-                else {
-String("name")+" ("+ship.getInt("id")+"), ein Schiff der "+shiptype.getNickname()+"-Klasse, &uuml;bergeben\nSie steht bei "+ship.getInt("system")+":"+ship.getInt("x")+"/"+ship.getInt("y"
+Name()+" ("+ship.getId()+"), ein Schiff der "+shiptype.getNickname()+"-Klasse, &uuml;bergeben\nSie steht bei "+ship.getSystem()+":"+ship.getX()+"/"+ship.getY(
-                        PM.send(getContext(), user.getID(), newowner.getID(), "Schiff &uuml;bergeben", msg);
-                
@@ -259 +260 @@
-                        t.set_var("ship.message", (!consMessage.equals("") ? consMessage+"<br />" : "")+"<span style=\"color:green\">Das Schiff wurde erfolgreich an "+newowner.getProfileLink()+" &uuml;bergeben</span><br />");
-                        
-
-
+
+
+
+
-                        
-                                if( fleetcount < 3 ) {
-
-
+
+
+
+
+
-                                }
-                        }       
@@ -279 +285 @@
-                TemplateEngine t = getTemplateEngine();
-
-!ship.getString("lock").equals(""
+(ship.getLock() != null) && (ship.getLock().length() > 0
-                        t.set_var("ship.message", "<span style=\"color:red\">Dieses Schiff kann sich nicht selbstzerst&ouml;ren, da es in ein Quest eingebunden ist</span><br />");
-                        redirect();
@@ -289 +295 @@
-        
-                if( conf == 0 ) {
-String("name"))+" ("+ship.getInt("id"
-nt("id"
+Name())+" ("+ship.getId(
+d(
-                        t.set_var("ship.message", text);
-                        
@@ -297 +303 @@
-                }
-        
-nt("id"
+d(
-
-                t.set_var("ship.message", "<span style=\"color:white\">Das Schiff hat sich selbstzerst&ouml;rt</span><br />");
@@ -311 +317 @@
-                TemplateEngine t = getTemplateEngine();
-                
-Int("engine"
+Engine(
-                        redirect();
-                        return;
@@ -320 +326 @@
-                
-                if( node != 0 ) {
-nt("id"
+d(
-                        t.set_var("ship.message", Ships.MESSAGE.getMessage());
-                }
@@ -335 +341 @@
-                TemplateEngine t = getTemplateEngine();
-                
-Int("engine"
+Engine(
-                        redirect();
-                        return;
@@ -344 +350 @@
-                
-                if( knode != 0 ) {
-nt("id"
+d(
-                        t.set_var("ship.message", Ships.MESSAGE.getMessage());
-                }
@@ -357 +363 @@
-         */
-        public void renameAction() {
-                Database db = getDatabase();
-                TemplateEngine t = getTemplateEngine();
-                
@@ -363 +368 @@
-                String newname = getString("newname");
-                
-db.prepare("UPDATE ships SET name= ? WHERE id= ?").update(newname, ship.getInt("id")
+ship.setName(newname
-                t.set_var("ship.message", "Name zu "+Common._plaintitle(newname)+" ge&auml;ndert<br />");
-                ship.put("name", newname);
-        
-                redirect();
@@ -421 +425 @@
-                int[] shiplist = Common.explodeToInt("|",shipIdList);
-                
-nt("id"
+d(
-                t.set_var("ship.message", Ships.MESSAGE.getMessage());
-
@@ -446 +450 @@
-                int[] shiplist = Common.explodeToInt("|",shipIdList);
-                
-nt("id"
+d(
-                t.set_var("ship.message", Ships.MESSAGE.getMessage());
-
@@ -487 +491 @@
-                }
-                
-nt("id"
+d(
-                t.set_var("ship.message", Ships.MESSAGE.getMessage());
-
@@ -512 +516 @@
-                int[] shiplist = Common.explodeToInt("|",shipIdList);
-                
-nt("id"
+d(
-                t.set_var("ship.message", Ships.MESSAGE.getMessage());
-
@@ -524 +528 @@
-         */
-        public void joinAction() {
-Database db = getDatabase
+org.hibernate.Session db = getDB
-                TemplateEngine t = getTemplateEngine();
-                User user = (User)getUser();
@@ -531 +535 @@
-                int join = getInteger("join");
-                
-
+
+
+
+
+
-
-                // Austreten
-
-
-
+
+
-                        
-                        t.set_var("ship.message", "<span style=\"color:green\">"+Ships.MESSAGE.getMessage()+"</span><br />");
@@ -545 +552 @@
-                // Beitreten
-                else {
-
-
-
+
+
+
+
+
+
+
+
+
-                                t.set_var("ship.message", "<span style=\"color:red\">Sie k&oumlnnen der Flotte nicht beitreten, solange entweder das Schiff oder die Flotte in ein Quest eingebunden ist</span><br />");
-                                redirect();
@@ -554 +567 @@
-                        }
-                        
-Location.fromResult(ship).sameSector(0, Location.fromResult(fleetship), 0) || ( fleetship.getInt("owner") != user.getID() ) || (fleet.getInt("id") != fleetship.getInt("fleet")
-String("name"
+ship.getLocation().sameSector(0, fleetship.getLocation(), 0) || ( fleetship.getOwner() != user 
+Name(
-                        }
-                        else {
-
-
-
-
-
-
-
-
+
+
-                        }
-                }
@@ -578 +585 @@
-         */
-        public void shupAction() {
-                Database db = getDatabase();
-                TemplateEngine t = getTemplateEngine();
-                
@@ -589 +595 @@
-                }
-
-Int("shields"
-Int("shields"
-
-Int("e"
-Int("e"
+Shields(
+Shields(
+
+Energy(
+Energy(
-                }
-
-                t.set_var("ship.message", "Schilde +"+(shup*shieldfactor)+"<br />");
-                
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        
-                redirect();
@@ -637 +639 @@
-                        }
-        
-nt("id"
+d(
-                }
-                else {
-nt("id"
+d(
-                }
-                
@@ -655 +657 @@
-         */
-        public void communicateAction() {
-Database db = getDatabase
+org.hibernate.Session db = getDB
-                TemplateEngine t = getTemplateEngine();
-                User user = (User)getUser();
@@ -662 +664 @@
-                int communicate = getInteger("communicate");
-                
-String("lock"
-
-.length > 2) && !lock[2].equals(Quests.EVENT_ONCOMMUNICATE
+Lock(
+
+ == null) || ((lock.length > 2) && !lock[2].equals(Quests.EVENT_ONCOMMUNICATE)
-                        redirect();
-                        
@@ -690 +692 @@
-                }
-        
-QLResultRow targetship = db.first("SELECT x,y,system,oncommunicate FROM ships WHERE id>0 AND id='",communicate,"'"
-!Location.fromResult(targetship).sameSector(0, Location.fromResult(ship
+hip targetship = (Ship)db.get(Ship.class, communicate
+(targetship.getId() < 0) || !targetship.getLocation().sameSector(0, ship.getLocation(
-                        t.set_var("ship.message", "<span style=\"color:red\">Sie k&ouml;nnen nur mit Schiffen im selben Sektor kommunizieren</span><br />");
-                        redirect();
-                        return;
-                }
-String("oncommunicate"
+OnCommunicate(
-                
-                redirect();
@@ -710 +712 @@
-                User user = (User)getUser();
-                
-String("lock"
-
-.length > 2) && !lock[2].equals(Quests.EVENT_ONMOVE
+Lock(
+
+ == null) || ((lock.length > 2) && !lock[2].equals(Quests.EVENT_ONMOVE)
-                        redirect();
-                        
@@ -736 +738 @@
-                }
-        
-ship.getString("onmove"
+(ship.getOnMove() == null) || ship.getOnMove(
-                        t.set_var("ship.message", "<span style=\"color:red\">Das angegebene Schiff verf&uuml;gt nicht &uuml;ber dieses Ereigniss</span><br />");
-                        redirect();
@@ -742 +744 @@
-                }
-
-String("onmove"
+OnMove(
-        
-                redirect();
@@ -753 +755 @@
-         */
-        public void onenterAction() {
-                Database db = getDatabase();
-                TemplateEngine t = getTemplateEngine();
-                User user = (User)getUser();
-                
-String("lock"
-
-.length > 2) && !lock[2].equals(Quests.EVENT_ONENTER
+Lock(
+
+ == null) || ((lock.length > 2) && !lock[2].equals(Quests.EVENT_ONENTER)
-                        redirect();
-                        
@@ -784 +785 @@
-        
-                if( !usescript.equals("-1") ) {
+                        Database database = getDatabase();
+                        
-                        parameterString("execparameter");
-                        String execparameter = getString( "execparameter" );
@@ -792 +795 @@
-                        Quests.currentEventURL.set("&action=onenter");
-                        
-b
+atabase
-                        Blob execdata = null;
-                
@@ -805 +808 @@
-                                }
-                                catch( Exception e ) {
-nt("id"
+d(
-                                        return;
-                                }
@@ -816 +819 @@
-                        }
-                
-b
+atabase
-                        scriptparser.setRegister("USER", Integer.toString(user.getID()));
-                        if( !usequest.equals("") ) {
@@ -822 +825 @@
-                        }
-                        scriptparser.setRegister("SCRIPT", usescript);
-Location.fromResult(ship
+ship.getLocation(
-                        if( (lock.length > 2) ) {               
-                                scriptparser.setRegister("LOCKEXEC", "1");
-                        }
-
-b
+atabase
-                
-                        usequest = scriptparser.getRegister("QUEST");
@@ -834 +837 @@
-                                try {
-                                        scriptparser.getContext().toStream(execdata.setBinaryStream(1));
-b
+atabase
-                                                .update(execdata, runningdata.getInt("id"));
-                                }
-                                catch( Exception e ) {
-nt("id"
+d(
-                                        return;
-                                }
@@ -991 +994 @@
-                }
-                
-nt("id"
+d(
-                if( negdata < 0 ) {
-nt("id"
-
-nt("id"),"','l ",ship.getInt("id"
+d(
+
+d(),"','l ",ship.getId(
-                        while( sid.next() ) {
-                                deleteRespawnEntry(sid.getInt("id"));
@@ -1007 +1010 @@
-                        int respawntime = getInteger("respawntime");
-                        
-nt("id"
-
-nt("id"),"','l ",ship.getInt("id"
+d(
+
+d(),"','l ",ship.getId(
-                        while( sid.next() ) {
-                                createRespawnEntry(sid.getInt("id"),respawntime);
@@ -1026 +1029 @@
-         */
-        public void inselAction() {
-                Database db = getDatabase();
-                TemplateEngine t = getTemplateEngine();
-                User user = (User)getUser(); 
@@ -1035 +1037 @@
-                }
-                
-
+
+
+
+
-                t.set_var("ship.message", "<span style=\"color:green\">Willkommen auf der Insel <img align=\"middle\" src=\""+Configuration.getSetting("SMILIE_PATH")+"/icon_smile.gif\" alt=\":)\" /></span><br />");
-                
@@ -1075 +1080 @@
-                User user = (User)getUser();
-                TemplateEngine t = getTemplateEngine();
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                ScriptParser scriptparser = getContext().get(ContextCommon.class).getScriptParser( ScriptParser.NameSpace.QUEST );
-.isEmpty()
+ == null
-                        if( (scriptparser != null) && (scriptparser.getContext().getOutput().length() != 0) ) {
-                                t.set_var("ship.scriptparseroutput",
-                                                scriptparser.getContext().getOutput().replace("{{var.sessid}}", getString("sess")) );
-                        }
-
+
+
+
-                        return;
-                }
-
-
+
+
+
-                        if( (scriptparser != null) && (scriptparser.getContext().getOutput().length() > 0) ) {
-                                t.set_var("ship.scriptparseroutput",
@@ -1101 +1105 @@
-                        }
-                
-String("battle"), "ship", ship.getInt("id"
+Battle(), "ship", ship.getId(
-                        return;
-                }
-                
-nt("id"
+d(
-                
-                StringBuilder tooltiptext = new StringBuilder(100);
-                tooltiptext.append(Common.tableBegin(340, "center").replace('"', '\'') );
-Int("system"
+System(
-                tooltiptext.append(Common.tableEnd().replace('"', '\'') );
-                String tooltiptextStr = StringEscapeUtils.escapeJavaScript(tooltiptext.toString().replace(">", "&gt;").replace("<", "&lt;"));
-
-                t.set_var(      "ship.showui",                  1,
-nt("id"
-String("name"
-
-Int("type"
+d(
+Name(
+.getLocation()
+Type(
-                                        "shiptype.picture",             shiptype.getPicture(),
-                                        "shiptype.name",                shiptype.getNickname(),
-Int("hull"
-Int("hull"
+Hull(
+Hull(
-                                        "shiptype.hull",                Common.ln(shiptype.getHull())