Changeset 7f0a2d954e9670f22011e0ff0ebc390401b1343d

Timestamp:

05/01/07 14:58:50 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[0f80e75ad3bc135cf584aa7b3e6f74c91464688b]

git-author:

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

Message:

Jaegerflotten aufsammeln eingebaut

Files:

• src/net/driftingsouls/ds2/server/modules/schiffplugins/SensorsDefault.java (modified) (4 diffs)
• templates/schiff.sensors.default.html (modified) (1 diff)

src/net/driftingsouls/ds2/server/modules/schiffplugins/SensorsDefault.java

@@ -301 +301 @@
-                        */
-                        
+                        // Cache fuer Jaegerflotten. Key ist die Flotten-ID. Value die Liste der Schiffs-IDs der Flotte
+                        Map<Integer,List<Integer>> jaegerFleetCache = new HashMap<Integer,List<Integer>>();
+                        
+                        // Die ID des Schiffes, an dem das aktuell ausgewaehlte Schiff angedockt ist
-                        int currentDockID = 0;
-                        if( data.getString("docked").length() > 0 ) {
@@ -311 +315 @@
-                        }
-                        
+                        int user_wrapfactor = Integer.parseInt(user.getUserValue("TBLORDER/schiff/wrapfactor"));
+                        
+                        // dockCount - die Anzahl der aktuell angedockten Schiffe
+                        final int dockCount = db.first("SELECT count(*) count FROM ships WHERE id>0 AND docked='",data.getInt("id"),"'").getInt("count");
+                        
+                        // superdock - Kann der aktuelle Benutzer alles andocken?
-                        boolean superdock = false;
-                        int user_wrapfactor = Integer.parseInt(user.getUserValue("TBLORDER/schiff/wrapfactor"));
-                        final int dockCount = db.first("SELECT count(*) count FROM ships WHERE id>0 AND docked='",data.getInt("id"),"'").getInt("count");
-                        
-                        if( datatype.getInt("adocks") > dockCount ) {   
-                                superdock = user.hasFlag( User.FLAG_SUPER_DOCK );
-                        }
-                        
+                        // fullcount - Die Anzahl der freien Landeplaetze auf dem aktuell ausgewaehlten Traeger
+                        // spaceToLand - Ist ueberhaupt noch Platz auf dem aktuell ausgewaehlten Traeger?
-                        boolean spaceToLand = false;
-                        int fullcount = db.first("SELECT count(*) fullcount FROM ships WHERE id>0 AND docked='l ",data.getInt("id"),"'").getInt("fullcount");
@@ -657 +666 @@
-                                                                if( data.getInt("fleet") > 0 ) {
-                                                                        boolean ok = true;
+                                                                        // Falls noch nicht geschehen die Flotte des Jaegers ermitteln
-                                                                        if( fleetlist == null ) {
-                                                                                fleetlist = new ArrayList<Integer>();
@@ -688 +698 @@
-                                        if( (datas.getInt("owner") == user.getID()) && spaceToLand && ShipTypes.hasShipTypeFlag(ashiptype, ShipTypes.SF_JAEGER) ) {
-                                                t.set_var("sships.action.landthis",1);
+                                                
+                                                // Flotte des aktuellen Jaegers landen lassen
+                                                if( datas.getInt("fleet") != 0 ) {
+                                                        if( !jaegerFleetCache.containsKey(datas.getInt("fleet"))) {
+                                                                List<Integer> thisFleetList = new ArrayList<Integer>();
+                                                                
+                                                                boolean ok = true;
+                                                                SQLQuery tmp = db.query("SELECT id,type,status FROM ships WHERE id>0 AND fleet='"+datas.getInt("fleet")+"'");
+                                                                while( tmp.next() ) {
+                                                                        SQLResultRow tmptype = ShipTypes.getShipType( tmp.getRow() );
+                                                                        if( !ShipTypes.hasShipTypeFlag(tmptype, ShipTypes.SF_JAEGER) ) {
+                                                                                ok = false;
+                                                                                break;
+                                                                        }
+                                                                        thisFleetList.add(tmp.getInt("id"));
+                                                                }               
+                                                                tmp.free();
+                                                                if( !ok ) {
+                                                                        thisFleetList.clear();
+                                                                }
+                                                                
+                                                                jaegerFleetCache.put(datas.getInt("fleet"), thisFleetList);
+                                                        }
+                                                        List<Integer> thisFleetList = jaegerFleetCache.get(datas.getInt("fleet"));
+                                                        
+                                                        if( !thisFleetList.isEmpty() && (thisFleetList.size() <= datatype.getInt("jdocks")) ) {
+                                                                if( fullcount + thisFleetList.size() <= datatype.getInt("jdocks") )
+                                                                        t.set_var(      "sships.action.landthisfleet", 1,
+                                                                                                "sships.shiplist", Common.implode("|",thisFleetList) );
+                                                        }
+                                                }
-                                        }
-

templates/schiff.sensors.default.html

@@ -315 +315 @@
-                                {/endif}{if sships.action.landthis}
-                                        <a class="greenborder" onmouseover="return helpme('{sships.type.name} landen lassen');" onmouseout="return nd();" href="./main.php?module=schiff&amp;sess={global.sess}&amp;action=land&amp;land={global.ship}&amp;ship={global.ship}&amp;shiplist={sships.id}"><img src="{URL}data/interface/schiffe/schiff_landen.gif" alt="" /></a>
+                                {/endif}{if sships.action.landthisfleet}
+                                        <a class="greenborder" onmouseover="return helpme('{sships.type.name}\'s Flotte landen lassen');" onmouseout="return nd();" href="./main.php?module=schiff&amp;sess={global.sess}&amp;action=land&amp;land={global.ship}&amp;ship={global.ship}&amp;shiplist={sships.shiplist}"><img src="{URL}data/interface/schiffe/schiff_flottelanden.gif" alt="" /></a>
-                                {/endif}{if sships.action.joinfleet}
-                                        <a class="greenborder" onmouseover="return helpme('an {sships.type.name}s Flotte anschliessen');" onmouseout="return nd();" href="./main.php?module=schiff&amp;sess={global.sess}&amp;action=join&amp;join={sships.id}&amp;ship={global.ship}"><img src="{URL}data/interface/schiffe/schiff_anschliessen.gif" alt="" /></a>