From 17e968ddfca27d2a17b6d4caba9ba715b671c6ed Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 26 Jan 2025 16:18:19 +0530 Subject: [PATCH] Updating a few minigames to api 9 --- plugins/minigames.json | 15 +++++++++++++++ plugins/minigames/alliance_elimination.py | 2 +- plugins/minigames/arms_race.py | 11 ++--------- plugins/minigames/avalanche.py | 10 +++------- plugins/minigames/basket_bomb.py | 8 +------- plugins/minigames/better_deathmatch.py | 5 ++--- plugins/minigames/better_elimination.py | 5 ++--- plugins/minigames/big_ball.py | 12 +++--------- plugins/minigames/bomb_on_my_head.py | 4 +--- plugins/minigames/bot_chase.py | 8 ++------ plugins/minigames/bot_shower.py | 7 ++----- plugins/minigames/boxing.py | 7 ++----- plugins/minigames/canon_fight.py | 6 ++---- plugins/minigames/castel_queen.py | 8 +++----- plugins/minigames/collector.py | 4 +--- plugins/minigames/demolition_war.py | 6 ++---- 16 files changed, 44 insertions(+), 74 deletions(-) diff --git a/plugins/minigames.json b/plugins/minigames.json index c1b552d..47b9138 100644 --- a/plugins/minigames.json +++ b/plugins/minigames.json @@ -183,6 +183,7 @@ } ], "versions": { + "3.0.0": null, "2.0.0": { "api_version": 8, "commit_sha": "6263872", @@ -208,6 +209,7 @@ } ], "versions": { + "1.2.0": null, "1.1.0": { "api_version": 8, "commit_sha": "2b5c9ee", @@ -264,6 +266,7 @@ } ], "versions": { + "2.1.0": null, "2.0.0": { "api_version": 8, "commit_sha": "1b14789", @@ -450,6 +453,7 @@ } ], "versions": { + "3.0.0": null, "2.0.0": { "api_version": 8, "commit_sha": "f54c993", @@ -475,6 +479,7 @@ } ], "versions": { + "1.1.0": null, "1.0.1": { "api_version": 8, "commit_sha": "2b5c9ee", @@ -582,6 +587,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "505c948", @@ -625,6 +631,7 @@ } ], "versions": { + "2.1.0": null, "2.0.0": { "api_version": 8, "commit_sha": "48f9302", @@ -661,6 +668,7 @@ } ], "versions": { + "3.0.0": null, "2.0.0": { "api_version": 8, "commit_sha": "e8bbb61", @@ -911,6 +919,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "ca3221b", @@ -949,6 +958,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "c39664c", @@ -1036,6 +1046,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "5063690", @@ -1257,6 +1268,7 @@ } ], "versions": { + "1.1.0": null, "1.0.1": { "api_version": 8, "commit_sha": "9ca6039", @@ -1301,6 +1313,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "4941d0c", @@ -1320,6 +1333,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "4941d0c", @@ -1339,6 +1353,7 @@ } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 8, "commit_sha": "4941d0c", diff --git a/plugins/minigames/alliance_elimination.py b/plugins/minigames/alliance_elimination.py index f6d47b5..b8255a6 100644 --- a/plugins/minigames/alliance_elimination.py +++ b/plugins/minigames/alliance_elimination.py @@ -2,7 +2,7 @@ # """Elimination mini-game.""" -# ba_meta require api 8 +# ba_meta require api 9 # (see https://ballistica.net/wiki/meta-tag-system) from __future__ import annotations diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index 475811a..084edb8 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -1,10 +1,4 @@ -# Ported by your friend: Freaku - -# Join BCS: -# https://discord.gg/ucyaesh - - -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations @@ -12,10 +6,9 @@ from typing import TYPE_CHECKING import babase import bascenev1 as bs -from bascenev1lib.actor.playerspaz import PlayerSpaz if TYPE_CHECKING: - from typing import Any, Type, List, Dict, Tuple, Union, Sequence, Optional + from typing import Any, Type, List, Union, Sequence class State: diff --git a/plugins/minigames/avalanche.py b/plugins/minigames/avalanche.py index 43eed2f..3360c6e 100644 --- a/plugins/minigames/avalanche.py +++ b/plugins/minigames/avalanche.py @@ -1,32 +1,28 @@ -# Porting to api 8 made easier by baport.(https://github.com/bombsquad-community/baport) """Avalancha mini-game.""" -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations import random from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs from bascenev1lib.actor.bomb import Bomb from bascenev1lib.actor.onscreentimer import OnScreenTimer from bascenev1lib.game.meteorshower import * from bascenev1lib.actor.spazbot import * -from bascenev1lib.actor.spaz import PunchHitMessage from bascenev1lib.gameutils import SharedObjects if TYPE_CHECKING: - from typing import Any, Sequence, Optional, List, Dict, Type, Type + from typing import Any, Sequence, Optional, List, Type, Type ## MoreMinigames.py support ## randomPic = ["lakeFrigidPreview", "hockeyStadiumPreview"] def ba_get_api_version(): - return 8 + return 9 def ba_get_levels(): diff --git a/plugins/minigames/basket_bomb.py b/plugins/minigames/basket_bomb.py index 8c33edb..0fa83f1 100644 --- a/plugins/minigames/basket_bomb.py +++ b/plugins/minigames/basket_bomb.py @@ -1,19 +1,13 @@ -# Porting to api 8 made easier by baport.(https://github.com/bombsquad-community/baport) # Released under the MIT License. See LICENSE for details. -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING -import babase -import bauiv1 as bui import bascenev1 as bs -import _babase from bascenev1lib.actor.playerspaz import PlayerSpaz from bascenev1lib.actor.scoreboard import Scoreboard -from bascenev1lib.actor.powerupbox import PowerupBoxFactory from bascenev1lib.gameutils import SharedObjects from bascenev1lib.actor import playerspaz as ps from bascenev1lib import maps diff --git a/plugins/minigames/better_deathmatch.py b/plugins/minigames/better_deathmatch.py index 6882c8a..4883a53 100644 --- a/plugins/minigames/better_deathmatch.py +++ b/plugins/minigames/better_deathmatch.py @@ -1,10 +1,9 @@ -# Ported to api 8 by brostos using baport.(https://github.com/bombsquad-community/baport) # BetterDeathMatch # Made by your friend: @[Just] Freak#4999 """Defines a very-customisable DeathMatch mini-game""" -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations @@ -17,7 +16,7 @@ from bascenev1lib.actor.playerspaz import PlayerSpaz from bascenev1lib.actor.scoreboard import Scoreboard if TYPE_CHECKING: - from typing import Any, Type, List, Dict, Tuple, Union, Sequence, Optional + from typing import Any, Type, List, Union, Sequence, Optional class Player(bs.Player['Team']): diff --git a/plugins/minigames/better_elimination.py b/plugins/minigames/better_elimination.py index 8edd4c1..bac9c20 100644 --- a/plugins/minigames/better_elimination.py +++ b/plugins/minigames/better_elimination.py @@ -1,4 +1,3 @@ -# Ported to api 8 by brostos using baport.(https://github.com/bombsquad-community/baport) # BetterElimination # Made by your friend: @[Just] Freak#4999 @@ -7,7 +6,7 @@ """Defines a very-customisable Elimination mini-game""" -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations @@ -20,7 +19,7 @@ from bascenev1lib.actor.spazfactory import SpazFactory from bascenev1lib.actor.scoreboard import Scoreboard if TYPE_CHECKING: - from typing import (Any, Tuple, Dict, Type, List, Sequence, Optional, + from typing import (Any, Tuple, Type, List, Sequence, Optional, Union) diff --git a/plugins/minigames/big_ball.py b/plugins/minigames/big_ball.py index 9976722..e1a5d3a 100644 --- a/plugins/minigames/big_ball.py +++ b/plugins/minigames/big_ball.py @@ -1,19 +1,13 @@ # Made by MythB -# Ported by: MysteriousBoi - -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING -import babase -import bauiv1 as bui import bascenev1 as bs -import random from bascenev1lib.actor.playerspaz import PlayerSpaz from bascenev1lib.actor.scoreboard import Scoreboard from bascenev1lib.actor.powerupbox import PowerupBoxFactory from bascenev1lib.gameutils import SharedObjects -from bascenev1lib.actor.flag import Flag if TYPE_CHECKING: from typing import Any, Sequence, Dict, Type, List, Optional, Union @@ -47,7 +41,7 @@ class FlagKale(bs.Actor): elif isinstance(m, bs.OutOfBoundsMessage): self.handlemessage(bs.DieMessage()) else: - super().handlemessage(msg) + super().handlemessage(m) class Puck(bs.Actor): @@ -304,7 +298,7 @@ class BBGame(bs.TeamGameActivity[Player, Team]): super().on_begin() self.setup_standard_time_limit(self._time_limit) - self.setup_standard_powerup_drops() + self.setup_standard_powerup_drops(enable_tnt=False) self._puck_spawn_pos = self.map.get_flag_position(None) self._spawn_puck() # for night mode we need night actor. And same goodies for nigh mode diff --git a/plugins/minigames/bomb_on_my_head.py b/plugins/minigames/bomb_on_my_head.py index 91a6a62..633d2f1 100644 --- a/plugins/minigames/bomb_on_my_head.py +++ b/plugins/minigames/bomb_on_my_head.py @@ -1,12 +1,10 @@ -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs import random from bascenev1lib.actor.onscreentimer import OnScreenTimer diff --git a/plugins/minigames/bot_chase.py b/plugins/minigames/bot_chase.py index 6738bf1..65aab7e 100644 --- a/plugins/minigames/bot_chase.py +++ b/plugins/minigames/bot_chase.py @@ -1,15 +1,11 @@ -# Ported to api 8 by brostos using baport.(https://github.com/bombsquad-community/baport) -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs import random -from bascenev1lib.actor.spazbot import BrawlerBot, SpazBotSet, SpazBot, SpazBotDiedMessage -from bascenev1lib.actor.bomb import Bomb -from bascenev1lib.actor.spaz import Spaz +from bascenev1lib.actor.spazbot import SpazBotSet, SpazBot, SpazBotDiedMessage from bascenev1lib.actor.onscreentimer import OnScreenTimer if TYPE_CHECKING: diff --git a/plugins/minigames/bot_shower.py b/plugins/minigames/bot_shower.py index bbc6da9..bb72afc 100644 --- a/plugins/minigames/bot_shower.py +++ b/plugins/minigames/bot_shower.py @@ -1,6 +1,4 @@ -# Ported to api 8 by brostos using baport.(https://github.com/bombsquad-community/baport) - -# ba_meta require api 8 +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING @@ -13,8 +11,7 @@ from bascenev1lib.actor.onscreentimer import OnScreenTimer from bascenev1lib.actor.spazbot import ( SpazBot, SpazBotSet, BomberBot, BrawlerBot, BouncyBot, - ChargerBot, StickyBot, TriggerBot, - ExplodeyBot) + ChargerBot, TriggerBot, ExplodeyBot) if TYPE_CHECKING: from typing import Any, List, Type, Optional diff --git a/plugins/minigames/boxing.py b/plugins/minigames/boxing.py index 9208784..b0a1af2 100644 --- a/plugins/minigames/boxing.py +++ b/plugins/minigames/boxing.py @@ -1,19 +1,17 @@ -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs from bascenev1lib.actor.playerspaz import PlayerSpaz from bascenev1lib.actor.scoreboard import Scoreboard from bascenev1lib.game.deathmatch import DeathMatchGame if TYPE_CHECKING: - from typing import Any, Sequence + from typing import Sequence lang = bs.app.lang.language @@ -197,7 +195,6 @@ class BoxingGame(DeathMatchGame): import random from babase import _math from bascenev1._gameutils import animate - from bascenev1._coopsession import CoopSession if isinstance(self.session, bs.DualTeamSession): position = self.map.get_start_position(player.team.id) diff --git a/plugins/minigames/canon_fight.py b/plugins/minigames/canon_fight.py index 05da807..636a322 100644 --- a/plugins/minigames/canon_fight.py +++ b/plugins/minigames/canon_fight.py @@ -1,4 +1,3 @@ -# Porting to api 8 made easier by baport.(https://github.com/bombsquad-community/baport) # Released under the MIT License. See LICENSE for details. # Created by Mr.Smoothy - # https://discord.gg/ucyaesh @@ -6,8 +5,7 @@ # """DeathMatch game and support classes.""" -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations from typing import TYPE_CHECKING @@ -444,4 +442,4 @@ class CanonFightGame(DeathMatchGame): ('modify_part_collision', 'collide', False) )) self.wall = bs.newnode('region', attrs={'position': ( - 0.61877517104148865, 4.312626838684082, -8.68477725982666), 'scale': (3, 7, 27), 'type': 'box', 'materials': [mat]}) + 0.36877517104148865, 4.312626838684082, -8.68477725982666), 'scale': (3, 7, 27), 'type': 'box', 'materials': [mat]}) diff --git a/plugins/minigames/castel_queen.py b/plugins/minigames/castel_queen.py index e3d7bc5..f90b32d 100644 --- a/plugins/minigames/castel_queen.py +++ b/plugins/minigames/castel_queen.py @@ -1,4 +1,3 @@ -# Porting to api 8 made easier by baport.(https://github.com/bombsquad-community/baport) # Released under the MIT License. See LICENSE for details. # """ @@ -9,8 +8,7 @@ Youtube: https://www.youtube.com/c/HeySmoothy Website: https://bombsquad-community.web.app Github: https://github.com/bombsquad-community """ -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 from __future__ import annotations @@ -24,7 +22,7 @@ from bascenev1lib.actor.playerspaz import PlayerSpaz from bascenev1lib.game.keepaway import KeepAwayGame, FlagState, Player from bascenev1lib.actor import spaz if TYPE_CHECKING: - from typing import Any, Sequence, Dict, Type, List, Optional, Union + from typing import Any, Sequence, Dict, Type, List # ba_meta export bascenev1.GameActivity @@ -100,7 +98,7 @@ class ChooseQueen(KeepAwayGame): self._flash_flag_spawn() assert self._flag_spawn_pos is not None shared = SharedObjects.get() - self._flag = spaz.Spaz((0, 0, 0), character="Pixel").autoretain() + self._flag = spaz.Spaz(color=(0, 0, 0), character="Pixel").autoretain() self._flag.handlemessage(bs.StandMessage((0, 14.63, -5.52), 93)) self._flag.node.hold_position_pressed = True self._flag.node.materials = (self._queen_material, shared.object_material) diff --git a/plugins/minigames/collector.py b/plugins/minigames/collector.py index da4b416..0660010 100644 --- a/plugins/minigames/collector.py +++ b/plugins/minigames/collector.py @@ -1,5 +1,4 @@ -# ba_meta require api 8 -# (see https://ballistica.net/wiki/meta-tag-system) +# ba_meta require api 9 ''' Gamemode: Collector @@ -32,7 +31,6 @@ from enum import Enum from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs import random from bascenev1lib.actor.flag import Flag diff --git a/plugins/minigames/demolition_war.py b/plugins/minigames/demolition_war.py index abafe06..7cce96c 100644 --- a/plugins/minigames/demolition_war.py +++ b/plugins/minigames/demolition_war.py @@ -1,5 +1,5 @@ -# ba_meta require api 8 +# ba_meta require api 9 """ DemolitionWar - BombFight on wooden floor flying in air. Author: Mr.Smoothy @@ -13,16 +13,14 @@ from __future__ import annotations from typing import TYPE_CHECKING import babase -import bauiv1 as bui import bascenev1 as bs -from bascenev1 import _map from bascenev1lib.game.elimination import EliminationGame, Player from bascenev1lib.gameutils import SharedObjects from bascenev1lib.actor.bomb import BombFactory import random from bascenev1lib.actor.playerspaz import PlayerSpaz if TYPE_CHECKING: - from typing import Any, Sequence + from typing import Any # ba_meta export bascenev1.GameActivity