diff --git a/objects/oGUI.iss b/objects/oGUI.iss index 756845d..62fdfbe 100644 --- a/objects/oGUI.iss +++ b/objects/oGUI.iss @@ -115,14 +115,16 @@ objectdef oGUI inherits oBase if ${UIElement[chkPartyMode@Overview@Pages@openbot].Checked} { Party.Uplink:Enable - return } + elseif !${UIElement[chkPartyMode@Overview@Pages@openbot].Checked} { Party.Uplink:Disable - return + } + break } case LogoutOnTimer { Bot.LogOutIn:Set[${Math.Calc[${LavishScript.RunningTime}+(${UIElement[sldLogOutIn@Logout@Pages@OpenBot].Value}*60000)]}] + break } case ForceHotspotSwitch { @@ -318,7 +320,7 @@ objectdef oGUI inherits oBase } case ForceLogout { - This:Output[Force Safe Logout] + This:Output["Force Safe Logout"] POI.NeedLogout:Set[TRUE] break } @@ -385,10 +387,12 @@ objectdef oGUI inherits oBase case ManualBlacklistPOI { POI:ManualBlacklistPOI + break } case ManualBlacklistPOITarget { POI:ManualBlacklistPOITarget + break } case BlacklistRemovePOI { @@ -461,29 +465,33 @@ objectdef oGUI inherits oBase break } case FoodRestock + { if ${UIElement[chkRestockFood@Restock@InvPages@Inventory@Pages@OpenBot].Checked} { FoodSupplyEnable:Set[TRUE] } - if !${UIElement[chkRestockFood@Restock@InvPages@Inventory@Pages@OpenBot].Checked} + elseif !${UIElement[chkRestockFood@Restock@InvPages@Inventory@Pages@OpenBot].Checked} { FoodSupplyEnable:Set[FALSE] } break - + } case AddFood + { FoodNumber:Set[${UIElement[FoodNumber@Restock@InvPages@Inventory@Pages@OpenBot].Text}] FoodName:Set[${UIElement[FoodName@Restock@InvPages@Inventory@Pages@OpenBot].Text}] FoodMerchant:Set["${UIElement[FoodMerchant@Restock@InvPages@Inventory@Pages@OpenBot].Text}"] break - + } case AddDrink + { DrinkNumber:Set[${UIElement[DrinkNumber@Restock@InvPages@Inventory@Pages@OpenBot].Text}] DrinkName:Set[${UIElement[DrinkName@Restock@InvPages@Inventory@Pages@OpenBot].Text}] DrinkMerchant:Set["${UIElement[DrinkMerchant@Restock@InvPages@Inventory@Pages@OpenBot].Text}"] break - + } case AmmoRestock + { if ${UIElement[chkRestockAmmo@Restock@InvPages@Inventory@Pages@OpenBot].Checked} { AmmoSupplyEnable:Set[TRUE] @@ -493,21 +501,24 @@ objectdef oGUI inherits oBase AmmoSupplyEnable:Set[FALSE] } break - + } case AddAmmo + { AmmoMerchant:Set["${UIElement[AmmoMerchant@Restock@InvPages@Inventory@Pages@OpenBot].Text}"] AmmoName:Set["${UIElement[AmmoName@Restock@InvPages@Inventory@Pages@OpenBot].Text}"] AmmoNumber:Set[${UIElement[AmmoNumber@Restock@InvPages@Inventory@Pages@OpenBot].Text}] break - + } case MapSettingChanged + { Mapper:OnGUIChange break - + } case BackupZone + { Mapper:BackupZone break - + } case MapLeftClick { MapEditor:LeftClick @@ -518,8 +529,8 @@ objectdef oGUI inherits oBase MapEditor:RightClick break } - case BGMode + { if ${UIElement[BGMode@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.BGMode:Set[TRUE] @@ -529,7 +540,9 @@ objectdef oGUI inherits oBase BG.BGMode:Set[FALSE] } break + } case BGLootMode + { if ${UIElement[BGLootMode@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.BGLootMode:Set[TRUE] @@ -539,111 +552,103 @@ objectdef oGUI inherits oBase BG.BGLootMode:Set[FALSE] } break + } case BGOne + { if ${UIElement[BGOne@Main@BGPages@BG@Pages@OpenBot].SelectedItem.Value(exists)} { BG.BGOne:Set[${UIElement[BGOne@Main@BGPages@BG@Pages@OpenBot].SelectedItem}] } break + } case BGTwo + { if ${UIElement[BGTwo@Main@BGPages@BG@Pages@OpenBot].SelectedItem.Value(exists)} { BG.BGTwo:Set[${UIElement[BGTwo@Main@BGPages@BG@Pages@OpenBot].SelectedItem}] } break + } case BGThree + { if ${UIElement[BGThree@Main@BGPages@BG@Pages@OpenBot].SelectedItem.Value(exists)} { BG.BGThree:Set[${UIElement[BGThree@Main@BGPages@BG@Pages@OpenBot].SelectedItem}] } break - + } ; AV Hotspots case VanndarStormpike { BGConfig:BGHotspotAdd[Vanndar Stormpike] - } break - + } case StormPikeAid { BGConfig:BGHotspotAdd[Aid Station] - } break - + } case StormPikeGY { BGConfig:BGHotspotAdd[Storm Pike GY] - } break - + } case StoneHearth { BGConfig:BGHotspotAdd[Stone Hearth GY] - } break - + } case Balinda { BGConfig:BGHotspotAdd[Balinda Stonehearth] - } break - + } case FieldofStrife { BGConfig:BGHotspotAdd[Field of Strife] - } break - + } case Galvangar { BGConfig:BGHotspotAdd[Galvangar] - } break - + } case IceBloodGY { BGConfig:BGHotspotAdd[Ice Blood GY] - } break - + } case TowerPoint { BGConfig:BGHotspotAdd[Tower Point] - } break - + } case FrostWolfGY { BGConfig:BGHotspotAdd[Frost Wolf GY] - } break - + } case ReliefHut { BGConfig:BGHotspotAdd[Relief Hut] - } break - + } case Drekthar { BGConfig:BGHotspotAdd[Drekthar] - } break - + } case AVGate { BGConfig:BGHotspotAdd[AVGate] - } break - + } ; Eye of the Storm case BloodElfTower { BGConfig:BGHotspotAdd[Blood Elf Tower] - } break - + } case DraeneiRuins { BGConfig:BGHotspotAdd[Draenei Ruins] @@ -652,99 +657,97 @@ objectdef oGUI inherits oBase case FelReaverRuins { BGConfig:BGHotspotAdd[Fel Reaver Ruins] - } break + } case MageTower { BGConfig:BGHotspotAdd[Mage Tower] - } break + } case Flag { BGConfig:BGHotspotAdd[Flag] - } break - + } case HordeFlag { BGConfig:BGHotspotAdd[HordeFlag] - } break + } case AllianceFlag { BGConfig:BGHotspotAdd[AllianceFlag] - } break + } case GraveyardAlliance { BGConfig:BGHotspotAdd[Graveyard Alliance] - } break + } case GraveyardHorde { BGConfig:BGHotspotAdd[Graveyard Horde] - } break + } case HordeRoof { BGConfig:BGHotspotAdd[Horde Roof] - } break + } case AlliRoof { BGConfig:BGHotspotAdd[Alli Roof] - } break + } case MiddleNorth { BGConfig:BGHotspotAdd[Middle North] - } break + } case MiddleSouth { BGConfig:BGHotspotAdd[Middle South] - } break + } case WSGGate { BGConfig:BGHotspotAdd[WSGGate] - } break - + } ; Arathi Basin case Blacksmith { BGConfig:BGHotspotAdd[Blacksmith] - } break + } case Farm { BGConfig:BGHotspotAdd[Farm] - } break + } case LumberMill { BGConfig:BGHotspotAdd[Lumber Mill] - } break + } case Mine { BGConfig:BGHotspotAdd[Mine] - } break + } case Stables { BGConfig:BGHotspotAdd[Stables] - } break + } case ABGate { BGConfig:BGHotspotAdd[ABGate] - } break - + } ; BG Guarding Shit case GlobalGuard + { if ${UIElement[GlobalGuard@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVGuard:Set[TRUE] @@ -752,7 +755,7 @@ objectdef oGUI inherits oBase BG.WSGGuard:Set[TRUE] BG.EOTSGuard:Set[TRUE] } - if !${UIElement[GlobalGuard@Main@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[GlobalGuard@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVGuard:Set[FALSE] BG.ABGuard:Set[FALSE] @@ -760,7 +763,9 @@ objectdef oGUI inherits oBase BG.EOTSGuard:Set[FALSE] } break + } case GlobalDefend + { if ${UIElement[GlobalDefend@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVDefend:Set[TRUE] @@ -768,7 +773,7 @@ objectdef oGUI inherits oBase BG.WSGDefend:Set[TRUE] BG.EOTSDefend:Set[TRUE] } - if !${UIElement[GlobalDefend@Main@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[GlobalDefend@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVDefend:Set[FALSE] BG.ABDefend:Set[FALSE] @@ -776,7 +781,9 @@ objectdef oGUI inherits oBase BG.EOTSDefend:Set[FALSE] } break + } case GlobalOffense + { if ${UIElement[GlobalOffense@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVOffense:Set[TRUE] @@ -784,7 +791,7 @@ objectdef oGUI inherits oBase BG.WSGOffense:Set[TRUE] BG.EOTSOffense:Set[TRUE] } - if !${UIElement[GlobalOffense@Main@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[GlobalOffense@Main@BGPages@BG@Pages@OpenBot].Checked} { BG.AVOffense:Set[FALSE] BG.ABOffense:Set[FALSE] @@ -792,145 +799,177 @@ objectdef oGUI inherits oBase BG.EOTSOffense:Set[FALSE] } break + } case AVGuard + { if ${UIElement[AVGuard@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVGuard:Set[TRUE] } - if !${UIElement[AVGuard@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[AVGuard@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVGuard:Set[FALSE] } break + } case AVOffense + { if ${UIElement[AVOffense@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVOffense:Set[TRUE] } - if !${UIElement[AVOffense@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[AVOffense@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVOffense:Set[FALSE] } break + } case AVDefend + { if ${UIElement[AVDefend@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVDefend:Set[TRUE] } - if !${UIElement[AVDefend@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[AVDefend@Alterac Valley@BGPages@BG@Pages@OpenBot].Checked} { BG.AVDefend:Set[FALSE] } break + } case ABGuard + { if ${UIElement[ABGuard@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABGuard:Set[TRUE] } - if !${UIElement[ABGuard@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[ABGuard@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABGuard:Set[FALSE] } break + } case ABOffense + { if ${UIElement[ABOffense@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABOffense:Set[TRUE] } - if !${UIElement[ABOffense@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[ABOffense@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABOffense:Set[FALSE] } break + } case ABDefend + { if ${UIElement[ABDefend@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABDefend:Set[TRUE] } - if !${UIElement[ABDefend@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[ABDefend@Arathi Basin@BGPages@BG@Pages@OpenBot].Checked} { BG.ABDefend:Set[FALSE] } break + } case WSGGuard + { if ${UIElement[WSGGuard@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGGuard:Set[TRUE] } - if !${UIElement[WSGGuard@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[WSGGuard@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGGuard:Set[FALSE] } break + } case WSGOffense + { if ${UIElement[WSGOffense@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGOffense:Set[TRUE] } - if !${UIElement[WSGOffense@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[WSGOffense@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGOffense:Set[FALSE] } break + } case WSGDefend + { if ${UIElement[WSGDefend@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGDefend:Set[TRUE] } - if !${UIElement[WSGDefend@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[WSGDefend@Warsong Gulch@BGPages@BG@Pages@OpenBot].Checked} { BG.WSGDefend:Set[FALSE] } break + } case EOTSGuard + { if ${UIElement[EOTSGuard@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSGuard:Set[TRUE] } - if !${UIElement[EOTSGuard@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[EOTSGuard@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSGuard:Set[FALSE] } break + } case EOTSOffense + { if ${UIElement[EOTSOffense@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSOffense:Set[TRUE] } - if !${UIElement[EOTSOffense@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[EOTSOffense@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSOffense:Set[FALSE] } break + } case EOTSDefend + { if ${UIElement[EOTSDefend@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSDefend:Set[TRUE] } - if !${UIElement[EOTSDefend@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} + elseif !${UIElement[EOTSDefend@Eye of the Storm@BGPages@BG@Pages@OpenBot].Checked} { BG.EOTSDefend:Set[FALSE] } break + } case AVGuardSpot + { if ${UIElement[AVGuardSpot@Alterac Valley@BGPages@BG@Pages@OpenBot].SelectedItem(exists)} { BG.AVGuardSpot:Set[${UIElement[AVGuardSpot@Alterac Valley@BGPages@BG@Pages@OpenBot].SelectedItem.Text}] } break + } case ABGuardSpot + { if ${UIElement[ABGuardSpot@Arathi Basin@BGPages@BG@Pages@OpenBot].SelectedItem(exists)} { BG.ABGuardSpot:Set[${UIElement[ABGuardSpot@Arathi Basin@BGPages@BG@Pages@OpenBot].SelectedItem.Text}] } break + } case WSGGuardSpot + { if ${UIElement[WSGGuardSpot@Warsong Gulch@BGPages@BG@Pages@OpenBot].SelectedItem(exists)} { BG.WSGGuardSpot:Set[${UIElement[WSGGuardSpot@Warsong Gulch@BGPages@BG@Pages@OpenBot].SelectedItem.Text}] } break + } case EOTSGuardSpot + { if ${UIElement[EOTSGuardSpot@Eye of the Storm@BGPages@BG@Pages@OpenBot].SelectedItem(exists)} { BG.EOTSGuardSpot:Set[${UIElement[EOTSGuardSpot@Eye of the Storm@BGPages@BG@Pages@OpenBot].SelectedItem.Text}] @@ -938,4 +977,5 @@ objectdef oGUI inherits oBase break } } + } } \ No newline at end of file