From 50a42545ec1e6d4d9cec89054cced74b7040065c Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Sat, 4 Jul 2026 12:14:46 +1000 Subject: [PATCH] bugfix: Remove superfluous borders from all Special Power buttons in the sidebar --- .../CommandButton/AmericaAirForceCommandButton.ini | 4 ---- .../Data/INI/CommandButton/AmericaCommandButton.ini | 12 ------------ .../INI/CommandButton/AmericaLaserCommandButton.ini | 1 - .../AmericaSuperWeaponCommandButton.ini | 3 --- .../Data/INI/CommandButton/ChinaCommandButton.ini | 10 ---------- .../INI/CommandButton/ChinaInfantryCommandButton.ini | 1 - .../INI/CommandButton/ChinaNukeCommandButton.ini | 3 --- .../INI/CommandButton/ChinaTankCommandButton.ini | 1 - .../INI/CommandButton/GC_GLAToxinCommandButton.ini | 1 - .../Data/INI/CommandButton/GLACommandButton.ini | 7 ------- .../INI/CommandButton/GLAStealthCommandButton.ini | 1 - .../Data/INI/CommandButton/GLAToxinCommandButton.ini | 1 - .../Data/INI/CommandButton/MiscCommandButton.ini | 5 ----- 13 files changed, 50 deletions(-) diff --git a/GeneralsZH/Data/INI/CommandButton/AmericaAirForceCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/AmericaAirForceCommandButton.ini index d55f9cc8..46ebf395 100644 --- a/GeneralsZH/Data/INI/CommandButton/AmericaAirForceCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/AmericaAirForceCommandButton.ini @@ -275,7 +275,6 @@ CommandButton AirF_Command_CarpetBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:CarpetBomb ButtonImage = SAB3Carpet - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CARPETBOMB DescriptLabel = CONTROLBAR:TooltipCarpetBomb @@ -299,7 +298,6 @@ CommandButton AirF_Command_DaisyCutterFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:DaisyCutterBomb ButtonImage = SACDaisyCutter - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = DAISYCUTTER DescriptLabel = CONTROLBAR:TooltipDaisyCutter @@ -325,7 +323,6 @@ CommandButton AirF_Command_A10ThunderboltMissileStrikeFromShortcut Science = AirF_SCIENCE_A10ThunderboltMissileStrike1 AirF_SCIENCE_A10ThunderboltMissileStrike2 AirF_SCIENCE_A10ThunderboltMissileStrike3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponA10ThunderboltMissileStrike ButtonImage = SSA10Attack - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = A10STRIKE DescriptLabel = CONTROLBAR:TooltipA10Strike @@ -351,7 +348,6 @@ CommandButton AirF_Command_SpectreGunshipFromShortcut Science = SCIENCE_SpectreGunship1 SCIENCE_SpectreGunship2 SCIENCE_SpectreGunship3 ; These will cause the buttons to change icons, nothing more TextLabel = CONTROLBAR:SpectreGunshipFromShortcut ButtonImage = SASpGunship - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = SPECTREGUNSHIP DescriptLabel = CONTROLBAR:TooltipSpectreGunship diff --git a/GeneralsZH/Data/INI/CommandButton/AmericaCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/AmericaCommandButton.ini index 84331a1d..55d16181 100644 --- a/GeneralsZH/Data/INI/CommandButton/AmericaCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/AmericaCommandButton.ini @@ -536,7 +536,6 @@ CommandButton Command_DaisyCutterFromShortcut Science = SCIENCE_DaisyCutter SCIENCE_MOAB ; These will cause the buttons to change icons, nothing more TextLabel = OBJECT:DaisyCutterBomb ButtonImage = SACDaisyCutter - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = DAISYCUTTER DescriptLabel = CONTROLBAR:TooltipDaisyCutter @@ -585,7 +584,6 @@ CommandButton Command_LeafletDropFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:LeafletDropShort ButtonImage = SALeaflet - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = DAISYCUTTER DescriptLabel = CONTROLBAR:TooltipLeafletDrop @@ -597,7 +595,6 @@ CommandButton Early_Command_LeafletDropFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:LeafletDropShort ButtonImage = SALeaflet - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = DAISYCUTTER DescriptLabel = CONTROLBAR:TooltipLeafletDrop @@ -621,7 +618,6 @@ CommandButton Command_FireParticleUplinkCannonFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND CAN_USE_WAYPOINTS TextLabel = CONTROLBAR:FireParticleUplinkCannonShortcut ButtonImage = SSParticleFire - ButtonBorderType = ACTION CursorName = ParticleUplinkCannon InvalidCursorName = GenericInvalid DescriptLabel = CONTROLBAR:TooltipFireParticleUplinkCannon @@ -647,7 +643,6 @@ CommandButton Command_ParadropFromShortcut Science = SCIENCE_Paradrop1 SCIENCE_Paradrop2 SCIENCE_Paradrop3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponParadropAmerica ButtonImage = SACParatroopers - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = PARADROP DescriptLabel = CONTROLBAR:TooltipParaDrop @@ -673,7 +668,6 @@ CommandButton Command_A10ThunderboltMissileStrikeFromShortcut Science = SCIENCE_A10ThunderboltMissileStrike1 SCIENCE_A10ThunderboltMissileStrike2 SCIENCE_A10ThunderboltMissileStrike3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponA10ThunderboltMissileStrike ButtonImage = SSA10Attack - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = A10STRIKE DescriptLabel = CONTROLBAR:TooltipA10Strike @@ -699,7 +693,6 @@ CommandButton Command_SpectreGunshipFromShortcut Science = SCIENCE_SpectreGunshipSolo ; These will cause the buttons to change icons, nothing more TextLabel = CONTROLBAR:SpectreGunshipFromShortcut ButtonImage = SASpGunship - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = SPECTREGUNSHIP DescriptLabel = CONTROLBAR:TooltipSpectreGunship @@ -723,7 +716,6 @@ CommandButton Command_SpyDroneFromShortcut Options = NEED_TARGET_POS CONTEXTMODE_COMMAND NEED_SPECIAL_POWER_SCIENCE OK_FOR_MULTI_SELECT TextLabel = OBJECT:SpyDrone ButtonImage = SAScout - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = SPYDRONE DescriptLabel = CONTROLBAR:TooltipFireSpyDrone @@ -745,7 +737,6 @@ CommandButton Command_CIAIntelligenceFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE TextLabel = CONTROLBAR:CIAIntelligenceShortcut ButtonImage = SSCIA - ButtonBorderType = ACTION DescriptLabel = CONTROLBAR:TooltipCIAIntelligence End @@ -1058,7 +1049,6 @@ CommandButton Command_SelectAircraftCarriersFromShortcut Object = AmericaAircraftCarrier TextLabel = CONTROLBAR:SelectAircraftCarriersFromShortcut ButtonImage = SAcarrier - ButtonBorderType = ACTION DescriptLabel = CONTROLBAR:ToolTipSelectAircraftCarriers End @@ -1067,7 +1057,6 @@ End ; Object = AmericaVehicleBattleShipDemo ; TextLabel = CONTROLBAR:SelectBattleshipsFromShortcut ; ButtonImage = SABattleship -; ButtonBorderType = ACTION ; DescriptLabel = CONTROLBAR:ToolTipSelectBattleships ; End @@ -1077,7 +1066,6 @@ CommandButton Command_SelectBattleshipsFromShortcut Options = OK_FOR_MULTI_SELECT NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:BattleshipFire ButtonImage = SABattleship - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = ARTILLERYBARRAGE DescriptLabel = CONTROLBAR:ToolTipFireBattleship diff --git a/GeneralsZH/Data/INI/CommandButton/AmericaLaserCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/AmericaLaserCommandButton.ini index 98b5b8d5..dc126658 100644 --- a/GeneralsZH/Data/INI/CommandButton/AmericaLaserCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/AmericaLaserCommandButton.ini @@ -52,7 +52,6 @@ CommandButton Lazr_Command_FireLaserCannonFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND CAN_USE_WAYPOINTS TextLabel = CONTROLBAR:FireParticleUplinkCannonShortcut ButtonImage = SSParticleFire - ButtonBorderType = ACTION CursorName = ParticleUplinkCannon InvalidCursorName = GenericInvalid DescriptLabel = OBJECT:TooltipFireParticleUplinkCannon diff --git a/GeneralsZH/Data/INI/CommandButton/AmericaSuperWeaponCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/AmericaSuperWeaponCommandButton.ini index faacbe7f..69e39a00 100644 --- a/GeneralsZH/Data/INI/CommandButton/AmericaSuperWeaponCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/AmericaSuperWeaponCommandButton.ini @@ -335,7 +335,6 @@ CommandButton SupW_Command_NeutronMissileFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:ICBMShortcut ButtonImage = SNNukeLaunch - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NUCLEARMISSILE DescriptLabel = CONTROLBAR:TooltipFireNukeMissile @@ -359,7 +358,6 @@ CommandButton SupW_Command_CruiseMissileFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:ICBMShortcut ButtonImage = SNNukeLaunch - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NUCLEARMISSILE DescriptLabel = CONTROLBAR:TooltipFireNukeMissile @@ -392,7 +390,6 @@ CommandButton SupW_Command_FireParticleUplinkCannonFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND CAN_USE_WAYPOINTS TextLabel = CONTROLBAR:FireParticleUplinkCannonShortcut ButtonImage = SSParticleFire - ButtonBorderType = ACTION CursorName = ParticleUplinkCannon InvalidCursorName = GenericInvalid DescriptLabel = CONTROLBAR:TooltipFireParticleUplinkCannon diff --git a/GeneralsZH/Data/INI/CommandButton/ChinaCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/ChinaCommandButton.ini index 76ebfc66..b97c7d55 100644 --- a/GeneralsZH/Data/INI/CommandButton/ChinaCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/ChinaCommandButton.ini @@ -28,7 +28,6 @@ CommandButton Command_ChinaCarpetBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:CarpetBomb ButtonImage = SNCBomber - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CARPETBOMB DescriptLabel = CONTROLBAR:TooltipCarpetBomb @@ -40,7 +39,6 @@ CommandButton Early_Command_ChinaCarpetBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:CarpetBomb ButtonImage = SNCBomber - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CARPETBOMB DescriptLabel = CONTROLBAR:TooltipCarpetBomb @@ -714,7 +712,6 @@ CommandButton Command_NapalmStrikeFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = GUI:SuperweaponNapalmStrike ButtonImage = SNFirestorm - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NAPALMSTRIKE DescriptLabel = CONTROLBAR:TempDescription @@ -738,7 +735,6 @@ CommandButton Command_ClusterMinesFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:ClusterMinesBomb ButtonImage = SSClusterMines - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CLUSTERMINES DescriptLabel = CONTROLBAR:TooltipClusterMines @@ -762,7 +758,6 @@ CommandButton Command_EMPPulseFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:EMPPulseBomb ButtonImage = SSEMP - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = EMPPULSE DescriptLabel = CONTROLBAR:TooltipEMPPulse @@ -786,7 +781,6 @@ CommandButton Command_NeutronMissileFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:NeutronMissileShortcut ButtonImage = SNNukeLaunch - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NUCLEARMISSILE DescriptLabel = CONTROLBAR:TooltipFireNukeMissile @@ -812,7 +806,6 @@ CommandButton Command_ArtilleryBarrageFromShortcut Science = SCIENCE_ArtilleryBarrage1 SCIENCE_ArtilleryBarrage2 SCIENCE_ArtilleryBarrage3 ; These will cause the buttons to change icons, nothing more TextLabel = CONTROLBAR:NoHotKeyArtilleryBarrage ButtonImage = SSBarrage - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = ARTILLERYBARRAGE DescriptLabel = CONTROLBAR:TooltipFireArtilleryBarrage @@ -838,7 +831,6 @@ CommandButton Command_FrenzyFromShortcut Science = SCIENCE_Frenzy1 SCIENCE_Frenzy2 SCIENCE_Frenzy3 ; These will cause the buttons to change icons, nothing more TextLabel = CONTROLBAR:NoHotKeyFrenzy ButtonImage = SNFrenzy01 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = FRENZY DescriptLabel = CONTROLBAR:TooltipFrenzy @@ -864,7 +856,6 @@ CommandButton Early_Command_FrenzyFromShortcut Science = Early_SCIENCE_Frenzy1 Early_SCIENCE_Frenzy2 Early_SCIENCE_Frenzy3 ; These will cause the buttons to change icons, nothing more TextLabel = CONTROLBAR:NoHotKeyFrenzy ButtonImage = SNFrenzy01 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = FRENZY DescriptLabel = CONTROLBAR:TooltipFrenzy @@ -890,7 +881,6 @@ CommandButton Command_CashHackFromShortcut Science = SCIENCE_CashHack1 SCIENCE_CashHack2 SCIENCE_CashHack3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponCashHack ButtonImage = SSCashHack - ; ButtonBorderType = ACTION CursorName = Hack InvalidCursorName = GenericInvalid DescriptLabel = CONTROLBAR:TooltipFireSuperWeaponCashHack diff --git a/GeneralsZH/Data/INI/CommandButton/ChinaInfantryCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/ChinaInfantryCommandButton.ini index 0cdf30fd..872dcd79 100644 --- a/GeneralsZH/Data/INI/CommandButton/ChinaInfantryCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/ChinaInfantryCommandButton.ini @@ -131,7 +131,6 @@ CommandButton Infa_Command_ParadropFromShortcut Science = Infa_SCIENCE_InfantryParadrop1 Infa_SCIENCE_InfantryParadrop2 Infa_SCIENCE_InfantryParadrop3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponParadropAmerica ButtonImage = SACParatroopers - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = PARADROP DescriptLabel = CONTROLBAR:Infa_TooltipParaDrop diff --git a/GeneralsZH/Data/INI/CommandButton/ChinaNukeCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/ChinaNukeCommandButton.ini index b6dffa48..781cfc0d 100644 --- a/GeneralsZH/Data/INI/CommandButton/ChinaNukeCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/ChinaNukeCommandButton.ini @@ -16,7 +16,6 @@ CommandButton Nuke_Command_ChinaCarpetBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:Nuke_CarpetBomb ButtonImage = SSNkeCrptBmb - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CARPETBOMB DescriptLabel = CONTROLBAR:Nuke_TooltipCarpetBomb @@ -343,7 +342,6 @@ CommandButton Nuke_Command_NukeDropFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:NukeDrop ButtonImage = SNNukeBomb - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NUCLEARMISSILE DescriptLabel = CONTROLBAR:TooltipNukeDrop @@ -384,7 +382,6 @@ CommandButton Nuke_Command_NeutronMissileFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:NeutronMissileShortcut ButtonImage = SNNukeLaunch - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = NUCLEARMISSILE DescriptLabel = CONTROLBAR:TooltipFireNukeMissile diff --git a/GeneralsZH/Data/INI/CommandButton/ChinaTankCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/ChinaTankCommandButton.ini index 6dc696a2..d4f3582b 100644 --- a/GeneralsZH/Data/INI/CommandButton/ChinaTankCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/ChinaTankCommandButton.ini @@ -235,7 +235,6 @@ CommandButton Tank_Command_TankParadropFromShortcut Science = SCIENCE_TankParadrop1 SCIENCE_TankParadrop2 SCIENCE_TankParadrop3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponTankParadrop ButtonImage = SNBattlemaster - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = PARADROP DescriptLabel = CONTROLBAR:TooltipTankParaDrop diff --git a/GeneralsZH/Data/INI/CommandButton/GC_GLAToxinCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/GC_GLAToxinCommandButton.ini index 730b52db..013c3e7a 100644 --- a/GeneralsZH/Data/INI/CommandButton/GC_GLAToxinCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/GC_GLAToxinCommandButton.ini @@ -246,7 +246,6 @@ CommandButton GC_Chem_Command_AmbushFromShortcut Science = SCIENCE_RebelAmbush1 SCIENCE_RebelAmbush2 SCIENCE_RebelAmbush3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponRebelAmbush ButtonImage = SUToxAmbsh1 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = AMBUSH DescriptLabel = CONTROLBAR:TooltipFireRebelAmbush diff --git a/GeneralsZH/Data/INI/CommandButton/GLACommandButton.ini b/GeneralsZH/Data/INI/CommandButton/GLACommandButton.ini index 80049b28..581d9f9f 100644 --- a/GeneralsZH/Data/INI/CommandButton/GLACommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/GLACommandButton.ini @@ -666,7 +666,6 @@ CommandButton Command_ScudStormFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:ScudStormShortcut ButtonImage = SSScudStorm - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = SCUDSTORM DescriptLabel = CONTROLBAR:TooltipFireSCUDStorm @@ -690,7 +689,6 @@ CommandButton Command_SpySatelliteScanFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = CONTROLBAR:NoHotKeySpySatellite ButtonImage = SSSpySat - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = SPYSATELLITE DescriptLabel = CONTROLBAR:TooltipFireSpySatScan @@ -716,7 +714,6 @@ CommandButton Command_RadarVanScanFromShortcut Upgrade = Upgrade_GLARadarVanScan TextLabel = CONTROLBAR:RadarVanScanShortcut ButtonImage = SSRadarVanScan - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = RADAR DescriptLabel = CONTROLBAR:TooltipFireRadarVanScan @@ -768,7 +765,6 @@ CommandButton Command_AmbushFromShortcut Science = SCIENCE_RebelAmbush1 SCIENCE_RebelAmbush2 SCIENCE_RebelAmbush3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponRebelAmbush ButtonImage = SSGLAAmbush - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = AMBUSH DescriptLabel = CONTROLBAR:TooltipFireRebelAmbush @@ -794,7 +790,6 @@ CommandButton Command_GPSScramblerFromShortcut Science = SCIENCE_GPSScrambler TextLabel = GUI:SuperweaponGPSScrambler ButtonImage = SUGPS01 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = RADAR DescriptLabel = CONTROLBAR:TooltipFireGPSScrambler @@ -818,7 +813,6 @@ CommandButton Command_AnthraxBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:AnthraxBomb ButtonImage = SSAnthraxBomb - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = ANTHRAXBOMB DescriptLabel = CONTROLBAR:TooltipFireAnthraxBomb @@ -1002,7 +996,6 @@ CommandButton Command_SneakAttackFromShortcut Object = GLASneakAttackTunnelNetwork TextLabel = CONTROLBAR:SneakAttackShort ButtonImage = SUSneakAttack - ButtonBorderType = ACTION DescriptLabel = CONTROLBAR:ToolTipGLASneakAttack End diff --git a/GeneralsZH/Data/INI/CommandButton/GLAStealthCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/GLAStealthCommandButton.ini index 746d1aa6..6f56452f 100644 --- a/GeneralsZH/Data/INI/CommandButton/GLAStealthCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/GLAStealthCommandButton.ini @@ -30,7 +30,6 @@ CommandButton Slth_Command_GPSScramblerFromShortcut Science = Slth_SCIENCE_GPSScrambler TextLabel = GUI:SuperweaponGPSScrambler ButtonImage = SUGPS01 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = RADAR DescriptLabel = CONTROLBAR:TooltipFireGPSScrambler diff --git a/GeneralsZH/Data/INI/CommandButton/GLAToxinCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/GLAToxinCommandButton.ini index eff9d474..1ec45f17 100644 --- a/GeneralsZH/Data/INI/CommandButton/GLAToxinCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/GLAToxinCommandButton.ini @@ -126,7 +126,6 @@ CommandButton Chem_Command_AmbushFromShortcut Science = SCIENCE_RebelAmbush1 SCIENCE_RebelAmbush2 SCIENCE_RebelAmbush3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponRebelAmbush ButtonImage = SUToxAmbsh1 - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = AMBUSH DescriptLabel = CONTROLBAR:Chem_TooltipFireRebelAmbush diff --git a/GeneralsZH/Data/INI/CommandButton/MiscCommandButton.ini b/GeneralsZH/Data/INI/CommandButton/MiscCommandButton.ini index eb6a3b14..9e7e1071 100644 --- a/GeneralsZH/Data/INI/CommandButton/MiscCommandButton.ini +++ b/GeneralsZH/Data/INI/CommandButton/MiscCommandButton.ini @@ -44,7 +44,6 @@ CommandButton Command_CrateDropFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = GUI:SuperweaponCrateDrop ButtonImage = SCTempDefaultCommand - ; ButtonBorderType = ACTION CursorName = DaisyCutter InvalidCursorName = GenericInvalid DescriptLabel = CONTROLBAR:TooltipCrateDrop @@ -70,7 +69,6 @@ CommandButton Command_CarpetBombFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE NEED_TARGET_POS CONTEXTMODE_COMMAND TextLabel = OBJECT:CarpetBomb ButtonImage = SSCarpetBomb - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = CARPETBOMB DescriptLabel = CONTROLBAR:TooltipCarpetBomb @@ -102,7 +100,6 @@ CommandButton Command_CommunicationsDownloadFromShortcut Options = NEED_SPECIAL_POWER_SCIENCE TextLabel = CONTROLBAR:CommunicationsDownloadShortcut ButtonImage = SSCIA - ButtonBorderType = ACTION DescriptLabel = CONTROLBAR:TooltipCommunicationsDownload End @@ -126,7 +123,6 @@ CommandButton Command_EmergencyRepairFromShortcut Science = SCIENCE_EmergencyRepair1 SCIENCE_EmergencyRepair2 SCIENCE_EmergencyRepair3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponEmergencyRepair ButtonImage = SSRepair - ; ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = EMERGENCY_REPAIR DescriptLabel = CONTROLBAR:TooltipFireEmergencyRepair @@ -152,7 +148,6 @@ CommandButton Early_Command_EmergencyRepairFromShortcut Science = Early_SCIENCE_EmergencyRepair1 Early_SCIENCE_EmergencyRepair2 Early_SCIENCE_EmergencyRepair3 ; These will cause the buttons to change icons, nothing more TextLabel = GUI:SuperweaponEmergencyRepair ButtonImage = SSRepair - ButtonBorderType = ACTION InvalidCursorName = GenericInvalid RadiusCursorType = EMERGENCY_REPAIR DescriptLabel = CONTROLBAR:TooltipFireEmergencyRepair