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

Updates to Changelog and spelling corrections

Browse Source
This commit is contained in:
phkb 2017-06-04 14:35:59 +10:00
parent 412349ffe9
commit 6637f9b33e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/CHANGELOG.TXT
View File

@ -28,6 +28,8 @@ Scripting:
* player.ship.nextSystem property * player.ship.nextSystem property
* player.ship.compassType read/write property (use with caution) * player.ship.compassType read/write property (use with caution)
* player.ship.massLockable property * player.ship.massLockable property
* player.ship.addCargoEntity(cargoEntity) method allows cargo ship entities
to be added to the player ship directly when in space.
* station.canDockShip(shipEntity) method * station.canDockShip(shipEntity) method
* playerDockingClearanceGranted world event * playerDockingClearanceGranted world event
* playerDockingClearanceCancelled world event * playerDockingClearanceCancelled world event

6
src/Core/OOShipRegistry.m
View File

@ -1578,13 +1578,13 @@ static NSString * const kVisualEffectDataCacheKey = @"visual effect data";
fireRate = [declaration oo_floatForKey:@"fire_rate" defaultValue:-1.0f]; fireRate = [declaration oo_floatForKey:@"fire_rate" defaultValue:-1.0f];
if (fireRate < 0.25f && fireRate >= 0.0f) if (fireRate < 0.25f && fireRate >= 0.0f)
{ {
OOLogWARN(@"shipData.load.warning.turret.badFireRate", @"ball turret fire rate of %g for subenitity of ship %@ is invalid, using 0.25.", fireRate, shipKey); OOLogWARN(@"shipData.load.warning.turret.badFireRate", @"ball turret fire rate of %g for subentity of ship %@ is invalid, using 0.25.", fireRate, shipKey);
fireRate = 0.25f; fireRate = 0.25f;
} }
weaponRange = [declaration oo_floatForKey:@"weapon_range" defaultValue:-1.0f]; weaponRange = [declaration oo_floatForKey:@"weapon_range" defaultValue:-1.0f];
if (weaponRange > TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR) if (weaponRange > TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR)
{ {
OOLogWARN(@"shipData.load.warning.turret.badWeaponRange", @"ball turret weapon range of %g for subenitity of ship %@ is too high, using %.1f.", weaponRange, shipKey, TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR); OOLogWARN(@"shipData.load.warning.turret.badWeaponRange", @"ball turret weapon range of %g for subentity of ship %@ is too high, using %.1f.", weaponRange, shipKey, TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR);
weaponRange = TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR; // approx. range of primary plasma canon. weaponRange = TURRET_SHOT_RANGE * COMBAT_WEAPON_RANGE_FACTOR; // approx. range of primary plasma canon.
} }
@ -1592,7 +1592,7 @@ static NSString * const kVisualEffectDataCacheKey = @"visual effect data";
if (weaponEnergy > 100.0f) if (weaponEnergy > 100.0f)
{ {
OOLogWARN(@"shipData.load.warning.turret.badWeaponEnergy", @"ball turret weapon energy of %g for subenitity of ship %@ is too high, using 100.", weaponEnergy, shipKey); OOLogWARN(@"shipData.load.warning.turret.badWeaponEnergy", @"ball turret weapon energy of %g for subentity of ship %@ is too high, using 100.", weaponEnergy, shipKey);
weaponEnergy = 100.0f; weaponEnergy = 100.0f;
} }
} }