183 Commits

Author SHA1 Message Date
cim
848e59ce19 Remove Strict Mode
Replace strict mode control with OXP enable/disable control
Display OXP setting on new game ship parade to make it clearer to users why their OXPs aren't loading
Adjust descriptions
Remove all gameplay differences other than OXP loading in strict mode
2013-06-29 10:21:35 +01:00
Marc
d6d9568341 - regression fix: OXPs can show commander 'kills' once again - syntax fits current string expander, though. - fix: language OXPs can now translate thargoid character name & short description, as originally intended.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5674 127b21dd-08f5-0310-b4b7-95ae10353056
2013-05-04 13:05:59 +02:00
Nikos Barkas
afb09f9a7e Here goes another year. Happy 2013. The Reference Sheet and the Readme still need to have year references bumped.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5596 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-31 09:00:28 +00:00
Nikos Barkas
23de81392f Nitcpick: More 'professionally' sounding message when a distant hyperspace destination is selected.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5525 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-23 09:35:07 +00:00
Chris Morris
20b59c9a62 Use station name on F8 screen for non-main stations
Fines only applied at main station


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5517 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-18 20:58:08 +00:00
Chris Morris
603a934fa8 Add interfaces for cargo and passenger contracts. Including:
- API to allow OXPs to insert contracts
 - New customsounds entries for contract acceptance and rejection
 - New choicesKey parameter to make choice unselectable
 - More than 5 contracts viewable at once


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5466 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-01 20:36:08 +00:00
Jens Ayton
99f2065b9b Fully integrated new string expander.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5423 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-12 12:49:55 +00:00
Jens Ayton
6e37e3d15f More fiddling with startup logging.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5417 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 18:33:42 +00:00
Marc
5e11ee5103 * Mass lock/hud internals refactoring part II - boosted various hud elements rendering speed, & hopefully didn't break xcode4 builds - there's more to come...
* disabled the obsolete & unclear AEGIS_CLOSE_TO_PLANET AI message (AEGIS_CLOSE_TO_MAIN_PLANET & CLOSE_TO_PLANET are sent for main & extra planets respectively)
* fixed Aegis status edge case - events & messages should now also fire correctly when moving directly from one oxp planet vicinity to another, plus somewhat streamlined the algorithm.
- assorted minor cleanup: code, comments & blank spaces

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5331 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-16 21:16:25 +00:00
Chris Morris
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens.
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-14 19:49:53 +00:00
Marc
e878d62401 - New feature: contracts that might still be completed, but are now past the estimated departure time, are shown in orange for a while. New translation string added.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5320 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-13 15:54:31 +00:00
Nikos Barkas
8ce944d4df Need for space.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5317 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-11 13:56:58 +00:00
Nikos Barkas
661901f5d6 Made Docking Clearance Protocol a game option (note: one spacer line had to be removed for the SDL builds - werun out of screen space!)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5314 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-10 19:42:30 +00:00
Jens Ayton
e638ea259b Removed vestiges of Groolite; Growl and Notification Center notifications appear above the game anyway in 64-bit now, and fixing Groolite for 32-bit ain't gonna happen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5206 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:47:46 +00:00
Chris Morris
37703e68c3 Change allowPlayerDocking to disallowedDockingCollides (with approximately reversed meaning)
Fix some bugs with player docking clearance in new docking code
Disable logging of "ship could not launch because there aren't any launch docks"


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5130 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-24 16:51:28 +00:00
Jens Ayton
d69513681f Added joystick buttons for target memory.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5123 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-22 22:00:47 +00:00
Chris Morris
34673db0d5 A cornucopia of changes:
- Fix "ghost wormhole" bug most common around zero-distance doubles
 - Fix minor bug in handling of wormhole player carriers
 - Fix display bug with wormholes and sun
 - Fix other minor bugs with wormholes
 - Add "dayChanged" world script event
 - Remove some runaway bounties, and remove some player/NPC distinction in bounty awards
 - Offenders won't call for help, but may still beg for mercy
 - Traders may dump cargo when attacked by NPCs, not just the player (and sometimes they will escape as a result, too)
 - new "long-range-chart-title-N" descriptions.plist entries for individually-named galaxies.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5113 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-20 20:04:02 +00:00
Jens Ayton
2378df9e35 Plist syntax nit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5099 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-16 11:47:00 +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
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
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
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
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
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
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-03 16:08:14 +00:00
Marc
d2922e78d4 More js reset fixes:
- made js engine less likely to stall on reset after player's death.
 - better feedback in case of load game failure due to js issues.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4665 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-28 01:17:03 +00:00
Nikos Barkas
063427c16e Fixed weapon name displayed always as '<position> <type> laser' on the status screen, even after editing it in equipment.plist. As a result, the weapon_name array in descriptions.plist is no longer necessary.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4600 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-19 22:53:46 +00:00
Eric Walch
5013d3c330 - Fixed bug #17997. When very close to the dock, the player now gets a few extra seconds to finish docking or to back off.
- Fixed a bug where the player got docking clearance while there were still ships in the launch queue.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4593 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-11 16:52:16 +00:00
Jens Ayton
54780c3ac8 Fixed a punctuation error.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4522 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-22 17:54:41 +00:00
Jens Ayton
fbaaec461f Fixed credits formatting on game over screen. gameoverscreen-score-@-f is now gameoverscreen-score-@.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4396 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-22 23:46:37 +00:00
Eric Walch
6d1743d8c8 - Spelling corrections.
- Reverted a accidentally committed file

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4394 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-22 20:02:08 +00:00
Marc
188c0f4f35 'Credits' changed to 'credits' in processEscapePods.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4378 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-19 07:40:35 +00:00
Nikos Barkas
c7722133f0 Removed excess punctuation in the Thanks! message, which was causing it to be pronounced as <thanks exclamation>.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4353 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-14 20:21:09 +00:00
Jens Ayton
944ac15e75 Removed unused instance variable key_autopilot_target.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4333 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-12 15:31:49 +00:00
Jens Ayton
79a9d11f29 Changed handling of speech synth Incoming message string to be friendlier to existing localizations.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4332 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-12 14:57:40 +00:00
Marc
40184ebb0c Duplicate strings part II: restored the previous translation strings. Distance and estimated travel time strings can now be overridden globally, or assume separate values depending on which chart is displayed! :)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4211 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-02 09:53:03 +00:00
Marc
62fb7e8aa0 Removed duplicate strings in descriptions.plist (change in translation string name)
Some txt updates (porting & readme_linux in particular might well need to be further updated)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4208 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-01 20:15:52 +00:00
Jens Ayton
bb8ee9280d Work on scriptable number formatting for localization. (If this seems like overkill, you probably haven’t considered the problem in enough detail.) Currently supports integers and credits quantities, and is used for displaying credits quantites in UI.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4112 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-21 01:00:25 +00:00
Jens Ayton
b5a207c598 Comm log messages are now spoken. (Feature request #4970)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4039 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-09 14:18:29 +00:00
Jens Ayton
473e4e5c5e Mac startup messages now reflect reality, and are more fine-grained in debug builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3976 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 17:25:11 +00:00
Marc
cb89afc4d4 Copyright date bonanza! Most - if not all - copyright notices are now updated to 2011.
Minor code cleanup:
- graphically cleaner windows resize for SDL systems.
- world event shipWillExit/ExitedWitchspace now also triggered if the escape capsule is rescued at a different system (via OXP override).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3965 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 02:16:03 +00:00
Jens Ayton
5bf81d659d Joystick code cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3877 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:16:44 +00:00
Jens Ayton
3a463348bb Joystick refactoring.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 14:56:39 +00:00
Nikos Barkas
e14168201a Enabled ability to take snapshot using joystick button assignment.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3844 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-11 21:44:29 +00:00
getafix
f2b95b7606 Added the escape pod entry in the joystick configuration menu,
following to the changes introduced in r3808.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3818 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-15 23:10:31 +00:00
Marc
b3647b67bc escape pods part II:
- player and NPCs can eject at all times now.
- if pod ejected in witchspace, it's game over for the player, unless overridden by oxp.
- if pod ejected in normal space, the player will always reappear at the main station, unless overridden by oxp!
- new worldScript event 'escapePodSequenceOver' to override escape pod behaviour: if at the end of the event player.ship.target is a dockable station, the player will reappear inside it, otherwise game over!
- new translation string: gameover-escape-pod

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3809 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-13 20:10:05 +00:00
Nikos Barkas
f81cfc21ae Implemented the allowsAutoDocking property for stations and made it visible and read/write to scripts. Defaults to YES.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3805 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-12 18:20:22 +00:00
Marc
ec4a512194 * Primable equipment! Use shift-n to select, and n to activate the equipment.
- New primed equipment key in savegames.
- Equipment scripts only respond to the activate event.
- Equipment scripts have access to this.equipmentKey, which contains the equipment type the script is associated to (e.g. 'EQ_WHATEVER')
* More commsMessage stuff:
- new parameter: ship.commsMessage(message [, toShip]) the second - optional - parameter now allows for narrowcast, as opposed to generic broadcast within scanner range - in crowded systems it's faster to narrowcast to a couple of ships, than to just broadcast the message to all ships in range!
- commsMessageReceived event: the ship sending the message is now passed as a second parameter to the event handler.
* new equipmentInfo property: scriptName
* new ship property: isPiloted
* assorted code cleanup...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3799 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-10 21:49:23 +00:00
Michael Werle
c085bcdd2b Autopilot controls revamp, as discussed.
- c now tries to dock either at the players' current target, a nearby station, or the system main station.
 - Shift-C does the same, except attempts a fast-dock if the station allows it.
Added a new key 'allowsFastDocking'. Defaults to YES for the system main station, and NO to all other stations.
 - Shift-D is no longer used.
Also, autopilot will no longer engage on Condition Red.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3783 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-28 19:55:35 +00:00
Nikos Barkas
8f6c69079f Weapons online/offline toggle control can now be assigned to joystick button too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3776 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-22 22:30:09 +00:00