… | |
… | |
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 | |
… | |
… | |
19 | |
19 | |
20 | our @EXPORT = qw( |
20 | our @EXPORT = qw( |
21 | read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents |
21 | read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents |
22 | ); |
22 | ); |
23 | |
23 | |
24 | use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working |
24 | use JSON::XS qw(from_json to_json); |
25 | |
|
|
26 | sub from_json($) { |
|
|
27 | $JSON::Syck::ImplicitUnicode = 1; |
|
|
28 | JSON::Syck::Load $_[0] |
|
|
29 | } |
|
|
30 | |
|
|
31 | sub to_json($) { |
|
|
32 | $JSON::Syck::ImplicitUnicode = 0; |
|
|
33 | JSON::Syck::Dump $_[0] |
|
|
34 | } |
|
|
35 | |
25 | |
36 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
26 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
37 | |
27 | |
38 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
28 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
39 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
29 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
… | |
… | |
157 | |
147 | |
158 | { |
148 | { |
159 | package Crossfire::MoveType; |
149 | package Crossfire::MoveType; |
160 | |
150 | |
161 | use overload |
151 | use overload |
|
|
152 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
162 | '""' => \&as_string, |
153 | '""' => \&as_string, |
163 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
154 | '>=' => 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 }, |
155 | '+=' => 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 }, |
156 | '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
166 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
157 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
167 | 'x=' => sub { |
158 | 'x=' => sub { |
168 | my $cur = $_[0] >= $_[1]; |
159 | my $cur = $_[0] >= $_[1]; |
169 | if (!defined $cur) { |
160 | if (!defined $cur) { |
|
|
161 | if ($_[0] >= "all") { |
|
|
162 | $_[0] -= $_[1]; |
|
|
163 | } else { |
170 | $_[0] += $_[1]; |
164 | $_[0] += $_[1]; |
|
|
165 | } |
171 | } elsif ($cur) { |
166 | } elsif ($cur) { |
172 | $_[0] -= $_[1]; |
167 | $_[0] -= $_[1]; |
173 | } else { |
168 | } else { |
174 | $_[0] /= $_[1]; |
169 | $_[0] /= $_[1]; |
175 | } |
170 | } |
… | |
… | |
347 | } else { |
342 | } else { |
348 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
343 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
349 | } |
344 | } |
350 | } |
345 | } |
351 | |
346 | |
|
|
347 | # color_fg is used as default for magicmap if magicmap does not exist |
|
|
348 | $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; |
|
|
349 | |
352 | # nuke outdated or never supported fields |
350 | # nuke outdated or never supported fields |
353 | delete @$ob{qw( |
351 | delete @$ob{qw( |
354 | can_knockback can_parry can_impale can_cut can_dam_armour |
352 | can_knockback can_parry can_impale can_cut can_dam_armour |
355 | can_apply pass_thru can_pass_thru |
353 | can_apply pass_thru can_pass_thru color_bg color_fg |
356 | )}; |
354 | )}; |
357 | |
355 | |
358 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
356 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
359 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
357 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
360 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
358 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |