Changeset 6278763354e25a05ac88231b9c826f1c728a0188
- Timestamp:
- 01/20/08 12:30:00
(7 months ago)
- Author:
- Christopher Jung <bktheg@web.de>
- git-committer:
- Christopher Jung <bktheg@web.de> 1200828600 +0100
- git-parent:
[4c8d4a8ac38ae7518a40cf0419baec26131a59c1]
- git-author:
- Christopher Jung <bktheg@web.de> 1200828600 +0100
- Message:
ScriptParser?: Rolle DeutTransporter? auf ShipUtils? umgestellt
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rd466783 |
r6278763 |
|
| 30 | 30 | import net.driftingsouls.ds2.server.cargo.Resources; |
|---|
| 31 | 31 | import net.driftingsouls.ds2.server.framework.ContextMap; |
|---|
| | 32 | import net.driftingsouls.ds2.server.scripting.ShipUtils; |
|---|
| 32 | 33 | import net.driftingsouls.ds2.server.scripting.roles.Role; |
|---|
| 33 | 34 | import net.driftingsouls.ds2.server.scripting.roles.interpreter.Attribute; |
|---|
| 34 | | import net.driftingsouls.ds2.server.ships.RouteFactory; |
|---|
| 35 | 35 | import net.driftingsouls.ds2.server.ships.Ship; |
|---|
| 36 | | import net.driftingsouls.ds2.server.ships.Ship.MovementStatus; |
|---|
| 37 | 36 | |
|---|
| 38 | 37 | /** |
|---|
| … | … | |
| 66 | 65 | |
|---|
| 67 | 66 | if( !nebel.equals(ship.getLocation()) && !isEnougthDeutAvailableForTransport(ship) ) { |
|---|
| 68 | | ship.move(new RouteFactory().findRoute(ship.getLocation(), nebel), true, true); |
|---|
| | 67 | ShipUtils.move(ship, nebel, Integer.MAX_VALUE); |
|---|
| 69 | 68 | return; |
|---|
| 70 | 69 | } |
|---|
| … | … | |
| 79 | 78 | |
|---|
| 80 | 79 | Base base = (Base)db.get(Base.class, (int)this.base); |
|---|
| 81 | | MovementStatus status = ship.move(new RouteFactory().findRoute(ship.getLocation(), base.getLocation()), true, true); |
|---|
| 82 | | if( status != MovementStatus.SUCCESS ) { |
|---|
| | 80 | if( !ShipUtils.move(ship, base.getLocation(), Integer.MAX_VALUE) ) { |
|---|
| 83 | 81 | return; |
|---|
| 84 | 82 | } |
|---|
| … | … | |
| 86 | 84 | transferDeutToBase(ship, base); |
|---|
| 87 | 85 | |
|---|
| 88 | | ship.move(new RouteFactory().findRoute(base.getLocation(), nebel), true, true); |
|---|
| | 86 | ShipUtils.move(ship, nebel, Integer.MAX_VALUE); |
|---|
| 89 | 87 | } |
|---|
| 90 | 88 | |
|---|
| rd466783 |
r6278763 |
|
| 2 | 2 | <dataset> |
|---|
| 3 | 3 | <nebel x="1" y="1" system="1" type="1" /> |
|---|
| | 4 | |
|---|
| | 5 | <!-- EMP-Nebel --> |
|---|
| | 6 | <nebel x="50" y="50" system="1" type="4" /> |
|---|
| | 7 | <nebel x="51" y="51" system="1" type="4" /> |
|---|
| | 8 | <nebel x="52" y="52" system="1" type="4" /> |
|---|
| 4 | 9 | |
|---|
| 5 | 10 | <users id="1" name="Testuser" cargo="10000000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," history="" flags="" /> |
|---|
