W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing string for infection death

Browse Source
This commit is contained in:
ebaydayz
2016-04-21 19:23:49 -04:00
parent 23b6ad2455
commit 6ea1df14cf
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGE LOG 1.0.6.txt
View File

@@ -30,7 +30,8 @@
[CHANGED] Several weapon, item and tool classnames changed. Admins see SQL\1.0.6_Updates @ebaydayz [CHANGED] Several weapon, item and tool classnames changed. Admins see SQL\1.0.6_Updates @ebaydayz
[CHANGED] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt [CHANGED] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
[CHANGED] Combattimeout now uses diag_tickTime instead of time. [CHANGED] Combattimeout now uses diag_tickTime instead of time.
[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox [CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev [CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock [CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock

15
SQF/dayz_code/actions/salvage_vehicle.sqf
View File

@@ -1,7 +1,9 @@
private ["_part","_color","_vehicle","_PlayerNear","_hitpoints","_cursorTarget","_isATV","_is6WheelType","_HasNoGlassKind", private ["_part","_color","_vehicle","_PlayerNear","_hitpoints","_isATV","_is6WheelType","_HasNoGlassKind",
"_6WheelTypeArray","_NoGlassArray","_NoExtraWheelsArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"]; "_6WheelTypeArray","_NoGlassArray","_NoExtraWheelsArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type","_isBicycle"];
_vehicle = _this select 3; _vehicle = _this select 3;
_isBicycle = _vehicle isKindOf "Bicycle";
if (_isBicycle) exitWith {}; // No salvage for now. Bicycle wheels should not give full size tires. Also model does not update to show removed wheels.
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; {dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
_PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1;
@@ -10,12 +12,11 @@ if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_l
dayz_myCursorTarget = _vehicle; dayz_myCursorTarget = _vehicle;
_hitpoints = _vehicle call vehicle_getHitpoints; _hitpoints = _vehicle call vehicle_getHitpoints;
_cursorTarget = cursorTarget; _type = typeOf _vehicle;
_type = typeOf _cursorTarget;
_isATV = _type in ["ATV_US_EP1","ATV_CZ_EP1"]; _isATV = _type in ["ATV_US_EP1","ATV_CZ_EP1"];
_is6WheelType = false; _is6WheelType = false;
{if (_type isKindOf _x) exitWith {_is6WheelType = true;};} count ["Kamaz_Base","MTVR","Ural_Base","Ural_Base_withTurret","V3S_Base"]; {if (_type isKindOf _x) exitWith {_is6WheelType = true;};} count ["Kamaz_Base","MTVR","Ural_Base","Ural_Base_withTurret","V3S_Base"];
_HasNoGlassKind = (_cursorTarget isKindOf "Motorcycle") or (_cursorTarget isKindOf "Bicycle"); _HasNoGlassKind = (_vehicle isKindOf "Motorcycle") or _isBicycle;
_6WheelTypeArray = ["HitLMWheel","HitRMWheel"]; _6WheelTypeArray = ["HitLMWheel","HitRMWheel"];
_NoGlassArray = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass"]; _NoGlassArray = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass"];
@@ -26,11 +27,11 @@ if (_isATV or _HasNoGlassKind) then {
_hitpoints = _hitpoints - _NoGlassArray; _hitpoints = _hitpoints - _NoGlassArray;
}; };
if (_cursorTarget isKindOf "tractor") then { if (_vehicle isKindOf "tractor") then {
_hitpoints = _hitpoints - ["motor","HitLFWheel","HitRFWheel","HitLBWheel","HitRBWheel","HitLF2Wheel","HitRF2Wheel","HitLMWheel","HitRMWheel"]; _hitpoints = _hitpoints - ["motor","HitLFWheel","HitRFWheel","HitLBWheel","HitRBWheel","HitLF2Wheel","HitRF2Wheel","HitLMWheel","HitRMWheel"];
}; };
if ((_cursorTarget isKindOf "Bicycle") or (_cursorTarget isKindOf "Motocycle")) then { if (_isBicycle or (_vehicle isKindOf "Motocycle")) then {
_hitpoints = _hitpoints - ["HitEngine","HitFuel"]; _hitpoints = _hitpoints - ["HitEngine","HitFuel"];
}; };

8
SQF/dayz_code/stringtable.xml
View File

@@ -7565,6 +7565,14 @@
<French>une déshydratation</French> <French>une déshydratation</French>
<Czech>na dehydrataci.</Czech> <Czech>na dehydrataci.</Czech>
</Key> </Key>
<Key ID="str_death_sick">
<English>infection</English>
<German>infektion</German>
<Russian>инфекционное заболевание</Russian>
<Spanish>infección</Spanish>
<French>maladie</French>
<Czech>nemoc</Czech>
</Key>
<Key ID="str_death_starve"> <Key ID="str_death_starve">
<English>starvation</English> <English>starvation</English>
<German>durch Verhungern.</German> <German>durch Verhungern.</German>