From 5f507e9cc6991a516fe402a05674b9eda073a7f1 Mon Sep 17 00:00:00 2001 From: Forrest-Darabian Date: Thu, 5 Mar 2020 10:47:36 -0800 Subject: [PATCH 1/3] starting movement chaining --- adventure/api.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/adventure/api.py b/adventure/api.py index 8ca7a66eb..fa5006473 100644 --- a/adventure/api.py +++ b/adventure/api.py @@ -48,12 +48,19 @@ def other_players(request): def move(request): data = request.data direction = data['direction'] + directions = ['n', 's', 'e', 'w'] player = request.user.player - try: - new_room = player.move(direction) - return JsonResponse({'maze': new_room.maze.id, 'x': new_room.x, 'y': new_room.y}) - except: - return JsonResponse({'message': 'Invalid Direction'}, safe=True, status=400) + for i in range(1, 101): + player.move('n') + player.move('s') + player.move('e') + player.move('w') + + try: + new_room = player.move(direction) + return JsonResponse({'maze': new_room.maze.id, 'x': new_room.x, 'y': new_room.y}) + except: + return JsonResponse({'message': 'Invalid Direction'}, safe=True, status=400) @csrf_exempt From 5c4465f53ccbadd7eed55f1c1f7c57925aab5ce6 Mon Sep 17 00:00:00 2001 From: Forrest-Darabian Date: Thu, 5 Mar 2020 12:27:56 -0800 Subject: [PATCH 2/3] Changes --- adventure/api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adventure/api.py b/adventure/api.py index fa5006473..005ca1d44 100644 --- a/adventure/api.py +++ b/adventure/api.py @@ -51,10 +51,10 @@ def move(request): directions = ['n', 's', 'e', 'w'] player = request.user.player for i in range(1, 101): - player.move('n') - player.move('s') - player.move('e') - player.move('w') + player.move(directions['n']) + player.move(directions['s']) + player.move(directions['e']) + player.move(directions['w']) try: new_room = player.move(direction) From bc003e5cdc844d65ccc3b59082069f13cd2e401b Mon Sep 17 00:00:00 2001 From: William Sedlacek Date: Thu, 5 Mar 2020 21:37:05 -0600 Subject: [PATCH 3/3] Testing Movement Chaining Signed-off-by: William Sedlacek --- adventure/api.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/adventure/api.py b/adventure/api.py index 4b2e2832f..136bb7b96 100644 --- a/adventure/api.py +++ b/adventure/api.py @@ -41,19 +41,29 @@ def other_players(request): def move(request): player = request.user.player prev_maze = player.current_maze - direction = request.data['direction'] - directions = [**request.data['direction'], [direction]] + directions = [] - for direction in directions: - try: + try: + directions += [request.data['direction']] + except: + pass + + try: + directions += request.data['directions'] + except: + pass + + try: + for direction in directions: room = player.move(direction) maze = dict(player.maze()) if prev_maze != room.maze.id else None position = {'x': room.x, 'y': room.y} pusher.trigger('Tower-Maze', 'movement', {'player': player.id, **position}) - return JsonResponse({'player': {**position, 'maze': room.maze.id}, 'nextMaze': maze}, safe=True) - except: - return JsonResponse({'detail': 'Invalid Direction'}, safe=True, status=400) + + return JsonResponse({'player': {**position, 'maze': room.maze.id}, 'nextMaze': maze}, safe=True) + except: + return JsonResponse({'detail': 'Invalid Direction'}, safe=True, status=400) @api_view(['POST'])