From 3f7160ae464c0f0b1130af769f7a1b77f87f8685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <drummyfish@disroot.org>
Date: Mon, 14 Sep 2020 19:58:23 +0200
Subject: [PATCH] Add autoaim

---
 My_settings.h         |   2 +-
 TODO.txt              |   2 +-
 assets/level_test.gif | Bin 2851 -> 2952 bytes
 game.h                | 105 ++++++++++++++++++++++++++++++++----------
 main_pokitto.cpp      |   4 --
 mbed_config.h         |  25 ++++++++++
 settings.h            |   9 ++++
 texts.h               |   2 +-
 8 files changed, 117 insertions(+), 32 deletions(-)
 create mode 100644 mbed_config.h

diff --git a/My_settings.h b/My_settings.h
index cf7eba5..8823b93 100644
--- a/My_settings.h
+++ b/My_settings.h
@@ -1,6 +1,6 @@
 // Pokitto config required by PokittoLib
 
-//#define PROJ_SHOW_FPS_COUNTER
+#define PROJ_SHOW_FPS_COUNTER
 #define PROJ_SCREENMODE 13
 #define PROJ_MODE13 1
 #define PROJ_ENABLE_SOUND 1
diff --git a/TODO.txt b/TODO.txt
index 33a4aab..075623e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,7 +2,6 @@ general:
 
 - Ability to play SFX slower to e.g. give some monsters lower pitch?
 - Rewrite python scripts to C (faster, less bloat).
-- Option for vertical auto aim?
 - Try to recolor textures and give them a bit more of variety.
 - Make monsters die when squeezed?
 - On Win$hit builds display an anti-windshit text, by macro.
@@ -154,6 +153,7 @@ bugs:
 done:
 
 - add headbob
+- option for vertical auto aim
 - add blinking
 - make zBuffer 8bit only?
 - texture coords of floor walls should start from the floor? NO, CAUSES ISSUES
diff --git a/assets/level_test.gif b/assets/level_test.gif
index bea27e2359bd7d6c452078e07aea345180e88a3f..9ec19d6c9a8cf30848ca5fcabbbfed5d79080cc0 100644
GIT binary patch
delta 1644
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

delta 1542
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

diff --git a/game.h b/game.h
index 3f5aaa3..69df65b 100755
--- a/game.h
+++ b/game.h
@@ -2621,6 +2621,72 @@ static inline uint16_t SFG_getMapRevealBit(uint8_t squareX, uint8_t squareY)
   return 1 << ((squareY / 16) * 4 + squareX / 16);
 }
 
+/**
+  Checks a 3D point visibility from player's position (WITHOUT considering
+  facing direction).
+*/
+static inline uint8_t SFG_spriteIsVisible(RCL_Vector2D pos, RCL_Unit height,
+  uint8_t spriteSize)
+{
+  return
+    RCL_castRay3D(
+      SFG_player.camera.position,
+      SFG_player.camera.height,
+      pos,
+      height,
+      SFG_floorHeightAt,
+      SFG_ceilingHeightAt,
+      SFG_game.rayConstraints
+    ) == RCL_UNITS_PER_SQUARE;
+}
+
+/**
+  Returns a tangent in RCL_Unit of vertical autoaim, given current game state.
+*/
+RCL_Unit SFG_autoaimVertically()
+{
+  for (uint16_t i = 0; i < SFG_currentLevel.monsterRecordCount; ++i)
+  {
+    SFG_MonsterRecord m = SFG_currentLevel.monsterRecords[i];
+      
+    if (SFG_MR_STATE(m) == SFG_MONSTER_STATE_INACTIVE)
+      continue;
+
+    RCL_Vector2D worldPosition, toMonster;
+
+    worldPosition.x = SFG_MONSTER_COORD_TO_RCL_UNITS(m.coords[0]);
+    worldPosition.y = SFG_MONSTER_COORD_TO_RCL_UNITS(m.coords[1]);
+    
+    toMonster.x = worldPosition.x - SFG_player.camera.position.x;
+    toMonster.y = worldPosition.y - SFG_player.camera.position.y;
+
+    if (RCL_abs(
+         RCL_vectorsAngleCos(SFG_player.direction,toMonster) 
+         - RCL_UNITS_PER_SQUARE) < SFG_VERTICAL_AUTOAIM_ANGLE_THRESHOLD)
+    {
+      uint8_t spriteSize = SFG_GET_MONSTER_SPRITE_SIZE(
+        SFG_MONSTER_TYPE_TO_INDEX(SFG_MR_TYPE(m)));
+        
+      RCL_Unit worldHeight = 
+        SFG_floorHeightAt(
+          SFG_MONSTER_COORD_TO_SQUARES(m.coords[0]),
+          SFG_MONSTER_COORD_TO_SQUARES(m.coords[1]))
+          + 
+          SFG_SPRITE_SIZE_TO_HEIGHT_ABOVE_GROUND(spriteSize);
+        
+      if (SFG_spriteIsVisible(worldPosition,worldHeight,spriteSize))
+      {
+        RCL_Unit distance = RCL_len(toMonster);
+ 
+        return ((worldHeight - SFG_player.camera.height) * RCL_UNITS_PER_SQUARE)
+          / distance;
+      }
+    }
+  }
+
+  return 0;
+}
+
 /**
   Part of SFG_gameStep() for SFG_GAME_STATE_PLAYING.
 */
@@ -2650,8 +2716,8 @@ void SFG_gameStepPlaying()
   int8_t shearing = 0;
 
   if (SFG_keyJustPressed(SFG_KEY_TOGGLE_FREELOOK))
-    SFG_game.settings = 
-      (~SFG_game.settings & 0x08) | (SFG_game.settings & ~0x08);
+    SFG_game.settings = (SFG_game.settings & 0x04) ?
+      (SFG_game.settings & ~0x0c) : (SFG_game.settings | 0x0c );
 
 #if SFG_PREVIEW_MODE == 0
   if (
@@ -2719,6 +2785,16 @@ void SFG_gameStepPlaying()
         RCL_Unit direction =
           (SFG_player.camera.direction - SFG_PROJECTILE_SPREAD_ANGLE / 2) 
           + angleAdd;
+          
+        RCL_Unit projectileSpeed = SFG_GET_PROJECTILE_SPEED_UPS(projectile);
+        
+        /* Vertical speed will be either determined by autoaim (if shearing is
+           off) or the camera shear value. */
+        RCL_Unit verticalSpeed = (SFG_game.settings & 0x04) ?
+          (SFG_player.camera.shear * projectileSpeed) / 
+            SFG_CAMERA_MAX_SHEAR_PIXELS
+          :
+          (projectileSpeed * SFG_autoaimVertically()) / RCL_UNITS_PER_SQUARE;
 
         for (uint8_t i = 0; i < projectileCount; ++i)
         {
@@ -2727,10 +2803,8 @@ void SFG_gameStepPlaying()
             SFG_player.camera.position,
             SFG_player.camera.height,
             RCL_angleToDirection(direction),
-            (SFG_player.camera.shear *
-              SFG_GET_PROJECTILE_SPEED_UPS(projectile)) / 
-              SFG_CAMERA_MAX_SHEAR_PIXELS,
-              SFG_PROJECTILE_SPAWN_OFFSET
+            verticalSpeed,  
+            SFG_PROJECTILE_SPAWN_OFFSET
             );
 
           direction += angleAdd;
@@ -3850,25 +3924,6 @@ void SFG_drawWinOverlay()
   #undef INNER_STRIP_HEIGHT
 }
 
-/**
-  Checks a 3D point visibility from player's position (WITHOUT considering
-  facing direction).
-*/
-static inline uint8_t SFG_spriteIsVisible(RCL_Vector2D pos, RCL_Unit height,
-  uint8_t spriteSize)
-{
-  return
-    RCL_castRay3D(
-      SFG_player.camera.position,
-      SFG_player.camera.height,
-      pos,
-      height,
-      SFG_floorHeightAt,
-      SFG_ceilingHeightAt,
-      SFG_game.rayConstraints
-    ) == RCL_UNITS_PER_SQUARE;
-}
-
 void SFG_draw()
 {
 #if SFG_BACKGROUND_BLUR != 0
diff --git a/main_pokitto.cpp b/main_pokitto.cpp
index 98b06b6..3eb356b 100644
--- a/main_pokitto.cpp
+++ b/main_pokitto.cpp
@@ -164,10 +164,6 @@ int main()
   {
     if (pokitto.update())
     {
-
-if (SFG_game.frame % 32 == 0)
-printf("%d\n",Pokitto::Core::fps_counter);
-
       SFG_mainLoopBody();
     }
   }
diff --git a/mbed_config.h b/mbed_config.h
new file mode 100644
index 0000000..34e7f96
--- /dev/null
+++ b/mbed_config.h
@@ -0,0 +1,25 @@
+/*
+ * mbed SDK
+ * Copyright (c) 2017 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Automatically generated configuration file.
+// DO NOT EDIT, content will be overwritten.
+
+#ifndef __MBED_CONFIG_DATA__
+#define __MBED_CONFIG_DATA__
+
+
+#endif
diff --git a/settings.h b/settings.h
index b549cd3..fbaa18a 100644
--- a/settings.h
+++ b/settings.h
@@ -307,6 +307,15 @@
   #define SFG_OS_IS_MALWARE 0
 #endif
 
+/**
+  Angle difference, as a cos value in RCL_Units, between the player and a
+  monster, at which vertical autoaim will trigger. If the angle is greater, a
+  shot will go directly forward.
+*/
+#ifndef SFG_VERTICAL_AUTOAIM_ANGLE_THRESHOLD
+  #define SFG_VERTICAL_AUTOAIM_ANGLE_THRESHOLD 50
+#endif
+
 //------ developer/debug settings ------
 
 /**
diff --git a/texts.h b/texts.h
index 71f6abb..298f386 100644
--- a/texts.h
+++ b/texts.h
@@ -21,7 +21,7 @@ SFG_PROGRAM_MEMORY char *SFG_menuItemTexts[] =
   "play level",
   "load",
   "sound",
-  "shear",
+  "look",
   "exit"
 };