Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chemical - Fix bad gas type in zeus placed zone #666

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions addons/chemical/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CfgVehicles {
displayName = CSTRING(ChemicalDetector_Menu);
icon = QPATHTOF(ui\kat_chemicalDet_icon.paa);
exceptions[] = {"isNotSwimming"};

class KAT_ChemicalDetector_Enable {
displayName = CSTRING(EnableDetector);
condition = QUOTE(([_player] call FUNC(hasDetector)) && !(_player getVariable [ARR_2(QQGVAR(detectorEnabled),false)]));
Expand Down Expand Up @@ -145,15 +145,15 @@ class CfgVehicles {
displayName = CSTRING(UI_gasType);
typeName = "NUMBER";
class values {
class TearGas {
name = CSTRING(Lvl0_Gas);
value = 0;
};
class ToxicGas {
name = CSTRING(LvL1_Gas);
name = CSTRING(Lvl1_Gas);
value = 1;
default = 1;
};
/* class csgas {
name = "CS-Gas (Level 2)";
value = "CS";
};*/
};
};
class IsSealable
Expand Down
2 changes: 1 addition & 1 deletion addons/chemical/functions/fnc_gasmodule.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
params ["_logic", "_units", "_activated"];

private _radius = _logic getVariable ["Radius", 20];
private _gasLevel = _logic getVariable ["GAS_type", 0];
private _gasLevel = _logic getVariable ["GAS_type", 1];
private _isSealable = _logic getVariable ["IsSealable", false];

if (count _units == 0) then {_units pushBack _logic;};
Expand Down
5 changes: 4 additions & 1 deletion addons/chemical/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,10 @@
<Russian>70mm GAS</Russian>
<Dutch>70mm GAS</Dutch>
</Key>
<Key ID="STR_KAT_Chemical_LvL1_Gas">
<Key ID="STR_KAT_Chemical_Lvl0_Gas">
<English>Tear gas (Level 0)</English>
</Key>
<Key ID="STR_KAT_Chemical_Lvl1_Gas">
<English>Toxic gas (Level 1)</English>
<Spanish>Gas toxico (Nivel 1)</Spanish>
<German>Senfgas (Level 1)</German>
Expand Down
6 changes: 4 additions & 2 deletions addons/chemical/ui/RscAttributes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ class GVAR(kat_RscAtributeRadius): RscControlsGroupNoScrollbars {
h = QUOTE(H_PART(1));
colorBackground[] = {0, 0, 0, 0.7};
class Items {
class type0 {
text = CSTRING(Lvl0_Gas);
};
class type1 {
text = CSTRING(LvL1_Gas);
pricture = "";
text = CSTRING(Lvl1_Gas);
default = 1;
};
};
Expand Down
Loading