Changeset 8e3cf9b4c2ca1641f6fffa569ea85a5309290daf

Timestamp:

07/01/07 14:57:03 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[fdd9b7da5f3efa70d6ba2e2ede6d0cb28403831c]

git-author:

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

Message:

Eine einfache Bauschlange fuer Werften eingebaut

Files:

• db/tables/werft_queues.sql (added)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/bases/Kommandozentrale.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/bases/Werft.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/entities/User.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/SchiffInfoController.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/tick/regular/WerftTick.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/BaseWerft.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/WerftGUI.java (modified) (8 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (21 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftQueueEntry.java (added)
• templates/schiffinfo.html (modified) (1 diff)
• templates/werft.werftgui.html (modified) (2 diffs)
• web/WEB-INF/cfg/hibernatemappings.xml (modified) (1 diff)

db/updates.xml

@@ -298 +298 @@
-                ALTER TABLE werften ADD CONSTRAINT werften_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);
-        ]]></update>
+        <update type="structure" datum="2007-07-01"><![CDATA[
+                CREATE TABLE `werft_queues` (
+                  werft int NOT NULL,
+                  `position` int NOT NULL,
+                  `building` int(11) default NULL,
+                  `item` smallint(6) NOT NULL default '-1',
+                  `remaining` tinyint(4) NOT NULL default '0',
+                  `flagschiff` tinyint(1) unsigned NOT NULL default '0',
+                  PRIMARY KEY  (`werft`,`position`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+                
+                ALTER TABLE werft_queues ADD CONSTRAINT werft_queues_fk_werften FOREIGN KEY (werft) REFERENCES werften(id);
+                ALTER TABLE werft_queues ADD CONSTRAINT werft_queues_fk_ship_types FOREIGN KEY (building) REFERENCES ship_types(id);
+                
+                ALTER TABLE `werften`
+                        DROP `building`,
+                        DROP `item`,
+                        DROP `remaining`;
+        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/bases/Kommandozentrale.java

@@ -42 +42 @@
-import net.driftingsouls.ds2.server.framework.db.SQLResultRow;
-import net.driftingsouls.ds2.server.framework.templates.TemplateEngine;
+import net.driftingsouls.ds2.server.werften.BaseWerft;
-
-class Kommandozentrale extends DefaultBuilding {
@@ -56 +57 @@
-                super.cleanup(context, base);
-                
-
-
-
+
+
-                base.setAutoGTUActs(new ArrayList<AutoGTUAction>());
-                User nullUser = (User)context.getDB().get(User.class, 0);
@@ -64 +64 @@
-                
-                // TODO: Unschoen. Das sollte die Werft selbst machen
-
-
+
+
+
+
+
+
+
+
-        }
-

src/net/driftingsouls/ds2/server/bases/Werft.java

@@ -55 +55 @@
-                super.build(base);
-                
-
+
+
-        }
-
@@ -63 +64 @@
-                super.cleanup(context, base);
-                
-
+
+
+
-        }
-
-
-        @Override

src/net/driftingsouls/ds2/server/entities/User.java

@@ -311 +311 @@
-                                }
-                                else {
-fs.getBoolean("flagschiff") ? 1 : 0
+1
-                                }
-                        }
-                        else {
-fs.getBoolean("flagschiff") ? 1 : 0
+1
-                        }
-                }

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

@@ -169 +169 @@
-                t.set_var(      "shiptype.cost.energie",                shipBuildData.getInt("ekosten"),
-                                        "shiptype.cost.crew",                   shipBuildData.getInt("crew"),
-
-
+
-
-                t.set_block("_SCHIFFINFO", "shiptype.werften.listitem", "shiptype.werften.list" );

src/net/driftingsouls/ds2/server/tick/regular/WerftTick.java

@@ -47 +47 @@
-                org.hibernate.Session db = getDB();
-                
- where building!=0
+Object
-                for( Iterator iter=werften.iterator(); iter.hasNext(); ) {
-                        WerftObject werft = (WerftObject)iter.next();

src/net/driftingsouls/ds2/server/werften/BaseWerft.java

@@ -54 +54 @@
-        
-        /**
+         * Erstellt eine neue Werft
+         * @param base Die Basis auf der die Werft stehen soll
+         */
+        public BaseWerft(Base base) {
+                super(1);
+                this.base = base;
+        }
+        
+        /**
-         * Gibt die ID der Basis zurueck, auf dem die Werft steht
-         * @return Die ID der Basis

src/net/driftingsouls/ds2/server/werften/WerftGUI.java

@@ -81 +81 @@
-        
-                int build = context.getRequest().getParameterInt("build");
-                String conf = context.getRequest().getParameterString("conf");
-                int ws = context.getRequest().getParameterInt("ws");
-                int item = context.getRequest().getParameterInt("item");
-                
-                if( !t.set_file( "_WERFT.WERFTGUI", "werft.werftgui.html" ) ) {
@@ -92 +90 @@
-                                        "werftgui.urlbase",             werft.getUrlBase() );
-                
+                // Baudialog
-                if( build != 0 ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
-                else if( ws != 0 ) {
-                        if( werft.isBuilding() ) {
@@ -108 +106 @@
-                        }
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        SQLResultRow[] shipdata = werft.getBuildShipList();
-                        
@@ -122 +125 @@
-                        this.out_ResourceList( werft, costs );
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                }
+                                else if( action.equals("queuedown") ) {
+                                        WerftQueueEntry entry = werft.getBuildQueueEntry(position);
+                                        WerftQueueEntry entry2 = werft.getBuildQueueEntry(position+1);
+                                        if( (entry != null) && (entry2 != null) ) {
+                                                werft.swapQueueEntries(entry, entry2);
+                                        }
+                                }
+                                else if( action.equals("queueup") ) {
+                                        WerftQueueEntry entry = werft.getBuildQueueEntry(position);
+                                        WerftQueueEntry entry2 = werft.getBuildQueueEntry(position-1);
+                                        if( (entry != null) && (entry2 != null) ) {
+                                                werft.swapQueueEntries(entry, entry2);
+                                        }
+                                }
+                                
+                                out_queueShipList(werft, werft.getBuildQueue());
+                        }
+                        else if( "options".equals(show) ) {
+                                t.set_var("werftgui.main.options", 1);
+                                
+                                // Verbindung Base <-> Werft
+                                if( werft.getWerftType() == WerftObject.SHIP ) {
+                                        int shipid = ((ShipWerft)werft).getShipID();
+                                        int linkedbaseID = ((ShipWerft)werft).getLinkedBase();
+                                        
+                                        ShipTypeData shiptype = Ship.getShipType( shipid, true );
+                                        if( shiptype.getCost() == 0 ) {
+                                                t.set_block("_WERFT.WERFTGUI", "werftgui.linkedbase.listitem", "werftgui.linkedbase.list");
+                                                
+                                                if( linkedbaseID != 0 ) {
+                                                        t.set_var(      "linkedbase.selected",  false,
+                                                                                "linkedbase.value",             "-1",
+                                                                                "linkedbase.name",              "kein Ziel" );
+                                                        
+                                                        t.parse("werftgui.linkedbase.list", "werftgui.linkedbase.listitem", true);
+                                                }
+                        
+                                                List bases = db.createQuery("from Base " +
+                                                                        "where x=? and y=? and system=? and owner=? order by id")
+                                                                        .setInteger(0, werft.getX())
+                                                                        .setInteger(1, werft.getY())
+                                                                        .setInteger(2, werft.getSystem())
+                                                                        .setInteger(3, werft.getOwner())
+                                                                        .list();
+                                                for( Iterator iter=bases.iterator(); iter.hasNext(); ) {
+                                                        Base base = (Base)iter.next();
+                                                        
+                                                        t.set_var(      "linkedbase.selected",  (linkedbaseID == base.getID()),
+                                                                                "linkedbase.value",             base.getID(),
+                                                                                "linkedbase.name",              base.getName()+" ("+base.getID()+")" );
+                                                        t.parse("werftgui.linkedbase.list", "werftgui.linkedbase.listitem", true);
+                                                }
+                                        }
+                                }
-                        }
-                }
@@ -170 +215 @@
-                t.set_block("_WERFT.WERFTGUI", "wsshiplist.listitem", "wsshiplist.list");
-                
-
+left join fetch s.modules 
-                                                                "where s.id>0 and (s.x between ? and ?) and (s.y between ? and ?) and s.system=? and " +
-                                                                "locate('l ',s.docked)=0 and s.battle=0 order by u.id,s.id")
@@ -207 +252 @@
-        }
-
+        private void out_queueShipList(WerftObject werft, WerftQueueEntry[] queue) {            
+                t.set_block("_WERFT.WERFTGUI", "queueshiplist.listitem", "queueshiplist.list");
+                
+                int remaining = 0;
+                for( int i=0; i < queue.length; i++ ) {
+                        WerftQueueEntry entry = queue[i];
+
+                        remaining += entry.getRemaining();
+                        
+                        t.set_var(
+                                        "queueship.position",   entry.getPosition(),
+                                        "queueship.type.image", entry.getBuilding().getPicture(),
+                                        "queueship.type.id",    entry.getBuilding().getTypeId(),
+                                        "queueship.type.name",  entry.getBuilding().getNickname(),
+                                        "queueship.remainingtotal",     remaining,
+                                        "queueship.building",   i == 0,
+                                        "queueship.uppossible", i > 0,
+                                        "queueship.downpossible",       i < queue.length-1);
+                        
+                        t.parse("queueshiplist.list", "queueshiplist.listitem", true);
+                }
+        }
+        
-        private void out_buildShipList(WerftObject werft, SQLResultRow[] shipdata) {            
-                t.set_var("werftgui.buildshiplist", 1);
@@ -276 +344 @@
-
-        private void out_ResourceList(WerftObject werft, Cargo showonly) {              
-                t.set_var("werftgui.reslist", 1);
-                t.set_block("_WERFT.WERFTGUI", "reslist.res.listitem", "reslist.res.list");
-                
@@ -298 +365 @@
-                                        "res.cargo",            frei );
-                t.parse("reslist.res.list", "reslist.res.listitem", true);
-        }
-
-        private void out_werftbuilding(WerftObject werft, String conf) {
-                String action = context.getRequest().getParameterString("werftact");
-                        
-                ShipTypeData type = werft.getBuildShipType();
-
-                if( action.equals("canclebuild") && conf.equals("ok") ) {
-                        t.set_var( "werftgui.building.cancel", 1 );
-                        werft.cancelBuild();
-                        return;
-                }
-                
-                t.set_var(      "werftgui.building",            1,
-                                        "ship.type.image",                      type.getPicture(),
-                                        "ship.type.id",                         type.getTypeId(),
-                                        "ship.type.name",                       type.getNickname(),
-                                        "ship.build.remaining",         werft.getRemainingTime(),
-                                        "werftgui.building.cancel.conf",        action.equals("canclebuild") && !conf.equals("ok") );
-
-                if( werft.getRequiredItem() > -1 ) {
-                        t.set_var(      "ship.build.item",                              werft.getRequiredItem(),
-                                                "ship.build.item.picture",              Items.get().item(werft.getRequiredItem()).getPicture(),
-                                                "ship.build.item.name",                 Items.get().item(werft.getRequiredItem()).getName(),
-                                                "ship.build.item.available",    werft.isBuildContPossible() );
-                }
-        }
-

src/net/driftingsouls/ds2/server/werften/WerftObject.java

@@ -32 +32 @@
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import javax.persistence.Transient;
-
-import net.driftingsouls.ds2.server.ContextCommon;
@@ -86 +87 @@
-        @Id @GeneratedValue
-        private int id = 0;
-        private int building = 0;
-        @Column(name="item")
-        private int buildItem = -1;
-        private int remaining = 0;
-        @Column(name="flagschiff")
-        private boolean buildFlagschiff = false;
@@ -102 +99 @@
-        }
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        
@@ -117 +112 @@
-         */
-        public final boolean isBuilding() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -125 +144 @@
-         */
-        public final ShipTypeData getBuildShipType() {
-
-
+
+
+
+
-                }
-                
@@ -136 +157 @@
-         */
-        public final void decRemainingTime() {
-
+
+
-                        return;
-                }
-remaining--;
-ContextMap.getContext().getDatabase().update("UPDATE werften SET remaining=remaining-1 WHERE id=",getWerftID()
+
+entry.setRemaining(entry.getRemaining()-1
-        }
-        
@@ -147 +169 @@
-         */
-        public final void incRemainingTime() {
-
-
+
+
+
+
+
-        }
-        
@@ -156 +181 @@
-         */
-        public final int getRemainingTime() {
-
+
+
+
+
+
-        }
-        
@@ -165 +194 @@
-         */
-        public final int getRequiredItem() {
-
+
+
+
+
+
-        }
-        
@@ -185 +218 @@
-                Context context = ContextMap.getContext();
-                org.hibernate.Session db = context.getDB();
+                
+                if( !this.isBuilding() ) {
+                        return 0;
+                }
-                
-                ShipTypeData shipd = this.getBuildShipType();
@@ -217 +254 @@
-                        this.MESSAGE.get().append("\tWerft '"+shipd.getWerft()+"' in Liste der Werften eingetragen\n");
-                }
-
+
+
+
-                        auser.setFlagschiff(id);
-                        this.MESSAGE.get().append("\tFlagschiff eingetragen\n");
@@ -278 +317 @@
-                ship.recalculateShipStatus();
-                
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                
-                return id;
@@ -319 +364 @@
-        
-        /**
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -1059 +1128 @@
-                        sysreqquery = "t1.systemreq=0 AND ";
-                }
-,t1.linfactor
+
-                        "FROM ships_baubar t1 JOIN ship_types t2 ON t1.type=t2.id " +
-                        "WHERE "+sysreqquery+" LOCATE('"+this.getWerftTag()+"',t1.werftreq) "+fsquery+" " +
@@ -1108 +1177 @@
-
-                        Cargo costs = new Cargo( Cargo.Type.STRING, shipdata.getString("costs") );
-        
-                        // Kosten anpassen
-                        if( shipdata.getDouble("linfactor") > 0 ) {
-                                int count = db.first("SELECT count(*) count FROM ships WHERE id>0 AND type=",shipdata.getInt("type")," AND owner=",user.getID()).getInt("count");
-                                int count2 = db.first("SELECT count(t1.id) count FROM werften t1 JOIN bases t2 ON t1.col=t2.id WHERE t1.building=",shipdata.getInt("type")," AND t2.owner=",user.getID()).getInt("count");
-                                int count3 = db.first("SELECT count(t1.id) count FROM werften t1 JOIN ships t2 ON t1.shipid=t2.id WHERE t2.id>0 AND t1.building=",shipdata.getInt("type")," AND t2.owner=",user.getID()).getInt("count");
-        
-                                count = count + count2 + count3;
-                                
-                                costs.multiply( count*shipdata.getDouble("linfactor")+1, Cargo.Round.NONE );
-                        }
-        
-                        shipdata.put("costs", costs);
@@ -1160 +1218 @@
-                        shipdata.put("type", effect.getShipType());
-                        shipdata.put("costs", cost);
-                        shipdata.put("linfactor", 0);
-                        shipdata.put("crew", effect.getCrew());
-                        shipdata.put("dauer", effect.getDauer());
@@ -1208 +1265 @@
-                        shipdata.put("type", effect.getShipType());
-                        shipdata.put("costs", cost);
-                        shipdata.put("linfactor", 0);
-                        shipdata.put("crew", effect.getCrew());
-                        shipdata.put("dauer", effect.getDauer());
@@ -1257 +1313 @@
-                SQLResultRow shipdata = null;
-                if( build > 0 ) {
-,linfactor
+
-                        if( shipdata.isEmpty() ) {
-                                MESSAGE.get().append("Es wurde kein passender Schiffsbauplan gefunden");
@@ -1264 +1320 @@
-                        
-                        shipdata.put("costs", new Cargo(Cargo.Type.STRING, shipdata.getString("costs")));
-                        
-                        // Kosten anpassen
-                        if( shipdata.getDouble("linfactor") > 0 ) {
-                                int count = db.first("SELECT count(*) count FROM ships WHERE id>0 AND type=",shipdata.getInt("type")," AND owner=",user.getID()).getInt("count");
-                                int count2 = db.first("SELECT count(t1.id) count FROM werften t1 JOIN bases t2 ON t1.col=t2.id WHERE t1.building=",shipdata.getInt("type")," AND t2.owner=",user.getID()).getInt("count");
-                                int count3 = db.first("SELECT count(t1.id) count FROM werften t1 JOIN ships t2 ON t1.shipid=t2.id WHERE t2.id>0 AND t1.building=",shipdata.getInt("type")," AND t2.owner=",user.getID()).getInt("count");
-                
-                                count = count + count2 + count3;
-                                ((Cargo)shipdata.get("costs")).multiply( shipdata.getDouble("linfactor")*count+1, Cargo.Round.NONE );
-                        }
-                }
-                else {
@@ -1291 +1337 @@
-                        shipdata.put("type", effect.getShipType());
-