… | |
… | |
4 | |
4 | |
5 | =cut |
5 | =cut |
6 | |
6 | |
7 | package Crossfire; |
7 | package Crossfire; |
8 | |
8 | |
9 | our $VERSION = '0.96'; |
9 | our $VERSION = '0.97'; |
10 | |
10 | |
11 | use strict; |
11 | use strict; |
12 | |
12 | |
13 | use base 'Exporter'; |
13 | use base 'Exporter'; |
14 | |
14 | |
… | |
… | |
157 | |
157 | |
158 | { |
158 | { |
159 | package Crossfire::MoveType; |
159 | package Crossfire::MoveType; |
160 | |
160 | |
161 | use overload |
161 | use overload |
|
|
162 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
162 | '""' => \&as_string, |
163 | '""' => \&as_string, |
163 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
164 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
164 | '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, |
165 | '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, |
165 | '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
166 | '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
166 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
167 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
167 | 'x=' => sub { |
168 | 'x=' => sub { |
168 | my $cur = $_[0] >= $_[1]; |
169 | my $cur = $_[0] >= $_[1]; |
169 | if (!defined $cur) { |
170 | if (!defined $cur) { |
|
|
171 | if ($_[0] >= "all") { |
|
|
172 | $_[0] -= $_[1]; |
|
|
173 | } else { |
170 | $_[0] += $_[1]; |
174 | $_[0] += $_[1]; |
|
|
175 | } |
171 | } elsif ($cur) { |
176 | } elsif ($cur) { |
172 | $_[0] -= $_[1]; |
177 | $_[0] -= $_[1]; |
173 | } else { |
178 | } else { |
174 | $_[0] /= $_[1]; |
179 | $_[0] /= $_[1]; |
175 | } |
180 | } |
… | |
… | |
347 | } else { |
352 | } else { |
348 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
353 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
349 | } |
354 | } |
350 | } |
355 | } |
351 | |
356 | |
|
|
357 | # color_fg is used as default for magicmap if magicmap does not exist |
|
|
358 | $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; |
|
|
359 | |
352 | # nuke outdated or never supported fields |
360 | # nuke outdated or never supported fields |
353 | delete @$ob{qw( |
361 | delete @$ob{qw( |
354 | can_knockback can_parry can_impale can_cut can_dam_armour |
362 | can_knockback can_parry can_impale can_cut can_dam_armour |
355 | can_apply pass_thru can_pass_thru |
363 | can_apply pass_thru can_pass_thru color_bg |
356 | )}; |
364 | )}; |
357 | |
365 | |
358 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
366 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
359 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
367 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
360 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
368 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |