From e3203684bb2c6a3dcebe48df8b11a8ad2cfff0d4 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Fri, 19 May 2023 01:46:55 +0530 Subject: [PATCH 1/7] pickup,punch btn is now bomb btn --- plugins/minigames/arms_race.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index 728f7c0..459a57e 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -30,6 +30,7 @@ class State: self.next = None self.index = None + def apply(self, spaz): spaz.disconnect_controls_from_player() spaz.connect_controls_to_player(enable_punch=self.punch, @@ -154,6 +155,19 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): player.state = self.states[0] self.spawn_player(player) + def idk(self,spaz:PlayerSpaz): + + return {"press":{ + ba.InputType.PUNCH_PRESS : spaz.on_punch_press, + ba.InputType.PICK_UP_PRESS : spaz.on_pickup_press,}, + "release":{ + ba.InputType.PUNCH_RELEASE : spaz.on_punch_release, + ba.InputType.PICK_UP_RELEASE : spaz.on_pickup_release} + } + + def set_controls(self,spaz:PlayerSpaz,): + spaz.on_punch_press() + # overriding the default character spawning.. def spawn_player(self, player): if player.state is None: @@ -161,6 +175,19 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): super().spawn_player(player) player.state.apply(player.actor) + press_input=self.idk(player.actor)["press"] + release_input=self.idk(player.actor)["release"] + + for press,release in zip(press_input.keys(),release_input.keys()): + player.assigninput( + press, + lambda : player.actor.on_bomb_press() + ) + player.assigninput( + release, + lambda: player.actor.on_bomb_release() + ) + def isValidKill(self, m): if m.getkillerplayer(Player) is None: return False From eb7e05ad72f61fbf555bbccfa3a48898ee284834 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Thu, 18 May 2023 20:20:53 +0000 Subject: [PATCH 2/7] [ci] auto-format --- plugins/minigames/arms_race.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index 459a57e..f97407d 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -30,7 +30,6 @@ class State: self.next = None self.index = None - def apply(self, spaz): spaz.disconnect_controls_from_player() spaz.connect_controls_to_player(enable_punch=self.punch, @@ -155,17 +154,17 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): player.state = self.states[0] self.spawn_player(player) - def idk(self,spaz:PlayerSpaz): + def idk(self, spaz: PlayerSpaz): - return {"press":{ - ba.InputType.PUNCH_PRESS : spaz.on_punch_press, - ba.InputType.PICK_UP_PRESS : spaz.on_pickup_press,}, - "release":{ - ba.InputType.PUNCH_RELEASE : spaz.on_punch_release, - ba.InputType.PICK_UP_RELEASE : spaz.on_pickup_release} - } + return {"press": { + ba.InputType.PUNCH_PRESS: spaz.on_punch_press, + ba.InputType.PICK_UP_PRESS: spaz.on_pickup_press, }, + "release": { + ba.InputType.PUNCH_RELEASE: spaz.on_punch_release, + ba.InputType.PICK_UP_RELEASE: spaz.on_pickup_release} + } - def set_controls(self,spaz:PlayerSpaz,): + def set_controls(self, spaz: PlayerSpaz,): spaz.on_punch_press() # overriding the default character spawning.. @@ -175,13 +174,13 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): super().spawn_player(player) player.state.apply(player.actor) - press_input=self.idk(player.actor)["press"] - release_input=self.idk(player.actor)["release"] + press_input = self.idk(player.actor)["press"] + release_input = self.idk(player.actor)["release"] - for press,release in zip(press_input.keys(),release_input.keys()): + for press, release in zip(press_input.keys(), release_input.keys()): player.assigninput( press, - lambda : player.actor.on_bomb_press() + lambda: player.actor.on_bomb_press() ) player.assigninput( release, From dd4dd9089c903e206c3556344f1a0b74cc81a90b Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Fri, 19 May 2023 10:10:16 +0530 Subject: [PATCH 3/7] removed on press inputs --- plugins/minigames/arms_race.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index 459a57e..f5df451 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -32,10 +32,10 @@ class State: def apply(self, spaz): - spaz.disconnect_controls_from_player() - spaz.connect_controls_to_player(enable_punch=self.punch, - enable_bomb=self.bomb, - enable_pickup=self.grab) + #spaz.disconnect_controls_from_player() + #spaz.connect_controls_to_player(enable_punch=self.punch, + # enable_bomb=self.bomb, + # enable_pickup=self.grab) if self.curse: spaz.curse_time = -1 spaz.curse() @@ -179,10 +179,10 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): release_input=self.idk(player.actor)["release"] for press,release in zip(press_input.keys(),release_input.keys()): - player.assigninput( - press, - lambda : player.actor.on_bomb_press() - ) +# player.assigninput( +# press, +# lambda : player.actor.on_bomb_press() +# ) player.assigninput( release, lambda: player.actor.on_bomb_release() From f681ef4ad8bcd4f0b61dcffaf1986f18532a5115 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Fri, 19 May 2023 04:45:41 +0000 Subject: [PATCH 4/7] [ci] auto-format --- plugins/minigames/arms_race.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index b168633..ffa2770 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -31,8 +31,8 @@ class State: self.index = None def apply(self, spaz): - #spaz.disconnect_controls_from_player() - #spaz.connect_controls_to_player(enable_punch=self.punch, + # spaz.disconnect_controls_from_player() + # spaz.connect_controls_to_player(enable_punch=self.punch, # enable_bomb=self.bomb, # enable_pickup=self.grab) if self.curse: @@ -177,11 +177,11 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): press_input = self.idk(player.actor)["press"] release_input = self.idk(player.actor)["release"] - for press,release in zip(press_input.keys(),release_input.keys()): -# player.assigninput( -# press, -# lambda : player.actor.on_bomb_press() -# ) + for press, release in zip(press_input.keys(), release_input.keys()): + # player.assigninput( + # press, + # lambda : player.actor.on_bomb_press() + # ) player.assigninput( release, lambda: player.actor.on_bomb_release() From 6bf4dae698d51eea019f76f7a6984f95160f50e0 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Sat, 20 May 2023 20:26:54 +0530 Subject: [PATCH 5/7] Fix and Updated minigames.json --- plugins/minigames.json | 8 ++++- plugins/minigames/arms_race.py | 53 ++++++++++++++-------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/plugins/minigames.json b/plugins/minigames.json index b15f63a..d0e1225 100644 --- a/plugins/minigames.json +++ b/plugins/minigames.json @@ -325,9 +325,15 @@ "name": "Freaku", "email": "", "discord": "[Just] Freak#4999" + }, + { + "name": "LoupGarou", + "email": "LoupGarou5418@outlook.com", + "discord": "ʟօʊքɢǟʀօʊ#3063" } ], "versions": { + "1.1.0": null, "1.0.0": { "api_version": 7, "commit_sha": "7219487", @@ -513,4 +519,4 @@ } } } -} \ No newline at end of file +} diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index ffa2770..fb3da8b 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -30,11 +30,14 @@ class State: self.next = None self.index = None - def apply(self, spaz): - # spaz.disconnect_controls_from_player() - # spaz.connect_controls_to_player(enable_punch=self.punch, - # enable_bomb=self.bomb, - # enable_pickup=self.grab) + + + def apply(self, player,spaz): + + spaz.disconnect_controls_from_player() + spaz.connect_controls_to_player(enable_punch=self.punch, + enable_bomb=self.bomb, + enable_pickup=self.grab) if self.curse: spaz.curse_time = -1 spaz.curse() @@ -42,6 +45,18 @@ class State: spaz.bomb_type = self.bomb spaz.set_score_text(self.name) + def set_controls(): + player.actor.node.bomb_pressed=True + player.actor.on_bomb_release() + + release_input=(ba.InputType.PUNCH_RELEASE,ba.InputType.PICK_UP_RELEASE) + if not self.bomb is None: + for release in release_input: + player.assigninput( + release, + set_controls + ) + def get_setting(self): return (self.name) @@ -154,38 +169,14 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): player.state = self.states[0] self.spawn_player(player) - def idk(self, spaz: PlayerSpaz): - - return {"press": { - ba.InputType.PUNCH_PRESS: spaz.on_punch_press, - ba.InputType.PICK_UP_PRESS: spaz.on_pickup_press, }, - "release": { - ba.InputType.PUNCH_RELEASE: spaz.on_punch_release, - ba.InputType.PICK_UP_RELEASE: spaz.on_pickup_release} - } - - def set_controls(self, spaz: PlayerSpaz,): - spaz.on_punch_press() # overriding the default character spawning.. def spawn_player(self, player): if player.state is None: player.state = self.states[0] super().spawn_player(player) - player.state.apply(player.actor) + player.state.apply(player,player.actor) - press_input = self.idk(player.actor)["press"] - release_input = self.idk(player.actor)["release"] - - for press, release in zip(press_input.keys(), release_input.keys()): - # player.assigninput( - # press, - # lambda : player.actor.on_bomb_press() - # ) - player.assigninput( - release, - lambda: player.actor.on_bomb_release() - ) def isValidKill(self, m): if m.getkillerplayer(Player) is None: @@ -203,7 +194,7 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): self.stats.player_scored(msg.getkillerplayer(Player), 10, kill=True) if not msg.getkillerplayer(Player).state.final: msg.getkillerplayer(Player).state = msg.getkillerplayer(Player).state.next - msg.getkillerplayer(Player).state.apply(msg.getkillerplayer(Player).actor) + msg.getkillerplayer(Player).state.apply(msg.getkillerplayer(Player),msg.getkillerplayer(Player).actor) else: msg.getkillerplayer(Player).team.score += 1 self.end_game() From 2e2540ae5bc4ae2e72404b1b48512c3a2d79e1cf Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Sat, 20 May 2023 14:58:01 +0000 Subject: [PATCH 6/7] [ci] auto-format --- plugins/minigames/arms_race.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/minigames/arms_race.py b/plugins/minigames/arms_race.py index fb3da8b..b7ea3f5 100644 --- a/plugins/minigames/arms_race.py +++ b/plugins/minigames/arms_race.py @@ -30,10 +30,8 @@ class State: self.next = None self.index = None - - - def apply(self, player,spaz): - + def apply(self, player, spaz): + spaz.disconnect_controls_from_player() spaz.connect_controls_to_player(enable_punch=self.punch, enable_bomb=self.bomb, @@ -46,10 +44,10 @@ class State: spaz.set_score_text(self.name) def set_controls(): - player.actor.node.bomb_pressed=True + player.actor.node.bomb_pressed = True player.actor.on_bomb_release() - release_input=(ba.InputType.PUNCH_RELEASE,ba.InputType.PICK_UP_RELEASE) + release_input = (ba.InputType.PUNCH_RELEASE, ba.InputType.PICK_UP_RELEASE) if not self.bomb is None: for release in release_input: player.assigninput( @@ -169,14 +167,13 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): player.state = self.states[0] self.spawn_player(player) - # overriding the default character spawning.. + def spawn_player(self, player): if player.state is None: player.state = self.states[0] super().spawn_player(player) - player.state.apply(player,player.actor) - + player.state.apply(player, player.actor) def isValidKill(self, m): if m.getkillerplayer(Player) is None: @@ -194,7 +191,8 @@ class ArmsRaceGame(ba.TeamGameActivity[Player, Team]): self.stats.player_scored(msg.getkillerplayer(Player), 10, kill=True) if not msg.getkillerplayer(Player).state.final: msg.getkillerplayer(Player).state = msg.getkillerplayer(Player).state.next - msg.getkillerplayer(Player).state.apply(msg.getkillerplayer(Player),msg.getkillerplayer(Player).actor) + msg.getkillerplayer(Player).state.apply( + msg.getkillerplayer(Player), msg.getkillerplayer(Player).actor) else: msg.getkillerplayer(Player).team.score += 1 self.end_game() From a0af0d00f6a29eac8be19d5e55e3264fbaa01fe7 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Sat, 20 May 2023 14:58:02 +0000 Subject: [PATCH 7/7] [ci] apply-version-metadata --- plugins/minigames.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/minigames.json b/plugins/minigames.json index d0e1225..66ba30d 100644 --- a/plugins/minigames.json +++ b/plugins/minigames.json @@ -333,7 +333,12 @@ } ], "versions": { - "1.1.0": null, + "1.1.0": { + "api_version": 7, + "commit_sha": "2e2540a", + "released_on": "20-05-2023", + "md5sum": "e06fbfeb1c0c4c78e04054caab3d593f" + }, "1.0.0": { "api_version": 7, "commit_sha": "7219487", @@ -519,4 +524,4 @@ } } } -} +} \ No newline at end of file