From 2ccabcc6f6787c92449a06f25dda6d6e45b96bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Mon, 2 Mar 2020 21:47:28 +0100 Subject: [PATCH] Continue level --- assets/img2map.py | 5 ++++- assets/levelX.gif | Bin 0 -> 3202 bytes assets/map_template.gif | Bin 2621 -> 2645 bytes main.c | 7 +++++-- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 assets/levelX.gif diff --git a/assets/img2map.py b/assets/img2map.py index a40e27f..6699a8a 100644 --- a/assets/img2map.py +++ b/assets/img2map.py @@ -23,7 +23,10 @@ elementTypes = [ "CARD0", "CARD1", "CARD2", - "LOCK0" + "LOCK0", + "LOCK1", + "LOCK2", + "BLOCKER" ] propertyTypes = [ diff --git a/assets/levelX.gif b/assets/levelX.gif new file mode 100644 index 0000000000000000000000000000000000000000..d84b053cc77bfd9a824a682d04956d35ad86ba3e GIT binary patch literal 3202 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 literal 0 HcmV?d00001 diff --git a/assets/map_template.gif b/assets/map_template.gif index bcd4b307cdf71bb97f32863e643d65c6d83eb7e7..5e9eaa10e4fc4a73f7015e56a6c2d54899115303 100644 GIT binary patch delta 428 zcmV;d0aO0H6x9^44FeS+{t-iRWnpw>WFU8GbZ8()Nlj1ylMMrE0&1v}c>|XMXsDAC z1l|H)5tIHl6)Mtt{Jk*}neu4S^m0Y+=E1*u;vKw545JTPyO`wf^#)cI72r zd3q5+7&nhz%B@^E6-mho*SXGYlyL=tT$n2NqH_&yCx?IANt%3My4CIJb&Xh6&=jam z<0UV1(Mi`=K2n|D-GzL^3m4zw61bAJCS~(0(u&A;7xYC_deOGeRt`6ot99fD{u|)3 z*f*8Cy$MIhm;bJxmz9k&d zFv#+L=Dc)$0kI(Qn@+s;c*7s)g^**6$^oZipBi%e--P_2f#tt58UIh zAJBkeF%s9e5t5aOtfng=3roH7H3xnLtak=m*u!>Au^M1(W83!FboSGwaCtY9pNOf{|7x4WqTzHF1-$vG& zlfADk;c4cC4c@&o%u}YLdzr|06UlJ$728h diff --git a/main.c b/main.c index 43619d9..eb93b18 100755 --- a/main.c +++ b/main.c @@ -1023,9 +1023,12 @@ RCL_Unit SFG_floorHeightAt(int16_t x, int16_t y) } else if (properties == SFG_TILE_PROPERTY_ELEVATOR) { + RCL_Unit height = + SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP; + return SFG_movingWallHeight( - SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP, - SFG_TILE_CEILING_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP, + height, + height + SFG_TILE_CEILING_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP, SFG_game.frameTime - SFG_currentLevel.timeStart); }