Skip to content
This repository has been archived by the owner on Dec 26, 2021. It is now read-only.

Commit

Permalink
Preparations for release (0.9.9a)
Browse files Browse the repository at this point in the history
  • Loading branch information
mtadayz committed Apr 28, 2017
1 parent 991c9de commit 0617c12
Show file tree
Hide file tree
Showing 16 changed files with 121 additions and 13 deletions.
2 changes: 1 addition & 1 deletion DayZ/gui/gear/functions_gear.lua
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ function playerUseItem(itemName,itemInfo)
triggerServerEvent("onPlayerChangeClothes",localPlayer)
end
else
if itemName == "Military collar" or itemName == "Africa collar" or itemName == "LS collar" or itemName == "Gold collar" or itemName == "Silver collar" or itemName == "Black Bandana (M)" or itemName == "Blue Bandana (M)" or itemName == "Green Bandana (M)" or itemName == "Red Bandana (M)" or itemName == "Dark Glasses" or itemName == "Red Glasses" or itemName == "Square Glasses" or itemName == "Black Bandana (H)" or itemName == "Blue Bandana (H)" or itemName == "Green Bandana (H)" or itemName == "Red Bandana (H)" or itemName == "Black Beret" or itemName == "Red Beret" or itemName == "Old Hat" or itemName == "Black Hat" or itemName == "Yellow Hat" or itemName == "Black Trucker" or itemName == "Blue Trucker" or itemName == "Green Trucker" or itemName == "Red Trucker" or itemName == "Yellow Trucker" or itemName == "Cow-Boy Hat" or itemName == "White Hat" or itemName == "Hockey Mask" or itemName == "Black Shoe" or itemName == "Sport Shoe" or itemName == "Brown Shoe" or itemName == "Biker Shoe" or itemName == "Blue Shoe" or itemName == "Red Shoe" or itemName == "Beach Shoe" or itemName == "Black Pants" or itemName == "Beige Pants" or itemName == "Gray Shorts" or itemName == "Blue Shorts" or itemName == "Blue Jeans" or itemName == "Green Jeans" or itemName == "Gray Pants" or itemName == "Yellow Pants" or itemName == "Blue Jogging" or itemName == "Gray Jogging" or itemName == "Military Pants" or itemName == "Beige Vest" or itemName == "Baseball Shirt" or itemName == "Baseball 2 Shirt" or itemName == "Red Vest" or itemName == "Grey Shirt" or itemName == "Green Vest" or itemName == "Hawai Shirt" or itemName == "Black Vest" or itemName == "Brown Vest" or itemName == "Biker Vest" or itemName == "Blue Shirt" or itemName == "Green 2 Vest" or itemName == "Number 5 Shirt" or itemName == "Monk Shirt" or itemName == "Helmet" or itemName == "MX Helmet" then
if itemName == "Military collar" or itemName == "Africa collar" or itemName == "LS collar" or itemName == "Gold collar" or itemName == "Silver collar" or itemName == "Black Bandana (M)" or itemName == "Blue Bandana (M)" or itemName == "Green Bandana (M)" or itemName == "Red Bandana (M)" or itemName == "Dark Glasses" or itemName == "Red Glasses" or itemName == "Square Glasses" or itemName == "Black Bandana (H)" or itemName == "Blue Bandana (H)" or itemName == "Green Bandana (H)" or itemName == "Red Bandana (H)" or itemName == "Black Beret" or itemName == "Red Beret" or itemName == "Old Hat" or itemName == "Black Hat" or itemName == "Yellow Hat" or itemName == "Black Trucker" or itemName == "Blue Trucker" or itemName == "Green Trucker" or itemName == "Red Trucker" or itemName == "Yellow Trucker" or itemName == "Cow-Boy Hat" or itemName == "White Hat" or itemName == "Hockey Mask" or itemName == "Black Shoe" or itemName == "Sport Shoe" or itemName == "Brown Shoe" or itemName == "Biker Shoe" or itemName == "Blue Shoe" or itemName == "Red Shoe" or itemName == "Beach Shoe" or itemName == "Black Pants" or itemName == "Beige Pants" or itemName == "Gray Shorts" or itemName == "Blue Shorts" or itemName == "Blue Jeans" or itemName == "Green Jeans" or itemName == "Gray Pants" or itemName == "Yellow Pants" or itemName == "Blue Jogging" or itemName == "Gray Jogging" or itemName == "Military Pants" or itemName == "Beige Vest" or itemName == "Baseball Shirt" or itemName == "Baseball 2 Shirt" or itemName == "Red Vest" or itemName == "Grey Shirt" or itemName == "Green Vest" or itemName == "Hawai Shirt" or itemName == "Black Vest" or itemName == "Brown Vest" or itemName == "Biker Vest" or itemName == "Blue Shirt" or itemName == "Green 2 Vest" or itemName == "Number 5 Shirt" or itemName == "Monk Shirt" then
triggerEvent("displayClientInfo", localPlayer, "Clothes", "You can't wear this!", 255, 0, 0)
return
else
Expand Down
Binary file added DayZ/gui/status/misc/helmet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions DayZ/gui/status/player_status.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,16 @@ function updateStatusIcons()
dxDrawImage ( screenWidth*0.94 , screenHeight*0.63, screenHeight*0.065, screenHeight*0.065, ":DayZ/gui/status/misc/background.png",0,0,0)
dxDrawImage ( screenWidth*0.943 , screenHeight*0.63, screenHeight*0.055, screenHeight*0.055, ":DayZ/gui/status/humanity/"..h_number..".png",0,0,0)
]]
-- Helmet
if not gameplayVariables["newclothingsystem"] then
if getElementData(localPlayer,"hasHelmet") then
dxDrawImage ( screenWidth*0.94 , screenHeight*0.63, screenHeight*0.065, screenHeight*0.065, ":DayZ/gui/status/misc/background.png",0,0,0)
dxDrawImage ( screenWidth*0.943 , screenHeight*0.63, screenHeight*0.055, screenHeight*0.055, ":DayZ/gui/status/misc/helmet.png",0,0,0)
end
end
-- Temperature
local temperature = math.round(getElementData(localPlayer,"temperature"),2)
--local temperature = math.round(playerDynamicTable.playerTemperature,2)
local status = getElementData(localPlayer,"temperature_status") or 0
r,g,b = 0,255,0
local t_number = 3
Expand Down Expand Up @@ -89,6 +97,7 @@ function updateStatusIcons()
-- Thirst
r,g,b = 0,255,0
local thirst = getElementData(localPlayer,"thirst")
--local thirst = playerDynamicTable.playerWater
local thirst_coloring = getElementData(localPlayer,"thirst")*2.55
r,g,b = 255-thirst_coloring,thirst_coloring,0
local thirst_icon = ":DayZ/gui/status/thirst/100.png"
Expand Down Expand Up @@ -117,6 +126,7 @@ function updateStatusIcons()
-- Blood
r,g,b = 0,255,0
local blood = getElementData(localPlayer,"blood")
--local blood = playerDynamicTable.playerBlood
local blood_coloring = getElementData(localPlayer,"blood")/47.2
r,g,b = 255-blood_coloring,blood_coloring,0
local blood_icon = ":DayZ/gui/status/blood/12000.png"
Expand All @@ -139,6 +149,7 @@ function updateStatusIcons()
-- Food
r,g,b = 0,255,0
local food = getElementData(localPlayer,"food")
--local food = playerDynamicTable.playerFood
local food_coloring = getElementData(localPlayer,"food")*2.55
r,g,b = 255-food_coloring,food_coloring,0
local food_icon = ":DayZ/gui/status/hunger/100.png"
Expand Down Expand Up @@ -167,12 +178,15 @@ function updateStatusIcons()
-- // Status Symbols (Broken bone, pain, bleeding, ...)
-- Broken bone
if getElementData(localPlayer,"brokenbone") then
--if playerDynamicTable.playerBrokenBone then
dxDrawImage ( screenWidth*0.9375 , screenHeight*0.55, screenHeight*0.065, screenHeight*0.065, ":DayZ/gui/status/misc/brokenbone.png",0,0,0)
end
if getElementData(localPlayer,"bleeding") > 0 then
--if playerDynamicTable.playerBleeding > 0 then
dxDrawImage ( screenWidth*0.94 , screenHeight*0.85, screenHeight*0.065, screenHeight*0.065, ":DayZ/gui/status/misc/medic.png",0,0,0,tocolor(255,255,255,fading))
end
if getElementData(localPlayer,"infection") or getElementData(localPlayer,"sepsis") and getElementData(localPlayer,"sepsis") > 0 then
--if playerDynamicTable.playerInfection or playerDynamicTable.playerSepsis and playerDynamicTable.playerSepsis > 0 then
dxDrawImage ( screenWidth*0.94 , screenHeight*0.85, screenHeight*0.065, screenHeight*0.065, ":DayZ/gui/status/blood/infection.png",0,0,0)
end
local x,y,z = getElementPosition(localPlayer)
Expand Down
34 changes: 25 additions & 9 deletions DayZ/handlers/players/client/damage_player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,33 @@ function dayZPlayerDamage(attacker,weapon,bodypart,loss)
playSound(":DayZ/sounds/status/bonecrack.mp3",false)
playSFX("pain_a",2,95,false)
elseif bodypart == 9 then
local hasHelmet = getPedClothes(localPlayer,16)
if hasHelmet == "helmet" or hasHelmet == "moto" then
if weapon ~=34 then
damage = 0
playSFX("genrl",20,12,false)
else
damage = damage*gameplayVariables["headshotdamage_player"]
headshot = true
playSFX("pain_a",2,38,false)
local hasHelmet
if gameplayVariables["newclothingsystem"] then
hasHelmet = getPedClothes(localPlayer,16)
if hasHelmet == "helmet" or hasHelmet == "moto" then
if weapon ~=34 then
damage = 0
playSFX("genrl",20,12,false)
else
damage = damage*gameplayVariables["headshotdamage_player"]
headshot = true
playSFX("pain_a",2,38,false)
end
end
else
hasHelmet = getElementData(localPlayer,"hasHelmet")
if hasHelmet then
if weapon ~=34 then
damage = 0
playSFX("genrl",20,12,false)
else
damage = damage*gameplayVariables["headshotdamage_player"]
headshot = true
playSFX("pain_a",2,38,false)
end
end
end

end
if getElementData(localPlayer,"humanity") >= 5000 then
if damage <= 1000 then
Expand Down
5 changes: 5 additions & 0 deletions DayZ/handlers/players/server/skins_player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,11 @@ function getSkinNameFromID(id)
end

function addPlayerSkin(skin)
if skin == "MX Helmet" or skin == "Helmet" then
setElementData(source,"hasHelmet",true)
setElementData(source,skin,getElementData(source,skin)-1)
return
end
local current = getElementData(source,"skin")
local name = getSkinNameFromID(current)
local id = getSkinIDFromName(skin)
Expand Down
1 change: 1 addition & 0 deletions DayZ/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@
<file src="gui/status/misc/dead.jpg" />
<file src="gui/status/misc/hourglass.png" />
<file src="gui/status/misc/circle.png" />
<file src="gui/status/misc/helmet.png" />
<file src="gui/status/blood/blood_border.png" />
<file src="gui/status/blood/12000.png" />
<file src="gui/status/blood/10000.png" />
Expand Down
24 changes: 23 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,25 @@ This changelog lists all changes made to MTA DayZ. It adheres to the following f
### REMOVED: For deprecated features removed in the release it's mentioned in

# - #
## [0.9.9a] - 2017-MM-DD
## [0.9.9a] - 2017-04-28
### ADDED: New Sound + Visibility System (based on terrain, weather, light, movement)
### ADDED: New zombie spawn system based on loot location
### ADDED: Petrol stations now have a limited amount of fuel (configurable in cfgServer.lua)
### ADDED: Achievement System
### ADDED: Anti-Advertising for chat system
### ADDED: Indicators for temperature rising/falling
### ADDED: Occasional rain when weather is cloudy
### ADDED: MySQL implementation
### ADDED: Old clothes/skin system
### ADDED: New condition (fractured arms)
### ADDED: Vehicle respawn command
### ADDED: Setting for camera sway when in pain
### ADDED: Helmets for headshots
### ADDED: [DayZAdmin] Ability to change gameplayVariables ingame
### ADDED: Binds for GPS (Key: 7) and Compass (Key: 8)
### ADDED: Spawn Selection System
### ADDED: Randomized loot spots
### ADDED: Random clothes on spawn if clothes system is activated
### CHANGED: Logs System refactored
### CHANGED: Simplified player spawning code
### CHANGED: Simplified vehicle spawning code (makes it easier to add new vehicles)
Expand All @@ -27,6 +39,10 @@ This changelog lists all changes made to MTA DayZ. It adheres to the following f
### CHANGED: Version rewrite, tree handling optimised
### CHANGED: Hunger & Thirst now decrease according to difficulty too
### CHANGED: Moved debug monitor to Journal (Key: 6)
### CHANGED: New damage code for players
### CHANGED: Some zombies will sprint (depends on difficulty)
### CHANGED: Kills have to be confirmed with "Check Body" (player kills only)
### CHANGED: First Person Mode (view can be rotated 360°)
### FIXED: consume_player.lua causing lots of errors
### FIXED: Bug with tree chopping
### FIXED: Hunger & Thirst not decreasing
Expand All @@ -37,7 +53,13 @@ This changelog lists all changes made to MTA DayZ. It adheres to the following f
### FIXED: Milk breaking inventory
### FIXED: Unconscious animation being clientside only
### FIXED: M1911 not having a firing sound
### FIXED: Old bug with damage when falling
### FIXED: Floating medical box in Fort Carson
### FIXED: Constant raining
### FIXED: Hunger and Thirst not really decreasing
### FIXED: M24 not having any sound
### REMOVED: Viral zombies (until a better solution is found for more dangerous zombies)
### REMOVED: Housing mod

# - #
## [0.9.8.1a] - 2017-02-18
Expand Down
Binary file modified login/dayzsoundtrack.mp3
Binary file not shown.
Binary file modified login/images/background_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified login/images/background_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified login/images/background_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified login/images/background_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified login/images/background_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion login/login_client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function showLogin()
--guiRadioButtonSetSelected(Login_Edit[5],true)
guiEditSetMasked(Login_Edit[2],true)
guiEditSetMasked(Login_Edit[4],true)
if number == 2 or number == 4 or number == 5 then
if number == 2 or number == 5 then
guiLabelSetColor(title_label,0,0,0)
guiLabelSetColor(version_label,0,0,0)
else
Expand Down
2 changes: 1 addition & 1 deletion login/login_server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ addEventHandler("onClientSendRegisterDataToServer", getRootElement(), tryToRegsi
function pullChangelog(news)
local player = client -- idk how to send it correctly to function()
if news then
fetchRemote("https://raw.githubusercontent.com/ciber96/mtadayz/master/changelog.txt",function(data,err)
fetchRemote("https://raw.githubusercontent.com/ciber96/mtadayz/master/news.txt",function(data,err)
triggerClientEvent(player,"loadAPIData",player,"changelog",data)
end)
end
Expand Down
50 changes: 50 additions & 0 deletions news.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[0.9.9a] - 2017-04-28
ADDED: New Sound + Visibility System (based on terrain, weather, light, movement)
ADDED: New zombie spawn system based on loot location
ADDED: Petrol stations now have a limited amount of fuel (configurable in cfgServer.lua)
ADDED: Achievement System
ADDED: Anti-Advertising for chat system
ADDED: Indicators for temperature rising/falling
ADDED: Occasional rain when weather is cloudy
ADDED: MySQL implementation
ADDED: Old clothes/skin system
ADDED: New condition (fractured arms)
ADDED: Vehicle respawn command
ADDED: Setting for camera sway when in pain
ADDED: Helmets for headshots
ADDED: [DayZAdmin] Ability to change gameplayVariables ingame
ADDED: Binds for GPS (Key: 7) and Compass (Key: 8)
ADDED: Spawn Selection System
ADDED: Randomized loot spots
ADDED: Random clothes on spawn if clothes system is activated
CHANGED: Logs System refactored
CHANGED: Simplified player spawning code
CHANGED: Simplified vehicle spawning code (makes it easier to add new vehicles)
CHANGED: Simplified sound code
CHANGED: Custom chat can now be toggled on/off (/chat)
CHANGED: Eased lag a bit
CHANGED: Updated how Helicrashes and hospital bags were being initialised
CHANGED: Version rewrite, tree handling optimised
CHANGED: Hunger & Thirst now decrease according to difficulty too
CHANGED: Moved debug monitor to Journal (Key: 6)
CHANGED: New damage code for players
CHANGED: Some zombies will sprint (depends on difficulty)
CHANGED: Kills have to be confirmed with "Check Body" (player kills only)
CHANGED: First Person Mode (view can be rotated 360°)
FIXED: consume_player.lua causing lots of errors
FIXED: Bug with tree chopping
FIXED: Hunger & Thirst not decreasing
FIXED: Bug with setPedStat
FIXED: Flashlight appearing on HUD with ammo count
FIXED: Bug where player would continue to lose blood after becoming unconscious and being killed
FIXED: Crafting getting bugged when inventory is full
FIXED: Milk breaking inventory
FIXED: Unconscious animation being clientside only
FIXED: M1911 not having a firing sound
FIXED: Old bug with damage when falling
FIXED: Floating medical box in Fort Carson
FIXED: Constant raining
FIXED: Hunger and Thirst not really decreasing
FIXED: M24 not having any sound
REMOVED: Viral zombies (until a better solution is found for more dangerous zombies)
REMOVED: Housing mod

0 comments on commit 0617c12

Please sign in to comment.