Skip to content

Commit

Permalink
Update Red Ridge
Browse files Browse the repository at this point in the history
- Changed the BMMH to not have explosion sounds

- Fixed(?) a vscript error caused by afterburn damage

- Adjusted time limit in the secret room

- Added a hint that pops up when you start the warmup sequence for the teleporter
  • Loading branch information
mtxfellen committed Dec 13, 2024
1 parent 1a0620b commit 9a1d527
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions scripts/vscripts/zombiemode/hooks.nut
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ if ("RedRidgeEvents" in getroottable()) delete ::RedRidgeEvents // this is done
local inflictor = params.inflictor
local damage = params.damage
local weapon = params.weapon
if (attacker == null) return
if (attacker.GetTeam() == 3)
{
if (attacker.GetScriptScope().Preserved.zombie_type <= 5) NetProps.SetPropString(params.weapon, "m_iClassname", "unarmed_combat")
Expand Down
6 changes: 4 additions & 2 deletions scripts/vscripts/zombiemode/playerlogic.nut
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,6 @@ local ImportantItems =
}
function PressButton(box, message, input, param = "", delay = -1, activator = null, caller = null)
{

if (GetPropBool(box, "m_bLocked")) // shouldnt call something box if the box isnt the only one using it!!
{
ClientPrint(self, HUD_PRINTCENTER, "")
Expand All @@ -930,12 +929,14 @@ local ImportantItems =
{
box.EmitSound("buttons/button4.wav")
EntFireByHandle(box, input, param, delay, activator, caller)
ClientPrint(self, HUD_PRINTCENTER, "")
if (box.GetName() == "teleport_button_1") ClientPrint(self, HUD_PRINTCENTER, "Data Link connection lost. Please resynchronize.") // add a hint for teleporter
else ClientPrint(self, HUD_PRINTCENTER, "")

//set cooldown time
scope.Preserved.cooldowntime = Time() + BUTTON_COOLDOWN_TIME
//manually set it here just in case
SetPropBool(self, "m_bUsingActionSlot", false)

}
}
local key = ""
Expand Down Expand Up @@ -982,6 +983,7 @@ local ImportantItems =
if ("caller" in GenericButtons[key]) param = GenericButtons[key].caller

PressButton(box, GenericButtons[key].message, GenericButtons[key].input, param, delay, activator, caller)

}
}
for (local reanimator; reanimator = FindByClassnameWithin(reanimator, "entity_revive_marker", self.GetOrigin(), BUTTON_RADIUS); )
Expand Down
8 changes: 4 additions & 4 deletions scripts/vscripts/zombiemode/zm_util.nut
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@ const POWERUP_TIME = 30;
{
foreach (player in PopExtUtil.HumanArray)
{
local scope = player.GetScriptScope().Preserved
if (scope.isusingstrongmann == true)
local scope = player.GetScriptScope()
if (scope.Preserved.isusingstrongmann == true)
{
return false;
break
Expand Down Expand Up @@ -505,7 +505,7 @@ const POWERUP_TIME = 30;
text_gas = SpawnEntityFromTable("game_text",
{
targetname = "__text_gas"
channel = 1
channel = 2
color = "255 255 255"
// spawnflags = 1
fadein = 0
Expand Down Expand Up @@ -633,7 +633,7 @@ const POWERUP_TIME = 30;
self.ValidateScriptScope()
local scope = self.GetScriptScope();
self.AddCondEx(6,10,null)
scope.Preserved.teleporttime = Time() + STRONGMANN_TIME - 20; // I dunno keep it as like a minute??
scope.Preserved.teleporttime = Time() + STRONGMANN_TIME - 10; // I dunno keep it as like a minute??
scope.Preserved.isinstrongmannroom = true; // trip look up for playerlogic
ScreenFade(self,255,255,255,255,1,0,1)
ScreenShake(self.GetCenter(),16,144,2,48,0,true)
Expand Down

0 comments on commit 9a1d527

Please sign in to comment.