fixed syntax errors

gruppe-adler · Oct 27, 2015 · 68a155a · 68a155a
1 parent c0d7547
commit 68a155a
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/description.ext b/description.ext
@@ -34,7 +34,7 @@ class Params
 		title = "Time of Day";
 		values[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23};
 		texts[] = {"00:00","01:00","02:00","03:00","04:00","05:00","06:00","07:00","08:00","09:00","10:00","11:00","12:00","13:00","14:00","15:00","16:00","17:00","18:00","19:00","20:00","21:00","22:00","23:00"};
-		default = 12;
+		default = 8;
 	};
 
 	class WeatherSetting
@@ -74,7 +74,7 @@ class Params
 		title = "How long should OPFOR have to send before they win?";
 		values[] = {300, 600, 900, 1800, 2700, 3600, 4500, 5400, 6300};
 		texts[] = {"5'","10'", "15'", "30'", "45'", "1h'", "1h15'","1h30'","1h45'"};
-		default = 1800;
+		default = 4500;
 	};
 
 	class Zeitbeschleunigung

diff --git a/helpers/enforceNoSwim.sqf b/helpers/enforceNoSwim.sqf
@@ -0,0 +1,4 @@
+_SwimAnims = ["aswmpercmwlksnonwnondf", "aswmpercmsprsnonwnondf", "aswmpercmrunsnonwnondf", "aswmpercmstpsnonwnondnon", "aswmpercmrunsnonwnondf_aswmpercmstpsnonwnondnon", "aswmpercmstpsnonwnondnon_aswmpercmrunsnonwnondf", "aswmpercmstpdnon", "aswmpercmstpdnon_aswmpercmstpdf", "aswmpercmstpdf_aswmpercmstpdnon", "aswmpercmstpsnonwnondf"];
+if ((animationState player) in _SwimAnims) then {
+	player switchmove "AmovPercMstpSnonWnonDnon";
+};
diff --git a/helpers/spawnBluforHQ.sqf b/helpers/spawnBluforHQ.sqf
@@ -36,7 +36,7 @@ setSpawnedDirection = {
 	_veh2 = _this select 1;
 
 	private ["_roadconnectedto1","_roadconnectedto2","_connectedRoad1","_connectedRoad2"];
-
+	/*
 	_road1 = [getPos _veh1] call BIS_fnc_nearestRoad;
 	_road2 = [getPos _veh2] call BIS_fnc_nearestRoad;
 
@@ -64,6 +64,7 @@ setSpawnedDirection = {
 	if (!isNil "_direction2") then {
 		_veh2 setDir (_direction2);
 	};
+	*/
 };
 
 testSpawnPositions = {

diff --git a/helpers/teleportPlayer.sqf b/helpers/teleportPlayer.sqf
@@ -13,4 +13,5 @@ _nul = player setPos _spawn;
 openMap [false, false];
 hintSilent "";
 cutText ["", "BLACK IN", 1];
-1 call fn_sthud_usermenu_changeMode;
+[] execVM "helpers\enforceNoSwim.sqf";
+3 call fn_sthud_usermenu_changeMode;
diff --git a/init.sqf b/init.sqf
@@ -163,6 +163,7 @@ if (hasInterface) then {
 
 
 	checkSpawnButton = {
+		[] execVM "helpers\enforceNoSwim.sqf";
 
 		if (player != opfor_teamlead) then {
 			0 = [[worldSize/2,worldSize/2,0],""] execVM "helpers\establishingShot.sqf";

diff --git a/spawn/gui/addPublicVariableEventhandler.sqf b/spawn/gui/addPublicVariableEventhandler.sqf
@@ -90,8 +90,8 @@ fillRussianSupplies = {
             (_this select 0) addItemCargoGlobal ['ACE_epinephrine',40];
             (_this select 0) addItemCargoGlobal ['ACE_fieldDressing',100];
             (_this select 0) addItemCargoGlobal ['ItemGPS',5];
-            ["AddCargoByClass", _this select 0, ["ACE_wheel", _this select 0, 3]] call ace_common_fnc_targetEvent;
-            ["AddCargoByClass", _this select 0, ["ACE_Track", _this select 0, 1]] call ace_common_fnc_targetEvent;
+            ['AddCargoByClass', _this select 0, ['ACE_wheel', _this select 0, 3]] call ace_common_fnc_targetEvent;
+            ['AddCargoByClass', _this select 0, ['ACE_Track', _this select 0, 1]] call ace_common_fnc_targetEvent;
             }
         ],
         [
@@ -155,12 +155,12 @@ fillRussianSupplies = {
             (_this select 0) addBackpackCargoGlobal ['RHS_NSV_Gun_Bag',1];
             (_this select 0) addBackpackCargoGlobal ['RHS_NSV_Tripod_Bag',1];
             (_this select 0) addItemCargoGlobal ['ACE_Sandbag_empty',100];
-            _box = createVehicle ["ACE_Box_Misc", position (_this select 0), [], 1, "NONE"];
+            _box = createVehicle ['ACE_Box_Misc', position (_this select 0), [], 1, 'NONE'];
             clearWeaponCargoGlobal _box; 
             clearItemCargoGlobal _box; 
             clearBackpackCargoGlobal _box; 
             clearMagazineCargoGlobal _box;
-            _box = createVehicle ["ACE_Box_Misc", position (_this select 0), [], 1, "NONE"];
+            _box = createVehicle ['ACE_Box_Misc', position (_this select 0), [], 1, 'NONE'];
             clearWeaponCargoGlobal _box; 
             clearItemCargoGlobal _box; 
             clearBackpackCargoGlobal _box; 
@@ -287,8 +287,8 @@ fillUSSupplies = {
             (_this select 0) addItemCargoGlobal ['ACE_epinephrine',40];
             (_this select 0) addItemCargoGlobal ['ACE_fieldDressing',100];
             (_this select 0) addItemCargoGlobal ['ItemGPS',5];
-            ["AddCargoByClass", _this select 0, ["ACE_wheel", _this select 0, 3]] call ace_common_fnc_targetEvent;
-            ["AddCargoByClass", _this select 0, ["ACE_Track", _this select 0, 1]] call ace_common_fnc_targetEvent;
+            ['AddCargoByClass', _this select 0, ['ACE_wheel', _this select 0, 3]] call ace_common_fnc_targetEvent;
+            ['AddCargoByClass', _this select 0, ['ACE_Track', _this select 0, 1]] call ace_common_fnc_targetEvent;
             }
         ],
         [

diff --git a/spawn/gui/dialogConvertFunctions.sqf b/spawn/gui/dialogConvertFunctions.sqf
@@ -11,7 +11,7 @@ creditString = {
 pricedisplayString = {
     _price = _this select 0;
 
-    _string = "<t align='center'>" + _price + " cr </t>";
+    _string = "<t align='center'>" + (str _price) + " cr </t>";
 
     _string
 };

diff --git a/stringtable.xml b/stringtable.xml
@@ -174,19 +174,19 @@
                 <German>Verbleibende Credits</German>
             </Key>
             <Key ID="str_GRAD_buy_legend_price">
-               <Original><t color='#80ffffff'>Price</t></Original>
-                <English><t color='#80ffffff'>Price</t></English>
-                <German><t color='#80ffffff'>Preis</t></German>
+               <Original><t color='#80ffffff'>Price</Original>
+                <English><t color='#80ffffff'>Price</English>
+                <German><t color='#80ffffff'>Preis</German>
             </Key>
              <Key ID="str_GRAD_buy_legend_count">
-               <Original><t color='#80ffffff'>Count left</t></Original>
-                <English><t color='#80ffffff'>Count left</t></English>
-                <German><t color='#80ffffff'>Anz. verf.</t></German>
+               <Original><t color='#80ffffff'>Count left</Original>
+                <English><t color='#80ffffff'>Count left</English>
+                <German><t color='#80ffffff'>Anz. verf.</German>
             </Key>
              <Key ID="str_GRAD_buy_legend_vehicle">
-               <Original><t color='#80ffffff'>Type</t></Original>
-                <English><t color='#80ffffff'>Type</t></English>
-                <German><t color='#80ffffff'>Typ</t></German>
+               <Original><t color='#80ffffff'>Type</Original>
+                <English><t color='#80ffffff'>Type</English>
+                <German><t color='#80ffffff'>Typ</German>
             </Key>
             <Key ID="str_GRAD_buy_headline">
                <Original>Call reinforcements</Original>