From 6cc4b0ce80713ffc9132e096839548a8775889ab Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Mar 2013 10:20:38 -0500 Subject: [PATCH] 0.996a + [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. --- dayz_code/actions/ammo.sqf | 4 +- dayz_code/actions/boil.sqf | 4 +- dayz_code/actions/build.sqf | 4 +- dayz_code/actions/cook.sqf | 4 +- dayz_code/actions/jerry_fill.sqf | 4 +- dayz_code/actions/player_build.sqf | 4 +- dayz_code/actions/refuel.sqf | 4 +- dayz_code/actions/repair.sqf | 4 +- dayz_code/actions/salvage.sqf | 4 +- dayz_code/actions/siphonFuel.sqf | 4 +- dayz_code/actions/trade_any_boat.sqf | 8 +- dayz_code/actions/trade_any_vehicle.sqf | 8 +- dayz_code/actions/trade_backpacks.sqf | 12 +-- dayz_code/actions/trade_items.sqf | 12 +-- dayz_code/actions/trade_items_wo_db.sqf | 4 +- dayz_code/actions/trade_weapons.sqf | 8 +- dayz_code/actions/vault_pitch.sqf | 4 +- dayz_code/cfgVehicles.hpp | 122 +++++++++++++++++------- dayz_code/config.cpp | 4 +- dayz_code/medical/transfusion.sqf | 4 +- 20 files changed, 139 insertions(+), 87 deletions(-) diff --git a/dayz_code/actions/ammo.sqf b/dayz_code/actions/ammo.sqf index 0643bd9d9..bff42a012 100644 --- a/dayz_code/actions/ammo.sqf +++ b/dayz_code/actions/ammo.sqf @@ -19,8 +19,8 @@ if (_ammo != "") then { _vehicle addMagazineTurret [_ammo,_turret]; player removeMagazine _ammo; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; cutText [format["You have successfully loaded %1 ammunition.",_ammoType], "PLAIN DOWN"]; } else { diff --git a/dayz_code/actions/boil.sqf b/dayz_code/actions/boil.sqf index cc62750ff..e4067dd46 100644 --- a/dayz_code/actions/boil.sqf +++ b/dayz_code/actions/boil.sqf @@ -36,8 +36,8 @@ if (_hasbottleitem and _hastinitem) then { player addMagazine "ItemWaterbottleBoiled"; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; cutText [format[(localize "str_player_01"),_qty], "PLAIN DOWN"]; diff --git a/dayz_code/actions/build.sqf b/dayz_code/actions/build.sqf index 43d1ea105..e0443ea2e 100644 --- a/dayz_code/actions/build.sqf +++ b/dayz_code/actions/build.sqf @@ -85,8 +85,8 @@ if(!_cancel) then { player removeMagazine _item; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; player playActionNow "Medic"; diff --git a/dayz_code/actions/cook.sqf b/dayz_code/actions/cook.sqf index bfc8f39f2..50f30b397 100644 --- a/dayz_code/actions/cook.sqf +++ b/dayz_code/actions/cook.sqf @@ -26,8 +26,8 @@ _cookedmeat = meatcooked; player addMagazine _meatcooked; if !(_meat in magazines player) exitWith {cutText [format[(localize "str_player_31"),_text,"cook"] , "PLAIN DOWN"]}; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; cutText [format[(localize "str_success_cooked"),_qty,_text], "PLAIN DOWN"]; }; diff --git a/dayz_code/actions/jerry_fill.sqf b/dayz_code/actions/jerry_fill.sqf index 61cdbf757..ac1674def 100644 --- a/dayz_code/actions/jerry_fill.sqf +++ b/dayz_code/actions/jerry_fill.sqf @@ -10,8 +10,8 @@ if ("ItemJerrycanEmpty" in magazines player) then { player removeMagazine "ItemJerrycanEmpty"; player addMagazine "ItemJerrycan"; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; player playActionNow "Medic"; diff --git a/dayz_code/actions/player_build.sqf b/dayz_code/actions/player_build.sqf index c75ce393f..7f98cdb78 100644 --- a/dayz_code/actions/player_build.sqf +++ b/dayz_code/actions/player_build.sqf @@ -91,8 +91,8 @@ if (_hasrequireditem or _bypass) then { _dir = getDir player; player removeMagazine _item; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; player playActionNow "Medic"; sleep 1; diff --git a/dayz_code/actions/refuel.sqf b/dayz_code/actions/refuel.sqf index bbc628c1d..21266c092 100644 --- a/dayz_code/actions/refuel.sqf +++ b/dayz_code/actions/refuel.sqf @@ -16,8 +16,8 @@ _newFuel = (_newFuel / _capacity); player removeMagazine "ItemJerrycan"; player addMagazine "ItemJerrycanEmpty"; -disableSerialization; -call dayz_forceSave; +//disableSerialization; +//call dayz_forceSave; player playActionNow "Medic"; _dis=10; diff --git a/dayz_code/actions/repair.sqf b/dayz_code/actions/repair.sqf index 4cf751190..adbe0d53f 100644 --- a/dayz_code/actions/repair.sqf +++ b/dayz_code/actions/repair.sqf @@ -28,8 +28,8 @@ if (_section and _hasToolbox) then { player removeMagazine _part; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; //Fix the part _selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name"); diff --git a/dayz_code/actions/salvage.sqf b/dayz_code/actions/salvage.sqf index 1cf791a33..590b3acde 100644 --- a/dayz_code/actions/salvage.sqf +++ b/dayz_code/actions/salvage.sqf @@ -1,6 +1,6 @@ private["_vehicle","_part","_hitpoint","_type","_selection","_array"]; -disableSerialization; +//disableSerialization; _id = _this select 2; _array = _this select 3; @@ -44,7 +44,7 @@ if (_hasToolbox) then { _brokenPart = false; - call dayz_forceSave; + //call dayz_forceSave; }; diff --git a/dayz_code/actions/siphonFuel.sqf b/dayz_code/actions/siphonFuel.sqf index b6fa1fc77..71589fda8 100644 --- a/dayz_code/actions/siphonFuel.sqf +++ b/dayz_code/actions/siphonFuel.sqf @@ -18,8 +18,8 @@ if (_newFuel > 0) then { player removeMagazine "ItemJerrycanEmpty"; player addMagazine "ItemJerrycan"; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; player playActionNow "Medic"; [player,"refuel",0,false] call dayz_zombieSpeak; diff --git a/dayz_code/actions/trade_any_boat.sqf b/dayz_code/actions/trade_any_boat.sqf index 84e9b81c2..f422e7db0 100644 --- a/dayz_code/actions/trade_any_boat.sqf +++ b/dayz_code/actions/trade_any_boat.sqf @@ -46,8 +46,8 @@ if (_qty >= _qty_in) then { player removeMagazine _part_in; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; _dir = round(random 360); @@ -75,8 +75,8 @@ if (_qty >= _qty_in) then { player addMagazine _part_out; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; _obj = _obj select 0; _objectID = _obj getVariable ["ObjectID","0"]; diff --git a/dayz_code/actions/trade_any_vehicle.sqf b/dayz_code/actions/trade_any_vehicle.sqf index b1838d88c..7ec518477 100644 --- a/dayz_code/actions/trade_any_vehicle.sqf +++ b/dayz_code/actions/trade_any_vehicle.sqf @@ -47,8 +47,8 @@ if (_qty >= _qty_in) then { player removeMagazine _part_in; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; _dir = round(random 360); @@ -81,8 +81,8 @@ if (_qty >= _qty_in) then { player addMagazine _part_out; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; _obj = _obj select 0; _objectID = _obj getVariable ["ObjectID","0"]; diff --git a/dayz_code/actions/trade_backpacks.sqf b/dayz_code/actions/trade_backpacks.sqf index cdc680712..6f9a778d1 100644 --- a/dayz_code/actions/trade_backpacks.sqf +++ b/dayz_code/actions/trade_backpacks.sqf @@ -44,8 +44,8 @@ if (_bulkqty >= 1) then { _part_in = "bulk_" + _part_in; player removeMagazine _part_in; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; diag_log format["DEBUG remove magazine %1", _part_in]; @@ -99,8 +99,8 @@ if (_bulkqty >= 1) then { }; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; 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; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; diff --git a/dayz_code/actions/trade_items.sqf b/dayz_code/actions/trade_items.sqf index 1c78efea5..50556e81a 100644 --- a/dayz_code/actions/trade_items.sqf +++ b/dayz_code/actions/trade_items.sqf @@ -37,8 +37,8 @@ if (_bulkqty >= 1) then { _part_in = "bulk_" + _part_in; player removeMagazine _part_in; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; // diag_log format["DEBUG remove magazine %1", _part_in]; @@ -100,8 +100,8 @@ if (_bulkqty >= 1) then { }; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; 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; }; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; // [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"]; diff --git a/dayz_code/actions/trade_items_wo_db.sqf b/dayz_code/actions/trade_items_wo_db.sqf index 9d3559e80..3088f01ee 100644 --- a/dayz_code/actions/trade_items_wo_db.sqf +++ b/dayz_code/actions/trade_items_wo_db.sqf @@ -72,8 +72,8 @@ if (_qty >= _qty_in) then { }; if(_total_out > 0) then { cutText [format[("Traded %1 %2 for %3 %4"),_total_in,_textPartIn,_total_out,_textPartOut], "PLAIN DOWN"]; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; }; } else { diff --git a/dayz_code/actions/trade_weapons.sqf b/dayz_code/actions/trade_weapons.sqf index 3505d9989..dd35c6e41 100644 --- a/dayz_code/actions/trade_weapons.sqf +++ b/dayz_code/actions/trade_weapons.sqf @@ -97,8 +97,8 @@ if (_bulkqty >= 1) then { }; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; dayzTradeResult = nil; @@ -138,8 +138,8 @@ if (_bulkqty >= 1) then { // [player,"repair",0,false] call dayz_zombieSpeak; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; {player removeAction _x} forEach s_player_parts;s_player_parts = []; s_player_parts_crtl = -1; diff --git a/dayz_code/actions/vault_pitch.sqf b/dayz_code/actions/vault_pitch.sqf index 4311e9e53..7135515de 100644 --- a/dayz_code/actions/vault_pitch.sqf +++ b/dayz_code/actions/vault_pitch.sqf @@ -4,7 +4,7 @@ private["_position","_tent","_location","_isOk","_backpack","_tentType","_trg"," if(TradeInprogress) exitWith { cutText ["Vault pitching already in progress." , "PLAIN DOWN"]; }; TradeInprogress = true; -disableSerialization; +//disableSerialization; _playerPos = getPosATL player; _item = _this; @@ -110,7 +110,7 @@ if(!_cancel) then { player removeMagazine _item; - call dayz_forceSave; + //call dayz_forceSave; _dir = round(direction player); diff --git a/dayz_code/cfgVehicles.hpp b/dayz_code/cfgVehicles.hpp index da07d4c43..d20d6b50c 100644 --- a/dayz_code/cfgVehicles.hpp +++ b/dayz_code/cfgVehicles.hpp @@ -154,9 +154,9 @@ class Citizen1; // External class reference hiddenSelections[] = {}; class TransportMagazines{}; class TransportWeapons{}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 10; transportMaxMagazines = 50; transportmaxbackpacks = 10; @@ -184,9 +184,9 @@ class Citizen1; // External class reference typicalCargo[] = {}; class TransportMagazines{}; class TransportWeapons{}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 10; transportMaxMagazines = 50; transportmaxbackpacks = 10; @@ -219,9 +219,9 @@ class Citizen1; // External class reference hiddenSelections[] = {}; class TransportMagazines{}; class TransportWeapons{}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 5; transportMaxMagazines = 25; transportmaxbackpacks = 4; @@ -261,14 +261,30 @@ class Citizen1; // External class reference class TransportWeapons{}; weapons[] = {}; magazines[] = {}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 3; transportMaxMagazines = 10; transportmaxbackpacks = 2; 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_DZ : ArmoredSUV_PMC { scope = 2; @@ -555,9 +571,9 @@ class Citizen1; // External class reference class TransportWeapons{}; weapons[] = {}; magazines[] = {}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 3; transportMaxMagazines = 20; transportmaxbackpacks = 5; @@ -1006,9 +1022,9 @@ class Citizen1; // External class reference weapons[] = {}; magazines[] = {}; gunnerHasFlares = false; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 10; transportMaxMagazines = 80; transportmaxbackpacks = 15; @@ -1046,14 +1062,56 @@ class Citizen1; // External class reference 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"; - transportFuel = 0; + model = "\ca\Structures_E\Ind\Ind_FuelStation\Ind_FuelStation_Feed_ep1.p3d"; + transportFuel = 0; nameSound = "fuelstation"; }; + + 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 + class Ship: AllVehicles { displayName = "Ship"; transportMaxMagazines = 2000; @@ -1116,9 +1174,9 @@ class Citizen1; // External class reference hiddenSelections[] = {}; class TransportMagazines{}; class TransportWeapons{}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 5; transportMaxMagazines = 25; transportmaxbackpacks = 4; @@ -1133,21 +1191,15 @@ class Citizen1; // External class reference hiddenSelections[] = {}; class TransportMagazines{}; class TransportWeapons{}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; + commanderCanSee = 2; + gunnerCanSee = 2; + driverCanSee = 2; transportMaxWeapons = 5; transportMaxMagazines = 25; transportmaxbackpacks = 4; }; - // Lingor hangars - //class land_ibr_hangar: land_ibr_hangar - //{ - // scope = 2; - // transportFuel = 0; - // transportRepair = 0; - //}; + }; \ No newline at end of file diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index fffdea9f1..663127021 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -553,7 +553,7 @@ class CfgBuildingLoot { { "PartWoodPile","magazine" }, { "WeaponHolder_ItemHatchet","object" }, { "MR43","weapon" }, - {"TrapBear","magazine"}, + //{"TrapBear","magazine"}, {"WeaponHolder_ItemMachete"} }; itemChance[] = { @@ -567,7 +567,7 @@ class CfgBuildingLoot { 0.11, 0.17, 0.06, - 0.01, + //0.01, 0.03 }; }; diff --git a/dayz_code/medical/transfusion.sqf b/dayz_code/medical/transfusion.sqf index 8df836b91..5fb326989 100644 --- a/dayz_code/medical/transfusion.sqf +++ b/dayz_code/medical/transfusion.sqf @@ -42,8 +42,8 @@ if (_finished) then { _unit setVariable["USEC_lowBlood",false,true]; player removeMagazine "ItemBloodbag"; - disableSerialization; - call dayz_forceSave; + //disableSerialization; + //call dayz_forceSave; //["usecTransfuse",[_unit,player]] call broadcastRpcCallAll; usecTransfuse = [_unit,player];