+ [REVERT] Removed a bunch of force gear saves that should no longer be
needed.
+ [FIXED] Removed auto refuel from lingor gas stations.
+ [FIXED] Removed auto refuel and repair lingor hangars.
+ [REMOVED] Bear Traps and Land Mines.
+ [FIXED] Removed radar from chinhook with _DZ variant.
+ [FIXED] Possible fix for extra intel in heliocopters.
This commit is contained in:
vbawol
2013-03-12 10:20:38 -05:00
parent 54ddb3e898
commit 6cc4b0ce80
20 changed files with 139 additions and 87 deletions

View File

@@ -19,8 +19,8 @@ if (_ammo != "") then {
_vehicle addMagazineTurret [_ammo,_turret]; _vehicle addMagazineTurret [_ammo,_turret];
player removeMagazine _ammo; player removeMagazine _ammo;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format["You have successfully loaded %1 ammunition.",_ammoType], "PLAIN DOWN"]; cutText [format["You have successfully loaded %1 ammunition.",_ammoType], "PLAIN DOWN"];
} else { } else {

View File

@@ -36,8 +36,8 @@ if (_hasbottleitem and _hastinitem) then {
player addMagazine "ItemWaterbottleBoiled"; player addMagazine "ItemWaterbottleBoiled";
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format[(localize "str_player_01"),_qty], "PLAIN DOWN"]; cutText [format[(localize "str_player_01"),_qty], "PLAIN DOWN"];

View File

@@ -85,8 +85,8 @@ if(!_cancel) then {
player removeMagazine _item; player removeMagazine _item;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
player playActionNow "Medic"; player playActionNow "Medic";

View File

@@ -26,8 +26,8 @@ _cookedmeat = meatcooked;
player addMagazine _meatcooked; player addMagazine _meatcooked;
if !(_meat in magazines player) exitWith {cutText [format[(localize "str_player_31"),_text,"cook"] , "PLAIN DOWN"]}; if !(_meat in magazines player) exitWith {cutText [format[(localize "str_player_31"),_text,"cook"] , "PLAIN DOWN"]};
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format[(localize "str_success_cooked"),_qty,_text], "PLAIN DOWN"]; cutText [format[(localize "str_success_cooked"),_qty,_text], "PLAIN DOWN"];
}; };

View File

@@ -10,8 +10,8 @@ if ("ItemJerrycanEmpty" in magazines player) then {
player removeMagazine "ItemJerrycanEmpty"; player removeMagazine "ItemJerrycanEmpty";
player addMagazine "ItemJerrycan"; player addMagazine "ItemJerrycan";
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
player playActionNow "Medic"; player playActionNow "Medic";

View File

@@ -91,8 +91,8 @@ if (_hasrequireditem or _bypass) then {
_dir = getDir player; _dir = getDir player;
player removeMagazine _item; player removeMagazine _item;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
player playActionNow "Medic"; player playActionNow "Medic";
sleep 1; sleep 1;

View File

@@ -16,8 +16,8 @@ _newFuel = (_newFuel / _capacity);
player removeMagazine "ItemJerrycan"; player removeMagazine "ItemJerrycan";
player addMagazine "ItemJerrycanEmpty"; player addMagazine "ItemJerrycanEmpty";
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
player playActionNow "Medic"; player playActionNow "Medic";
_dis=10; _dis=10;

View File

@@ -28,8 +28,8 @@ if (_section and _hasToolbox) then {
player removeMagazine _part; player removeMagazine _part;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
//Fix the part //Fix the part
_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name"); _selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");

View File

@@ -1,6 +1,6 @@
private["_vehicle","_part","_hitpoint","_type","_selection","_array"]; private["_vehicle","_part","_hitpoint","_type","_selection","_array"];
disableSerialization; //disableSerialization;
_id = _this select 2; _id = _this select 2;
_array = _this select 3; _array = _this select 3;
@@ -44,7 +44,7 @@ if (_hasToolbox) then {
_brokenPart = false; _brokenPart = false;
call dayz_forceSave; //call dayz_forceSave;
}; };

View File

@@ -18,8 +18,8 @@ if (_newFuel > 0) then {
player removeMagazine "ItemJerrycanEmpty"; player removeMagazine "ItemJerrycanEmpty";
player addMagazine "ItemJerrycan"; player addMagazine "ItemJerrycan";
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
player playActionNow "Medic"; player playActionNow "Medic";
[player,"refuel",0,false] call dayz_zombieSpeak; [player,"refuel",0,false] call dayz_zombieSpeak;

View File

@@ -46,8 +46,8 @@ if (_qty >= _qty_in) then {
player removeMagazine _part_in; player removeMagazine _part_in;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
_dir = round(random 360); _dir = round(random 360);
@@ -75,8 +75,8 @@ if (_qty >= _qty_in) then {
player addMagazine _part_out; player addMagazine _part_out;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
_obj = _obj select 0; _obj = _obj select 0;
_objectID = _obj getVariable ["ObjectID","0"]; _objectID = _obj getVariable ["ObjectID","0"];

View File

@@ -47,8 +47,8 @@ if (_qty >= _qty_in) then {
player removeMagazine _part_in; player removeMagazine _part_in;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
_dir = round(random 360); _dir = round(random 360);
@@ -81,8 +81,8 @@ if (_qty >= _qty_in) then {
player addMagazine _part_out; player addMagazine _part_out;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
_obj = _obj select 0; _obj = _obj select 0;
_objectID = _obj getVariable ["ObjectID","0"]; _objectID = _obj getVariable ["ObjectID","0"];

View File

@@ -44,8 +44,8 @@ if (_bulkqty >= 1) then {
_part_in = "bulk_" + _part_in; _part_in = "bulk_" + _part_in;
player removeMagazine _part_in; player removeMagazine _part_in;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
diag_log format["DEBUG remove magazine %1", _part_in]; diag_log format["DEBUG remove magazine %1", _part_in];
@@ -99,8 +99,8 @@ if (_bulkqty >= 1) then {
}; };
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
@@ -140,8 +140,8 @@ if (_bulkqty >= 1) then {
// player addBackpack _part_out; // player addBackpack _part_out;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];

View File

@@ -37,8 +37,8 @@ if (_bulkqty >= 1) then {
_part_in = "bulk_" + _part_in; _part_in = "bulk_" + _part_in;
player removeMagazine _part_in; player removeMagazine _part_in;
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
// diag_log format["DEBUG remove magazine %1", _part_in]; // diag_log format["DEBUG remove magazine %1", _part_in];
@@ -100,8 +100,8 @@ if (_bulkqty >= 1) then {
}; };
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
@@ -142,8 +142,8 @@ if (_bulkqty >= 1) then {
player addMagazine _part_out; player addMagazine _part_out;
}; };
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
// [player,"repair",0,false] call dayz_zombieSpeak; // [player,"repair",0,false] call dayz_zombieSpeak;
cutText [format[("Traded %1 %2 for %3 %4"),(_qty_in*_qty),_textPartIn,(_qty_out*_qty),_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),(_qty_in*_qty),_textPartIn,(_qty_out*_qty),_textPartOut], "PLAIN DOWN"];

View File

@@ -72,8 +72,8 @@ if (_qty >= _qty_in) then {
}; };
if(_total_out > 0) then { if(_total_out > 0) then {
cutText [format[("Traded %1 %2 for %3 %4"),_total_in,_textPartIn,_total_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_total_in,_textPartIn,_total_out,_textPartOut], "PLAIN DOWN"];
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
}; };
} else { } else {

View File

@@ -97,8 +97,8 @@ if (_bulkqty >= 1) then {
}; };
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
dayzTradeResult = nil; dayzTradeResult = nil;
@@ -138,8 +138,8 @@ if (_bulkqty >= 1) then {
// [player,"repair",0,false] call dayz_zombieSpeak; // [player,"repair",0,false] call dayz_zombieSpeak;
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
{player removeAction _x} forEach s_player_parts;s_player_parts = []; {player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1; s_player_parts_crtl = -1;

View File

@@ -4,7 +4,7 @@ private["_position","_tent","_location","_isOk","_backpack","_tentType","_trg","
if(TradeInprogress) exitWith { cutText ["Vault pitching already in progress." , "PLAIN DOWN"]; }; if(TradeInprogress) exitWith { cutText ["Vault pitching already in progress." , "PLAIN DOWN"]; };
TradeInprogress = true; TradeInprogress = true;
disableSerialization; //disableSerialization;
_playerPos = getPosATL player; _playerPos = getPosATL player;
_item = _this; _item = _this;
@@ -110,7 +110,7 @@ if(!_cancel) then {
player removeMagazine _item; player removeMagazine _item;
call dayz_forceSave; //call dayz_forceSave;
_dir = round(direction player); _dir = round(direction player);

View File

@@ -154,9 +154,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 50; transportMaxMagazines = 50;
transportmaxbackpacks = 10; transportmaxbackpacks = 10;
@@ -184,9 +184,9 @@ class Citizen1; // External class reference
typicalCargo[] = {}; typicalCargo[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 50; transportMaxMagazines = 50;
transportmaxbackpacks = 10; transportmaxbackpacks = 10;
@@ -219,9 +219,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;
@@ -261,14 +261,30 @@ class Citizen1; // External class reference
class TransportWeapons{}; class TransportWeapons{};
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 3; transportMaxWeapons = 3;
transportMaxMagazines = 10; transportMaxMagazines = 10;
transportmaxbackpacks = 2; transportmaxbackpacks = 2;
class Turrets {}; class Turrets {};
}; };
class CH_47F_EP1;
class CH_47F_EP1_DZ : CH_47F_EP1 {
accuracy = 1000;
model = "\ca\air_E\CH47\CH_47F";
scope = 2;
displayName = "CH-47F";
crew = "";
typicalCargo[] = {};
commanderCanSee = 2;
gunnerCanSee = 2;
driverCanSee = 2;
transportMaxWeapons = 10;
transportMaxMagazines = 200;
transportmaxbackpacks = 5;
};
class ArmoredSUV_PMC; class ArmoredSUV_PMC;
class ArmoredSUV_PMC_DZ : ArmoredSUV_PMC { class ArmoredSUV_PMC_DZ : ArmoredSUV_PMC {
scope = 2; scope = 2;
@@ -555,9 +571,9 @@ class Citizen1; // External class reference
class TransportWeapons{}; class TransportWeapons{};
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 3; transportMaxWeapons = 3;
transportMaxMagazines = 20; transportMaxMagazines = 20;
transportmaxbackpacks = 5; transportmaxbackpacks = 5;
@@ -1006,9 +1022,9 @@ class Citizen1; // External class reference
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
gunnerHasFlares = false; gunnerHasFlares = false;
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 80; transportMaxMagazines = 80;
transportmaxbackpacks = 15; transportmaxbackpacks = 15;
@@ -1046,14 +1062,56 @@ class Citizen1; // External class reference
nameSound = "fuelstation"; nameSound = "fuelstation";
}; };
class Land_Ind_FuelStation_Feed_Ep1: Strategic class Land_Ind_FuelStation_Feed_EP1: Strategic
{ {
model = "\ca\structures_pmc\ind\fuelstation\fuelstation_feed_pmc"; model = "\ca\Structures_E\Ind\Ind_FuelStation\Ind_FuelStation_Feed_ep1.p3d";
transportFuel = 0; transportFuel = 0;
nameSound = "fuelstation"; nameSound = "fuelstation";
}; };
class Ship: AllVehicles class FuelStation : Strategic {
icon = "\Ca\buildings\Icons\i_fuel_CA.paa";
scope = 0;
animated = 0;
armor = 20;
displayName = "Fuel station";
accuracy = 0.5;
transportFuel = 0;
};
class Land_FuelStation_Feed_PMC : Strategic {
model = "\ca\Structures_PMC\Ind\FuelStation\FuelStation_Feed_PMC.p3d";
transportFuel = 0;
nameSound = "fuelstation";
};
// lingor
class Land_ibr_FuelStation_Feed : Strategic {
model = "\ibr\lingor_fuel\ibr_FuelStation_Feed.p3d";
transportFuel = 0;
nameSound = "fuelstation";
};
// lingor
class Land_fuelstation_army : Strategic {
model = "\ibr\ibr_plants\fuelstation_army";
transportFuel = 0;
nameSound = "fuelstation";
}
// Lingor hangars
class land_ibr_hangar : House {
model = "\ibr\ibr_hangars\ibr_hangar";
scope = 2;
vehicleClass = "ibr_hangars";
transportFuel = 0;
transportRepair = 0;
icon = "\ibr\ibr_hangars\icons\icon5.paa";
mapSize = 40;
displayName = "House";
destrType = "DestructBuilding";
armor = 1200;
};
class Ship: AllVehicles
{ {
displayName = "Ship"; displayName = "Ship";
transportMaxMagazines = 2000; transportMaxMagazines = 2000;
@@ -1116,9 +1174,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;
@@ -1133,21 +1191,15 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2+16+32; commanderCanSee = 2;
gunnerCanSee = 2+16+32; gunnerCanSee = 2;
driverCanSee = 2+16+32; driverCanSee = 2;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;
}; };
// Lingor hangars
//class land_ibr_hangar: land_ibr_hangar
//{
// scope = 2;
// transportFuel = 0;
// transportRepair = 0;
//};
}; };

View File

@@ -553,7 +553,7 @@ class CfgBuildingLoot {
{ "PartWoodPile","magazine" }, { "PartWoodPile","magazine" },
{ "WeaponHolder_ItemHatchet","object" }, { "WeaponHolder_ItemHatchet","object" },
{ "MR43","weapon" }, { "MR43","weapon" },
{"TrapBear","magazine"}, //{"TrapBear","magazine"},
{"WeaponHolder_ItemMachete"} {"WeaponHolder_ItemMachete"}
}; };
itemChance[] = { itemChance[] = {
@@ -567,7 +567,7 @@ class CfgBuildingLoot {
0.11, 0.11,
0.17, 0.17,
0.06, 0.06,
0.01, //0.01,
0.03 0.03
}; };
}; };

View File

@@ -42,8 +42,8 @@ if (_finished) then {
_unit setVariable["USEC_lowBlood",false,true]; _unit setVariable["USEC_lowBlood",false,true];
player removeMagazine "ItemBloodbag"; player removeMagazine "ItemBloodbag";
disableSerialization; //disableSerialization;
call dayz_forceSave; //call dayz_forceSave;
//["usecTransfuse",[_unit,player]] call broadcastRpcCallAll; //["usecTransfuse",[_unit,player]] call broadcastRpcCallAll;
usecTransfuse = [_unit,player]; usecTransfuse = [_unit,player];