Unique Universes #10

janine9vn · 2024-08-15T18:50:27Z

No description provided.

Signed-off-by: Mmesek <[email protected]>

* Add docker setup & instructions Signed-off-by: Mmesek <[email protected]> * Add docker build workflow Signed-off-by: Mmesek <[email protected]> * Improve image size & build by leveraging multi-stage build Signed-off-by: Mmesek <[email protected]> --------- Signed-off-by: Mmesek <[email protected]>

* Update README to include how to run project without docker Signed-off-by: Mmesek <[email protected]> * Remove samples folder Signed-off-by: Mmesek <[email protected]> * Reorganize installation steps Signed-off-by: Mmesek <[email protected]> --------- Signed-off-by: Mmesek <[email protected]>

feat: load exts at startup

This reverts commit 47c243c, reversing changes made to e1a8c37.

* added database * safety * Update src/database.py * Update src/database.py * Update src/database.py * Update src/database.py * lint and format * added type hinting for player obj * changed where db connection is made * implement custom run flow for db closure --------- Co-authored-by: Snipy7374 <[email protected]>

* implement the base for shoot minigame * Add sample statisic fields Signed-off-by: Mmesek <[email protected]> * Add aim buttons Signed-off-by: Mmesek <[email protected]> * Add embed attributes to ShootMenu Added embed attributes, did ammunition check in shoot_callback * Add values to fields Add values to fields from ShootMenu * implement shoot minigame logic * Add Ad embed (part 1) * Add Ad embed (part 2) (test) * Use a json of ads instead of random Wikipedia articles * Revert "Merge branch 'main' into main" This reverts commit 47c243c, reversing changes made to e1a8c37. * new: database (#9) * added database * safety * Update src/database.py * Update src/database.py * Update src/database.py * Update src/database.py * lint and format * added type hinting for player obj * changed where db connection is made * implement custom run flow for db closure --------- Co-authored-by: Snipy7374 <[email protected]> * finalize shoot minigame adding database stats --------- Signed-off-by: Mmesek <[email protected]> Co-authored-by: Mmesek <[email protected]> Co-authored-by: stroh13 <[email protected]> Co-authored-by: EarthKiii <[email protected]> Co-authored-by: Astroyo <[email protected]>

* Added about command with bot instantiat Instantiated the bot, and added bot.run() and implemented the /about command * Updated .gitignore Includes .history * Added about command with bot instantiat Instantiated the bot, and added bot.run() and implemented the /about command * Updated .gitignore Includes .history * fix about command * remove version field * Add Ad embed (part 1) * Add Ad embed (part 2) (test) * Use a json of ads instead of random Wikipedia articles * Revert "Merge branch 'main' into main" This reverts commit 47c243c, reversing changes made to e1a8c37. * new: database (#9) * added database * safety * Update src/database.py * Update src/database.py * Update src/database.py * Update src/database.py * lint and format * added type hinting for player obj * changed where db connection is made * implement custom run flow for db closure --------- Co-authored-by: Snipy7374 <[email protected]> * Added about command with bot instantiat Instantiated the bot, and added bot.run() and implemented the /about command * fix about command * add shoot command mention in about command response --------- Co-authored-by: stroh13 <[email protected]> Co-authored-by: EarthKiii <[email protected]> Co-authored-by: Astroyo <[email protected]>

feat: documentation for CJ judges

…8150904d' git-subtree-dir: unique-universes git-subtree-mainline: 196cae3 git-subtree-split: 18bd85e

mbaruh

A fun game, I liked the humor :)

You should invest more in comments and docstrings, but I think you knew that already.

Looks like you didn't manage to implement everything you had in mind, hopefully you enjoyed working on the project

mbaruh · 2024-09-01T15:15:40Z

unique-universes/requirements-dev.txt

You have dev-dependencies in your pyproject.toml, so this seems redundant.

mbaruh · 2024-09-01T15:44:40Z

unique-universes/src/bot.py

+    @tasks.loop(seconds=1, count=1)
+    async def fetch_cmd(self) -> None:


So it's a loop that repeats once? Why not await it normally then?

mbaruh · 2024-09-01T15:45:00Z

unique-universes/src/bot.py

+class FetchTasks:
+    def __init__(self, bot: Universe) -> None:
+        self.bot = bot
+
+    async def _fetch_shoot_cmd(self) -> None:
+        _log.info("Fetching shoot cmd")
+        cmds = await self.bot.fetch_global_commands()
+        for cmd in cmds:
+            if cmd.name != "shoot":
+                continue
+            if isinstance(cmd, disnake.APISlashCommand):
+                self.bot.shoot_cmd = cmd
+
+        if self.bot.shoot_cmd is not None:
+            _log.info("Shoot command fetched")
+
+    @tasks.loop(seconds=1, count=1)
+    async def fetch_cmd(self) -> None:
+        await self.bot.wait_until_ready()
+        await self._fetch_shoot_cmd()


It's not clear to me why this is all needed and can't be part of the bot class.

mbaruh · 2024-09-01T15:59:05Z

unique-universes/src/exts/minigames.py

+    from src.views.shoot import ShootStats
+
+
+__all__: tuple[str, ...] = (


You don't need to type-hint this

mbaruh · 2024-09-01T16:02:40Z

unique-universes/src/exts/minigames.py

+    seq = random.choices(tokens, k=16)  # noqa: S311
+    return ":".join([f"{seq[i]}{seq[i+1]}" for i in range(0, len(seq), 2)])


You could instead do random.choices with k=2 8 times and join that. Seems more readable that way

mbaruh · 2024-09-01T16:17:23Z

unique-universes/src/exts/minigames.py

+        embed = disnake.Embed(title="Shoot minigame", description="\n".join(["." * 10] * 5))
+        embed.add_field("Planet acceleration", f"{round(view.stats.g_acc, 2)} m/s^2")
+        embed.add_field("Position", f"{view.stats.position}")
+        embed.add_field("Angle", f"{view.stats.angle}")
+        embed.add_field("Ammunition (Shots left)", f"{view.stats.ammunition}")
+        embed.add_field("Energy (Moves left)", f"{view.stats.energy}")
+        embed.add_field("Ship Speed", f"{view.stats.ship_speed}")
+        embed.add_field("Bullet Velocity", f"{view.stats.bullet_velocity}")
+        embed.add_field("Bullet Type", f"{view.stats.bullet_type}")
+
+        embed.add_field("Obstacles in range", f"{view.stats.obstacles_in_range}")
+        embed.add_field("Outer Space Pression", "1.32 x 10^-11 Pa")
+
+        embed.add_field("Enemy Position", f"{view.stats.enemy_position}")
+        embed.add_field("Enemy Health", f"{view.stats.enemy_health}")
+        embed.add_field("Enemy Energy", f"{view.stats.enemy_energy}")
+
+        embed.add_field("Enemy has VIP Pass (+100 to Pay 2 Win)", f"{view.stats.enemy_has_vip_pass}")
+        embed.add_field("Enemy logins in a row", f"{view.stats.enemy_logins_in_a_row}")
+
+        embed.add_field("Ship insured", "Only below 0-e2 of skin damage")
+        embed.add_field("Gun cleaned", f"{random.randint(1, 10_000)} days ago")  # noqa: S311
+        embed.add_field("Engines checked", f"{random.randint(1, 100)} years ago")  # noqa: S311
+
+        embed.add_field("Serial Number", f"10-{str(inter.user.id).replace('4', 'A').replace('3', 'E')}-A")
+        # yeah you're basically fighting against yourself, enjoy it
+        embed.add_field("Enemy Serial Number", f"10-{str(inter.user.id*3).replace('4', 'A').replace('3', 'E')}-A")
+        embed.add_field("Manufacturer", "Legit Stuff™")
+        embed.add_field("MAC address", _generate_fake_mac())
+        embed.add_field(
+            "Your stats",
+            (
+                f"Wins: {player.wins}\n"
+                f"Losses: {player.loses}\n"
+                f"Total Shots: {player.shots_fired}\n"
+                f"Total Hits: {player.hits}\n"
+                f"Total Shots Missed: {player.misses}\n"
+            ),
+        )
+        embed.set_footer(text=f"Total shots: {view.stats.total_shots}")


Creating the embed could also have been a method of ShootStats.

I'm wondering how all of these add_fields could be avoided. You could store those extra values in ShootStats, and then most of the work could be done with a for loop on the fields.

mbaruh · 2024-09-01T16:18:50Z

unique-universes/src/exts/minigames.py

+        generate_random_stats(view.stats)
+        embed = disnake.Embed(title="Shoot minigame", description="\n".join(["." * 10] * 5))
+        embed.add_field("Planet acceleration", f"{round(view.stats.g_acc, 2)} m/s^2")
+        embed.add_field("Position", f"{view.stats.position}")


Suggested change

embed.add_field("Position", f"{view.stats.position}")

embed.add_field("Position", str(view.stats.position))

Here and everywhere else f-strings are used only for casting to string

mbaruh · 2024-09-01T16:20:57Z

unique-universes/src/views/shoot.py

+# acceleration directed to the center of Earth
+# measured in m/s^2
+EARTH_ACCELERATION = 9.81


Speaking of too much information, could account for the gravity in various points on Earth ;)

mbaruh · 2024-09-01T16:23:26Z

unique-universes/src/views/shoot.py

+
+    async def callback(self, interaction: disnake.ModalInteraction) -> None:
+        angle = interaction.text_values["angle_deg"]
+        if not angle.isdigit():


.isdigit accepts a lot more than simple numbers. The most sure-fire way to check if a string represents a number is to try casting it to int and catch the error if it's not.

mbaruh · 2024-09-01T16:25:21Z

unique-universes/src/views/shoot.py

+    @property
+    def misses(self) -> int:
+        return self.total_shots - self.hits
+
+    @property
+    def angle_as_radians(self) -> float:
+        return math.radians(self.angle)
+
+    @property
+    def get_enemy_distance(self) -> int:
+        return abs(self.enemy_position - self.position)
+
+    def calculate_shot_range(self) -> float:
+        return (
+            2 * self.bullet_velocity * math.cos(self.angle_as_radians) * math.sin(self.angle_as_radians)
+        ) / self.g_acc
+
+    def calculate_max_possible_range(self) -> float:
+        return (self.bullet_velocity**2) / self.g_acc
+
+    def calculate_flight_time(self) -> float:
+        return (2 * self.bullet_velocity * math.sin(self.angle_as_radians)) / self.g_acc
+
+    def calculate_max_height(self) -> float:
+        return ((self.bullet_velocity**2) * (math.sin(self.angle_as_radians) ** 2)) / (2 * self.g_acc)


How did you decide what should be a property and what shouldn't? Could all be properties if you removed calculate from the names. If the calculate methods were meant to be helper methods for other calculations, you could indicate that by starting their names with a _.

Snipy7374 and others added 30 commits July 15, 2024 23:15

Initial commit

6aa6f0a

update README, LICENSE and pyproject

c3d3d91

update gitignore to ignore lock file

dd2274e

lint and update gitignore

d4eb5bd

implement bot core structure

10cbb1d

add depencendcie

0d173b2

lint and reformat

553264b

typing tweaks

12e6d3a

Add example .env file (#3)

fd61256

Signed-off-by: Mmesek <[email protected]>

Change or switch to getenv's default (#2)

457f666

Signed-off-by: Mmesek <[email protected]>

Add Ad embed (part 1)

81c9a0b

Add Ad embed (part 2) (test)

c1d39ce

update authors and disable poetry package mode

5178637

load exts at startup

f35d8fe

Merge pull request #8 from Snipy7374/beta

e1a8c37

feat: load exts at startup

Use a json of ads instead of random Wikipedia articles

1667195

Merge branch 'main' into main

47c243c

Revert "Merge branch 'main' into main"

212eb53

This reverts commit 47c243c, reversing changes made to e1a8c37.

fix shoot command ping in about command

04f9626

fix shoot stats incorrect behaviour

4dcf0f4

Add documentation about the application

ece06a0

Fix images paths

a2fd464

Add contribution section to the readme

d976fa1

Add missing details for the contribution

3d05051

add info about critic bug

e3cc010

Snipy7374 and others added 5 commits July 31, 2024 23:40

add explanation for shoot game

899fee8

remove wrong section title

1ade90c

fix installation steps info

7959a82

Merge pull request #14 from Snipy7374/documentation

18bd85e

feat: documentation for CJ judges

Add 'unique-universes/' from commit '18bd85ec64bd29fa29b123667fe0ca5b…

10aae7d

…8150904d' git-subtree-dir: unique-universes git-subtree-mainline: 196cae3 git-subtree-split: 18bd85e

mbaruh reviewed Sep 1, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unique Universes #10

Unique Universes #10

janine9vn commented Aug 15, 2024

mbaruh left a comment

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

mbaruh Sep 1, 2024

		@tasks.loop(seconds=1, count=1)
		async def fetch_cmd(self) -> None:

		from src.views.shoot import ShootStats


		__all__: tuple[str, ...] = (

		seq = random.choices(tokens, k=16) # noqa: S311
		return ":".join([f"{seq[i]}{seq[i+1]}" for i in range(0, len(seq), 2)])

	embed.add_field("Position", f"{view.stats.position}")
	embed.add_field("Position", str(view.stats.position))

Unique Universes #10

Are you sure you want to change the base?

Unique Universes #10

Conversation

janine9vn commented Aug 15, 2024

mbaruh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment