Pull request

Saxashitter · Oct 25, 2024 · 459e81a · 459e81a
2 parents e527134 + 2eb7b55
commit 459e81a
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 152 deletions.
diff --git a/src/Graphics/PTSR/OT_ITS.lmp b/src/Graphics/PTSR/OT_ITS.lmp
diff --git a/src/Graphics/PTSR/OT_OVERTIME.lmp b/src/Graphics/PTSR/OT_OVERTIME.lmp
diff --git a/src/Lua/Functions/Scripts/init.lua b/src/Lua/Functions/Scripts/init.lua
@@ -192,12 +192,6 @@ return function(self, maploaded)
 	if isserver then
 		CV_Set(CV_FindVar("restrictskinchange"),0)
 	end
-
-	MM_N.ptsr_mode = P_RandomRange(1, 10) >= 7
-	-- HEADS UP! this might be an external mod in the future when we clean up the code
-	-- the reason behind this is cause we dislike bloat
-	-- and i only did this cause i made a promise
-	-- - saxashitter
-
+
 	MM.runHook("Init")
 end
diff --git a/src/Lua/Functions/Scripts/startVote.lua b/src/Lua/Functions/Scripts/startVote.lua
@@ -6,7 +6,7 @@ return function(self)
 
 	MM_N.mapVote = {}
 
-	mapmusname = "MMINTR"
+	mapmusname = "_CHSEL"
 	S_ChangeMusic(mapmusname)
 
 	local addedMaps = 0
@@ -42,5 +42,7 @@ return function(self)
 			continue
 		end
 		table.insert(MM_N.innocents, p)
+
+		p.mm.cur_map = P_RandomRange(1, #MM_N.mapVote) -- Be on random selection when vote starts.
 	end
 end
diff --git a/src/Lua/Hooks/Game/Manager.lua b/src/Lua/Hooks/Game/Manager.lua
@@ -76,7 +76,6 @@ addScript "Waiting"
 addScript "Game Over"
 
 addScript "Overtime"
-addScript "PTSR Overtime"
 addScript "Showdown"
 addScript "Game End"
 addScript "Restrict"

diff --git a/src/Lua/Hooks/Game/Scripts/Gun Manager.lua b/src/Lua/Hooks/Game/Scripts/Gun Manager.lua
@@ -1,4 +1,5 @@
 local getCount = MM.require "Libs/getCount"
+local randomPlayer = MM.require "Libs/getRandomPlayer"
 
 local function _eligibleGunPlayer(p)
 	return p

diff --git a/src/Lua/Hooks/Game/Scripts/PTSR Overtime.lua b/src/Lua/Hooks/Game/Scripts/PTSR Overtime.lua
diff --git a/src/Lua/Hooks/HUD/Drawers/ptsr_hurryup.lua b/src/Lua/Hooks/HUD/Drawers/ptsr_hurryup.lua
diff --git a/src/Lua/Hooks/HUD/Drawers/ptsr_overtime.lua b/src/Lua/Hooks/HUD/Drawers/ptsr_overtime.lua
diff --git a/src/Lua/Hooks/HUD/Drawers/results.lua b/src/Lua/Hooks/HUD/Drawers/results.lua
@@ -71,7 +71,7 @@ return function(v, p)
 		display_results = false
 	end
 	if (p and p.mm and p.mm.joinedmidgame) then
-		ft = "You joined during a game!"
+		ft = "You joined midgame!"
 		display_results = false
 	end
 

diff --git a/src/Lua/Hooks/HUD/main.lua b/src/Lua/Hooks/HUD/main.lua
@@ -140,8 +140,6 @@ addHud "availableitems"
 addHud "weapontime"
 addHud "info"
 addHud "seenplayer"
-addHud "ptsr_hurryup"
-addHud "ptsr_overtime"
 addHud "results"
 addHud "showdownanim"
 addHud "intermissiontally"

diff --git a/src/Lua/Variables/Data/Match.lua b/src/Lua/Variables/Data/Match.lua
@@ -19,9 +19,6 @@ return {
 	showdown_song = "MMOVRT",
 	showdown_ticker = 0,
 
-	ptsr_mode = true,
-	ptsr_overtime_ticker = 0, -- luigi please fix ur variable names (overtime ticker is showdown ticker)
-
 	overtime_point = nil,
 	overtime_ticker = 0,
 	overtime_startingdist = 6000*FU,

diff --git a/src/Music/O_MMINTR.ogg b/src/Music/O_MMINTR.ogg
diff --git a/src/Music/O_OTMUSA.ogg b/src/Music/O_OTMUSA.ogg
diff --git a/src/Music/O_OTMUSB.ogg b/src/Music/O_OTMUSB.ogg
diff --git a/src/Music/O_SHWDW3.ogg b/src/Music/O_SHWDW3.ogg