VERSION{v1.14.4.0}

Reset PW notification to default off for everyone.
Fix activity prompt with zero charges.
Text tweak.

Author: GoogleFrog

LuaMenu/widgets/chobby/components/configuration.lua

@@ -210,7 +210,7 @@ function Configuration:init()
 	self.lastLoginChatLength = 25
 	self.notifyForAllChat = true
 	self.autosaveOnMatchmaker = true
-	self.planetwarsNotifications = false -- Possibly too intrusive? See how it goes.
+	self.planetwarsNotifications2 = false -- Possibly too intrusive? See how it goes.
 	self.ingameNotifcations = true -- Party, chat
 	self.nonFriendNotifications = true -- Party, chat
 	self.friendNotifyIngame = true
@@ -583,7 +583,7 @@ function Configuration:GetConfigData()
 		animate_lobby = self.animate_lobby,
 		game_settings = self.game_settings,
 		notifyForAllChat = self.notifyForAllChat,
-		planetwarsNotifications = self.planetwarsNotifications,
+		planetwarsNotifications2 = self.planetwarsNotifications2,
 		ingameNotifcations = self.ingameNotifcations,
 		nonFriendNotifications = self.nonFriendNotifications,
 		friendNotifyIngame = self.friendNotifyIngame,

LuaMenu/widgets/gui_planetwars_list_window.lua

@@ -169,6 +169,10 @@ local function GetActivityToPrompt(lobby, attackerFactions, defenderFactions, cu
 			return myPlanet, attackPhase, true, not attackPhase
 		end
 	end
+	
+	if attackPhase and lobby.planetwarsData.charges == 0 then
+		return false -- Cannot attack with no charges
+	end
 
 	if IsPhaseUrgent() then
 		local targetPlanet, minMissing
@@ -469,7 +473,7 @@ local function InitializeActivityPromptHandler()
 		end
 		newNotification = false
 		oldIsAttacker = isAttacker
-		if not Configuration.planetwarsNotifications then
+		if not Configuration.planetwarsNotifications2 then
 			return
 		end
 		if WG.WrapperLoopback then
@@ -492,7 +496,6 @@ local function InitializeActivityPromptHandler()
 			Spring.SetConfigString("snd_volui", snd_volui)
 			Spring.SetConfigString("snd_volmaster", snd_volmaster)
 		end, 10)
-
 	end
 
 	holder.OnResize = {Resize}
@@ -1388,9 +1391,9 @@ local function InitializeControls(window)
 
 		if attackPhase then
 			if charges == 0 then
-				statusText:SetText("You are out of attack charges. Regain charges by defending or waiting for the recharge timer.")
+				statusText:SetText("You are out of attack charges. Gain charges by defending or over time.")
 			else
-				statusText:SetText("Select a planet to attack and wait for allies to join you. Attacks lock at the end of the phase and request defenders.")
+				statusText:SetText("Select a planet to attack. Invasions with enough players are locked at the end of the phase and sent to the defenders.")
 			end
 			if planets then
 				UpdatePlanetStatusData(attackPhase, planets)

LuaMenu/widgets/gui_settings_window.lua

@@ -980,7 +980,7 @@ local function GetLobbyTabControls()
 	end
 	children[#children + 1], offset = AddCheckboxSetting(offset, "Multiplayer in new window", "multiplayerLaunchNewSpring", true)
 	if not Configuration.gameConfig.disablePlanetwars then
-		children[#children + 1], offset = AddCheckboxSetting(offset, i18n("planetwars_notifications"), "planetwarsNotifications", false)
+		children[#children + 1], offset = AddCheckboxSetting(offset, i18n("planetwars_notifications"), "planetwarsNotifications2", false)
 	end
 
 	children[#children + 1], offset = AddCheckboxSetting(offset, "Autosave SP on matchmaker", "autosaveOnMatchmaker", true)

modinfo.lua

@@ -19,3 +19,4 @@ local modinfo = {
 }
 
 return modinfo
+