Scenario's default AI difficulty can now be changed via configuration. Default AI difficulty is now easy by default (was normal for scenarios and novice for random games). These changes affect new games only.

Author: javaxubuntu

lib/freeciv/options.py

@@ -72,12 +72,20 @@ def add_feature(self, label, key):
     def add_feature_bool(self, label_t, label_f, key):
         self.add(BoolOptionsButton(label_t, label_f, key))
 
+    def add_difficulty_button(self):
+        def _callback(optionsPanel):
+            change_difficulty(self.difficulty_button)
+
+        self.difficulty_button = ui.Button('Default difficulty for new games: ' + features.get('app.difficulty'), functools.partial(_callback, self))
+        self.add(self.difficulty_button)
+
 def show_options():
     options = OptionsPanel(marginleft=10)
     options.add(ui.Label(('Touch' if osutil.is_android else 'Click') + ' an option to change'))
     options.add_feature('Shutdown game after %d seconds of pause', 'app.shutdown')
     #options.add_feature_bool('New joystick', 'Old joystick', 'app.new_joystick')
     options.add(ui.Button('Change joystick', change_joystick))
+    options.add_difficulty_button()
     options.add(ui.Button('Change ruleset for new games', change_ruleset))
     st = 'Full city label toggle button:'
     options.add_feature_bool(st + ' show', st + ' hide', 'app.full_label_toggle_button')
@@ -179,6 +187,20 @@ def set_ruleset(name):
 
     ui.set_dialog(panel)
 
+def change_difficulty(difficulty_button):
+    def set_difficulty(name):
+        features.set_perm('app.difficulty', name)
+        difficulty_button.set_text('Default difficulty for new games: ' + name)
+        ui.back()
+
+    difficulties = ['handicapped', 'novice', 'easy', 'normal', 'hard', 'cheating']
+    panel = ui.LinearLayoutWidget()
+
+    for difficulty in difficulties:
+        panel.add(ui.Button(difficulty, functools.partial(set_difficulty, difficulty)))
+
+    ui.set_dialog(panel)
+
 def change_joystick():
     def set_type(name):
         features.set_perm('app.joystick', name)

lib/freeciv/save.py

@@ -39,6 +39,7 @@
 from monitor import get_save_dir
 
 features.add_feature('app.ruleset', default='classic')
+features.add_feature('app.difficulty', default='easy')
 
 # Using fork causes the "Failed to connect to game server" error that happens randomly
 # https://stackoverflow.com/questions/6078712/is-it-safe-to-fork-from-within-a-thread#6079669
@@ -132,7 +133,7 @@ def setup_ui(self):
         self.leader_name = 'Player'
         self.city_style = nation[1]
         self.leader_sex = 2
-        self.difficulty = 'novice'
+        self.difficulty = features.get('app.difficulty')
 
         self.set_nation_settings()
         self.set_difficulty_settings()
@@ -324,6 +325,7 @@ def callback():
 
 def load_game_now(port, username):
     client.client.chat('/take "%s"' % username)
+    client.client.chat('/%s' % features.get('app.difficulty'))
     client.client.chat('/start')
     client.client.tick()
     ui.back(allow_override=False)