ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.81 by root, Tue Feb 6 22:27:44 2007 UTC vs.
Revision 1.91 by root, Sat Mar 3 19:06:03 2007 UTC

… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
59 59
60# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 61# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
66 unique template 67 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
… …
138sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 143sub MOVE_KNOWN (){ 0x1f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x10000 } # very special value
145
146our %MOVE_TYPE = (
147 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING,
151 swim => MOVE_SWIM,
152 boat => MOVE_BOAT,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '""' => \&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]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub {
168 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) {
170 $_[0] += $_[1];
171 } elsif ($cur) {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] /= $_[1];
175 }
176
177 $_[0]
178 },
179 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ;
182}
183
184sub Crossfire::MoveType::new {
185 my ($class, $string) = @_;
186
187 my $mask;
188 my $value;
189
190 for (split /\s+/, lc $string) {
191 if (s/^-//) {
192 $mask |= $MOVE_TYPE{$_};
193 $value &= ~$MOVE_TYPE{$_};
194 } else {
195 $mask |= $MOVE_TYPE{$_};
196 $value |= $MOVE_TYPE{$_};
197 }
198 }
199
200 (bless [$mask, $value], $class)->normalise
201}
202
203sub Crossfire::MoveType::normalise {
204 my ($self) = @_;
205
206 if ($self->[0] & MOVE_ALL) {
207 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
208 $self->[0] &= $mask;
209 $self->[1] &= $mask;
210 }
211
212 $self->[1] &= $self->[0];
213
214 $self
215}
216
217sub Crossfire::MoveType::as_string {
218 my ($self) = @_;
219
220 my @res;
221
222 my ($mask, $value) = @$self;
223
224 for (@Crossfire::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_";
229 }
230 }
231
232 join " ", @res
233}
145 234
146sub load_ref($) { 235sub load_ref($) {
147 my ($path) = @_; 236 my ($path) = @_;
148 237
149 open my $fh, "<:raw:perlio", $path 238 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 288 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 289 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 290 }
202} 291}
203 292
293my %MATERIAL = reverse
294 paper => 1,
295 iron => 2,
296 glass => 4,
297 leather => 8,
298 wood => 16,
299 organic => 32,
300 stone => 64,
301 cloth => 128,
302 adamant => 256,
303 liquid => 512,
304 tin => 1024,
305 bone => 2048,
306 ice => 4096,
307
308 # guesses
309 runestone => 12,
310 bronze => 18,
311 "ancient wood" => 20,
312 glass => 36,
313 marble => 66,
314 ice => 68,
315 stone => 70,
316 stone => 80,
317 cloth => 136,
318 ironwood => 144,
319 adamantium => 258,
320 glacium => 260,
321 blood => 544,
322;
323
204# object as in "Object xxx", i.e. archetypes 324# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 325sub normalize_object($) {
206 my ($ob) = @_; 326 my ($ob) = @_;
327
328 # convert material bitset to materialname, if possible
329 if (exists $ob->{material}) {
330 if (!$ob->{material}) {
331 delete $ob->{material};
332 } elsif (exists $ob->{materialname}) {
333 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
334 delete $ob->{material};
335 } else {
336 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
337 delete $ob->{material}; # assume materilname is more specific and nuke material
338 }
339 } elsif (my $name = $MATERIAL{$ob->{material}}) {
340 delete $ob->{material};
341 $ob->{materialname} = $name;
342 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 }
345 }
207 346
208 # nuke outdated or never supported fields 347 # nuke outdated or never supported fields
209 delete @$ob{qw( 348 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 349 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 350 can_apply pass_thru can_pass_thru
… …
217 356
218 # convert movement strings to bitsets 357 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 358 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 359 next unless exists $ob->{$attr};
221 360
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 361 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 } 362 }
249 363
250 # convert outdated movement flags to new movement sets 364 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 365 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 366 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
253 } 367 }
254 if (defined (my $v = delete $ob->{slow_move})) { 368 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 369 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 370 $ob->{move_slow_penalty} = $v;
257 } 371 }
258 if (defined (my $v = delete $ob->{walk_on})) { 372 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 373 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 374 }
263 if (defined (my $v = delete $ob->{walk_off})) { 375 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 376 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 377 }
268 if (defined (my $v = delete $ob->{fly_on})) { 378 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 379 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 380 }
273 if (defined (my $v = delete $ob->{fly_off})) { 381 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 382 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 383 }
278 if (defined (my $v = delete $ob->{flying})) { 384 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 385 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 386 }
283 387
284 # convert idiotic event_xxx things into objects 388 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 389 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 390 if (exists $ob->{"event_${event}_plugin"}) {
… …
517 621
518 my $inv = delete $a{inventory}; 622 my $inv = delete $a{inventory};
519 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 623 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
520 my $anim = delete $a{anim}; 624 my $anim = delete $a{anim};
521 625
626 if ($a{_atype} eq 'object') {
627 $str .= join "\n", "anim", @$anim, "mina\n"
628 if $anim;
629 }
630
522 my @kv; 631 my @kv;
523 632
524 for ($a{_name} eq "map" 633 for ($a{_name} eq "map"
525 ? @Crossfire::FIELD_ORDER_MAP 634 ? @Crossfire::FIELD_ORDER_MAP
526 : @Crossfire::FIELD_ORDER) { 635 : @Crossfire::FIELD_ORDER) {
… …
537 my ($k, $v) = @$_; 646 my ($k, $v) = @$_;
538 647
539 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 648 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
540 $v =~ s/\n$//; 649 $v =~ s/\n$//;
541 $str .= "$k\n$v\n$end\n"; 650 $str .= "$k\n$v\n$end\n";
542 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
543 if ($v & ~Crossfire::MOVE_ALL or !$v) {
544 $str .= "$k $v\n";
545
546 } elsif ($v & Crossfire::MOVE_ALLBIT) {
547 $str .= "$k all";
548
549 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
550 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
551 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
552 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
553 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
554
555 $str .= "\n";
556
557 } else {
558 $str .= $k;
559
560 $str .= " walk" if $v & Crossfire::MOVE_WALK;
561 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
562 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
563 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
564 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
565
566 $str .= "\n";
567 }
568 } else { 651 } else {
569 $str .= "$k $v\n"; 652 $str .= "$k $v\n";
570 } 653 }
571 } 654 }
572 655
573 if ($inv) { 656 if ($inv) {
574 $append->($_) for @$inv; 657 $append->($_) for @$inv;
575 }
576
577 if ($a{_atype} eq 'object') {
578 $str .= join "\n", "anim", @$anim, "mina\n"
579 if $anim;
580 } 658 }
581 659
582 $str .= "end\n"; 660 $str .= "end\n";
583 661
584 if ($a{_atype} eq 'object') { 662 if ($a{_atype} eq 'object') {
… …
745 ]; 823 ];
746 824
747 $attr 825 $attr
748} 826}
749 827
750sub arch_edit_sections {
751# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
752# edit_type = 0;
753# else if (edit_type != 0) {
754# // all flags from 'check_type' must be unset in this arch because they get recalculated now
755# edit_type &= ~check_type;
756# }
757#
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
760# getAttributeValue("alive", defarch) == 1 &&
761# (getAttributeValue("monster", defarch) == 1 ||
762# getAttributeValue("generator", defarch) == 1)) {
763# // Monster: monsters/npcs/generators
764# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
765# }
766# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
767# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
768# // Walls
769# edit_type |= IGUIConstants.TILE_EDIT_WALL;
770# }
771# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
772# getAttributeValue("connected", defarch) != 0) {
773# // Connected Objects
774# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
775# }
776# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
777# arch_type == 66 || arch_type == 41 || arch_type == 95) {
778# // Exit: teleporter/exit/trapdoors
779# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
780# }
781# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
782# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
783# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
784# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
785# arch_type == 124 || arch_type == 130)) {
786# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
787# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
788# }
789# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
790# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
791# arch_type == 91 || arch_type == 21 || arch_type == 24) {
792# // Door: door/special door/gates + keys
793# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
794# }
795# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
796# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
797# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
798# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
799# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
800# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
801# arch_type == 122 || arch_type == 3)) {
802# // Equipment: weapons/armour/wands/rods
803# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
804# }
805#
806# return(edit_type);
807#
808#
809}
810
811sub cache_file($$&&) { 828sub cache_file($$&&) {
812 my ($src, $cache, $load, $create) = @_; 829 my ($src, $cache, $load, $create) = @_;
813 830
814 my ($size, $mtime) = (stat $src)[7,9] 831 my ($size, $mtime) = (stat $src)[7,9]
815 or Carp::croak "$src: $!"; 832 or Carp::croak "$src: $!";

Diff Legend

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