new options, landmaps, mission settings generation update & frontlike smokes generation

ui/configurationmenu.py

@@ -7,3 +7,26 @@ from ui.window import *
 class ConfigurationMenu(Menu):
     def __init__(self, window: Window, parent, game: Game):
         super(ConfigurationMenu, self).__init__(window, parent, game)
+        self.frame = window.right_pane
+        self.player_skill_var = StringVar()
+        self.player_skill_var.set(self.game.player_skill)
+
+        self.enemy_skill_var = StringVar()
+        self.enemy_skill_var.set(self.game.enemy_skill)
+
+    def dismiss(self):
+        self.game.player_skill = self.player_skill_var.get()
+        self.game.enemy_skill = self.enemy_skill_var.get()
+        super(ConfigurationMenu, self).dismiss()
+
+    def display(self):
+        self.window.clear_right_pane()
+
+        Label(self.frame, text="Player coalition skill").grid(row=0, column=0)
+        Label(self.frame, text="Enemy coalition skill").grid(row=1, column=0)
+
+        OptionMenu(self.frame, self.player_skill_var, "Average", "Good", "High", "Excellent").grid(row=0, column=1)
+        OptionMenu(self.frame, self.enemy_skill_var, "Average", "Good", "High", "Excellent").grid(row=1, column=1)
+
+        Button(self.frame, text="Back", command=self.dismiss).grid(row=2, column=0, columnspan=1)
+

ui/eventmenu.py

@@ -30,9 +30,9 @@ class EventMenu(Menu):
         self.window.clear_right_pane()
         row = 0
 
-        def label(text, _row=None, _column=None):
+        def label(text, _row=None, _column=None, sticky=None):
             nonlocal row
-            Label(self.frame, text=text).grid(row=_row and _row or row, column=_column and _column or 0)
+            Label(self.frame, text=text).grid(row=_row and _row or row, column=_column and _column or 0, sticky=sticky)
 
             if _row is None:
                 row += 1
@@ -62,7 +62,12 @@ class EventMenu(Menu):
 
             row += 1
 
-        Checkbutton(self.frame, text="AWACS", var=self.awacs).grid(row=row, column=2)
+        Button(self.frame, text="Commit", command=self.start).grid(column=1, row=row, sticky=E)
+        Button(self.frame, text="Back", command=self.dismiss).grid(column=2, row=row, sticky=E)
+
+        awacs_enabled = self.game.budget >= AWACS_BUDGET_COST and NORMAL or DISABLED
+        Checkbutton(self.frame, text="AWACS ({}m)".format(AWACS_BUDGET_COST), var=self.awacs, state=awacs_enabled).grid(row=row, column=0, sticky=W)
+
         row += 1
 
         label("Aircraft")
@@ -76,17 +81,14 @@ class EventMenu(Menu):
             scrable_row(unit_type, count)
 
         if not self.base.total_planes:
-            label("None")
+            label("None", sticky=W)
 
         label("Armor")
         for unit_type, count in self.base.armor.items():
             scramble_armor_row(unit_type, count)
 
         if not self.base.total_armor:
-            label("None")
-
-        Button(self.frame, text="Commit", command=self.start).grid(column=0, row=row)
-        Button(self.frame, text="Back", command=self.dismiss).grid(column=2, row=row)
+            label("None", sticky=W)
 
     def start(self):
         if self.awacs.get() == 1:

ui/mainmenu.py

@@ -2,6 +2,7 @@ import pickle
 
 from ui.basemenu import *
 from ui.overviewcanvas import *
+from ui.configurationmenu import *
 
 from game.game import *
 from userdata import persistency
@@ -41,7 +42,8 @@ class MainMenu(Menu):
             row += 1
             Separator(self.frame, orient='horizontal').grid(row=row, sticky=EW); row += 1
 
-        Button(self.frame, text="Pass turn", command=self.pass_turn).grid(column=0, row=0, sticky=NE)
+        Button(self.frame, text="Configuration", command=self.configuration_menu).grid(column=0, row=0, sticky=NE)
+        Button(self.frame, text="Pass turn", command=self.pass_turn).grid(column=0, row=0, sticky=N)
         Label(self.frame, text="Budget: {}m (+{}m)".format(self.game.budget, self.game.budget_reward_amount)).grid(column=0, row=0, sticky=NW)
         Separator(self.frame, orient='horizontal').grid(row=row, sticky=EW); row += 1
 
@@ -58,10 +60,16 @@ class MainMenu(Menu):
         self.game.pass_turn(no_action=True)
         self.display()
 
+    def configuration_menu(self):
+        ConfigurationMenu(self.window, self, self.game).display()
+
     def start_event(self, event) -> typing.Callable:
         return lambda: EventMenu(self.window, self, self.game, event).display()
 
     def go_cp(self, cp: ControlPoint):
+        if not cp.captured:
+            return
+
         if self.basemenu:
             self.basemenu.dismiss()
             self.basemenu = None

ui/newgamemenu.py

@@ -7,6 +7,7 @@ from ui.window import *
 class NewGameMenu(Menu):
     selected_country = None  # type: IntVar
     selected_terrain = None  # type: IntVar
+    sams = True
 
     def __init__(self, window: Window, callback: typing.Callable):
         super(NewGameMenu, self).__init__(window, None, None)
@@ -19,6 +20,9 @@ class NewGameMenu(Menu):
         self.selected_terrain = IntVar()
         self.selected_terrain.set(0)
 
+        self.sams = BooleanVar()
+        self.sams.set(1)
+
     @property
     def player_country_name(self):
         if self.selected_country.get() == 0:
@@ -53,7 +57,11 @@ class NewGameMenu(Menu):
         Radiobutton(self.frame, text="Caucasus", variable=self.selected_terrain, value=0).grid(row=1, column=1)
         Radiobutton(self.frame, text="Nevada", variable=self.selected_terrain, value=1).grid(row=2, column=1)
         Radiobutton(self.frame, text="Persian Gulf", variable=self.selected_terrain, value=2).grid(row=3, column=1)
-        Button(self.frame, text="Proceed", command=self.proceed).grid(row=4, column=0, columnspan=2)
+
+        Label(self.frame, text="Options").grid(row=1, column=2)
+        Checkbutton(self.frame, text="SAMs", variable=self.sams).grid(row=1, column=2)
+
+        Button(self.frame, text="Proceed", command=self.proceed).grid(row=4, column=0, columnspan=3)
 
     def proceed(self):
-        self.callback(self.player_country_name, self.enemy_country_name, self.terrain_name)
+        self.callback(self.player_country_name, self.enemy_country_name, self.terrain_name, bool(self.sams.get()))