0.75 + 1.7.5.M1D21 with binaries and sql

This commit is contained in:
vbawol
2013-01-21 11:33:58 -06:00
parent 1cb4388089
commit bea64841eb
23 changed files with 226 additions and 98 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,79 @@
;This is a comment
;Comments above a certain setting will provide it's description
;The format for a setting is
;Variable = Value
;If you see a commented line of that form, it means that the setting is optional, and the Value shows the default
;To change from the default, simply uncomment the line and change the Value
;This configuration file should be placed inside your server instance's configuration directory (like cfgdayz)
[Time]
;Possible values: Local, Custom, Static
;You cannot use Static on OFFICIAL Hive, it will just revert to Local
Type = Custom
;If using Custom type, offset from UTC in hours (can be negative as well)
Offset = -3
;If using Static type (Hour value always the same on every server start), the value (0-24) to set the Hour to
;Hour = 8
[Database]
;Hostname or IP of the server to connect to
;If you leave this line commented or blank, HiveExt will connect to the OFFICIAL Hive, which requires registration
;See support.dayzmod.com for more information on what OFFICIAL Hive means, what are the rules, etc.
;If using OFFICIAL hive, the rest of the settings in this section have no effect
Host = localhost
;Currently, only MySQL is supported
Type = MySQL
;Port to connect to. The default is the default listening port of a server of the selected Type
;Instead of specifying Port, you can specify Socket and set Value to the socket name
Port = 3366
;Database name to connect to.
Database = dayz_epoch
;Username to connect with
Username = dayz
;Password to authenticate with (default is blank)
Password = 123456
;If using OFFICIAL hive, the settings in this section have no effect, appropriate layout will be used
[Characters]
;The field name that Player's IDs are stored in (unique per game license)
;Some table layouts have this as PlayerID, and some as PlayerUID, that's why this is configurable
;IDField = PlayerUID
;The field name that Player's World Position and rotation is stored in
;Enables you to run multiple different maps (different instances) off the same character table
;WSField = Worldspace
;If using OFFICIAL hive, the settings in this section have no effect, as it will clean up by itself
[Objects]
;Which table should the objects be stored and fetched from ?
;Table = Object_DATA
;Negative values will disable this feature
;0 means that ALL empty placed items will be deleted every server restart
;A positive number is how old (in days) a placed empty item must be, in order for it to be deleted
;CleanupPlacedAfterDays = 6
;Flag indicating whether hiveext should detect vehicles out of map boundaries (X < 0, or Y > 15360) and reset their position to []
;Note: YOU MUST have a proper dayz_server.pbo that supports this feature, otherwise you will get script errors
;You can find that file under the SQF directory for your server version
;ResetOOBVehicles = false
;If using OFFICIAL hive, the settings in this section have no effect, it will manage objects on its own
[ObjectDB]
;Setting this to true separates the Object fetches from the Character fetches
;That means that the Object Table must be on this other database
;Use = false
;The settings here have the same meaning as in [Database], and are only used if the setting above is set to true
;Type = MySQL
;Host = localhost
;Port = 3306
;Database = dayz
;Username = root
;Password =

Binary file not shown.

Binary file not shown.

View File

@@ -45516,7 +45516,7 @@ class CfgVehicles
};
class z_worker1: zZombie_Base
{
zombieLoot = "";
zombieLoot = "worker";
model = "\Ca\characters_E\Overall\Overall";
hiddenSelections[] = {"Camo"};
class Wounds
@@ -45548,7 +45548,7 @@ class CfgVehicles
};
class z_teacher: z_doctor
{
zombieLoot = "";
zombieLoot = "civilian";
hiddenSelectionsTextures[] = {"\dayz\textures\clothes\teacher_co.paa"};
};
class z_hunter: zZombie_Base

View File

@@ -96,7 +96,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
//_part = player addAction [_Display, "\z\addons\dayz_code\actions\trade_cancel.sqf",[], 0, true, false, "",""];
//_part = player addAction [_Display, _File,[_name,_bname,_out,_in,"buy",_textCurrency,_textPart,_header], _order, true, true, "",""];
} else {
_Display = format["Buy %1 for %2 %3 (Available: %4)", _textPart, _in, _textCurrency, _qty];
_Display = format["Buy %1 (%2) for %3 %4 (Available: %5)", _textPart, _name, _in, _textCurrency, _qty];
_part = player addAction [_Display, _File,[_name,_bname,_out,_in,"buy",_textCurrency,_textPart,_header], _order, true, true, "",""];
};

View File

@@ -8,15 +8,7 @@ _config = configFile >> "CfgSurvival" >> "Meat" >> _type;
player removeAction s_player_butcher;
s_player_butcher = -1;
_hasChance = 9 > random 100;
if (_hasKnife) then {
if (_hasChance) then {
player removeWeapon "ItemKnife";
player addWeapon "ItemKnifeBlunt";
cutText [localize "STR_EQUIP_CODE_DESC_4", "PLAIN DOWN"];
};
};
if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
//Get Animal Type

View File

@@ -2,21 +2,14 @@ private["_location","_isOk","_dir","_classname"];
private["_item"];
_item = _this;
call gear_ui_init;
_hasChance = 9 > random 100;
if (["forest",dayz_surfaceType] call fnc_inString) then {
if (!_hasChance) then {
_result = [player,"PartWoodPile"] call BIS_fnc_invAdd;
if (_result) then {
cutText [localize "str_player_25", "PLAIN DOWN"];
} else {
cutText [localize "str_player_24", "PLAIN DOWN"];
};
} else {
player removeWeapon "ItemHatchet";
player addWeapon "ItemBrokeHatchet";
cutText [localize "str_player_23", "PLAIN DOWN"];
}
} else {
cutText [localize "str_player_23", "PLAIN DOWN"];
};

View File

@@ -7,7 +7,7 @@ if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
if (vehicle player != player) exitWith {cutText ["You may not drink while in a vehicle", "PLAIN DOWN"]};
//Force players to wait 3 mins to drink again
if (dayz_lastDrink < 180) exitWith {cutText ["You may not drink, your not thirsty", "PLAIN DOWN"]};
//if (dayz_lastDrink < 180) exitWith {cutText ["You may not drink, your not thirsty", "PLAIN DOWN"]};
_item = _this;
_hasdrinkitem = _this in magazines player;

View File

@@ -6,7 +6,7 @@ if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
if (vehicle player != player) exitWith {cutText ["You may not eat while in a vehicle", "PLAIN DOWN"]};
//Force players to wait 3 mins to eat again
if (dayz_lastMeal < 180) exitWith {cutText ["You may not eat, you're already full", "PLAIN DOWN"]};
//if (dayz_lastMeal < 180) exitWith {cutText ["You may not eat, you're already full", "PLAIN DOWN"]};
_item = _this;
_hasfooditem = _this in magazines player;

View File

@@ -6,11 +6,9 @@ if ((_location select 2) < 0) then {
//_location set [2,0];
_isOk = true; //count (_location isFlatEmpty [0.3,0,0,4,0,false,player]) > 0;
_hasWood = "PartWoodPile" in magazines player;
_hasChance = 9 > random 100;
if (_hasWood) then {
if (_isOk) then {
if (!_hasChance) then {
player removeMagazine "PartWoodPile";
_dir = getDir player;
_classname = "Land_Fire_DZ";
@@ -23,11 +21,6 @@ if (_hasWood) then {
_id = _fire spawn player_fireMonitor;
cutText [localize "str_fireplace_01", "PLAIN DOWN"];
} else {
player removeWeapon "ItemMatchbox";
player addWeapon "ItemMatchboxEmpty";
cutText [localize "Your box of matches appear to be empty", "PLAIN DOWN"];
};
} else {
cutText [localize "str_fireplace_02", "PLAIN DOWN"];
};

View File

@@ -5,8 +5,8 @@ _action = _this select 2;
_caller removeAction _action;
_callerID = _caller getVariable ["characterID", "0"];
_targetID = _target getVariable ["characterID", "0"];
_callerID = _caller getVariable ["characterID", 0];
_targetID = _target getVariable ["characterID", 0];
if (_callerID != 0 && _targetID != 0) then {

View File

@@ -1,10 +1,12 @@
/*
_item spawn player_wearClothes;
TODO: female
Added Female skin changes - vbawol
*/
private["_item","_onLadder","_hasclothesitem","_config","_text","_isFemale","_myModel","_humanity","_isBandit","_isHero","_itemNew","_model"];
private["_item","_onLadder","_hasclothesitem","_config","_text","_isFemale","_myModel","_itemNew","_currentSex","_newSex","_model"];
_item = _this;
call gear_ui_init;
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
@@ -16,70 +18,30 @@ if (!_hasclothesitem) exitWith {cutText [format[(localize "str_player_31"),_text
if (vehicle player != player) exitWith {cutText ["You may not change clothes while in a vehicle", "PLAIN DOWN"]};
_isFemale = ((typeOf player == "SurvivorW2_DZ")||(typeOf player == "BanditW1_DZ"));
if (_isFemale) exitWith {cutText ["Currently Female Characters cannot change to this skin. This will change in a future update.", "PLAIN DOWN"]};
// _isFemale = ((typeOf player == "SurvivorW2_DZ")||(typeOf player == "BanditW1_DZ"));
// if (_isFemale) exitWith {cutText ["Currently Female Characters cannot change to this skin. This will change in a future update.", "PLAIN DOWN"]};
private["_itemNew","_myModel","_humanity","_isBandit","_isHero"];
_myModel = (typeOf player);
//_humanity = player getVariable ["humanity",0];
//_isBandit = _humanity < -2000;
//_isHero = _humanity > 5000;
_itemNew = "Skin_" + _myModel;
if ( !(isClass(_config >> _itemNew)) ) then {
_itemNew = if (!_isFemale) then {"Skin_Survivor2_DZ"} else {"Skin_SurvivorW2_DZ"};
};
if ( (isClass(_config >> _itemNew)) ) then {
if ( (isClass(_config >> _item)) ) then {
// Current sex of player skin
switch (_item) do {
case "Skin_Sniper1_DZ": {
_model = "Sniper1_DZ";
};
case "Skin_Camo1_DZ": {
_model = "Camo1_DZ";
};
case "Skin_Rocket_DZ": {
_model = "Rocket_DZ";
};
case "Skin_RU_Policeman_DZ": {
_model = "RU_Policeman_DZ";
};
case "Skin_Pilot_EP1_DZ": {
_model = "Pilot_EP1_DZ";
};
case "Skin_Haris_Press_EP1_DZ": {
_model = "Haris_Press_EP1_DZ";
};
case "Skin_Ins_Soldier_GL_DZ": {
_model = "Ins_Soldier_GL_DZ";
};
case "Skin_GUE_Commander_DZ": {
_model = "GUE_Commander_DZ";
};
case "Skin_Functionary1_EP1_DZ": {
_model = "Functionary1_EP1_DZ";
};
case "Skin_Priest_DZ": {
_model = "Priest_DZ";
};
case "Skin_Rocker2_DZ": {
_model = "Rocker2_DZ";
};
case "Skin_Soldier1_DZ": {
_model = "Soldier1_DZ";
};
case "Skin_Survivor2_DZ": {
_model = "Survivor2_DZ";
};
case "Skin_Bandit1_DZ": {
_model = "Bandit1_DZ";
};
case "Skin_Survivor3_DZ": {
_model = "Survivor3_DZ";
};
};
if (_model != _myModel) then {
_currentSex = getText (configFile >> "CfgSurvival" >> "Skins" >> _itemNew >> "sex");
// Sex of new skin
_newSex = getText (configFile >> "CfgSurvival" >> "Skins" >> _item >> "sex");
if(_currentSex == _newSex) then {
// Get model name from config
_model = getText (configFile >> "CfgSurvival" >> "Skins" >> _item >> "playerModel");
if (_model != _myModel) then {
player removeMagazine _item;
player addMagazine _itemNew;
[dayz_playerUID,dayz_characterID,_model] spawn player_humanityMorph;
};
} else {
cutText ["You cannot wear a skin of the opposite sex.", "PLAIN DOWN"];
};
};
};

View File

@@ -57,6 +57,9 @@ if (_qty >= _qty_in) then {
_veh setVariable ["characterID",dayz_playerUID,true];
clearWeaponCargoGlobal _veh;
clearMagazineCargoGlobal _veh;
["dayzPublishVeh",[_veh,[_dir,_location],_part_out,false,dayz_playerUID]] call callRpcProcedure;
cutText [format[("Bought %3 %4 for %1 %2"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];

View File

@@ -57,6 +57,9 @@ if (_qty >= _qty_in) then {
_veh setVariable ["characterID",dayz_playerUID,true];
clearWeaponCargoGlobal _veh;
clearMagazineCargoGlobal _veh;
["dayzPublishVeh",[_veh,[_dir,_location],_part_out,false,dayz_playerUID]] call callRpcProcedure;
cutText [format[("Bought %3 %4 for %1 %2"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];

View File

@@ -305,4 +305,48 @@ class CfgLoot {
0.01
}
};
worker[] = {
{
"ItemMatchboxEmpty",
"ItemMatchboxWet",
"TrashTinCan",
"TrashJackDaniels",
"ItemSodaEmpty",
"ItemSodaCoke",
"ItemSodaPepsi",
"FoodCanBakedBeans",
"FoodCanSardines",
"FoodCanFrankBeans",
"FoodCanPasta",
"8Rnd_9x18_Makarov",
"7Rnd_45ACP_1911",
"2Rnd_shotgun_74Slug",
"2Rnd_shotgun_74Pellets",
"ItemBandage",
"ItemPainkiller",
"ItemToolbox",
"ItemEtool"
},
{
0.05,
0.05,
0.09,
0.09,
0.09,
0.12,
0.09,
0.05,
0.05,
0.05,
0.05,
0.07,
0.05,
0.05,
0.05,
0.06,
0.06,
0.01,
0.01
}
};
};

View File

@@ -365,15 +365,17 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
// [_trader_id, _category, ];
_cantrader = player addAction ["Trade 3 Empty Soda Cans for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar"], 99, true, true, "",""];
_cantrader1 = player addAction ["Trade 3 Empty Tin Cans for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar"], 99, true, true, "",""];
_cantrader2 = player addAction ["Trade 1 Empty Wiskey Bottle for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar"], 99, true, true, "",""];
s_player_parts set [count s_player_parts,_cantrader];
s_player_parts set [count s_player_parts,_cantrader1];
s_player_parts set [count s_player_parts,_cantrader2];
_can_trader_menu = [["Food and Drinks",51],["Backpacks",52],["Toolbelt",53],["Clothes",54]];
{
// _title = _x select 0;
// _traderid = _x select 1;
// buy_or_sell.sqf [_trader_id, _category, ];
_buy = player addAction [(_x select 0), "\z\addons\dayz_code\actions\buy_or_sell.sqf",[(_x select 1),(_x select 0)], 99, true, false, "",""];
_buy = player addAction [(_x select 0), "\z\addons\dayz_code\actions\buy_or_sell.sqf",[(_x select 1),(_x select 0)], 98, true, false, "",""];
s_player_parts set [count s_player_parts,_buy];
} forEach _can_trader_menu;
@@ -390,15 +392,17 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
// [_trader_id, _category, ];
_cantrader = player addAction ["Trade 3 Empty Soda Cans for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar"], 99, true, true, "",""];
_cantrader1 = player addAction ["Trade 3 Empty Tin Cans for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar"], 99, true, true, "",""];
_cantrader2 = player addAction ["Trade 1 Empty Wiskey Bottle for 1 Copper", "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar"], 99, true, true, "",""];
s_player_parts set [count s_player_parts,_cantrader];
s_player_parts set [count s_player_parts,_cantrader1];
s_player_parts set [count s_player_parts,_cantrader2];
_can_trader_2_menu = [["Food and Drinks",5151],["Backpacks",5252],["Toolbelt",5353],["Clothes",5454]];
{
// _title = _x select 0;
// _traderid = _x select 1;
// buy_or_sell.sqf [_trader_id, _category, ];
_buy = player addAction [(_x select 0), "\z\addons\dayz_code\actions\buy_or_sell.sqf",[(_x select 1),(_x select 0)], 99, true, false, "",""];
_buy = player addAction [(_x select 0), "\z\addons\dayz_code\actions\buy_or_sell.sqf",[(_x select 1),(_x select 0)], 98, true, false, "",""];
s_player_parts set [count s_player_parts,_buy];
} forEach _can_trader_2_menu;

View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayzmod.com";
version = "1.7.5.M1D15";
version = "0.7.5.M1D21";
hiveVersion = 0.96; //0.93
};
};
@@ -220,6 +220,62 @@ class CfgSurvival {
rawfoodtype = "FoodrabbitRaw";
};
};
class Skins {
class Default {
sex = "male";
playerModel = "Survivor2_DZ";
};
class Skin_Survivor2_DZ: Default {
sex = "male";
playerModel = "Survivor2_DZ";
};
class Skin_Sniper1_DZ: Default {
sex = "male";
playerModel = "Sniper1_DZ";
};
class Skin_Rocket_DZ: Default {
sex = "male";
playerModel = "Rocket_DZ";
};
class Skin_Soldier1_DZ: Default {
sex = "male";
playerModel = "Soldier1_DZ";
};
class Skin_RU_Policeman_DZ: Default {
sex = "male";
playerModel = "RU_Policeman_DZ";
};
class Skin_Pilot_EP1_DZ: Default {
sex = "male";
playerModel = "Pilot_EP1_DZ";
};
class Skin_Haris_Press_EP1_DZ: Default {
sex = "male";
playerModel = "Haris_Press_EP1_DZ";
};
class Skin_Ins_Soldier_GL_DZ: Default {
sex = "male";
playerModel = "Ins_Soldier_GL_DZ";
};
class Skin_GUE_Commander_DZ: Default {
sex = "male";
playerModel = "GUE_Commander_DZ";
};
class Skin_Functionary1_EP1_DZ: Default {
sex = "male";
playerModel = "Functionary1_EP1_DZ";
};
class Skin_Priest_DZ: Default {
sex = "male";
playerModel = "Priest_DZ";
};
class Skin_Rocker2_DZ: Default {
sex = "male";
playerModel = "Rocker2_DZ";
};
};
};
class CfgBuildingLoot {

View File

@@ -5,7 +5,7 @@ _injured = _unit getVariable ["USEC_injured", false];
_inPain = _unit getVariable ["USEC_inPain", false];
_lastused = _unit getVariable ["LastTransfusion", time];
if (_lastused - time < 600) exitwith {cutText [format[(localize "str_actions_medical_18"),_text] , "PLAIN DOWN"]};
// if (_lastused - time < 600) exitwith {cutText [format[(localize "str_actions_medical_18"),_text] , "PLAIN DOWN"]};
call fnc_usec_medic_removeActions;
r_action = false;

View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ 1.7.5.M1D15";
text = "DayZ Epoch 0.7 (1.7.5.M1D21)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
class CA_TitleMainMenu;

View File

@@ -127,7 +127,6 @@ server_characterSync = {
//onPlayerConnected "[_uid,_name] spawn server_onPlayerConnect;";
onPlayerDisconnected "[_uid,_name] call server_onPlayerDisconnect;";
// Setup globals allow overwrite from init.sqf
if(isnil "dayz_MapArea") then {
dayz_MapArea = 10000;

View File

@@ -221,7 +221,7 @@ _vehLimit = MaxVehicleLimit - _totalvehicles;
diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit));
if(_vehLimit > 0) then {
for "_x" from 1 to _vehLimit do {
_id = [] spawn spawn_vehicles; // Needs setup
_id = [] spawn spawn_vehicles;
waitUntil{scriptDone _id};
};
};