Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed problem with traders that have pirate AI. Gave each non-player ship a unique role based on its dictionary key. Changed numbers like 0.65000000000000002 to 0.65.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1050 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-06-29 12:55:48 +00:00
parent 72f760b4d6
commit 439d26be98
3 changed files with 115 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
Resources/Config/shipdata.plist
View File

@ -36,7 +36,7 @@
<key>max_flight_pitch</key>
<real>2</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>240</real>
<key>max_missiles</key>
@ -50,7 +50,7 @@
<key>name</key>
<string>Adder</string>
<key>roles</key>
<string>hunter scavenger shuttle hermit-ship</string>
<string>hunter scavenger shuttle hermit-ship oolite-adder</string>
<key>thrust</key>
<real>30</real>
<key>view_position_aft</key>
@ -92,7 +92,7 @@
<key>max_flight_pitch</key>
<real>2</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>240</real>
<key>max_missiles</key>
@ -240,7 +240,7 @@
<key>name</key>
<string>Metal fragment</string>
<key>roles</key>
<string>alloy</string>
<string>alloy oolite-alloy</string>
<key>thrust</key>
<real>0.0</real>
</dict>
@ -284,7 +284,7 @@
<key>max_energy</key>
<real>500</real>
<key>max_flight_pitch</key>
<real>0.40000000000000002</real>
<real>0.4</real>
<key>max_flight_roll</key>
<real>0.75</real>
<key>max_flight_speed</key>
@ -300,7 +300,7 @@
<key>name</key>
<string>Anaconda</string>
<key>roles</key>
<string>trader</string>
<string>trader oolite-anaconda</string>
<key>thrust</key>
<real>14</real>
<key>weapon_position_aft</key>
@ -332,7 +332,7 @@
<key>max_energy</key>
<real>500</real>
<key>max_flight_pitch</key>
<real>0.40000000000000002</real>
<real>0.4</real>
<key>max_flight_roll</key>
<real>0.75</real>
<key>max_flight_speed</key>
@ -460,7 +460,7 @@
<key>name</key>
<string>Arc Detail</string>
<key>roles</key>
<string>arc-detail</string>
<string>arc-detail oolite-arc-detail</string>
</dict>
<key>asp</key>
<dict>
@ -483,11 +483,11 @@
<key>fuel</key>
<integer>70</integer>
<key>has_ecm</key>
<real>0.84999999999999998</real>
<real>0.85</real>
<key>has_fuel_injection</key>
<real>0.5</real>
<key>has_scoop</key>
<real>0.98999999999999999</real>
<real>0.99</real>
<key>has_shield_booster</key>
<real>0.5</real>
<key>likely_cargo</key>
@ -513,7 +513,7 @@
<key>name</key>
<string>Asp Mark II</string>
<key>roles</key>
<string>hunter pirate asp-pirate</string>
<string>hunter pirate asp-pirate oolite-asp</string>
<key>thrust</key>
<real>50</real>
<key>view_position_aft</key>
@ -585,7 +585,7 @@
<key>name</key>
<string>Asp Mark II</string>
<key>roles</key>
<string>asp-cloaked</string>
<string>asp-cloaked oolite-asp-cloaked</string>
<key>thrust</key>
<real>50</real>
<key>view_position_aft</key>
@ -762,9 +762,9 @@
<key>max_energy</key>
<real>100</real>
<key>max_flight_pitch</key>
<real>0.10000000000000001</real>
<real>0.1</real>
<key>max_flight_roll</key>
<real>0.10000000000000001</real>
<real>0.1</real>
<key>max_flight_speed</key>
<real>0.0</real>
<key>missiles</key>
@ -774,7 +774,7 @@
<key>name</key>
<string>Asteroid</string>
<key>roles</key>
<string>asteroid</string>
<string>asteroid oolite-asteroid</string>
<key>scanClass</key>
<string>CLASS_ROCK</string>
<key>smooth</key>
@ -792,6 +792,8 @@
<string>asteroid</string>
<key>model</key>
<string>asteroid1.dat</string>
<key>roles</key>
<string>asteroid oolite-asteroid-alternative</string>
</dict>
<key>barrel</key>
<dict>
@ -824,7 +826,7 @@
<key>name</key>
<string>Cargo container</string>
<key>roles</key>
<string>cargopod 1t-cargopod</string>
<string>cargopod 1t-cargopod oolite-barrel</string>
<key>thrust</key>
<real>0.0</real>
<key>unpiloted</key>
@ -871,7 +873,7 @@
<key>max_flight_pitch</key>
<real>1</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>240</real>
<key>max_missiles</key>
@ -885,7 +887,7 @@
<key>name</key>
<string>Boa</string>
<key>roles</key>
<string>trader</string>
<string>trader oolite-boa</string>
<key>thrust</key>
<real>36</real>
<key>view_position_aft</key>
@ -918,7 +920,7 @@
<key>cargo_type</key>
<string>CARGO_NOT_CARGO</string>
<key>energy_recharge_rate</key>
<real>3.2000000000000002</real>
<real>3.2</real>
<key>escorts</key>
<integer>4</integer>
<key>exhaust</key>
@ -959,7 +961,7 @@
<key>name</key>
<string>Boa Class Cruiser</string>
<key>roles</key>
<string>trader sunskim-trader</string>
<string>trader sunskim-trader oolite-boa-mk2</string>
<key>thrust</key>
<real>40</real>
<key>view_position_aft</key>
@ -986,7 +988,7 @@
<key>aft_eject_position</key>
<string>0.0 -15.75 -50.75</string>
<key>energy_recharge_rate</key>
<real>3.2000000000000002</real>
<real>3.2</real>
<key>escorts</key>
<integer>4</integer>
<key>exhaust</key>
@ -1143,7 +1145,7 @@
<key>max_flight_pitch</key>
<real>1</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>240</real>
<key>max_missiles</key>
@ -1297,7 +1299,7 @@
<key>name</key>
<string>Boulder</string>
<key>roles</key>
<string>boulder</string>
<string>boulder oolite-boulder</string>
<key>scanClass</key>
<string>CLASS_ROCK</string>
<key>smooth</key>
@ -1315,6 +1317,8 @@
<string>boulder</string>
<key>model</key>
<string>boulder1.dat</string>
<key>roles</key>
<string>boulder oolite-boulder-alternative</string>
</dict>
<key>buoy</key>
<dict>
@ -1349,7 +1353,7 @@
<key>name</key>
<string>Navigation Buoy</string>
<key>roles</key>
<string>buoy</string>
<string>buoy oolite-buoy</string>
<key>thrust</key>
<real>100</real>
<key>unpiloted</key>
@ -1390,7 +1394,7 @@
<key>name</key>
<string>Witchpoint Beacon</string>
<key>roles</key>
<string>buoy-witchpoint</string>
<string>buoy-witchpoint oolite-buoy-witchpoint</string>
<key>subentities</key>
<array>
<string>*FLASHER* 0 0 60 60 0.15 1 150</string>
@ -1434,7 +1438,7 @@
<key>name</key>
<string>Unusual cargo container</string>
<key>roles</key>
<string>cloaking-device</string>
<string>cloaking-device oolite-cloaking-device</string>
<key>scanClass</key>
<string>CLASS_CARGO</string>
<key>script_actions</key>
@ -1514,7 +1518,7 @@
<key>name</key>
<string>Cobra Mark III</string>
<key>roles</key>
<string>hunter pirate trader hermit-ship sunskim-trader</string>
<string>hunter pirate trader hermit-ship sunskim-trader oolite-cobra3-alternate</string>
<key>thrust</key>
<real>32</real>
<key>weapon_energy</key>
@ -1550,9 +1554,9 @@
<key>fuel</key>
<integer>70</integer>
<key>has_ecm</key>
<real>0.10000000000000001</real>
<real>0.1</real>
<key>has_escape_pod</key>
<real>0.84999999999999998</real>
<real>0.85</real>
<key>has_scoop</key>
<real>1</real>
<key>has_shield_booster</key>
@ -1578,7 +1582,7 @@
<key>name</key>
<string>Cobra Mark III</string>
<key>roles</key>
<string>pirate hunter</string>
<string>pirate hunter oolite-cobra3-pirate</string>
<key>thrust</key>
<real>30</real>
<key>weapon_position_aft</key>
@ -1753,7 +1757,7 @@
<key>fuel</key>
<integer>70</integer>
<key>has_ecm</key>
<real>0.14999999999999999</real>
<real>0.15</real>
<key>has_escape_pod</key>
<real>0.95</real>
<key>has_scoop</key>
@ -1779,7 +1783,7 @@
<key>name</key>
<string>Cobra Mark III</string>
<key>roles</key>
<string>trader scavenger sunskim-trader</string>
<string>trader scavenger sunskim-trader oolite-cobra3-trader</string>
<key>thrust</key>
<real>30</real>
<key>weapon_position_aft</key>
@ -1796,7 +1800,7 @@
<key>aft_eject_position</key>
<string>0.0 7.5 -21.0</string>
<key>ai_type</key>
<string>pirateAI.plist</string>
<string>route1traderAI.plist</string>
<key>bounty</key>
<integer>0</integer>
<key>cargo_type</key>
@ -1835,7 +1839,7 @@
<key>name</key>
<string>Cobra Mark I</string>
<key>roles</key>
<string>pirate scavenger trader hunter hermit-ship</string>
<string>pirate hunter scavenger trader hermit-ship oolite-cobramk1</string>
<key>thrust</key>
<real>25</real>
<key>weapon_position_aft</key>
@ -1897,7 +1901,7 @@
<key>name</key>
<string>Cobra Mark I</string>
<key>roles</key>
<string>pirate</string>
<string>pirate oolite-cobramk1-alt</string>
<key>thrust</key>
<real>30</real>
<key>weapon_position_aft</key>
@ -1955,7 +1959,7 @@
<key>name</key>
<string>Cobra Mark I</string>
<key>roles</key>
<string>miner</string>
<string>miner oolite-cobramk1-miner</string>
<key>thrust</key>
<real>25</real>
<key>weapon_position_aft</key>
@ -2138,8 +2142,6 @@
<true/>
<key>has_fuel_injection</key>
<true/>
<key>launch_actions</key>
<array/>
<key>likely_cargo</key>
<integer>3</integer>
<key>max_cargo</key>
@ -2163,7 +2165,7 @@
<key>name</key>
<string>Constrictor</string>
<key>roles</key>
<string>constrictor</string>
<string>constrictor oolite-constrictor</string>
<key>thrust</key>
<real>50</real>
<key>view_position_aft</key>
@ -2226,7 +2228,7 @@
<key>port_radius</key>
<real>500</real>
<key>roles</key>
<string>coriolis station</string>
<string>coriolis station oolite-coriolis-station</string>
<key>rotating</key>
<true/>
<key>subentities</key>
@ -2276,7 +2278,7 @@
<key>name</key>
<string>Docking Slit (horizontal)</string>
<key>roles</key>
<string>docking-slit-horizontal</string>
<string>docking-slit-horizontal oolite-dock-flat</string>
</dict>
<key>dodecahedron-station</key>
<dict>
@ -2321,7 +2323,7 @@
<key>port_radius</key>
<real>392</real>
<key>roles</key>
<string>dodo dodec dodecahedron station</string>
<string>dodo dodec dodecahedron station oolite-dodecahedron-station</string>
<key>rotating</key>
<true/>
<key>subentities</key>
@ -2390,7 +2392,7 @@
<key>name</key>
<string>Escape capsule</string>
<key>roles</key>
<string>escape-capsule</string>
<string>escape-capsule oolite-escape-capsule</string>
<key>subentities</key>
<array>
<string>*FLASHER* 0.0 4.42 -1.54 0.0 2 0.0 2.0</string>
@ -2457,7 +2459,7 @@
<key>max_flight_pitch</key>
<real>1</real>
<key>max_flight_roll</key>
<real>3.6000000000000001</real>
<real>3.6</real>
<key>max_flight_speed</key>
<real>300</real>
<key>max_missiles</key>
@ -2471,7 +2473,7 @@
<key>name</key>
<string>Fer-de-Lance</string>
<key>roles</key>
<string>pirate hunter</string>
<string>pirate hunter oolite-ferdelance</string>
<key>thrust</key>
<real>36</real>
<key>weapon_position_aft</key>
@ -2506,7 +2508,7 @@
<key>max_flight_pitch</key>
<real>1</real>
<key>max_flight_roll</key>
<real>3.6000000000000001</real>
<real>3.6</real>
<key>max_flight_speed</key>
<real>300</real>
<key>max_missiles</key>
@ -2644,7 +2646,7 @@
<key>has_scoop</key>
<real>1</real>
<key>has_shield_booster</key>
<real>0.40000000000000002</real>
<real>0.4</real>
<key>likely_cargo</key>
<integer>1</integer>
<key>max_cargo</key>
@ -2668,7 +2670,7 @@
<key>name</key>
<string>Gecko</string>
<key>roles</key>
<string>pirate</string>
<string>pirate oolite-gecko</string>
<key>thrust</key>
<real>45</real>
<key>view_position_aft</key>
@ -2697,7 +2699,7 @@
<key>name</key>
<string>Docking Slit</string>
<key>roles</key>
<string>docking-slit</string>
<string>docking-slit oolite-hermit-docking-slit</string>
</dict>
<key>hermitage</key>
<dict>
@ -2708,7 +2710,7 @@
<key>name</key>
<string>Rock Hermit living area</string>
<key>roles</key>
<string>rock-box</string>
<string>rock-box oolite-hermitage</string>
</dict>
<key>icosahedron-station</key>
<dict>
@ -2753,7 +2755,7 @@
<key>port_radius</key>
<real>500</real>
<key>roles</key>
<string>ico icosa icosahedron station</string>
<string>ico icosa icosahedron station oolite-icosahedron-station</string>
<key>rotating</key>
<true/>
<key>subentities</key>
@ -2801,7 +2803,7 @@
<key>fuel</key>
<integer>70</integer>
<key>has_fuel_injection</key>
<real>0.65000000000000002</real>
<real>0.65</real>
<key>has_scoop</key>
<real>0.95</real>
<key>has_shield_booster</key>
@ -2831,7 +2833,7 @@
<key>name</key>
<string>Krait</string>
<key>roles</key>
<string>pirate hunter</string>
<string>pirate hunter oolite-krait</string>
<key>thrust</key>
<real>35</real>
<key>view_position_aft</key>
@ -2896,7 +2898,7 @@
<key>name</key>
<string>Mamba</string>
<key>roles</key>
<string>pirate</string>
<string>pirate oolite-mamba</string>
<key>thrust</key>
<real>32</real>
<key>view_position_aft</key>
@ -2957,7 +2959,7 @@
<key>name</key>
<string>Mamba Escort</string>
<key>roles</key>
<string>escort</string>
<string>escort oolite-mamba-escort</string>
<key>thrust</key>
<real>32</real>
<key>view_position_aft</key>
@ -3014,7 +3016,7 @@
<key>name</key>
<string>Missile</string>
<key>roles</key>
<string>missile EQ_MISSILE</string>
<string>missile EQ_MISSILE oolite-missile</string>
<key>scanClass</key>
<string>CLASS_MISSILE</string>
<key>thrust</key>
@ -3071,7 +3073,7 @@
<key>name</key>
<string>Moray Star Boat</string>
<key>roles</key>
<string>pirate</string>
<string>pirate oolite-moray</string>
<key>thrust</key>
<real>32</real>
<key>weapon_position_aft</key>
@ -3226,7 +3228,7 @@
<key>aft_eject_position</key>
<string>0.0 5.75 -8.0</string>
<key>ai_type</key>
<string>pirateAI.plist</string>
<string>route1traderAI.plist</string>
<key>bounty</key>
<integer>0</integer>
<key>cargo_type</key>
@ -3266,7 +3268,7 @@
<key>name</key>
<string>Moray Medical Boat</string>
<key>roles</key>
<string>trader sunskim-trader</string>
<string>trader sunskim-trader oolite-morayMED</string>
<key>thrust</key>
<real>32</real>
<key>weapon_position_aft</key>
@ -3421,7 +3423,7 @@
<key>aft_eject_position</key>
<string>0.0 15.5 -50.0</string>
<key>ai_type</key>
<string>pirateAI.plist</string>
<string>route1traderAI.plist</string>
<key>bounty</key>
<integer>0</integer>
<key>cargo_type</key>
@ -3449,7 +3451,7 @@
<key>max_energy</key>
<real>450</real>
<key>max_flight_pitch</key>
<real>0.80000000000000004</real>
<real>0.8</real>
<key>max_flight_roll</key>
<real>2</real>
<key>max_flight_speed</key>
@ -3465,7 +3467,7 @@
<key>name</key>
<string>Python</string>
<key>roles</key>
<string>trader pirate</string>
<string>trader pirate oolite-python</string>
<key>thrust</key>
<real>20</real>
<key>weapon_position_aft</key>
@ -3506,7 +3508,7 @@
<key>has_scoop</key>
<real>1</real>
<key>has_shield_booster</key>
<real>0.84999999999999998</real>
<real>0.85</real>
<key>likely_cargo</key>
<integer>10</integer>
<key>max_cargo</key>
@ -3514,7 +3516,7 @@
<key>max_energy</key>
<real>450</real>
<key>max_flight_pitch</key>
<real>0.80000000000000004</real>
<real>0.8</real>
<key>max_flight_roll</key>
<real>2</real>
<key>max_flight_speed</key>
@ -3530,7 +3532,7 @@
<key>name</key>
<string>Python</string>
<key>roles</key>
<string>pirate</string>
<string>pirate oolite-python-blackdog</string>
<key>thrust</key>
<real>20</real>
<key>weapon_position_aft</key>
@ -3561,7 +3563,7 @@
<key>max_energy</key>
<real>450</real>
<key>max_flight_pitch</key>
<real>0.80000000000000004</real>
<real>0.8</real>
<key>max_flight_roll</key>
<real>2</real>
<key>max_flight_speed</key>
@ -3713,7 +3715,7 @@
<key>max_energy</key>
<real>450</real>
<key>max_flight_pitch</key>
<real>0.80000000000000004</real>
<real>0.8</real>
<key>max_flight_roll</key>
<real>2</real>
<key>max_flight_speed</key>
@ -3729,7 +3731,7 @@
<key>name</key>
<string>Python</string>
<key>roles</key>
<string>trader</string>
<string>trader oolite-python-trader</string>
<key>thrust</key>
<real>20</real>
<key>weapon_position_aft</key>
@ -3760,7 +3762,7 @@
<key>name</key>
<string>Quirium Cascade Mine</string>
<key>roles</key>
<string>energy-bomb EQ_QC_MINE</string>
<string>energy-bomb EQ_QC_MINE oolite-qbomb</string>
<key>thrust</key>
<real>0.0</real>
</dict>
@ -3815,7 +3817,7 @@
<key>port_radius</key>
<real>250</real>
<key>roles</key>
<string>rockhermit station</string>
<string>rockhermit station oolite-rock-hermit</string>
<key>smooth</key>
<true/>
<key>subentities</key>
@ -3865,7 +3867,7 @@
<key>name</key>
<string>Metal fragment</string>
<key>roles</key>
<string>alloy</string>
<string>alloy oolite-scarred-alloy</string>
<key>thrust</key>
<real>0.0</real>
</dict>
@ -3897,7 +3899,7 @@
<key>max_energy</key>
<real>120</real>
<key>max_flight_pitch</key>
<real>0.90000000000000002</real>
<real>0.9</real>
<key>max_flight_roll</key>
<real>2</real>
<key>max_flight_speed</key>
@ -3913,7 +3915,7 @@
<key>name</key>
<string>Orbital Shuttle</string>
<key>roles</key>
<string>shuttle</string>
<string>shuttle oolite-shuttle</string>
<key>thrust</key>
<real>16</real>
<key>view_position_aft</key>
@ -3958,9 +3960,9 @@
<key>max_energy</key>
<real>240</real>
<key>max_flight_pitch</key>
<real>1.6000000000000001</real>
<real>1.6</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>370</real>
<key>max_missiles</key>
@ -3974,7 +3976,7 @@
<key>name</key>
<string>Sidewinder Scout Ship</string>
<key>roles</key>
<string>pirate hunter</string>
<string>pirate hunter oolite-sidewinder</string>
<key>thrust</key>
<real>37</real>
<key>view_position_aft</key>
@ -4021,7 +4023,7 @@
<key>max_flight_pitch</key>
<real>1.8</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>370</real>
<key>max_missiles</key>
@ -4035,7 +4037,7 @@
<key>name</key>
<string>Sidewinder Scout Ship</string>
<key>roles</key>
<string>escort hunter</string>
<string>escort hunter oolite-sidewinder-escort</string>
<key>thrust</key>
<real>37</real>
<key>view_position_aft</key>
@ -4092,7 +4094,7 @@
<key>name</key>
<string>Splinter</string>
<key>roles</key>
<string>splinter</string>
<string>splinter oolite-splinter</string>
<key>smooth</key>
<true/>
<key>thrust</key>
@ -4106,6 +4108,8 @@
<dict>
<key>like_ship</key>
<string>splinter</string>
<key>roles</key>
<string>splinter oolite-splinter-alternative</string>
<key>model</key>
<string>splinter1.dat</string>
</dict>
@ -4118,7 +4122,7 @@
<key>name</key>
<string>Strut 10-10-30</string>
<key>roles</key>
<string>strut</string>
<string>strut oolite-strut</string>
<key>unpiloted</key>
<true/>
</dict>
@ -4155,7 +4159,7 @@
<key>name</key>
<string>Thargoid Robot Fighter</string>
<key>roles</key>
<string>tharglet thargon</string>
<string>tharglet thargon oolite-tharglet</string>
<key>scanClass</key>
<string>CLASS_THARGOID</string>
<key>scannerRange</key>
@ -4224,7 +4228,7 @@
<key>name</key>
<string>Thargoid Warship</string>
<key>roles</key>
<string>thargoid</string>
<string>thargoid oolite-thargoid</string>
<key>scanClass</key>
<string>CLASS_THARGOID</string>
<key>scannerRange</key>
@ -4274,7 +4278,7 @@
<key>name</key>
<string>Transporter</string>
<key>roles</key>
<string>shuttle</string>
<string>shuttle oolite-transporter</string>
<key>thrust</key>
<real>20</real>
<key>view_position_aft</key>
@ -4340,7 +4344,7 @@
<key>name</key>
<string>Mining Transporter</string>
<key>roles</key>
<string>miner</string>
<string>miner oolite-transporter-miner</string>
<key>thrust</key>
<real>20</real>
<key>view_position_aft</key>
@ -4392,7 +4396,7 @@
<key>max_flight_pitch</key>
<real>1.8</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>320</real>
<key>max_missiles</key>
@ -4406,7 +4410,7 @@
<key>name</key>
<string>GalCop Viper</string>
<key>roles</key>
<string>police</string>
<string>police oolite-viper</string>
<key>scanClass</key>
<string>CLASS_POLICE</string>
<key>subentities</key>
@ -4480,7 +4484,7 @@
<key>max_flight_pitch</key>
<real>2</real>
<key>max_flight_roll</key>
<real>4.2000000000000002</real>
<real>4.2</real>
<key>max_flight_speed</key>
<real>520</real>
<key>max_missiles</key>
@ -4494,7 +4498,7 @@
<key>name</key>
<string>GalCop Viper Interceptor</string>
<key>roles</key>
<string>interceptor wingman</string>
<string>interceptor wingman oolite-viper-interceptor</string>
<key>scanClass</key>
<string>CLASS_POLICE</string>
<key>subentities</key>
@ -4563,7 +4567,7 @@
<key>max_flight_pitch</key>
<real>1.8</real>
<key>max_flight_roll</key>
<real>2.7999999999999998</real>
<real>2.8</real>
<key>max_flight_speed</key>
<real>360</real>
<key>max_missiles</key>
@ -4577,7 +4581,7 @@
<key>name</key>
<string>GalCop Viper</string>
<key>roles</key>
<string>wingman</string>
<string>wingman oolite-viper-pursuit</string>
<key>thrust</key>
<real>36</real>
<key>view_position_aft</key>
@ -4638,7 +4642,7 @@
<key>name</key>
<string>Worm</string>
<key>roles</key>
<string>shuttle</string>
<string>shuttle oolite-worm</string>
<key>thrust</key>
<real>12</real>
<key>view_position_aft</key>
@ -4669,7 +4673,7 @@
<key>cargo_type</key>
<string>CARGO_NOT_CARGO</string>
<key>energy_recharge_rate</key>
<real>1.8500000000000001</real>
<real>1.85</real>
<key>exhaust</key>
<array>
<string>0.0 0.0 -17.5 6.0 5.0 5.0</string>
@ -4701,7 +4705,7 @@
<key>name</key>
<string>Worm</string>
<key>roles</key>
<string>miner</string>
<string>miner oolite-worm-miner</string>
<key>thrust</key>
<real>12</real>
<key>view_position_aft</key>
@ -4759,7 +4763,7 @@
<key>name</key>
<string>ECM Hardened Missile</string>
<key>roles</key>
<string>missile EQ_HARDENED_MISSILE</string>
<string>missile EQ_HARDENED_MISSILE oolite-ecm-proof-missile</string>
<key>scanClass</key>
<string>CLASS_MISSILE</string>
<key>thrust</key>
@ -4795,7 +4799,7 @@
<key>name</key>
<string>Wreckage</string>
<key>roles</key>
<string>wreckage</string>
<string>wreckage oolite-wreckage-component</string>
<key>scanClass</key>
<string>CLASS_CARGO</string>
<key>thrust</key>
@ -4809,6 +4813,8 @@
<string>wreckage-component</string>
<key>model</key>
<string>wreck2.dat</string>
<key>roles</key>
<string>wreckage oolite-more-wreckage2</string>
</dict>
<key>more-wreckage3</key>
<dict>
@ -4816,6 +4822,8 @@
<string>wreckage-component</string>
<key>model</key>
<string>wreck3.dat</string>
<key>roles</key>
<string>wreckage oolite-more-wreckage3</string>
</dict>
<key>more-wreckage4</key>
<dict>
@ -4823,6 +4831,8 @@
<string>wreckage-component</string>
<key>model</key>
<string>wreck4.dat</string>
<key>roles</key>
<string>wreckage oolite-more-wreckage4</string>
</dict>
<key>more-wreckage5</key>
<dict>
@ -4830,6 +4840,8 @@
<string>wreckage-component</string>
<key>model</key>
<string>wreck5.dat</string>
<key>roles</key>
<string>wreckage oolite-more-wreckage5</string>
</dict>
<key>oolite-unknown-ship</key>
<dict>
@ -4838,7 +4850,8 @@
<key>name</key>
<string>Question Mark</string>
<key>roles</key>
<string>oolite-unknown-ship</string>
<!-- oo-unknown-ship is used by the game for the load screen when a saved game uses a ship that can't be found, i.e. a ship from an OXP that's not installed. -->
<string>oo-unknown-ship oolite-unknown-ship</string>
<key>scanClass</key>
<string>CLASS_NEUTRAL</string>
<key>smooth</key>

2
src/Core/Entities/PlayerEntityLoadSave.m
View File

@ -851,7 +851,7 @@ MA 02110-1301, USA.
}
else
{
[self showShipyardModel:[UNIVERSE getDictionaryForShip:@"oolite-unknown-ship"]];
[self showShipyardModel:[UNIVERSE getDictionaryForShip:@"oo-unknown-ship"]];
shipName = [cdr stringForKey:@"ship_name" defaultValue:@"unknown"];
shipName = [shipName stringByAppendingString:@" - OXP not installed"];
}

6
src/Core/Materials/OOShaderMaterial.m
View File

@ -302,7 +302,11 @@ static NSString *MacrosToString(NSDictionary *macros);
value = [definition objectForKey:@"value"];
binding = [definition objectForKey:@"binding"];
type = [definition objectForKey:@"type"];
if (type == nil) type = @"float";
if (type == nil)
{
if (value == nil && binding != nil) type = @"binding";
else type = @"float";
}
}
else if ([definition isKindOfClass:[NSNumber class]])
{