Changeset cebb7b381e718b279c1dd4c9b938081350f6aeb2

Timestamp:

05/12/08 16:22:24 (2 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[9fc4d8797d8b9f3e36c7d5871eda34d7fa44f1f4]

git-author:

Simon Dietsch <rhonabwy@sternenbund.org> 1210602144 +0200

Message:

[gameplay] Globales Flag fuer Munition eingefuehrt. Schaden wird durch Panzerung dividiert, wenn Flag gesetzt ist. Ammo Table bit-flag (2)

Files:

• src/net/driftingsouls/ds2/server/entities/Ammo.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/ks/KSAttackAction.java (modified) (5 diffs)

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

@@ -64 +64 @@
-                 * Area-Damage ueber die Distanz nicht reduzieren
-                 */
-
+
+
+
+
+
+
-                
-                private int bit;

src/net/driftingsouls/ds2/server/modules/ks/KSAttackAction.java

@@ -388 +388 @@
-                        battle.logenemy("\n"+prefix+":\n");     
-                }
+                
+                if(this.weapon.getAmmoType().length != 0){
+                        if ( this.localweapon.get("armor_redux") != null){
+                                schaden = (int)Math.round(schaden/this.getPanzerung(eShip, eShipType));
+                                
+                        }
+                }
+
+                
-        
-                if( (hit != 0) && (eShip.getShields() > 0) ) {
@@ -595 +604 @@
-        }
-        
+        private int getPanzerung(BattleShip ship, ShipTypeData shipType) {
+                return (int)Math.round(shipType.getPanzerung()*ship.getShip().getHull()/(double)shipType.getHull());
+        }
+        
+        
-        private SQLResultRow getWeaponData( Battle battle ) {   
-                ShipTypeData ownShipType = this.ownShip.getTypeData();
@@ -723 +737 @@
-                localweapon.put("ammoitem", ammoitem);
-                localweapon.put("ad_full", ammo.hasFlag(Ammo.Flags.AD_FULL));
+                localweapon.put("armor_redux", ammo.hasFlag(Ammo.Flags.ARMOR_REDUX));
-                localweapon.put("long_range", this.weapon.hasFlag(Weapon.Flags.LONG_RANGE));
-                localweapon.put("very_long_range", this.weapon.hasFlag(Weapon.Flags.VERY_LONG_RANGE));
@@ -911 +926 @@
-                                        
-                if( this.localweapon.getInt("subdamage") > 0 ) {
-(int)Math.round(aeShipType.getPanzerung()*aeShip.getShip().getHull()/(double)aeShipType.getHull()
-                       
+this.getPanzerung(aeShip, aeShipType
+
-                        Offizier eOffizier = Offizier.getOffizierByDest('s', aeShip.getId());
-                        int defensivskill = this.getDefensivSkill( aeShipType, eOffizier );
@@ -1219 +1234 @@
-                                int shieldSchaden = this.getDamage(this.localweapon.getInt("shielddamage"), offensivskill, enemyShipType);
-                                
-(int)Math.round(enemyShipType.getPanzerung()*this.enemyShip.getShip().getHull()/(double)enemyShipType.getHull()
+this.getPanzerung(enemyShip, enemyShipType
-                                int schaden = absSchaden;
-