diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m index 84ebfe0f2..0b7a9f5d5 100644 --- a/src/Core/Entities/PlayerEntity.m +++ b/src/Core/Entities/PlayerEntity.m @@ -6788,6 +6788,10 @@ - (void) collectBountyFor:(ShipEntity *)other NSString *bonusMessage = OOExpandKey(@"bounty-awarded", score, credits); [UNIVERSE addDelayedMessage:bonusMessage forCount:6 afterDelay:0.15]; } + + if ([other isHulk]) { + killAward = NO; + } if (killAward) { diff --git a/src/Core/Entities/ShipEntity.m b/src/Core/Entities/ShipEntity.m index 2ade638f1..91f0016bd 100644 --- a/src/Core/Entities/ShipEntity.m +++ b/src/Core/Entities/ShipEntity.m @@ -13296,7 +13296,12 @@ - (void) takeEnergyDamage:(double)amount from:(Entity *)ent becauseOf:(Entity *) } if ((energy < maxEnergy *0.125 || (energy < 64 && energy < amount*2)) && [self hasEscapePod] && (ranrot_rand() & 3) == 0) // 25% chance he gets to an escape pod { - [self abandonShip]; + if ([self abandonShip]) { + if (hunter == PLAYER) { + NSUInteger kills = [hunter score]; + [hunter setScore:(kills+1)]; + } + } } } }