Add Private Airship command and improve response handling and multi-item and quest condition support, equip option eventMacro utils

plugins/eventMacro/eventMacro/Condition/Base/Inventory.pm

@@ -1,39 +1,64 @@
 package eventMacro::Condition::Base::Inventory;
 
 use strict;
-
 use base 'eventMacro::Conditiontypes::NumericConditionState';
 
 sub _parse_syntax {
-	my ( $self, $condition_code ) = @_;
-	
-	$self->{is_on_stand_by} = 1;
-	
-	$self->SUPER::_parse_syntax($condition_code);
+    my ( $self, $condition_code ) = @_;
+
+    $self->{is_on_stand_by} = 1;
+    $self->{member_list} ||= [];
+    $self->{last_member} = undef;
 }
 
 sub validate_condition {
-	my ( $self, $callback_type, $callback_name, $args ) = @_;
-
-	if ($callback_type eq 'variable') {
-		$self->update_validator_var($callback_name, $args);
-	}
-
-	if ($self->{is_on_stand_by} == 1) {
-		return $self->SUPER::validate_condition(0);
-	} else {
-		return $self->SUPER::validate_condition( $self->validator_check );
-	}
+    my ( $self, $callback_type, $callback_name, $args ) = @_;
+
+    if ($callback_type eq 'variable') {
+        $self->update_validator_var($callback_name, $args);
+    }
+
+    if ($self->{is_on_stand_by} == 1) {
+        return $self->SUPER::validate_condition(0);
+    } else {
+        return $self->SUPER::validate_condition( $self->validator_check );
+    }
+}
+
+sub validator_check {
+    my ($self) = @_;
+
+    my $last_member;
+    foreach my $member (@{ $self->{member_list} }) {
+        my $value = $self->_get_val($member->{wanted});
+        $last_member = { wanted => $member->{wanted}, amount => $value };
+        if ($member->{validator}->validate( $value, $self->_get_ref_val($member->{wanted}) )) {
+            $self->{last_member} = $last_member;
+            return 1;
+        }
+    }
+
+    $self->{last_member} = $last_member if defined $last_member;
+    return 0;
+}
+
+sub update_validator_var {
+    my ( $self, $var_name, $var_value ) = @_;
+
+    foreach my $member ( @{ $self->{member_list} } ) {
+        $member->{validator}->update_vars( $var_name, $var_value );
+    }
 }
 
 sub get_new_variable_list {
-	my ($self) = @_;
-	my $new_variables;
-
-	$new_variables->{".".$self->{name}."Last"} = $self->{wanted};
-	$new_variables->{".".$self->{name}."LastAmount"} = $self->_get_val;
-
-	return $new_variables;
+    my ($self) = @_;
+    my $new_variables = {};
+    return $new_variables unless (defined $self->{last_member});
+
+    $new_variables->{".".$self->{name}."Last"} = $self->{last_member}{wanted};
+    $new_variables->{".".$self->{name}."LastAmount"} = $self->{last_member}{amount};
+
+    return $new_variables;
 }
 
 1;

plugins/eventMacro/eventMacro/Condition/Console.pm

@@ -0,0 +1,24 @@
+package eventMacro::Condition::Console;
+
+use strict;
+
+use base 'eventMacro::Condition::Base::Msg';
+
+sub _hooks {
+        ['log'];
+}
+
+sub validate_condition {
+        my ( $self, $callback_type, $callback_name, $args ) = @_;
+
+        $self->{message} = undef;
+        $self->{source} = undef;
+
+        if ($callback_type eq 'hook') {
+                $self->{message} = $args->{message};
+                $self->{source} = $args->{domain};
+        }
+        return $self->SUPER::validate_condition( $callback_type, $callback_name, $args );
+}
+
+1;

plugins/eventMacro/eventMacro/Condition/InCart.pm

@@ -7,24 +7,43 @@ use base 'eventMacro::Condition::Base::InCart';
 use Globals qw( $char );
 
 sub _parse_syntax {
-	my ( $self, $condition_code ) = @_;
-
-	$self->{wanted} = undef;
-
-	if ($condition_code =~ /"(.+)"\s+(\S.*)/) {
-		$self->{wanted} = $1;
-		$condition_code = $2;
-	} else {
-		$self->{error} = "Item name must be inside quotation marks and a numeric comparison must be given";
-		return 0;
-	}
-
-	$self->SUPER::_parse_syntax($condition_code);
+my ( $self, $condition_code ) = @_;
+
+$self->{member_list} = [];
+my $error_message = "Item name must be inside quotation marks and a numeric comparison must be given";
+
+foreach my $member (split(/\s*,\s*/, $condition_code)) {
+next if ($member eq '');
+if ($member =~ /"(.+)"\s+(\S.*)/) {
+my ($wanted, $comparison) = ($1, $2);
+my $validator = eventMacro::Validator::NumericComparison->new($comparison);
+
+if (defined $validator->error) {
+$self->{error} = $validator->error;
+return 0;
+}
+
+push ( @{ $self->{variables} }, @{$validator->variables} );
+push ( @{ $self->{member_list} }, { wanted => $wanted, validator => $validator } );
+} else {
+$self->{error} = $error_message;
+return 0;
+}
+}
+
+unless (@{ $self->{member_list} }) {
+$self->{error} = $error_message;
+return 0;
+}
+
+$self->{wanted} = $self->{member_list}[0]{wanted};
+$self->SUPER::_parse_syntax($condition_code);
 }
 
 sub _get_val {
-	my ( $self ) = @_;
-	$char->cart->sumByName($self->{wanted});
+my ( $self, $wanted ) = @_;
+$wanted ||= $self->{wanted};
+$char->cart->sumByName($wanted);
 }
 
 1;

plugins/eventMacro/eventMacro/Condition/InCartID.pm

@@ -6,24 +6,43 @@ use base 'eventMacro::Condition::Base::InCart';
 use eventMacro::Utilities qw( getCartAmountbyID );
 
 sub _parse_syntax {
-	my ( $self, $condition_code ) = @_;
-
-	$self->{wanted} = undef;
-
-	if ($condition_code =~ /^(\d+)\s+(\S.*)$/) {
-		$self->{wanted} = $1;
-		$condition_code = $2;
-	} else {
-		$self->{error} = "Item ID must and a numeric comparison must be given";
-		return 0;
-	}
-
-	$self->SUPER::_parse_syntax($condition_code);
+my ( $self, $condition_code ) = @_;
+
+$self->{member_list} = [];
+my $error_message = "Item ID must and a numeric comparison must be given";
+
+foreach my $member (split(/\s*,\s*/, $condition_code)) {
+next if ($member eq '');
+if ($member =~ /^(\d+)\s+(\S.*)$/) {
+my ($wanted, $comparison) = ($1, $2);
+my $validator = eventMacro::Validator::NumericComparison->new($comparison);
+
+if (defined $validator->error) {
+$self->{error} = $validator->error;
+return 0;
+}
+
+push ( @{ $self->{variables} }, @{$validator->variables} );
+push ( @{ $self->{member_list} }, { wanted => $wanted, validator => $validator } );
+} else {
+$self->{error} = $error_message;
+return 0;
+}
+}
+
+unless (@{ $self->{member_list} }) {
+$self->{error} = $error_message;
+return 0;
+}
+
+$self->{wanted} = $self->{member_list}[0]{wanted};
+$self->SUPER::_parse_syntax($condition_code);
 }
 
 sub _get_val {
-	my ( $self ) = @_;
-	getCartAmountbyID($self->{wanted});
+my ( $self, $wanted ) = @_;
+$wanted ||= $self->{wanted};
+getCartAmountbyID($wanted);
 }
 
 1;

plugins/eventMacro/eventMacro/Condition/InInventory.pm

@@ -7,24 +7,43 @@ use base 'eventMacro::Condition::Base::InInventory';
 use Globals qw( $char );
 
 sub _parse_syntax {
-	my ( $self, $condition_code ) = @_;
-
-	$self->{wanted} = undef;
-
-	if ($condition_code =~ /"(.+)"\s+(\S.*)/) {
-		$self->{wanted} = $1;
-		$condition_code = $2;
-	} else {
-		$self->{error} = "Item name must be inside quotation marks and a numeric comparison must be given";
-		return 0;
-	}
-
-	$self->SUPER::_parse_syntax($condition_code);
+my ( $self, $condition_code ) = @_;
+
+$self->{member_list} = [];
+my $error_message = "Item name must be inside quotation marks and a numeric comparison must be given";
+
+foreach my $member (split(/\s*,\s*/, $condition_code)) {
+next if ($member eq '');
+if ($member =~ /"(.+)"\s+(\S.*)/) {
+my ($wanted, $comparison) = ($1, $2);
+my $validator = eventMacro::Validator::NumericComparison->new($comparison);
+
+if (defined $validator->error) {
+$self->{error} = $validator->error;
+return 0;
+}
+
+push ( @{ $self->{variables} }, @{$validator->variables} );
+push ( @{ $self->{member_list} }, { wanted => $wanted, validator => $validator } );
+} else {
+$self->{error} = $error_message;
+return 0;
+}
+}
+
+unless (@{ $self->{member_list} }) {
+$self->{error} = $error_message;
+return 0;
+}
+
+$self->{wanted} = $self->{member_list}[0]{wanted};
+$self->SUPER::_parse_syntax($condition_code);
 }
 
 sub _get_val {
-	my ( $self ) = @_;
-	$char->inventory->sumByName($self->{wanted});
+my ( $self, $wanted ) = @_;
+$wanted ||= $self->{wanted};
+$char->inventory->sumByName($wanted);
 }
 
 1;

plugins/eventMacro/eventMacro/Condition/InInventoryID.pm

@@ -7,24 +7,43 @@ use base 'eventMacro::Condition::Base::InInventory';
 use eventMacro::Utilities qw( getInventoryAmountbyID );
 
 sub _parse_syntax {
-	my ( $self, $condition_code ) = @_;
-
-	$self->{wanted} = undef;
-
-	if ($condition_code =~ /^(\d+)\s+(\S.*)$/) {
-		$self->{wanted} = $1;
-		$condition_code = $2;
-	} else {
-		$self->{error} = "Item ID must and a numeric comparison must be given";
-		return 0;
-	}
-
-	$self->SUPER::_parse_syntax($condition_code);
+my ( $self, $condition_code ) = @_;
+
+$self->{member_list} = [];
+my $error_message = "Item ID must and a numeric comparison must be given";
+
+foreach my $member (split(/\s*,\s*/, $condition_code)) {
+next if ($member eq '');
+if ($member =~ /^(\d+)\s+(\S.*)$/) {
+my ($wanted, $comparison) = ($1, $2);
+my $validator = eventMacro::Validator::NumericComparison->new($comparison);
+
+if (defined $validator->error) {
+$self->{error} = $validator->error;
+return 0;
+}
+
+push ( @{ $self->{variables} }, @{$validator->variables} );
+push ( @{ $self->{member_list} }, { wanted => $wanted, validator => $validator } );
+} else {
+$self->{error} = $error_message;
+return 0;
+}
+}
+
+unless (@{ $self->{member_list} }) {
+$self->{error} = $error_message;
+return 0;
+}
+
+$self->{wanted} = $self->{member_list}[0]{wanted};
+$self->SUPER::_parse_syntax($condition_code);
 }
 
 sub _get_val {
-	my ( $self ) = @_;
-	return getInventoryAmountbyID($self->{wanted});
+my ( $self, $wanted ) = @_;
+$wanted ||= $self->{wanted};
+return getInventoryAmountbyID($wanted);
 }
 
 1;