From: <tir...@us...> - 2010-02-10 23:38:27
|
Revision: 11454 http://pcgen.svn.sourceforge.net/pcgen/?rev=11454&view=rev Author: tir-gwaith Date: 2010-02-10 23:38:20 +0000 (Wed, 10 Feb 2010) Log Message: ----------- [ 1778050 ] MOVECLONE now only has 3 args x-checks the MOVE types, too. Modified Paths: -------------- Trunk/utilities/prettylst/prettylst.pl Modified: Trunk/utilities/prettylst/prettylst.pl =================================================================== --- Trunk/utilities/prettylst/prettylst.pl 2010-02-10 21:57:42 UTC (rev 11453) +++ Trunk/utilities/prettylst/prettylst.pl 2010-02-10 23:38:20 UTC (rev 11454) @@ -3900,7 +3900,6 @@ 'BONUS:ITEMCOST' => 'Modify the item cost', 'BONUS:LANGUAGES' => 'More language', 'BONUS:MISC' => 'Misc bonus', - 'BONUS:MOVE' => 'Move class', 'BONUS:MOVEADD' => 'Add to base move', 'BONUS:MOVEMULT' => 'Multiply base move', 'BONUS:POSTMOVEADD' => 'Add to magical move', @@ -7932,22 +7931,22 @@ } elsif ( $tag_name eq 'ADD:LANGUAGE' ) { - # Syntax: ADD:LANGUAGE(<coma separated list of languages)<number> - if ( $tag_value =~ /\((.*)\)/ ) { - push @xcheck_to_process, - [ - 'LANGUAGE', 'ADD:LANGUAGE(@@)', $file_for_error, $line_for_error, - split ',', $1 - ]; + # Syntax: ADD:LANGUAGE(<coma separated list of languages)<number> + if ( $tag_value =~ /\((.*)\)/ ) { + push @xcheck_to_process, + [ + 'LANGUAGE', 'ADD:LANGUAGE(@@)', $file_for_error, $line_for_error, + split ',', $1 + ]; + } + else { + $logging->ewarn( NOTICE, + qq{Invalid syntax for "$tag_name$tag_value"}, + $file_for_error, + $line_for_error + ); + } } - else { - $logging->ewarn( NOTICE, - qq{Invalid syntax for "$tag_name$tag_value"}, - $file_for_error, - $line_for_error - ); - } - } elsif ( $tag_name eq 'MOVE' ) { # MOVE:<move type>,<value> @@ -7984,6 +7983,38 @@ last MOVE_PAIR; } } + } + elsif ( $tag_name eq 'MOVECLONE' ) { + # MOVECLONE:A,B,formula A and B must be valid move types. + if ( $tag_value =~ /^(.*),(.*),(.*)/ ) { + # Error if more parameters (Which will show in the first group) + if ( $1 =~ /,/ ) { + $logging->ewarn( WARNING, + qq{Found too many parameters in "$tag_name:$tag_value"}, + $file_for_error, + $line_for_error + ); + } + else { + # Cross check for used MOVE Types. + push @xcheck_to_process, + [ + 'MOVE Type', $tag_name, + $file_for_error, $line_for_error, + $1, $2 + ]; + } + } + else { + # Report missing requisite parameters. + $logging->ewarn( WARNING, + qq{Missing a parameter in in "$tag_name:$tag_value"}, + $file_for_error, + $line_for_error + ); + } + + } elsif ( $tag_name eq 'RACE' && $linetype ne 'PCC' ) { # There is only one race per RACE tag @@ -15241,6 +15272,8 @@ =head2 v1.40 -- -- NOT YET RELEASED +[ 1778050 ] MOVECLONE now only has 3 args + [ 1870825 ] EqMod CHOOSE Changes [ 2946558 ] TEMPLATE can be used in COMPANIONMOD lines This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |