Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Belissimo-T committed Apr 11, 2024
2 parents 974e314 + a1b316f commit 7fbbc65
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.pyc
dist/
Empty file removed build.sh
Empty file.
2 changes: 1 addition & 1 deletion default_config.ini → config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ thrust=0.1
# center - the center of the map
# player/<player_index>/<seeker_index> - the specified seeker of the specified player
# goal/<goal_index> - the specified goal
relative-drawing-to=center
relative-drawing-to=center
6 changes: 3 additions & 3 deletions freeze.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash

echo "Hello from the Seekers Community! cx_Freeze helper 24.3.6"
echo "Hello from the seekers community! cx_Freeze helper 24.3.15"

usage() {
echo "Usage: $0 [-b] [-s]" 1>&2
echo "Usage: $0 [-b|-s]" 1>&2
}

build() {
echo "Building projekt ..."
pip install -r requirements.txt
pip install cx_Freeze
cxfreeze -c run_seekers.py --target-dir dist --include-files default_config.ini
cxfreeze -c run_seekers.py --target-dir dist --include-files config.ini
}

start() {
Expand Down
4 changes: 2 additions & 2 deletions run_seekers.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def main():
parser.add_argument("--debug", action="store_true", help="Enable debug mode. This will enable debug drawing.")
parser.add_argument("-address", "-a", type=str, default="localhost:7777",
help="Address of the server. (default: localhost:7777)")
parser.add_argument("-config", "-c", type=str, default="default_config.ini",
help="Path to the config file. (default: default_config.ini)")
parser.add_argument("-config", "-c", type=str, default="config.ini",
help="Path to the config file. (default: config.ini)")
parser.add_argument("-config-override", "-co", action="append",
help="Override a config option. Use the form option=value, e.g. global.seed=43.")
parser.add_argument("-loglevel", "-log", "-l", type=str, default="INFO",
Expand Down
6 changes: 3 additions & 3 deletions seekers/tests/test_seekers.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class TestSeekers(unittest.TestCase):
def test_seekers(self):
"""Test that a SeekersGame can be created and run without errors."""
config = Config.from_filepath("default_config.ini")
config = Config.from_filepath("config.ini")

config.global_playtime = 200
config.global_speed = 20
Expand Down Expand Up @@ -68,7 +68,7 @@ def start_grpc_client(filepath: str, address: str, joined_event: threading.Event

def grpc_game(playtime: int, speed: int, players: int, seed: int, filepaths: list[str],
address: str = "localhost:7778") -> dict[str, int]:
config = Config.from_filepath("default_config.ini")
config = Config.from_filepath("config.ini")

config.global_fps = 1000
config.global_playtime = playtime
Expand Down Expand Up @@ -106,7 +106,7 @@ def grpc_game(playtime: int, speed: int, players: int, seed: int, filepaths: lis


def nogrpc_game(playtime: int, speed: int, players: int, seed: int, filepaths: list[str]) -> dict[str, int]:
config = Config.from_filepath("default_config.ini")
config = Config.from_filepath("config.ini")

config.global_fps = 1000
config.global_wait_for_players = True
Expand Down

0 comments on commit 7fbbc65

Please sign in to comment.