Skip to content

Commit 079d3e5

Browse files
committed
Update Traitors Challenge
1. Fix two map damage zone bugs 2. Fix end game sound overlapping 3. Minor balance tweaks. 3.1 Disable lock-mode of devastator. 3.2 Slightly reduce devastator damage. 3.3 Slightly increace the threshold ratio of converting marines from 1.5 to 1.6
1 parent ea556ec commit 079d3e5

5 files changed

Lines changed: 75 additions & 33 deletions

File tree

reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,7 @@
5353
"asw_sentry_top_flamer_dmg_override" "50"
5454
"asw_sentry_top_machinegun_dmg_override" "0"
5555
"asw_sentry_top_machinegun_fire_rate" "0.1"
56+
"rd_devastator_bullet_spread_duck" "30"
57+
"rd_devastator_lockmode_enabled" "0"
5658
}
5759
}

reactivedrop/content/traitors_challenge/scripts/game_sounds_rd_traitors.txt

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -92,62 +92,90 @@
9292
"wave" "explosions/t7501.wav"
9393
}
9494

95-
"Traitors.Music_IAF_Win"
95+
"Traitors.Music_IAF_Win1"
9696
{
9797
"channel" "CHAN_STATIC"
9898
"volume" "1.000"
9999
"pitch" "100"
100100

101101
"soundlevel" "SNDLVL_NONE"
102102

103-
"rndwave"
104-
{
105-
"wave" "*#music/cossack_sandvich.wav"
106-
"wave" "*#music/fortress_reel.wav"
107-
}
103+
"wave" "*#music/cossack_sandvich.wav"
108104
}
109105

110-
"Traitors.Music_Traitor_Win"
106+
"Traitors.Music_IAF_Win2"
111107
{
112108
"channel" "CHAN_STATIC"
113109
"volume" "1.000"
114110
"pitch" "100"
115111

116112
"soundlevel" "SNDLVL_NONE"
117113

118-
"rndwave"
119-
{
120-
"wave" "*#music/mvm_lost_wave.wav"
121-
"wave" "*#music/trombonetauntv2.mp3"
122-
}
114+
"wave" "*#music/fortress_reel.wav"
123115
}
124116

125-
"Traitors.Announcer_IAF_Win"
117+
"Traitors.Music_Traitor_Win1"
118+
{
119+
"channel" "CHAN_STATIC"
120+
"volume" "1.000"
121+
"pitch" "100"
122+
123+
"soundlevel" "SNDLVL_NONE"
124+
125+
"wave" "*#music/mvm_lost_wave.wav"
126+
}
127+
128+
"Traitors.Music_Traitor_Win2"
129+
{
130+
"channel" "CHAN_STATIC"
131+
"volume" "1.000"
132+
"pitch" "100"
133+
134+
"soundlevel" "SNDLVL_NONE"
135+
136+
"wave" "*#music/trombonetauntv2.mp3"
137+
}
138+
139+
"Traitors.Announcer_IAF_Win1"
126140
{
127141
"channel" "CHAN_VOICE"
128142
"volume" "1.000"
129143
"pitch" "100"
130144

131145
"soundlevel" "SNDLVL_NONE"
132146

133-
"rndwave"
134-
{
135-
"wave" "*#vo/traitors_challenge_command/announcer_victory.wav"
136-
"wave" "*#vo/traitors_challenge_command/announcer_we_succeeded.wav"
137-
}
147+
"wave" "*#vo/traitors_challenge_command/announcer_victory.wav"
138148
}
139149

140-
"Traitors.Announcer_Traitor_Win"
150+
"Traitors.Announcer_IAF_Win2"
141151
{
142152
"channel" "CHAN_VOICE"
143153
"volume" "1.000"
144154
"pitch" "100"
145155

146156
"soundlevel" "SNDLVL_NONE"
147157

148-
"rndwave"
149-
{
150-
"wave" "*#vo/traitors_challenge_command/announcer_you_failed.wav"
151-
"wave" "*#vo/traitors_challenge_command/announcer_traitors_won.wav"
152-
}
158+
"wave" "*#vo/traitors_challenge_command/announcer_we_succeeded.wav"
153159
}
160+
161+
"Traitors.Announcer_Traitor_Win1"
162+
{
163+
"channel" "CHAN_VOICE"
164+
"volume" "1.000"
165+
"pitch" "100"
166+
167+
"soundlevel" "SNDLVL_NONE"
168+
169+
"wave" "*#vo/traitors_challenge_command/announcer_you_failed.wav"
170+
}
171+
172+
"Traitors.Announcer_Traitor_Win2"
173+
{
174+
"channel" "CHAN_VOICE"
175+
"volume" "1.000"
176+
"pitch" "100"
177+
178+
"soundlevel" "SNDLVL_NONE"
179+
180+
"wave" "*#vo/traitors_challenge_command/announcer_traitors_won.wav"
181+
}

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ function RefreshSkillMenu(interval = 1) {
447447
}
448448
}
449449

450-
g_float_AbetRatio <- 1.5;
450+
g_float_AbetRatio <- 1.6;
451451
function RefreshMenu(hMarine) {
452452
local i = -1;
453453

@@ -945,8 +945,8 @@ function PlayMissionEndSound(strWinner) {
945945
local hPlayer = null;
946946
local music;
947947
local voice;
948-
music = MISSION_END_SOUND[strWinner].MUSIC;
949-
voice = MISSION_END_SOUND[strWinner].VOICE;
948+
music = MISSION_END_SOUND[strWinner].MUSIC[RandomHQUniformIntDistribution(0, 1)];
949+
voice = MISSION_END_SOUND[strWinner].VOICE[RandomHQUniformIntDistribution(0, 1)];
950950
while (hPlayer = Entities.FindByClassname(hPlayer, "player")) {
951951
hPlayer.PrecacheSoundScript(music);
952952
hPlayer.PrecacheSoundScript(voice);

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_enums.nut

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,24 @@ BOOMER_SOUND <- {
7979

8080
MISSION_END_SOUND <- {
8181
IAF = {
82-
MUSIC = "Traitors.Music_IAF_Win",
83-
VOICE = "Traitors.Announcer_IAF_Win",
82+
MUSIC = [
83+
"Traitors.Music_IAF_Win1",
84+
"Traitors.Music_IAF_Win2",
85+
],
86+
VOICE = [
87+
"Traitors.Announcer_IAF_Win1",
88+
"Traitors.Announcer_IAF_Win2",
89+
],
8490
},
8591
TRAITOR = {
86-
MUSIC = "Traitors.Music_Traitor_Win",
87-
VOICE = "Traitors.Announcer_Traitor_Win",
92+
MUSIC = [
93+
"Traitors.Music_Traitor_Win1",
94+
"Traitors.Music_Traitor_Win2",
95+
],
96+
VOICE = [
97+
"Traitors.Announcer_Traitor_Win1",
98+
"Traitors.Announcer_Traitor_Win2",
99+
],
88100
},
89101
};
90102

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_map_handler.nut

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function SetMapHandler() {
224224
if (g_int_Counter > g_int_MapKillCounter[1] && temp.y < 4950) {
225225
hMarine.TakeDamage(4, DAMAGE_TYPE.DMG_FALL, null);
226226
}
227-
if (g_int_Counter > g_int_MapKillCounter[2] && temp.z < 6068) {
227+
if (g_int_Counter > g_int_MapKillCounter[2] && temp.y < 6068) {
228228
hMarine.TakeDamage(4, DAMAGE_TYPE.DMG_FALL, null);
229229
}
230230
}
@@ -657,7 +657,7 @@ function SetMapHandler() {
657657
if (temp.x < 1800 && temp.y < -2800) {
658658
hMarine.TakeDamage(5, DAMAGE_TYPE.DMG_FALL, null);
659659
}
660-
if (temp.x < 1500 && temp.y < -2800) {
660+
if (temp.x > 500 && temp.x < 1500 && temp.y < -2800) {
661661
hMarine.Die();
662662
}
663663
}

0 commit comments

Comments
 (0)