Skip to content

update traitors challenge #903

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

Merged
BenLubar merged 2 commits into from
May 29, 2025
+2 −14
Merged

update traitors challenge #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c0614
update traitors challenge.
ywgATustcbbs May 28, 2025
d6fc24d
Merge pull request #1 from ReactiveDrop/reactivedrop_beta
ywgATustcbbs May 28, 2025
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
5 changes: 1 addition & 4 deletions reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,19 +935,16 @@ function OnGameplayStart() {
g_str_GameResult = GetMapName().tolower() + "\t" + g_int_MarineCount.tostring() + "\t" + g_int_TraitorCount.tostring() + "\t"; //MapName, PlayerCount, TraitorCount

DelayFunctionCall("ClientPrintRoles", "", 2.0); // 2秒后显示内鬼名单

//PrintNetProps(hMarine);
//PrintNetProps(hPlayer);
}

function DisplayGameInstructions() {
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction0");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction1");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction2");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction3");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction4");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction5");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction6");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction7");
LocalizedClientPrint(null, 3, TextColor(255, 255, 0) + "%s1", "#challenge_traitors_game_instruction8");
}

Expand Down
11 changes: 1 addition & 10 deletions reactivedrop/content/traitors_challenge/scripts/vscripts/traitors_player_info.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ IncludeScript("challenge_traitors_enums.nut");
FONT_DEFAULTLARGE <- self.LookupFont("DefaultMedium");

xMargin <- 0;
yMargin <- 0;

function Paint() {
//如果正在控制士兵，显示信息。
Expand Down Expand Up @@ -87,11 +86,6 @@ function PaintMsg(point, role, font, message) {
self.PaintRectangle(ScreenHeight() * 0.315, ScreenHeight() * 0.91, xMargin, ScreenHeight(), 0, 0, 0, alpha);
self.PaintRectangle(ScreenWidth() - xMargin, 0, ScreenWidth(), ScreenHeight(), 0, 0, 0, alpha);
}
if (yMargin != 0) {
self.PaintRectangle(0, 0, ScreenWidth(), yMargin, 0, 0, 0, alpha);
//self.PaintRectangle(0, ScreenHeight() - yMargin, ScreenWidth() / 10, ScreenHeight(), 0, 0, 0, alpha);
self.PaintRectangle(ScreenWidth() / 10 * 2.4, ScreenHeight() - yMargin, ScreenWidth(), ScreenHeight(), 0, 0, 0, alpha);
}
local xOffset = point[0] >= textHalfWidth + 20 ? 0 : textHalfWidth + 20 - point[0];
point[0] += xOffset;
if (role <= ROLE.MAX_IAF_TEAM) {
Expand Down Expand Up @@ -124,9 +118,6 @@ function SetMargin() {
if (ScreenWidth().tofloat() / ScreenHeight().tofloat() > 16.0 / 9.0) {
xMargin = ((ScreenWidth().tofloat() - ScreenHeight().tofloat() * 16.0 / 9.0) / 2.0).tointeger();
}
if (ScreenWidth().tofloat() / ScreenHeight().tofloat() < 16.0 / 10.0) {
yMargin = ((ScreenHeight().tofloat() - ScreenWidth().tofloat() / 16.0 * 10.0) / 2.0).tointeger();;
}
}

// pass in a value from 0.0 to 1.0, 0.0 means the left side of the screen, 1.0 means the right, 0.5 in the middle
Expand All @@ -136,5 +127,5 @@ function ScreenPosX(fraction) {

// pass in a value from 0.0 to 1.0, 0.0 means the up side of the screen, 1.0 means the down, 0.5 in the middle
function ScreenPosY(fraction) {
return yMargin + (ScreenHeight() - 2 * yMargin) * fraction;
return ScreenHeight() * fraction;
}