CHANGES:

- Penalty: new event "reslot" added

Author: karel26

plugins/punishment/README.md

@@ -27,10 +27,13 @@ DEFAULT:
     human: 12
     AI: 8
     reason: Friendly fire on a team member
-  - event: collision_hit    # if you hit another team member, you get 5 points, 1 if it was an AI.
+  - event: collision_hit    # If you hit another team member, you get 5 points, 1 if it was an AI.
     human: 5
     AI: 1
     reason: Colliding with a team member
+  - event: reslot           # If you re-slotted when being shot at, you get 30 points (you stole a kill)
+    default: 30
+    reason: Respawning when being shot at
   forgive: 30               # People can forgive others in-between of 30 seconds (default) with the .forgive in-game chat command.
   punishments:              # list of punishments, based on the users penalty points
   - points: 100             # we temp-ban the player when they reached 100 points.

plugins/punishment/listener.py

@@ -2,7 +2,7 @@
 import time
 
 from core import EventListener, Server, Player, event, chat_command, get_translation, ChatCommand, Channel, \
-    ThreadSafeDict, Side
+    ThreadSafeDict
 from plugins.competitive.commands import Competitive
 from typing import Optional, TYPE_CHECKING
 
@@ -11,9 +11,9 @@
 
 _ = get_translation(__name__.split('.')[1])
 
-# we can expect any missile that has more than 120s to not hit
+# we can expect any missile that was in the air for more than 60s to not hit
 # TODO: improve that by weapon
-MAX_MISSILE_TIME = 120
+MAX_MISSILE_TIME = 60
 
 
 class PunishmentEventListener(EventListener["Punishment"]):
@@ -257,12 +257,12 @@ async def onPlayerChangeSlot(self, server: Server, data: dict) -> None:
 
         delta_time = int(time.time()) - shot_time
         if delta_time < MAX_MISSILE_TIME:
-            # we will not punish disconnects for now but report them
-            admin = self.bot.get_admin_channel(server)
-            if admin:
-                await admin.send(
-                    "```" + _("Player {} ({}) reslotted after being shot at {} seconds ago.").format(
-                        player.name, player.ucid, delta_time) + "```")
+            event = {
+                "eventName": "reslot",
+                "server_name": server.name,
+                "initiator": player
+            }
+            asyncio.create_task(self._check_punishment(event))
         else:
             # we will not punish reslotting before landing for now but report them
             channel_id = server.channels[Channel.EVENTS]

samples/plugins/punishment.yaml

@@ -17,6 +17,9 @@ DEFAULT:
     human: 5
     AI: 1
     reason: Colliding with a team member
+  - event: reslot           # If you re-slotted when being shot at, you get 30 points (you stole a kill)
+    default: 30
+    reason: Respawning when being shot at
   forgive: 30               # People can forgive others in-between of 30 seconds (default) with the .forgive in-game chat command.
   punishments:              # list of punishments, based on the users penalty points
   - points: 100             # we temp-ban the player when they reached 100 points.

samples/plugins/tournament.yaml

@@ -0,0 +1,38 @@
+DEFAULT:
+  use_signup_form: false      # Do you want the participating squadrons to write an application form on signup? (default: false)
+  match_generation: trueskill # One of trueskill or standard (see below)
+  autostart_matches: false    # If you want your matches to be autostarted by the bot (with a 1 day and 1 hour reminder per DM), set this to true (default: false)
+  coalition_passwords: true   # Auto-generate coalition passwords for red and blue.
+  allow_exports: false        # Do not allow exports (default: false).
+  auto_join: true             # If true, your pilot will be automatically assigned to the associated squadron on join (default: false).
+  delayed_start: 300          # optional: give people 300 seconds to prepare their planes.
+  time_to_choose: 600         # The time in seconds squadrons have to choose their customizations for the next round (default: 600s).
+  sudden_death: false         # true: add one decisive round after the configured rounds were played if no winner was found. false: wait until the best out of X is reached.
+  balance_multiplier: true    # true: use a sophisticated multiplier for credit points, based on the Trueskill™️ difference
+  remove_on_death: .*         # Optional: if set, any unit that was lost and where the name matches this regular expression will be removed in the next round of the same match
+  # mission: Tournament.miz   # Optional: the mission to load, otherwise the current mission is used. (Could be a name or a number. If name it has to be in the mission list.)
+  mission:                    # Optional: if you provide a list of missions, a random pick will be done. Terrain perferences of the squadrons will be considered.
+    - Caucasus.miz            # you need at least (!) one mission on Caucasus or MarianaIslands
+    - PersianGulf.miz         # all missions need to be in your mission list in serverSettings.lua!
+  events:
+    go: {message: "GO GO GO! The fight is now on!", sound: "siren.ogg"}   # Go message to be sent at match start (optional add a sound)
+  presets:
+    file: presets_tournament.yaml
+    initial:                  # presets that have to be applied to any mission
+      - default               # Add a default preset (sample has a sound to be added)
+      - sanitize              # preset to be used for sanitization (security settings in mission)
+      - random_weather        # Randomize the weather
+    even:
+      - switch_sides          # This will switch the blue and red sides on any even round (2, 4, ..)
+    # uneven:                 # just to show you that it is there also
+    choices:  # list of preset | cost in squadron credits
+      'AIM-120': {"costs": 2}                   # each AIM-120 costs you 2 credit points
+      'AIM-9x': {"costs": 1}                    # each AIM-9x costs you 1 credit points
+      'AWACS': {"costs": 0, "max": 1, "ticket": "AWACS"}  # each AWACS costs you no credit points but one AWACS ticket. You can only choose one AWACS per round.
+    tickets:                        # you can get a specific number of tickets per tournament
+      AWACS: {num: 1, credits: 500} # you get 1 ticket per default, but you can optionally sell tickets with /ticket sell and get the number in credits for it
+  channels:
+    info: 112233445566778899      # information channel
+    streamer: 91827364519283745   # channel for a tournament streamer
+    category: 119922883377446655  # a category where all match channels will be created into
+    admin: 998877665544332211     # optional: gamemaster admin channel (if not set, a central admin channel will be used)