weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

carrier ops; persistency; ui improvements; refactoring

Browse Source
This commit is contained in:
Vasyl Horbachenko
2018-06-13 00:15:27 +03:00
parent 3d0babf65f
commit dc303997a6
22 changed files with 348 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/basemenu.py
View File

@@ -1,7 +1,3 @@
from shop import db
from tkinter import *
from ui.window import *
from ui.eventmenu import *
from game.game import *

7
ui/eventmenu.py
View File

@@ -1,10 +1,7 @@
from tkinter import *
from ui.window import *
from ui.eventresultsmenu import *
from shop import db
from game.game import *
from game import event
from game import event, db
class EventMenu(Menu):
@@ -55,7 +52,7 @@ class EventMenu(Menu):
row += 1
base = None # type: Base
if self.event.attacker.name == self.game.player:
if self.event.attacker_name == self.game.player:
base = self.event.from_cp.base
else:
base = self.event.to_cp.base

29
ui/eventresultsmenu.py
View File

@@ -1,13 +1,7 @@
import math
import itertools
from tkinter import *
from tkinter.ttk import *
from ui.window import *
from userdata.debriefing_parser import *
from game.game import *
from game import event
class EventResultsMenu(Menu):
@@ -21,18 +15,22 @@ class EventResultsMenu(Menu):
self.event = event
self.finished = False
wait_for_debriefing(lambda: self.process_debriefing)
def display(self):
self.window.clear_right_pane()
if not self.finished:
Button(self.frame, text="no losses, succ", command=self.simulate_result(0, 1, True)).grid()
Button(self.frame, text="no losses, fail", command=self.simulate_result(0, 1, False)).grid(column=1)
Button(self.frame, text="no losses, fail", command=self.simulate_result(0, 1, False)).grid(row=1, column=1)
Button(self.frame, text="half losses, succ", command=self.simulate_result(0.5, 0.5, True)).grid(row=1, )
Button(self.frame, text="half losses, fail", command=self.simulate_result(0.5, 0.5, False)).grid(row=1, column=1)
Button(self.frame, text="half losses, succ", command=self.simulate_result(0.5, 0.5, True)).grid(row=2, )
Button(self.frame, text="half losses, fail", command=self.simulate_result(0.5, 0.5, False)).grid(row=2, column=1)
Button(self.frame, text="full losses, succ", command=self.simulate_result(1, 0, True)).grid(row=2, )
Button(self.frame, text="full losses, fail", command=self.simulate_result(1, 0, False)).grid(row=2, column=1)
Button(self.frame, text="full losses, succ", command=self.simulate_result(1, 0, True)).grid(row=3, )
Button(self.frame, text="full losses, fail", command=self.simulate_result(1, 0, False)).grid(row=3, column=1)
Label(self.frame, text="Play the mission and save debriefing to {}".format(debriefing_directory_location())).grid(row=0, column=0)
else:
row = 0
if self.event.is_successfull(self.debriefing):
@@ -56,6 +54,15 @@ class EventResultsMenu(Menu):
Button(self.frame, text="Okay", command=self.dismiss).grid(columnspan=1, row=row); row += 1
def process_debriefing(self, debriefing: Debriefing):
self.game.finish_event(debriefing)
self.game.pass_turn()
self.finished = True
self.player_losses = debriefing.destroyed_units[self.game.player]
self.enemy_losses = debriefing.destroyed_units[self.game.enemy]
self.display()
def simulate_result(self, player_factor: float, enemy_factor: float, result: bool):
def action():
debriefing = Debriefing()

17
ui/mainmenu.py
View File

@@ -1,12 +1,10 @@
from tkinter import *
from tkinter.ttk import *
import pickle
from ui.window import *
from ui.eventmenu import *
from ui.basemenu import *
from ui.overviewcanvas import *
from game.game import *
from userdata import persistency
class MainMenu(Menu):
@@ -22,9 +20,10 @@ class MainMenu(Menu):
self.frame.grid_columnconfigure(0, weight=1)
def display(self):
persistency.save_game(self.game)
self.window.clear_right_pane()
self.upd.update()
row = 1
def label(text):
@@ -51,7 +50,13 @@ class MainMenu(Menu):
if event.informational:
continue
event_button(event, "{} {}".format(event.attacker.name != self.game.player and "!" or " ", event))
prefix = ""
if event.attacker_name != self.game.player:
prefix += "!"
elif event.from_cp.is_global:
prefix += "CARRIER"
event_button(event, "{} {}".format(prefix, event))
def pass_turn(self):
self.game.pass_turn(no_action=True)

4
ui/overviewcanvas.py
View File

@@ -79,7 +79,9 @@ class OverviewCanvas:
extent=extent)
self.canvas.tag_bind(cp_id, "<Button-1>", self.display(cp))
self.create_cp_title((coords[0] + arc_size/2, coords[1] + arc_size/2), cp)
self.canvas.create_text(coords[0], coords[1] - arc_size / 1.5, text="8/4/2", font=("Helvetica", 10))
units_title = "{}/{}/{}".format(cp.base.total_planes, cp.base.total_armor, cp.base.total_aa)
self.canvas.create_text(coords[0], coords[1] - arc_size / 1.5, text=units_title, font=("Helvetica", 10))
def display(self, cp: ControlPoint):
def action(_):