Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: Macro/Automacro.pm
- ===================================================================
- --- Macro/Automacro.pm (revision 8992)
- +++ Macro/Automacro.pm (working copy)
- @@ -670,6 +670,14 @@
- return 0
- }
- +sub checkCity {
- + if (($_[0] && $field->isCity) || (!$_[0] && !$field->isCity)) {
- + return 1;
- + } else {
- + return 0;
- + }
- +}
- +
- # parses automacros and checks conditions #################
- sub automacroCheck {
- my ($trigger, $args) = @_;
- @@ -764,6 +772,7 @@
- next CHKAM if (defined $automacro{$am}->{eval} && !checkEval($automacro{$am}->{eval}));
- next CHKAM if (defined $automacro{$am}->{whenGround} && !checkGround($automacro{$am}->{whenGround}));
- next CHKAM if (defined $automacro{$am}->{notMonster} && !checkMonster($automacro{$am}->{notMonster}, 1));
- + next CHKAM if (defined $automacro{$am}->{incity} && !checkCity($automacro{$am}->{incity}));
- foreach my $i (@{$automacro{$am}->{monster}}) {next CHKAM unless checkMonster($i)}
- foreach my $i (@{$automacro{$am}->{aggressives}}){next CHKAM unless checkAggressives($i)}
- Index: Macro/Data.pm
- ===================================================================
- --- Macro/Data.pm (revision 8992)
- +++ Macro/Data.pm (working copy)
- @@ -42,7 +42,8 @@
- 'playerguild' => 1, # check: player guilds
- 'eval' => 1, # check : eval
- 'whenGround' => 1, # check : when ground statuses
- - 'areaSpell' => 1 # check : area spell
- + 'areaSpell' => 1, # check : area spell
- + 'incity' => 1
- );
- our %amMulti = (
Advertisement
Add Comment
Please, Sign In to add comment
