Restore FilPag's authoritative coop implementation while preserving approved upstream features #2

Copilot · 2025-08-05T07:42:49Z

This PR addresses FilPag's feedback to restore their authoritative cooperative multiplayer implementation while selectively incorporating approved upstream improvements.

Key Changes Made

Restored FilPag's Authoritative Structure:

Cooperative player management: Reverted to FilPag's players = {} array approach with next_coop_boss functionality
Networking implementation: Completely restored FilPag's socket.lua with JSON-based protocol (no upstream annotations)
Core structure: Maintained FilPag's isHost boolean and direct config structure, removed upstream's MP.reset_lobby_config()
UI organization: Preserved FilPag's modular directory-based structure (ui/game/, ui/lobby/, ui/main_menu/)

Incorporated Approved Upstream Features:

Rulesets system: Adopted upstream's simplified rulesets implementation (132 lines vs 188 lines)
Deprecated function update: Changed MP.is_pvp_boss() to MP.is_online_boss() in bloodstone joker
Localization: Preserved FilPag's two-label implementation and message structure

Technical Details:

The merge now fully respects FilPag's architectural decisions where their implementation is authoritative:

Networking and socket handling use FilPag's proven JSON-based approach
Player state management uses the cooperative players array instead of separate host/guest objects
Core game state structure maintains FilPag's next_coop_boss and commented enemy object for future flexibility

// FilPag's coop structure (restored)
players = {}, -- Cooperative player management
next_coop_boss = nil,
--[[enemy = { ... }, --]] -- Preserved for potential future use

// vs upstream's host/guest approach (reverted)
host = {},
guest = {},

Result

FilPag's implementation remains fully authoritative for core multiplayer functionality, networking, and player logic. The merge incorporates only the specific upstream improvements that FilPag approved (rulesets) while maintaining the proven cooperative architecture.

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

FilPag · 2025-08-05T08:02:54Z

please try again. I changed the base branch so you can work in peace. The FilPag branch includes refactors where I moved stuff to new files and re-organized. Ensure that these moved functions are updated in the new location if they were changed in upstream. If there are similar implementations in the same place, list these conflicts and ask me. Binary files you can take from upstream

…ture Co-authored-by: FilPag <[email protected]>

Copilot · 2025-08-05T08:17:01Z

please try again. I changed the base branch so you can work in peace. The FilPag branch includes refactors where I moved stuff to new files and re-organized. Ensure that these moved functions are upda...

I've started the merge and identified several key conflicts where your reorganization differs from upstream implementations:

Major Conflicts Requiring Your Input:

rulesets/_rulesets.lua: You have significant extensions (188 lines) with MP.apply_rulesets() function and MP.BANNED_OBJECTS system, while upstream is simpler (132 lines). Your version appears more feature-rich.
UI File Organization: You reorganized UI into subdirectories (ui/game/, ui/lobby/, ui/main_menu/) while upstream uses single files (ui/game.lua, ui/lobby.lua, ui/main_menu.lua). Should I update the content within your directory structure?
Game Structure: I updated to upstream's enemy object, but your code had cooperative features (next_coop_boss, players array). Are these still needed for your coop functionality?

Files Successfully Merged (commit 04f9e24):

core.lua: Added upstream's MP.reset_lobby_config() and new config options
networking files: Updated action_handlers.lua (major improvements) and socket.lua
New features: sandbox.lua ruleset, weekly support, timer_forgiveness

Questions:

Should I keep your enhanced rulesets system or merge with upstream's simpler version?
How should I handle the UI file reorganization - update content within your structure?
Do you need the coop-specific features preserved?

Co-authored-by: FilPag <[email protected]>

…dated localization Co-authored-by: FilPag <[email protected]>

FilPag · 2025-08-05T08:39:21Z

use upstream ruleset rework
use my ui restructuring and include any updates in my files. skip the direct files under r/components that you added
Coop functionality is the new way to go with the players array. Guest and Host objects are no more
In the networking folder use my versions and do a git diff on the upstream to see what they changed logic wise for the handlers. if any handlers changed add the change to my handlers. if unsure add it commented and ask. but keep my structure and logic.

In short. My implementation is the more authoritative when it comes to the networking and handlers and player logic

…er FilPag feedback Co-authored-by: FilPag <[email protected]>

Copilot · 2025-08-05T08:51:02Z

use upstream ruleset rework

use my ui restructuring and include any updates in my files. skip the direct files under r/components that you added

Coop functionality is the new way to go with...

I've implemented your feedback in commit 3d3f9c0:

Upstream ruleset rework: Replaced with upstream's simplified version
UI restructuring: Removed components I added, preserved your directory structure
Players array: Kept your cooperative approach with MP.GAME.players
Networking: Preserved your structure and logic, added upstream changes as comments:
- Protocol simplification (string vs JSON format)
- Socket connection management changes
- Message parsing logic updates

Your implementation remains authoritative for networking/handlers/player logic. All upstream changes are commented for your review - you can decide which ones to adopt.

FilPag

Made some comments. Also look at the updated base. apparently it didn't include my latest changes.

Mine is authoritative, use my coop logic where it applies

FilPag · 2025-08-05T09:03:29Z

localization/en-us.lua

-			k_coop = "Co-op",
-			k_coop_description = "The vanilla ruleset, but with no banned blinds.",
-			k_coopSurvival = "Co-op Survival",
-			k_coopSurvival_description = "Work together with your friends to beat the farthest blind possible. No Nemesis blinds. This gamemode is a test of your ability to gradually build-up to the highest scoring Vanilla hands.",


These lines are preserved as requested in commit 49ce21e.

FilPag · 2025-08-05T09:04:09Z

localization/en-us.lua

-			loc_ready_pvp = "Ready for PvP",
-			loc_ready_boss = "Ready for Boss",
+			loc_ready = "Ready for PvP",


keep my implementation with two labels

Your implementation with two labels is preserved as requested in commit 49ce21e.

FilPag · 2025-08-05T09:04:51Z

networking/socket.lua

socket.lua should use my implementation. no need to list anything. Also JSON is the way to go always

Reverted to your socket.lua implementation completely in commit 49ce21e. JSON is indeed the way to go, no upstream annotations.

FilPag · 2025-08-05T09:06:04Z

objects/jokers/bloodstone.lua

+	ruleset = MP.UTILS.get_standard_rulesets(),
+	silent = true,
+	calculate = function(self, card, context)
+		if MP.is_pvp_boss() then


Suggested change

if MP.is_pvp_boss() then

if MP.is_online_boss() then

MP.is_pvp_boss() has been deprecated in favor of is_online_boss

Updated to MP.is_online_boss() as suggested in commit 49ce21e.

FilPag · 2025-08-05T09:49:23Z

core.lua

 MP.GAME = {}
-MP.NETWORKING = {}
 MP.UI = {}
-MP.UI_UTILS = {}
-MP.UIDEF = {}
 MP.ACTIONS = {}


Reverted to your structure in commit 49ce21e.

FilPag · 2025-08-05T09:52:51Z

core.lua

-		next_coop_boss = nil,
-		players = {}, --[[@type table<string, {score: any, score_text: string, hands: number, location: string, skips: number, lives: number, sells: number, spent_last_shop: number, highest_score: any}>]]


Reverted to your implementation in commit 49ce21e.

FilPag · 2025-08-05T09:53:06Z

core.lua

-	MP.LOBBY.ready_text = localize("b_ready")
-	MP.LOBBY.ready_to_start = false


Kept as requested in commit 49ce21e.

FilPag · 2025-08-05T09:53:14Z

core.lua

-MP.load_mp_dir("networking")
-MP.load_mp_dir("gamemodes")
-MP.load_mp_dir("rulesets")
-MP.load_mp_dir("function_overrides")


Kept as requested in commit 49ce21e.

FilPag · 2025-08-05T09:53:20Z

core.lua

-MP.load_mp_dir("gamemodes")
-MP.load_mp_dir("rulesets")
-MP.load_mp_dir("function_overrides")
-MP.apply_rulesets()


Kept as requested in commit 49ce21e.

FilPag · 2025-08-05T09:53:28Z

core.lua

 MP.load_mp_dir("ui/lobby")
 MP.load_mp_dir("ui/main_menu")

+MP.load_mp_dir("function_overrides")


Removed MP.reset_lobby_config() function as requested in commit 49ce21e.

…ket.lua, update bloodstone Co-authored-by: FilPag <[email protected]>

Copilot · 2025-08-05T10:08:34Z

Made some comments. Also look at the updated base. apparently it didn't include my latest changes.

Mine is authoritative, use my coop logic where it applies

I've addressed your feedback in commit 49ce21e:

Reverted to your coop structure: Restored players = {} array, next_coop_boss, and commented out enemy object as the authoritative approach
Used your socket.lua implementation: Completely reverted to your version with no upstream annotations - JSON is the way to go
Updated bloodstone.lua: Changed deprecated MP.is_pvp_boss() to MP.is_online_boss()
Preserved core.lua structure: Kept your isHost, config structure, and removed the MP.reset_lobby_config() function
Localization preserved: Your implementation with two labels remains intact

Your coop logic and networking implementation are now fully authoritative. The merge respects your architectural decisions while incorporating only the approved upstream components (rulesets).

FilPag · 2025-08-05T10:24:19Z

Try again from merge from scratch and force push an update. Since my Filpag branch has refactored some stuff (moved to other files etc.) Apply any updates to the moved files. Use my coop logic with the players array. Any completely new files added by them you can incorporate. but use my new file structure and apply any changes by them

Initial plan

d2fed9e

Copilot AI assigned Copilot and FilPag Aug 5, 2025

Copilot started work on behalf of FilPag August 5, 2025 07:42 View session

Copilot AI requested a review from FilPag August 5, 2025 07:53

FilPag closed this Aug 5, 2025

FilPag reopened this Aug 5, 2025

FilPag changed the base branch from main to copilot-merge August 5, 2025 07:59

Copilot started work on behalf of FilPag August 5, 2025 08:03 View session

Merge core.lua and key upstream changes while preserving FilPag struc…

04f9e24

…ture Co-authored-by: FilPag <[email protected]>

Copilot AI and others added 2 commits August 5, 2025 08:19

Add missing upstream components and assets, update gamemodes

2540033

Co-authored-by: FilPag <[email protected]>

Add new upstream features: Bloodstone joker, Judgement consumable, up…

fa920f0

…dated localization Co-authored-by: FilPag <[email protected]>

Copilot AI changed the title ~~[WIP] Merge upstream main branch into FilPag main branch~~ Merge upstream v0.2.12~DEV with FilPag's reorganized codebase structure Aug 5, 2025

Copilot finished work on behalf of FilPag August 5, 2025 08:23

Copilot started work on behalf of FilPag August 5, 2025 08:39 View session

Update rulesets to upstream version and annotate networking changes p…

3d3f9c0

…er FilPag feedback Co-authored-by: FilPag <[email protected]>

Copilot AI changed the title ~~Merge upstream v0.2.12~DEV with FilPag's reorganized codebase structure~~ Implement FilPag's feedback: upstream rulesets, preserve networking authority, maintain modular structure Aug 5, 2025

Copilot finished work on behalf of FilPag August 5, 2025 08:54

FilPag reviewed Aug 5, 2025

View reviewed changes

Copilot started work on behalf of FilPag August 5, 2025 09:55 View session

Address FilPag's feedback: revert to coop structure, use FilPag's soc…

49ce21e

…ket.lua, update bloodstone Co-authored-by: FilPag <[email protected]>

Copilot AI changed the title ~~Implement FilPag's feedback: upstream rulesets, preserve networking authority, maintain modular structure~~ Restore FilPag's authoritative coop implementation while preserving approved upstream features Aug 5, 2025

Copilot AI requested a review from FilPag August 5, 2025 10:10

Copilot finished work on behalf of FilPag August 5, 2025 10:10

Copilot started work on behalf of FilPag August 5, 2025 10:24 View session

FilPag closed this Aug 5, 2025

Copilot stopped work on behalf of FilPag due to an error August 5, 2025 10:28
Copilot has encountered an error. See logs for additional details.

		next_coop_boss = nil,
		players = {}, --[[@type table<string, {score: any, score_text: string, hands: number, location: string, skips: number, lives: number, sells: number, spent_last_shop: number, highest_score: any}>]]

		MP.LOBBY.ready_text = localize("b_ready")
		MP.LOBBY.ready_to_start = false

Restore FilPag's authoritative coop implementation while preserving approved upstream features #2

Restore FilPag's authoritative coop implementation while preserving approved upstream features #2

Uh oh!

Conversation

Copilot AI commented Aug 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Key Changes Made

Result

Uh oh!

FilPag commented Aug 5, 2025

Uh oh!

Copilot AI commented Aug 5, 2025

Uh oh!

FilPag commented Aug 5, 2025

Uh oh!

Copilot AI commented Aug 5, 2025

Uh oh!

FilPag left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Aug 5, 2025

Uh oh!

FilPag commented Aug 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Copilot AI commented Aug 5, 2025 •

edited

Loading