Skip to content

Commit

Permalink
Merge pull request #119 from TheWillard/grenadeLauncherAmmo
Browse files Browse the repository at this point in the history
Bounciness of 40mm smoke grenades
  • Loading branch information
AdlerSalbei authored Mar 7, 2019
2 parents c8f1641 + fe9b76a commit 3c88a24
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 28 deletions.
1 change: 0 additions & 1 deletion addons/brightFlares/$PBOPREFIX$

This file was deleted.

7 changes: 0 additions & 7 deletions addons/brightFlares/README.md

This file was deleted.

19 changes: 0 additions & 19 deletions addons/brightFlares/config.cpp

This file was deleted.

1 change: 1 addition & 0 deletions addons/grenadeLauncherAmmo/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x\grad\addons\grenadeLauncherAmmo
8 changes: 8 additions & 0 deletions addons/grenadeLauncherAmmo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
### grenadeLauncherAmmo

* Increases brightness of 40mm flares to a level where they are usable for illumination.
* Decreases bounciness of 40mm smoke grenades

#### Maintainer(s)

* Fusselwurm
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ class CfgAmmo {
class Flare_82mm_AMOS_White: FlareCore {
intensity = 4000000;
};

class SmokeShell;
class G_40mm_Smoke: SmokeShell
{
simulation = "shotSmoke";
deflectionSlowDown = 0.4;
};
};
20 changes: 20 additions & 0 deletions addons/grenadeLauncherAmmo/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
author = "$STR_grad_Author";
name = QUOTE(ADDON);
url = "$STR_grad_URL";
requiredVersion = 1.0;
requiredAddons[] = {"grad_main", "A3_Data_F", "A3_Weapons_F"};
units[] = {};
weapons[] = {};
VERSION_CONFIG;
authors[] = {
"Fusselwurm <[email protected]>",
"Willard"
};
};
};

#include "cfgAmmo.hpp"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define COMPONENT brightFlares
#define COMPONENT grenadeLauncherAmmo

#include "\x\grad\addons\main\script_mod.hpp"
#include "\x\grad\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/grenadeLauncherAmmoRhs/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x\grad\addons\grenadeLauncherAmmoRhs
7 changes: 7 additions & 0 deletions addons/grenadeLauncherAmmoRhs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### grenadeLauncherAmmoRhs

* Decreases bounciness of the RHS 40mm smoke grenades

#### Maintainer(s)

* Fusselwurm
37 changes: 37 additions & 0 deletions addons/grenadeLauncherAmmoRhs/cfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
class CfgAmmo {
class SmokeShell;
class rhs_40mm_smoke_white: SmokeShell
{
simulation = "shotSmoke";
deflectionSlowDown = 0.4;
};

class SmokeShellRed;
class rhs_40mm_smoke_red: SmokeShellRed
{
simulation = "shotSmoke";
deflectionSlowDown = 0.4;
};

class SmokeShellGreen;
class rhs_40mm_smoke_green: SmokeShellGreen
{
simulation = "shotSmoke";
deflectionSlowDown = 0.4;
};

class SmokeShellYellow;
class rhs_40mm_smoke_yellow: SmokeShellYellow
{
simulation = "shotSmoke";
deflectionSlowDown = 0.4;
};

class rhs_g_vog25;
class rhs_g_vg40md_white: rhs_g_vog25
{
simulation = "shotSmoke";
deflecting = 30;
deflectionSlowDown = 0.4;
}
};
19 changes: 19 additions & 0 deletions addons/grenadeLauncherAmmoRhs/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
author = "$STR_grad_Author";
name = QUOTE(ADDON);
url = "$STR_grad_URL";
requiredVersion = 1.0;
requiredAddons[] = {"grad_main", "A3_Weapons_F", "rhs_c_weapons", "rhsusf_c_weapons"};
units[] = {};
weapons[] = {};
VERSION_CONFIG;
authors[] = {
"Willard"
};
};
};

#include "cfgAmmo.hpp"
4 changes: 4 additions & 0 deletions addons/grenadeLauncherAmmoRhs/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#define COMPONENT grenadeLauncherAmmoRhs

#include "\x\grad\addons\main\script_mod.hpp"
#include "\x\grad\addons\main\script_macros.hpp"

0 comments on commit 3c88a24

Please sign in to comment.