From 458bf2fa46a9afc0a7d63281b0f51e7843b2a557 Mon Sep 17 00:00:00 2001 From: Kylin_on_Mac Date: Thu, 26 May 2022 10:02:31 +0800 Subject: [PATCH] update --- README.md | 10 +++++----- config.py | 8 ++++---- ml/ml_play_manual.py | 38 -------------------------------------- ml/ml_play_template.py | 21 --------------------- src/game.py | 30 ++++++++++++------------------ 5 files changed, 21 insertions(+), 86 deletions(-) delete mode 100644 ml/ml_play_manual.py delete mode 100644 ml/ml_play_template.py diff --git a/README.md b/README.md index 98978ef..faeb4f8 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # **Easy Game** -logo [comment]: <> (![python](https://img.shields.io/pypi/pyversions/pygame)) +![pygame](https://img.shields.io/badge/release-2.0.0beta-red.svg) -![arkanoid](https://img.shields.io/github/v/tag/PAIA-Playful-AI-Arena/arkanoid) [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-390/) -[![MLGame](https://img.shields.io/badge/MLGame-9.4.0-.svg)](https://github.com/PAIA-Playful-AI-Arena/MLGame) +[![MLGame](https://img.shields.io/badge/MLGame-9.5.1-.svg)](https://github.com/PAIA-Playful-AI-Arena/MLGame) [![pygame](https://img.shields.io/badge/pygame-2.0.1-.svg)](https://github.com/pygame/pygame/releases/tag/2.0.1) ---- -這是一個吃東西小遊戲，除了讓你熟習所有基本操作，也是 PAIA 的遊戲教學範例 + + +這是一個吃東西小遊戲，也是 PAIA 的遊戲教學範例 ![https://github.com/PAIA-Playful-AI-Arena/MLGame/raw/master/games/easy_game/asset/easy_game.gif](https://github.com/PAIA-Playful-AI-Arena/MLGame/raw/master/games/easy_game/asset/easy_game.gif) diff --git a/config.py b/config.py index afc979b..d9f3e6c 100644 --- a/config.py +++ b/config.py @@ -1,8 +1,9 @@ - +import sys from os import path +sys.path.append(path.dirname(__file__)) -from mlgame.utils.parse_config import read_json_file, parse_config -from .src.game import EasyGame +from mlgame.argument.tool import read_json_file, parse_config +from src.game import EasyGame config_file = path.join(path.dirname(__file__), "game_config.json") @@ -15,6 +16,5 @@ GAME_PARAMS = parse_config(config_data) GAME_SETUP = { "game": EasyGame, - "ml_clients": EasyGame.ai_clients(), # "dynamic_ml_clients":True } diff --git a/ml/ml_play_manual.py b/ml/ml_play_manual.py deleted file mode 100644 index 5c612fe..0000000 --- a/ml/ml_play_manual.py +++ /dev/null @@ -1,38 +0,0 @@ -import random -import pygame - - -class MLPlay: - def __init__(self): - print("Initial ml script") - - def update(self, scene_info: dict, keyboard:list=[], *args, **kwargs): - """ - Generate the command according to the received scene information - """ - # print("AI received data from game :", json.dumps(scene_info)) - # print(scene_info) - actions = [] - - if pygame.K_w in keyboard or pygame.K_UP in keyboard: - actions.append("UP") - elif pygame.K_s in keyboard or pygame.K_DOWN in keyboard: - actions.append("DOWN") - - elif pygame.K_a in keyboard or pygame.K_LEFT in keyboard: - actions.append("LEFT") - elif pygame.K_d in keyboard or pygame.K_RIGHT in keyboard: - actions.append("RIGHT") - else: - actions.append("NONE") - - return actions - - - - def reset(self): - """ - Reset the status - """ - print("reset ml script") - pass diff --git a/ml/ml_play_template.py b/ml/ml_play_template.py deleted file mode 100644 index 02efb26..0000000 --- a/ml/ml_play_template.py +++ /dev/null @@ -1,21 +0,0 @@ -import random -class MLPlay: - def __init__(self): - print("Initial ml script") - - def update(self, scene_info: dict, *args, **kwargs): - """ - Generate the command according to the received scene information - """ - # print("AI received data from game :", json.dumps(scene_info)) - # print(scene_info) - actions = ["UP", "DOWN", "LEFT", "RIGHT"] - - return random.sample(actions, 1) - - def reset(self): - """ - Reset the status - """ - print("reset ml script") - pass diff --git a/src/game.py b/src/game.py index 85f4f90..dbd59d8 100644 --- a/src/game.py +++ b/src/game.py @@ -3,8 +3,9 @@ from os import path import pygame -from mlgame.gamedev.game_interface import PaiaGame, GameResultState, GameStatus -from mlgame.view.test_decorator import check_game_progress, check_game_result +from mlgame.argument.model import AI_NAMES +from mlgame.gamedev.paia_game import PaiaGame, GameResultState, GameStatus +from mlgame.tests.test_decorator import check_game_progress, check_game_result from mlgame.view.view_model import create_text_view_data, create_asset_init_data, create_image_view_data, Scene, \ create_scene_progress_data from .game_object import Ball, Food @@ -34,9 +35,13 @@ class EasyGame(PaiaGame): def update(self, commands): # handle command - ai_1p_cmd = commands[self.ai_clients()[0]["name"]][0] + ai_1p_cmd = commands[AI_NAMES[0]] + if ai_1p_cmd is not None: + action = ai_1p_cmd[0] + else: + action = "NONE" # print(ai_1p_cmd) - self.ball.update(ai_1p_cmd) + self.ball.update(action) # update sprite self.foods.update() @@ -72,8 +77,7 @@ class EasyGame(PaiaGame): "status": self.get_game_status() } - for ai_client in self.ai_clients(): - to_players_data[ai_client['name']] = data_to_1p + to_players_data[AI_NAMES[0]] = data_to_1p # should be equal to config. GAME_SETUP["ml_clients"][0]["name"] return to_players_data @@ -139,7 +143,7 @@ class EasyGame(PaiaGame): "state": self.game_result_state, "attachment": [ { - "player": self.ai_clients()[0]["name"], + "player": AI_NAMES[0], "rank": 1, "score": self.score } @@ -163,8 +167,7 @@ class EasyGame(PaiaGame): cmd_1p.append("RIGHT") else: cmd_1p.append("NONE") - ai_1p = self.ai_clients()[0]["name"] - return {ai_1p: cmd_1p} + return {AI_NAMES[0]: cmd_1p} def _create_foods(self, count: int = 5): for i in range(count): @@ -172,12 +175,3 @@ class EasyGame(PaiaGame): food = Food(self.foods) pass - @staticmethod - def ai_clients(): - """ - let MLGame know how to parse your ai, - you can also use this names to get different cmd and send different data to each ai client - """ - return [ - {"name": "1P"} - ]