[ViewVC] Diff of: cvs/deliantra/server/lib/cf/match.pm

Comparing deliantra/server/lib/cf/match.pm (file contents):
Revision 1.20 by root, Tue Oct 20 05:57:08 2009 UTC vs.
Revision 1.26 by root, Fri Mar 26 01:04:44 2010 UTC

+#
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+#
+# Copyright (©) 2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+#
+# Deliantra is free software: you can redistribute it and/or modify it under
+# the terms of the Affero GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the Affero GNU General Public License
+# and the GNU General Public License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# The authors can be reached via e-mail to <support@deliantra.net>
+#
 =head1 NAME
 cf::match - object matching language
 =head1 DESCRIPTION
 Not that C<not> only negates a condition and not the whole match
 expressions, thus
    not applied in inv
-is true if there is I<any> non-object in the inventory. To negate a whole
+is true if there is I<any> non-applied object in the inventory. To negate
-match, you have to use a sub-match. To check whether there is I<no>
+a whole match, you have to use a sub-match: To check whether there is
-applied object in someones inventory, write this:
+I<no> applied object in someones inventory, write this:
    not (applied in inv)
 Example: match applied weapons.
    applied type=WEAPON
 Example: match horns or rods.
    type=HORN or type=ROD
+Example: see if the originator is a player.
+   type=PLAYER of originator
 =item in ...
 The in operator takes the context set and modifies it in various ways. As
 a less technical description, think of the C<in> as being a I<look into>
 =item in map
 Replaces all objects by the objects that are on the same mapspace as them.
+=item in head
+Replaces all objects by their head objects.
 =item in <condition>
 Finds all context objects matching the condition, and then puts their
 inventories into the context set.
 =item any
 This simply evaluates to true, and simply makes matching I<any> object a
 bit easier to read.
+=item none
+This simply evaluates to false, and simply makes matching I<never> a bit
+easier to read.
 =item has(condition)
 True iff the object has a matching inventory object.
 =item count(match)
    match     = chain
              | chain 'of' root
    root      = 'object' | 'self' | 'source' | 'originator'
    chain     = condition
-             | chain also deep 'in' set
+             | chain also deep 'in' modifier
    also      = nothing | 'also'
    deep      = nothing | 'deep'
-   set       = 'inv' | 'env' | 'arch' | 'map'
+   modifier  ='inv' | 'env' | 'arch' | 'map' | 'head'
-   empty     =
+   nothing   =
    # boolean matching condition
    condition = factor
              | factor 'and'? condition
    operator  = '=' | '==' | '!=' | '<' | '<=' | '>' | '>='
    expr      = flag
              | sattr
              | aattr '[' <constant> ']'
+             | 'stat.' statattr
              | special
              | func '(' args ')'
              | '{' perl code block '}'
    func      = <any function name>
    sattr     = <any scalar object attribute>
    aattr     = <any array object attribute>
    flag      = <any object flag>
+   statattr  = <any stat attribute: exp, food, str, dex, hp, maxhp...>
    special   = <any ()-less "function">
    constant  = <number> | '"' <string> '"' | <uppercase cf::XXX name>
    args      = <depends on function>
    our %special = (
       any => sub {
          1
       },
+      none => sub {
+         0
+      },
    );
    sub constant {
       ws;
       die "number, string or uppercase constant name expected\n";
    }
    our $flag  = $cf::REFLECT{object}{flags};
    our $sattr = $cf::REFLECT{object}{scalars};
+   # quick hack to support archname, untested
+   $sattr->{archname} = "W";
    our $aattr = $cf::REFLECT{object}{arrays};
+   our $lattr = $cf::REFLECT{living}{scalars};
    sub expr {
       # ws done by factor
       my $res;
          # perl
          my $expr = $1;
          $res .= $expr =~ /\{([^;]+)\}/ ? $1 : "do $expr";
+      } elsif (/\Gstats\.([A-Za-z0-9_]+)/gc) {
+         if (exists $lattr->{$1}) {
+            $res .= "\$_->stats->$1";
+         } elsif (exists $lattr->{"\u$1"}) {
+            $res .= "\$_->stats->\u$1";
+         } else {
+            die "living statistic name expected (str, pow, hp, sp...)\n";
+         }
       } elsif (/\G([A-Za-z0-9_]+)/gc) {
          if (my $func = $func{$1}) {
             /\G\s*\(/gc
       my $res = condition;
       # if nothing follows, we have a simple condition, so
       # optimise a comon case.
       if ($defctx eq '$_' and /\G\s*(?=\)|$)/gc) {
-         warn "shortcut<$res>$wantarray\n";#d#
          return $wantarray
                 ? "$res ? \$_ : ()"
                 : $res;
       }
          my $deep = /\Gdeep\s+/gc + 0;
          if (/\Gin\s+/gc) {
             my $expand;
-            if (/\G(inv|env|map|arch)\b/gc) {
+            if (/\G(inv|env|map|arch|head)\b/gc) {
                if ($1 eq "inv") {
                   $expand = "map \$_->inv,";
                } elsif ($1 eq "env") {
                   $expand = "map \$_->env // (),";
+               } elsif ($1 eq "head") {
+                  $expand = "map \$_->head,";
+                  $deep = 0; # infinite loop otherwise
                } elsif ($1 eq "arch") {
                   $expand = "map \$_->arch,";
                   $deep = 0; # infinite loop otherwise
                } elsif ($1 eq "map") {
                   $expand = "map \$_->map->at (\$_->x, \$_->y),";
    $res
 }
 if (0) {#d#
-   die parse 1, 'applied in inv';
+   die parse 1, 'stats.pow';
    exit 0;
 }
 our %CACHE;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf/match.pm (file contents): Revision 1.20 by root, Tue Oct 20 05:57:08 2009 UTC vs. Revision 1.26 by root, Fri Mar 26 01:04:44 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf/match.pm (file contents):
Revision 1.20 by root, Tue Oct 20 05:57:08 2009 UTC vs.
Revision 1.26 by root, Fri Mar 26 01:04:44 2010 UTC