890 Commits

Author SHA1 Message Date
Jens Ayton
6a52ff134f Prefixing applies to us, too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5078 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-12 11:55:33 +00:00
Chris Morris
b56e4acb72 Add allow_player_docking property
Add a virtual dock subent to stations without dock subents. Proximity docking should now work as before


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5077 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-12 11:27:54 +00:00
Chris Morris
2e0ee4070a More docking changes:
- allocate launch queues better when incoming ships
 - player only blocks allocated queue now
 - fix clearance messages
 - allow bays to be named; include bay names in messages (if >1 dock)
 - allow bays to be marked launch-only / dock-only. Still some bugs in this bit 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5062 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-10 22:04:52 +00:00
Chris Morris
ae014d1496 Expose individual weapon mount temperatures (readonly!) to script for both player and NPC
Move laserHeatLevel from PlayerShip to Ship


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5047 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-04 21:08:38 +00:00
Jens Ayton
b7ccf80512 [Mac] Updated game icon and splash screen for retina displays.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5015 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-16 17:51:05 +00:00
Chris Morris
000ff5c546 Remove debug lines mistakenly left in last commit
Add 'alertCondition' as an NPC shader property


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5012 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-16 12:01:17 +00:00
Jens Ayton
899d9e42b6 Gave myself top billing. (But no I want to implement kerning.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5010 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-15 21:49:04 +00:00
Chris Morris
48e2a103bb weaponRecoveryTime (for shaders, mimics 1.76 laserHeatLevel behaviour for NPCs)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5003 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-11 19:17:30 +00:00
Jens Ayton
bc38ee7621 Disabled half-baked material synthesizer.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5001 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-10 17:09:03 +00:00
Nikos Barkas
d833c9fb31 Small typo fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4998 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-08 17:20:13 +00:00
Chris Morris
9f22081e2b Wormholes:
- set wormhole exit speed to 25% max ship speed
- add small perpendicular displacement to ships following the leader
- special case treatment where player is both following and being followed
- activate Eric's wormhole positioning code now it is safe to do so

AI:
- fix bug in stick refactoring causing problems with pitch and missile tracking
- tone down in-combat injector usage (fleeing still at full speed)
- tune "back off for another attack run" behaviour
- increase general laser accuracy for combat (though still not as high as 1.76, to compensate for overheating changes)
- apply SIX and TWELVE behaviour to bad pilots not good pilots
- make sure the Constrictor always has positive accuracy 0-5


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4989 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-06 10:02:31 +00:00
Jens Ayton
8e342317fe Fixed some out-of-date version and copyright strings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4965 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-27 16:33:21 +00:00
Eric Walch
cea95deb2d - Changed 'setDestinationToJinkPosition' slightly to give a faster pitch reaction.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4958 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-25 21:24:22 +00:00
Chris Morris
84f3278234 Add weapon_facings property to shipdata.plist (optional, default 15)
Prevent (and remove existing) weapons on player ships not allowed by weapon_facings
Move weaponFacings JS property from PlayerShip to Ship
Prevent addition of weapons to NPC ships not allowed by their weapon_facings


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4957 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-25 20:11:01 +00:00
Eric Walch
0167b32938 - Added a new AI command 'setDestinationToJinkPosition'
- Updated several AIs with reaction to cloaked attacks.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4954 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-22 20:06:21 +00:00
Chris Morris
7ec9ba3211 Add side weapon points to NPCs.
- automatically used sometimes in combat if weapons fitted
 - performBroadside AI command to force use if fitted
 - JS properties added for NPC ships
 - shipdata.plist properties added (no core ship uses them, of course)
 - works better if you fit the same weapon to each side, but it can cope...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4949 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-20 15:59:44 +00:00
Eric Walch
27bb46cacd - Added two new AI commands: 'storeTarget' and 'recallStoredTarget'
- Used both commands in pirate and missile AI for a better reaction on cloaked targets.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4941 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-16 12:46:14 +00:00
Chris Morris
9b0ac9af4c Add damage_probability property to equipment.plist (and damageProbability to JS view)
Always effectively zero for pylon equipment.
Otherwise equipment to be damaged will be picked on algorithm like ship roles.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4938 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-14 19:52:45 +00:00
Eric Walch
6486df01b7 - Fixed compiler error on macs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4915 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-08 07:54:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
5e0136ab7b - Take out ship.setBeacon in favour of making ship.beaconCode writable.
- Prevent writing of mainStation beacon.
- Change way that station beacon is handled with ASC - rather than having the compass point at the buoy, just make the main station beacon visible anywhere in the system.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4855 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-15 19:19:23 +00:00
Eric Walch
14ec5bedc9 No longer shuttle launches from additional planets without nearby stations.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4852 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-14 20:58:44 +00:00
Chris Morris
3c91e03e9e playerBoughtCargo and playerSoldCargo world events
Also add commodity-name translations for the modern names for multi-word goods


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4851 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-14 18:46:30 +00:00
Eric Walch
79b17ebcef Added
- new behaviour BEHAVIOUR_LAND_ON_PLANET that takes care of the whole landing and removal.
- AI command: performLandOnPlanet. Works only very close (500 meters) to the planet surface were APPROACHING_SURFACE has be send. Otherwise returns: NO_PLANET_NEARBY
- ship event: shipLandedOnPlanet(planet)
- changed the old AI message LANDED_ON_PLANET from normal to reactToMessage.  The normal one never triggered because of ship removal in the same update.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4844 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-13 07:43:38 +00:00
Chris Morris
07d419950b Label elements of system_description to make lookups easier for human OXP writers
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4839 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-10 19:46:44 +00:00
Marc
b353faef84 A mixed bag:
* change: specifically setting empty comms_log_gui & message_gui sections inside hud plists now resets those guis to Oolite's default. Updated standard huds accordingly.
 * bugfix: fixed crash with malformed gui declarations inside hud plists - trunk & maintenance.
 * change: internal name of commodity identifiers normalised: 'liquor/wines', 'alien items', 'gem-stones' are now expressed internally as 'liguor_wines', 'alien_items' and 'gem_stones' - in most cases the old identifiers are still recognised, for backward compatibility.
 - linux build and windows build directories separated, both can now share the same source directory without build conflicts.
 - updated copyright notice in shaders files, minor planet drawable cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4826 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-01 13:27:36 +00:00
Eric Walch
2c2e3b416a - the restored planet shader files from r4818 now also work on mac builds
- escorts launching from stations, now correctly have their mothers scanClass

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4825 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-01 09:59:08 +00:00
Marc
ed00bda834 Steady lasers partI!
- Shot lasers don't lag behind any more when the player's ship is moving at speed.
- Readjusted position for cobra3 side lasers, to avoid the now noticeable 'laser crosses'.

minor comment rewording.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4821 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-30 16:43:53 +00:00
Marc
baf5830463 - restored NEW_PLANETS shader files.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4818 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-28 22:11:06 +00:00
Eric Walch
cb9e2a2cee - On scooping the cloak, the cloak now becomes repairable in tech level 15 systems.
- Improved the docking approach when arriving from the backside of a station.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4800 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-10 15:19:44 +00:00
Eric Walch
bb50cc8433 - takeSnapShot() is excluded from the timelimiter.
- scooping constrictor pilot without killing the ship no longer gives a success message.
- activating a "becomeEnergyBlast" or "becomeExplosion" within a shipDied event, no longer triggers a new shipDied event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4794 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-04 16:04:45 +00:00
Jens Ayton
a106f4055f Shader synthesizer: light maps can now be controlled by bindings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4793 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-26 17:08:49 +00:00
Jens Ayton
df1412c57b Shaving the yak fantastic.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4773 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-11 15:53:58 +00:00
Eric Walch
6fd5701273 - added two AI commands: setTargetToRandomStation and setTargetToLastStation.
- setTargetToRandomStation will select a random station from all stations within 'desiredRange'. Carriers and stations without npc_traffic are excluded. It returns "NO_STATION_IN_RANGE" or "STATION_FOUND"
- setTargetToLastStation sets the primary target to the last selected station. It returns "NO_STATION_FOUND" when the last station lo longer exists.
- Updated the route1traderAI.plist so that ships with bounty no longer go to the main station as default but start looking for a random station.

- Bugfix: Activating the fuel injector while deceleration from torus speed, no longer drops the speed immediately to max-injector speed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4770 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-08 19:45:39 +00:00
Jens Ayton
dce3f842ce Fixed normal and parallax mapping with shader synthesizer. Player Cobra 3 is temporarily pink while using synthesizer.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4765 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-08 00:34:07 +00:00
Jens Ayton
5377668ea8 Restored energy bomb compensation and made energy bomb strict mode only again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4755 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-31 19:17:45 +00:00
Eric Walch
fd073849fe - Ships that have a specific commodity defined as cargo, no longer get their bounty reduced to 10% when the pilot ejects.
- The scoop icon now correctly shows a full cargo hold when special cargo is transported.
- Added code that points the ships towards the station during stationkeeping. Main reason is that the player has something to watch when waiting.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4744 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-18 21:41:37 +00:00
Jens Ayton
deb8b846be Cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4741 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-18 15:23:11 +00:00
Jens Ayton
121f6ef237 Slightly simplified default fragment shader now that we don't need to worry about Mac OS X 10.4 compatibility.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4739 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-16 18:53:56 +00:00