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

Another adjustment to the planetinfo-gathering debug mode

Browse Source
This commit is contained in:
cim 2014-10-11 17:19:05 +01:00
parent b87d2002c9
commit 26c815b3b5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Entities/PlayerEntity.m
View File

@ -6905,6 +6905,9 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
{ {
misjump = YES; // a script could just have changed this to true; misjump = YES; // a script could just have changed this to true;
} }
#ifdef OO_DUMP_PLANETINFO
misjump = NO;
#endif
if (misjump && [self scriptedMisjumpRange] != 0.5) if (misjump && [self scriptedMisjumpRange] != 0.5)
{ {
[w_hole setMisjumpWithRange:[self scriptedMisjumpRange]]; // overrides wormholes, if player also had non-default scriptedMisjumpRange [w_hole setMisjumpWithRange:[self scriptedMisjumpRange]]; // overrides wormholes, if player also had non-default scriptedMisjumpRange
@ -6922,6 +6925,9 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
if (ship_trade_in_factor < 80) if (ship_trade_in_factor < 80)
malfunc_chance -= (1 + ranrot_rand() % (81-ship_trade_in_factor)) / 2; // increase chance of misjump in worn-out craft malfunc_chance -= (1 + ranrot_rand() % (81-ship_trade_in_factor)) / 2; // increase chance of misjump in worn-out craft
#ifdef OO_DUMP_PLANETINFO
BOOL misjump = NO; // debugging
#else
BOOL malfunc = ((ranrot_rand() & 0xff) > malfunc_chance); BOOL malfunc = ((ranrot_rand() & 0xff) > malfunc_chance);
// 75% of the time a malfunction means a misjump // 75% of the time a malfunction means a misjump
BOOL misjump = [self scriptedMisjump] || (flightPitch == max_flight_pitch) || (malfunc && (randf() > 0.75)); BOOL misjump = [self scriptedMisjump] || (flightPitch == max_flight_pitch) || (malfunc && (randf() > 0.75));
@ -6941,7 +6947,8 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
[self setFuelLeak:[NSString stringWithFormat:@"%f", (randf() + randf()) * 5.0]]; [self setFuelLeak:[NSString stringWithFormat:@"%f", (randf() + randf()) * 5.0]];
} }
} }
#endif
// From this point forward we are -definitely- witchjumping // From this point forward we are -definitely- witchjumping
// burn the full fuel amount to create the wormhole // burn the full fuel amount to create the wormhole