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

- Ship put in the launch queue now have the correct status: STATUS_DOCKED.

Browse Source 
- Lowered the aft_eject_position of the boa_mk2 by 3 meters to avoid collision with escape pod.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2859 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2009-12-07 21:41:44 +00:00
parent 6ed5aae5c9
commit 8afb80c43c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/shipdata.plist
View File

@ -518,7 +518,7 @@
};
"boa-mk2" =
{
aft_eject_position = "0.0 -15.75 -50.75";
aft_eject_position = "0.0 -18.75 -50.75";
aft_weapon_type = "WEAPON_BEAM_LASER";
ai_type = "route1traderAI.plist";
auto_ai = yes;

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

@ -1499,6 +1499,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
}
}
[ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:ship];
OOShipGroup *escortGroup = [ship escortGroup];
@ -1563,6 +1564,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[escort_ship setOwner:ship];
[[escort_ship getAI] setStateMachine:@"escortAI.plist"];
[escort_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:escort_ship];
[escort_ship release];
@ -1638,6 +1640,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[police_ship setScanClass:CLASS_POLICE];
[police_ship setBounty:0];
[[police_ship getAI] setStateMachine:@"policeInterceptAI.plist"];
[police_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:police_ship];
[police_ship autorelease];
defenders_launched++;
@ -1722,6 +1725,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
if ((scanClass != CLASS_ROCK)&&(scanClass != CLASS_STATION))
[defense_ship setScanClass: scanClass]; // same as self
[defense_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:defense_ship];
[defense_ship autorelease];
no_docking_while_launching = YES;
@ -1754,6 +1758,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[scavenger_ship setScanClass: CLASS_NEUTRAL];
[scavenger_ship setGroup:[self stationGroup]]; // who's your Daddy -- FIXME: should we have a separate group for non-escort auxiliaires?
[[scavenger_ship getAI] setStateMachine:@"scavengerAI.plist"];
[scavenger_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:scavenger_ship];
[scavenger_ship autorelease];
}
@ -1786,6 +1791,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[miner_ship setScanClass:CLASS_NEUTRAL];
[miner_ship setGroup:[self stationGroup]]; // who's your Daddy -- FIXME: should we have a separate group for non-escort auxiliaires?
[[miner_ship getAI] setStateMachine:@"minerAI.plist"];
[miner_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:miner_ship];
[miner_ship autorelease];
}
@ -1833,6 +1839,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
//**Lazygun** added 30 Nov 04 to put a bounty on those pirates' heads.
[pirate_ship setBounty: 10 + floor(randf() * 20)]; // modified for variety
[pirate_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:pirate_ship];
[pirate_ship autorelease];
no_docking_while_launching = YES;
@ -1859,6 +1866,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[shuttle_ship setScanClass: CLASS_NEUTRAL];
[shuttle_ship setCargoFlag:CARGO_FLAG_FULL_SCARCE];
[[shuttle_ship getAI] setStateMachine:@"fallingShuttleAI.plist"];
[shuttle_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:shuttle_ship];
[shuttle_ship autorelease];
@ -1884,6 +1892,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[escort_ship setScanClass: CLASS_NEUTRAL];
[escort_ship setCargoFlag: CARGO_FLAG_FULL_PLENTIFUL];
[[escort_ship getAI] setStateMachine:@"escortAI.plist"];
[escort_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:escort_ship];
[escort_ship release];
@ -1922,6 +1931,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
[patrol_ship setBounty:0];
[patrol_ship setGroup:[self stationGroup]]; // who's your Daddy
[[patrol_ship getAI] setStateMachine:@"planetPatrolAI.plist"];
[patrol_ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:patrol_ship];
[self acceptPatrolReportFrom:patrol_ship];
[patrol_ship autorelease];
@ -1945,6 +1955,7 @@ static NSDictionary* instructions(int station_id, Vector coords, float speed, fl
if (ship->scanClass == CLASS_NOT_SET) [ship setScanClass: CLASS_NEUTRAL];
[ship setPrimaryRole:role];
[ship setGroup:[self stationGroup]]; // who's your Daddy
[ship setStatus: STATUS_DOCKED];
[self addShipToLaunchQueue:ship];
[ship release];
}