update for 12/11 event

inada-s · Dec 10, 2020 · a64959d · a64959d
1 parent 48edd42
commit a64959d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/gdxsv/lbs_lobby.go b/gdxsv/lbs_lobby.go
@@ -65,6 +65,15 @@ func NewLobby(app *Lbs, platform, disk string, lobbyID uint16) *LbsLobby {
 		lobby.Rule.ZeonMaskDC = MSMaskDCGundam | MSMaskDCGM | MSMaskDCGelgoogS | MSMaskDCGelgoog | MSMaskDCZgokS | MSMaskDCZgok
 	}
 
+	if lobby.LobbySetting.LowCostMSEvent {
+		lobby.Rule.RenpoMaskDC = MSMaskDCGuntank | MSMaskDCZgok | MSMaskDCZock | MSMaskDCGogg | MSMaskDCGouf | MSMaskDCGM | MSMaskDCZaku2S | MSMaskDCLGM | MSMaskDCAcguy | MSMaskDCZaku2 | MSMaskDCZaku1
+		lobby.Rule.ZeonMaskDC = MSMaskDCGuntank | MSMaskDCZgok | MSMaskDCZock | MSMaskDCGogg | MSMaskDCGouf | MSMaskDCGM | MSMaskDCZaku2S | MSMaskDCLGM | MSMaskDCAcguy | MSMaskDCZaku2 | MSMaskDCZaku1
+	}
+
+	if lobby.LobbySetting.UnlimitedAmmo {
+		lobby.Rule.ReloadFlag = 1
+	}
+
 	if 0 < lobby.LobbySetting.AutoReBattle {
 		lobby.Rule.AutoRebattle = byte(lobby.LobbySetting.AutoReBattle)
 	}

diff --git a/gdxsv/lbs_lobby_setting.go b/gdxsv/lbs_lobby_setting.go
@@ -28,8 +28,10 @@ type LobbySetting struct {
 	PingLimit           bool
 	No375MS             bool
 	Cost630             bool
+	UnlimitedAmmo       bool
 
-	BeamMSEvent bool
+	BeamMSEvent    bool
+	LowCostMSEvent bool
 }
 
 func init() {
@@ -137,23 +139,26 @@ func init() {
 			Comment:             "Free Lobby",
 		},
 		15: {
-			Name:        "ア・バオア・クー宙域",
-			McsRegion:   "best",
-			BeamMSEvent: true,
-			Comment:     "Event Lobby",
+			Name:           "ア・バオア・クー宙域",
+			McsRegion:      "best",
+			LowCostMSEvent: true,
+			UnlimitedAmmo:  true,
+			Comment:        "Event Lobby",
 		},
 		16: {
-			Name:        "ア・バオア・クー外部",
-			McsRegion:   "best",
-			BeamMSEvent: true,
-			Comment:     "Event Lobby",
+			Name:           "ア・バオア・クー外部",
+			McsRegion:      "best",
+			LowCostMSEvent: true,
+			UnlimitedAmmo:  true,
+			Comment:        "Event Lobby",
 		},
 		17: {
-			Name:        "ア・バオア・クー内部",
-			McsRegion:   "best",
-			BeamMSEvent: true,
-			TeamShuffle: true,
-			Comment:     "Event Lobby (TeamShuffle)",
+			Name:           "ア・バオア・クー内部",
+			McsRegion:      "best",
+			LowCostMSEvent: true,
+			UnlimitedAmmo:  true,
+			TeamShuffle:    true,
+			Comment:        "Event Lobby (TeamShuffle)",
 		},
 		18: {
 			// PS2 Only