817 Commits

Author SHA1 Message Date
Nikos Barkas
b092420e51 Added default values for hud alpha, target sensitive reticle and cloak indicator on status light in hud-small.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2806 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-29 20:47:23 +00:00
Marc
da4b70efa5 * missiles part II: no more quantum NPC missiles - they still use the same criteria as before, but they're created with the ship, instead of immediately before launch.
* max_missile now applies to NPC ships too.
* fix: corrected a mistake affecting setEquipmentStatus.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2797 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-29 07:17:00 +00:00
Jens Ayton
5675e4a911 Ressurected worms (oops)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2789 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-28 14:03:04 +00:00
Nikos Barkas
101813d321 Fixed an error in shipdata.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2788 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-28 11:13:48 +00:00
Jens Ayton
531dcc10bc Cleaned up contours of various models using a mix of smoothing groups and normal tweaking, use materials rather than duplicate models for identical ships with different textures, deleted obsolete models, some like_shippage in shipdata.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2787 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-27 23:52:27 +00:00
Jens Ayton
76e3295f3a Set Asp's likely_cargo to 0, as its max_cargo is 0. While I was at it, cleaned up Asp's contours using smooth groups, and like_shipified its shipdata entry.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2785 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-27 15:18:54 +00:00
Marc
472b08f9af - fix: no more mission.runScreen flight related crashes.
- more js missions cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2783 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-26 02:32:12 +00:00
Nikos Barkas
c2edf2238f Fixed a typo in whitelist.plist and removed references to methods removed in previous commit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2781 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-24 21:15:40 +00:00
Jens Ayton
9bbc3845c1 Fixed questionable use of release in launchIndependentShip:, and moved some trivial aliases of launchIndependentShip: into whitelist aliasing mechanism.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2780 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-24 18:37:41 +00:00
Marc
bf23119d18 - mission.setInstructionsKey fix (the global prefix implementation would not be able to tell which oxp it was called from)
- yet another windows DEP fix. There's something inside OOJSScript that windows doesn't like.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2770 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-20 15:27:11 +00:00
Marc
3a92c0f7d1 - minor tweaks to missions, reworded one nova screen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2762 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-19 02:31:04 +00:00
Marc
116d83f955 missionScreen RFC part III
* yet more RFC bugfixes, there were quite a few not-quite-right bits, I _think_ I got all of them now...
* added titleKey as a mission.runScreen parameter, for use with missiontext.plist
* updated all internal missions to use the new mission API, some mission keys normalisation.
* fully tested & fixed both nova & trumbles missions.
* proper fix: no save when the sun is going nova!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2759 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-18 21:58:32 +00:00
Marc
f7affbc01a MissionScreen RFC part II:
* missionScreenOpportunity now fires up after loading a savegame & at startup, as well as after docking.
* fixed a mission callback related crash.
* fixed clash with fines and mission screens.
* name change for new mission.runScreen parameter shipModel: is now showModel.
* the foreground & background images now display correctly in relation to the spinning demo ship.

- code cleanup
- added missing keys to the shipdata entry schema


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2758 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-17 18:27:11 +00:00
Jens Ayton
31ae47c6f4 Fix for bogus is_template warning in verifier. Changed scanClass to scan_class in shipdata.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2755 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-16 23:53:13 +00:00
Marc
7bb627586f * New mission.setInstructions to go with mission.setInstructionsKey, analogous to the mission.addText / mission.addTextKey pair.
* mission RFC part I. Initial implementation of the changes proposed in the forum. Will need tweaking.
* added new parameters to mission: title & foregroundImage (identical to backgroundImage atm)
* assorted code tidying up.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2750 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-15 00:24:23 +00:00
Eric Walch
9d963a50b1 - Limited wormhole size in nova systems.
- Added scoop positions to all ships that can have fuel scoops.
- Raised asteroid and boulder density to 5. (To discourage boulder ramming)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2748 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-14 22:40:43 +00:00
Eric Walch
8119a48c8b - Corrected bug in the 2 second AI delay for station launches
- Corrected escortAI.plist so it now follows their mother better after a station launch

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2741 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-14 13:19:26 +00:00
Eric Walch
d7c3922fba - Corrected delay in: sendAllShipsAway.
- Corrected key for hostile messages in dockingClearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2740 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 21:25:32 +00:00
Jens Ayton
31a5c76622 sunSkimExitAI fixes: ATTACK_SHIP no longer tries to go to non-existent state HEAD_AWAY_FROM_PLANET on victory; it and FLEE instead go to a state that chooses between restarting and exiting based on current energy level.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2739 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 18:15:27 +00:00
Jens Ayton
d76d50eb1d minerAI now goes to FLEE rather than non-existing ATTACK_SHIP if attacked in DOCK_WITH_STATION.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2737 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 17:18:56 +00:00
Jens Ayton
bd634a4237 Excluded BEHAVIOUR_ATTACK_MINING_TARGET from hasHostileTarget.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2736 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 16:23:01 +00:00
Jens Ayton
578a0f351f AI graphing now handles setAITo: and switchAITo:. TODO: handle returns from setAITo: and hyperspace. Also removed some redundant AI states/handers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2735 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 12:09:54 +00:00
Jens Ayton
07902c2b70 Whitelisted setPrimaryRole: for AIs, and made setStateTo: a normal method.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2734 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-11 15:24:34 +00:00
Eric Walch
fd2789fa7a Added two new properties to ship:
* maxThrust  (read-only)
* thrust (read/write for npc, read-only for player and clamped between 0 and maxThrust)
Fixed bug with ships flying out of range when attacking with rear military laser.
Changed miner and scavenger AI to not get lost when flying out of a station scanner range.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2726 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-07 11:21:04 +00:00
Nikos Barkas
bde26b04df Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-06 16:32:58 +00:00
Marc
03a1728895 - Applied pv4's patch to trunk, with modifications.
* ship.target = null now works as expected.
* adding trumbles to a ship has now got variable chance of working, depending on how many trumbles are already on board. Always works with 0 or very few trumbles.
- more cleanup: removed a windows compile warning, added a possible freeBSD bugfix, updated a js comment & autoindented Universe.m

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2720 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-04 20:57:11 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-03 17:36:18 +00:00
Eric Walch
d80f8a1bfd Added a AI command "setThrustFactorTo:" Re-added the group feature for missiles with Thargoid scanclass after having seen some friendly fire going on between a thargoid and a tharglet.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2713 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-27 17:27:33 +00:00
Nikos Barkas
84800c9134 Allow break pattern model to be specified externally. This works similar to the docking clearance: The default is set in the 'universal' section of planetinfo.plist under the 'default_breakpattern_model' key and is used for both hyperspace and docking pattern. Docking pattern can be overriden for each station by setting the key 'docking_pattern_model' in its shipdata.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2684 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-20 20:28:12 +00:00
Marc
228ae5a9f5 - change: hyperspace tunnel colour now scriptable from inside planetinfo.plist
- comment cleanup inside constrictor hunt.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2681 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-18 19:30:31 +00:00
Nikos Barkas
48416ff810 Committed Svengali's converted-to-OpenStep-format plists. Now all core resources property lists should be in OpenStep format. Added Svengali to contributors list.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2675 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-16 16:05:12 +00:00
Eric Walch
93ba473d78 fixed sanity check confusion with docked station during firing the playerWillDockStation. Now all places that lose a target while tracking targets will send a noteLostTarget and will go into performIdle. When noteLostTarget was called without a target, it still will notify the ship about losing a target.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2673 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-15 17:09:38 +00:00
Michael Werle
8abfd996a4 Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-12 21:22:01 +00:00
Jens Ayton
233dd3131e Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-10 22:36:17 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-10 12:23:24 +00:00
Michael Werle
7bb913afe0 - Tweaked new docking-clearance-request-updates messages as discussed.
- Renamed docking-clearance resource strings to be more consistent.
- Fixed slow-gpus plist; it was causing exceptions in MacOS


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2647 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 20:26:02 +00:00
Marc
9e27ce2410 - restored commodities.plist as it was before my testing...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2643 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 18:00:41 +00:00
Marc
a7c2cd2578 - hopefully last tweak to the way available cargo is computed...
- tidied up some warnings, and added a test condition against changing cargo values when Special Cargo is in use.
- corrected a silly mistake in the manifest commodity setter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2641 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 16:12:50 +00:00
Marc
47f9f2c920 * corrected manifest miscount when ship in flight.
* last change to player.ship.manifest: manifest.food & similar are now read/write manifest quantities. Internally all commodities are now going to be referenced by the canonical identifiers, commodities.plist still overrides the displayName - the .manifest.list array is unchanged, and still read-only.
* renamed 2 ship properties for consistency: ship.availableCargoSpace & ship.cargoCapacity now become ship.cargoSpaceAvailable & ship.cargoSpaceCapacity.

- more code tidying.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2637 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 09:09:08 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-05 13:13:06 +00:00
Eric Walch
55e21608d2 Scooping cargo no longer pushes 3 times an AI on stack. When previous scooped cargo is dumped or released after an explosion, it now continues in the AI were it was interrupted. This will mainly benefit escape-pods that continue flying home.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2627 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 12:49:09 +00:00
Marc
5ee5e3479e * New: ship.maxMissiles read only property. NB: NPCs always return the current number of missiles on board, due to current underlying engine limitations.
* Change: load failure prefix string altered to avoid the silly sounding 'Saved game failed to load. Could not load file.' That now reads 'Failed to restore saved game. Could not load file.': half as mysterious! :)

* Game Over fixes:
- after game over, Oolite now restores the last saved game. 
- there should be no more 'xyz broken equipment' messages after dying now.

I'm fairly sure I haven't broken anything there, but will port to maintenance after some more testing.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2616 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-28 15:06:18 +00:00
Marc
560e5501b1 * Autosave fixes ( trunk & maintenance ):
- no more autosave immediately after a restart.
- removed duplicate screen message during autosave.
- autosaved commander name is now 'CommanderName (autosave)' instead of 'autosave' as before.

* Trunk:
- changed the name of the autosave description key inside plist.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2609 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 03:10:39 +00:00
Marc
b132eb31fd * Fixed the NEU availability issues once again. Please don't un-fix.
* Fix for the last-ever-I-promise graphic glitch with find system on the long range map. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2599 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 17:06:51 +00:00
Eric Walch
5e8ee68a8f Added a "messageMother: ESCORT_ATTACKED" to the escort AI for escorts busy escorting. Added a response to this message for mothers in ATTACK mode to selectively release escorts.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2595 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 14:50:28 +00:00
Jens Ayton
0889ca77a4 Minor tidying up.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2592 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 13:25:19 +00:00
Marc
a0a1b592c2 Trunk:
* any found system in galaxy map is now restored properly from save games.
* various found system bugfixes.
* corrected new nova mission string typo.

Maintenance & Trunk:
* friendlier handling for missing ']' in expandDescription: will return the unexpanded string instead of nil, plus warning integrated better with logcontrol.plist

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2590 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 12:38:47 +00:00
Jens Ayton
3a35a277ed Scavengers no longer try to switch to non-existent ATTACK_SHIP state when attacked during docking.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2582 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-23 16:58:10 +00:00
Jens Ayton
e390b42dbe Made buoys shinier, because I can.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2572 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-21 22:46:36 +00:00
Nikos Barkas
b278fc15f3 Fixed missing planet name in Constrictor mission.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2571 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-21 22:34:51 +00:00