Changeset 960085dc50fcbf695ec1287765c7cadb1b55a1a8
- Timestamp:
- 06/15/07 14:55:13
(1 year ago)
- Author:
- Christopher Jung <bktheg@web.de>
- git-committer:
- Christopher Jung <bktheg@web.de> 1181912113 +0200
- git-parent:
[2f166837f63c8ee083d2307a13577f7319eef5cf]
- git-author:
- Christopher Jung <bktheg@web.de> 1181715848 +0200
- Message:
TrefferWS gefixt
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r283e6c7 |
r960085d |
|
| 258 | 258 | trefferWS *= (this.ownShip.getInt("sensors")/100); |
|---|
| 259 | 259 | if( (ownShipType.getCrew() > 0) && (this.ownShip.getInt("crew") < ownShipType.getCrew()) ) { |
|---|
| 260 | | trefferWS *= this.ownShip.getInt("crew")/ownShipType.getCrew(); |
|---|
| | 260 | trefferWS *= this.ownShip.getInt("crew")/(double)ownShipType.getCrew(); |
|---|
| 261 | 261 | } |
|---|
| 262 | 262 | |
|---|
| 263 | 263 | // Und nun die TrefferWS anteilig steigern, wenn die Gegnerische Crew/Antrie nicht auf 100 sind |
|---|
| 264 | 264 | int restws = 100-trefferWS; |
|---|
| 265 | | trefferWS += restws*((100-eShip.getInt("engine"))/100); |
|---|
| | 265 | trefferWS += restws*((100-eShip.getInt("engine"))/100d); |
|---|
| 266 | 266 | if( eShip.getInt("crew") < eShipType.getCrew() ) { |
|---|
| 267 | | trefferWS += restws*((eShipType.getCrew()-eShip.getInt("crew"))/eShipType.getCrew()); |
|---|
| | 267 | trefferWS += restws*((eShipType.getCrew()-eShip.getInt("crew"))/(double)eShipType.getCrew()); |
|---|
| 268 | 268 | } |
|---|
| 269 | 269 | |
|---|
| … | … | |
| 306 | 306 | trefferWS *= (this.ownShip.getInt("sensors")/100); |
|---|
| 307 | 307 | if( (ownShipType.getCrew() > 0) && (this.ownShip.getInt("crew") < ownShipType.getCrew()) ) { |
|---|
| 308 | | trefferWS *= this.ownShip.getInt("crew")/ownShipType.getCrew(); |
|---|
| | 308 | trefferWS *= this.ownShip.getInt("crew")/(double)ownShipType.getCrew(); |
|---|
| 309 | 309 | } |
|---|
| 310 | 310 | |
|---|
| 311 | 311 | // Und nun die TrefferWS anteilig steigern, wenn die Gegnerische Crew/Antrie nicht auf 100 sind |
|---|
| 312 | 312 | int restws = 100-trefferWS; |
|---|
| 313 | | trefferWS += restws*((100-eShip.getInt("engine"))/100); |
|---|
| | 313 | trefferWS += restws*((100-eShip.getInt("engine"))/100d); |
|---|
| 314 | 314 | if( eShip.getInt("crew") < eShipType.getCrew() ) { |
|---|
| 315 | | trefferWS += restws*((eShipType.getCrew()-eShip.getInt("crew"))/eShipType.getCrew()); |
|---|
| | 315 | trefferWS += restws*((eShipType.getCrew()-eShip.getInt("crew"))/(double)eShipType.getCrew()); |
|---|
| 316 | 316 | } |
|---|
| 317 | 317 | |
|---|