now properly walking and running, fully fixed

semestralka1/chafa/character/crawl/out_crawl1.txt

@@ -0,0 +1,6 @@
+........
+........
+...y4@W.
+..a@a`..
+..@@R@=.
+.aa@s@..

semestralka1/chafa/character/crawl/out_crawl2.txt

@@ -0,0 +1,6 @@
+........
+........
+........
+.____...
+.@@@@yg,
+.a@@PR@L

semestralka1/chafa/character/run/out_run1.txt

@@ -0,0 +1,6 @@
+....g@w.
+..._ZF~.
+..@~@@y=
+.".g@_`.
+_ygF.Ry.
+`~`...4L

semestralka1/chafa/character/run/out_run2.txt

@@ -0,0 +1,6 @@
+....g@w.
+..._Z~~.
+..aM@$y,
+..~a@_`.
+.yy@`$..
+..`..@..

semestralka1/chafa/character/run/out_run3.txt

@@ -0,0 +1,6 @@
+...a@$..
+..._Z~..
+..a@@...
+..R@@=..
+.yy@@...
+.``u@...

semestralka1/chafa/character/run/out_run4.txt

@@ -0,0 +1,6 @@
+..g@$...
+..yT`...
+.g@F....
+.4@L....
+._$$....
+.`@~....

semestralka1/chafa/character/run/out_run5.txt

@@ -0,0 +1,6 @@
+...@@...
+.._Z~...
+..@@....
+..$@#...
+..g@L...
+.yFP....

semestralka1/chafa/character/run/out_run6.txt

@@ -0,0 +1,6 @@
+....@@..
+..._Z~..
+..y@@,_.
+..@$@~~.
+..y@~$..
+.aF~.4L.

semestralka1/chafa/character/run/out_run7.txt

@@ -0,0 +1,6 @@
+....a@e.
+..._ZF`.
+..a~@@y=
+..'y@L`.
+_yyP.4y.
+`~`...4L

semestralka1/chafa/character/run_chafa.txt

@@ -2,3 +2,4 @@ chafa --symbols ascii-block -c none --fill none --invert --size=13x20 predloha_r
 
 a = 78x111
 b = 34x111
+walk = 60x111

semestralka1/chafa/character/walk/out_walk1.txt

@@ -0,0 +1,6 @@
+..a@w.
+.._T`.
+.s@@y.
+.^$$~T
+.y@`$.
+=F..?K

semestralka1/chafa/character/walk/out_walk2.txt

@@ -0,0 +1,6 @@
+..y@$.
+.._Z~.
+.y@@L.
+.4W@Z!
+._$~$.
+~~`.0.

semestralka1/chafa/character/walk/out_walk3.txt

@@ -0,0 +1,6 @@
+..g@L.
+.._T~.
+.g@$..
+.J@@..
+_y$4L.
+~~.4~.

semestralka1/chafa/character/walk/out_walk4.txt

@@ -0,0 +1,6 @@
+..a@w.
+..~T~.
+..@$..
+..@$..
+..y@..
+."~@..

semestralka1/chafa/character/walk/out_walk5.txt

@@ -0,0 +1,6 @@
+..@@..
+..Z~..
+..@L..
+..@L..
+..$%..
+.4F...

semestralka1/chafa/character/walk/out_walk6.txt

@@ -0,0 +1,6 @@
+.u@$..
+..Z~..
+.g@_..
+.$@5+.
+._BL..
+uP.@..

semestralka1/chafa/character/walk/out_walk7.txt

@@ -0,0 +1,6 @@
+..a@w.
+.._T`.
+.s@@y.
+.^$$~T
+.yE`$.
+=F..JK

semestralka1/src/assets/character_crawl_frames.h

@@ -0,0 +1,38 @@
+// src/assets/character_crawl_frames.h
+#pragma once
+
+// Crawl frame 1
+static const char *CRAWL_FRAME_1[] = {
+    "........",
+    "........",
+    "...y4@W.",
+    "..a@a`..",
+    "..@@R@=.",
+    ".aa@s@.."
+};
+
+// Crawl frame 2
+static const char *CRAWL_FRAME_2[] = {
+    "........",
+    "........",
+    "........",
+    ".____...",
+    ".@@@@yg,",
+    ".a@@PR@L"
+};
+
+enum class CrawlFrame {
+    Crawl1 = 0,
+    Crawl2,
+    COUNT
+};
+
+static const char **CHARACTER_CRAWL_FRAMES[] = {
+    CRAWL_FRAME_1,
+    CRAWL_FRAME_2
+};
+
+static const int CHARACTER_CRAWL_FRAME_COUNT = sizeof(CHARACTER_CRAWL_FRAMES) / sizeof(CHARACTER_CRAWL_FRAMES[0]);
+
+// Height (rows per crawl frame)
+static const int CHARACTER_CRAWL_FRAME_HEIGHT = sizeof(CRAWL_FRAME_1) / sizeof(CRAWL_FRAME_1[0]);

semestralka1/src/assets/character_frames.h

@@ -1,54 +0,0 @@
-// src/assets/character_frames.h
-
-#pragma once
-
-// Player frame 1
-static const char *CHARACTER_MASK_FRAME_1[] = {
-    ".....a@$..",
-    ".....7PF..",
-    "..yaM@@__y",
-    "..@.y@FFF~",
-    "..._$M@_..",
-    "yaa@~.`@y.",
-    "........@r"
-};
-
-// Player frame 2
-static const char *CHARACTER_MASK_FRAME_2[] = {
-    ".g@$",
-    ".7PF",
-    "y@$.",
-    "0@F.",
-    "4@$.",
-    "y$@.",
-    "u@.."
-};
-
-// Player frame 3 (triggered)
-static const char *CHARACTER_MASK_FRAME_3[] = {
-    ".._$@.",
-    ".$By`.",
-    "4@$@@a",
-    "aa@W@."
-};
-
-enum class CharacterFrame {
-    Walk1 = 0,
-    Walk2,
-    Crawl1,
-    COUNT // number of frames, must stay last
-};
-
-// Combine frames for easy access
-static const char **PLAYER_FRAMES[] = {
-    CHARACTER_MASK_FRAME_1, // Walk1
-    CHARACTER_MASK_FRAME_2, // Walk1
-    CHARACTER_MASK_FRAME_3  // Crawl1
-};
-
-static const int CHARACTER_FRAME_COUNT = static_cast<int>(CharacterFrame::COUNT);
-
-// Height per frame
-static const int CHARACTER_HEIGHT_1 = sizeof(CHARACTER_MASK_FRAME_1) / sizeof(CHARACTER_MASK_FRAME_1[0]);
-static const int CHARACTER_HEIGHT_2 = sizeof(CHARACTER_MASK_FRAME_2) / sizeof(CHARACTER_MASK_FRAME_2[0]);
-static const int CHARACTER_HEIGHT_3 = sizeof(CHARACTER_MASK_FRAME_3) / sizeof(CHARACTER_MASK_FRAME_3[0]);

semestralka1/src/assets/character_run_frames.h

@@ -0,0 +1,98 @@
+// src/assets/character_run_frames.h
+#pragma once
+
+// Run frame 1
+static const char *RUN_FRAME_1[] = {
+    "....g@w.",
+    "..._ZF~.",
+    "..@~@@y=",
+    "\".g@_`.",
+    "_ygF.Ry.",
+    "`~`...4L",
+};
+
+// Run frame 2
+static const char *RUN_FRAME_2[] = {
+    "....g@w.",
+    "..._Z~~.",
+    "..aM@$y,",
+    "..~a@_`.",
+    ".yy@`$..",
+    "..`..@..",
+};
+
+// Run frame 3
+static const char *RUN_FRAME_3[] = {
+    "...a@$..",
+    "..._Z~..",
+    "..a@@...",
+    "..R@@=..",
+    ".yy@@...",
+    ".``u@...",
+};
+
+// Run frame 4
+static const char *RUN_FRAME_4[] = {
+    "..g@$...",
+    "..yT`...",
+    ".g@F....",
+    ".4@L....",
+    "._$$....",
+    ".`@~....",
+};
+
+// Run frame 5
+static const char *RUN_FRAME_5[] = {
+    "...@@...",
+    ".._Z~...",
+    "..@@....",
+    "..$@#...",
+    "..g@L...",
+    ".yFP....",
+};
+
+// Run frame 6
+static const char *RUN_FRAME_6[] = {
+    "....@@..",
+    "..._Z~..",
+    "..y@@,_.",
+    "..@$@~~.",
+    "..y@~$..",
+    ".aF~.4L.",
+};
+
+// Run frame 7
+static const char *RUN_FRAME_7[] = {
+    "....a@e.",
+    "..._ZF`.",
+    "..a~@@y=",
+    "..'y@L`.",
+    "_yyP.4y.",
+    "`~`...4L",
+};
+
+enum class RunFrame {
+    Run1 = 0,
+    Run2,
+    Run3,
+    Run4,
+    Run5,
+    Run6,
+    Run7,
+    COUNT
+};
+
+static const char **CHARACTER_RUN_FRAMES[] = {
+    RUN_FRAME_1,
+    RUN_FRAME_2,
+    RUN_FRAME_3,
+    RUN_FRAME_4,
+    RUN_FRAME_5,
+    RUN_FRAME_6,
+    RUN_FRAME_7,
+};
+
+static const int CHARACTER_RUN_FRAME_COUNT = sizeof(CHARACTER_RUN_FRAMES) / sizeof(CHARACTER_RUN_FRAMES[0]);
+
+// Height (rows per run frame)
+static const int CHARACTER_RUN_FRAME_HEIGHT = sizeof(RUN_FRAME_1) / sizeof(RUN_FRAME_1[0]);

semestralka1/src/assets/character_walk_frames.h

@@ -0,0 +1,98 @@
+// src/assets/character_walk_frames.h
+#pragma once
+
+// Walk frame 1
+static const char *WALK_FRAME_1[] = {
+    "..a@w.",
+    ".._T`.",
+    ".s@@y.",
+    ".^$$~T",
+    ".y@`$.",
+    "=F..?K",
+};
+
+// Walk frame 2
+static const char *WALK_FRAME_2[] = {
+    "..y@$.",
+    ".._Z~.",
+    ".y@@L.",
+    ".4W@Z!",
+    "._$~$.",
+    "~~`.0.",
+};
+
+// Walk frame 3
+static const char *WALK_FRAME_3[] = {
+    "..g@L.",
+    ".._T~.",
+    ".g@$..",
+    ".J@@..",
+    "_y$4L.",
+    "~~.4~.",
+};
+
+// Walk frame 4
+static const char *WALK_FRAME_4[] = {
+    "..a@w.",
+    "..~T~.",
+    "..@$..",
+    "..@$..",
+    "..y@..",
+    ".\"~@..",
+};
+
+// Walk frame 5
+static const char *WALK_FRAME_5[] = {
+    "..@@..",
+    "..Z~..",
+    "..@L..",
+    "..@L..",
+    "..$%..",
+    ".4F...",
+};
+
+// Walk frame 6
+static const char *WALK_FRAME_6[] = {
+    ".u@$..",
+    "..Z~..",
+    ".g@_..",
+    ".$@5+.",
+    "._BL..",
+    "uP.@..",
+};
+
+// Walk frame 7
+static const char *WALK_FRAME_7[] = {
+    "..a@w.",
+    ".._T`.",
+    ".s@@y.",
+    ".^$$~T",
+    ".yE`$.",
+    "=F..JK",
+};
+
+enum class WalkFrame {
+    Walk1 = 0,
+    Walk2,
+    Walk3,
+    Walk4,
+    Walk5,
+    Walk6,
+    Walk7,
+    COUNT
+};
+
+static const char **CHARACTER_WALK_FRAMES[] = {
+    WALK_FRAME_1,
+    WALK_FRAME_2,
+    WALK_FRAME_3,
+    WALK_FRAME_4,
+    WALK_FRAME_5,
+    WALK_FRAME_6,
+    WALK_FRAME_7,
+};
+
+static const int CHARACTER_WALK_FRAME_COUNT = sizeof(CHARACTER_WALK_FRAMES) / sizeof(CHARACTER_WALK_FRAMES[0]);
+
+// Height (rows per walk frame)
+static const int CHARACTER_WALK_FRAME_HEIGHT = sizeof(WALK_FRAME_1) / sizeof(WALK_FRAME_1[0]);

semestralka1/src/game/state.cpp

@@ -1,38 +1,167 @@
 // src/game/state.cpp
 #include "state.h"
+#include "../render/player.h"
+#include "../timing/speed_controller.h"
+#include  "../assets/character_run_frames.h"
+#include  "../assets/character_walk_frames.h"
+#include  "../assets/character_crawl_frames.h"
+#include <cmath>
+
+namespace {
+// Frame selector with two regimes:
+// 1) Normal (speed <= 6): ping‑pong with holds at both ends
+// 2) High‑speed (speed >= 7): 0, random(1..last-1), last, random(1..last-1)...
+static inline int compute_frame_index(int frame_count,
+                                      float player_speed,
+                                      int tick_counter) {
+  if (frame_count <= 1) return 0;
+  if (player_speed <= 0.0f) return 0;
+
+  const int last = frame_count - 1;
+
+  // High-speed pattern: 0, rand(1..last-1), last, rand(1..last-1), ...
+  if (player_speed >= 7.0f) {
+    // Special-case 2-frame animations
+    if (frame_count <= 2) {
+      return (tick_counter & 1) ? 1 : 0;
+    }
+
+    // Even ticks → extremes (0 or last), alternating each time.
+    // Odd ticks → pseudo-random mid in [1..last-1].
+    if ((tick_counter & 1) == 0) {
+      // Alternate 0 and last on even ticks
+      bool choose_zero = ((tick_counter >> 1) & 1) == 0;
+      return choose_zero ? 0 : last;
+    } else {
+      // Simple deterministic PRNG from tick_counter and speed
+      unsigned int seed =
+          static_cast<unsigned int>(tick_counter) * 1664525u + 1013904223u;
+      seed ^= static_cast<unsigned int>(frame_count) * 2654435761u;
+      seed ^= static_cast<unsigned int>(player_speed * 997.0f);
+      int range = last - 1; // size of 1..last-1
+      if (range <= 0) return 0; // safety
+      int mid = 1 + static_cast<int>(seed % static_cast<unsigned int>(range));
+      return mid;
+    }
+  }
+
+  // Normal-speed regime: discrete ping‑pong with holds at both ends.
+  // - speed 1 => 0,1,2,...,last, last, ..., 2,1, 0,0 ...
+  // - speed 2 => advances 2 steps per tick (skipping every second timeline entry)
+  // - holds at ends make 0 and last appear more frequently
+  const int hold = 2; // how many extra steps to hold at each end
+
+  // One full ping‑pong cycle length:
+  // [hold at 0] + [ascend 1..last] + [hold at last] + [descend last-1..0]
+  const int ascend_len = last;   // produces 1..last (length = last)
+  const int descend_len = last;  // produces last-1..0 (length = last)
+  const int cycle_len = hold + ascend_len + hold + descend_len;
+
+  // Advance by an integer number of steps per tick based on speed
+  int step = static_cast<int>(floorf(player_speed + 0.5f));
+  if (step < 1) step = 1;
+
+  // Use 64-bit for safety, then fold into cycle length
+  const long long pos64 =
+      (static_cast<long long>(tick_counter) *
+       static_cast<long long>(step)) %
+      static_cast<long long>(cycle_len);
+  int pos = static_cast<int>(pos64);
+
+  // Map timeline position to frame index
+  if (pos < hold) {
+    return 0; // hold at 0
+  }
+  pos -= hold;
+
+  if (pos < ascend_len) {
+    // ascend: 1..last
+    return (pos + 1);
+  }
+  pos -= ascend_len;
+
+  if (pos < hold) {
+    return last; // hold at last
+  }
+  pos -= hold;
+
+  // descend: last-1 .. 0
+  return last - 1 - pos;
+}
+} // namespace
 
 void WalkingState::update() {
   // stop crawling after duration
-  if (current_state == PlayerState::Crawl1 &&
+  if (current_state == PlayerState::Crawl &&
       state_timer.elapsed_time() >= CRAWL_DURATION) {
-    current_state = PlayerState::Walk1;
+    current_state = PlayerState::Walk;
     state_timer.stop();
   }
 }
 
 void WalkingState::start_crawl() {
-  current_state = PlayerState::Crawl1;
+  current_state = PlayerState::Crawl;
   state_timer.reset();
   state_timer.start();
 }
 
-void WalkingState::toggle_walk_frame() {
-  if (current_state == PlayerState::Walk1) {
-    current_state = PlayerState::Walk2;
-  } else if (current_state == PlayerState::Walk2) {
-    current_state = PlayerState::Walk1;
+void WalkingState::set_state(PlayerState s) {
+  if (current_state != s) {
+    walk_index = run_index = crawl_index = 0;
+    phase = 0.0f;
+  }
+  current_state = s;
+}
+
+void WalkingState::set_motion_state_for_speed(int player_speed, int ground_speed) {
+    int relative = player_speed - ground_speed;
+    PlayerState new_state = (relative > 1) ? PlayerState::Run : PlayerState::Walk;
+    if (new_state != current_state) {
+        run_index = 0;
+        walk_index = 0;
+    }
+    current_state = new_state;
+}
+
+// TODO THIS NEEDS REDESIGN FOR WALK/RUN
+void WalkingState::toggle_walk_frame(float player_speed, int tick_counter) {
+  switch (current_state) {
+  case PlayerState::Run:
+    run_index =
+        compute_frame_index(CHARACTER_RUN_FRAME_COUNT, player_speed, tick_counter);
+    break;
+
+  case PlayerState::Walk:
+    walk_index =
+        compute_frame_index(CHARACTER_WALK_FRAME_COUNT, player_speed, tick_counter);
+    break;
+
+  case PlayerState::Crawl:
+    crawl_index =
+        compute_frame_index(CHARACTER_CRAWL_FRAME_COUNT, player_speed, tick_counter);
+    break;
   }
 }
 
-CharacterFrame WalkingState::get_character_frame() const {
-  switch (current_state) {
-  case PlayerState::Walk1:
-    return CharacterFrame::Walk1;
-  case PlayerState::Walk2:
-    return CharacterFrame::Walk2;
-  case PlayerState::Crawl1:
-    return CharacterFrame::Crawl1;
-  default:
-    return CharacterFrame::Walk1;
-  }
+FrameSelection WalkingState::get_frame_selection() const {
+    FrameSelection f{};
+    switch (current_state) {
+    case PlayerState::Walk:
+        f.movement = MovementType::Walk;
+        f.frame_index = walk_index;
+        break;
+    case PlayerState::Run:
+        f.movement = MovementType::Run;
+        f.frame_index = run_index;
+        break;
+    case PlayerState::Crawl:
+        f.movement = MovementType::Crawl;
+        f.frame_index = crawl_index;
+        break;
+    default:
+        f.movement = MovementType::Walk;
+        f.frame_index = walk_index;
+        break;
+    }
+    return f;
 }

semestralka1/src/game/state.h

@@ -1,27 +1,35 @@
 // src/game/state.h
 #pragma once
 #include "mbed.h"
-#include "../assets/character_frames.h"
+#include "../render/player.h"
 
 constexpr auto CRAWL_DURATION = 300ms;
 
-enum class PlayerState { Walk1, Walk2, Crawl1 };
+enum class PlayerState { Walk, Run, Crawl };
+
+struct FrameSelection {
+  MovementType movement;
+  int frame_index;
+};
 
 class WalkingState {
 private:
-  PlayerState current_state = PlayerState::Walk1;
+  PlayerState current_state = PlayerState::Walk;
   Timer state_timer;
+  int walk_index = 0;   // cycles 0‑6
+  int run_index  = 0;   // cycles 0‑6
+  int crawl_index = 0;  // cycles 0‑1
+  float phase = 0.0f;
 
 public:
-  // MOVED FROM loop.cpp
-  // Update state (handles crawl timeout)
   void update();
-  
-  // State transitions
   void start_crawl();
-  void toggle_walk_frame();
 
-  // Getters
+  void set_motion_state_for_speed(int player_speed, int ground_speed);
+  void toggle_walk_frame(float player_speed, int tick_counter);
+
+  FrameSelection get_frame_selection() const;
   PlayerState get_state() const { return current_state; }
-  CharacterFrame get_character_frame() const;
+
+  void set_state(PlayerState s);
 };

semestralka1/src/main.cpp

@@ -22,5 +22,5 @@ int main(void) {
     printf("Baud: %d, Format: 8-N-1\r\n", BAUD_RATE);
 
     // Just call into render feature
-    render_loop(4);
+    render_loop(6);
 }

semestralka1/src/render/background.cpp

@@ -1,17 +1,15 @@
 // src/render/background.cpp
 
+#include "background.h"
 #include "../assets/background_frame.h"
 #include <cstdio>
 #include <cstring>
 
 void draw_mask(const char *unused_filename, int shift, const char *text) {
-    const int view_width = 90;
-    const int view_height = 16;
-
     // Terminal clear + home
     printf("\033[2J\033[H");
 
-    for (int i = 0; i < view_height && i < VIEW_HEIGHT; i++) {
+    for (int i = 0; i < VIEW_HEIGHT && i < VIEW_HEIGHT; i++) {
         const char *row = BACKGROUND_MASK[i];
         int width = strlen(row);
         if (width == 0) {
@@ -21,7 +19,7 @@ void draw_mask(const char *unused_filename, int shift, const char *text) {
 
         int start = shift % width;
 
-        for (int j = 0; j < view_width; j++) {
+        for (int j = 0; j < VIEW_WIDTH; j++) {
             printf("%c", row[(start + j) % width]);
         }
         printf("\r\n");

semestralka1/src/render/background.h

@@ -1,6 +1,7 @@
 // src/render/background.h
 
 #pragma once
+constexpr int VIEW_WIDTH = 90;
 
 // Draws the ASCII art background with optional message
 void draw_mask(const char *unused_filename, int shift, const char *text = nullptr);

semestralka1/src/render/loop.cpp

@@ -8,13 +8,16 @@
 #include "../game/state.h"
 #include "../game/animation.h"
 #include "../hardware/uart.h"
-#include "../assets/character_frames.h"
+#include "../render/player.h"
+#include "../timing/speed_controller.h"
+#include "../timing/movement_controller.h"
 
 extern BufferedSerial serial_port;
 extern DigitalOut led;
 
 // Constants
-constexpr int PLAYER_X = 9;
+// constexpr int PLAYER_X = 9;
+constexpr int PLAYER_X = 29;
 constexpr int PLAYER_Y = 6;
 
 void draw_mask(const char *unused_filename, int shift, const char *text);
@@ -23,13 +26,26 @@ void render_loop(int speed) {
   WalkingState player_state;
   AnimationController animation;
   UartReader uart(serial_port);
+  MovementController mover(PLAYER_X, VIEW_WIDTH);
+  SpeedController timing;
+  timing.set_ground_speed(speed);
 
   CharacterPosition pos = {PLAYER_X, PLAYER_Y};
 
   const char *bg_file = "background_dark_inverted.txt";
   bool need_redraw = false;
 
+  int anim_tick_counter = 0;
+  int tick_counter = 0;
+  int player_speed = 6;
+
+  player_state.set_state(PlayerState::Run);
   while (true) {
+    tick_counter++;
+
+    mover.update_position(player_speed, timing.get_ground_speed());
+    pos.x = mover.get_position();
+
     need_redraw = false;
     UartEvent uart_event = uart.poll();
 
@@ -47,20 +63,17 @@ void render_loop(int speed) {
     player_state.update();
 
     if (animation.tick(speed)) {
+      anim_tick_counter++;
       need_redraw = true;
     }
 
     if (need_redraw) {
+      player_state.toggle_walk_frame(player_speed, anim_tick_counter);
       draw_mask(bg_file, animation.get_shift(), uart.get_message());
-      CharacterFrame player_frame = player_state.get_character_frame();
+      FrameSelection frame = player_state.get_frame_selection();
 
-      CharacterPosition draw_pos = get_aligned_frame_position(pos, player_frame);
-      draw_character(draw_pos.x, draw_pos.y, player_frame);
-
-      // alternate between frame 0 and 1 when not crawling
-      if (player_state.get_state() != PlayerState::Crawl1) {
-	player_state.toggle_walk_frame();
-      }
+      CharacterPosition draw_pos = get_aligned_frame_position(pos, frame.movement, frame.frame_index);
+      draw_character(draw_pos.x, draw_pos.y, frame.movement, frame.frame_index);
 
       ThisThread::sleep_for(50ms);
     }

semestralka1/src/render/player.cpp

@@ -1,28 +1,38 @@
 // src/render/player.cpp
 #include "player.h"
-#include "../assets/character_frames.h"
+#include "../assets/character_walk_frames.h"
+#include "../assets/character_run_frames.h"
+#include "../assets/character_crawl_frames.h"
 #include <cstdio>
 
-void draw_character(int x, int y, CharacterFrame frame) {
-    int frame_index = static_cast<int>(frame);
-    if (frame_index < 0 || frame_index >= CHARACTER_FRAME_COUNT)
-        frame_index = 0; // fallback safety
-
-    const char **character = PLAYER_FRAMES[frame_index];
-
+void draw_character(int x, int y, MovementType movement, int frame_index) {
+    const char **character = nullptr;
     int character_height = 0;
-    switch (frame) {
-    case CharacterFrame::Walk1:
-        character_height = CHARACTER_HEIGHT_1;
+    int total_frames = 0;
+
+    switch (movement) {
+    case MovementType::Walk:
+        total_frames = CHARACTER_WALK_FRAME_COUNT;
+        if (frame_index < 0 || frame_index >= total_frames)
+            frame_index = 0;
+        character = CHARACTER_WALK_FRAMES[frame_index];
+        character_height = CHARACTER_WALK_FRAME_HEIGHT;
         break;
-    case CharacterFrame::Walk2:
-        character_height = CHARACTER_HEIGHT_2;
+
+    case MovementType::Run:
+        total_frames = CHARACTER_RUN_FRAME_COUNT;
+        if (frame_index < 0 || frame_index >= total_frames)
+            frame_index = 0;
+        character = CHARACTER_RUN_FRAMES[frame_index];
+        character_height = CHARACTER_RUN_FRAME_HEIGHT;
         break;
-    case CharacterFrame::Crawl1:
-        character_height = CHARACTER_HEIGHT_3;
-        break;
-    default:
-        character_height = CHARACTER_HEIGHT_1;
+
+    case MovementType::Crawl:
+        total_frames = CHARACTER_CRAWL_FRAME_COUNT;
+        if (frame_index < 0 || frame_index >= total_frames)
+            frame_index = 0;
+        character = CHARACTER_CRAWL_FRAMES[frame_index];
+        character_height = CHARACTER_CRAWL_FRAME_HEIGHT;
         break;
     }
 

semestralka1/src/render/player.h

@@ -1,6 +1,11 @@
 // src/render/player.h
 #pragma once
-#include "../assets/character_frames.h"
+
+enum class MovementType {
+    Walk,
+    Run,
+    Crawl
+};
 
 // Draw the player object starting at given (x, y)
-void draw_character(int x, int y, CharacterFrame frame);
+void draw_character(int x, int y, MovementType movement, int frame_index);

semestralka1/src/render/player_positioning.cpp

@@ -1,25 +1,30 @@
 // src/render/player_positioning.cpp
 #include "player_positioning.h"
 #include "../assets/background_frame.h"
+#include "../assets/character_walk_frames.h"
+#include "../assets/character_run_frames.h"
+#include "../assets/character_crawl_frames.h"
 #include <cstdio>
 
-// Convert a pivot coordinate (bottom-left) to the top-left draw position
-CharacterPosition get_aligned_frame_position(CharacterPosition base, CharacterFrame frame) {
-    int frame_index = static_cast<int>(frame);
-    if (frame_index < 0 || frame_index >= CHARACTER_FRAME_COUNT)
-        frame_index = 0;
-
+CharacterPosition get_aligned_frame_position(CharacterPosition base,
+                                             MovementType movement,
+                                             int /*frame_index*/) {
     int character_height = 0;
-    if (frame_index == 0)
-        character_height = CHARACTER_HEIGHT_1;
-    else if (frame_index == 1)
-        character_height = CHARACTER_HEIGHT_2;
-    else
-        character_height = CHARACTER_HEIGHT_3;
 
-    CharacterPosition draw_pos;
+    switch (movement) {
+    case MovementType::Walk:
+        character_height = CHARACTER_WALK_FRAME_HEIGHT;
+        break;
+    case MovementType::Run:
+        character_height = CHARACTER_RUN_FRAME_HEIGHT;
+        break;
+    case MovementType::Crawl:
+        character_height = CHARACTER_CRAWL_FRAME_HEIGHT;
+        break;
+    }
+
+    CharacterPosition draw_pos{};
     draw_pos.x = base.x;
     draw_pos.y = (VIEW_HEIGHT - base.y) - character_height;
-
     return draw_pos;
 }

semestralka1/src/render/player_positioning.h

@@ -1,7 +1,7 @@
 // src/render/player_positioning.h
 #pragma once
 #include "../assets/background_frame.h"
-#include "../assets/character_frames.h"
+#include "player.h"
 
 struct CharacterPosition {
     int x;
@@ -9,4 +9,4 @@ struct CharacterPosition {
 };
 
 // Calculates drawing position relative to bottom-left pivot
-CharacterPosition get_aligned_frame_position(CharacterPosition base, CharacterFrame frame);
+CharacterPosition get_aligned_frame_position(CharacterPosition base, MovementType movement,int frame_index);

semestralka1/src/timing/movement_controller.h

@@ -0,0 +1,29 @@
+// src/timing/movement_controller.h
+
+#pragma once
+#include "mbed.h"
+
+// Handles position of the player relative to ground movement
+class MovementController {
+private:
+    float x_pos;
+    const int view_width;
+
+    // Scale factor for translating speed difference to pixel movement
+    const float motion_scale = 0.2f;
+
+public:
+    MovementController(int start_x, int width) : x_pos(static_cast<float>(start_x)), view_width(width) {}
+
+    void reset(int start_x) { x_pos = static_cast<float>(start_x); }
+
+    void update_position(int player_speed, int ground_speed) {
+        int delta = player_speed - ground_speed;
+        x_pos += static_cast<float>(delta) * motion_scale;
+
+        if (x_pos < 0) x_pos = 0;
+        if (x_pos > (VIEW_WIDTH - 10)) x_pos = static_cast<float>(VIEW_WIDTH - 10);
+    }
+
+    int get_position() const { return static_cast<int>(x_pos); }
+};

semestralka1/src/timing/speed_controller.cpp

@@ -0,0 +1,34 @@
+// src/timing/speed_controller.cpp
+#include "speed_controller.h"
+
+void SpeedController::set_ground_speed(int spd) {
+    if (spd < 0) spd = 0;
+    if (spd > 30) spd = 30;
+    ground_speed = spd;
+}
+
+int SpeedController::frame_advance_for(int object_speed, int tick_counter) const {
+    if (object_speed <= 0) {
+        return 0;
+    }
+
+    if (ground_speed == 0) {
+        return 1 + object_speed;
+    }
+
+    const int delta = object_speed - ground_speed;
+
+    if (delta > 0) {
+        return 1 + delta;
+    }
+
+    if (delta == 0) {
+        return 1;
+    }
+
+    float ratio_f = static_cast<float>(ground_speed) / object_speed;
+    int ratio = static_cast<int>(ratio_f + 0.3f);
+    if (ratio < 1) ratio = 1;
+
+    return (tick_counter % ratio == 0) ? 1 : 0;
+}

semestralka1/src/timing/speed_controller.h

@@ -0,0 +1,19 @@
+// src/timing/speed_controller.h
+#pragma once
+#include "mbed.h"
+
+class SpeedController {
+private:
+    int ground_speed = 1;
+
+public:
+    SpeedController() = default;
+
+    void set_ground_speed(int spd);
+    int get_ground_speed() const { return ground_speed; }
+
+    // Calculates how many frames to advance for current tick.
+    // Takes object’s current speed and a global tick counter
+    // to automatically handle slower "wait" behavior.
+    int frame_advance_for(int object_speed, int tick_counter) const;
+};