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

While there's still time, put the new AIs into the right nameprefix

Browse Source
This commit is contained in:
cim 2013-09-13 20:45:48 +01:00
parent 4c6f352736
commit 3360843aae
31 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Resources/AIs/bountyHunterAI.js → Resources/AIs/oolite-bountyHunterAI.js
View File

0
Resources/AIs/bountyHunterLeaderAI.js → Resources/AIs/oolite-bountyHunterLeaderAI.js
View File

0
Resources/AIs/ooliteConstrictorAI.js → Resources/AIs/oolite-constrictorAI.js
View File

0
Resources/AIs/defenseShipAI.js → Resources/AIs/oolite-defenseShipAI.js
View File

0
Resources/AIs/escortAI.js → Resources/AIs/oolite-escortAI.js
View File

0
Resources/AIs/missileAI.js → Resources/AIs/oolite-missileAI.js
View File

0
Resources/AIs/nullAI.js → Resources/AIs/oolite-nullAI.js
View File

0
Resources/AIs/pirateAI.js → Resources/AIs/oolite-pirateAI.js
View File

0
Resources/AIs/pirateFighterAI.js → Resources/AIs/oolite-pirateFighterAI.js
View File

0
Resources/AIs/pirateFreighterAI.js → Resources/AIs/oolite-pirateFreighterAI.js
View File

0
Resources/AIs/pirateInterceptorAI.js → Resources/AIs/oolite-pirateInterceptorAI.js
View File

0
Resources/AIs/policeAI.js → Resources/AIs/oolite-policeAI.js
View File

0
Resources/AIs/qbombAI.js → Resources/AIs/oolite-qbombAI.js
View File

0
Resources/AIs/rockHermitAI.js → Resources/AIs/oolite-rockHermitAI.js
View File

0
Resources/AIs/scavengerAI.js → Resources/AIs/oolite-scavengerAI.js
View File

0
Resources/AIs/shuttleAI.js → Resources/AIs/oolite-shuttleAI.js
View File

0
Resources/AIs/stationAI.js → Resources/AIs/oolite-stationAI.js
View File

0
Resources/AIs/thargletAI.js → Resources/AIs/oolite-thargletAI.js
View File

0
Resources/AIs/thargoidAI.js → Resources/AIs/oolite-thargoidAI.js
View File

0
Resources/AIs/traderAI.js → Resources/AIs/oolite-traderAI.js
View File

0
Resources/AIs/traderOpportunistAI.js → Resources/AIs/oolite-traderOpportunistAI.js
View File

46
Resources/Config/autoAImap.plist
View File

@ -16,27 +16,27 @@
{
"asteroid" = "dumbAI.plist";
"escort" = "escortAI.js";
"hunter" = "bountyHunterAI.js";
"hunter-medium" = "bountyHunterLeaderAI.js";
"hunter-heavy" = "bountyHunterLeaderAI.js";
"interceptor" = "policeAI.js";
"miner" = "scavengerAI.js";
"pirate" = "pirateAI.js";
"pirate-aegis-raider" = "pirateInterceptorAI.js";
"pirate-interceptor" = "pirateInterceptorAI.js";
"pirate-light-fighter" = "pirateAI.js";
"pirate-medium-fighter" = "pirateAI.js";
"pirate-heavy-fighter" = "pirateAI.js";
"pirate-light-freighter" = "pirateFreighterAI.js";
"pirate-medium-freighter" = "pirateFreighterAI.js";
"pirate-heavy-freighter" = "pirateFreighterAI.js";
"police" = "policeAI.js";
"trader" = "traderAI.js";
"trader-courier" = "traderAI.js";
"trader-smuggler" = "traderAI.js";
"scavenger" = "scavengerAI.js";
"shuttle" = "shuttleAI.js";
"sunskim-trader" = "traderAI.js";
"wingman" = "policeAI.js";
"escort" = "oolite-escortAI.js";
"hunter" = "oolite-bountyHunterAI.js";
"hunter-medium" = "oolite-bountyHunterLeaderAI.js";
"hunter-heavy" = "oolite-bountyHunterLeaderAI.js";
"interceptor" = "oolite-policeAI.js";
"miner" = "oolite-scavengerAI.js";
"pirate" = "oolite-pirateAI.js";
"pirate-aegis-raider" = "oolite-pirateInterceptorAI.js";
"pirate-interceptor" = "oolite-pirateInterceptorAI.js";
"pirate-light-fighter" = "oolite-pirateAI.js";
"pirate-medium-fighter" = "oolite-pirateAI.js";
"pirate-heavy-fighter" = "oolite-pirateAI.js";
"pirate-light-freighter" = "oolite-pirateFreighterAI.js";
"pirate-medium-freighter" = "oolite-pirateFreighterAI.js";
"pirate-heavy-freighter" = "oolite-pirateFreighterAI.js";
"police" = "oolite-policeAI.js";
"trader" = "oolite-traderAI.js";
"trader-courier" = "oolite-traderAI.js";
"trader-smuggler" = "oolite-traderAI.js";
"scavenger" = "oolite-scavengerAI.js";
"shuttle" = "oolite-shuttleAI.js";
"sunskim-trader" = "oolite-traderAI.js";
"wingman" = "oolite-policeAI.js";
}

74
Resources/Config/shipdata.plist
View File

@ -47,7 +47,7 @@
"oolite_template_adder" =
{
aft_eject_position = "0.0 -4.5 -23.0";
ai_type = "scavengerAI.js";
ai_type = "oolite-scavengerAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -185,7 +185,7 @@
{
aft_eject_position = "0.0 -20.0 -67.0";
aft_weapon_type = "WEAPON_PULSE_LASER";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -319,7 +319,7 @@
};
"oolite_template_asp" = {
aft_eject_position = "0.0 -8.0 -21.5";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -539,7 +539,7 @@
{
aft_eject_position = "0.0 -15.0 -50.5";
aft_weapon_type = "WEAPON_BEAM_LASER";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -667,7 +667,7 @@
{
aft_eject_position = "0.0 -18.75 -50.75";
aft_weapon_type = "WEAPON_BEAM_LASER";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -920,7 +920,7 @@
"oolite_template_cobra3" =
{
aft_eject_position = "0.0 15.5 -33.0";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1044,7 +1044,7 @@
{
like_ship = "oolite_template_cobra3";
is_template = 1;
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
bounty = 50;
forward_weapon_type = "WEAPON_PULSE_LASER";
has_ecm = 0.1;
@ -1065,7 +1065,7 @@
};
"oolite_template_cobramk1" = {
aft_eject_position = "0.0 7.5 -21.0";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1167,7 +1167,7 @@
{
like_ship = "oolite_template_cobramk1";
is_template = 1;
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
energy_recharge_rate = 3.75; // equivalent of Extra Energy Unit
forward_weapon_type = "WEAPON_BEAM_LASER";
has_fuel_injection = 0.25;
@ -1184,7 +1184,7 @@
{
like_ship = "oolite_template_cobramk1";
is_template = 1;
ai_type = "scavengerAI.js";
ai_type = "oolite-scavengerAI.js";
forward_weapon_type = "WEAPON_MINING_LASER";
has_scoop = yes;
materials =
@ -1202,7 +1202,7 @@
"oolite_template_constrictor" =
{
aft_eject_position = "0.0 5.5 -19.0";
ai_type = "ooliteConstrictorAI.js";
ai_type = "oolite-constrictorAI.js";
bounty = 250;
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 5;
@ -1238,7 +1238,7 @@
};
"oolite_template_coriolis-station" =
{
ai_type = "stationAI.js";
ai_type = "oolite-stationAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 100;
forward_weapon_type = "WEAPON_NONE";
@ -1400,7 +1400,7 @@
};
"oolite_template_dodecahedron-station" =
{
ai_type = "stationAI.js";
ai_type = "oolite-stationAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 100;
forward_weapon_type = "WEAPON_NONE";
@ -1449,7 +1449,7 @@
{
like_ship = "oolite_template_missile";
is_template = 1;
ai_type = "missileAI.js";
ai_type = "oolite-missileAI.js";
name = "ECM Hardened Missile";
script_info =
{
@ -1464,7 +1464,7 @@
};
"oolite_template_escape-capsule" = {
aft_eject_position = "0.0 0.0 -2.0";
ai_type = "shuttleAI.js";
ai_type = "oolite-shuttleAI.js";
cargo_type = "CARGO_SLAVES";
energy_recharge_rate = 2;
exhaust =
@ -1526,7 +1526,7 @@
};
"oolite_template_ferdelance" = {
aft_eject_position = "0.0 3.0 -38.0";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1639,7 +1639,7 @@
"oolite_template_gecko" =
{
aft_eject_position = "0.0 4.5 -11.0";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1670,7 +1670,7 @@
};
"oolite_template_icosahedron-station" =
{
ai_type = "stationAI.js";
ai_type = "oolite-stationAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 100;
forward_weapon_type = "WEAPON_NONE";
@ -1717,7 +1717,7 @@
"oolite_template_krait" =
{
aft_eject_position = "0.0 7.5 -16.5";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1752,7 +1752,7 @@
};
"oolite_template_mamba" = {
aft_eject_position = "0.0 5.5 -17.0";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1796,7 +1796,7 @@
};
"oolite_template_missile" =
{
ai_type = "missileAI.js";
ai_type = "oolite-missileAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 0;
exhaust = ("0.0 0.0 -3.5 2.0 2.0 0.75");
@ -1826,7 +1826,7 @@
"oolite_template_moray" =
{
aft_eject_position = "0.0 5.75 -8.0";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -1936,7 +1936,7 @@
{
like_ship = "oolite_template_moray";
is_template = 1;
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
likely_cargo = 15;
max_cargo = 22;
materials =
@ -1963,7 +1963,7 @@
"oolite_template_python" =
{
aft_eject_position = "0.0 15.5 -50.0";
ai_type = "traderAI.js";
ai_type = "oolite-traderAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -2067,7 +2067,7 @@
{
like_ship = "oolite_template_python";
is_template = 1;
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
energy_recharge_rate = 3.5;
escort_roles = (
{ "role" = "pirate-light-fighter"; min = 1; max = 1; },
@ -2106,7 +2106,7 @@
};
"oolite_template_qbomb" =
{
ai_type = "qbombAI.js";
ai_type = "oolite-qbombAI.js";
energy_recharge_rate = 0;
is_template = 1;
max_energy = 10;
@ -2120,7 +2120,7 @@
};
"oolite_template_rock-hermit" =
{
ai_type = "rockHermitAI.js";
ai_type = "oolite-rockHermitAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 5;
"equipment_price_factor" = 4.5;
@ -2230,7 +2230,7 @@
};
"oolite_template_shuttle" = {
aft_eject_position = "0.0 0 -18.0";
ai_type = "nullAI.plist";
ai_type = "oolite-shuttleAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 1;
exhaust = (
@ -2261,7 +2261,7 @@
};
"oolite_template_sidewinder" = {
aft_eject_position = "0.0 7.5 -18.0";
ai_type = "pirateAI.js";
ai_type = "oolite-pirateAI.js";
auto_ai = yes;
auto_weapons = yes;
cargo_type = "CARGO_NOT_CARGO";
@ -2330,7 +2330,7 @@
};
"oolite_template_tharglet" =
{
ai_type = "thargletAI.js";
ai_type = "oolite-thargletAI.js";
bounty = 50;
cargo_type = "CARGO_THARGOID";
energy_recharge_rate = 3;
@ -2359,7 +2359,7 @@
{
aft_eject_position = "0.0 0.0 -20.5";
aft_weapon_type = "WEAPON_THARGOID_LASER";
ai_type = "thargoidAI.js";
ai_type = "oolite-thargoidAI.js";
bounty = 100;
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 4;
@ -2388,7 +2388,7 @@
"oolite_template_transporter" =
{
aft_eject_position = "0.0 5.5 -18.0";
ai_type = "nullAI.plist";
ai_type = "oolite-shuttleAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 3;
exhaust = ("6.125 -0.75 -17.5 3.0 3.0 1.5", "-6.125 -0.75 -17.5 3.0 3.0 1.5");
@ -2417,7 +2417,7 @@
{
like_ship = "oolite_template_transporter";
is_template = 1;
ai_type = "scavengerAI.js";
ai_type = "oolite-scavengerAI.js";
forward_weapon_type = "WEAPON_MINING_LASER";
has_scoop = yes;
materials =
@ -2430,7 +2430,7 @@
"oolite_template_viper" =
{
aft_eject_position = "0.0 6.5 -28.0";
ai_type = "policeAI.js";
ai_type = "oolite-policeAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 4;
exhaust = ("12.5 0.0 -27.5 6.0 6.0 1.5", "-12.5 0.0 -27.5 6.0 6.0 1.5");
@ -2545,7 +2545,7 @@
"oolite_template_viper-interceptor" =
{
aft_eject_position = "0.0 10.5 -22.0";
ai_type = "policeAI.js";
ai_type = "oolite-policeAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 6;
exhaust = (
@ -2676,7 +2676,7 @@
"oolite_template_worm" =
{
aft_eject_position = "0.0 5.0 -9.5";
ai_type = "nullAI.plist";
ai_type = "oolite-shuttleAI.js";
cargo_type = "CARGO_NOT_CARGO";
energy_recharge_rate = 2;
exhaust = ("0.0 0.0 -17.5 7.0 6.0 1.5");
@ -2705,7 +2705,7 @@
{
like_ship = "oolite_template_worm";
is_template = 1;
ai_type = "scavengerAI.js";
ai_type = "oolite-scavengerAI.js";
energy_recharge_rate = 1.85;
forward_weapon_type = "WEAPON_MINING_LASER";
has_scoop = yes;

14
Resources/Scripts/oolite-populator.js
View File

@ -1268,7 +1268,7 @@ this._addFreighter = function(pos)
// half of the offender traders are a bit more sinister
if (Math.random() < 0.5)
{
t[0].switchAI("traderOpportunistAI.js");
t[0].switchAI("oolite-traderOpportunistAI.js");
goods = "PIRATE_GOODS";
}
var eg = t[0].escortGroup.ships;
@ -1518,7 +1518,7 @@ this._addHunterPack = function(pos,home,dest,role,returning)
this._setWeapons(t[0],1.9);
}
this._setSkill(t[0],3); // likely to be good pilot
t[0].switchAI("bountyHunterLeaderAI.js");
t[0].switchAI("oolite-bountyHunterLeaderAI.js");
}
}
@ -1577,7 +1577,7 @@ this._addPirateAssistant = function(role,lead,pos)
asst[0].destinationSystem = lead.destinationSystem;
if (role == "pirate-interceptor")
{
asst[0].switchAI("pirateInterceptorAI.js");
asst[0].switchAI("oolite-pirateInterceptorAI.js");
asst[0].setBounty(50+system.government+Math.floor(Math.random()*36),"setup actions");
// interceptors not actually part of group: they just get the
// same destinations
@ -1591,7 +1591,7 @@ this._addPirateAssistant = function(role,lead,pos)
{
asst[0].group = lead.group;
lead.group.addShip(asst[0]);
asst[0].switchAI("pirateFighterAI.js");
asst[0].switchAI("oolite-pirateFighterAI.js");
asst[0].setBounty(20+system.government+Math.floor(Math.random()*12),"setup actions");
if (role == "pirate-light-fighter")
{
@ -1680,7 +1680,7 @@ this._addPiratePack = function(pos,leader,lf,mf,hf,thug,home,destination,returni
lead[0].setCargoType("PIRATE_GOODS");
}
this._setEscortWeapons(lead[0]);
lead[0].switchAI("pirateFreighterAI.js");
lead[0].switchAI("oolite-pirateFreighterAI.js");
return lead[0];
}
@ -1818,7 +1818,7 @@ this._addPoliceStationPatrol = function(pos)
p.primaryRole = "police-station-patrol";
p.group = system.mainStation.group;
p.group.addShip(p);
p.switchAI("policeAI.js");
p.switchAI("oolite-policeAI.js");
p.bounty = 0;
p.maxEscorts = 16;
if (system.info.techlevel >= 14)
@ -1839,7 +1839,7 @@ this._addInterceptors = function(pos)
h.ships[i].maxEscorts = 16;
h.ships[i].homeSystem = system.ID;
h.ships[i].destinationSystem = system.ID;
h.ships[i].switchAI("policeAI.js");
h.ships[i].switchAI("oolite-policeAI.js");
// only +1 as core already gives police ships better AI
this._setSkill(h.ships[i],1);

2
src/Core/Entities/OOPlanetEntity.m
View File

@ -568,7 +568,7 @@ static OOColor *ColorWithHSBColor(Vector c)
[shuttle_ship setScanClass: CLASS_NEUTRAL];
[shuttle_ship setCargoFlag:CARGO_FLAG_FULL_PLENTIFUL];
[shuttle_ship switchAITo:@"shuttleAI.js"];
[shuttle_ship switchAITo:@"oolite-shuttleAI.js"];
[UNIVERSE addEntity:shuttle_ship]; // STATUS_IN_FLIGHT, AI state GLOBAL
_shuttlesOnGround--;
_lastLaunchTime = [UNIVERSE getTime];

2
src/Core/Entities/PlanetEntity.m
View File

@ -1194,7 +1194,7 @@ static const BaseFace kTexturedFaces[][3] =
[shuttle_ship setScanClass: CLASS_NEUTRAL];
[shuttle_ship setCargoFlag:CARGO_FLAG_FULL_PLENTIFUL];
[shuttle_ship switchAITo:@"shuttleAI.js"];
[shuttle_ship switchAITo:@"oolite-shuttleAI.js"];
[UNIVERSE addEntity:shuttle_ship];
[shuttle_ship release];

2
src/Core/Entities/PlayerEntity.m
View File

@ -2677,7 +2677,7 @@ static GLfloat sBaseMass = 0.0;
- (void) resetAutopilotAI
{
AI *myAI = [self getAI];
// JSAI: will need changing if dockingAI.js written
// JSAI: will need changing if oolite-dockingAI.js written
if (![[myAI name] isEqualToString:PLAYER_DOCKING_AI_NAME])
{
[self setAITo:PLAYER_DOCKING_AI_NAME ];

2
src/Core/Entities/ShipEntity.m
View File

@ -2054,7 +2054,7 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
[pod setTemperature:[self randomEjectaTemperatureWithMaxFactor:0.9]];
[pod setCommodity:[UNIVERSE commodityForName:@"Slaves"] andAmount:1];
[pod setCrew:podCrew];
[pod switchAITo:@"shuttleAI.js"];
[pod switchAITo:@"oolite-shuttleAI.js"];
[self dumpItem:pod]; // CLASS_CARGO, STATUS_IN_FLIGHT, AI state GLOBAL
[pod release]; //release
}

6
src/Core/Entities/ShipEntityAI.m
View File

@ -253,8 +253,8 @@
{
if ([aiString hasSuffix:@".plist"])
{
[[self getAI] setStateMachine:aiString withJSScript:@"nullAI.js"];
[self setAIScript:@"nullAI.js"];
[[self getAI] setStateMachine:aiString withJSScript:@"oolite-nullAI.js"];
[self setAIScript:@"oolite-nullAI.js"];
}
else if ([aiString hasSuffix:@".js"])
{
@ -288,7 +288,7 @@
if (aiScript == nil)
{
OOLog(@"ai.load.failed.unknownAI",@"Unable to load JS AI %@",aiString);
aiScript = [OOScript jsAIScriptFromFileNamed:@"nullAI.js" properties:properties];
aiScript = [OOScript jsAIScriptFromFileNamed:@"oolite-nullAI.js" properties:properties];
}
else
{

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

@ -1419,7 +1419,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
}
else
{
// JSAI: not needed - traderAI.js handles exiting if full fuel and plentiful cargo
// JSAI: not needed - oolite-traderAI.js handles exiting if full fuel and plentiful cargo
// [ship switchAITo:@"exitingTraderAI.plist"];
if([ship fuel] == 0) [ship setFuel:70];
// if ([ship hasRole:@"sunskim-trader"]) [UNIVERSE makeSunSkimmer:ship andSetAI:NO];
@ -1521,7 +1521,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
[police_ship setBounty:0 withReason:kOOLegalStatusReasonSetup];
if ([police_ship heatInsulation] < [self heatInsulation])
[police_ship setHeatInsulation:[self heatInsulation]];
[police_ship switchAITo:@"defenseShipAI.js"];
[police_ship switchAITo:@"oolite-defenseShipAI.js"];
[self addShipToLaunchQueue:police_ship withPriority:YES];
defenders_launched++;
[result addObject:police_ship];
@ -1548,7 +1548,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
NSString *defense_ship_key = nil,
*defense_ship_role = nil,
*default_defense_ship_role = nil;
NSString *defense_ship_ai = @"defenseShipAI.js";
NSString *defense_ship_ai = @"oolite-defenseShipAI.js";
OOTechLevelID techlevel;
@ -1684,7 +1684,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
if ([scavenger_ship heatInsulation] < [self heatInsulation])
[scavenger_ship setHeatInsulation:[self heatInsulation]];
[scavenger_ship setGroup:[self stationGroup]]; // who's your Daddy -- FIXME: should we have a separate group for non-escort auxiliaires?
[scavenger_ship switchAITo:@"scavengerAI.js"];
[scavenger_ship switchAITo:@"oolite-scavengerAI.js"];
[self addShipToLaunchQueue:scavenger_ship withPriority:NO];
[scavenger_ship autorelease];
}
@ -1732,7 +1732,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
if ([miner_ship heatInsulation] < [self heatInsulation])
[miner_ship setHeatInsulation:[self heatInsulation]];
[miner_ship setGroup:[self stationGroup]]; // who's your Daddy -- FIXME: should we have a separate group for non-escort auxiliaires?
[miner_ship switchAITo:@"scavengerAI.js"];
[miner_ship switchAITo:@"oolite-scavengerAI.js"];
[self addShipToLaunchQueue:miner_ship withPriority:NO];
[miner_ship autorelease];
}
@ -1831,7 +1831,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
docked_shuttles--;
[shuttle_ship setScanClass: CLASS_NEUTRAL];
[shuttle_ship setCargoFlag:CARGO_FLAG_FULL_SCARCE];
[shuttle_ship switchAITo:@"shuttleAI.js"];
[shuttle_ship switchAITo:@"oolite-shuttleAI.js"];
[self addShipToLaunchQueue:shuttle_ship withPriority:NO];
[shuttle_ship autorelease];
@ -1862,7 +1862,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
[escort_ship setScanClass: CLASS_NEUTRAL];
[escort_ship setCargoFlag: CARGO_FLAG_FULL_PLENTIFUL];
[escort_ship switchAITo:@"escortAI.js"];
[escort_ship switchAITo:@"oolite-escortAI.js"];
[self addShipToLaunchQueue:escort_ship withPriority:NO];
}
@ -1916,7 +1916,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, HPVector coords,
[patrol_ship setPrimaryRole:@"police-station-patrol"];
[patrol_ship setBounty:0 withReason:kOOLegalStatusReasonSetup];
[patrol_ship setGroup:[self stationGroup]]; // who's your Daddy
[patrol_ship switchAITo:@"policeAI.js"];
[patrol_ship switchAITo:@"oolite-policeAI.js"];
[self addShipToLaunchQueue:patrol_ship withPriority:NO];
[self acceptPatrolReportFrom:patrol_ship];
[patrol_ship autorelease];

6
src/Core/Universe.m
View File

@ -2171,7 +2171,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
}
else
{
[ship switchAITo:@"traderAI.js"];
[ship switchAITo:@"oolite-traderAI.js"];
}
if (([ship pendingEscortCount] > 0)&&((Ranrot() % 7) < government)) // remove escorts if we feel safe
@ -2324,7 +2324,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
}
else
{
[ship switchAITo:@"traderAI.js"];
[ship switchAITo:@"oolite-traderAI.js"];
}
}
else if ([role isEqual:@"pirate"])
@ -8174,7 +8174,7 @@ static NSDictionary *sCachedSystemData = nil;
- (void) makeSunSkimmer:(ShipEntity *) ship andSetAI:(BOOL)setAI
{
if (setAI) [ship switchAITo:@"traderAI.js"]; // perfectly acceptable for both route 2 & 3
if (setAI) [ship switchAITo:@"oolite-traderAI.js"]; // perfectly acceptable for both route 2 & 3
[ship setFuel:(Ranrot()&31)];
// slow ships need extra insulation or they will burn up when sunskimming. (Tested at biggest sun in G3: Aenqute)
float minInsulation = 1000 / [ship maxFlightSpeed] + 1;