Skip to content

Commit 141fda5

Browse files
Chemical - Fix bad gas type in zeus placed zone (#666)
**When merged this pull request will:** - Title ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
1 parent fbdf44f commit 141fda5

4 files changed

Lines changed: 15 additions & 10 deletions

File tree

addons/chemical/CfgVehicles.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CfgVehicles {
4040
displayName = CSTRING(ChemicalDetector_Menu);
4141
icon = QPATHTOF(ui\kat_chemicalDet_icon.paa);
4242
exceptions[] = {"isNotSwimming"};
43-
43+
4444
class KAT_ChemicalDetector_Enable {
4545
displayName = CSTRING(EnableDetector);
4646
condition = QUOTE(([_player] call FUNC(hasDetector)) && !(_player getVariable [ARR_2(QQGVAR(detectorEnabled),false)]));
@@ -145,15 +145,15 @@ class CfgVehicles {
145145
displayName = CSTRING(UI_gasType);
146146
typeName = "NUMBER";
147147
class values {
148+
class TearGas {
149+
name = CSTRING(Lvl0_Gas);
150+
value = 0;
151+
};
148152
class ToxicGas {
149-
name = CSTRING(LvL1_Gas);
153+
name = CSTRING(Lvl1_Gas);
150154
value = 1;
151155
default = 1;
152156
};
153-
/* class csgas {
154-
name = "CS-Gas (Level 2)";
155-
value = "CS";
156-
};*/
157157
};
158158
};
159159
class IsSealable

addons/chemical/functions/fnc_gasmodule.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
params ["_logic", "_units", "_activated"];
2020

2121
private _radius = _logic getVariable ["Radius", 20];
22-
private _gasLevel = _logic getVariable ["GAS_type", 0];
22+
private _gasLevel = _logic getVariable ["GAS_type", 1];
2323
private _isSealable = _logic getVariable ["IsSealable", false];
2424

2525
if (count _units == 0) then {_units pushBack _logic;};

addons/chemical/stringtable.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,10 @@
749749
<Dutch>70mm GAS</Dutch>
750750
<Chinesesimp>70mm毒气</Chinesesimp>
751751
</Key>
752-
<Key ID="STR_KAT_Chemical_LvL1_Gas">
752+
<Key ID="STR_KAT_Chemical_Lvl0_Gas">
753+
<English>Tear gas (Level 0)</English>
754+
</Key>
755+
<Key ID="STR_KAT_Chemical_Lvl1_Gas">
753756
<English>Toxic gas (Level 1)</English>
754757
<Spanish>Gas toxico (Nivel 1)</Spanish>
755758
<German>Senfgas (Level 1)</German>

addons/chemical/ui/RscAttributes.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ class GVAR(kat_RscAtributeRadius): RscControlsGroupNoScrollbars {
7676
h = QUOTE(H_PART(1));
7777
colorBackground[] = {0, 0, 0, 0.7};
7878
class Items {
79+
class type0 {
80+
text = CSTRING(Lvl0_Gas);
81+
};
7982
class type1 {
80-
text = CSTRING(LvL1_Gas);
81-
pricture = "";
83+
text = CSTRING(Lvl1_Gas);
8284
default = 1;
8385
};
8486
};

0 commit comments

Comments
 (0)