Skip to content

Commit

Permalink
more settings
Browse files Browse the repository at this point in the history
  • Loading branch information
commy2 committed May 29, 2016
1 parent 693b691 commit a7a991e
Show file tree
Hide file tree
Showing 21 changed files with 160 additions and 110 deletions.
8 changes: 0 additions & 8 deletions addons/hitreactions/ACE_Settings.hpp

This file was deleted.

13 changes: 13 additions & 0 deletions addons/hitreactions/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

class CBA_Setting_Slider_2_base;

class CBA_Settings {
class PREFIX {
´//displayName = CSTRING(Module_DisplayName);

This comment has been minimized.

Copy link
@jonpas

jonpas May 29, 2016

Member

´

This comment has been minimized.

Copy link
@commy2

commy2 May 29, 2016

Author Contributor

{:


class GVAR(minDamageToTrigger) {: CBA_Setting_Slider_2_base {
//Minimum mamage needed to trigger falling down while moving. Set to -1 to disable completely.
defaultValue = 0.1;
};
};
};
3 changes: 2 additions & 1 deletion addons/hitreactions/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ class CfgPatches {
};
};

#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"

#include "CBA_Settings.hpp"
10 changes: 0 additions & 10 deletions addons/inventory/ACE_Settings.hpp

This file was deleted.

16 changes: 16 additions & 0 deletions addons/inventory/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

class CBA_Setting_List_base;

class CBA_Settings {
class PREFIX {
//displayName = CSTRING(Module_DisplayName);

class GVAR(inventoryDisplaySize): CBA_Setting_List_base {
displayName = CSTRING(SettingName);
tooltip = CSTRING(SettingDescription);
values[] = {0,1,2};
labels[] = {"$str_medium","$str_large","$str_very_large"};
defaultIndex = 0;
};
};
};
2 changes: 1 addition & 1 deletion addons/inventory/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"

#include "RscDisplayInventory.hpp"
#include "ACE_Settings.hpp"
#include "CBA_Settings.hpp"
6 changes: 0 additions & 6 deletions addons/laserpointer/ACE_Settings.hpp

This file was deleted.

12 changes: 12 additions & 0 deletions addons/laserpointer/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

class CBA_Setting_Boolean_base;

class CBA_Settings {
class PREFIX {
//displayName = CSTRING(Module_DisplayName);

class GVAR(enabled): CBA_Setting_Boolean_base {
defaultValue = 1;
};
};
};
4 changes: 3 additions & 1 deletion addons/laserpointer/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ class CfgPatches {
};
};

#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"

#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "CfgJointRails.hpp"

#include "CBA_Settings.hpp"
17 changes: 0 additions & 17 deletions addons/magazinerepack/ACE_Settings.hpp

This file was deleted.

30 changes: 30 additions & 0 deletions addons/magazinerepack/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

class CBA_Setting_Slider_base;

class CBA_Settings {
class PREFIX {
//displayName = CSTRING(Module_DisplayName);

//Time to move a round from one magazine to another
class GVAR(timePerAmmo): CBA_Setting_Slider_base {
min = 0;
max = 10;
defaultValue = 1.5;
trailingDecimals = 1;
};
//Time to swap between magazines when repacking
class GVAR(timePerMagazine): CBA_Setting_Slider_base {
min = 0;
max = 10;
defaultValue = 2.0;
trailingDecimals = 1;
};
//Time to relink 2 belts together
class GVAR(timePerBeltLink): CBA_Setting_Slider_base {
min = 0;
max = 10;
defaultValue = 8.0;
trailingDecimals = 1;
};
};
};
4 changes: 3 additions & 1 deletion addons/magazinerepack/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"

#include "CfgSounds.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Settings.hpp"

#include "CBA_Settings.hpp"
10 changes: 0 additions & 10 deletions addons/missileguidance/ACE_Settings.hpp

This file was deleted.

16 changes: 16 additions & 0 deletions addons/missileguidance/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

class CBA_Setting_List_base;

class CBA_Settings {
class PREFIX {
//displayName = CSTRING(Module_DisplayName);

class GVAR(enabled): CBA_Setting_List_base {
displayName = CSTRING(Title);
tooltip = CSTRING(Desc);
values[] = {0,1,2};
labels[] = {CSTRING(Off),CSTRING(PlayerOnly),CSTRING(PlayerAndAi)};
defaultIndex = 2;
};
};
};
7 changes: 4 additions & 3 deletions addons/missileguidance/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ class CfgPatches {
};
};

#include "ACE_GuidanceConfig.hpp"
#include "ACE_Settings.hpp"

#include "CfgEventhandlers.hpp"

#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"

#include "ACE_GuidanceConfig.hpp"
#include "CBA_Settings.hpp"
31 changes: 0 additions & 31 deletions addons/mk6mortar/ACE_Settings.hpp

This file was deleted.

30 changes: 30 additions & 0 deletions addons/mk6mortar/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

class CBA_Setting_Boolean_base;

class CBA_Settings {
class ADDON {
//displayName = CSTRING(Module_DisplayName);

//These settings effect gameplay difficutly: defaults will leave the mortar the same as vanilla
class GVAR(airResistanceEnabled): CBA_Setting_Boolean_base {
displayName = CSTRING(airResistanceEnabled_DisplayName);
tooltip = CSTRING(airResistanceEnabled_tooltip);
defaultValue = 0;
};
class GVAR(allowComputerRangefinder): CBA_Setting_Boolean_base {
displayName = CSTRING(allowComputerRangefinder_DisplayName);
tooltip = CSTRING(allowComputerRangefinder_tooltip);
defaultValue = 1;
};
class GVAR(allowCompass): CBA_Setting_Boolean_base {
displayName = CSTRING(allowCompass_DisplayName);
tooltip = CSTRING(allowCompass_tooltip);
defaultValue = 1;
};
class GVAR(useAmmoHandling): CBA_Setting_Boolean_base {
displayName = CSTRING(useAmmoHandling_DisplayName);
tooltip = CSTRING(useAmmoHandling_tooltip);
defaultValue = 0;
};
};
};
3 changes: 2 additions & 1 deletion addons/mk6mortar/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ class CfgPatches {
};
};

#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"

#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "CfgMagazines.hpp"

#include "CBA_Settings.hpp"

//UI Stuff:
class RscText;
Expand Down
19 changes: 0 additions & 19 deletions addons/respawn/ACE_Settings.hpp

This file was deleted.

25 changes: 25 additions & 0 deletions addons/respawn/CBA_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

class CBA_Setting_Boolean_base;
class CBA_Setting_Slider_2_base;

class CBA_Settings {
class ADDON {
//displayName = CSTRING(Module_DisplayName);

class GVAR(savePreDeathGear): CBA_Setting_Boolean_base {
displayName = CSTRING(SavePreDeathGear_DisplayName);
tooltip = CSTRING(SavePreDeathGear_tooltip);
defaultValue = 0;
};
class GVAR(removeDeadBodiesDisconnected): CBA_Setting_Boolean_base {
displayName = CSTRING(RemoveDeadBodiesDisconnected_DisplayName);
tooltip = CSTRING(RemoveDeadBodiesDisconnected_tooltip);
defaultValue = 1;
};
class GVAR(bodyRemoveTimer): CBA_Setting_Slider_2_base {
min = 0;
max = 600;
defaultValue = 0;
};
};
};
4 changes: 3 additions & 1 deletion addons/respawn/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"

#include "CfgAddons.hpp"
#include "CfgVehicleClasses.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Settings.hpp"

#include "CBA_Settings.hpp"

0 comments on commit a7a991e

Please sign in to comment.