From e318e853b2147bb8831677b32dedb675e8a56696 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 5 Jan 2022 22:49:21 -0600 Subject: [PATCH] Some minor fixes --- addons/spike/ACE_GuidanceConfig.hpp | 10 ++++---- addons/spike/CfgAmmo.hpp | 36 ++++++++++++++--------------- addons/spike/CfgMagazines.hpp | 14 +++++------ addons/spike/CfgWeapons.hpp | 12 +++++----- addons/spike/RscInGameUI.hpp | 4 ++-- addons/spike/config.cpp | 2 +- addons/spike/stringtable.xml | 26 +++++++++++++-------- 7 files changed, 55 insertions(+), 49 deletions(-) diff --git a/addons/spike/ACE_GuidanceConfig.hpp b/addons/spike/ACE_GuidanceConfig.hpp index 35961058c6..6131ea33c4 100644 --- a/addons/spike/ACE_GuidanceConfig.hpp +++ b/addons/spike/ACE_GuidanceConfig.hpp @@ -1,11 +1,11 @@ class ace_missileguidance_SeekerTypes { - class SPIKE { - functionName = QFUNC(seeker); - }; + class SPIKE { + functionName = QFUNC(seeker); + }; }; class ace_missileguidance_NavigationTypes { class SPIKE { functionName = QFUNC(navigation); - onFired = ""; + onFired = ""; }; -}; \ No newline at end of file +}; diff --git a/addons/spike/CfgAmmo.hpp b/addons/spike/CfgAmmo.hpp index a18d8d44d5..e1e15812d2 100644 --- a/addons/spike/CfgAmmo.hpp +++ b/addons/spike/CfgAmmo.hpp @@ -10,30 +10,30 @@ class CfgAmmo { class ace_missileguidance { enabled = 1; - pitchRate = 30; - yawRate = 30; + pitchRate = 30; + yawRate = 30; - canVanillaLock = 0; + canVanillaLock = 0; - defaultSeekerType = "SPIKE"; - seekerTypes[] = {"SPIKE"}; - - defaultSeekerLockMode = "LOAL"; - seekerLockModes[] = { "LOAL" }; + defaultSeekerType = "SPIKE"; + seekerTypes[] = {"SPIKE"}; + + defaultSeekerLockMode = "LOAL"; + seekerLockModes[] = { "LOAL" }; - defaultNavigationType = "SPIKE"; - navigationTypes[] = { "SPIKE", "ZeroEffortMiss" }; + defaultNavigationType = "SPIKE"; + navigationTypes[] = { "SPIKE", "ZeroEffortMiss" }; - seekLastTargetPos = 0; - seekerAngle = 20; - seekerAccuracy = 1; + seekLastTargetPos = 0; + seekerAngle = 20; + seekerAccuracy = 1; - seekerMinRange = 50; - seekerMaxRange = 2500; + seekerMinRange = 50; + seekerMaxRange = 2500; - defaultAttackProfile = "DIR"; - attackProfiles[] = {"DIR"}; - useModeForAttackProfile = 0; + defaultAttackProfile = "DIR"; + attackProfiles[] = {"DIR"}; + useModeForAttackProfile = 0; class navigationStates { class initial { diff --git a/addons/spike/CfgMagazines.hpp b/addons/spike/CfgMagazines.hpp index 1e7b389f33..fd8b0c8576 100644 --- a/addons/spike/CfgMagazines.hpp +++ b/addons/spike/CfgMagazines.hpp @@ -1,12 +1,12 @@ class CfgMagazines { class Titan_AT; - class GVAR(lr): Titan_AT { - author = "Brandon (TCVM)"; - ammo = QGVAR(lr); + class GVAR(lr): Titan_AT { + author = "Brandon (TCVM)"; + ammo = QGVAR(lr); - displayName = CSTRING(LR); - displayNameShort = CSTRING(LR_Short); - mass = 300; - }; + displayName = CSTRING(LR); + displayNameShort = CSTRING(LR_Short); + mass = 300; + }; }; diff --git a/addons/spike/CfgWeapons.hpp b/addons/spike/CfgWeapons.hpp index 6abf8d4168..89f658ee82 100644 --- a/addons/spike/CfgWeapons.hpp +++ b/addons/spike/CfgWeapons.hpp @@ -1,15 +1,15 @@ class CfgWeapons { class launch_Titan_short_base; - class launch_B_Titan_short_F: launch_Titan_short_base { + class launch_B_Titan_short_F: launch_Titan_short_base { class Single; }; - class GVAR(base): launch_B_Titan_short_F { + class GVAR(base): launch_B_Titan_short_F { class Single: Single { EGVAR(missileGuidance,attackProfile) = "SPIKE_TOP"; }; }; class GVAR(launcher): GVAR(base) { - scope = 2; + scope = 2; GVAR(enabled) = 1; weaponInfoType = "ACE_RscOptics_spike"; modelOptics = QPATHTOF(data\reticle_titan.p3d); @@ -19,10 +19,10 @@ class CfgWeapons { lockingTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1}; - displayName = CSTRING(LR); - displayNameShort = CSTRING(LR_Short); + displayName = CSTRING(LR); + displayNameShort = CSTRING(LR_Short); - magazines[] = {QGVAR(lr)}; + magazines[] = {QGVAR(lr)}; magazineWell[] = {}; }; }; diff --git a/addons/spike/RscInGameUI.hpp b/addons/spike/RscInGameUI.hpp index bd318655cc..f5399fb008 100644 --- a/addons/spike/RscInGameUI.hpp +++ b/addons/spike/RscInGameUI.hpp @@ -31,8 +31,8 @@ class RscInGameUI { show = 1; }; - class reticle: RscControlsGroupNoScrollbars { - idc = 242000; + class reticle: RscControlsGroupNoScrollbars { + idc = 242000; x = "safeZoneX"; y = "safeZoneY"; w = "safeZoneW-safeZoneX"; diff --git a/addons/spike/config.cpp b/addons/spike/config.cpp index 6cf3d389e0..95cdd85ba1 100644 --- a/addons/spike/config.cpp +++ b/addons/spike/config.cpp @@ -27,7 +27,7 @@ class RscText; #include "ACE_GuidanceConfig.hpp" #include "RscTitles.hpp" #include "RscInGameUI.hpp" -#include "CfgEventhandlers.hpp" +#include "CfgEventHandlers.hpp" #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" diff --git a/addons/spike/stringtable.xml b/addons/spike/stringtable.xml index 2bc7af704d..ff2a43760c 100644 --- a/addons/spike/stringtable.xml +++ b/addons/spike/stringtable.xml @@ -1,35 +1,41 @@ - + Pan Camera Left - + Pan Camera Right - + Pan Camera Up - + Pan Camera Down - + Zoom Camera In - + Zoom Camera Out - + Cycle Camera Vision Mode - + MANUAL - + Spike LR - + LR + + Designate + + + Leave Camera +