From 3bc9a901576e0f4e8f35d1c19fa897711aae1d38 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@comcast.net>
Date: Tue, 28 Apr 2015 22:24:57 -0400
Subject: [PATCH] More LBFO widescreen

---
 toontown/cogdominium/CogdoFlyingGameGlobals.py |  4 ++--
 toontown/cogdominium/CogdoFlyingGuiManager.py  | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/toontown/cogdominium/CogdoFlyingGameGlobals.py b/toontown/cogdominium/CogdoFlyingGameGlobals.py
index 8acc076b..ef11e3b7 100644
--- a/toontown/cogdominium/CogdoFlyingGameGlobals.py
+++ b/toontown/cogdominium/CogdoFlyingGameGlobals.py
@@ -133,7 +133,7 @@ Gameplay.MinionScale = 0.8
 Gui = VariableContainer()
 Gui.FuelNumBladesPos2D = (-0.005, -0.017)
 Gui.FuelNumBladesScale = 0.07
-Gui.FuelPos2D = (-1.19, -0.24)
+Gui.FuelPos2D = (0.143, 0.760)
 Gui.NumBlades2FuelColor = {0: (0.9, 0.15, 0.15, 1.0),
  1: (0.9, 0.15, 0.15, 1.0),
  2: (0.9, 0.9, 0.15, 1.0),
@@ -141,7 +141,7 @@ Gui.NumBlades2FuelColor = {0: (0.9, 0.15, 0.15, 1.0),
 Gui.FuelNormalColor = (0.25, 0.65, 0.25, 1.0)
 Gui.FuelLowColor = (0.9, 0.9, 0.15, 1.0)
 Gui.FuelVeryLowColor = (0.9, 0.15, 0.15, 1.0)
-Gui.ProgressPos2D = (1.15, -0.15)
+Gui.ProgressPos2D = (-0.183, 0.85)
 Gui.ProgressHPos2D = (0, 0.82)
 Gui.MarkerScale = 0.03
 Gui.LocalMarkerScale = 0.0425
diff --git a/toontown/cogdominium/CogdoFlyingGuiManager.py b/toontown/cogdominium/CogdoFlyingGuiManager.py
index f7a46b14..eb31d70b 100644
--- a/toontown/cogdominium/CogdoFlyingGuiManager.py
+++ b/toontown/cogdominium/CogdoFlyingGuiManager.py
@@ -20,12 +20,18 @@ class CogdoFlyingGuiManager:
         self.root = NodePath('CogdoFlyingGui')
         self.root.reparentTo(aspect2d)
         self.root.stash()
+        self.fuelGui = NodePath('CogdoFlyingFuelGui')
+        self.fuelGui.reparentTo(base.a2dBottomLeft)
+        self.fuelGui.stash()
+        self.progressGui = NodePath('CogdoFlyingProgressGui')
+        self.progressGui.reparentTo(base.a2dBottomRight)
+        self.progressGui.stash()
         self._initTimer()
         self._initHud()
         self._initMessageDisplay()
         self.sentTimeRunningOutMessage = False
-        self._refuelGui = CogdoFlyingFuelGui(self.root)
-        self._progressGui = CogdoFlyingProgressGui(self.root, self._level)
+        self._refuelGui = CogdoFlyingFuelGui(self.fuelGui)
+        self._progressGui = CogdoFlyingProgressGui(self.progressGui, self._level)
 
     def _initHud(self):
         self._memoGui = CogdoMemoGui(self.root, 'memo_card')
@@ -50,6 +56,8 @@ class CogdoFlyingGuiManager:
 
     def onstage(self):
         self.root.unstash()
+        self.fuelGui.unstash()
+        self.progressGui.unstash()
         self._refuelGui.hide()
         self._progressGui.hide()
 
@@ -67,6 +75,8 @@ class CogdoFlyingGuiManager:
 
     def offstage(self):
         self.root.stash()
+        self.fuelGui.stash()
+        self.progressGui.stash()
         self._refuelGui.hide()
         self._progressGui.hide()
         self.hideTimer()
@@ -164,4 +174,8 @@ class CogdoFlyingGuiManager:
         self._messageDisplay = None
         self.root.removeNode()
         self.root = None
+        self.fuelGui.removeNode()
+        self.fuelGui = None
+        self.progressGui.removeNode()
+        self.progressGui = None
         return