Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added a size check for launching and docking ship.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3759 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2010-09-19 09:30:46 +00:00
parent fcb618c07f
commit 5042c648eb
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/AIs/dockingAI.plist
View File

@ -19,6 +19,7 @@
"TRY_AGAIN_LATER" = ("pauseAI: 30.0", "setStateTo: ABORT");
"COLLISION" = ("setStateTo: ABORT");
"RESTART_DOCKING" = ("setStateTo: GLOBAL");
"TOO_BIG_TO_DOCK" = ("exitAIWithMessage: DOCKING_REFUSED");
DOCKED = ("setStateTo: EXIT_SYSTEM");
"NO_STATION_FOUND" = ("setStateTo: EXIT_SYSTEM");
UPDATE = ("pauseAI: 2");

6
Resources/AIs/route1traderAI.plist
View File

@ -32,7 +32,8 @@
"WAYPOINT_SET" = ("setAITo: gotoWaypointAI.plist");
"DESIRED_RANGE_ACHIEVED" = (dockEscorts, setTargetToSystemStation, "setAITo: dockingAI.plist");
"AEGIS_IN_DOCKING_RANGE" = (dockEscorts, setTargetToSystemStation, "setAITo: dockingAI.plist");
"NO_STATION_FOUND" = ("setAITo: exitingTraderAI.plist");
"DOCKING_REFUSED" = ("switchAITo: route2sunskimAI.plist");
"NO_STATION_FOUND" = ("switchAITo: exitingTraderAI.plist");
"TARGET_FOUND" = (setTargetToFoundTarget, "setAITo: traderInterceptAI.plist", fightOrFleeHostiles);
"INCOMING_MISSILE" = ("setAITo: traderInterceptAI.plist", "setStateTo: INCOMING_MISSILE", "randomPauseAI: 0.25 1.5");
ATTACKED = ("setAITo: traderInterceptAI.plist", fightOrFleeHostiles);
@ -53,7 +54,8 @@
"WAYPOINT_SET" = ("setAITo: gotoWaypointAI.plist");
"DESIRED_RANGE_ACHIEVED" = (dockEscorts, setTargetToStation, "setAITo: dockingAI.plist");
"AEGIS_IN_DOCKING_RANGE" = (dockEscorts, setTargetToSystemStation, "setAITo: dockingAI.plist");
"NO_STATION_FOUND" = ("setAITo: exitingTraderAI.plist");
"DOCKING_REFUSED" = ("switchAITo: route2sunskimAI.plist");
"NO_STATION_FOUND" = ("switchAITo: exitingTraderAI.plist");
"TARGET_FOUND" = (setTargetToFoundTarget, "setAITo: traderInterceptAI.plist", fightOrFleeHostiles);
"INCOMING_MISSILE" = ("setAITo: traderInterceptAI.plist", "setStateTo: INCOMING_MISSILE", "randomPauseAI: 0.25 1.5");
ATTACKED = ("setAITo: traderInterceptAI.plist", fightOrFleeHostiles);

18
src/Core/Entities/StationEntity.m
View File

@ -367,6 +367,13 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
return instructions(universalID, ship->position, 0, 100, @"TRY_AGAIN_LATER", nil, NO);
}
BoundingBox bb = [ship boundingBox];
if ((port_dimensions.x < (bb.max.x - bb.min.x) || port_dimensions.y < (bb.max.y - bb.min.y)) &&
(port_dimensions.y < (bb.max.x - bb.min.x) || port_dimensions.x < (bb.max.y - bb.min.y)))
{
return instructions(universalID, ship->position, 0, 100, @"TOO_BIG_TO_DOCK", nil, NO);
}
#if DOCKING_CLEARANCE_ENABLED
// If the ship is not on its docking approach and the player has
// requested or even been granted docking clearance, then tell the
@ -1234,6 +1241,15 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
{
if (![ship isShip]) return;
BoundingBox bb = [ship boundingBox];
if ((port_dimensions.x < (bb.max.x - bb.min.x) || port_dimensions.y < (bb.max.y - bb.min.y)) &&
(port_dimensions.y < (bb.max.x - bb.min.x) || port_dimensions.x < (bb.max.y - bb.min.y)))
{
OOLog(@"station.launchShip.failed", @"Canceled a launch for a %@ with role %@, that is to big for the docking port of the %@.",
[ship displayName], [ship primaryRole], [self displayName]);
return;
}
Vector launchPos = position;
Vector launchVel = velocity;
double launchSpeed = 0.5 * [ship maxFlightSpeed];
@ -1244,7 +1260,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
Quaternion q1 = orientation;
q1 = quaternion_multiply(port_orientation, q1);
Vector launchVector = vector_forward_from_quaternion(q1);
BoundingBox bb = [ship boundingBox];
if ((port_dimensions.x < port_dimensions.y) ^ (bb.max.x - bb.min.x < bb.max.y - bb.min.y))
{
quaternion_rotate_about_axis(&q1, launchVector, M_PI*0.5); // to account for the slot being at 90 degrees to vertical