Remove game mode FFA

The mode is too buggy at the moment.

Signed-off-by: BackRaw <backraw@gmx.de>

README.md

@@ -26,7 +26,6 @@ See the [issues list](https://github.com/backraw/udm/issues) for current bugs.
 * Noblock (see the config file below)
 * Give back High Explosive grenade (4 options - see the config file below)
 * Restore the killer's health to 100HP if they killed an enemy with the knife (see the config file below)
-* Free for All mode
 
 Check out the tech demo: https://www.youtube.com/watch?v=srTt0N0AakQ
 

addons/source-python/plugins/udm/config.py

@@ -44,16 +44,6 @@
         'The spawn protection delay (in seconds).'
     )
 
-    config.text('----------------------------------')
-    config.text('   * Free for All')
-    config.text('----------------------------------')
-
-    cvar_ffa = config.cvar(
-        'ffa',
-        1,
-        'Enable Free for All'
-    )
-
     config.text('----------------------------------')
     config.text('   * Infinite Ammo')
     config.text('----------------------------------')

addons/source-python/plugins/udm/players/__init__.py

@@ -64,9 +64,6 @@
 # Store personal player random weapons
 player_random_weapons = defaultdict(lambda: {tag: list() for tag in weapon_manager.tags})
 
-# Store FFA team changes
-player_ffa_team_changes = set()
-
 
 # =============================================================================
 # >> PLAYER ENTITY
@@ -421,25 +418,6 @@ def get_team_changes(self):
     # Set the `team_changes` property for PlayerEntity
     team_changes = property(get_team_changes, set_team_changes)
 
-    def set_ffa_team_changed(self, value):
-        """Handle FFA team changes."""
-        # Switch the player silently to the other team
-        self.team_index = 5 - self.team
-
-        # Add or remove the player to the list of FFA team changes
-        # depending on whether it should be enabled or disabled
-        if value:
-            player_ffa_team_changes.add(self.userid)
-
-        elif self.userid in player_ffa_team_changes:
-            player_ffa_team_changes.remove(self.userid)
-
-    def get_ffa_team_changed(self):
-        """Return whether the player's team has been changed due to FFA."""
-        return self.userid in player_ffa_team_changes
-
-    ffa_team_changed = property(get_ffa_team_changed, set_ffa_team_changed)
-
     def set_inventory_selection(self, inventory_index):
         """Set the player's inventory selection to `inventory_index`."""
         player_inventories.selections[self.uniqueid] = inventory_index

addons/source-python/plugins/udm/udm.py

@@ -18,11 +18,9 @@
 #   Cvars
 from cvars import cvar
 #   Entities
-from entities import TakeDamageInfo
 from entities.entity import Entity
 from entities.hooks import EntityCondition
 from entities.hooks import EntityPreHook
-from entities.hooks import EntityPostHook
 #   Events
 from events import Event
 from events.hooks import PreEvent
@@ -45,12 +43,10 @@
 from udm.admin import admin_menu
 #   Colors
 from udm.colors import MESSAGE_COLOR_WHITE
-from udm.colors import MESSAGE_COLOR_ORANGE
 #   Config
 from udm.config import cvar_enable_infinite_ammo
 from udm.config import cvar_enable_noblock
 from udm.config import cvar_equip_hegrenade
-from udm.config import cvar_ffa
 from udm.config import cvar_refill_clip_on_headshot
 from udm.config import cvar_respawn_delay
 from udm.config import cvar_restore_health_on_knife_kill
@@ -72,7 +68,6 @@
 #   Players
 from udm.players import player_random_weapons
 from udm.players import player_spawn_locations
-from udm.players import player_ffa_team_changes
 from udm.players import player_team_changes
 from udm.players import PlayerEntity
 #   Spawn Points
@@ -166,14 +161,6 @@ def on_player_spawn(game_event):
     if not player.dead and player.team > 1:
         prepare_player(player)
 
-        # Tell the player about the Free for All mode setting
-        # if they haven't configured their inventory yet
-        if not player.inventory:
-            player.tell(
-                f'{MESSAGE_COLOR_WHITE}Free for All mode: {MESSAGE_COLOR_ORANGE}'
-                f"{'Enabled' if cvar_ffa.get_int() else 'Disabled'}"
-            )
-
 
 @Event('player_death')
 def on_player_death(game_event):
@@ -331,41 +318,6 @@ def on_pre_drop_weapon(stack_data):
         )
 
 
-@EntityPreHook(EntityCondition.is_human_player, 'on_take_damage')
-@EntityPreHook(EntityCondition.is_bot_player, 'on_take_damage')
-def on_pre_take_damage(stack_data):
-    """Handle team changes for FFA mode."""
-    if cvar_ffa.get_int():
-
-        # Get a PlayerEntity instance for the victim
-        victim = make_object(PlayerEntity, stack_data[0])
-
-        # Get the take damage info
-        damage_info = make_object(TakeDamageInfo, stack_data[1])
-
-        # Get PlayerEntity instance for the attacker
-        if damage_info.attacker > 0:
-            attacker = PlayerEntity(damage_info.attacker)
-
-            # Change the victim's team index if both players are on the same team
-            if attacker.team == victim.team:
-                victim.ffa_team_changed = True
-
-
-@EntityPostHook(EntityCondition.is_human_player, 'on_take_damage')
-@EntityPostHook(EntityCondition.is_bot_player, 'on_take_damage')
-def on_post_take_damage(stack_data, unused):
-    """Revert FFA team changes."""
-    if cvar_ffa.get_int():
-
-        # Get a PlayerEntity instance for the victim
-        victim = make_object(PlayerEntity, stack_data[0])
-
-        # Switch the player back to their original team, if a team change happened because of the FFA mode.
-        if victim.ffa_team_changed:
-            victim.ffa_team_changed = False
-
-
 @EntityPreHook(is_silencer_option_primary, 'secondary_attack')
 @EntityPreHook(is_silencer_option_secondary, 'secondary_attack')
 def on_pre_secondary_fire(stack_data):
@@ -597,8 +549,5 @@ def unload():
     # Clear player team change counts
     player_team_changes.clear()
 
-    # Clear the list of FFA-caused team changes
-    player_ffa_team_changes.clear()
-
     # Restart the game after 1 second
     mp_restartgame.set_int(1)