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

136 Commits

Author SHA1 Message Date
cim
e377cd8438 Add beacon dial (will be needed for waypoints) and beacon label property 
(beacon code isn't suitable as initial letter of label may differ from code: the N beacon being an obvious example)
 2013-09-28 23:31:50 +01:00
cim
57944ba4a3 Merge pull request #52 from OoliteProject/steady-state-ecosystem 
Steady state ecosystem
Still plenty of testing and balancing to do, and I've left the test comms messages in for now, but the remaining work can be done on master as and when.
 2013-09-28 01:21:19 -07:00
cim
606667229c Adjust explosions a little more 
Put old explosions back for tiny objects (cargo, missile and mines being destroyed before detonation)
Add explosion effect to dealEnergyDamage
 2013-09-25 23:22:07 +01:00
cim
86505d4356 Initial implementation of assassin NPCs 2013-09-14 13:50:49 +01:00
cim
3360843aae While there's still time, put the new AIs into the right nameprefix 2013-09-13 20:45:48 +01:00
cim
35da08ae64 ship.damageAssessment() to check damage levels (will do more when NPCs can be damaged) 
Also: adjust independent pirate role odds to be more towards small ships, and adjust missile loads of ships to reflect prior action or high value
 2013-09-04 22:25:54 +01:00
cim
eef920f9d3 Give Vipers escape pods; give low energy ships some practical chance to use pods; adjust default pilots 2013-09-02 20:30:47 +01:00
cim
a2334ba5f4 Add basic aegis raiders, some bug fixes in station/defense ship AI 2013-09-01 19:25:45 +01:00
cim
e6fb14ffbf Adjust cargo generation, especially for smugglers, medical. 
Increase likely_cargo levels on pirate ships quite a bit (PIRATE_GOODS already reduces it once; no need to do so again in shipdata)
 2013-08-25 13:14:02 +01:00
cim
6e801538e4 Shorten missile engine plume 2013-08-24 09:46:39 +01:00
cim
894d3d683b Add auto_weapons (ship.autoWeapons) parameter to shipdata. 
If set (default 0), then populator has discretion to change ship weapons and other items to fit the ship's role. So far just does fore and aft lasers.
 2013-08-15 21:53:17 +01:00
cim
965e6d4b62 Add "escort_roles" shipdata key for more detailed escort config 2013-08-08 11:20:41 +01:00
cim
ab0e7db465 Add new roles to shipdata 2013-08-07 21:08:09 +01:00
cim
be388e4fa2 JSAI: Constrictor 2013-07-25 20:09:53 +01:00
cim
be6d167f38 JSAI: Q-bomb 
New ship script event: shipWasDumped (opposite of shipWasScooped)
 2013-07-25 18:31:14 +01:00
cim
b6b3f227a3 JSAI: Missiles 2013-07-24 21:56:50 +01:00
cim
202ff3e418 JSAI: the shuttle AI is fine for escape pods too 2013-07-24 18:06:04 +01:00
cim
f128abf309 JSAI: Rock hermit 2013-07-23 22:37:07 +01:00
cim
9aa62fc2bd JSAI: main station AI 2013-07-23 21:21:49 +01:00
cim
363d7bbeb2 JSAI: Miner/Scavenger AI (the two are very similar, so one AI can do both) 2013-07-22 21:24:27 +01:00
cim
228344c540 JSAIs for Thargoids and Thargons. 
Thargons now act as escorts for the warships.
 2013-07-21 11:10:47 +01:00
cim
a4ae37c849 Change autoAIs for more testing what we have so far. 
Set trader, pirate, escort, hunter, police AIs to JS by default
 2013-07-19 22:51:43 +01:00
cim
bfd8400941 Continue updating cargo generation 
New scripting:
ship.cargoList (similar to player.ship.manifest.list)
ship.setCargoType( SCARCE_GOODS | PLENTIFUL_GOODS | MEDICAL_GOODS | ILLEGAL_GOODS | PIRATE_GOODS );

Change likely_cargo values in shipdata to more reasonable levels.
 2013-07-14 13:56:33 +01:00
cim
f3cbf78849 Allow definition of ship cargo at creation 
To avoid creating thousands of entities, the universe holds a template copy of each commodity. These are then placed, repeatedly, into the hold. If a ship would release a template item, either through ejection or explosion, it is replaced with a genuine cargopod at that point. (issue #39)
 2013-07-14 12:17:04 +01:00
cim
e444ba7f52 Reorganise shipdata.plist to make future interactions with shipsets easier. (Closes #37) 2013-07-04 09:25:09 +01:00
Nikos Barkas
0078af5183 Removed stale references to oolite-missile.js from shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5610 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-07 11:14:56 +00:00
Chris Morris
80f2f4f6da New engine flare appearance. (breaks Mac build again) 
Engine flare z size now does something. Values from 0.5-2.0 scale the flare compared with its 'normal' scale. All other values treated as equal to 1.0. shipdata.plist updated with new exhaust z-size parameters for completeness.
Slightly tweak laser turbulence parameter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5521 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-22 19:55:51 +00:00
Chris Morris
0301dd6959 Enable OO_GL_CHECK_HEAVY in debug builds (SDL) 
Fix splash screen GL settings (SDL)
Remove obsolete shipdata.plist line


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5456 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 21:29:27 +00:00
Chris Morris
23315623af Explicitly specify hermit scan class rather than relying on populator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5449 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 09:10:02 +00:00
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
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
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
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
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
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
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
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