Many small-ish changes and ini updates

meta53 · Oct 29, 2023 · d052d9e · d052d9e
1 parent 11ad663
commit d052d9e
Show file tree

Hide file tree

Showing 74 changed files with 2,782 additions and 418 deletions.
diff --git a/bot_pull.mac b/bot_pull.mac
@@ -122,7 +122,7 @@ Sub Main(int _pull_dist, string _channel, string _campName, bool _useDownFlags,
 /return
 
 Sub chkZone
-	/if (${Zone.ShortName.NotEqual[${SZ_shortName}]}) {
+	/if (${Zone.ShortName.NotEqual[${str_startZone}]}) {
 		/if (${Zone.ShortName.Equal[${Me.BoundLocation[0]}]}) {
 			/delay 30s
 			/if (${Zone.ShortName.Equal[${Me.BoundLocation[0]}]}) {
@@ -524,7 +524,7 @@ Sub AggroTarget
 				/if (${Me.Class.ShortName.Equal[PAL]}) /call MQ2Cast "${spell_pull}" ${spell_pullGem} 2s
 				/if (${Me.Class.ShortName.Equal[WAR]}) /call chk_warProvoke "${war_ca_hate_1}"
 				/delay 1
-				/if (${Me.CombatAbilityReady[Taunt]}) /doability Taunt
+				/if (${Me.AbilityReady[Taunt]}) /doability Taunt
 				/varset bln_tooClose FALSE
 				/goto :TargetAggroCheck
 			}

diff --git a/bot_shm.mac b/bot_shm.mac
@@ -182,6 +182,14 @@ Sub EVENT_DOSHRINK(_line, _chatSender, _eventParams)
 	/if (${FindItemCount[Umbracite Swarm Orb]}) {
 		/echo \agShrinking
 		/call MQ2Cast "Umbracite Swarm Orb" item
+	} else {
+		/declare i int local 0
+		/for i 0 to 5
+			/call TrueTarget ${Group.Member[${i}].ID}
+			/delay 5
+			/call MQ2Cast "Shrink" gem9 5s
+			/delay 10
+		/next i
 	}
 /return