Changeset dcf8d2426124665b83cad9404f478f69914663a9

Timestamp:

08/26/07 10:28:54 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[13940572ed2de0bc7430440f97209d8cf11f5a65]

git-author:

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

Message:

Fuegt die ablative Panzerung in die Kampfanzeige ein.

Files:

• src/net/driftingsouls/ds2/server/modules/AngriffController.java (modified) (4 diffs)
• templates/angriff.html (modified) (1 diff)

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

@@ -183 +183 @@
-                                        "shipinfo.type.image",          shipType.getPicture(),
-                                        "shipinfo.type.hull",           Common.ln(shipType.getHull()),
+                                        "shipinfo.type.ablativeArmor", Common.ln(shipType.getAblativeArmor()),
-                                        "shipinfo.type.shields",        Common.ln(shipType.getShields()),
-                                        "shipinfo.type.cost",           shipType.getCost(),
@@ -189 +190 @@
-                                        "shipinfo.type.weapons",        shipType.isMilitary(),
-                                        "shipinfo.hull",                        Common.ln(ship.getShip().getHull()),
+                                        "shipinfo.ablativeArmor",       Common.ln(ship.getShip().getAblativeArmor()),
-                                        "shipinfo.panzerung",           (int)Math.round(shipType.getPanzerung()*ship.getShip().getHull()/(double)shipType.getHull()),
-                                        "shipinfo.shields",                     Common.ln(ship.getShip().getShields()),
@@ -206 +208 @@
-                                        "shipinfo.tmp.comm",            ship.getComm(),
-                                        "shipinfo.tmp.sensors",         ship.getSensors(),
-
+
+
-
-                // Anzahl
@@ -212 +215 @@
-                        t.set_var(      "shipinfo.count",               ship.getCount(),
-                                                "shipinfo.tmp.count",   ship.getNewCount() );
+                }
+                
+                // Ablative Panzerung
+                if(ship.getShip().getAblativeArmor() < shipType.getAblativeArmor()/2)
+                {
+                        t.set_var("shipinfo.ablativeArmor.bad", 1);
+                }
+                else if(ship.getShip().getAblativeArmor() < shipType.getAblativeArmor()) 
+                {
+                        t.set_var("shipinfo.ablativeArmor.normal",1);
+                }
+                else 
+                {
+                        t.set_var("shipinfo.ablativeArmor.good",1);
-                }
-

templates/angriff.html

@@ -217 +217 @@
-                                                {/endif}
-                                                Zustand:
+                                                {if shipinfo.ablativeArmor.bad}<span style="color:#ff0000">{/endif}
+                                                {if shipinfo.ablativeArmor.normal}<span style="color:#ffff00">{/endif}
+                                                {if shipinfo.ablativeArmor.good}<span style="color:#00ff00">{/endif}
+                                                {shipinfo.ablativeArmor}/{shipinfo.type.ablativeArmor}</span>{if shipinfo.showtmp}&nbsp;({shipinfo.tmp.ablativeArmor}){/endif}<br />
-                                                {if shipinfo.hull.bad}<span style="color:#ff0000">{/endif}
-                                                {if shipinfo.hull.normal}<span style="color:#ffff00">{/endif}