Fixed day 1 part 2

1 files changed, 18 insertions, 15 deletions

diff --git a/day1/__init__.py b/day1/__init__.py
index 6e95329..ec1c2f2 100644
--- a/day1/__init__.py
+++ b/day1/__init__.py
@@ -32,21 +32,24 @@ class AssignmentTwo(Assignment):
 
     @staticmethod
     def calculate_new_position(position, rotation) -> tuple[int, int]:
-        previous_position = position
-        new_position = position + rotation
-
-        overturned = new_position >= 100 or new_position < 0
-
-        multiplier = position - (0 - -previous_position) // 100
-
-        if overturned:
-            new_position = new_position % 100
-
-        seen_0 = 0
-        if new_position == 0 and multiplier == 0:
-            seen_0 += multiplier + 1
-        elif overturned:
-            seen_0 += multiplier
+        abs_rotation = abs(rotation)
+        seen_0 = abs(abs_rotation // 100)
+
+        if rotation > 0:
+            remainder_rotation = rotation - (seen_0 * 100)
+        elif rotation < 0:
+            remainder_rotation = rotation + (seen_0 * 100)
+        else:
+            remainder_rotation = 0
+
+        new_position = (position + remainder_rotation) % 100
+
+        if remainder_rotation != 0 and new_position == 0:
+            seen_0 += 1
+        elif position > 0 and rotation > 0 and position > new_position:
+            seen_0 += 1
+        elif position > 0 and rotation < 0 and position < new_position:
+            seen_0 += 1
 
         return new_position, seen_0