Allow user to load difficulty (#518)

* Allow user to load difficulty

* Add getSpeed call

* Test push

* test commit

* test commit

* Add dumps to ignore and back to v141

* remove spurior recipes

* Fix for remaster darkpilo.cfg which is not located in the game folder.

* Add for linux compatibility

* Update Linux pathing.

* fix for nix paths

* change the path path based on testing on proton.

* patching jereth's float changes

* Update angle values

* updating angle code

* Delete TheForceEngine/x64/Debug/TheForceEngine.exe.recipe

Removing spurious file.

* Fix for angles

---------

Co-authored-by: Karjala22 <78927981+Karjala22@users.noreply.github.com>

Author: ifeldshteyn

.gitignore

@@ -81,3 +81,6 @@ CMakeFiles/
 
 # Linux
 TheForceEngine/tfelnx
+
+# Ignore dumps
+*.dmp

TheForceEngine/TFE_DarkForces/Scripting/gs_level.cpp

@@ -5,6 +5,7 @@
 #include "scriptWall.h"
 #include "scriptSector.h"
 #include "scriptObject.h"
+#include <TFE_DarkForces/agent.h>
 #include <TFE_DarkForces/player.h>
 #include <TFE_DarkForces/projectile.h>
 #include <TFE_System/system.h>
@@ -331,6 +332,8 @@ namespace TFE_DarkForces
 			ScriptLambdaPropertyGet("int get_textureCount()", s32, { return s_levelState.textureCount; });
 			ScriptLambdaPropertyGet("int get_elevatorCount()", s32, { return allocator_getCount(s_infSerState.infElevators); });
 			ScriptLambdaPropertyGet("float2 get_parallax()", TFE_ForceScript::float2, { return TFE_ForceScript::float2(fixed16ToFloat(s_levelState.parallax0), fixed16ToFloat(s_levelState.parallax1)); });
+			
+			ScriptLambdaPropertyGet("int get_difficulty()", u8, { return s_agentData[s_agentId].difficulty; });
 
 			// Gameplay sector pointers.
 			ScriptLambdaPropertyGet("Sector get_bossSector()", ScriptSector, { ScriptSector sector(-1); if (s_levelState.bossSector) { sector.m_id = s_levelState.bossSector->id; } return sector; });

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

@@ -23,12 +23,20 @@ namespace TFE_DarkForces
 		return (data->updateFlags & ELEV_MASTER_ON) != 0;
 	}
 
-	void setElevSpeed(s32 value, ScriptElev* elev)
+	float getElevSpeed(ScriptElev* elev)
+	{
+		if (!ScriptElev::isScriptElevValid(elev)) { return 0; }
+
+		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
+		return data->type == IELEV_ROTATE_WALL ? fixedAngleToDegrees(data->speed) : fixed16ToFloat(data->speed);
+	}
+
+	void setElevSpeed(float value, ScriptElev* elev)
 	{
 		if (!ScriptElev::isScriptElevValid(elev)) { return; }
 
 		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
-		data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle((f32)value)) : FIXED(value);
+		data->speed = data->type == IELEV_ROTATE_WALL ? degreesToFixedAngle(value) : floatToFixed16(value);
 	}
 
 	void ScriptElev::registerType()
@@ -37,13 +45,15 @@ namespace TFE_DarkForces
 		asIScriptEngine* engine = (asIScriptEngine*)TFE_ForceScript::getEngine();
 
 		ScriptValueType("Elevator");
+
 		// Variables
 		ScriptMemberVariable("int id", m_id);
 		// Functions
 		ScriptObjFunc("bool isValid()", isScriptElevValid);
 		// Properties
 		ScriptPropertyGetFunc("bool get_master()", getElevMaster);
-		
-		ScriptPropertySetFunc("void set_speed(int)", setElevSpeed);
+
+		ScriptPropertyGetFunc("float get_speed()", getElevSpeed);
+		ScriptPropertySetFunc("void set_speed(float)", setElevSpeed);
 	}
 }

TheForceEngine/TFE_Jedi/Math/fixedPoint.h

@@ -137,6 +137,16 @@ namespace TFE_Jedi
 		return fixed16_16(16384.0f * angle / 360.0f);
 	}
 
+	inline f32 fixedAngleToDegrees(fixed16_16 angle)
+	{
+		return fixed16ToFloat(angle) / 45.5111f;
+	}
+
+	inline fixed16_16 degreesToFixedAngle(f32 angle)
+	{
+		return floatToFixed16(angle * 45.5111f);
+	}
+
 	inline s32 fixed16to12(fixed16_16 x)
 	{
 		return s32(x >> 4);