diff --git a/resources/graphics/TODO.txt b/resources/graphics/TODO.txt index 4132e71..ec1ee9f 100644 --- a/resources/graphics/TODO.txt +++ b/resources/graphics/TODO.txt @@ -1,9 +1,10 @@ - wheel +DONE søjle +DONE søjle som kan hæve/sænke water/lava/to be discussed -done well with alpha in center to allow coloured light - spaceship - walls (in-door) - gate +DONE well with alpha in center to allow coloured light +dummy spaceship +dummy walls (in-door) +dummy gate numbered stones (symbols to be discussed) -done floor tiles +DONE floor tiles weight scale indicator (arrow moving 180 degrees from left to right) diff --git a/resources/graphics/blocks/block3.png b/resources/graphics/blocks/block3.png index 50d395d..71884f3 100644 Binary files a/resources/graphics/blocks/block3.png and b/resources/graphics/blocks/block3.png differ diff --git a/resources/graphics/blocks/block4.png b/resources/graphics/blocks/block4.png new file mode 100644 index 0000000..50d395d Binary files /dev/null and b/resources/graphics/blocks/block4.png differ diff --git a/resources/graphics/door/door0001.png b/resources/graphics/door/door0001.png index e138ca0..46bc56b 100644 Binary files a/resources/graphics/door/door0001.png and b/resources/graphics/door/door0001.png differ diff --git a/resources/graphics/door/door0020.png b/resources/graphics/door/door0020.png new file mode 100644 index 0000000..9406211 Binary files /dev/null and b/resources/graphics/door/door0020.png differ diff --git a/resources/graphics/elevating_column/column0002.png b/resources/graphics/elevating_column/column0002.png new file mode 100644 index 0000000..4e86a8f Binary files /dev/null and b/resources/graphics/elevating_column/column0002.png differ diff --git a/resources/graphics/elevating_column/column0003.png b/resources/graphics/elevating_column/column0003.png new file mode 100644 index 0000000..87ec1a2 Binary files /dev/null and b/resources/graphics/elevating_column/column0003.png differ diff --git a/resources/graphics/elevating_column/column0004.png b/resources/graphics/elevating_column/column0004.png new file mode 100644 index 0000000..5be0132 Binary files /dev/null and b/resources/graphics/elevating_column/column0004.png differ diff --git a/resources/graphics/elevating_column/column0005.png b/resources/graphics/elevating_column/column0005.png new file mode 100644 index 0000000..eabb1b9 Binary files /dev/null and b/resources/graphics/elevating_column/column0005.png differ diff --git a/resources/graphics/elevating_column/column0006.png b/resources/graphics/elevating_column/column0006.png new file mode 100644 index 0000000..8bffe83 Binary files /dev/null and b/resources/graphics/elevating_column/column0006.png differ diff --git a/resources/graphics/elevating_column/column0007.png b/resources/graphics/elevating_column/column0007.png new file mode 100644 index 0000000..e3ba9b8 Binary files /dev/null and b/resources/graphics/elevating_column/column0007.png differ diff --git a/resources/graphics/elevating_column/column0008.png b/resources/graphics/elevating_column/column0008.png new file mode 100644 index 0000000..eef1c17 Binary files /dev/null and b/resources/graphics/elevating_column/column0008.png differ diff --git a/resources/graphics/elevating_column/column0009.png b/resources/graphics/elevating_column/column0009.png new file mode 100644 index 0000000..e710160 Binary files /dev/null and b/resources/graphics/elevating_column/column0009.png differ diff --git a/resources/graphics/elevating_column/column0010.png b/resources/graphics/elevating_column/column0010.png new file mode 100644 index 0000000..ac55bda Binary files /dev/null and b/resources/graphics/elevating_column/column0010.png differ diff --git a/resources/graphics/elevating_column/column0011.png b/resources/graphics/elevating_column/column0011.png new file mode 100644 index 0000000..f0aad05 Binary files /dev/null and b/resources/graphics/elevating_column/column0011.png differ diff --git a/resources/graphics/elevating_column/column0012.png b/resources/graphics/elevating_column/column0012.png new file mode 100644 index 0000000..c9078c4 Binary files /dev/null and b/resources/graphics/elevating_column/column0012.png differ diff --git a/resources/graphics/elevating_column/column0013.png b/resources/graphics/elevating_column/column0013.png new file mode 100644 index 0000000..39abf59 Binary files /dev/null and b/resources/graphics/elevating_column/column0013.png differ diff --git a/resources/graphics/elevating_column/column0014.png b/resources/graphics/elevating_column/column0014.png new file mode 100644 index 0000000..3b63258 Binary files /dev/null and b/resources/graphics/elevating_column/column0014.png differ diff --git a/resources/graphics/elevating_column/column0015.png b/resources/graphics/elevating_column/column0015.png new file mode 100644 index 0000000..5e06901 Binary files /dev/null and b/resources/graphics/elevating_column/column0015.png differ diff --git a/resources/graphics/elevating_column/column0016.png b/resources/graphics/elevating_column/column0016.png new file mode 100644 index 0000000..7af4f9d Binary files /dev/null and b/resources/graphics/elevating_column/column0016.png differ diff --git a/resources/graphics/elevating_column/column0017.png b/resources/graphics/elevating_column/column0017.png new file mode 100644 index 0000000..74b6fd7 Binary files /dev/null and b/resources/graphics/elevating_column/column0017.png differ diff --git a/resources/graphics/elevating_column/column0018.png b/resources/graphics/elevating_column/column0018.png new file mode 100644 index 0000000..844be71 Binary files /dev/null and b/resources/graphics/elevating_column/column0018.png differ diff --git a/resources/graphics/elevating_column/column0019.png b/resources/graphics/elevating_column/column0019.png new file mode 100644 index 0000000..295b0a6 Binary files /dev/null and b/resources/graphics/elevating_column/column0019.png differ diff --git a/resources/graphics/elevating_column/column0020.png b/resources/graphics/elevating_column/column0020.png new file mode 100644 index 0000000..e71dbfc Binary files /dev/null and b/resources/graphics/elevating_column/column0020.png differ diff --git a/resources/graphics/elevating_column/column0021.png b/resources/graphics/elevating_column/column0021.png new file mode 100644 index 0000000..46521ae Binary files /dev/null and b/resources/graphics/elevating_column/column0021.png differ diff --git a/resources/graphics/elevating_column/column0022.png b/resources/graphics/elevating_column/column0022.png new file mode 100644 index 0000000..d26f28e Binary files /dev/null and b/resources/graphics/elevating_column/column0022.png differ diff --git a/resources/graphics/elevating_column/column0023.png b/resources/graphics/elevating_column/column0023.png new file mode 100644 index 0000000..08c870b Binary files /dev/null and b/resources/graphics/elevating_column/column0023.png differ diff --git a/resources/graphics/elevating_column/column0024.png b/resources/graphics/elevating_column/column0024.png new file mode 100644 index 0000000..2834d1e Binary files /dev/null and b/resources/graphics/elevating_column/column0024.png differ diff --git a/resources/graphics/elevating_column/column0025.png b/resources/graphics/elevating_column/column0025.png new file mode 100644 index 0000000..d016f87 Binary files /dev/null and b/resources/graphics/elevating_column/column0025.png differ diff --git a/resources/graphics/elevating_column/column0026.png b/resources/graphics/elevating_column/column0026.png new file mode 100644 index 0000000..71884f3 Binary files /dev/null and b/resources/graphics/elevating_column/column0026.png differ diff --git a/resources/graphics/elevating_column/readme b/resources/graphics/elevating_column/readme new file mode 100644 index 0000000..3b89ebb --- /dev/null +++ b/resources/graphics/elevating_column/readme @@ -0,0 +1,6 @@ +frame 02 is basic (entirely lowered) +frame 08 is stage 1 +frame 14 is stage 2 +frame 20 is stage 3 +frame 26 is max + diff --git a/resources/graphics/spacecraft.png b/resources/graphics/spacecraft.png new file mode 100644 index 0000000..7e02f96 Binary files /dev/null and b/resources/graphics/spacecraft.png differ diff --git a/resources/graphics/wall.png b/resources/graphics/wall.png new file mode 100644 index 0000000..def82df Binary files /dev/null and b/resources/graphics/wall.png differ diff --git a/robotgame/level1.py b/robotgame/level1.py index f4acf19..9cb18f1 100644 --- a/robotgame/level1.py +++ b/robotgame/level1.py @@ -418,14 +418,14 @@ class Wheel(block.Block): self.frame = 0 self.anim_speed = 15 - self.nsettings = 4 + self.nsettings = 5 self.setting = random.randint(0, self.nsettings - 1) if self.immitate: self.on = self.setting == self.immitate.setting self.init_setting = self.setting - self.anim = 'stairs' + self.anim = 'elevating_column' self.anim_direction = 1 @@ -447,7 +447,8 @@ class Wheel(block.Block): def update(self, e, t, dt): # Update the animation l = len(self.level.imgs[self.anim]) - if not (int(self.frame) == self.setting * l / self.nsettings): + if not (int(self.frame) == self.setting * (l - 1) + / (self.nsettings - 1)): self.frame = ((self.frame + self.anim_speed * dt) % l if (self.setting > 0 and self.anim_direction > 0) or (self.setting == self.nsettings - 1 diff --git a/robotgame/loader.py b/robotgame/loader.py index 2967072..c207906 100644 --- a/robotgame/loader.py +++ b/robotgame/loader.py @@ -86,6 +86,7 @@ class Loader(object): ('arrow_left', os.path.join('matt', 'right')), ('stairs', 'stairs'), + ('elevating_column', 'elevating_column'), ('mirror', 'mirror')] ):