From 98d005b57e9255f38a4b91826d702f1e2faead52 Mon Sep 17 00:00:00 2001 From: Resxt <55228336+Resxt@users.noreply.github.com> Date: Fri, 21 Oct 2022 21:18:39 +0200 Subject: [PATCH] mapvote 1.0.2 Changed all notifies with the mapvote prefix to avoid conflicts with other scripts Fixed some typos in the code comments Removed self notifyonplayercommand("unselect", "+frag"); as it should have been removed in 1.0.1 --- mapvote/mapvote.gsc | Bin 15809 -> 15817 bytes mapvote/mapvote_mp_extend.gsc | Bin 646 -> 662 bytes mapvote/source/mapvote-source.gsc | 41 +++++++++----------- mapvote/source/mapvote_mp_extend-source.gsc | 8 ++-- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/mapvote/mapvote.gsc b/mapvote/mapvote.gsc index d783ae754e29cadb1920e001b267b20ddd9d9f88..a2c95a60cc8a4cff0ab5bc70a86cd34789e520b7 100644 GIT binary patch delta 5616 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 diff --git a/mapvote/mapvote_mp_extend.gsc b/mapvote/mapvote_mp_extend.gsc index de80bc4a466e12ef2815cb459e67ac56c9df0385..8bcb5f673caf30bda450a96b1a5f427afaf30fe5 100644 GIT binary patch delta 225 zcmZo;oyMx!;2!ME%f-OP00gOw3=C;Z3=FwYnhVHQ0^(^PJW=zDbZ%lnS$;`sJeVjh zNh~U1fC)|3U^HY5nHAAeaMWuK?037?v{tnT)kS;sV1~FuMiFehe08 zV(J01nHiTe0BvGg4rJc}VgV?BE0FyXh-UzGl>zDZ42+BmfV3llfjXZk>MJU0{|xpDQ*A& delta 209 zcmbQn+QzEc;2!ME%f-OP00g0o3=CmR3=FYQ`WKKE0`l8Hc%tSP?y~%n)cE3(#G(?0 z$rg-;j4qS27?;$i0F_M!=?8)yAbSOnUcs=O0mx*`1riq+wu0FuK=xy>I1^J1kj>1v zoB?Pu({v#F3=j)I`AdQ9n?O7Rs4ERfzh_`%oB*U{8JQS%0O>bCtN~>21Ja)u88{gX K85tRl0XYC~{v#d$ diff --git a/mapvote/source/mapvote-source.gsc b/mapvote/source/mapvote-source.gsc index 4c6bddf..5ca5339 100644 --- a/mapvote/source/mapvote-source.gsc +++ b/mapvote/source/mapvote-source.gsc @@ -40,7 +40,7 @@ InitMapvote() { Print("[MAPVOTE] Debug mode is ON"); wait 3; - level notify("vote_start"); + level notify("mapvote_vote_start"); } else { @@ -97,9 +97,9 @@ InitVariables() /* Player section */ /* -This is used instead of notifyonplayercommand("down", "speed_throw") +This is used instead of notifyonplayercommand("mapvote_up", "speed_throw") to fix an issue where players using toggle ads would have to press right click twice for it to register one right click. -With this instead it keeps scrolling even 0.35s until they right click again which is a better user experience +With this instead it keeps scrolling every 0.35s until they right click again which is a better user experience */ ListenForRightClick() { @@ -109,7 +109,7 @@ ListenForRightClick() { if (self AdsButtonPressed()) { - self notify("up"); + self notify("mapvote_up"); wait 0.35; } @@ -123,29 +123,28 @@ ListenForVoteInputs() self thread ListenForRightClick(); - self notifyonplayercommand("down", "+attack"); - self notifyonplayercommand("select", "+gostand"); - self notifyonplayercommand("unselect", "+usereload"); - self notifyonplayercommand("unselect", "+activate"); - self notifyonplayercommand("unselect", "+frag"); + self notifyonplayercommand("mapvote_down", "+attack"); + self notifyonplayercommand("mapvote_select", "+gostand"); + self notifyonplayercommand("mapvote_unselect", "+usereload"); + self notifyonplayercommand("mapvote_unselect", "+activate"); if (GetDvarInt("mapvote_debug")) { - self notifyonplayercommand("debug", "+melee"); + self notifyonplayercommand("mapvote_debug", "+melee"); } while(true) { - input = self waittill_any_return("down", "up", "select", "unselect", "debug"); + input = self waittill_any_return("mapvote_down", "mapvote_up", "mapvote_select", "mapvote_unselect", "mapvote_debug"); section = self.mapvote["vote_section"]; - if (section == "end" && input != "unselect" && input != "debug") + if (section == "end" && input != "mapvote_unselect" && input != "mapvote_debug") { continue; // stop/skip execution } - if (input == "down") + if (input == "mapvote_down") { if (self.mapvote[section]["hovered_index"] < (level.mapvote[section + "s"]["by_index"].size - 1)) { @@ -153,7 +152,7 @@ ListenForVoteInputs() self UpdateSelection(section, (self.mapvote[section]["hovered_index"] + 1)); } } - else if (input == "up") + else if (input == "mapvote_up") { if (self.mapvote[section]["hovered_index"] > 0) { @@ -161,22 +160,20 @@ ListenForVoteInputs() self UpdateSelection(section, (self.mapvote[section]["hovered_index"] - 1)); } } - else if (input == "select") + else if (input == "mapvote_select") { self playlocalsound("mpl_killconfirm_tags_pickup"); - self ConfirmSelection(section); } - else if (input == "unselect") + else if (input == "mapvote_unselect") { if (section != "map") { self playlocalsound("fly_betty_jump"); - self CancelSelection(section); } } - else if (input == "debug" && GetDvarInt("mapvote_debug")) + else if (input == "mapvote_debug" && GetDvarInt("mapvote_debug")) { Print("--------------------------------"); @@ -309,13 +306,13 @@ CreateVoteTimer() } wait(1); } - level notify("vote_end"); + level notify("mapvote_vote_end"); } ListenForStartVote() { level endon("end_game"); - level waittill("vote_start"); + level waittill("mapvote_vote_start"); for (i = 0; i < level.mapvote["maps"]["by_index"].size; i++) { @@ -342,7 +339,7 @@ ListenForStartVote() ListenForEndVote() { level endon("end_game"); - level waittill("vote_end"); + level waittill("mapvote_vote_end"); mostVotedMapIndex = 0; mostVotedMapVotes = 0; diff --git a/mapvote/source/mapvote_mp_extend-source.gsc b/mapvote/source/mapvote_mp_extend-source.gsc index ff13ba4..d546011 100644 --- a/mapvote/source/mapvote_mp_extend-source.gsc +++ b/mapvote/source/mapvote_mp_extend-source.gsc @@ -16,8 +16,8 @@ OnKillcamEnd() return false; wait 3; - level notify("vote_start"); - level waittill("vote_end"); + level notify("mapvote_vote_start"); + level waittill("mapvote_vote_end"); return false; } @@ -26,7 +26,7 @@ OnKillcamEnd() return true; wait 3; - level notify("vote_start"); - level waittill("vote_end"); + level notify("mapvote_vote_start"); + level waittill("mapvote_vote_end"); return true; } \ No newline at end of file