X-Git-Url: https://plomlompom.com/repos/todo?a=blobdiff_plain;f=new%2Fplomrogue%2Fgame.py;h=9b20cb2e48e78036c6495849d12a3541ebab0843;hb=34a2854e63892c17232fed7795d1b0d16d014626;hp=a5ce4740417af3b2f83a104b2177418a28983a8d;hpb=c7ed14237418f807473b11e49f17a878ff344f97;p=plomrogue2-experiments

diff --git a/new/plomrogue/game.py b/new/plomrogue/game.py
index a5ce474..9b20cb2 100755
--- a/new/plomrogue/game.py
+++ b/new/plomrogue/game.py
@@ -1,4 +1,4 @@
-from plomrogue.tasks import Task_WAIT, Task_MOVE
+from plomrogue.tasks import Task_WAIT, Task_MOVE, Task_PICKUP, Task_DROP
 from plomrogue.errors import ArgError
 from plomrogue.commands import (cmd_GEN_WORLD, cmd_GET_GAMESTATE, cmd_MAP,
                                 cmd_MAP, cmd_THING_TYPE, cmd_THING_POS,
@@ -107,7 +107,10 @@ class Game:
     def __init__(self, game_file_name):
         self.io = GameIO(game_file_name, self)
         self.map_type = MapHex
-        self.tasks = {'WAIT': Task_WAIT, 'MOVE': Task_MOVE}
+        self.tasks = {'WAIT': Task_WAIT,
+                      'MOVE': Task_MOVE,
+                      'PICKUP': Task_PICKUP,
+                      'DROP': Task_DROP}
         self.commands = {'GEN_WORLD': cmd_GEN_WORLD,
                          'GET_GAMESTATE': cmd_GET_GAMESTATE,
                          'MAP': cmd_MAP,
@@ -147,6 +150,16 @@ class Game:
                                               stringify_yx(thing.position)))
         player = self.world.get_player()
         self.io.send('PLAYER_POS %s' % (stringify_yx(player.position)))
+        if len(player.inventory) > 0:
+            self.io.send('PLAYER_INVENTORY %s' % ','.join([str(i) for i in
+                                                           player.inventory]))
+        else:
+            self.io.send('PLAYER_INVENTORY ,')
+        for id_ in player.inventory:
+            thing = self.world.get_thing(id_)
+            self.io.send('THING_TYPE %s %s' % (thing.id_, thing.type_))
+            self.io.send('THING_POS %s %s' % (thing.id_,
+                                              stringify_yx(thing.position)))
         self.io.send('GAME_STATE_COMPLETE')
 
     def proceed(self):