Skip to content

Commit 79694ac

Browse files
mexikoedimexikoedi
committed
adjusted f1 settings
1 parent 3d9bc00 commit 79694ac

File tree

4 files changed

+59
-45
lines changed

4 files changed

+59
-45
lines changed

‎gamemodes/terrortown/entities/weapons/weapon_ttt2_medic_defibrillator.lua

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ SWEP.AllowPickup = false
2424
SWEP.CanBuy = nil
2525
SWEP.notBuyable = true
2626
SWEP.InLoadoutFor = {ROLE_MEDIC}
27+
-- added the convars and set default values with internal descriptions
2728
SWEP.cvars = {
28-
reviveBraindead = CreateConVar("ttt2_med_defibrillator_revive_braindead", "0", flags),
29-
playSound = CreateConVar("ttt2_med_defibrillator_play_sounds", "1", flags),
30-
reviveTime = CreateConVar("ttt2_med_defibrillator_revive_time", "3.0", flags),
31-
errorTime = CreateConVar("ttt2_med_defibrillator_error_time", "1.5", flags),
32-
successChance = CreateConVar("ttt2_med_defibrillator_success_chance", "80", flags),
33-
resetConfirmation = CreateConVar("ttt2_med_defibrillator_reset_confirm", "0", flags),
34-
revivalHealth = CreateConVar("ttt2_med_defibrillator_revival_health", "100", flags),
35-
revivalMaxHealth = CreateConVar("ttt2_med_defibrillator_revival_max_health", "100", flags)
29+
reviveBraindead = CreateConVar("ttt2_med_defibrillator_revive_braindead", "0", flags, "Should the defibrillator be able to revive braindead people or not"),
30+
playSound = CreateConVar("ttt2_med_defibrillator_play_sounds", "1", flags, "Should the revival process make sounds or not"),
31+
reviveTime = CreateConVar("ttt2_med_defibrillator_revive_time", "3.0", flags, "The time needed for the revival"),
32+
errorTime = CreateConVar("ttt2_med_defibrillator_error_time", "1.5", flags, "The cooldown time after an revival attempt"),
33+
successChance = CreateConVar("ttt2_med_defibrillator_success_chance", "80", flags, "The chance that a revival is successful"),
34+
resetConfirmation = CreateConVar("ttt2_med_defibrillator_reset_confirm", "0", flags, "Reset confirm state on round begin to prevent short blinking of confirmed roles on round start"),
35+
revivalHealth = CreateConVar("ttt2_med_defibrillator_revival_health", "100", flags, "The health after a revival"),
36+
revivalMaxHealth = CreateConVar("ttt2_med_defibrillator_revival_max_health", "100", flags, "The max health after a revival")
3637
}
3738

3839
SWEP.revivalReason = "revived_by_medic"

‎gamemodes/terrortown/entities/weapons/weapon_ttt2_medic_medigun.lua

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ if SERVER then
1414
})
1515
end
1616

17+
local flags = {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}
18+
SWEP.Base = "weapon_tttbase"
1719
SWEP.AutoSpawnable = false
1820
SWEP.AdminSpawnable = false
1921
SWEP.Spawnable = false
2022
SWEP.AdminOnly = false
2123
SWEP.Weight = 3
22-
SWEP.Base = "weapon_tttbase"
2324
SWEP.ViewModel = "models/weapons/v_models/v_mediown_medic.mdl"
2425
SWEP.WorldModel = "models/weapons/w_models/w_mediown.mdl"
2526
SWEP.ViewModelFlip = false
@@ -30,7 +31,6 @@ SWEP.SwayScale = 0
3031
SWEP.ViewModelFOV = 65
3132
SWEP.CSMuzzleFlashes = 1
3233
SWEP.Kind = WEAPON_EQUIP1
33-
SWEP.Icon = "vgui/ttt/icon_medigun"
3434
SWEP.Primary.ClipSize = -1
3535
SWEP.Primary.DefaultClip = -1
3636
SWEP.Primary.Automatic = false
@@ -44,12 +44,31 @@ SWEP.AllowPickup = false
4444
SWEP.CanBuy = nil
4545
SWEP.notBuyable = true
4646
SWEP.InLoadoutFor = {ROLE_MEDIC}
47+
-- added the convars and set default values with internal descriptions
48+
CreateConVar("ttt2_med_medigun_max_range", "450", flags, "Max range (in hammer units) the medigun can heal")
49+
CreateConVar("ttt2_med_medigun_ticks_per_heal", "40", flags, "How many ticks between each healing point(s)")
50+
CreateConVar("ttt2_med_medigun_ticks_per_heal_uber", "25", flags, "How many ticks between each healing point(s) while ubering")
51+
CreateConVar("ttt2_med_medigun_heal_per_tick", "3", flags, "How many health points are received for one heal tick")
52+
CreateConVar("ttt2_med_medigun_heal_per_tick_uber", "4", flags, "How many health points are received for one heal tick while ubering")
53+
CreateConVar("ttt2_med_medigun_ticks_per_self_heal", "300", flags, "How many ticks between each self-healing point(s)")
54+
CreateConVar("ttt2_med_medigun_ticks_per_self_heal_uber", "15", flags, "How many ticks between each self-healing point(s) while ubering")
55+
CreateConVar("ttt2_med_medigun_self_heal_per_tick", "1", flags, "How many health points are self-received for one heal tick")
56+
CreateConVar("ttt2_med_medigun_self_heal_per_tick_uber", "1", flags, "How many health points are self-received for one heal tick while ubering")
57+
CreateConVar("ttt2_med_medigun_self_heal_is_passive", "1", flags, "The holder of the medigun will receive his health points without healing someone")
58+
CreateConVar("ttt2_med_medigun_ticks_per_uber", "50", flags, "How many ticks between each pct of uber")
59+
CreateConVar("ttt2_med_medigun_uber_seconds", "8", flags, "How many seconds should the uber last")
60+
CreateConVar("ttt2_med_medigun_uber_headshot_dmg_get_pct", "0.50", flags, "Pct of damage a headshot will actually do")
61+
CreateConVar("ttt2_med_medigun_uber_general_dmg_get_pct", "0.60", flags, "Pct of damage other things will actually do")
62+
CreateConVar("ttt2_med_medigun_enable_beam", "1", flags, "Should the heal beam be rendered")
63+
CreateConVar("ttt2_med_medigun_call_healing_hook", "0", flags, "Should we call the heal hook every tick or not at all")
4764
if CLIENT then
4865
SWEP.EquipMenuData = {
4966
type = "item_weapon",
5067
name = "weapon_med_medigun_name",
5168
desc = "weapon_med_medigun_desc"
5269
}
70+
71+
SWEP.Icon = "vgui/ttt/icon_medigun"
5372
end
5473

5574
function SWEP:Initialize()

‎lua/terrortown/autorun/shared/sh_med_convars.lua

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@ CreateConVar("ttt2_med_announce_win_popup", "1", {FCVAR_NOTIFY, FCVAR_ARCHIVE},
2121
CreateConVar("ttt2_med_announce_win_popup_duration", "5", {FCVAR_NOTIFY, FCVAR_ARCHIVE}, "Duration of the win popup")
2222
CreateConVar("ttt2_med_announce_win_achieved_popup", "1", {FCVAR_NOTIFY, FCVAR_ARCHIVE}, "Enable or disable popup for a win achieved by the medic")
2323
CreateConVar("ttt2_med_announce_win_achieved_popup_duration", "5", {FCVAR_NOTIFY, FCVAR_ARCHIVE}, "Duration of the win achieved popup")
24-
CreateConVar("ttt2_med_medigun_max_range", "450", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "Max range (in hammer units) the medigun can heal")
25-
CreateConVar("ttt2_med_medigun_ticks_per_heal", "40", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many ticks between each healing point(s)")
26-
CreateConVar("ttt2_med_medigun_ticks_per_heal_uber", "25", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many ticks between each healing point(s) while ubering")
27-
CreateConVar("ttt2_med_medigun_heal_per_tick", "3", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many health points are received for one heal tick")
28-
CreateConVar("ttt2_med_medigun_heal_per_tick_uber", "4", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many health points are received for one heal tick while ubering")
29-
CreateConVar("ttt2_med_medigun_ticks_per_self_heal", "300", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many ticks between each self-healing point(s)")
30-
CreateConVar("ttt2_med_medigun_ticks_per_self_heal_uber", "15", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many ticks between each self-healing point(s) while ubering")
31-
CreateConVar("ttt2_med_medigun_self_heal_per_tick", "1", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many health points are self-received for one heal tick")
32-
CreateConVar("ttt2_med_medigun_self_heal_per_tick_uber", "1", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many health points are self-received for one heal tick while ubering")
33-
CreateConVar("ttt2_med_medigun_self_heal_is_passive", "1", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "The holder of the medigun will receive his health points without healing someone")
34-
CreateConVar("ttt2_med_medigun_ticks_per_uber", "50", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many ticks between each pct of uber")
35-
CreateConVar("ttt2_med_medigun_uber_seconds", "8", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "How many seconds should the uber last")
36-
CreateConVar("ttt2_med_medigun_uber_headshot_dmg_get_pct", "0.50", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "Pct of damage a headshot will actually do")
37-
CreateConVar("ttt2_med_medigun_uber_general_dmg_get_pct", "0.60", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "Pct of damage other things will actually do")
38-
CreateConVar("ttt2_med_medigun_enable_beam", "1", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "Should the heal beam be rendered")
39-
CreateConVar("ttt2_med_medigun_call_healing_hook", "0", {FCVAR_SERVER_CAN_EXECUTE, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "Should we call the heal hook every tick or not at all")
4024
-- for medigun, look in weapon_ttt2_medic_medigun code
4125
TTT2MEDMEDIGUN_DATA = {}
4226
if CLIENT then

‎lua/terrortown/entities/roles/medic/shared.lua

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ if CLIENT then
270270
decimal = 0
271271
})
272272

273-
form:MakeCheckBox({
273+
local masterWinEnb = form:MakeCheckBox({
274274
serverConvar = "ttt2_med_win_enabled",
275275
label = "label_med_win_enabled"
276276
})
@@ -280,12 +280,14 @@ if CLIENT then
280280
label = "label_med_win_rqd_heal_per_alv_ply",
281281
min = 1,
282282
max = 100,
283-
decimal = 0
283+
decimal = 0,
284+
master = masterWinEnb
284285
})
285286

286287
form:MakeCheckBox({
287288
serverConvar = "ttt2_med_win_rqd_revive",
288-
label = "label_med_win_rqd_revive"
289+
label = "label_med_win_rqd_revive",
290+
master = masterWinEnb
289291
})
290292

291293
form:MakeCheckBox({
@@ -298,7 +300,7 @@ if CLIENT then
298300
label = "label_med_disable_defibrillator"
299301
})
300302

301-
form:MakeCheckBox({
303+
local masterKarma = form:MakeCheckBox({
302304
serverConvar = "ttt2_med_karma_penalty",
303305
label = "label_med_karma_penalty"
304306
})
@@ -308,10 +310,11 @@ if CLIENT then
308310
label = "label_med_karma_penalty_per_killed_ply",
309311
min = 1,
310312
max = 150,
311-
decimal = 0
313+
decimal = 0,
314+
master = masterKarma
312315
})
313316

314-
form:MakeCheckBox({
317+
local masterArrival = form:MakeCheckBox({
315318
serverConvar = "ttt2_med_announce_arrival_popup",
316319
label = "label_med_announce_arrival_popup"
317320
})
@@ -321,10 +324,11 @@ if CLIENT then
321324
label = "label_med_announce_arrival_popup_duration",
322325
min = 1,
323326
max = 15,
324-
decimal = 0
327+
decimal = 0,
328+
master = masterArrival
325329
})
326330

327-
form:MakeCheckBox({
331+
local masterDeath = form:MakeCheckBox({
328332
serverConvar = "ttt2_med_announce_death_popup",
329333
label = "label_med_announce_death_popup"
330334
})
@@ -334,10 +338,11 @@ if CLIENT then
334338
label = "label_med_announce_death_popup_duration",
335339
min = 1,
336340
max = 15,
337-
decimal = 0
341+
decimal = 0,
342+
master = masterDeath
338343
})
339344

340-
form:MakeCheckBox({
345+
local masterCrime = form:MakeCheckBox({
341346
serverConvar = "ttt2_med_announce_crime_popup",
342347
label = "label_med_announce_crime_popup"
343348
})
@@ -347,10 +352,11 @@ if CLIENT then
347352
label = "label_med_announce_crime_popup_duration",
348353
min = 1,
349354
max = 15,
350-
decimal = 0
355+
decimal = 0,
356+
master = masterCrime
351357
})
352358

353-
form:MakeCheckBox({
359+
local masterBetrayal = form:MakeCheckBox({
354360
serverConvar = "ttt2_med_announce_betrayal_popup",
355361
label = "label_med_announce_betrayal_popup"
356362
})
@@ -360,10 +366,11 @@ if CLIENT then
360366
label = "label_med_announce_betrayal_popup_duration",
361367
min = 1,
362368
max = 15,
363-
decimal = 0
369+
decimal = 0,
370+
master = masterBetrayal
364371
})
365372

366-
form:MakeCheckBox({
373+
local masterAccident = form:MakeCheckBox({
367374
serverConvar = "ttt2_med_announce_accident_popup",
368375
label = "label_med_announce_accident_popup"
369376
})
@@ -373,10 +380,11 @@ if CLIENT then
373380
label = "label_med_announce_accident_popup_duration",
374381
min = 1,
375382
max = 15,
376-
decimal = 0
383+
decimal = 0,
384+
master = masterAccident
377385
})
378386

379-
form:MakeCheckBox({
387+
local masterWinPop = form:MakeCheckBox({
380388
serverConvar = "ttt2_med_announce_win_popup",
381389
label = "label_med_announce_win_popup"
382390
})
@@ -386,10 +394,11 @@ if CLIENT then
386394
label = "label_med_announce_win_popup_duration",
387395
min = 1,
388396
max = 15,
389-
decimal = 0
397+
decimal = 0,
398+
master = masterWinPop
390399
})
391400

392-
form:MakeCheckBox({
401+
local masterWinAchPop = form:MakeCheckBox({
393402
serverConvar = "ttt2_med_announce_win_achieved_popup",
394403
label = "label_med_announce_win_achieved_popup"
395404
})
@@ -399,7 +408,8 @@ if CLIENT then
399408
label = "label_med_announce_win_achieved_popup_duration",
400409
min = 1,
401410
max = 15,
402-
decimal = 0
411+
decimal = 0,
412+
master = masterWinAchPop
403413
})
404414
end
405415

0 commit comments

Comments
 (0)