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

49 Commits

Author SHA1 Message Date
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
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
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
Jens Ayton
a1b28ecb52 Rolled back r4524. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4525 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 23:21:50 +00:00
Marc
69fa821072 Heat shields now compatible with strict mode... fixed one standard mission in strict mode, and made fuel collecting in strict viable again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4524 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 16:16:03 +00:00
Jens Ayton
e1e3541ae7 Rolled back r3678: messaging behaviour is a feature, not a bug, and convertor is a valid, albeit less common, spelling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3679 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 19:08:53 +00:00
Marc
a170b5219a - rev3676 redux: the 'equipment destroyed' message is shown, if a script destroys the equipment, rather than show no message at all. Corrected a spelling mistake. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3678 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 17:51:12 +00:00
Nikos Barkas
c3061d4029 Fixed some breakage in equipment.plist. Upgraded Windows GNUstep base library to version 1.18.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3584 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 07:46:03 +00:00
Marc
e84a0d339c - fix: short range map highlight should have dealt with system info icons, as well as system names. (trunk & maintenance) 
- more equipment tweaks, hopefully sensible ones. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3583 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 01:18:02 +00:00
Jens Ayton
6ded4261b2 Cleaned up canAwardEquipment - now admits the existence of canAwardMultiple equipment, and has less redundancy. Added available_to_player and available_to_NPCs properties for equipment. Exposed five new equipment properties to JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3578 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:18:41 +00:00
Jens Ayton
16b8d30f54 Trumbles are no longer listed as equipment on status screen - hard-coded in maintenance, equipment attribute in trunk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3577 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 18:36:10 +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
df34ec4c7a Added equipment.plist entry for trumbles. Looking forward to finding out what sort of intriguing, subtle side effects this will have. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3522 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:06:12 +00:00
Jens Ayton
c2860317a4 Re-enabled energy bomb until post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2984 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-20 21:51:31 +00:00
Jens Ayton
cd760213e7 Energy bombs are now only available in strict mode. Strict mode-compatible equipment is now explicitly flagged instead of using count (and thargon is now strict-compatible). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2960 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 22:00:18 +00:00
Marc
4022a5e9ee Oops! Corrected a warning to display only when appropriate to do so, and some minor tidying up... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2943 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 12:36:38 +00:00
Marc
6f2ee3d132 - Reverted pirates to full nastiness! 
- Stopped dumping atmosphere textures for now.
- Harmonised TL to 98 for NPC-only equipment. And reworded comments!
- Windows & linux now don't show detailed planet options when compiled with NEW_PLANETS any more.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2914 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-27 16:45:11 +00:00
Eric Walch
2f48ec24a2 - The default route for system.addShiptsToRoute() is now withchpoint->station (not witchpoint->planet) 
- NPC ships can now be awarded with EQ_SHIELD_BOOSTER  and EQ_SHIELD_ENHANCER by script. (added EQ_SHIELD_ENHANCER as a npc only equipment)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2912 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-25 12:09:46 +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
Marc
8731d87464 - fix: refactored thargoids were using various 'EQ_MISSILES' instead of thargons - now they use thargons again! - 'thargon' is now a thargoid-only piece of equipment. Equipment name kept the same as pre-exisiting thargon role for backward compatibility. 
- fix: no more occasional 'ident system locked onto(null)' on game restart.
- code cleanup: replaced all (deprecated) cStrings inside the GNUStep code with UTF8String.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2835 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 19:46:42 +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
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
Michael Werle
734938237f Fix the various 'targetting' spelling errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2360 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 14:09:05 +00:00
Nikos Barkas
7059e171e3 Fixed debug console crash on WinXP. Should work without problems on Linux and Vista too, please check. Increased Wormhole Scanner price to 2395Cr. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2143 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 16:05:49 +00:00
Michael Werle
e0344e1d54 Wormholes: 
* Enable by default in GNUmakefile
* Adjust price to something more plausible
* Fix discrepancy in save-files between loading & saving

SDL Sound:
* Commit in sound patch when no sound-card available (was committed into 1.72 ages ago)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2124 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-08 22:36:37 +00:00
Michael Werle
d7578e4f36 Wormholes: 
* Added code to add wormhole to scanned wormholes (was omitted in r2111) without which persistent wormholes doesn't work. Oops.
* Added delayed decoding of information from scanner - data added to the communications log
* Upped tech level to 9

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2118 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-03 22:41:03 +00:00
Michael Werle
360e502c40 First draft of the Wormhole Scanner 
To test: define WORMHOLE_SCANNER preprocessor macro (see GNUmakefile), by default off.

TODO: 
 * Restore wormhole if not expired and in current system
 * Draw Wormhole exit effects
 * Revise techlevel, price, description
 * bugs?



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2111 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 01:12:24 +00:00
Michael Werle
eb223d5784 * Revamped targetting system as discussed in http://www.aegidian.org/bb/viewtopic.php?t=5921 
* Added logging of compile-time options


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2106 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-28 00:42:48 +00:00
Jens Ayton
f575d75530 Added JS EquipmentInfo, wrapper around OOEquipementType. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1796 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-16 22:04:29 +00:00
Jens Ayton
87d724fc8a Fix for bug in prefix script adding player compatibility aliases to all objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1716 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 19:19:01 +00:00
Jens Ayton
717e72ffae New compiler, new warnings about problems that don't really exist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1690 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 21:11:28 +00:00
Jens Ayton
a8b39c4c9a Refactored equipment restriction tests, and apply them in addEquipmentItem: as well as the shopping screen. Added new class representing equipment types, currently only used in these tests. Added new equipment restrictions: requires_free_passenger_berth, requires_full_fuel, requires_non_full_fuel. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1689 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 20:45:02 +00:00
Jens Ayton
53e5244d68 Fixes for patrol AIs (bug #14160). Marked Naval Energy Unit incompatible with standard unit. Check docked status in mission scripts for compatibility with scripts that force immediate launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1686 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-08 23:15:33 +00:00
Marc
cc9f7cd857 Energy unit changes: energy units recharge rate adjusted to offer a better challenge to the player, and naval/extra energy unit purchase behaviour more flexible (see resolution of Bug #13507, Naval Energy Unit bug in berlios). Warnings added if energy units are going to be removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1544 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 16:12:59 +00:00
Nikos Barkas
d6fcfe75d4 Missiles now use the accuracy variable to determine how well to track targets. Accuracy must be more than 1.0 and less than or equal to 10.0, otherwise it is ignored. Made the required Advanced Nav Array tech level equal to 7, as it was meant to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1291 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-01 15:38:28 +00:00
Jens Ayton
31744b7903 Fix for legacy script engine local variables in set: and [] substitution. Unbroke equipment.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1122 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-08-03 14:53:02 +00:00
Jens Ayton
15255d19c0 JavaScript: entity class hierarchy now reflected in JS object prototype relationships (player is a Player is a Ship is an Entity). Fix for enery units being unbuyable; moved some hardcoded equipment requirements into equipment.plist; made -[PlayerEntity hasExtraEquipment:] accept arrays and sets of strings as well as individual strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1118 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-08-02 00:31:44 +00:00
Jens Ayton
ece83a5097 Made Advanced Navigational Array available_to_all. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@829 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 16:39:58 +00:00
Jens Ayton
89a8501491 Added Advanced Navigational Array code by another_commander. Stopped saving textured planet flag in save files as it's experimental and, er, in need of further performance optimization. (Should be saved in preferences rather than game files anyway.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@818 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 13:19:11 +00:00
Giles Williams
98d24ad127 cloaking device portable between ships 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@588 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-06-17 08:43:10 +00:00
Giles Williams
d21b51ec2e implemented Target Memory Expansion 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@323 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-13 18:55:39 +00:00
Giles Williams
8b02d25e3a fixed availability of items problems in setGuiToEquipShipScreen 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@303 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-10 11:52:45 +00:00
Dylan Smith
670629b7e3 Merge in thor repo r1383 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@290 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-05 16:56:58 +00:00
Dylan Smith
1264b83cf0 Move cocoa-merge (GUSTO) to trunk 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@289 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-05 16:26:25 +00:00
Dylan Smith
6f818d4754 merge from OS X r1030 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@170 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-10-24 19:18:47 +00:00
Dylan Smith
653488e27e Nerge missed plist files to OS X revision 932 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@147 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-10-02 14:36:08 +00:00
Giles Williams
305b324cda changes from OSX r807 - including the MASC'M and interstellar stuff 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@80 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-17 08:25:19 +00:00
Giles Williams
d7eae4e657 to bring sources up to Oolite r675 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@51 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-05-06 20:13:49 +00:00
Dylan Smith
3274cb3ea6 organize the source tree somewhat better 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@30 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-04-28 21:47:22 +00:00