Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
@boludoz
boludoz committed Jun 7, 2022
1 parent dc29995 commit 3034273
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 38 deletions.
25 changes: 16 additions & 9 deletions COCBot/MBR Global Variables.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,9 @@ Global Enum $eIcnArcher = 1, $eIcnDonArcher, $eIcnBalloon, $eIcnDonBalloon, $eIc
$eIcnMachineA, $eIcnHeadhunter, $eIcnDiscord, $eIcnCollectAchievements, _ ; Team__AiO__MOD
$eIcnInvisibilitySpell, $eIcnLogL, _ ; Team__AiO__MOD
$eIcnSuperBarbarian, $eIcnSuperArcher, $eIcnSuperGiant, $eIcnSneakyGoblin, $eIcnSuperWallBreaker, $eIcnSuperWizard, $eIcnInfernoDragon, $eIcnSuperMinion, $eIcnSuperValkyrie, $eIcnSuperWitch, $eIcnIceHound, _
$eIcnPetLassi, $eIcnPetElectroOwl, $eIcnPetMightyYak, $eIcnPetUnicorn, $eIcnTH14, $eWall15, $eIcnPetHouse, $eIcnRocketBalloon, $eIcnDragonRider, $eHdV14, $eIcnSuperBowler, $eIcnFlameF, $eIcnSuperDragon, _ ; Team__AiO__MOD
$eIcnSleepingChampion, $eIcnSiegePets; Team__AiO__MOD
$eIcnPetLassi, $eIcnPetElectroOwl, $eIcnPetMightyYak, $eIcnPetUnicorn, $eIcnTH14, $eWall15, $eIcnPetHouse, $eIcnRocketBalloon, $eIcnDragonRider, $eHdV14, $eIcnSuperBowler, $eIcnSuperDragon, $eIcnFlameF, _ ; Team__AiO__MOD
$eIcnSleepingChampion, $eIcnSiegePets, _ ; Team__AiO__MOD
$eIcnClanCapital, $eIcnCapitalGold, $eIcnCapitalMedal

Global $eIcnDonBlank = $eIcnDonBlacklist
Global $eIcnOptions = $eIcnDonBlacklist
Expand Down Expand Up @@ -648,11 +649,11 @@ Global Const $DROPLINE_DROPPOINTS_ONLY = 4
; Standard Enums and Consts - Attacks, Troops, Spells, Leagues, Loot Types
;--------------------------------------------------------------------------
; Complete list of all deployable/trainable objects
Global Enum $eBarb, $eSBarb, $eArch, $eSArch, $eGiant, $eSGiant, $eGobl, $eSGobl, $eWall, $eSWall, $eBall, $eRBall, $eWiza, $eSWiza, $eHeal, $eDrag, $eSDrag, $ePekk, $eBabyD, $eInfernoD, $eMine, $eEDrag, $eYeti, $eRDrag, _ ; 23
$eMini, $eSMini, $eHogs, $eValk, $eSValk, $eGole, $eWitc, $eSWitc, $eLava, $eIceH, $eBowl, $eSBowl, $eIceG, $eHunt, _ ; 37
$eKing, $eQueen, $eWarden, $eChampion, $eCastle, _ ; 42
$eLSpell, $eHSpell, $eRSpell, $eJSpell, $eFSpell, $eCSpell, $eISpell, $ePSpell, $eESpell, $eHaSpell, $eSkSpell, $eBtSpell, _ ; 54
$eWallW, $eBattleB, $eStoneS, $eSiegeB, $eLogL, $eFlameF, $eArmyCount ; 63
Global Enum $eBarb, $eSBarb, $eArch, $eSArch, $eGiant, $eSGiant, $eGobl, $eSGobl, $eWall, $eSWall, $eBall, $eRBall, $eWiza, $eSWiza, $eHeal, $eDrag, $eSDrag, $ePekk, $eBabyD, $eInfernoD, $eMine, $eEDrag, $eYeti, $eRDrag, _
$eMini, $eSMini, $eHogs, $eValk, $eSValk, $eGole, $eWitc, $eSWitc, $eLava, $eIceH, $eBowl, $eSBowl, $eIceG, $eHunt, _
$eKing, $eQueen, $eWarden, $eChampion, $eCastle, _
$eLSpell, $eHSpell, $eRSpell, $eJSpell, $eFSpell, $eCSpell, $eISpell, $ePSpell, $eESpell, $eHaSpell, $eSkSpell, $eBtSpell, _
$eWallW, $eBattleB, $eStoneS, $eSiegeB, $eLogL, $eFlameF, $eArmyCount

; Attack types
Global Enum $DB, $LB, $TB, $DT ; DeadBase, ActiveBase, TownhallBully, DropTrophy
Expand All @@ -671,7 +672,7 @@ Global Const $g_asTroopNames[$eTroopCount] = [ _
"Lava Hound", "Ice Hound", "Bowler", "Super Bowler", "Ice Golem", "Headhunter"]
Global Const $g_asTroopNamesPlural[$eTroopCount] = [ _
"Barbarians", "Super Barbarians", "Archers", "Super Archers", "Giants", "Super Giants", "Goblins", "Sneaky Goblins", "Wall Breakers", "Super Wall Breakers", "Balloons", "Rocket Balloons", "Wizards", "Super Wizards", "Healers", _
"Dragons", "Super Dragons", "Pekkas", "Baby Dragons", "Inferno Dragons", "Miners", "Electro Dragons", "Yetis", "Dragon Riders", "Minions", "Super Minions", "Hog Riders", "Valkyries", "Super Valkyries", "Golems", "Witches", "Super Witches", _
"Dragons", "Super Dragons", "Pekkas", "Baby Dragons", "Inferno Dragons", "Miners", "Electro Dragons", "Yetis", "Dragon Riders", "Minions", "Super Minions", "Hog Riders", "Valkyries", "Super Valkyries", "Golems", "Witches", "Super Witchs", _
"Lava Hounds", "Ice Hounds", "Bowlers", "Super Bowlers", "Ice Golems", "Headhunters"]
Global Const $g_asTroopShortNames[$eTroopCount] = [ _
"Barb", "SBarb", "Arch", "SArch", "Giant", "SGiant", "Gobl", "SGobl", "Wall", "SWall", "Ball", "RBall", "Wiza", "SWiza", "Heal", "Drag", "SDrag", "Pekk", "BabyD", "InfernoD", "Mine", "EDrag", "Yeti", "RDrag", _
Expand Down Expand Up @@ -2068,4 +2069,10 @@ Global $IMGLOCTHRDISTANCE
; Team AiO MOD++ (2019)
#include "Team__AiO__MOD++\Globals_Team__AiO__MOD++.au3"

Global $g_bIsModeActive[$g_iModeCount]
Global $g_bIsModeActive[$g_iModeCount]

;ClanCapital
Global $g_iLootCCGold = 0, $g_iLootCCMedal = 0, $g_bChkEnableAutoUpgradeCC = False, $g_bChkAutoUpgradeCCIgnore = False
Global $g_bChkEnableCollectCCGold = False, $g_bChkEnableForgeGold = False, $g_bChkEnableForgeElix = False
Global $g_bChkEnableForgeDE = False, $g_bChkEnableForgeBBGold = False, $g_bChkEnableForgeBBElix = False, $g_iCmbForgeBuilder = 0
Global $aCCBuildingIgnore[9] = ["Grove", "Tree", "Forest", "Campsite", "Stone Circle", "Stone", "Pillar", "Forest Circle", "The First"]
30 changes: 1 addition & 29 deletions COCBot/Team__AiO__MOD++/Globals_Team__AiO__MOD++.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,32 +786,4 @@ Global $g_bIsCaravanOn = "Undefined" ; Custom BB - Team AIO Mod++
Global $g_bNewUpdateMainVillage = False, $g_hChkAutoBuildNew = 0

; Android version
Global $g_hLblAndroidInfo = 0


; Grumpy hog - My respects for him.
; Spring, Autumn, Clashy, Pirate, Epic Winter, Hog Mountain, Jungle, Epic Jungle, 9th Clash, PumpKin GraveYard, Snow Day, Tiger Mountain, Primal(PR), Shadow(SH), Royale
Global Enum $eTreeDS, $eTreeAS, $eTreeCC, $eTreePS, $eTreeEW, $eTreeHM, $eTreeJS, $eTreeEJ, $eTree9C, $eTreePG, $eTreeSD, $eTreeTM, $eTreePR, $eTreeSH, $eTreeRS, $eTreeCS, $eTreeIT, $eTreeCount
Global Const $g_aThemesNames[$eTreeCount] = ["DS", "AS", "CC", "PS", "EW", "HM", "JS", "EJ", "9C", "PG", "TM", "PR", "SH", "CS", "IT"]


Global Const $g_afRefVillage[$eTreeCount][5] = [ _
[481.536485225372, 35, 809, 57, 632], _ ; DS
[480, 35, 809, 57, 632], _ ; AS
[481.359352186882, 35, 809, 57, 632], _ ; CC
[487.190577721375, 35, 809, 57, 632], _ ; PS
[485.292934467294, 35, 809, 57, 632], _ ; EW
[479.574528317581, 35, 809, 57, 632], _ ; HM
[480.758630217939, 35, 809, 57, 632], _ ; JS
[481.531257240053, 35, 809, 57, 632], _ ; EJ
[481.956344570969, 35, 809, 57, 632], _ ; 9C
[480, 35, 809, 57, 632], _ ; PG
[480, 35, 809, 57, 632], _ ; SD
[480, 35, 809, 57, 632], _ ; TM
[480, 35, 809, 57, 632], _ ; PR
[480, 35, 809, 57, 632], _ ; SH
[480, 35, 809, 57, 632], _ ; RS
[480, 35, 809, 57, 632], _ ; CS
[480, 35, 809, 57, 632]] ; IT

Global $g_iTree = $eTreeDS ; default to classic
Global $g_hLblAndroidInfo = 0
Binary file modified lib/MBRBot.dll
View file
Binary file not shown.

0 comments on commit 3034273

Please sign in to comment.