Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,462 Commits 1 Branch 0 Tags
Commit Graph

4462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
9e4f5f4cb3 - The used cargo space is now shown in the long description on the equipment screen. 
- The thargoid plans mission now updates the time when awarding equipment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4908 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 15:18:45 +00:00
Jens Ayton
451525e3dd Removed some obsolete Core Audio debug code, added a state dump where I'm seeing intermittent errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4907 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:30:38 +00:00
Jens Ayton
60f04a0867 Tweaked some Xcode file attributes and added terminal line breaks to make Unix tools happy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4906 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:18:58 +00:00
Eric Walch
a8e966ea57 - the equipment key: requires_cargo_space now actually uses cargo space for that equipment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4905 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:14:19 +00:00
Chris Morris
652f414ff7 Revert aft_weapon damage change for Thargoid lasers; thanks Commander McLane. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4904 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 07:49:42 +00:00
Eric Walch
86bc4b2c36 - Added RESTARTED messages to some of the AIs that use the new fleeQMineAI to prevent leaving the ships idle. 
- also added the q-mine warning inside becomeEnergyBlast so that custom q-mines also give a warning, albeit later.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4903 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-03 20:34:19 +00:00
Nikos Barkas
7183c5f2ef Fixed lack of fuel scoop sound bug, at the same time attempting to fix the 'laserover-laserover' sound repetition issue. Thanks to Svengali for providing the code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4902 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-03 12:14:53 +00:00
Eric Walch
4500f5fa79 - Fixed a typo for the Mac compiler and added the 2 new AIs to the mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4901 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 21:28:08 +00:00
Chris Morris
3adc3ec460 Make JS returned types for passengers and contracts arrays match the docs. 
Thanks to Capt. Murphy for spotting this one.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4900 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:44:12 +00:00
Chris Morris
052f596e61 Improvements to (mostly Thargoid) AIs 
Bug fixes:
1) Giving a ship an aft Thargoid laser and a forward Thargoid laser
   now has a different effect to giving it just a forward Thargoid
   laser. (It gives it double attack power with its laser; use sparingly!)
2) Thargoid laser rate of fire no longer depends on the frame rate.

AI upgrades:
1) Pilots with fear will attempt to flee from Q-Mines at top speed
2) Pilots without fear will attempt to blow up Q-Mines, then avoid the
   cloud if unsuccessful.
3) Ships with a Thargoid laser fitted will use the fact that they have
   an omnidirectional laser to their advantage in combat.
4) Ships with multidirectional weapons (thargoid lasers, plasma
   turrets) can now track multiple targets with those weapons, which
   need not be the primary target, and use these weapons as point
   defense. New AI commands have been added for optimal use of point
   defense, but even old AIs will do reasonably well.

New AI commands:
1) "addPrimaryAggressorAsDefenseTarget"
2) "addFoundTargetAsDefenseTarget"
3) "findNewDefenseTarget"
4) "clearDefenseTargets"

New AI alerts:
1) DEFENSE_TARGET_LOST
2) DEFENSE_TARGET_DESTROYED
3) CASCADE_WEAPON_DETECTED


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4899 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:08:54 +00:00
Chris Morris
c4ac34bd44 Update reference sheet: 
- diamond icon for nav buoy
- note energy bomb is strict mode only
- correct ship dimensions
- fix a few typos


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4898 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:05:19 +00:00
Nikos Barkas
f35eea123d Added timer to the contributors' list - credit for implementation of Berlios request 5496. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4896 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 12:32:22 +00:00
Nikos Barkas
e390aa112c Fixed typo from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4894 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 21:49:45 +00:00
Nikos Barkas
a74e228d90 Fixed Nav Array not showing distance and time information when target system was selected by using the Find Planet method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4893 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 21:46:15 +00:00
Chris Morris
1e3f4e3665 Fix bug with resetting of passenger contracts on ship change 
(trunk and maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4892 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 19:02:22 +00:00
Nikos Barkas
3e8e768065 Added JS PlayerShip read-only property laserHeatLevel. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4891 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 18:04:27 +00:00
Nikos Barkas
b0375084db Feature request 5496 is now in for developers' tests, has to be manually enabled (make FEATURE_REQUEST_5496=yes). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4890 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 17:44:39 +00:00
Chris Morris
b506a87264 player.ship.price and player.ship.serviceLevel read-only 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4889 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 13:57:56 +00:00
Chris Morris
7a5543f487 ship.dataKey read-only attribute to make player.replaceShip more practical 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4888 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 13:16:33 +00:00
Chris Morris
ddeb52eb8a Cap energy damage explosion range (legacy and script) to SCANNER_MAX_RANGE 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4887 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-27 21:19:30 +00:00
Chris Morris
a11f1ca551 Clean up system populator function (mainly making comments match functionality and removing obsolete code) 
Make rock hermit clusters more likely to be large clusters


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4886 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-27 21:10:39 +00:00
Chris Morris
06f1f340be Replacing ships with script also triggers playerBoughtNewShip 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4885 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-26 21:52:17 +00:00
Chris Morris
919fa44134 Adjust experimental missile damage calculations. Collision velocity calculation 
is improved, and velocity component of damage is capped. Thanks to Switeck for test results on previous version.
Also clarify equipment.plist comments


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4884 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-26 21:37:49 +00:00
Chris Morris
be5d0e26a8 - Laser setting API now takes any valid equipmentInfoExpression 
- Laser setting API now works fore and aft for NPCs


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4883 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-25 19:03:08 +00:00
Eric Walch
ad4e2394f1 Only allow TAF changes when FPS values are on display. This to minimise the chance of accidentally changing TAF. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4882 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-25 15:54:32 +00:00
Chris Morris
956c294404 EXPERIMENTAL: ship and weapon replacing from script. 
Currently API is
 - player.replaceShip("adder-player");
 - player.ship.aftWeapon = "EQ_WEAPON_MINING_LASER";
This may change in future, but should be enough to test underlying functionality.
NPC ship weapons cannot yet be altered this way.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4881 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-24 20:12:31 +00:00
Chris Morris
4d72c0d45c Make gamma correction check less cautious. Works for me, but perhaps it should disable gamma settings anyway? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4880 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-24 20:10:00 +00:00
Nikos Barkas
71d1c96c6d Moar range for gamma setting. Now from 0.2 to 4.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4879 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 17:15:22 +00:00
Nikos Barkas
6f88ef38f3 A bit of cleanup on previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4878 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 15:17:44 +00:00
Nikos Barkas
bfd7f90ffb Implemented gamma control for SDL builds. Started including code for Berlios request 5496. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4877 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 14:54:38 +00:00
Marc
7d28ce89c5 - fix/change: when loading a game with more cargo than cargo space, the extra cargo is removed. 
- replaced 'magic numbers' cargo rounding up values (500 & 500000) using the CARGO_KG_ROUNDUP constant.
 - yet more code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4875 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-22 11:55:14 +00:00
Chris Morris
64d9f1a645 equipmentRepaired also fires if awardEquipment is used to repair. Thanks to Wildeblood for pointing out this extra path. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4874 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-22 11:36:25 +00:00
Chris Morris
a48c4dfee0 Add equipmentRepaired worldscript event 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4873 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 21:53:02 +00:00
Eric Walch
4038d0a9ec - experimentel, harder hardMisileAI. Does not explode when target cloaks, but instead travels to the spot were target cloaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4872 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 19:52:36 +00:00
Marc
d9dd8ad3f9 - fix: savefiles with wrong passengers and/or passengers berths data are now handled a bit better. (maintenance & trunk) 
- after proper evaluation, reversed rev4866. passenger berths cargo space displacement fixed at 5 tons.
 - assorted code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4871 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 18:09:37 +00:00
Chris Morris
768d3c8007 Fix bug where equipment depending on currently damaged equipment would be silently removed from the player's ship on game load 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4870 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 17:38:30 +00:00
Jens Ayton
3b186ddbad Fixed a sign error, and cleaned up cargo capacity logic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4869 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 17:14:59 +00:00
Chris Morris
11f70da5f7 Adjust missile damage to account for relative velocity. 
Exact values in oolite-missile.js are provisional and may need to be adjusted after wider testing.
Should get the best of both low and high frame-rate behaviours when it's finished.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4868 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 12:12:05 +00:00
Eric Walch
b58d393c25 - size check for launching ships no longer happens on launch, but when adding on the launch queue so that launching scripts return null for them. 
- police, interceptor and thargoid scan_class is now always forced into the default scan_class for them unless auto_ai is false and they have a scan_class defined.
- added a pilot to populator added thargoids. Script added thargoids always had them already. Only reason for this is that piloted ships use collision avoidance behaviour.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4867 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 08:09:23 +00:00
Marc
672e33b2e8 - change: required space quantity set inside equipment.plist is now used when adding/removing passenger berths to the player's ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4866 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 22:34:22 +00:00
Jens Ayton
1c961e520a Static analyzer placating, adjacent cleanup, and fix of a leak of virtual planets for material preloading. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4865 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 17:30:39 +00:00
Jens Ayton
4102e8dcee Typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4864 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 17:14:43 +00:00
Eric Walch
01a3b5c29b added cim's new missile script also to mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4863 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 07:32:19 +00:00
Chris Morris
287689914d Add Svengali's shipScoopedFuel event (feature request #5497) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4862 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 20:54:23 +00:00
Chris Morris
590b2b407f Better way of setting and calculating missile damage 
- revert r4853 changes to dealEnergyDamageAtDesiredRange
- instead, introduce ship.dealEnergyDamage(damage,range)
- apply new function to stock missiles, change default ship script for missiles


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4861 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 20:05:30 +00:00
Marc
d5d43d0f0a Undoing previous commit. shipTakingDamage was already working as intended as per forum thread: http://www.aegidian.org/bb/viewtopic.php?f=4&t=11853 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4860 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 10:33:23 +00:00
Marc
f229dcd87c - fix: shipTakingDamage event only fires when sustaining damage, as intended. (trunk & maintenance) 
- code cleanup!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4859 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 10:22:59 +00:00
Marc
d199b2162f - got shipReleasedEquipment to work properly 
- experimental tweak: cloaking behaviour should now be identical between player & NPCs
- comment cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4858 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-18 23:03:50 +00:00
Chris Morris
0a2590e5f0 - Revert changes to station beacons 
- Change beacon ASC symbol to diamond for easier centring


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4857 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-18 16:33:04 +00:00
Chris Morris
30d06dcbe5 Bugfix: target system memory expansion shouldn't try to restore locks on cloaked ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4856 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-15 21:24:20 +00:00