Merge branch 'master' of hongabar.org:robotgame

2012-08-08 11:15:19 +02:00 · 2012-08-08 11:15:19 +02:00 · 28a19d5493
commit 28a19d5493
parent 5ba6f515fb e759052c60
102 changed files with 184 additions and 153 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,2 @@
 *~
-*.pyc
-*.pyo
+*.py[co]
--- a/resources/graphics/ground_outside.png
+++ b/resources/graphics/ground_outside.png
--- a/resources/graphics/lever.png
+++ b/resources/graphics/lever.png
--- a/resources/graphics/lever/down-up/lever0001.png
+++ b/resources/graphics/lever/down-up/lever0001.png
--- a/resources/graphics/lever/down-up/lever0002.png
+++ b/resources/graphics/lever/down-up/lever0002.png
--- a/resources/graphics/lever/down-up/lever0003.png
+++ b/resources/graphics/lever/down-up/lever0003.png
--- a/resources/graphics/lever/down-up/lever0004.png
+++ b/resources/graphics/lever/down-up/lever0004.png
--- a/resources/graphics/lever/down-up/lever0005.png
+++ b/resources/graphics/lever/down-up/lever0005.png
--- a/resources/graphics/lever/down-up/lever0006.png
+++ b/resources/graphics/lever/down-up/lever0006.png
--- a/resources/graphics/lever/down-up/lever0007.png
+++ b/resources/graphics/lever/down-up/lever0007.png
--- a/resources/graphics/lever/down-up/lever0008.png
+++ b/resources/graphics/lever/down-up/lever0008.png
--- a/resources/graphics/lever/down-up/lever0009.png
+++ b/resources/graphics/lever/down-up/lever0009.png
--- a/resources/graphics/lever/down-up/lever0010.png
+++ b/resources/graphics/lever/down-up/lever0010.png
--- a/resources/graphics/lever/left-right/lever0001.png
+++ b/resources/graphics/lever/left-right/lever0001.png
--- a/resources/graphics/lever/left-right/lever0002.png
+++ b/resources/graphics/lever/left-right/lever0002.png
--- a/resources/graphics/lever/left-right/lever0003.png
+++ b/resources/graphics/lever/left-right/lever0003.png
--- a/resources/graphics/lever/left-right/lever0004.png
+++ b/resources/graphics/lever/left-right/lever0004.png
--- a/resources/graphics/lever/left-right/lever0005.png
+++ b/resources/graphics/lever/left-right/lever0005.png
--- a/resources/graphics/lever/left-right/lever0006.png
+++ b/resources/graphics/lever/left-right/lever0006.png
--- a/resources/graphics/lever/left-right/lever0007.png
+++ b/resources/graphics/lever/left-right/lever0007.png
--- a/resources/graphics/lever/left-right/lever0008.png
+++ b/resources/graphics/lever/left-right/lever0008.png
--- a/resources/graphics/lever/left-right/lever0009.png
+++ b/resources/graphics/lever/left-right/lever0009.png
--- a/resources/graphics/lever/left-right/lever0010.png
+++ b/resources/graphics/lever/left-right/lever0010.png
--- a/resources/graphics/robot_idle/down/robot0004.png
+++ b/resources/graphics/robot_idle/down/robot0004.png
--- a/resources/graphics/robot_idle/down/robot0005.png
+++ b/resources/graphics/robot_idle/down/robot0005.png
--- a/resources/graphics/robot_idle/down/robot0006.png
+++ b/resources/graphics/robot_idle/down/robot0006.png
--- a/resources/graphics/robot_idle/down/robot0007.png
+++ b/resources/graphics/robot_idle/down/robot0007.png
--- a/resources/graphics/robot_idle/down/robot0008.png
+++ b/resources/graphics/robot_idle/down/robot0008.png
--- a/resources/graphics/robot_idle/down/robot0009.png
+++ b/resources/graphics/robot_idle/down/robot0009.png
--- a/resources/graphics/robot_idle/down/robot0010.png
+++ b/resources/graphics/robot_idle/down/robot0010.png
--- a/resources/graphics/robot_idle/down/robot0011.png
+++ b/resources/graphics/robot_idle/down/robot0011.png
--- a/resources/graphics/robot_idle/down/robot0012.png
+++ b/resources/graphics/robot_idle/down/robot0012.png
--- a/resources/graphics/robot_idle/down/robot0013.png
+++ b/resources/graphics/robot_idle/down/robot0013.png
--- a/resources/graphics/robot_idle/down/robot0014.png
+++ b/resources/graphics/robot_idle/down/robot0014.png
--- a/resources/graphics/robot_idle/down/robot0015.png
+++ b/resources/graphics/robot_idle/down/robot0015.png
--- a/resources/graphics/robot_idle/down/robot0016.png
+++ b/resources/graphics/robot_idle/down/robot0016.png
--- a/resources/graphics/robot_idle/down/robot0017.png
+++ b/resources/graphics/robot_idle/down/robot0017.png
--- a/resources/graphics/robot_idle/down/robot0018.png
+++ b/resources/graphics/robot_idle/down/robot0018.png
--- a/resources/graphics/robot_idle/down/robot0019.png
+++ b/resources/graphics/robot_idle/down/robot0019.png
--- a/resources/graphics/robot_idle/down/robot0020.png
+++ b/resources/graphics/robot_idle/down/robot0020.png
--- a/resources/graphics/robot_idle/down/robot0021.png
+++ b/resources/graphics/robot_idle/down/robot0021.png
--- a/resources/graphics/robot_idle/down/robot0022.png
+++ b/resources/graphics/robot_idle/down/robot0022.png
--- a/resources/graphics/robot_idle/down/robot0023.png
+++ b/resources/graphics/robot_idle/down/robot0023.png
--- a/resources/graphics/robot_idle/down/robot0024.png
+++ b/resources/graphics/robot_idle/down/robot0024.png
--- a/resources/graphics/robot_idle/down/robot0025.png
+++ b/resources/graphics/robot_idle/down/robot0025.png
--- a/resources/graphics/robot_idle/down/robot0026.png
+++ b/resources/graphics/robot_idle/down/robot0026.png
--- a/resources/graphics/robot_idle/down/robot0027.png
+++ b/resources/graphics/robot_idle/down/robot0027.png
--- a/resources/graphics/robot_idle/down/robot0028.png
+++ b/resources/graphics/robot_idle/down/robot0028.png
--- a/resources/graphics/robot_idle/right/robot0004.png
+++ b/resources/graphics/robot_idle/right/robot0004.png
--- a/resources/graphics/robot_idle/right/robot0005.png
+++ b/resources/graphics/robot_idle/right/robot0005.png
--- a/resources/graphics/robot_idle/right/robot0006.png
+++ b/resources/graphics/robot_idle/right/robot0006.png
--- a/resources/graphics/robot_idle/right/robot0007.png
+++ b/resources/graphics/robot_idle/right/robot0007.png
--- a/resources/graphics/robot_idle/right/robot0008.png
+++ b/resources/graphics/robot_idle/right/robot0008.png
--- a/resources/graphics/robot_idle/right/robot0009.png
+++ b/resources/graphics/robot_idle/right/robot0009.png
--- a/resources/graphics/robot_idle/right/robot0010.png
+++ b/resources/graphics/robot_idle/right/robot0010.png
--- a/resources/graphics/robot_idle/right/robot0011.png
+++ b/resources/graphics/robot_idle/right/robot0011.png
--- a/resources/graphics/robot_idle/right/robot0012.png
+++ b/resources/graphics/robot_idle/right/robot0012.png
--- a/resources/graphics/robot_idle/right/robot0013.png
+++ b/resources/graphics/robot_idle/right/robot0013.png
--- a/resources/graphics/robot_idle/right/robot0014.png
+++ b/resources/graphics/robot_idle/right/robot0014.png
--- a/resources/graphics/robot_idle/right/robot0015.png
+++ b/resources/graphics/robot_idle/right/robot0015.png
--- a/resources/graphics/robot_idle/right/robot0016.png
+++ b/resources/graphics/robot_idle/right/robot0016.png
--- a/resources/graphics/robot_idle/right/robot0017.png
+++ b/resources/graphics/robot_idle/right/robot0017.png
--- a/resources/graphics/robot_idle/right/robot0018.png
+++ b/resources/graphics/robot_idle/right/robot0018.png
--- a/resources/graphics/robot_idle/right/robot0019.png
+++ b/resources/graphics/robot_idle/right/robot0019.png
--- a/resources/graphics/robot_idle/right/robot0020.png
+++ b/resources/graphics/robot_idle/right/robot0020.png
--- a/resources/graphics/robot_idle/right/robot0021.png
+++ b/resources/graphics/robot_idle/right/robot0021.png
--- a/resources/graphics/robot_idle/right/robot0022.png
+++ b/resources/graphics/robot_idle/right/robot0022.png
--- a/resources/graphics/robot_idle/right/robot0023.png
+++ b/resources/graphics/robot_idle/right/robot0023.png
--- a/resources/graphics/robot_idle/right/robot0024.png
+++ b/resources/graphics/robot_idle/right/robot0024.png
--- a/resources/graphics/robot_idle/right/robot0025.png
+++ b/resources/graphics/robot_idle/right/robot0025.png
--- a/resources/graphics/robot_idle/right/robot0026.png
+++ b/resources/graphics/robot_idle/right/robot0026.png
--- a/resources/graphics/robot_idle/right/robot0027.png
+++ b/resources/graphics/robot_idle/right/robot0027.png
--- a/resources/graphics/robot_idle/right/robot0028.png
+++ b/resources/graphics/robot_idle/right/robot0028.png
--- a/resources/graphics/robot_idle/up/robot0004.png
+++ b/resources/graphics/robot_idle/up/robot0004.png
--- a/resources/graphics/robot_idle/up/robot0005.png
+++ b/resources/graphics/robot_idle/up/robot0005.png
--- a/resources/graphics/robot_idle/up/robot0006.png
+++ b/resources/graphics/robot_idle/up/robot0006.png
--- a/resources/graphics/robot_idle/up/robot0007.png
+++ b/resources/graphics/robot_idle/up/robot0007.png
--- a/resources/graphics/robot_idle/up/robot0008.png
+++ b/resources/graphics/robot_idle/up/robot0008.png
--- a/resources/graphics/robot_idle/up/robot0009.png
+++ b/resources/graphics/robot_idle/up/robot0009.png
--- a/resources/graphics/robot_idle/up/robot0010.png
+++ b/resources/graphics/robot_idle/up/robot0010.png
--- a/resources/graphics/robot_idle/up/robot0011.png
+++ b/resources/graphics/robot_idle/up/robot0011.png
--- a/resources/graphics/robot_idle/up/robot0012.png
+++ b/resources/graphics/robot_idle/up/robot0012.png
--- a/resources/graphics/robot_idle/up/robot0013.png
+++ b/resources/graphics/robot_idle/up/robot0013.png
--- a/resources/graphics/robot_idle/up/robot0014.png
+++ b/resources/graphics/robot_idle/up/robot0014.png
--- a/resources/graphics/robot_idle/up/robot0015.png
+++ b/resources/graphics/robot_idle/up/robot0015.png
--- a/resources/graphics/robot_idle/up/robot0016.png
+++ b/resources/graphics/robot_idle/up/robot0016.png
--- a/resources/graphics/robot_idle/up/robot0017.png
+++ b/resources/graphics/robot_idle/up/robot0017.png
--- a/resources/graphics/robot_idle/up/robot0018.png
+++ b/resources/graphics/robot_idle/up/robot0018.png
--- a/resources/graphics/robot_idle/up/robot0019.png
+++ b/resources/graphics/robot_idle/up/robot0019.png
--- a/resources/graphics/robot_idle/up/robot0020.png
+++ b/resources/graphics/robot_idle/up/robot0020.png
--- a/resources/graphics/robot_idle/up/robot0021.png
+++ b/resources/graphics/robot_idle/up/robot0021.png
--- a/resources/graphics/robot_idle/up/robot0022.png
+++ b/resources/graphics/robot_idle/up/robot0022.png
--- a/resources/graphics/robot_idle/up/robot0023.png
+++ b/resources/graphics/robot_idle/up/robot0023.png
--- a/resources/graphics/robot_idle/up/robot0024.png
+++ b/resources/graphics/robot_idle/up/robot0024.png
--- a/resources/graphics/robot_idle/up/robot0025.png
+++ b/resources/graphics/robot_idle/up/robot0025.png
--- a/resources/graphics/robot_idle/up/robot0026.png
+++ b/resources/graphics/robot_idle/up/robot0026.png
--- a/resources/graphics/robot_idle/up/robot0027.png
+++ b/resources/graphics/robot_idle/up/robot0027.png
--- a/resources/graphics/robot_idle/up/robot0028.png
+++ b/resources/graphics/robot_idle/up/robot0028.png
--- a/resources/graphics/wall.png
+++ b/resources/graphics/wall.png
--- a/robotgame/logic/direction.py
+++ b/robotgame/logic/direction.py
@ -53,13 +53,9 @@ class Left(Direction):
        x, y = pos
        return x - 1, y

-succ = {Up:    Right,
-        Right: Down,
-        Down:  Left,
-        Left:  Up}.__getitem__
+all_directions = set((Up, Left, Down, Right))

-pred = {Right: Up,
-        Down:  Right,
-        Left:  Down,
-        Up:    Left}.__getitem__
+succ = lambda d: all_directions[(all_directions.index(d) + 1) % 4]
+pred = lambda d: all_directions[(all_directions.index(d) - 1) % 4]

+isDirection = lambda obj: obj in (Up, Left, Down, Right)
--- a/Show More
+++ b/Show More