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

Merge branch 'master' of github.com:OoliteProject/oolite

Browse Source
This commit is contained in:
Kevin Anthoney 2015-03-28 13:01:21 +00:00
commit 2fdd53f50a
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Scenarios/oolite-standard.oolite-save
View File

@ -574,7 +574,7 @@
<key>ship_name</key>
<string>Cobra Mark III</string>
<key>ship_trade_in_factor</key>
<integer>95</integer>
<integer>100</integer>
<key>ship_unique_name</key>
<string></string>
<key>shipyard_record</key>

2
Resources/Scenarios/oolite-strict.oolite-save
View File

@ -574,7 +574,7 @@
<key>ship_name</key>
<string>Cobra Mark III</string>
<key>ship_trade_in_factor</key>
<integer>95</integer>
<integer>100</integer>
<key>ship_unique_name</key>
<string></string>
<key>shipyard_record</key>

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

@ -7090,7 +7090,13 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
// perform any check here for forced witchspace encounters
unsigned malfunc_chance = 253;
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
}
else if (ship_trade_in_factor >= 100)
{
malfunc_chance = 256; // force no misjumps on first jump
}
#ifdef OO_DUMP_PLANETINFO
BOOL misjump = NO; // debugging