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

97 Commits

Author SHA1 Message Date
Jens Ayton
fa23e7bc11 Set max_missiles to 4 for NPC cobra3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4454 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 20:53:53 +00:00
Jens Ayton
54d5c4b350 Breakpattern entity reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4266 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 19:09:22 +00:00
Eric Walch
cdea79b71c - Excluded the kZeroVector as missile_launch_position because it hangs Oolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4234 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 12:13:05 +00:00
Eric Walch
687f4be4d0 _ Corrected the missile_launch_position for thargoids and added an error message for other oxp ships with similar wrong positions, while ignoring the faulty positions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4219 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 11:19:49 +00:00
Jens Ayton
37c5982f4a Added counts_as_kill shipdata key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4143 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-24 18:14:01 +00:00
Eric Walch
506770ba27 - better role checking for ships starting to escort. No check for role, but for primaryRole. Should prevent ships being escorted by wrong ships. (It use to be this way in older Oolite versions before 1.72?) 
- translated some flashers to the new subentitie definition, allowing the viper flashers to be initially off.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3819 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-16 16:34:32 +00:00
Eric Walch
85b8f95c8e - Corrected two dodo flashers that were out of phase, as noticed by Commander McLane 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3811 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-14 10:05:47 +00:00
Eric Walch
3c099b9a59 - Added AI command: thargonCheckMother for a more efficient thargon handling. 
- Improved the thargletAI slightly.
- Changed policeInterceptAI so that launching ships without target immediately clear the launch area.
- Moved the constrictor script from shipData to the worldScript. (to prevent problems with bad oxp copies of the constrictor)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3752 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 20:13:01 +00:00
Marc
9adaf521b7 - more accurate aft laser resell price. 
- some code cleanup.
- OXP change: added new shipdata.plist key 'hyperspace_motor' if set to NO, no NPCs or player ships can enter witchspace on their own. Defaults to YES if not specified. Fuel injection and galaxy jumps are not affected by this change. New translation strings added and GUI screens updated to accommodate this change.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3739 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 13:43:09 +00:00
Jens Ayton
cbf12be920 Asteroids spawned as post-nova debris are now effectively heat-proof. This is achieved with a new standard role: cinder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3728 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 15:00:14 +00:00
Marc
46c4badaa7 - Change: Thargons will now use the standard 'EQ_THARGON' identifier internally. Should still accept the non-standard 'thargon' identifier as a an alias - there might well be related breakages! (trunk) 
- Change: reworded debug console error messages. (trunk & maintenance)
- Comment cleanup. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3561 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 08:41:35 +00:00
Jens Ayton
51c754eb84 Cargo/alloys from dying ships, and escape pods, now inherit parent's temperature. Temperature inheritance behaviour changed so ejecta from very hot ships are also very hot, and ejecta from ambient-temperature ships are not extra cold. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3424 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 11:17:45 +00:00
Jens Ayton
925970619e Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3413 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 21:01:32 +00:00
Marc
9813c80369 * changes to docking effects: 
- rock hermits have a docking tunnel consistent with their docking slot.
- when in strict mode, use ring.dat for all docking (as per oolite 1.65 - 1.73).
- renamed the new docking 'rings' as oolite-tunnel.dat and oolite-rocktunnel.dat.

* fix: stopped ship.exitSystem() from generating a clone of itself after leaving the system.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3360 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 23:07:02 +00:00
Jens Ayton
91ed7e8c5a Use renamed colour attributes in built-in shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3181 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:18:09 +00:00
Jens Ayton
fa25226d5f Cube mapping (for diffuse map) supported in default shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3123 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 14:32:33 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:20:55 +00:00
Jens Ayton
4dd43e3581 Asteroids and boulders can now specify custom debris roles. Setting a planet texture to a non-existent texture now has no effect instead of producing a black planet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2954 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 12:40:21 +00:00
Jens Ayton
ca8bdfa70e Return values and semicolons for all! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2890 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 07:33:10 +00:00
Marc
7c2a544db2 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2889 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 06:31:40 +00:00
Marc
b6826f47bc AddShips Part I: 
* new js methods added system.addShips(), system.addGroup(), system.addShipsToRoute(), system.addGroupToRoute() if a ship is created near the witchpoint, it gets the witchspace rings, and its status is STATUS_LAUNCHING, otherwise it's STATUS_IN_FLIGHT, and no witchspace effect.
* tentatively fixed berlios bug #14626: 'AI is initialised twice since 1.71'
when entities are added to the universe, the AI state is set to GLOBAL only once after their ID is set. Seems to work.

- reworked witchpoint buoy to use multiple colour flashers.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2888 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 06:25:41 +00:00
Eric Walch
8afb80c43c - Ship put in the launch queue now have the correct status: STATUS_DOCKED. 
- Lowered the aft_eject_position of the boa_mk2 by 3 meters to avoid collision with escape pod.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2859 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 21:41:44 +00:00
Marc
cd8e1ac956 - tweaked thargoids a bit more! If they're too tough, we can tweak their AI yet again! 
- minor equipment.plist tidy-up.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2844 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 19:54:05 +00:00
Jens Ayton
c17d4a389e Replaced horrible oolite-unknown-ship with more conceptually boring but non-horrible version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2821 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 21:27:31 +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
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
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
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
Jens Ayton
7237dcfcec Removed badly-thought-out supposedly-unique roles for built-in ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2423 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 18:47:10 +00:00
Nikos Barkas
b1ecf44f55 Removed escorts=4 declaration from boa-mk2-player. This should stop some ship.escortSetup.wtf errors popping up in the shipyard screen. Thanks to Svengali for spotting it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2287 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 21:24:41 +00:00
Jens Ayton
58549d3c73 New subentity stuff now knows a dock when it sees it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2053 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 18:46:16 +00:00
Jens Ayton
14e48aad0e Removed unused port_radius attributes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1978 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:49:45 +00:00
Nikos Barkas
d30e46fb02 Fix a little issue where docking clearance cancellation messages would appear on screen even if no clearance had been given, every second time player pressed 'L'. Reverted AI code fix from previous commit, as it was resulting in idle ships being launched from stations. Set default rock hermit docking clearance requirement to no. Adjusted a little the docking clearance messages to make sense also in the case the issuing station is not a main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1792 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-11 08:30:12 +00:00
Jens Ayton
3315272c00 Split JS Player object into Player and PlayerShip. Made curved sides of arc-detail smooth. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1710 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 17:34:37 +00:00
Jens Ayton
f2c07b5ee7 Fixed a few leaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1684 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-04 16:01:26 +00:00
Jens Ayton
a11ce38786 Made JS player.orientation work properly. Fixed some extra-niggly warnings. Made various JS system properties return placeholder values in interstellar space. Added -[Universe inInterstellarSpace] method, and made -[Universe currentSystemData] return placeholder values in interstellar space. Two new localizable strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1661 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 19:12:31 +00:00
Jens Ayton
2daba8a6bf Several fixes for an exception when trying to use OXP verifier while a requires.plist-incompatible OXP is installed, due to use of DESC in generating incompatibility warnings (Universe is not set up when OXP verifier runs). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1504 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-23 15:12:22 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +00:00
Jens Ayton
f68d550d8e Added JS Ship methods dumpCargo(), ejectItem() and ejectSpecificItem(). Spotlight indexer now indexes required.plist max_version for display in More Info. Fix for internal consistency in default fragment shader's handling of specular exponents. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1471 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 15:27:06 +00:00
Jens Ayton
2b89827eb3 Graphics fiddle: scarred alloy is now only scarred on one side, and has a specular intensity map (if shaders enabled); both types of alloy are now shinier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1462 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-06 18:13:57 +00:00
Jens Ayton
5f09cc936a Fixed a bug where subentity relationships would be messed up by -becomeLargeExplosion (currently only used for the player). Better diagnostics for bad AIs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1458 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 23:45:09 +00:00
Nikos Barkas
74ae10a5c9 Resolution for bug #12659 (scripted cargo pods do not award cargo when scooped). Added the CLASS_CARGO scan class to alloy and splinter in shipdata.plist, so that they don't appear unscoopable and with legal status when spawned by scripts. Finally, yes, you guessed it, more strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1448 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 06:46:40 +00:00
Jens Ayton
804b2fea93 Fix for Asps not having lasers when bought. Subentities no longer count as kills (trunk only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1305 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-09 01:11:38 +00:00
Nikos Barkas
665bba439c Fixed a problem in shipdata.plist, whereby the GNUstep parser was getting confused due to nested comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1245 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-25 21:24:13 +00:00
Jens Ayton
280f4d7828 Fixed some warnings in Windows build; switched cloaking device pod to use JavaScript implementation now that its script_actions are no longer needed for testing; fiddled with OOCollectionExtractors for a tool I'm fiddling with. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1243 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-24 15:58:15 +00:00
Jens Ayton
3fbc24887d * All ships now have a JavaScript script attached, allowing JS scripts to 
add behaviours to any ship.
* Legacy script_actions, setup_actions, launch_actions and death_actions
  handled through default JavaScript script.
* In order to implement the above, JS Ship now has a runLegacyScriptActions
  method. This is not to be exposed as an "official" method, though, since
  we might want to change the mechanism -- for instance, to "compile"
  legacy scripts into JS. Handling dynamically-generated legacy scripts in
  that case would be a significant complication.
* Updates for Mac OS X 10.5 "Leopard".
  - Errors on reading/writing plist will not cause a crash if building
    against the Leopard SDK. (I have no intention of requiring Leopard any
    time soon, but future-proofing is good.)
  - OOWeakReference is now more efficient when running under Leopard, by
    implementing the new "fast forwarding" mechanism.
  - Threads now have names set under Leopard, which may provide debugging
    advantages.
  - Fixed some new build warnings for new version of apple-gcc.
  - Updated type declarations to identify Oolite saved games as property
    lists.
* Cleaned up PlayerEntityControls.m somewhat. Moved method declarations
  into files, fixed indentation, broke up monster giant method of doom.
* Script-generated asteroids now behave like system populator-generated
  asteroids (As Seen on BB[TM]).
* Minor optimizations and simplifications of legacy script engine.
* JS System.filteredEntities() now has sensible behaviour if predicate
  throws an exception: the predicate is not called again, and null is
  returned. The exception is reported and not rethrown.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1240 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 15:04:14 +00:00