jonny_bro/beatrun
1
0
Fork 0
mirror of https://github.com/JonnyBro/beatrun.git synced 2025-01-08 01:53:01 +05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: jonny_bro:708520d008f8ed914426f7a78b5666bb74992d57
Branches Tags
jonny_bro:main
jonny_bro:dev
..
compare: jonny_bro:6169712625b9a64a35580b2aa16392484a893d7c
Branches Tags
jonny_bro:main
jonny_bro:dev

No commits in common. "708520d008f8ed914426f7a78b5666bb74992d57" and "6169712625b9a64a35580b2aa16392484a893d7c" have entirely different histories.
708520d008 ... 6169712625

7 changed files with 33 additions and 27 deletions
Show stats Expand all files Collapse all files

7
beatrun/gamemodes/beatrun/entities/entities/br_laser/shared.lua
View file

@ -63,9 +63,10 @@ function ENT:BRCollisionFunc(ent)
if util.QuickTrace(self:GetPos(), ang:Up() * self.LaserLength, self).Entity ~= ent then return false end if util.QuickTrace(self:GetPos(), ang:Up() * self.LaserLength, self).Entity ~= ent then return false end
local dmginfo = DamageInfo() local dmginfo = DamageInfo()
dmginfo:SetAttacker(self) dmginfo:SetAttacker(self)
dmginfo:SetDamage(1000) dmginfo:SetDamage(1000)
dmginfo:SetDamageType(DMG_DISSOLVE) dmginfo:SetDamageType(DMG_DISSOLVE)
ent:TakeDamageInfo(dmginfo) ent:TakeDamageInfo(dmginfo)
ent:EmitSound("bigspark" .. math.random(1, 2) .. ".wav") ent:EmitSound("bigspark" .. math.random(1, 2) .. ".wav")

13
beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua
View file

@ -495,12 +495,13 @@ function SWEP:PrimaryAttack()
if SERVER and IsValid(ent) then if SERVER and IsValid(ent) then
if not ply:IsPlayer() or (Course_Name == "" and not GetGlobalBool("GM_INFECTION")) then if not ply:IsPlayer() or (Course_Name == "" and not GetGlobalBool("GM_INFECTION")) then
local d = DamageInfo() local d = DamageInfo()
d:SetDamage((punch ~= 3 and 10) or 20) d:SetDamage((punch ~= 3 and 10) or 20)
d:SetAttacker(ply) d:SetAttacker(ply)
d:SetInflictor(self) d:SetInflictor(self)
d:SetDamageType(DMG_CLUB) d:SetDamageType(DMG_CLUB)
d:SetDamagePosition(tr.start) d:SetDamagePosition(tr.start)
d:SetDamageForce(ply:EyeAngles():Forward() * 7000) d:SetDamageForce(ply:EyeAngles():Forward() * 7000)
ent:TakeDamageInfo(d) ent:TakeDamageInfo(d)
if ent:IsNPC() then if ent:IsNPC() then

11
beatrun/gamemodes/beatrun/gamemode/sh/FreerunSysAll.lua
View file

@ -196,14 +196,15 @@ hook.Add("OnPlayerHitGround", "MELandSound", function(ply, water, floater, speed
end end
if SERVER and speed >= 500 and ply:GetJumpTurn() then if SERVER and speed >= 500 and ply:GetJumpTurn() then
local info = DamageInfo()
local dmg = ply:Health() * 0.1 local dmg = ply:Health() * 0.1
if ply:Health() - dmg > 0 then if ply:Health() - dmg > 0 then
local info = DamageInfo() info:SetDamage(dmg)
info:SetDamage(dmg) info:SetDamageType(DMG_FALL)
info:SetDamageType(DMG_FALL) info:SetAttacker(game.GetWorld())
info:SetAttacker(game.GetWorld()) info:SetInflictor(game.GetWorld())
info:SetInflictor(game.GetWorld())
ply:TakeDamageInfo(info) ply:TakeDamageInfo(info)
end end
end end

13
beatrun/gamemodes/beatrun/gamemode/sh/Melee.lua
View file

@ -191,12 +191,13 @@ local function MeleeThink(ply, mv, cmd)
if SERVER and IsValid(ent) and (not ent:IsPlayer() or Course_Name == "" and not GetGlobalBool("GM_INFECTION") and GetConVar("sbox_playershurtplayers"):GetBool()) then if SERVER and IsValid(ent) and (not ent:IsPlayer() or Course_Name == "" and not GetGlobalBool("GM_INFECTION") and GetConVar("sbox_playershurtplayers"):GetBool()) then
local d = DamageInfo() local d = DamageInfo()
d:SetDamage(meleedata[ply:GetMelee()][6]) d:SetDamage(meleedata[ply:GetMelee()][6])
d:SetAttacker(ply) d:SetAttacker(ply)
d:SetInflictor(ply) d:SetInflictor(ply)
d:SetDamageType(DMG_CLUB) d:SetDamageType(DMG_CLUB)
d:SetDamagePosition(tr.start) d:SetDamagePosition(tr.start)
d:SetDamageForce(ply:EyeAngles():Forward() * 7000) d:SetDamageForce(ply:EyeAngles():Forward() * 7000)
ent:TakeDamageInfo(d) ent:TakeDamageInfo(d)
if SERVER and ent:GetClass() == "func_breakable_surf" then if SERVER and ent:GetClass() == "func_breakable_surf" then

12
beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua
View file

@ -321,10 +321,12 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd)
ply:SetCrouchJump(false) ply:SetCrouchJump(false)
if SERVER and mv:GetVelocity().z <= -1250 and not ply:InOverdrive() then if SERVER and mv:GetVelocity().z <= -1250 then
local dmg = DamageInfo() local dmg = DamageInfo()
dmg:SetDamageType(DMG_FALL)
dmg:SetDamage(1000) dmg:SetDamageType(DMG_FALL)
dmg:SetDamage(1000)
ply:TakeDamageInfo(dmg) ply:TakeDamageInfo(dmg)
end end
end end
@ -518,8 +520,8 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd)
if not slippery and pos.z > ply:GetSlidingLastPos().z + 1 then if not slippery and pos.z > ply:GetSlidingLastPos().z + 1 then
ply:SetSlidingTime(ply:GetSlidingTime() - 0.025) ply:SetSlidingTime(ply:GetSlidingTime() - 0.025)
elseif slippery or slidedelta < 1 and pos.z < ply:GetSlidingLastPos().z - 0.25 then elseif slippery or slidedelta < 1 and pos.z < ply:GetSlidingLastPos().z - 0.25 then
ply:SetSlidingTime(CT + slidetime) --[[ GetConVar("Beatrun_SpeedLimit"):GetInt() ]] ply:SetSlidingTime(CT + slidetime) --[[ 450 * ply:GetOverdriveMult() ]]
ply:SetSlidingVel(math.min(mv:GetVelocity():Length() * 0.865, 450 * ply:GetOverdriveMult())) ply:SetSlidingVel(math.min(mv:GetVelocity():Length() * 0.865, GetConVar("Beatrun_SpeedLimit"):GetInt() * 2) * ply:GetOverdriveMult())
end end
ply:SetSlidingLastPos(pos) ply:SetSlidingLastPos(pos)

2
beatrun/gamemodes/beatrun/gamemode/shared.lua
View file

@ -1,4 +1,4 @@
VERSIONGLOBAL = "1.0.11" VERSIONGLOBAL = "1.0.10"
VERSIONLATEST = "" VERSIONLATEST = ""
DeriveGamemode("sandbox") DeriveGamemode("sandbox")

2
version.txt
View file

@ -1 +1 @@
1.0.11 1.0.10