import socket
import threading
from parser import ArgError, Parser
+from game import World
+class Thing:
+ def __init__(self, id_, position, symbol):
+ self.id_ = id_
+ self.symbol = symbol
+ self.position = position
+
class Game:
- turn = 0
+ world = World()
log_text = ''
- map_size = (0, 0)
- terrain_map = ''
- things = []
-
- class Thing:
- def __init__(self, id_, position, symbol):
- self.id_ = id_
- self.position = position
- self.symbol = symbol
def log(self, msg):
"""Prefix msg plus newline to self.log_text."""
self.log_text = msg + '\n' + self.log_text
- def get_thing(self, i):
- for thing in self.things:
- if i == thing.id_:
- return thing
- t = self.Thing(i, [0,0], '?')
- self.things += [t]
- return t
-
def cmd_THING_TYPE(self, i, type_):
- t = self.get_thing(i)
+ t = self.world.get_thing(i)
symbol = '?'
if type_ == 'human':
symbol = '@'
cmd_THING_TYPE.argtypes = 'int:nonneg string'
def cmd_THING_POS(self, i, yx):
- t = self.get_thing(i)
+ t = self.world.get_thing(i)
t.position = list(yx)
cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
def cmd_THING_POS(self, i, yx):
- t = self.get_thing(i)
+ t = self.world.get_thing(i)
t.position = list(yx)
cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
def cmd_MAP_SIZE(self, yx):
"""Set self.map_size to yx, redraw self.terrain_map as '?' cells."""
- y, x = yx
- self.map_size = (y, x)
- self.terrain_map = ''
- for y in range(self.map_size[0]):
- self.terrain_map += '?' * self.map_size[1]
+ self.world.set_map_size(yx)
cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
def cmd_TURN_FINISHED(self, n):
def cmd_NEW_TURN(self, n):
"""Set self.turn to n, empty self.things."""
- self.turn = n
- self.things = []
+ self.world.turn = n
+ self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
def cmd_TERRAIN_LINE(self, y, terrain_line):
- width_map = self.map_size[1]
- if y >= self.map_size[0]:
- raise ArgError('too large row number %s' % y)
- width_line = len(terrain_line)
- if width_line > width_map:
- raise ArgError('too large map line width %s' % width_line)
- self.terrain_map = self.terrain_map[:y * width_map] + \
- terrain_line + self.terrain_map[(y + 1) * width_map:]
+ self.world.set_map_line(y, terrain_line)
cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
def draw_map(self):
"""Draw map view from .game.terrain_map, .game.things."""
map_lines = []
- map_size = len(self.game.terrain_map)
+ map_size = len(self.game.world.terrain_map)
start_cut = 0
while start_cut < map_size:
- limit = start_cut + self.game.map_size[1]
- map_lines += [self.game.terrain_map[start_cut:limit]]
+ limit = start_cut + self.game.world.map_size[1]
+ map_lines += [self.game.world.terrain_map[start_cut:limit]]
start_cut = limit
- for t in self.game.things:
+ for t in self.game.world.things:
line_as_list = list(map_lines[t.position[0]])
line_as_list[t.position[1]] = t.symbol
map_lines[t.position[0]] = ''.join(line_as_list)
def update(self):
"""Redraw all non-edit widgets."""
- self.turn_widget.set_text('TURN: ' + str(self.game.turn))
+ self.turn_widget.set_text('TURN: ' + str(self.game.world.turn))
self.log_widget.set_text(self.game.log_text)
self.map_widget.set_text(self.draw_map())
--- /dev/null
+class GameError(Exception):
+ pass
+
+
+def move_pos(direction, pos_yx):
+ if direction == 'UP':
+ pos_yx[0] -= 1
+ elif direction == 'DOWN':
+ pos_yx[0] += 1
+ elif direction == 'RIGHT':
+ pos_yx[1] += 1
+ elif direction == 'LEFT':
+ pos_yx[1] -= 1
+
+
+class World:
+
+ def __init__(self):
+ self.turn = 0
+ self.map_size = (0, 0)
+ self.terrain_map = ''
+ self.things = []
+ self.player_id = 0
+
+ def proceed_to_next_player_turn(self):
+ """Run game world turns until player can decide their next step.
+
+ Iterates through all non-player things, on each step
+ furthering them in their tasks (and letting them decide new
+ ones if they finish). The iteration order is: first all things
+ that come after the player in the world things list, then
+ (after incrementing the world turn) all that come before the
+ player; then the player's .proceed() is run, and if it does
+ not finish his task, the loop starts at the beginning. Once
+ the player's task is finished, the loop breaks.
+ """
+ while True:
+ for thing in self.things[self.player_id+1:]:
+ thing.proceed()
+ self.turn += 1
+ for thing in self.things[:self.player_id]:
+ thing.proceed()
+ player = self.get_thing(self.player_id)
+ player.proceed(is_AI=False)
+ if player.task is None:
+ break
+
+ def set_map_size(self, yx):
+ y, x = yx
+ self.map_size = (y, x)
+ self.terrain_map = ''
+ for y in range(self.map_size[0]):
+ self.terrain_map += '?' * self.map_size[1]
+
+ def set_map_line(self, y, line):
+ width_map = self.map_size[1]
+ if y >= self.map_size[0]:
+ raise ArgError('too large row number %s' % y)
+ width_line = len(line)
+ if width_line > width_map:
+ raise ArgError('too large map line width %s' % width_line)
+ self.terrain_map = self.terrain_map[:y * width_map] + line + \
+ self.terrain_map[(y + 1) * width_map:]
+
+ def get_thing(self, i):
+ for thing in self.things:
+ if i == thing.id_:
+ return thing
+ t = Thing(self, i, '?', [0,0])
+ self.things += [t]
+ return t
+
+
+class Task:
+
+ def __init__(self, thing, name, args=(), kwargs={}):
+ self.name = name
+ self.thing = thing
+ self.args = args
+ self.kwargs = kwargs
+ self.todo = 1
+
+ def check(self):
+ if self.name == 'move':
+ if len(self.args) > 0:
+ direction = self.args[0]
+ else:
+ direction = self.kwargs['direction']
+ test_pos = self.thing.position[:]
+ move_pos(direction, test_pos)
+ if test_pos[0] < 0 or test_pos[1] < 0 or \
+ test_pos[0] >= self.thing.world.map_size[0] or \
+ test_pos[1] >= self.thing.world.map_size[1]:
+ raise GameError('would move outside map bounds')
+ pos_i = test_pos[0] * self.thing.world.map_size[1] + test_pos[1]
+ map_tile = self.thing.world.terrain_map[pos_i]
+ if map_tile != '.':
+ raise GameError('would move into illegal terrain')
+
+
+class Thing:
+
+ def __init__(self, world, id_, type_, position):
+ self.world = world
+ self.id_ = id_
+ self.type_ = type_
+ self.position = position
+ self.task = Task(self, 'wait')
+
+ def task_wait(self):
+ pass
+
+ def task_move(self, direction):
+ move_pos(direction, self.position)
+
+ def decide_task(self):
+ if self.position[1] > 1:
+ self.set_task('move', 'LEFT')
+ elif self.position[1] < 3:
+ self.set_task('move', 'RIGHT')
+ else:
+ self.set_task('wait')
+
+ def set_task(self, task_name, *args, **kwargs):
+ self.task = Task(self, task_name, args, kwargs)
+ self.task.check()
+
+ def proceed(self, is_AI=True):
+ """Further the thing in its tasks.
+
+ Decrements .task.todo; if it thus falls to <= 0, enacts method whose
+ name is 'task_' + self.task.name and sets .task = None. If is_AI, calls
+ .decide_task to decide a self.task.
+ """
+ self.task.todo -= 1
+ if self.task.todo <= 0:
+ task = getattr(self, 'task_' + self.task.name)
+ task(*self.task.args, **self.task.kwargs)
+ self.task = None
+ if is_AI and self.task is None:
+ self.decide_task()
import sys
import os
from parser import ArgError, Parser
-from server_.game import World, GameError
+from game import World, GameError
# Avoid "Address already in use" errors.
self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
for y in range(self.world.map_size[0]):
width = self.world.map_size[1]
- terrain_line = self.world.map_[y * width:(y + 1) * width]
+ terrain_line = self.world.terrain_map[y * width:(y + 1) * width]
self.send_all('TERRAIN_LINE %5s %s' % (y, self.quoted(terrain_line)))
for thing in self.world.things:
self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_))
+++ /dev/null
-class GameError(Exception):
- pass
-
-
-def move_pos(direction, pos_yx):
- if direction == 'UP':
- pos_yx[0] -= 1
- elif direction == 'DOWN':
- pos_yx[0] += 1
- elif direction == 'RIGHT':
- pos_yx[1] += 1
- elif direction == 'LEFT':
- pos_yx[1] -= 1
-
-
-class World:
-
- def __init__(self):
- self.turn = 0
- self.map_size = (0, 0)
- self.map_ = ''
- self.things = []
-# Thing(self, 'human', [3, 3]),
-# Thing(self, 'monster', [1, 1])
-# ]
- self.player_id = 0
-# self.player = self.things[self.player_i]
-
- def proceed_to_next_player_turn(self):
- """Run game world turns until player can decide their next step.
-
- Iterates through all non-player things, on each step
- furthering them in their tasks (and letting them decide new
- ones if they finish). The iteration order is: first all things
- that come after the player in the world things list, then
- (after incrementing the world turn) all that come before the
- player; then the player's .proceed() is run, and if it does
- not finish his task, the loop starts at the beginning. Once
- the player's task is finished, the loop breaks.
- """
- while True:
- for thing in self.things[self.player_id+1:]:
- thing.proceed()
- self.turn += 1
- for thing in self.things[:self.player_id]:
- thing.proceed()
- player = self.get_thing(self.player_id)
- player.proceed(is_AI=False)
- if player.task is None:
- break
-
- def set_map_size(self, yx):
- y, x = yx
- self.map_size = (y, x)
- self.map_ = ''
- for y in range(self.map_size[0]):
- self.map_ += '?' * self.map_size[1]
-
- def set_map_line(self, y, line):
- width_map = self.map_size[1]
- if y >= self.map_size[0]:
- raise ArgError('too large row number %s' % y)
- width_line = len(line)
- if width_line > width_map:
- raise ArgError('too large map line width %s' % width_line)
- self.map_ = self.map_[:y * width_map] + line + \
- self.map_[(y + 1) * width_map:]
-
- def get_thing(self, i):
- for thing in self.things:
- if i == thing.id_:
- return thing
- t = Thing(self, i, '?', [0,0])
- self.things += [t]
- return t
-
-
-class Task:
-
- def __init__(self, thing, name, args=(), kwargs={}):
- self.name = name
- self.thing = thing
- self.args = args
- self.kwargs = kwargs
- self.todo = 1
-
- def check(self):
- if self.name == 'move':
- if len(self.args) > 0:
- direction = self.args[0]
- else:
- direction = self.kwargs['direction']
- test_pos = self.thing.position[:]
- move_pos(direction, test_pos)
- if test_pos[0] < 0 or test_pos[1] < 0 or \
- test_pos[0] >= self.thing.world.map_size[0] or \
- test_pos[1] >= self.thing.world.map_size[1]:
- raise GameError('would move outside map bounds')
- pos_i = test_pos[0] * self.thing.world.map_size[1] + test_pos[1]
- map_tile = self.thing.world.map_[pos_i]
- if map_tile != '.':
- raise GameError('would move into illegal terrain')
-
-
-class Thing:
-
- def __init__(self, world, id_, type_, position):
- self.world = world
- self.id_ = id_
- self.type_ = type_
- self.position = position
- self.task = Task(self, 'wait')
-
- def task_wait(self):
- pass
-
- def task_move(self, direction):
- move_pos(direction, self.position)
-
- def decide_task(self):
- if self.position[1] > 1:
- self.set_task('move', 'LEFT')
- elif self.position[1] < 3:
- self.set_task('move', 'RIGHT')
- else:
- self.set_task('wait')
-
- def set_task(self, task_name, *args, **kwargs):
- self.task = Task(self, task_name, args, kwargs)
- self.task.check()
-
- def proceed(self, is_AI=True):
- """Further the thing in its tasks.
-
- Decrements .task.todo; if it thus falls to <= 0, enacts method whose
- name is 'task_' + self.task.name and sets .task = None. If is_AI, calls
- .decide_task to decide a self.task.
- """
- self.task.todo -= 1
- if self.task.todo <= 0:
- task = getattr(self, 'task_' + self.task.name)
- task(*self.task.args, **self.task.kwargs)
- self.task = None
- if is_AI and self.task is None:
- self.decide_task()
projects / plomrogue2-experiments / commitdiff