diff --git a/SBA_Serv/GUI/ObjWrappers/ShipWrapper.py b/SBA_Serv/GUI/ObjWrappers/ShipWrapper.py index 02016ec..5e3fa08 100644 --- a/SBA_Serv/GUI/ObjWrappers/ShipWrapper.py +++ b/SBA_Serv/GUI/ObjWrappers/ShipWrapper.py @@ -34,7 +34,7 @@ def draw(self, surface, flags, sp=None): yoff = 0 steer = self._worldobj.commandQueue.containstype(SteerCommand) - if steer: + if steer and steer.orgdeg != 0: if steer.orgdeg > 0: steer = -math.sin(steer.percent() * math.pi) else: diff --git a/SBA_Serv/Game/Game.py b/SBA_Serv/Game/Game.py index 90a314d..ed778a5 100644 --- a/SBA_Serv/Game/Game.py +++ b/SBA_Serv/Game/Game.py @@ -481,6 +481,17 @@ def player_died(self, player, gone): player.deaths += 1 if self._points_lost_on_death > 0: player.update_score(-self._points_lost_on_death) + + if self._primary_victory == "bestscore": + # we need to subtract/add to bestscore in stead + if self._primary_victory_high: + player.bestscore -= self._points_lost_on_death + if player.bestscore < 0: + player.bestscore = 0 + else: + player.bestscore += self._points_lost_on_death + if player.bestscore > self._points_initial: + player.bestscore = self._points_initial if self._reset_score_on_death: self._player_reset_score(player) diff --git a/SBA_Serv/buildnum b/SBA_Serv/buildnum index dbbcbc8..63192f7 100644 --- a/SBA_Serv/buildnum +++ b/SBA_Serv/buildnum @@ -1 +1 @@ -1123 \ No newline at end of file +1124 \ No newline at end of file diff --git a/SBA_Serv/game_thehungerbaubles.cfg b/SBA_Serv/game_thehungerbaubles.cfg index bfdbea7..6a2f6d6 100644 --- a/SBA_Serv/game_thehungerbaubles.cfg +++ b/SBA_Serv/game_thehungerbaubles.cfg @@ -45,6 +45,7 @@ spawn_time_max = 15 [Game] game = TheHungerBaubles reset_score_on_death = true +points_lost_on_death = 4 primary_victory_attr = bestscore secondary_victory_attr = collected diff --git a/changelog.md b/changelog.md index bc52c31..09a9031 100644 --- a/changelog.md +++ b/changelog.md @@ -31,10 +31,12 @@ v1.2 : Planned - May 2016 [Season 5] - The Hunger Baubles * Spawn Manager fixed to only look at specific Type for evaluating min/max not Subclasses. * Added option for Torpedoes to be effected by gravity **pull_weapon** * Added **enable_commands** [Server] config option. + * *points_lost_on_death* can be used in bestscore games. * Split 'explodable' from 'gravitable' for Entities, two separate object flags now. * Can click ships in tracking mode to switch tracking to the clicked ship. * Separated option for 'showip' in Application settings to decouple from showing statistics, no longer always show IP in Debug mode. * 3 New Ship Graphics + * SteerCommand now shown visually with a 'bank' * Fixed issue with LowerEnergyScoopCommand and Dragons * Add Microsoft Message Analyzer Log Parser Support * **Breaking Changes:**