weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into frontline

Browse Source
This commit is contained in:
walterroach 2020-11-21 12:50:44 -06:00
commit 8889e35f9e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/db.py
View File

@ -1119,7 +1119,7 @@ TIME_PERIODS = {
} }
REWARDS = { REWARDS = {
"power": 4, "warehouse": 2, "fuel": 2, "ammo": 2, "power": 4, "warehouse": 2, "ware": 2, "fuel": 2, "ammo": 2,
"farp": 1, "fob": 1, "factory": 10, "comms": 10, "oil": 10, "farp": 1, "fob": 1, "factory": 10, "comms": 10, "oil": 10,
"derrick": 8 "derrick": 8
} }

6
qt_ui/windows/groundobject/QGroundObjectMenu.py
View File

@ -130,6 +130,8 @@ class QGroundObjectMenu(QDialog):
total_income = total_income + REWARDS[building.category] total_income = total_income + REWARDS[building.category]
if not building.is_dead: if not building.is_dead:
received_income = received_income + REWARDS[building.category] received_income = received_income + REWARDS[building.category]
else:
logging.warning(building.category + " not in REWARDS")
self.financesBox = QGroupBox("Finances: ") self.financesBox = QGroupBox("Finances: ")
self.financesBoxLayout = QGridLayout() self.financesBoxLayout = QGridLayout()
@ -315,9 +317,9 @@ class QBuyGroupForGroundObjectDialog(QDialog):
self.buyArmorButton.setText("Buy [$" + str(db.PRICES[self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex())] * self.amount.value()) + "M][-$" + str(self.current_group_value) + "M]") self.buyArmorButton.setText("Buy [$" + str(db.PRICES[self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex())] * self.amount.value()) + "M][-$" + str(self.current_group_value) + "M]")
def buyArmor(self): def buyArmor(self):
print("Buy Armor ") logging.info("Buying Armor ")
utype = self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex()) utype = self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex())
print(utype) logging.info(utype)
price = db.PRICES[utype] * self.amount.value() - self.current_group_value price = db.PRICES[utype] * self.amount.value() - self.current_group_value
if price > self.game.budget: if price > self.game.budget:
self.error_money() self.error_money()