touchdown - The Eagle Has Landed

Author: NapoII

Discord_Rust_Team_bot/Discord_Rust_Team_bot.py

@@ -105,7 +105,7 @@ def __init__(self):
             "discord_cogs.help_command",
             "discord_cogs.Rust.server_stats",
             "discord_cogs.Rust.ChannelHoper",
-            "discord_cogs.Rust.Team_Checker",
+            "discord_cogs.Rust.team_check",
         ]
 
     async def setup_hook(self):
@@ -196,6 +196,25 @@ async def on_ready(self):
 
                 Rust_info = await guild.create_text_channel("💻 Rust_info", category=category_Rust)
 
+                embed = discord.Embed(title="#rust-info", color=0x8080ff)
+                embed.set_author(name=f"@{guild.name}",
+                                icon_url=f"https://i.imgur.com/sGX6nZz.png")
+                embed.set_thumbnail(url="https://i.imgur.com/sdr9twR.png")
+                all_commands = """`!rust help` - List of all commands
+                `!rust cctv` - List of all CCTV codes
+                `!rust pager` - List of all pager codes
+                `!rust cost` - Important prices
+                `!rust fert {Number of Fertilizers}` - How much Scrap from x Fertilizer
+                `!rust diesel {Number of Diesel}` - Giant Excavator / Mining Quarry - Calculator
+                `!rust sulfur {Number of sulphur}` - How much boom from x suflur
+                `!rust raid` - Raid costs list
+                `!rust bind` - Must-have Extra Bind's
+                `!rust elec` - Must have Electronic Circuits
+                """
+                embed.add_field(name="All Commands:",
+                                value=all_commands, inline=True)
+                await Rust_info.send(embed=embed)
+
                 rust_info_channel_id = Rust_info.id
                 rust_info_channel_name = Rust_info.name
                 write_config(config_dir, "Channel",

Discord_Rust_Team_bot/cfg/Team_data.json

@@ -1,14 +1,3 @@
 {
-    "Teams": {
-        "aaa": {
-            "note": "bbb",
-            "embed_id": 1106315540886212708,
-            "Sub_Discord_ID_list": [],
-            "Last_Status": true,
-            "ThatsWutSheZed": {
-                "ID": "977065329",
-                "note": "https://steamcommunity.com/profiles/76561198048069955/"
-            }
-        }
-    }
-}
+    "Teams": {}
+}

Discord_Rust_Team_bot/cfg/config.ini

@@ -1,21 +1,21 @@
 [Client]
-guild_id = 1103399447100133386
+guild_id = 
 activity = Farm Sulfur
 praefix = !
 
 [Channel]
-admin_channel_id = 1106276696304390287
-delt_messages_channel_id = 1106276698628046948
-server_stats_channel_id = 1106276688062591097
-rust_info_channel_id = 1106276690314928240
-player_observation_channel_id = 1106276689207640184
-hopper_voice_channel_id = 1106276692852494446
-category_rust_id = 1106276686774939659
+admin_channel_id = 1
+delt_messages_channel_id = 1
+server_stats_channel_id = 1
+rust_info_channel_id = 1
+player_observation_channel_id = 1
+hopper_voice_channel_id = 1
+category_rust_id = 1
 player_observation_id = 1
 
 [Rust]
 battlemetrics_server_id = 15343129
-rust_server_description_message_id = 1106277365140705300
-rust_server_embed_message_id = 1106277362846416976
+rust_server_description_message_id = 1
+rust_server_embed_message_id = 1
 rust_server_map_embed_message_id = 1
 

Discord_Rust_Team_bot/cfg/token.ini

@@ -1,3 +1,3 @@
 [Discord]
-token = 
-application_id = 
+token =
+application_id =

Discord_Rust_Team_bot/discord_cogs/Rust/Rust_info.py

@@ -24,7 +24,8 @@
 
 guild = discord.Object(id=guild_id)
 
-rust_info_channel_id = read_config(config_dir, "Channel", "rust_info_channel_id")
+rust_info_channel_id = read_config(
+    config_dir, "Channel", "rust_info_channel_id")
 if rust_info_channel_id == None:
     rust_info_channel_id = 1
 rust_info_channel_id = int(rust_info_channel_id)
@@ -53,8 +54,10 @@ async def send_info(self, ctx: commands.Context, first: str, second: str | None
             `!rust fert {Number of Fertilizers}` - How much Scrap from x Fertilizer
             `!rust diesel {Number of Diesel}` - Giant Excavator / Mining Quarry - Calculator
             `!rust sulfur {Number of sulphur}` - How much boom from x suflur
-            `!rust raid` - Überfallkosten Liste
-            `!rust bind` - Must-have Extra Bind's"""
+            `!rust raid` - Raid costs list
+            `!rust bind` - Must-have Extra Bind's
+            `!rust elec` - Must have Electronic Circuits
+            """
             embed.add_field(name="All Commands:",
                             value=all_commands, inline=True)
             await rust_info_channel.send(embed=embed)
@@ -361,6 +364,17 @@ async def send_info(self, ctx: commands.Context, first: str, second: str | None
                 name="More", value="Steam Guide: [Must-have Extra Bind](https://steamcommunity.com/sharedfiles/filedetails/?id=2493654016)", inline=False)
             await rust_info_channel.send(embed=embed)
 
+        if first.lower() == "elec":
+
+            embed = discord.Embed(title="Must have Electronic Circuits",
+                                  url="https://steamcommunity.com/sharedfiles/filedetails/?id=2375732344", description="a collection of my must-have Electronic Circuits for Rust!")
+            embed.set_author(name=f"@{ctx.author}",
+                             icon_url=f"{display_avatar}")
+            embed.set_thumbnail(
+                url="https://steamuserimages-a.akamaihd.net/ugc/2039609591868400626/3DDEBD3AAF15EE8C54E98FE9805530E56FCC247B/?imw=128&imh=128&ima=fit&impolicy=Letterbox&imcolor=%23000000&letterbox=true")
+            embed.add_field(name="Steam", value="Steam Guide: [Must-have Extra Bind](https://steamcommunity.com/sharedfiles/filedetails/?id=2375732344)", inline=False)
+            await rust_info_channel.send(embed=embed)
+
 
 async def setup(bot: commands.Bot):
     await bot.add_cog(Rust_Info(bot))

Discord_Rust_Team_bot/discord_cogs/Rust/player_watch.py

@@ -1,12 +1,10 @@
 """Full Doku on: https://github.com/NapoII/Discord_Rust_Team_bot"
 -----------------------------------------------
-Diese COG ist für Spielerkarten, um die letzte Aktiviti zu sehen.
-e.g. : 
-Wohnort ?
+This COG is for player cards to see the latest activiti.
 Team note: ?
-aktualisiert vor 7 Minuten
+updated 7 minutes ago
 FRED
-🔴 vor einem Monat
+🔴 one month ago
 ServerZeit: 223.61h
 note: Close by
 Player ID: 244928103
@@ -18,7 +16,7 @@
 from discord.ext import commands, tasks
 from discord.ui import Select, View
 from numpy import append
-import asyncio
+
 
 from util.__funktion__ import *
 
@@ -64,11 +62,13 @@
 player_observation_channel_id = int(read_config(
     config_dir, "Channel", "player_observation_channel_id"))
 
-Rust_Bot_Channel_ID = read_config(config_dir, "Channel", "player_observation_channel_id")
+Rust_Bot_Channel_ID = read_config(
+    config_dir, "Channel", "player_observation_channel_id")
 if Rust_Bot_Channel_ID == None:
     Rust_Bot_Channel_ID = 1
 Rust_Bot_Channel_ID = int(Rust_Bot_Channel_ID)
 
+
 class New_player(commands.Cog):
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
@@ -82,24 +82,28 @@ async def choise_team(self, interaction: discord.Interaction, player_name: str,
         self.player_name = player_name
         self.player_note = player_note
 
-        thinking = self.bot.get_emoji(123456789)  # replace with your thinking emoji ID
-        
+        # replace with your thinking emoji ID
+        thinking = self.bot.get_emoji(123456789)
 
         # Send the embed with the thinking animation
-        embed = discord.Embed(title="Adding player...", description=f"{thinking} Thinking...", color=discord.Color.blurple())
+        embed = discord.Embed(
+            title="Adding player...", description=f"{thinking} Thinking...", color=discord.Color.blurple())
         msg = await interaction.response.send_message(embed=embed, ephemeral=True, )
 
-        battlemetrics_server_id = read_config(config_dir, "Rust", "battlemetrics_server_id")
+        battlemetrics_server_id = read_config(
+            config_dir, "Rust", "battlemetrics_server_id")
 
         if "id-" in player_name:
             player_id = player_name.split("id:")[1]
 
         else:
-            player_id = get_player_id_from_name(player_name, battlemetrics_server_id)
+            player_id = get_player_id_from_name(
+                player_name, battlemetrics_server_id)
 
         if player_id == None:
             s_url = f"https://www.battlemetrics.com/players?filter%5Bsearch%5D={player_name}&filter%5BplayerFlags%5D=&filter%5Bservers%5D={battlemetrics_server_id}&sort=-lastSeen"
-            embed=discord.Embed(title=f"No search results with {player_name}", url=s_url, description="Try to find the player by yourself and add the ID to the next request with `id:{battlemetrics_player_id}`.", color=0xff0000)
+            embed = discord.Embed(title=f"No search results with {player_name}", url=s_url,
+                                  description="Try to find the player by yourself and add the ID to the next request with `id:{battlemetrics_player_id}`.", color=0xff0000)
             await interaction.response.send_message(embed=embed, ephemeral=True)
         else:
             player_id = int(player_id)
@@ -143,23 +147,24 @@ async def choise_team(self, interaction: discord.Interaction, player_name: str,
             if player_online_status == False or player_online_status == "never_played":
                 if player_online_status == "never_played":
                     embed = discord.Embed(title=f"{Player_name}", url=f"https://www.battlemetrics.com/players/{player_id}",
-                                        description=("❌ | ID: "+str(player_id)), color=0xff0000)
+                                          description=("❌ | ID: "+str(player_id)), color=0xff0000)
                     value = f"❌ `Never played on that Server` ❌ | note: `{player_note}`"
                     embed.add_field(name=Player_name, value=value, inline=True)
                 else:
                     embed = discord.Embed(title=f"{Player_name}", url=f"https://www.battlemetrics.com/players/{player_id}",
-                                        description=("🔴 | ID: "+str(player_id)), color=0xff0000)
+                                          description=("🔴 | ID: "+str(player_id)), color=0xff0000)
                     embed.add_field(name="Last Seen",
                                     value=f"{player_lastSeen}", inline=True)
                     embed.add_field(
                         name="Note", value=f"{player_note}", inline=True)
                     embed.set_footer(text=f"Select team:")
             else:
                 embed = discord.Embed(title=f"{Player_name}", url=f"https://www.battlemetrics.com/players/{player_id}",
-                                    description=f"🟢 | ID: {player_id}", color=0xff8040)
+                                      description=f"🟢 | ID: {player_id}", color=0xff8040)
                 embed.add_field(name="Online since",
                                 value=f"{player_lastSeen}", inline=True)
-                embed.add_field(name="Note", value=f"{player_note}", inline=True)
+                embed.add_field(
+                    name="Note", value=f"{player_note}", inline=True)
                 embed.set_footer(text=f"Select team:")
 
             Team_list = Team_choice(file_path_Team_data)
@@ -204,16 +209,11 @@ async def my_callback(interaction):
             select.callback = my_callback
             view = View()
             view.add_item(select)
-            
+
             if msg is not None:
                 await msg.edit(embed=embed, view=view)
             else:
-                await interaction.channel.send(embed=embed, delete_after=10, view=view)
-
-
-
-
-
+                await interaction.channel.send(embed=embed, delete_after=30, view=view)
 
 
 class Confirm_say(discord.ui.View):
@@ -250,7 +250,7 @@ class modal_New_team(ui.Modal, title="New Team",):
     log("modal_New_team: New_Team_name | New_team_note |")
 
     async def on_submit(self, interaction: discord.Interaction):
-        
+
         embed = discord.Embed(title=self.New_Team_name,
                               description=self.New_team_note, color=0xc0c0c0)
         view = Confirm_say()
@@ -275,7 +275,6 @@ async def on_submit(self, interaction: discord.Interaction):
             Team_Card_embed_id = 0
             log(f'Confirmed... self.confirm_Button = {self.confirm_Button}')
 
-
             JSOn_data = open_JSOn_File(file_path_Team_data)
             JSOn_data = add_Team(JSOn_data, self.New_Team_name,
                                  self.New_team_note, Team_Card_embed_id)
@@ -286,7 +285,8 @@ async def on_submit(self, interaction: discord.Interaction):
 
             # add_player(dict, team, name, id, note):
 
-            JSOn_data = add_player(JSOn_data, self.New_Team_name, player_name_str, player_id_int, player_note_str)
+            JSOn_data = add_player(
+                JSOn_data, self.New_Team_name, player_name_str, player_id_int, player_note_str)
 
             Fill_JSOn_File(file_path_Team_data, JSOn_data)
 
@@ -332,12 +332,13 @@ async def on_submit(self, interaction: discord.Interaction):
                     break
                 #player_observation_channel_id = int(read_config(config_dir, "Channel", "player_observation_channel_id"))
                 try:
-                    player_observation_channel = interaction.client.get_channel(player_observation_channel_id)
+                    player_observation_channel = interaction.client.get_channel(
+                        player_observation_channel_id)
                     msg = await player_observation_channel.fetch_message(embed_ID_list[x])
                     await msg.delete()
-                    log (f"No msg delt","blue")
+                    log(f"No msg delt", "blue")
                 except:
-                    log (f"No msg to delt","blue")
+                    log(f"No msg to delt", "blue")
 
             dictionary = {"Teams": {}}
             Fill_JSOn_File(file_path_Team_data, dictionary)
@@ -485,7 +486,8 @@ async def my_callback(interaction: discord.Interaction):
                 JSOn_data = delt_Team(JSOn_data, Team_name)
                 Fill_JSOn_File(file_path_Team_data, JSOn_data)
 
-                player_observation_channel = interaction.client.get_channel(player_observation_channel_id)
+                player_observation_channel = interaction.client.get_channel(
+                    player_observation_channel_id)
                 log(f"msg delt: {embed_id}: Team embed ({Team_name})")
                 msg = await player_observation_channel.fetch_message(embed_id)
                 await msg.delete()
@@ -641,19 +643,23 @@ async def myLoop(self, bot,):
                             await User.send(embed=embed)
 
             try:
-                player_observation_channel = self.bot.get_channel(player_observation_channel_id)
+                player_observation_channel = self.bot.get_channel(
+                    player_observation_channel_id)
                 msg = await player_observation_channel.fetch_message(Team_embed_id)
                 await msg.edit(embed=embed)
-                log(f"Discord: Edit Embed from Team [{Team_Name}] msg.id: [{msg.id}]")
+                log(
+                    f"Discord: Edit Embed from Team [{Team_Name}] msg.id: [{msg.id}]")
             except:
                 try:
                     JSOn_data = open_JSOn_File(file_path_Team_data)
-                    player_observation_channel = self.bot.get_channel(player_observation_channel_id)
+                    player_observation_channel = self.bot.get_channel(
+                        player_observation_channel_id)
                     Team_Card_embed = await player_observation_channel.send(embed=embed, view=Sub_button())
                     Team_Card_embed_id = (Team_Card_embed.id)
                     JSOn_data["Teams"][Team_Name]["embed_id"] = Team_Card_embed_id
                     Fill_JSOn_File(file_path_Team_data, JSOn_data)
-                    log(f"Discord: send new Embed from Team [{Team_Name}] msg.id: [{Team_Card_embed_id}]")
+                    log(
+                        f"Discord: send new Embed from Team [{Team_Name}] msg.id: [{Team_Card_embed_id}]")
                 except:
                     pass