Skip to content

Traitors challenge: fixes and balancing #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ywgATustcbbs wants to merge 4 commits into
base: reactivedrop_beta
Choose a base branch
from
Open

Traitors challenge: fixes and balancing #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9cda32
fix hitCount bug
ywgATustcbbs Aug 30, 2026
20083a0
fix hitCount bug
ywgATustcbbs Aug 30, 2026
ffa8082
traitors map balance
ywgATustcbbs Sep 9, 2026
6dc7a59
Merge branch 'traitors-damage-fix' of https://github.com/ywgATustcbbs…
ywgATustcbbs Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...aitors_challenge/scripts/vscripts/challenge_traitors_events/ongameevent_entity_killed.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function ApplyExplosionDamageToMarines(hAttacker, explosionPos, radius, damageRa
if (hMarine.IsValid() && hMarine != hAttacker && hMarine.GetHealth() > 0) {
local targetPos = hMarine.GetOrigin();
local hitCount = GetHitCount(explosionPos, targetPos);
if (hitCount <= 5) {
if (hitCount >= 115) {
continue;
}
local distance = (targetPos - explosionPos).Length();
Expand Down
6 changes: 3 additions & 3 deletions .../traitors_challenge/scripts/vscripts/challenge_traitors_events/ontakedamage_alive_any.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ function OnTakeDamage_Alive_Any(victim, inflictor, attacker, weapon, damage, dam
factor3 = 0.57;
break;
case "asw_weapon_pistol": //双手枪
factor1 = 0.40;
factor2 = 0.35;
factor3 = 0.45;
factor1 = 0.30;
factor2 = 0.25;
factor3 = 0.35;
break;
case "asw_weapon_shotgun": //泵动式霰弹枪
factor1 = 0.60;
Expand Down
71 changes: 70 additions & 1 deletion reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_map_handler.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,17 @@ function SetMapHandler() {
if (temp.z > -444) {
hMarine.TakeDamage(5, DAMAGE_TYPE.DMG_FALL, null);
}

if (g_int_MapKillCounter[0] == INT_MAX && g_int_MapKillCounter[1] == INT_MAX && temp.y > 1760) {
g_int_MapKillCounter[0] = g_int_Counter + 300;
g_int_MapKillCounter[1] = g_int_Counter + 340;
}
if (g_int_MapKillCounter[0] != INT_MAX && g_int_MapKillCounter[1] != INT_MAX && temp.y > 1760) {
g_int_MapKillCounter[1] = g_int_Counter + 40 > g_int_MapKillCounter[1] ? g_int_Counter + 40 : g_int_MapKillCounter[1];
}
if (g_int_Counter > g_int_MapKillCounter[0] && g_int_Counter <= g_int_MapKillCounter[1] && temp.y < 1040) {
hMarine.TakeDamage(2, DAMAGE_TYPE.DMG_FALL, null);
}
}
};
break;
Expand Down Expand Up @@ -499,7 +510,7 @@ function SetMapHandler() {
if (g_int_MapKillCounter[1] == INT_MAX && temp.x > -1297 && temp.y > 2781) {
g_int_MapKillCounter[1] = g_int_Counter + 200;
}
if (g_int_Counter > g_int_MapKillCounter[0] && !(temp.x > -1297 && temp.y > 2781)) {
if (g_int_Counter > g_int_MapKillCounter[1] && !(temp.x > -1297 && temp.y > 2781)) {
hMarine.SetHealth(1);
hMarine.TakeDamage(999, DAMAGE_TYPE.DMG_FALL, null);
}
Expand Down Expand Up @@ -660,6 +671,13 @@ function SetMapHandler() {
if (temp.x > 500 && temp.x < 1500 && temp.y < -2800) {
hMarine.Die();
}

if (g_int_MapKillCounter[0] == INT_MAX && temp.x < (-1150)) {
g_int_MapKillCounter[0] = g_int_Counter + 200;
}
if (g_int_Counter > g_int_MapKillCounter[0] && (temp.x > -1150 && temp.y < (-720))) {
hMarine.TakeDamage(5, DAMAGE_TYPE.DMG_FALL, null);
}
}
if (g_int_Counter % 49 != 0) {
return;
Expand Down Expand Up @@ -799,6 +817,25 @@ function SetMapHandler() {
}
}
}

local idx_end = g_int_Counter % 10;
for (local i = 0; i * 10 + idx_end < g_int_MarineCount; i++) {
local hMarine = g_marine_Total[i * 10 + idx_end];
if (hMarine == null || !hMarine.IsValid()) {
continue;
}
local temp = hMarine.GetOrigin();
if (g_int_MapKillCounter[0] == INT_MAX && g_int_MapKillCounter[1] == INT_MAX && temp.x < (-10500)) {
g_int_MapKillCounter[0] = g_int_Counter + 600;
g_int_MapKillCounter[1] = g_int_Counter + 700;
}
if (g_int_MapKillCounter[0] != INT_MAX && g_int_MapKillCounter[1] != INT_MAX && temp.x < (-10500)) {
g_int_MapKillCounter[1] = g_int_Counter + 100 > g_int_MapKillCounter[1] ? g_int_Counter + 100 : g_int_MapKillCounter[1];
}
if (g_int_Counter > g_int_MapKillCounter[0] && g_int_Counter <= g_int_MapKillCounter[1] && (temp.x >= (-10000) && temp.z >= (-2044))) {
hMarine.TakeDamage(2, DAMAGE_TYPE.DMG_FALL, null);
}
}
};
break;
case MAP.TFT_1: // 防止上墙
Expand All @@ -813,6 +850,14 @@ function SetMapHandler() {
if (temp.z > 250) {
hMarine.TakeDamage(1, DAMAGE_TYPE.DMG_FALL, null);
}
if (temp.x > (-3000) && temp.x < (-2000) && temp.y > 2040 && (4 * temp.x - 15 * temp.z + 12050) < 0) {
printl("AAAAAAAAAA");
hMarine.TakeDamage(10, DAMAGE_TYPE.DMG_FALL, null);
}
if (temp.x < (-5074)) {
printl("BBBBBBBBB");
hMarine.TakeDamage(10, DAMAGE_TYPE.DMG_FALL, null);
}
if (temp.x < 890 && ((temp.x>365&&temp.y>2662) || temp.y > 3085)) { //防止下地底
hMarine.TakeDamage(50, DAMAGE_TYPE.DMG_FALL, null);
}
Expand Down Expand Up @@ -912,6 +957,10 @@ function SetMapHandler() {
}
hMarine.GetScriptScope().DamageMapModifier = 1.0;
local temp = hMarine.GetOrigin();
if (temp.z > 540)
{
hMarine.TakeDamage(4, DAMAGE_TYPE.DMG_FALL, null);
}
if (g_int_MapKillCounter[0] == INT_MAX && temp.y >= 1400) {
g_int_MapKillCounter[0] = g_int_Counter + 600;
}
Expand Down Expand Up @@ -978,6 +1027,23 @@ function SetMapHandler() {
}
}
}

local idx_end = g_int_Counter % 10;
for (local i = 0; i * 10 + idx_end < g_int_MarineCount; i++) {
local hMarine = g_marine_Total[i * 10 + idx_end];
if (hMarine == null || !hMarine.IsValid()) {
continue;
}
hMarine.GetScriptScope().DamageMapModifier = 1.0;
local temp = hMarine.GetOrigin();

if (g_int_MapKillCounter[0] == INT_MAX && temp.y >= (-1300)) {
g_int_MapKillCounter[0] = g_int_Counter + 600;
}
if (g_int_Counter > g_int_MapKillCounter[0] && temp.y < (-1300)) {
hMarine.TakeDamage(2, DAMAGE_TYPE.DMG_FALL, null);
}
}
};
break;
case MAP.TILA_9: // 防止上墙
Expand All @@ -992,6 +1058,9 @@ function SetMapHandler() {
if (temp.z > 4760) {
hMarine.TakeDamage(1, DAMAGE_TYPE.DMG_FALL, null);
}
if (temp.x > 4290 || (temp.x > (-2150) && temp.y > 2760)) {
hMarine.TakeDamage(5, DAMAGE_TYPE.DMG_FALL, null);
}
}
if (idx_end == 0) {
local hTurret = null;
Expand Down
Loading