revert Merge Issue

This commit is contained in:
jokoho48 2015-08-05 04:27:11 +02:00
parent d95bc3c299
commit 12aa0b5584

View File

@ -1,31 +1,31 @@
class ACE_Settings { class ACE_Settings {
class GVAR(enabled) { class GVAR(enabled) {
displayName = "Advanced Ballistics"; displayName = CSTRING(enabled_DisplayName);
description = "Enables advanced ballistics"; description = CSTRING(enabled_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 0; value = 0;
}; };
class GVAR(simulateForSnipers) { class GVAR(simulateForSnipers) {
displayName = "Enabled For Snipers"; displayName = CSTRING(simulateForSnipers_DisplayName);
description = "Enables advanced ballistics for non local snipers (when using high power optics)"; description = CSTRING(simulateForSnipers_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 1;
}; };
class GVAR(simulateForGroupMembers) { class GVAR(simulateForGroupMembers) {
displayName = "Enabled For Group Members"; displayName = CSTRING(simulateForGroupMembers_DisplayName);
description = "Enables advanced ballistics for non local group members"; description = CSTRING(simulateForGroupMembers_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 0; value = 0;
}; };
class GVAR(simulateForEveryone) { class GVAR(simulateForEveryone) {
displayName = "Enabled For Everyone"; displayName = CSTRING(simulateForEveryone_DisplayName);
description = "Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)"; description = CSTRING(simulateForEveryone_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 0; value = 0;
}; };
class GVAR(disabledInFullAutoMode) { class GVAR(disabledInFullAutoMode) {
displayName = "Disabled In FullAuto Mode"; displayName = CSTRING(disabledInFullAutoMod_DisplayName);
description = "Disables advanced ballistics during full auto fire"; description = CSTRING(disabledInFullAutoMod_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 0; value = 0;
}; };
@ -38,32 +38,32 @@ class ACE_Settings {
}; };
*/ */
class GVAR(ammoTemperatureEnabled) { class GVAR(ammoTemperatureEnabled) {
displayName = "Enable Ammo Temperature Simulation"; displayName = CSTRING(ammoTemperatureEnabled_DisplayName);
description = "Muzzle velocity varies with ammo temperature"; description = CSTRING(ammoTemperatureEnabled_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 1;
}; };
class GVAR(barrelLengthInfluenceEnabled) { class GVAR(barrelLengthInfluenceEnabled) {
displayName = "Enable Barrel Length Simulation"; displayName = CSTRING(barrelLengthInfluenceEnabled_DisplayName);
description = "Muzzle velocity varies with barrel length"; description = CSTRING(barrelLengthInfluenceEnabled_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 1;
}; };
class GVAR(bulletTraceEnabled) { class GVAR(bulletTraceEnabled) {
displayName = "Enable Bullet Trace Effect"; displayName = CSTRING(bulletTraceEnabled_DisplayName);
description = "Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)"; description = CSTRING(bulletTraceEnabled_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 1;
}; };
class GVAR(simulationInterval) { class GVAR(simulationInterval) {
displayName = "Simulation Interval"; displayName = CSTRING(simulationInterval_DisplayName);
description = "Defines the interval between every calculation step"; description = CSTRING(simulationInterval_Description);
typeName = "SCALAR"; typeName = "SCALAR";
value = 0.0; value = 0.0;
}; };
class GVAR(simulationRadius) { class GVAR(simulationRadius) {
displayName = "Simulation Radius"; displayName = CSTRING(simulationRadius_DisplayName);
description = "Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles"; description = CSTRING(simulationRadius_Description);
typeName = "SCALAR"; typeName = "SCALAR";
value = 3000; value = 3000;
}; };