.gitignore

@@ -1 +1,5 @@
 .vscode/
+build/
+node_modules/
+venv/
+*.pyc

Makefile

@@ -0,0 +1,11 @@
+serve:
+	./node_modules/.bin/webpack-dev-server --mode development
+
+build:
+	./node_modules/.bin/webpack --mode production
+
+lint:
+	./node_modules/.bin/eslint src
+
+format:
+	./node_modules/.bin/prettier --write src/**/*.js

README.md

@@ -1 +1,8 @@
-# EbermergenTD
+#Hello there
+
+## Available scripts
+
+- `npm start`: starts a development server (`make` or `make serve`)
+- `npm run build`: make a production build (`make build`)
+- `npm run lint`: lint js files using eslint (`make lint`)
+- `npm run format`: format js files using prettier (`make format`)

server/.gitignore

@@ -1,2 +0,0 @@
-venv
-*.pyc

server/README.md

@@ -1,12 +0,0 @@
-# Backend for EbermergenTD
-
-## Install
-
-Requirements: python3, python3-venv and pip
-
-## Available scripts
-
-- `make venv`: creates a python virtual environment
-- `make install`: installs python dependencies
-- `make run`: runs the development server
-- `make test`: runs unittests

server/ebermergen/lib/ebermergen_game.py

@@ -1,50 +0,0 @@
-import atexit
-import time
-import threading
-import queue
-
-from .gameloop import GameLoop
-
-
-def tick(dt, first, second):
-    print('%.2f' % dt, first, second)
-    pass
-
-
-def worker(state, action_queue):
-    state['counter'] = 0
-    state['actions'] = []
-    loop = GameLoop(tick=tick, fps=1, fixed_dt=True, args=(1, 2))
-    while True:
-        item = action_queue.get()
-        if item['action'] == 'STOP':
-            loop.stop()
-        if item['action'] == 'START':
-            loop.start()
-        state['counter'] += 1
-        state['actions'].append(item['action'])
-
-
-class EbermergenGame:
-    """Runs a single game instance
-
-    Holds the serialized state.
-    Provides methods to perform actions.
-    """
-
-    def __init__(self):
-        self.state = {}
-        self.actions = queue.Queue()
-        self.thread = threading.Thread(
-            target=worker, args=(self.state, self.actions))
-
-    def start_game(self):
-        self.thread.start()
-        atexit.register(self.interupt)
-
-    def interupt(self):
-        # handle gracefull shutdown
-        pass
-
-    def perform_action(self, action, payload={}):
-        self.actions.put({'action': action, 'payload': payload})

server/ebermergen/lib/gameloop.py

@@ -1,46 +0,0 @@
-import threading
-import time
-import random
-
-
-class GameLoop():
-    """Implements a loop that calls tick every 1/fps
-
-    tick gets called with the time delta to the last call as parameter
-    if fixed_dt is True the tick function gets called with 1/fps
-    """
-
-    def __init__(self, fps=1, tick=None, fixed_dt=False, args=None):
-        self.fps = fps
-        self.tick = tick if tick is not None else self.default_tick
-        self.args = args or tuple()
-        self.fixed_dt = fixed_dt
-        self.running = False
-        self.last_frame_time = time.time()
-        self.thread = threading.Thread(target=self.loop)
-
-    def loop(self):
-        while self.running:
-            current_time = time.time()
-            dt = current_time - self.last_frame_time
-            self.last_frame_time = current_time
-
-            if self.fixed_dt:
-                self.tick(1 / self.fps, *self.args)
-            else:
-                self.tick(dt, *self.args)
-
-            sleep_time = (1 / self.fps) - (time.time() - self.last_frame_time)
-            if sleep_time > 0:
-                time.sleep(sleep_time)
-
-    def start(self):
-        self.running = True
-        self.thread.start()
-
-    def stop(self):
-        self.running = False
-
-    def default_tick(self, dt):
-        print('ticked. Last tick was %.2f seconds ago' % dt)
-        time.sleep(random.choice([0.4, 0.5, 0.6, 1.4, 2.1]) * 1/self.fps)

srv/ebermergen/__init__.py

@@ -5,13 +5,9 @@ from flask_cors import CORS
 from ebermergen.models.game import Game
 from .lib import generate_map
 
-from .lib.ebermergen_game import EbermergenGame
-
 app = Flask(__name__)
 CORS(app)
 
-games = {}
-
 
 @app.route('/')
 def index():
@@ -33,21 +29,3 @@ def state():
     a = Game()
     a.seed_map()
     return jsonify(a.serialize())
-
-
-@app.route('/lala')
-def lala():
-    return jsonify({k: v.state for (k, v) in games.items()})
-
-
-@app.route('/new-game/<name>', methods=['GET', 'POST'])
-def new_game(name):
-    games[name] = EbermergenGame()
-    games[name].start_game()
-    return jsonify({'message': 'success'})
-
-
-@app.route('/action/<name>/<type>')
-def action(name, type):
-    games[name].perform_action(type, {})
-    return jsonify({'message': 'success'})

srv/ebermergen/models/game.py

@@ -5,8 +5,6 @@ from .player import Player
 from .map import Map
 from .entities import Town
 
-from ebermergen.lib.gameloop import GameLoop
-
 
 class Game:
     def __init__(self):

web/.gitignore

@@ -1,2 +0,0 @@
-node_modules/
-build/

web/README.md

@@ -1,14 +0,0 @@
-# Hello there
-
-## Install
-
-Requirements: node and npm
-
-- `npm install`: installs dependencies in node_modules
-
-## Available scripts
-
-- `npm start`: starts a development server
-- `npm run build`: make a production build
-- `npm run lint`: lint js files using eslint
-- `npm run format`: format js files using prettier