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

0.997 released

Browse Source 
+ Added new female pink clothes option.
+ Fixed counter issues with trade_items_wo_db
+ trade_items fixed return bars if trader is out of stock.
This commit is contained in:
vbawol
2013-03-16 17:29:22 -05:00
parent 8a83b8b611
commit b7885325b2
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dayz_code/actions/trade_items.sqf
View File

@@ -114,6 +114,11 @@ for "_x" from 1 to _total_trades do {
cutText [format[("Insufficient Stock %1"),_textPartOut] , "PLAIN DOWN"];
_abort = true;
// Return items taken
for "_x" from 1 to _removed do {
player addMagazine _part_in;
};
};
dayzTradeResult = nil;

5
dayz_code/actions/trade_items_wo_db.sqf
View File

@@ -27,13 +27,16 @@ if(_total_trades < 1) exitWith {
};
_abort = false;
_tradeCounter = 0;
// trade all items
for "_x" from 1 to _total_trades do {
_removed = 0;
if(_total_trades == 1) then {
_tradeCounter = _tradeCounter + 1;
if(_total_trades == 1) then {
cutText [format[("Starting trade, stand still to complete trade."),_tradeCounter,_total_trades] , "PLAIN DOWN"];
} else {
cutText [format[("Starting trade, stand still to complete trade %1 of %2."),_tradeCounter,_total_trades] , "PLAIN DOWN"];

4
dayz_code/config.cpp
View File

@@ -341,6 +341,10 @@ class CfgSurvival {
sex = "female";
playerModel = "SurvivorW2_DZ";
};
class Skin_SurvivorWpink_DZ: Default {
sex = "female";
playerModel = "SurvivorWpink_DZ";
};
class Skin_SurvivorW3_DZ: Default {
sex = "female";
playerModel = "SurvivorW3_DZ";

7
dayz_code/init/variables.sqf
View File

@@ -29,9 +29,12 @@ Drake_Light_DZ = "Drake_Light_DZ";
CZ_Special_Forces_GL_DES_EP1_DZ = "CZ_Special_Forces_GL_DES_EP1_DZ";
TK_INS_Soldier_EP1_DZ = "TK_INS_Soldier_EP1_DZ";
TK_INS_Warlord_EP1_DZ = "TK_INS_Warlord_EP1_DZ";
// new females
SurvivorWpink_DZ = "SurvivorWpink_DZ";
AllPlayers = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"];
AllPlayersVehicles = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"];
AllPlayers = ["SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"];
AllPlayersVehicles = ["SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"];
PZombie_VB = "PZombie_VB";

8
dayz_equip/config.cpp
View File

@@ -1115,7 +1115,13 @@ class CfgMagazines
displayName = "Civilian (female)";
descriptionShort = "Civilian (female)";
};
class Skin_SurvivorWpink_DZ: SkinBase
{
scope = 2;
displayName = "Civilian Pink (female)";
descriptionShort = "Civilian Pink (female)";
};
class Skin_TK_INS_Warlord_EP1_DZ: SkinBase
{
scope = 2;

BIN
dayz_equip/textures/GirlyGirl.paa Normal file
View File

Binary file not shown.

5
dayz_weapons/config.cpp
View File

@@ -1607,6 +1607,11 @@ class CfgVehicles
hiddenSelections[] = {"Camo"};
hiddenSelectionsTextures[] = {"\ca\characters_e\woman\baker\data\european_woman_01_co.paa"};
};
class SurvivorWpink_DZ: SurvivorW2_DZ
{
hiddenSelections[] = {"Camo"};
hiddenSelectionsTextures[] = {"\dayz_equip\textures\GirlyGirl.paa"};
};
class Citizen1;
class PZombie_VB: Citizen1
{