diff --git a/Makefile.ahk.bat b/Makefile.ahk.bat new file mode 100644 index 00000000..79e2ec9a --- /dev/null +++ b/Makefile.ahk.bat @@ -0,0 +1,3 @@ +@Echo off +"C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in SimpleTUOptimizeStarter.ahk /out SimpleTUOptimizeStarter.exe +"C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in SimpleTUOptimizeStarter.ahk /out SimpleTUOptimizeStarter-x86.exe /bin "C:\Program Files\AutoHotkey\Compiler\ANSI 32-bit.bin" diff --git a/SimpleTUOptimizeStarter-x86.exe b/SimpleTUOptimizeStarter-x86.exe index 028e9c14..e640063e 100644 Binary files a/SimpleTUOptimizeStarter-x86.exe and b/SimpleTUOptimizeStarter-x86.exe differ diff --git a/SimpleTUOptimizeStarter.ahk b/SimpleTUOptimizeStarter.ahk index 7deb2124..46da995e 100644 --- a/SimpleTUOptimizeStarter.ahk +++ b/SimpleTUOptimizeStarter.ahk @@ -14,7 +14,7 @@ FileDelete, %file% MaxCardsSections := 100 -BGEffects := "none|Devotion|Unity|Iron-Will|Cold-Sleep|Blood-Vengeance|Oath-of-Loyalty|Furiosity|TemporalBacklash|CriticalReach|Devour|HaltedOrders|ZealotsPreservation|Virulence|Enfeeble all X|Enhance all S X|Evolve n S1 S2|Heal all X|Mortar X|Protect all X|Rally all X|Siege all X|Strike all X|Weaken all X|Brigade|Bloodlust X|Counterflux|Divert|EnduringRage|Fortification|Heroism|Metamorphosis|Megamorphosis|Revenge X|TurningTides" +BGEffects := "none|Crackdown|Devotion|Unity|Iron-Will|Cold-Sleep|Blood-Vengeance|Oath-of-Loyalty|Furiosity|TemporalBacklash|CriticalReach|Devour|HaltedOrders|ZealotsPreservation|Virulence|Enfeeble all X|Enhance all S X|Evolve n S1 S2|Heal all X|Mortar X|Protect all X|Rally all X|Siege all X|Strike all X|Weaken all X|Brigade|Bloodlust X|Counterflux|Divert|EnduringRage|Fortification|Heroism|Metamorphosis|Megamorphosis|Revenge X|TurningTides" IniFileName := "data\SimpleTUOptimizeStarter.ini" IniSection := "onLoad" diff --git a/SimpleTUOptimizeStarter.exe b/SimpleTUOptimizeStarter.exe index 768ad9f9..16a54456 100644 Binary files a/SimpleTUOptimizeStarter.exe and b/SimpleTUOptimizeStarter.exe differ diff --git a/sim.cpp b/sim.cpp index 556a6371..c592b10c 100644 --- a/sim.cpp +++ b/sim.cpp @@ -1257,7 +1257,7 @@ void turn_end_phase(Field* fd) { continue; } - unsigned refresh_value = status.skill(Skill::refresh); + unsigned refresh_value = status.skill(Skill::refresh) + __builtin_expect(fd->bg_effects[fd->tapi][PassiveBGE::crackdown],false)?(status.skill(Skill::subdue)+1)/2:0; //BGE: crackdown refresh+=subdue/2 if (refresh_value && skill_check(fd, &status, nullptr)) { _DEBUG_MSG(1, "%s refreshes %u health\n", status_description(&status).c_str(), refresh_value); diff --git a/tyrant.h b/tyrant.h index 6bef77de..54ef5179 100644 --- a/tyrant.h +++ b/tyrant.h @@ -50,7 +50,7 @@ enum Skill payback, revenge, tribute, refresh, wall, barrier, // Combat-Modifier: - coalition, legion, pierce, rupture, swipe, drain, venom, hunt, + coalition, legion, pierce, rupture, swipe, drain, venom, hunt, // Damage-Dependent: berserk, inhibit, sabotage, leech, poison, @@ -84,7 +84,7 @@ enum PassiveBGE bloodlust, brigade, counterflux, divert, enduringrage, fortification, heroism, zealotspreservation, metamorphosis, megamorphosis, revenge, turningtides, virulence, haltedorders, devour, criticalreach, temporalbacklash, furiosity, oath_of_loyalty, - bloodvengeance, coldsleep,ironwill,unity,devotion, + bloodvengeance, coldsleep,ironwill,unity,devotion,crackdown, // End of BGEs num_passive_bges diff --git a/tyrant_optimize.cpp b/tyrant_optimize.cpp index 62c3e63f..78cad223 100644 --- a/tyrant_optimize.cpp +++ b/tyrant_optimize.cpp @@ -1844,6 +1844,7 @@ void print_available_effects() " Iron-Will\n" " Unity\n" " Devotion\n" + " Crackdown\n" ; } void usage(int argc, char** argv)