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

introducing unpiloted entities (missiles, etc. that HAVE NO CREW and therefore do not communicate!)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@623 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Giles Williams 2006-06-28 16:06:49 +00:00
parent 3c96615b29
commit f306c999c3
2 changed files with 35 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
Resources/Config/shipdata.plist
View File

@ -532,6 +532,8 @@
<string>CLASS_ROCK</string>
<key>smooth</key>
<true/>
<key>unpiloted</key>
<true/>
<key>thrust</key>
<real>0.0</real>
<key>weapon_energy</key>
@ -541,52 +543,10 @@
</dict>
<key>asteroid-alternative</key>
<dict>
<key>ai_type</key>
<string>dumbAI.plist</string>
<key>bounty</key>
<integer>10</integer>
<key>cargo_type</key>
<string>CARGO_NOT_CARGO</string>
<key>energy_recharge_rate</key>
<real>0.0</real>
<key>forward_weapon_type</key>
<string>WEAPON_NONE</string>
<key>has_ecm</key>
<false/>
<key>has_escape_pod</key>
<false/>
<key>has_scoop</key>
<false/>
<key>likely_cargo</key>
<integer>0</integer>
<key>max_cargo</key>
<integer>0</integer>
<key>max_energy</key>
<real>100</real>
<key>max_flight_pitch</key>
<real>0.10000000000000001</real>
<key>max_flight_roll</key>
<real>0.10000000000000001</real>
<key>max_flight_speed</key>
<real>0.0</real>
<key>missiles</key>
<integer>0</integer>
<key>like_ship</key>
<string>asteroid</string>
<key>model</key>
<string>asteroid1.dat</string>
<key>name</key>
<string>Asteroid</string>
<key>roles</key>
<string>asteroid</string>
<key>scanClass</key>
<string>CLASS_ROCK</string>
<key>smooth</key>
<true/>
<key>thrust</key>
<real>0.0</real>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
<real>0.0</real>
</dict>
<key>barrel</key>
<dict>
@ -622,6 +582,8 @@
<string>cargopod 1t-cargopod</string>
<key>thrust</key>
<real>0.0</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
@ -933,6 +895,8 @@
<true/>
<key>thrust</key>
<real>0.0</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
@ -940,52 +904,10 @@
</dict>
<key>boulder-alternative</key>
<dict>
<key>ai_type</key>
<string>dumbAI.plist</string>
<key>bounty</key>
<integer>5</integer>
<key>cargo_type</key>
<string>CARGO_NOT_CARGO</string>
<key>energy_recharge_rate</key>
<real>0.0</real>
<key>forward_weapon_type</key>
<string>WEAPON_NONE</string>
<key>has_ecm</key>
<false/>
<key>has_escape_pod</key>
<false/>
<key>has_scoop</key>
<false/>
<key>likely_cargo</key>
<integer>0</integer>
<key>max_cargo</key>
<integer>0</integer>
<key>max_energy</key>
<real>25</real>
<key>max_flight_pitch</key>
<real>0.5</real>
<key>max_flight_roll</key>
<real>0.5</real>
<key>max_flight_speed</key>
<real>5</real>
<key>missiles</key>
<integer>0</integer>
<key>like_ship</key>
<string>boulder</string>
<key>model</key>
<string>boulder1.dat</string>
<key>name</key>
<string>Boulder</string>
<key>roles</key>
<string>boulder</string>
<key>scanClass</key>
<string>CLASS_ROCK</string>
<key>smooth</key>
<true/>
<key>thrust</key>
<real>0.0</real>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
<real>0.0</real>
</dict>
<key>buoy</key>
<dict>
@ -1023,6 +945,8 @@
<string>buoy</string>
<key>thrust</key>
<real>100</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
@ -1071,6 +995,8 @@
</array>
<key>thrust</key>
<real>100</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
@ -1136,6 +1062,8 @@
</array>
<key>thrust</key>
<real>0.0</real>
<key>unpiloted</key>
<true/>
</dict>
<key>cobra3-alternate</key>
<dict>
@ -2449,6 +2377,8 @@
<string>CLASS_MISSILE</string>
<key>thrust</key>
<real>250</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>4500</real>
</dict>
@ -3278,6 +3208,8 @@
<true/>
<key>thrust</key>
<real>0.0</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
@ -3285,50 +3217,10 @@
</dict>
<key>splinter-alternative</key>
<dict>
<key>ai_type</key>
<string>dumbAI.plist</string>
<key>bounty</key>
<integer>1</integer>
<key>cargo_type</key>
<string>CARGO_MINERALS</string>
<key>energy_recharge_rate</key>
<real>0.0</real>
<key>forward_weapon_type</key>
<string>WEAPON_NONE</string>
<key>has_ecm</key>
<false/>
<key>has_escape_pod</key>
<false/>
<key>has_scoop</key>
<false/>
<key>likely_cargo</key>
<integer>0</integer>
<key>max_cargo</key>
<integer>0</integer>
<key>max_energy</key>
<real>5</real>
<key>max_flight_pitch</key>
<real>1</real>
<key>max_flight_roll</key>
<real>1</real>
<key>max_flight_speed</key>
<real>10</real>
<key>missiles</key>
<integer>0</integer>
<key>like_ship</key>
<string>splinter</string>
<key>model</key>
<string>splinter1.dat</string>
<key>name</key>
<string>Splinter</string>
<key>roles</key>
<string>splinter</string>
<key>smooth</key>
<true/>
<key>thrust</key>
<real>0.0</real>
<key>weapon_energy</key>
<real>0.0</real>
<key>weapon_offset_x</key>
<real>0.0</real>
</dict>
<key>strut</key>
<dict>
@ -3340,6 +3232,8 @@
<string>Strut 10-10-30</string>
<key>roles</key>
<string>strut</string>
<key>unpiloted</key>
<true/>
</dict>
<key>tharglet</key>
<dict>
@ -3981,6 +3875,8 @@
<string>CLASS_MISSILE</string>
<key>thrust</key>
<real>250</real>
<key>unpiloted</key>
<true/>
<key>weapon_energy</key>
<real>4500</real>
</dict>

10
src/Core/ShipEntity.m
View File

@ -1374,6 +1374,14 @@ static NSMutableDictionary* smallOctreeDict = nil;
}
}
// unpiloted (like missiles asteroids etc.)
if ([shipdict objectForKey:@"unpiloted"])
{
GLfloat chance = [[shipdict objectForKey:@"unpiloted"] floatValue];
if (randf() < chance)
[self setCrew:[NSArray array]]; // empty array
}
// debugging flags
debug_flag = 0;
if ([shipdict objectForKey:@"debug_flag"])
@ -7370,7 +7378,7 @@ inline BOOL pairOK(NSString* my_role, NSString* their_role)
Entity* switcher = [universe entityForUniversalID:switcher_id];
int rescuer_id = [(NSString*)[tokens objectAtIndex:2] intValue];
Entity* rescuer = [universe entityForUniversalID:rescuer_id];
if ((switcher_id == primaryAggressor)&&(switcher_id == primaryTarget)&&(switcher)&&(rescuer)&&(rescuer->isShip)&&(thanked_ship_id != rescuer_id)&&(scan_class != CLASS_THARGOID))
if ((switcher_id == primaryAggressor)&&(switcher_id == primaryTarget)&&(switcher)&&(rescuer)&&(rescuer->isShip)&&(thanked_ship_id != rescuer_id)&&(scan_class != CLASS_THARGOID)&&(crew != nil)&&([crew count] > 0))
{
if (scan_class == CLASS_POLICE)
[self sendExpandedMessage:@"[police-thanks-for-assist]" toShip:(ShipEntity*)rescuer];