PvP timer

compatibility/Preview/InitPreview.lua

@@ -26,7 +26,7 @@ function FN.PRE.start_new_coroutine()
     -- Defaults are vanilla: free preview, slow (5s) delay.
     -- Layers like pressure_timer set both via ruleset scalars.
     local timer_delay, timer_cost = 0, 0
-    if MP.LOBBY and MP.LOBBY.code and not MP.is_pvp_boss() then
+    if MP.LOBBY and MP.LOBBY.code and MP.LOBBY.config.timer and not MP.is_pvp_boss() then
         timer_delay = 5
         timer_cost = 0
 
@@ -50,6 +50,10 @@ function FN.PRE.start_new_coroutine()
                 timer_cost > 0
                 and FN.PRE.data and not FN.PRE.data.empty
                 and MP.LOBBY.code and not MP.is_pvp_boss()
+                and MP.LOBBY.config.timer
+                and not MP.GAME.timer_started
+                and not MP.GAME.nemesis_timer_started
+                and not MP.GAME.timer_consumed
             then
                 MP.UI.consume_timer(timer_cost, nil, math.max(10, timer_cost))
             end

core.lua

@@ -110,6 +110,10 @@ function MP.is_major_league_ruleset()
 	return MP.LOBBY and MP.LOBBY.config and MP.LOBBY.config.ruleset == "ruleset_mp_majorleague" and MP.LOBBY.code
 end
 
+function MP.current_ruleset()
+    return {}
+end
+
 function MP.load_mp_file(file)
 	local chunk, err = SMODS.load_file(file, "Multiplayer")
 	if chunk then
@@ -292,7 +296,7 @@ MP.load_mp_file(networking_dir .. "/action_handlers.lua")
 
 MP.load_mp_dir("gamemodes")
 MP.load_mp_dir("layers")
-MP.load_mp_dir("rulesets")
+MP.load_mp_dir("rulesets", true)
 MP.load_mp_dir("ui", true)
 
 if MP.LOBBY.config.weekly then -- this could be a function but why bother

layers/_layers.lua

@@ -25,10 +25,7 @@ end
 -- Build an mp_include closure that returns true iff any of the named layers is active.
 local function layer_membership_include(owning_layers)
 	return function(_)
-		for _, layer_name in ipairs(owning_layers) do
-			if MP.is_layer_active(layer_name) then return true end
-		end
-		return false
+        return MP.is_any_layer_active(owning_layers)
 	end
 end
 
@@ -190,8 +187,16 @@ function MP.RunLayerHooks(hook_name)
 end
 
 function MP.is_layer_active(layer_name)
+    if not layer_name then return false end
 	for _, name in ipairs(MP.active_layer_chain()) do
 		if name == layer_name then return true end
 	end
 	return false
 end
+
+function MP.is_any_layer_active(layers)
+    for _, layer_name in pairs(layers) do
+        if MP.is_layer_active(layer_name) then return true end
+    end
+    return false
+end

layers/no_anim_timer.lua

@@ -1,5 +1,5 @@
 MP.Layer("no_animation_timer", {
     preview_calculate_delay = 1.5,
     preview_calculate_cost = 3.5,
-    timer_base_multiplier = 4/5,
+    timer_base_multiplier = 2/3,
 })

layers/pressure_timer.lua

@@ -8,3 +8,7 @@ MP.Layer("pressure_timer", {
     timer_speedup_multiplier = 2,
     timer_base_multiplier = 2,
 })
+
+MP.Layer("pressure_timer_plus", {
+    timer_hand_played_increment_seconds = 15
+})

layers/pvp_timer.lua

@@ -0,0 +1,4 @@
+MP.Layer("pvp_timer", {
+	pvp_timer_base_seconds = 90,
+	pvp_timer_hand_played_increment_seconds = 15,
+})

layers/ranked.lua

@@ -1,6 +1,6 @@
 MP.Layer("ranked", {
 	forced_lobby_options = true,
-	is_disabled = function(self)
+    is_disabled = function(self)
 		return MP.UTILS.check_smods_version() or MP.UTILS.check_lovely_version()
 	end,
 	force_lobby_options = function(self)

lib/insane_int.lua

@@ -51,6 +51,7 @@ end
 -- This doesn't really fit with the comment at the top,
 -- but I needed a way to compare highscores without storing this value seperately for no reason
 MP.INSANE_INT.greater_than = function(insane_int_display1, insane_int_display2)
+    if not insane_int_display1 or not insane_int_display2 then return false end
 	if insane_int_display1.e_count ~= insane_int_display2.e_count then
 		return tonumber(insane_int_display1.e_count) > tonumber(insane_int_display2.e_count)
 	end
@@ -62,6 +63,14 @@ MP.INSANE_INT.greater_than = function(insane_int_display1, insane_int_display2)
 	return tonumber(insane_int_display1.coeffiocient) > tonumber(insane_int_display2.coeffiocient)
 end
 
+MP.INSANE_INT.equal = function(insane_int_display1, insane_int_display2)
+    if not insane_int_display1 or not insane_int_display2 then return false end
+	if insane_int_display1.e_count ~= insane_int_display2.e_count then return false end
+	if insane_int_display1.exponent ~= insane_int_display2.exponent then return false end
+	if insane_int_display1.coeffiocient ~= insane_int_display2.coeffiocient then return false end
+    return true
+end
+
 -- ignore deprected warning for math.pow
 -- math.pow is used instead of ^ to avoid conflicts with talisman's __pow override
 -- theoretically the talisman override only applies to their special big number types and using '^' would be fine,

lib/ruleset_utils.lua

@@ -6,8 +6,20 @@ end
 -- (set by layers like pressure_timer). The multiplier is applied at timer-init sites,
 -- so the lobby UI keeps showing the unmultiplied base.
 function MP.UTILS.timer_base()
-	local base = MP.LOBBY.config.timer_base_seconds or 150
-	local mult = MP.current_ruleset and MP.current_ruleset().timer_base_multiplier or 1
+    local ruleset = MP.current_ruleset()
+	local base = MP.LOBBY.config.timer_base_seconds or ruleset.timer_base_seconds or 150
+	local mult = ruleset.timer_base_multiplier or 1
+	return base * mult
+end
+
+-- Base PvP timer in seconds, accounting for the active ruleset's pvp_timer_base_multiplier
+-- (set by layers like pvp_timer). The multiplier is applied at timer-init sites,
+-- so the lobby UI keeps showing the unmultiplied base.
+function MP.UTILS.pvp_timer_base()
+    if not MP.is_layer_active("pvp_timer") then return MP.UTILS.timer_base() end
+    local ruleset = MP.current_ruleset()
+	local base = MP.LOBBY.config.pvp_timer_base_seconds or ruleset.pvp_timer_base_seconds or 90
+	local mult = ruleset.pvp_timer_base_multiplier or 1
 	return base * mult
 end
 

localization/en-us.lua

@@ -1286,7 +1286,23 @@ return {
 			k_opts_showdown_starting_antes = "Showdown Starts at Ante",
 			k_opts_pvp_timer_increment = "Timer Increment",
 			k_opts_pvp_countdown_seconds = "PvP Countdown Seconds",
-			k_opts_modifier_timer = "Timer Modifier",
+			k_opts_modifier_timer = "Timer Implementation",
+            k_experimental_modifiers_timers = {
+                "- Default: regular {C:chips}150{} {C:inactive}(1x){} seconds timer",
+                " ",
+                "- No Animations: {C:chips}100{} {C:inactive}(0.67x){} seconds timer {C:attention}minus animations{}",
+                " ",
+                "- Pressure: {C:chips}300{} {C:inactive}(2x){} seconds timer {C:attention}minus animations{}",
+                "  which starts {C:attention}immediately{}",
+                " ",
+                "- Pressure+: Same as {C:attention}Pressure{} plus {C:chips}15{} seconds per hand played",
+            },
+            b_opts_modifier_pvp_timer = "PvP Timer",
+            k_experimental_modifiers_pvp_timer = {
+                "- Timer which available during {C:mult}PvP{} rounds.",
+                "  {C:chips}90{} seconds plus {C:chips}15{} seconds per hand played {C:attention}minus animations{}.",
+                "  Can \"timer\" opponent only when you have {C:attention}higher{} score"
+            },
 			k_bl_life = "Life",
 			k_bl_or = "or",
 			k_bl_death = "Death",
@@ -1303,6 +1319,8 @@ return {
 			k_experimental = "Experimental",
 			k_experimental_standard = "Experimental (Standard)",
 			k_experimental_description = "Standard's bleeding edge.\n\nHeavier balance changes being trialed\nfor a future Standard ruleset.\nExpect things to shift between versions.\n\n(See bans and reworks tabs for details)",
+			k_experimental_no_balance = "Experimental (No Balance)",
+			k_experimental_no_balance_description = "Standard's bleeding edge.\n\nNo balance changes, only new features.\nExpect things to shift between versions.",
 			k_traditional = "Traditional",
 			k_traditional_description = "Multiplayer content without time pressure.\n\nIncludes Multiplayer jokers and balance changes,\nbut removes time-based mechanics for methodical play.\n\nTime-based jokers are banned.\nTimer is disabled.\n\n(See bans and reworks tabs for details)",
 			k_majorleague = "Major League",
@@ -1334,7 +1352,7 @@ return {
 			k_release = "Release Ver.",
 			k_release_description = "Allan please add details",
             k_mp_ruleset_tab_general = "General",
-            k_mp_ruleset_tab_torunaments = "Tournaments",
+            k_mp_ruleset_tab_tournaments = "Tournaments",
             k_mp_ruleset_tab_experimental = "Experimental",
 			k_cost_up = "Cost Up",
 			k_destabilized = "Destabilized",
@@ -1393,8 +1411,9 @@ return {
 			},
 			ml_mp_modifier_timer_opt = {
 				"Default",
-				"No Animation",
+				"No Animations",
 				"Pressure",
+				"Pressure+",
 			},
 			k_sc_title = "SHORTCUTS",
 			k_sc_hint = "Press key or release TAB to close",