Changeset 8dffeca877f65f451e6f6b198e4083d97674a577

Timestamp:

06/17/07 22:46:02 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[93bd1ed8ec0ecdc92b541b8363c2490a4faebff3]

git-author:

Sebastian Gift <Madison@gt-knm.de> 1182113162 +0200

Message:

Geschwaetzige Schiffe

Files:

• src/net/driftingsouls/ds2/server/ships/Ships.java (modified) (15 diffs)

src/net/driftingsouls/ds2/server/ships/Ships.java

@@ -277 +277 @@
-        }
-        
-
+, boolean verbose
-                boolean moved = false;
-                boolean error = false;
+                boolean firstOutput = true;
-                
-                StringBuilder out = MESSAGE.get();
-                
-                if( ship.getInt("engine") <= 0 ) {
-
+
+
+
+
-                        distance = 0;
-                        
@@ -296 +300 @@
-                if( shiptype.getCrew()/2 > ship.getInt("crew") ) {
-                        newe--;
-
+
+
+
+
-                }
-                
@@ -311 +318 @@
-                
-                if( newe < 0 ) {
-
+
+
+
+
+
+
-                        distance = 0;
-                        
@@ -325 +337 @@
-                                        newe = ship.getInt("e") - 1;
-                                }
-
+
+
+
+
-                        }
-                        // Ueberhitzung
@@ -334 +349 @@
-                                        news = ship.getInt("s");
-                                }
-
-
-
+
+
+
+
+
+
+
-                }
-                
-                // Grillen wir uns bei dem Flug eventuell den Antrieb?
-                if( news > 100 )  {
-
+
+
+
+
+
-                                out.append("<span style=\"color:#ff0000\">Triebwerk w&uuml;rde &uuml;berhitzen</span><br />\n");
+
-                                out.append("<span style=\"color:#ff0000\">Autopilot bricht ab bei "+getLocationText(Location.fromResult(ship),true)+"</span><br />\n");
-                                out.append("</span></td></tr>\n");
@@ -385 +409 @@
-                        
-                        if( ship.getInt("s") >= 100 ) {
+                                if( !verbose && firstOutput) {
+                                        out.append(ship.getString("name")+" ("+ship.getInt("id")+"): ");
+                                        firstOutput = false;
+                                }
-                                out.append("<span style=\"color:#ff0000\">Triebwerke &uuml;berhitzt</span><br />\n");
+                                
-                                if( (RandomUtils.nextInt(101)) < 3*(news-100) ) {
-                                        int dmg = (int)( (2*(RandomUtils.nextInt(101)/100d)) + 1 ) * (news-100);
@@ -394 +423 @@
-                                        }
-                                        if( distance > 0 ) {
-
+ bei "+getLocationText(Location.fromResult(ship),true)+"
-                                                error = true;
-                                                distance = 0;
@@ -405 +434 @@
-                        ship.put("e", newe);
-                        ship.put("s", news);
-
+
+
+
-                }
-                
@@ -430 +461 @@
-        }
-        
-
+, boolean verbose
-                StringBuilder out = MESSAGE.get();
-                boolean error = false;
@@ -450 +481 @@
-                                                                        "id!='",ship.getInt("id"),"' AND e>0 AND battle=0");
-                        while( fleetshipRow.next() ) {
-
+verbose && 
-                                        firstEntry = false;
-                                        out.append("<table class=\"noBorder\">\n");
@@ -509 +540 @@
-                
-                for( SQLResultRow fleetship : fleetdata.ships.values() ) {
-
+verbose && 
-                                firstEntry = false;
-                                out.append("<table class=\"noBorder\">\n");
-                        }
-                        
-
-
-
+
+
+
+
+
-                        Offizier offizierf = fleetdata.offiziere.get(fleetship.getInt("id"));
-        
-                        ShipTypeData shiptype = Ship.getShipType(fleetship);
-                        
-
+, verbose
-                        
-                        //Einen einmal gesetzten Fehlerstatus nicht wieder aufheben
@@ -533 +566 @@
-                        }
-                        
-
-
+
+
+
+
+
+
-                if( !firstEntry )
-                        out.append("</table>\n");
@@ -787 +824 @@
-                                oldship.putAll(ship);
-                                
-
+, false
-                                error = result.error;
-                                waypoint.distance = result.distance;
@@ -794 +831 @@
-                                        // Jetzt, da sich unser Schiff korrekt bewegt hat, fliegen wir auch die Flotte ein stueck weiter        
-                                        if( ship.getInt("fleet") > 0 ) {
-
+, false
-                                                if( fleetResult != false  ) {
-                                                        error = true;
@@ -873 +910 @@
-                
-                if( moved ) {
+                        out.append("Ankunft bei "+getLocationText(Location.fromResult(ship),true)+"<br /><br />\n");
+                        
-                        db.update("UPDATE ships SET x=",ship.getInt("x"),",y=",ship.getInt("y"),",e=",ship.getInt("e"),",s=",ship.getInt("s"),",engine=",ship.getInt("engine"),",docked='' WHERE id=",ship.getInt("id"));
-                        if( docked != 0 ) {