From 2cbbc6c7b418a7180728a255bd18a169142348a5 Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 29 Sep 2024 00:04:47 +0200 Subject: [PATCH 1/3] [SHAKE_GAMEPLAY_CAM] Add all camera shakes --- CAM/ShakeGameplayCam.md | 109 ++++++++++++++++++++++++++++++++++------ 1 file changed, 94 insertions(+), 15 deletions(-) diff --git a/CAM/ShakeGameplayCam.md b/CAM/ShakeGameplayCam.md index f1f57a210..d819109e9 100644 --- a/CAM/ShakeGameplayCam.md +++ b/CAM/ShakeGameplayCam.md @@ -8,22 +8,101 @@ ns: CAM void SHAKE_GAMEPLAY_CAM(char* shakeName, float intensity); ``` -``` -Possible shake types (updated b617d): -DEATH_FAIL_IN_EFFECT_SHAKE -DRUNK_SHAKE -FAMILY5_DRUG_TRIP_SHAKE -HAND_SHAKE -JOLT_SHAKE -LARGE_EXPLOSION_SHAKE -MEDIUM_EXPLOSION_SHAKE -SMALL_EXPLOSION_SHAKE -ROAD_VIBRATION_SHAKE -SKY_DIVING_SHAKE -VIBRATE_SHAKE +Shakes the gameplay cam with the specified shake name and intensity. + +```cpp +enum eCameraShakes +{ + ASSAULT_RIFLE_RECOIL_SHAKE, + BOAT_WATER_ENTRY_SHAKE, + CAMERA_OPERATOR_SHAKE_X, + CAMERA_OPERATOR_SHAKE_Z, + CAMERA_OPERATOR_TURBULENCE_SHAKE, + CARBINE_RIFLE_ACCURACY_OFFSET_SHAKE, + CARBINE_RIFLE_RECOIL_SHAKE, + CINEMATIC_SHOOTING_RUN_SHAKE, + DAMPED_HAND_SHAKE, + DEATH_FAIL_IN_EFFECT_SHAKE, + DEATH_FAIL_OUT_EFFECT_SHAKE, + DEFAULT_DEPLOY_PARACHUTE_SHAKE, + DEFAULT_FIRST_PERSON_RECOIL_SHAKE, + DEFAULT_KILL_EFFECT_SHAKE, + DEFAULT_THIRD_PERSON_ACCURACY_OFFSET_SHAKE, + DEFAULT_THIRD_PERSON_RECOIL_SHAKE, + DRUNK_SHAKE, + FAMILY5_DRUG_TRIP_SHAKE, + FIRST_PERSON_AIM_SHAKE, + FIRST_PERSON_DEPLOY_PARACHUTE_SHAKE, + FOLLOW_RUN_SHAKE, + FOLLOW_SWIM_SHAKE, + FPS_ASSAULT_RIFLE_RECOIL_SHAKE, + FPS_BOLT_RELOAD_SHAKE, + FPS_BULLET_HIT_SHAKE, + FPS_DEATH_SHAKE, + FPS_GRENADE_LAUNCHER_RECOIL_SHAKE, + FPS_MAG_DROP_SHAKE, + FPS_MAG_RELOAD_SHAKE, + FPS_MELEE_HIT_SHAKE, + FPS_MG_RECOIL_SHAKE, + FPS_MINIGUN_RECOIL_SHAKE, + FPS_PISTOL_RECOIL_SHAKE, + FPS_RPG_RECOIL_SHAKE, + FPS_SHOTGUN_PUMP_SHAKE, + FPS_SHOTGUN_RECOIL_SHAKE, + FPS_SMG_RECOIL_SHAKE, + FPS_STEERING_WHEEL_HIT_SHAKE, + FPS_TANK_RECOIL_SHAKE, + FPS_THROW_SHAKE, + FPS_VEHICLE_HIT_SHAKE, + FPS_ZOOM_IN_SHAKE, + GAMEPLAY_EXPLOSION_SHAKE, + GRENADE_EXPLOSION_SHAKE, + GRENADE_LAUNCHER_RECOIL_SHAKE, + HAND_SHAKE, + HAND_SHAKE_ROLL, + HIGH_DIVE_SHAKE, + HIGH_FALL_SHAKE, + HIGH_SPEED_BOAT_SHAKE, + HIGH_SPEED_POV_SHAKE, + HIGH_SPEED_VEHICLE_SHAKE, + HIGH_SPEED_VIBRATION_POV_SHAKE, + IDLE_HAND_SHAKE, + JOLT_SHAKE, + KILL_SHOT_SHAKE, + LARGE_EXPLOSION_SHAKE, + LOW_ORBIT_HIGH_SPEED_CAMERA_SHAKE, + LOW_ORBIT_INACCURACY_CAMERA_SHAKE, + MEDIUM_EXPLOSION_SHAKE, + MG_RECOIL_SHAKE, + MINIGUN_RECOIL_SHAKE, + PARACHUTING_SHAKE, + PISTOL_RECOIL_SHAKE, + PLANE_PART_SPEED_SHAKE, + POV_IDLE_SHAKE, + REPLAY_DRUNK_SHAKE, + REPLAY_EXPLOSION_SHAKE, + REPLAY_HAND_SHAKE, + REPLAY_HIGH_SPEED_VEHICLE_SHAKE, + REPLAY_SKY_DIVING_SHAKE, + ROAD_VIBRATION_SHAKE, + RPG_RECOIL_SHAKE, + SHOTGUN_RECOIL_SHAKE, + SKY_DIVING_SHAKE, + SMALL_EXPLOSION_SHAKE, + SMG_RECOIL_SHAKE, + STUNT_HAND_SHAKE, + SWITCH_HAND_SHAKE, + TANK_RECOIL_SHAKE, + VEH_IMPACT_HEADING_SHAKE, + VEH_IMPACT_PITCH_HEADING_SHAKE_FPS, + VEH_IMPACT_PITCH_SHAKE, + VIBRATE_SHAKE, + WATER_BOB_SHAKE, + WOBBLY_SHAKE +} ``` ## Parameters -* **shakeName**: -* **intensity**: +* **shakeName**: The name of the shake. +* **intensity**: The intensity of the shake. From 9919547761a8961b2eb2c5657cf0979bb84b1999 Mon Sep 17 00:00:00 2001 From: Laura Date: Wed, 2 Oct 2024 16:01:22 +0200 Subject: [PATCH 2/3] no enum --- CAM/ShakeGameplayCam.md | 176 ++++++++++++++++++++-------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/CAM/ShakeGameplayCam.md b/CAM/ShakeGameplayCam.md index d819109e9..aa75ea1fa 100644 --- a/CAM/ShakeGameplayCam.md +++ b/CAM/ShakeGameplayCam.md @@ -11,95 +11,95 @@ void SHAKE_GAMEPLAY_CAM(char* shakeName, float intensity); Shakes the gameplay cam with the specified shake name and intensity. ```cpp -enum eCameraShakes +static const char* ShakeNames[] = { - ASSAULT_RIFLE_RECOIL_SHAKE, - BOAT_WATER_ENTRY_SHAKE, - CAMERA_OPERATOR_SHAKE_X, - CAMERA_OPERATOR_SHAKE_Z, - CAMERA_OPERATOR_TURBULENCE_SHAKE, - CARBINE_RIFLE_ACCURACY_OFFSET_SHAKE, - CARBINE_RIFLE_RECOIL_SHAKE, - CINEMATIC_SHOOTING_RUN_SHAKE, - DAMPED_HAND_SHAKE, - DEATH_FAIL_IN_EFFECT_SHAKE, - DEATH_FAIL_OUT_EFFECT_SHAKE, - DEFAULT_DEPLOY_PARACHUTE_SHAKE, - DEFAULT_FIRST_PERSON_RECOIL_SHAKE, - DEFAULT_KILL_EFFECT_SHAKE, - DEFAULT_THIRD_PERSON_ACCURACY_OFFSET_SHAKE, - DEFAULT_THIRD_PERSON_RECOIL_SHAKE, - DRUNK_SHAKE, - FAMILY5_DRUG_TRIP_SHAKE, - FIRST_PERSON_AIM_SHAKE, - FIRST_PERSON_DEPLOY_PARACHUTE_SHAKE, - FOLLOW_RUN_SHAKE, - FOLLOW_SWIM_SHAKE, - FPS_ASSAULT_RIFLE_RECOIL_SHAKE, - FPS_BOLT_RELOAD_SHAKE, - FPS_BULLET_HIT_SHAKE, - FPS_DEATH_SHAKE, - FPS_GRENADE_LAUNCHER_RECOIL_SHAKE, - FPS_MAG_DROP_SHAKE, - FPS_MAG_RELOAD_SHAKE, - FPS_MELEE_HIT_SHAKE, - FPS_MG_RECOIL_SHAKE, - FPS_MINIGUN_RECOIL_SHAKE, - FPS_PISTOL_RECOIL_SHAKE, - FPS_RPG_RECOIL_SHAKE, - FPS_SHOTGUN_PUMP_SHAKE, - FPS_SHOTGUN_RECOIL_SHAKE, - FPS_SMG_RECOIL_SHAKE, - FPS_STEERING_WHEEL_HIT_SHAKE, - FPS_TANK_RECOIL_SHAKE, - FPS_THROW_SHAKE, - FPS_VEHICLE_HIT_SHAKE, - FPS_ZOOM_IN_SHAKE, - GAMEPLAY_EXPLOSION_SHAKE, - GRENADE_EXPLOSION_SHAKE, - GRENADE_LAUNCHER_RECOIL_SHAKE, - HAND_SHAKE, - HAND_SHAKE_ROLL, - HIGH_DIVE_SHAKE, - HIGH_FALL_SHAKE, - HIGH_SPEED_BOAT_SHAKE, - HIGH_SPEED_POV_SHAKE, - HIGH_SPEED_VEHICLE_SHAKE, - HIGH_SPEED_VIBRATION_POV_SHAKE, - IDLE_HAND_SHAKE, - JOLT_SHAKE, - KILL_SHOT_SHAKE, - LARGE_EXPLOSION_SHAKE, - LOW_ORBIT_HIGH_SPEED_CAMERA_SHAKE, - LOW_ORBIT_INACCURACY_CAMERA_SHAKE, - MEDIUM_EXPLOSION_SHAKE, - MG_RECOIL_SHAKE, - MINIGUN_RECOIL_SHAKE, - PARACHUTING_SHAKE, - PISTOL_RECOIL_SHAKE, - PLANE_PART_SPEED_SHAKE, - POV_IDLE_SHAKE, - REPLAY_DRUNK_SHAKE, - REPLAY_EXPLOSION_SHAKE, - REPLAY_HAND_SHAKE, - REPLAY_HIGH_SPEED_VEHICLE_SHAKE, - REPLAY_SKY_DIVING_SHAKE, - ROAD_VIBRATION_SHAKE, - RPG_RECOIL_SHAKE, - SHOTGUN_RECOIL_SHAKE, - SKY_DIVING_SHAKE, - SMALL_EXPLOSION_SHAKE, - SMG_RECOIL_SHAKE, - STUNT_HAND_SHAKE, - SWITCH_HAND_SHAKE, - TANK_RECOIL_SHAKE, - VEH_IMPACT_HEADING_SHAKE, - VEH_IMPACT_PITCH_HEADING_SHAKE_FPS, - VEH_IMPACT_PITCH_SHAKE, - VIBRATE_SHAKE, - WATER_BOB_SHAKE, - WOBBLY_SHAKE -} + "ASSAULT_RIFLE_RECOIL_SHAKE", + "BOAT_WATER_ENTRY_SHAKE", + "CAMERA_OPERATOR_SHAKE_X", + "CAMERA_OPERATOR_SHAKE_Z", + "CAMERA_OPERATOR_TURBULENCE_SHAKE", + "CARBINE_RIFLE_ACCURACY_OFFSET_SHAKE", + "CARBINE_RIFLE_RECOIL_SHAKE", + "CINEMATIC_SHOOTING_RUN_SHAKE", + "DAMPED_HAND_SHAKE", + "DEATH_FAIL_IN_EFFECT_SHAKE", + "DEATH_FAIL_OUT_EFFECT_SHAKE", + "DEFAULT_DEPLOY_PARACHUTE_SHAKE", + "DEFAULT_FIRST_PERSON_RECOIL_SHAKE", + "DEFAULT_KILL_EFFECT_SHAKE", + "DEFAULT_THIRD_PERSON_ACCURACY_OFFSET_SHAKE", + "DEFAULT_THIRD_PERSON_RECOIL_SHAKE", + "DRUNK_SHAKE", + "FAMILY5_DRUG_TRIP_SHAKE", + "FIRST_PERSON_AIM_SHAKE", + "FIRST_PERSON_DEPLOY_PARACHUTE_SHAKE", + "FOLLOW_RUN_SHAKE", + "FOLLOW_SWIM_SHAKE", + "FPS_ASSAULT_RIFLE_RECOIL_SHAKE", + "FPS_BOLT_RELOAD_SHAKE", + "FPS_BULLET_HIT_SHAKE", + "FPS_DEATH_SHAKE", + "FPS_GRENADE_LAUNCHER_RECOIL_SHAKE", + "FPS_MAG_DROP_SHAKE", + "FPS_MAG_RELOAD_SHAKE", + "FPS_MELEE_HIT_SHAKE", + "FPS_MG_RECOIL_SHAKE", + "FPS_MINIGUN_RECOIL_SHAKE", + "FPS_PISTOL_RECOIL_SHAKE", + "FPS_RPG_RECOIL_SHAKE", + "FPS_SHOTGUN_PUMP_SHAKE", + "FPS_SHOTGUN_RECOIL_SHAKE", + "FPS_SMG_RECOIL_SHAKE", + "FPS_STEERING_WHEEL_HIT_SHAKE", + "FPS_TANK_RECOIL_SHAKE", + "FPS_THROW_SHAKE", + "FPS_VEHICLE_HIT_SHAKE", + "FPS_ZOOM_IN_SHAKE", + "GAMEPLAY_EXPLOSION_SHAKE", + "GRENADE_EXPLOSION_SHAKE", + "GRENADE_LAUNCHER_RECOIL_SHAKE", + "HAND_SHAKE", + "HAND_SHAKE_ROLL", + "HIGH_DIVE_SHAKE", + "HIGH_FALL_SHAKE", + "HIGH_SPEED_BOAT_SHAKE", + "HIGH_SPEED_POV_SHAKE", + "HIGH_SPEED_VEHICLE_SHAKE", + "HIGH_SPEED_VIBRATION_POV_SHAKE", + "IDLE_HAND_SHAKE", + "JOLT_SHAKE", + "KILL_SHOT_SHAKE", + "LARGE_EXPLOSION_SHAKE", + "LOW_ORBIT_HIGH_SPEED_CAMERA_SHAKE", + "LOW_ORBIT_INACCURACY_CAMERA_SHAKE", + "MEDIUM_EXPLOSION_SHAKE", + "MG_RECOIL_SHAKE", + "MINIGUN_RECOIL_SHAKE", + "PARACHUTING_SHAKE", + "PISTOL_RECOIL_SHAKE", + "PLANE_PART_SPEED_SHAKE", + "POV_IDLE_SHAKE", + "REPLAY_DRUNK_SHAKE", + "REPLAY_EXPLOSION_SHAKE", + "REPLAY_HAND_SHAKE", + "REPLAY_HIGH_SPEED_VEHICLE_SHAKE", + "REPLAY_SKY_DIVING_SHAKE", + "ROAD_VIBRATION_SHAKE", + "RPG_RECOIL_SHAKE", + "SHOTGUN_RECOIL_SHAKE", + "SKY_DIVING_SHAKE", + "SMALL_EXPLOSION_SHAKE", + "SMG_RECOIL_SHAKE", + "STUNT_HAND_SHAKE", + "SWITCH_HAND_SHAKE", + "TANK_RECOIL_SHAKE", + "VEH_IMPACT_HEADING_SHAKE", + "VEH_IMPACT_PITCH_HEADING_SHAKE_FPS", + "VEH_IMPACT_PITCH_SHAKE", + "VIBRATE_SHAKE", + "WATER_BOB_SHAKE", + "WOBBLY_SHAKE" +}; ``` ## Parameters From 2d92a2eefa471d9162f9237c9f2fbab3da159b72 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 14 Oct 2024 23:01:47 +0200 Subject: [PATCH 3/3] add references to other shake natives --- CAM/ShakeCam.md | 24 +++++------------------- CAM/ShakeCinematicCam.md | 11 ++++------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/CAM/ShakeCam.md b/CAM/ShakeCam.md index fd65c4596..84278f722 100644 --- a/CAM/ShakeCam.md +++ b/CAM/ShakeCam.md @@ -5,26 +5,12 @@ ns: CAM ```c // 0x6A25241C340D3822 0x1D4211B0 -void SHAKE_CAM(Cam cam, char* type, float amplitude); +void SHAKE_CAM(Cam cam, char* shakeName, float amplitude); ``` -``` -Possible shake types (updated b617d): -DEATH_FAIL_IN_EFFECT_SHAKE -DRUNK_SHAKE -FAMILY5_DRUG_TRIP_SHAKE -HAND_SHAKE -JOLT_SHAKE -LARGE_EXPLOSION_SHAKE -MEDIUM_EXPLOSION_SHAKE -SMALL_EXPLOSION_SHAKE -ROAD_VIBRATION_SHAKE -SKY_DIVING_SHAKE -VIBRATE_SHAKE -``` +See [`SHAKE_GAMEPLAY_CAM`](#_0xFD55E49555E017CF) for a full list of camera shakes. ## Parameters -* **cam**: -* **type**: -* **amplitude**: - +* **cam**: The camera handle. +* **shakeName**: The name of the shake. +* **amplitude**: The intensity of the shake. diff --git a/CAM/ShakeCinematicCam.md b/CAM/ShakeCinematicCam.md index 3064fe760..3c9aac5b6 100644 --- a/CAM/ShakeCinematicCam.md +++ b/CAM/ShakeCinematicCam.md @@ -5,14 +5,11 @@ ns: CAM ```c // 0xDCE214D9ED58F3CF 0x61815F31 -void SHAKE_CINEMATIC_CAM(char* p0, float p1); +void SHAKE_CINEMATIC_CAM(char* shakeName, float amplitudeScalar); ``` -``` -p0 argument found in the b617d scripts: "DRUNK_SHAKE" -``` +See [`SHAKE_GAMEPLAY_CAM`](#_0xFD55E49555E017CF) for a full list of camera shakes. ## Parameters -* **p0**: -* **p1**: - +* **shakeName**: The name of the shake. +* **amplitudeScalar**: The intensity of the shake.