Added menu for IntegerSetting.

Removed FloatSetting for player settings.

Author: satoon101

addons/source-python/packages/source-python/menus/base.py

@@ -48,17 +48,17 @@ def __init__(self, data=None, select_callback=None, build_callback=None):
         :param callable|None select_callback: A function that gets called
             whenever a selection was made.
 
-            The callback will recieve 3 parameters:
+            The callback will receive 3 parameters:
                 1. The instance of this menu.
                 2. The player's index who made the selection.
                 3. The player's choice.
 
         :param callable|None build_callback: A function that gets called
             before a menu is displayed.
 
-            The callback will recieve 2 parameters:
+            The callback will receive 2 parameters:
                 1. The instance of this menu.
-                2. The index of the player who will recieve this menu.
+                2. The index of the player who will receive this menu.
         """
         super().__init__(list() if data is None else data)
 
@@ -119,7 +119,7 @@ def send(self, *ply_indexes, **tokens):
         If no indexes were given, the menu will be sent to every player.
 
         :param ply_indexes:
-            Player indexes that should recieve the menu.
+            Player indexes that should receive the menu.
         :param tokens:
             Translation tokens for menu options, title and description.
         """
@@ -237,7 +237,7 @@ def register_select_callback(self, callback):
         :param callable callback: A function that gets called
             whenever a selection was made.
 
-            The callback will recieve 3 parameters:
+            The callback will receive 3 parameters:
                 1. The instance of this menu.
                 2. The player's index who made the selection.
                 3. The player's choice.
@@ -253,9 +253,9 @@ def register_build_callback(self, callback):
         :param callable callback: A function that gets called
             before a menu is displayed.
 
-            The callback will recieve 2 parameters:
+            The callback will receive 2 parameters:
                 1. The instance of this menu.
-                2. The index of the player who will recieve this menu.
+                2. The index of the player who will receive this menu.
         """
         self.build_callback = callback
         return callback

addons/source-python/packages/source-python/settings/player.py

@@ -13,7 +13,7 @@
 from menus import PagedMenu, PagedOption
 from settings.menu import _player_settings
 from settings.types import (
-    BoolSetting, FloatSetting, IntegerSetting, SettingsType, StringSetting
+    BoolSetting, IntegerSetting, SettingsType, StringSetting
 )
 
 
@@ -88,12 +88,6 @@ def __setitem__(self, item, value):
         self.menu.append(PagedOption(
             value.name if value.text is None else value.text, value))
 
-    def add_float_setting(
-            self, name, default, text=None, min_value=None, max_value=None):
-        """Add a new float setting to the dictionary."""
-        self[name] = FloatSetting(name, default, text, min_value, max_value)
-        return self[name]
-
     def add_int_setting(
             self, name, default, text=None, min_value=None, max_value=None):
         """Add a new integer setting to the dictionary."""

addons/source-python/packages/source-python/settings/types.py

@@ -12,8 +12,8 @@
 # Source.Python
 from cvars import ConVar
 from engines.server import engine_server
-from menus import PagedMenu
-from menus import PagedOption
+from menus import PagedMenu, SimpleMenu
+from menus import PagedOption, SimpleOption
 from messages import SayText
 from players.entity import Player
 from players.helpers import uniqueid_from_index
@@ -55,20 +55,23 @@ def __new__(cls, name, default, text=None, *args):
         # Get the new object instance
         self = object.__new__(cls)
 
-        # Store the base attributes
+        # Return the instance
+        return self
+
+    def __init__(self, name, default, text=None, *args):
+        """Store the base attributes and create the menu."""
         self.name = name
         self.default = default
         self.text = text
+        self._create_menu()
 
-        # Store a menu for the object
+    def _create_menu(self):
         self.menu = PagedMenu(
             select_callback=self._chosen_value,
             build_callback=self._menu_build,
-            title=name if text is None else text,
-            description=_settings_strings['Description'])
-
-        # Return the instance
-        return self
+            title=self.name if self.text is None else self.text,
+            description=_settings_strings['Description']
+        )
 
     @property
     def convar(self):
@@ -158,24 +161,117 @@ def _menu_build(self, menu, index):
 
     def _chosen_value(self, menu, index, option):
         """Store the player's chosen value for the setting."""
-        # Get the client's uniqueid
-        uniqueid = uniqueid_from_index(index)
-
         # Set the player's setting
+        uniqueid = uniqueid_from_index(index)
         _player_settings_storage[uniqueid][self.convar] = option.value
 
         # Send the player a message about their changed setting
         _message.send(index, convar=self.convar, value=option.value)
 
 
-class _NumericalSetting(SettingsType):
-    """Class used to store integer/float settings with min/max values."""
+class IntegerSetting(SettingsType):
+    """Class used to store integer value settings."""
+
+    _type = int
 
     def __init__(
-            self, name, default, text=None, min_value=None, max_value=None):
+        self, name, default, text=None, min_value=None, max_value=None
+    ):
         """Store the base attributes on instantiation."""
+        super().__init__(name=name, default=default, text=text)
+        if min_value is not None and max_value is not None:
+            if min_value >= max_value:
+                raise ValueError(
+                    'min_value ({min_value}) must be less than max_value '
+                    '({max_value}).'.format(
+                        min_value=min_value,
+                        max_value=max_value,
+                    )
+                )
         self.min = self._type(min_value) if min_value is not None else None
         self.max = self._type(max_value) if max_value is not None else None
+        self.current_values = {}
+
+    def _create_menu(self):
+        self.menu = SimpleMenu(
+            select_callback=self._chosen_value,
+            build_callback=self._menu_build,
+        )
+
+    def _menu_build(self, menu, index):
+        """Build the menu."""
+        self.menu.clear()
+        self.menu.append(self.name if self.text is None else self.text)
+
+        # Get the player's information
+        player = Player(index)
+        uniqueid = player.uniqueid
+        current_value = self.get_setting(index)
+
+        description = _settings_strings['Description'].get_string(
+            language=player.language,
+            value=current_value,
+        )
+        self.menu.append(description)
+        self.menu.append('-' * len(description))
+        counter = 1
+        if self.min is None or self.max is None or self.max - self.min > 100:
+            for value in (100, -100):
+                self._add_option(choice_index=counter, value=value)
+                counter += 1
+
+        if self.min is None or self.max is None or self.max - self.min > 10:
+            for value in (10, -10):
+                self._add_option(choice_index=counter, value=value)
+                counter += 1
+
+        for value in (1, -1):
+            self._add_option(choice_index=counter, value=value)
+            counter += 1
+
+        if uniqueid not in self.current_values:
+            self.current_values[uniqueid] = current_value
+
+        self.menu.append(
+            SimpleOption(
+                choice_index=counter,
+                text='Save ({current_value})'.format(
+                    current_value=self.current_values[uniqueid],
+                ),
+                value='Save',
+            )
+        )
+
+    def _add_option(self, choice_index, value):
+        """Add the value to the menu."""
+        self.menu.append(
+            SimpleOption(
+                choice_index=choice_index,
+                text='{:+d}'.format(value),
+                value=value,
+            )
+        )
+
+    def _chosen_value(self, menu, index, option):
+        """Store the player's chosen value for the setting."""
+        uniqueid = uniqueid_from_index(index)
+
+        if option.value == 'Save':
+            value = self.current_values[uniqueid]
+
+            # Set the player's setting
+            _player_settings_storage[uniqueid][self.convar] = value
+            _message.send(index, convar=self.convar, value=value)
+            del self.current_values[uniqueid]
+            return
+
+        new_value = self.current_values[uniqueid] + option.value
+        if self.min is not None:
+            new_value = max(new_value, self.min)
+        if self.max is not None:
+            new_value = min(new_value, self.max)
+        self.current_values[uniqueid] = new_value
+        self.menu.send()
 
     def _is_valid_setting(self, value):
         """Return whether the given value is a valid value for the setting."""
@@ -195,18 +291,6 @@ def _is_valid_setting(self, value):
         return True
 
 
-class FloatSetting(_NumericalSetting):
-    """Class used to store float value settings."""
-
-    _type = float
-
-
-class IntegerSetting(_NumericalSetting):
-    """Class used to store integer value settings."""
-
-    _type = int
-
-
 class BoolSetting(SettingsType):
     """Class used to store boolean value settings."""
 
@@ -216,7 +300,10 @@ def __init__(self, *args, **kwargs):
         # TODO: add translations
         for value, name in enumerate(['Yes', 'No']):
             self.menu.append(
-                PagedOption(name, not value)
+                PagedOption(
+                    text=name,
+                    value=not value,
+                )
             )
 
     def _typecast_value(self, value):
@@ -252,7 +339,9 @@ def add_option(self, name, text=None):
 
         # Store the option
         option = self.options[name] = PagedOption(
-            name if text is None else text, name)
+            text=name if text is None else text,
+            value=name,
+        )
 
         # Add the option to the menu
         self.menu.append(option)
@@ -267,6 +356,7 @@ def remove_option(self, name):
                 'Given name "{0}" is not an option'.format(name))
 
         # Delete the option
+        self.menu.remove(self.options[name])
         del self.options[name]
 
     def _is_valid_setting(self, value):