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

brought up to date with oolite r644 - fixing a bug when buying military lasers and adding the 'Cargo Holds Full' message

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Giles Williams 2005-04-20 13:25:34 +00:00
parent 0f46e9f10c
commit ca9a24718d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PlayerEntity.m
View File

@ -4328,6 +4328,12 @@ static BOOL toggling_music;
- (void) interpretAIMessage:(NSString *)ms
{
if ([ms isEqual:@"HOLD_FULL"])
{
[boopSound play]; [beepSound play];
[universe addMessage:[universe expandDescription:@"[hold-full]" forSystem:system_seed] forCount:4.5];
}
if ([ms isEqual:@"INCOMING_MISSILE"])
{
[warningSound play];
@ -6586,9 +6592,10 @@ static int last_outfitting_index;
credits += [universe getPriceForWeaponSystemWithKey:@"EQ_WEAPON_MINING_LASER"];
break;
case WEAPON_MILITARY_LASER :
credits += [universe getPriceForWeaponSystemWithKey:@"EQ_WEAPON_MILITARY_LASER"];
credits += [universe getPriceForWeaponSystemWithKey:@"EQ_WEAPON_MILITARY_LASER"];
break;
case WEAPON_THARGOID_LASER :
credits += [universe getPriceForWeaponSystemWithKey:@"EQ_WEAPON_THARGOID_LASER"];
credits += [universe getPriceForWeaponSystemWithKey:@"EQ_WEAPON_THARGOID_LASER"];
break;
case WEAPON_NONE :
break;

5
descriptions.plist
View File

@ -514,6 +514,11 @@
<array>
<string>Not enough energy to activate cloaking device.</string>
</array>
<!-- holds full -->
<key>hold-full</key>
<array>
<string>Cargo holds full.</string>
</array>
<!-- Assorted messages sent out by ships etc.. -->
<!-- %H - homeworld
%I - homeworld+ian