Skip to content
This repository has been archived by the owner on Aug 17, 2024. It is now read-only.

Commit

Permalink
Set up new defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
ikt32 committed Sep 10, 2017
1 parent b025f42 commit 981bc3c
Show file tree
Hide file tree
Showing 8 changed files with 224 additions and 262 deletions.
10 changes: 7 additions & 3 deletions Gears/ScriptMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,8 @@ void update_menu() {
menu.Subtitle("Steering wheel options");

if (menu.BoolOption("Enable wheel", settings.EnableWheel,
{ "Enable usage of a steering wheel." })) {
{ "Enable usage of a steering wheel. This needs to be enabled before configuring the axes! "
"After enabling, re-initialize the mod by toggling it." })) {
settings.SaveWheel(&controls);
}

Expand Down Expand Up @@ -500,7 +501,9 @@ void update_menu() {
}

menu.MenuOption("Steering wheel axis setup", "axesmenu",
{ "Configure analog controls, like throttle, steering and the like." });
{ "Configure analog controls, like throttle, steering and the like.",
"\"Enable wheel\" needs to be enabled before configuring the axes! "
"After enabling, re-initialize the mod by toggling it."});

menu.MenuOption("Steering wheel button setup", "buttonsmenu",
{ "Set up your buttons on your steering wheel." });
Expand Down Expand Up @@ -744,14 +747,15 @@ void update_menu() {
menu.Subtitle("");

menu.BoolOption("Gear", settings.GearIndicator);
menu.BoolOption("Shift Mode", settings.ShiftModeIndicator);

menu.FloatOption("Gear X", settings.GearXpos, 0.0f, 1.0f, 0.005f);
menu.FloatOption("Gear Y", settings.GearYpos, 0.0f, 1.0f, 0.005f);
menu.FloatOption("Gear Size", settings.GearSize, 0.0f, 3.0f, 0.05f);
menu.IntOption("Gear Top Color Red", settings.GearTopColorR, 0, 255);
menu.IntOption("Gear Top Color Green", settings.GearTopColorG, 0, 255);
menu.IntOption("Gear Top Color Blue", settings.GearTopColorB, 0, 255);

menu.BoolOption("Shift Mode", settings.ShiftModeIndicator);
menu.FloatOption("Shift Mode X", settings.ShiftModeXpos, 0.0f, 1.0f, 0.005f);
menu.FloatOption("Shift Mode Y", settings.ShiftModeYpos, 0.0f, 1.0f, 0.005f);
menu.FloatOption("Shift Mode Size", settings.ShiftModeSize, 0.0f, 3.0f, 0.05f);
Expand Down
127 changes: 60 additions & 67 deletions Gears/ScriptSettings.cpp

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Gears/ScriptSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ScriptSettings {

// settings_general.ini parts
// [OPTIONS]
bool EnableManual = true;
bool EnableManual = false;
ShiftModes ShiftMode = Sequential; // 0 Seq, 1 H, 2 Auto
bool SimpleBike = false;
bool EngDamage = false;
Expand All @@ -40,8 +40,8 @@ class ScriptSettings {
bool ClutchShiftingS = false;
bool DefaultNeutral = false;

float EngBrakePower;
float EngBrakeThreshold;
float EngBrakePower = 0.0f;
float EngBrakeThreshold = 0.75f;
float ClutchCatchpoint = 0.15f;
float StallingThreshold = 0.75f;
float RPMDamage = 1.5f;
Expand All @@ -58,21 +58,21 @@ class ScriptSettings {
bool AlwaysHUD = false;
int HUDFont = 0;

bool GearIndicator;
bool GearIndicator = true;
float GearXpos = 0.95f;
float GearYpos = 0.95f;
float GearSize = 1.0f;
int GearTopColorR = 255;
int GearTopColorG = 255;
int GearTopColorB = 255;

bool ShiftModeIndicator;
bool ShiftModeIndicator = true;
float ShiftModeXpos = 0.925f;
float ShiftModeYpos = 0.95f;
float ShiftModeSize = 1.0f;

// can be kph, mph, or ms
std::string Speedo;
std::string Speedo = "kph";
bool SpeedoShowUnit = false;
float SpeedoSize = 1.5f;
float SpeedoYpos = 0.85f;
Expand Down Expand Up @@ -119,7 +119,7 @@ class ScriptSettings {

// [DEBUG]
bool DisplayInfo = false;
bool DisplayGearingInfo;
bool DisplayGearingInfo = false;
bool DisplayWheelInfo = false;

std::vector<GUID> reggdGuids;
Expand Down
2 changes: 1 addition & 1 deletion doc/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 4.3.9
Thanks for your bug reports!
Config changes: Nope
Config changes: Updated defaults. No need to replace your config: it's just a more comprehensive start for new users/setups.

Fixes:
* Fix brake non-responsive while engine braking
Expand Down
56 changes: 56 additions & 0 deletions stage/ManualTransmission/Controller_Controls.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
[CONTROLLER]
The following controls can be assigned:
* DpadUp
* DpadDown
* DpadLeft
* DpadRight
* Start
* Back
* LeftThumb
* RightThumb
* LeftShoulder
* RightShoulder
* A
* B
* X
* Y
* LeftTrigger
* RightTrigger
* LeftThumbLeft
* LeftThumbRight
* RightThumbLeft
* RightThumbRight
* LeftThumbUp
* LeftThumbDown
* RightThumbUp
* RightThumbDown

[CONTROLLER_LEGACY]
Usable inputs. USE THE NUMBERS
Turn off a control by putting -1 there
Control name Xbox equivalent Control ID
ControlFrontendDown Dpad Down 187
ControlFrontendUp Dpad Up 188
ControlFrontendLeft Dpad Left 189
ControlFrontendRight Dpad Right 190
ControlFrontendRdown ?????????? 191
ControlFrontendRup ?????????? 192
ControlFrontendRleft ?????????? 193
ControlFrontendRright ?????????? 194
ControlFrontendAxisX Left stick X 195
ControlFrontendAxisY Left stick Y 196
ControlFrontendRightAxisX Right stick X 197
ControlFrontendRightAxisY Right stick Y 198
ControlFrontendPause Start 199
ControlFrontendAccept A 201
ControlFrontendCancel B 202
ControlFrontendX X 203
ControlFrontendY Y 204
ControlFrontendLb Left shoulder 205
ControlFrontendRb Right shoulder 206
ControlFrontendLt Left trigger 207
ControlFrontendRt Right trigger 208
ControlFrontendLs Left stick click 209
ControlFrontendRs Right stick click 210
ControlFrontendDelete ??????????? 214
ControlFrontendSelect Back 217
164 changes: 52 additions & 112 deletions stage/ManualTransmission/settings_general.ini
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
[OPTIONS]
; Manual Transmission for GTA V
; Please refer to the readme or the in-game menu for option descriptions
; It's advised to use the in-game menu to configure the mod

[OPTIONS]
Enable = true
ShiftMode = 0
SimpleBike = true
EngineDamage = true
SimpleBike = false
EngineDamage = false
EngineStalling = true
EngineStallingS = false
EngineBraking = true
EngineLocking = false
ClutchCatching = true
ClutchShiftingH = true
ClutchShiftingS = false
DefaultNeutral = true
ClutchCatchpoint = 10.000001
ClutchCatchpoint = 10.000000
StallingThreshold = 85.000000
RPMDamage = 14.999996
RPMDamage = 15.000001
MisshiftDamage = 20.000000

; At default GTA V applies brakes when standing still, while even
; at an angle. Enabling this will give your car a little push.
; Thanks to XMOD!
HillBrakeWorkaround = true
EngBrakePower = 1.000000
EngBrakeThreshold = 0.750000
HillBrakeWorkaround = false
AutoGear1 = false
AutoLookBack = false
ThrottleStart = true
Expand All @@ -26,23 +30,26 @@ CrossScript = true

[HUD]
EnableHUD = true
AlwaysHUD = false
HUDFont = 4
GearIndicator = true
GearXpos = 0.952500
GearYpos = 0.885000
GearSize = 0.700000
GearTopColorR = 255
GearTopColorG = 127
GearTopColorB = 127
GearTopColorG = 63
GearTopColorB = 63
ShiftModeIndicator = true
ShiftModeXpos = 0.935000
ShiftModeYpos = 0.885000
ShiftModeSize = 0.700000

; kph - mph - ms - none
; kph - mph - ms - off
Speedo = kph
SpeedoShowUnit = true
SpeedoXpos = 0.860000
SpeedoYpos = 0.883502
SpeedoSize = 0.750000
SpeedoYpos = 0.885000
SpeedoSize = 0.700000
EnableRPMIndicator = true
RPMIndicatorXpos = 0.120001
RPMIndicatorYpos = 0.765000
Expand All @@ -65,124 +72,66 @@ RPMIndicatorRevlimitR = 255
RPMIndicatorRevlimitG = 0
RPMIndicatorRevlimitB = 0
RPMIndicatorRevlimitA = 255
SteeringWheelInfo = true
AlwaysSteeringWheelInfo = false
SteeringWheelTextureX = 0.230000
SteeringWheelTextureY = 0.890000
SteeringWheelTextureSz = 0.060000
PedalInfoX = 0.290000
PedalInfoY = 0.890000
PedalInfoH = 0.100000
PedalInfoW = 0.040000
PedalInfoPadX = 0.000000
PedalInfoPadY = 0.000000


[CONTROLLER]
[DEBUG]
DisplayInfo = false
DisplayWheelInfo = false
DisplayGearingInfo = false

; The following controls can be assigned:
; DpadUp
; DpadDown
; DpadLeft
; DpadRight
; Start
; Back
; LeftThumb
; RightThumb
; LeftShoulder
; RightShoulder
; A
; B
; X
; Y
; LeftTrigger
; RightTrigger
; LeftThumbLeft
; LeftThumbRight
; RightThumbLeft
; RightThumbRight
; LeftThumbUp
; LeftThumbDown
; RightThumbUp
; RightThumbDown

; Turn off a control by putting UNKNOWN there
Toggle = DpadRight
ToggleShift = B
[CONTROLLER]
ToggleEngine = false
ToggleTime = 300

; This is how far an analog input is pressed to register it
; as a button press.
TriggerValue = 0.900000

; Controller buttons
TriggerValue = 0.850000
BlockCarControls = false
MaxTapTime = 200
ShiftUpBlocks = -1
ShiftDownBlocks = -1
Toggle = UNKNOWN
ToggleShift = B
ShiftUp = A
ShiftDown = X
Clutch = LeftThumbUp
Engine = DpadDown

; Turn on/off engine /w button, or only turn on engine?
ToggleEngine = false

; Controls for realistic reversing
Throttle = RightTrigger
Brake = LeftTrigger


[CONTROLLER_LEGACY]

; Using something that works with GTA V but isn't an
; Xbox controller nor does it use the Xinput thing? Try this!
Enable = false

; Uses same TriggerValue and ToggleTime as [CONTROLLER]

; Usable inputs. USE THE NUMBERS
; Turn off a control by putting -1 there
; Control name Xbox equivalent Control ID
; ControlFrontendDown Dpad Down 187
; ControlFrontendUp Dpad Up 188
; ControlFrontendLeft Dpad Left 189
; ControlFrontendRight Dpad Right 190
; ControlFrontendRdown ?????????? 191
; ControlFrontendRup ?????????? 192
; ControlFrontendRleft ?????????? 193
; ControlFrontendRright ?????????? 194
; ControlFrontendAxisX Left stick X 195
; ControlFrontendAxisY Left stick Y 196
; ControlFrontendRightAxisX Right stick X 197
; ControlFrontendRightAxisY Right stick Y 198
; ControlFrontendPause Start 199
; ControlFrontendAccept A 201
; ControlFrontendCancel B 202
; ControlFrontendX X 203
; ControlFrontendY Y 204
; ControlFrontendLb Left shoulder 205
; ControlFrontendRb Right shoulder 206
; ControlFrontendLt Left trigger 207
; ControlFrontendRt Right trigger 208
; ControlFrontendLs Left stick click 209
; ControlFrontendRs Right stick click 210
; ControlFrontendDelete ??????????? 214
; ControlFrontendSelect Back 217
Toggle = 190
ToggleShift = 202
ShiftUp = 201
ShiftDown = 203
ShiftUpBlocks = -1
ShiftDownBlocks = -1
Toggle = -1
ToggleShift = 194
ShiftUp = 191
ShiftDown = 193
Clutch = 196
Engine = 187

; Controls for realistic reversing
Throttle = 208
Brake = 207


[KEYBOARD]

; Refer to Keyboard_Keys.txt for usable keys

; To disable: put UNKNOWN
Toggle = VK_OEM_5
ToggleH = VK_OEM_6
ShiftUp = LSHIFT
ShiftDown = LCTRL
Clutch = Z
Engine = X

; Controls for realistic reversing
Throttle = W
Brake = S

; Keyboard H-shifter buttons
HR = NUM0
H1 = NUM1
H2 = NUM2
Expand All @@ -192,12 +141,3 @@ H5 = NUM5
H6 = NUM6
H7 = NUM7
HN = NUM9


[DEBUG]
DisplayInfo = false
LogCar = false


[FILEVERSION]
VERSION = 430
Loading

0 comments on commit 981bc3c

Please sign in to comment.