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.82 by root, Tue Feb 6 23:53:26 2007 UTC vs.
Revision 1.90 by root, Sat Mar 3 18:58:25 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 ;
180}
181
182sub Crossfire::MoveType::new {
183 my ($class, $string) = @_;
184
185 my $mask;
186 my $value;
187
188 for (split /\s+/, lc $string) {
189 if (s/^-//) {
190 $mask |= $MOVE_TYPE{$_};
191 $value &= ~$MOVE_TYPE{$_};
192 } else {
193 $mask |= $MOVE_TYPE{$_};
194 $value |= $MOVE_TYPE{$_};
195 }
196 }
197
198 (bless [$mask, $value], $class)->normalise
199}
200
201sub Crossfire::MoveType::normalise {
202 my ($self) = @_;
203
204 if ($self->[0] & MOVE_ALL) {
205 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
206 $self->[0] &= $mask;
207 $self->[1] &= $mask;
208 }
209
210 $self->[1] &= $self->[0];
211
212 $self
213}
214
215sub Crossfire::MoveType::as_string {
216 my ($self) = @_;
217
218 my @res;
219
220 my ($mask, $value) = @$self;
221
222 for (@Crossfire::MOVE_TYPE) {
223 my $bit = $Crossfire::MOVE_TYPE{$_};
224 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
225 $mask &= ~$bit;
226 push @res, $value & $bit ? $_ : "-$_";
227 }
228 }
229
230 join " ", @res
231}
145 232
146sub load_ref($) { 233sub load_ref($) {
147 my ($path) = @_; 234 my ($path) = @_;
148 235
149 open my $fh, "<:raw:perlio", $path 236 open my $fh, "<:raw:perlio", $path
… …
213 adamant => 256, 300 adamant => 256,
214 liquid => 512, 301 liquid => 512,
215 tin => 1024, 302 tin => 1024,
216 bone => 2048, 303 bone => 2048,
217 ice => 4096, 304 ice => 4096,
305
306 # guesses
307 runestone => 12,
308 bronze => 18,
309 "ancient wood" => 20,
310 glass => 36,
311 marble => 66,
312 ice => 68,
313 stone => 70,
314 stone => 80,
315 cloth => 136,
316 ironwood => 144,
317 adamantium => 258,
318 glacium => 260,
319 blood => 544,
218; 320;
219 321
220# object as in "Object xxx", i.e. archetypes 322# object as in "Object xxx", i.e. archetypes
221sub normalize_object($) { 323sub normalize_object($) {
222 my ($ob) = @_; 324 my ($ob) = @_;
… …
230 delete $ob->{material}; 332 delete $ob->{material};
231 } else { 333 } else {
232 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; 334 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
233 delete $ob->{material}; # assume materilname is more specific and nuke material 335 delete $ob->{material}; # assume materilname is more specific and nuke material
234 } 336 }
337 } elsif (my $name = $MATERIAL{$ob->{material}}) {
338 delete $ob->{material};
339 $ob->{materialname} = $name;
235 } else { 340 } else {
236 if (my $name = $MATERIAL{$ob->{material}}) { 341 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
237 delete $ob->{material};
238 $ob->{materialname} = $name;
239 }
240 } 342 }
241 } 343 }
242 344
243 # nuke outdated or never supported fields 345 # nuke outdated or never supported fields
244 delete @$ob{qw( 346 delete @$ob{qw(
… …
252 354
253 # convert movement strings to bitsets 355 # convert movement strings to bitsets
254 for my $attr (keys %FIELD_MOVEMENT) { 356 for my $attr (keys %FIELD_MOVEMENT) {
255 next unless exists $ob->{$attr}; 357 next unless exists $ob->{$attr};
256 358
257 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 359 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
258
259 next if $ob->{$attr} =~ /^\d+$/;
260
261 my $flags = 0;
262
263 # assume list
264 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
265 $flags |= MOVE_WALK if $flag eq "walk";
266 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
267 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
268 $flags |= MOVE_FLYING if $flag eq "flying";
269 $flags |= MOVE_SWIM if $flag eq "swim";
270 $flags |= MOVE_BOAT if $flag eq "boat";
271 $flags |= MOVE_ALL if $flag eq "all";
272
273 $flags &= ~MOVE_WALK if $flag eq "-walk";
274 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
275 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
276 $flags &= ~MOVE_FLYING if $flag eq "-flying";
277 $flags &= ~MOVE_SWIM if $flag eq "-swim";
278 $flags &= ~MOVE_BOAT if $flag eq "-boat";
279 $flags &= ~MOVE_ALL if $flag eq "-all";
280 }
281
282 $ob->{$attr} = $flags;
283 } 360 }
284 361
285 # convert outdated movement flags to new movement sets 362 # convert outdated movement flags to new movement sets
286 if (defined (my $v = delete $ob->{no_pass})) { 363 if (defined (my $v = delete $ob->{no_pass})) {
287 $ob->{move_block} = $v ? MOVE_ALL : 0; 364 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
288 } 365 }
289 if (defined (my $v = delete $ob->{slow_move})) { 366 if (defined (my $v = delete $ob->{slow_move})) {
290 $ob->{move_slow} |= MOVE_WALK; 367 $ob->{move_slow} += "walk";
291 $ob->{move_slow_penalty} = $v; 368 $ob->{move_slow_penalty} = $v;
292 } 369 }
293 if (defined (my $v = delete $ob->{walk_on})) { 370 if (defined (my $v = delete $ob->{walk_on})) {
294 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 371 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
295 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
296 : $ob->{move_on} & ~MOVE_WALK;
297 } 372 }
298 if (defined (my $v = delete $ob->{walk_off})) { 373 if (defined (my $v = delete $ob->{walk_off})) {
299 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 374 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
300 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
301 : $ob->{move_off} & ~MOVE_WALK;
302 } 375 }
303 if (defined (my $v = delete $ob->{fly_on})) { 376 if (defined (my $v = delete $ob->{fly_on})) {
304 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 377 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
305 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
306 : $ob->{move_on} & ~MOVE_FLY_LOW;
307 } 378 }
308 if (defined (my $v = delete $ob->{fly_off})) { 379 if (defined (my $v = delete $ob->{fly_off})) {
309 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 380 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
310 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
311 : $ob->{move_off} & ~MOVE_FLY_LOW;
312 } 381 }
313 if (defined (my $v = delete $ob->{flying})) { 382 if (defined (my $v = delete $ob->{flying})) {
314 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 383 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
315 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
316 : $ob->{move_type} & ~MOVE_FLY_LOW;
317 } 384 }
318 385
319 # convert idiotic event_xxx things into objects 386 # convert idiotic event_xxx things into objects
320 while (my ($event, $subtype) = each %EVENT_TYPE) { 387 while (my ($event, $subtype) = each %EVENT_TYPE) {
321 if (exists $ob->{"event_${event}_plugin"}) { 388 if (exists $ob->{"event_${event}_plugin"}) {
… …
552 619
553 my $inv = delete $a{inventory}; 620 my $inv = delete $a{inventory};
554 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 621 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
555 my $anim = delete $a{anim}; 622 my $anim = delete $a{anim};
556 623
624 if ($a{_atype} eq 'object') {
625 $str .= join "\n", "anim", @$anim, "mina\n"
626 if $anim;
627 }
628
557 my @kv; 629 my @kv;
558 630
559 for ($a{_name} eq "map" 631 for ($a{_name} eq "map"
560 ? @Crossfire::FIELD_ORDER_MAP 632 ? @Crossfire::FIELD_ORDER_MAP
561 : @Crossfire::FIELD_ORDER) { 633 : @Crossfire::FIELD_ORDER) {
… …
572 my ($k, $v) = @$_; 644 my ($k, $v) = @$_;
573 645
574 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 646 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
575 $v =~ s/\n$//; 647 $v =~ s/\n$//;
576 $str .= "$k\n$v\n$end\n"; 648 $str .= "$k\n$v\n$end\n";
577 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
578 if ($v & ~Crossfire::MOVE_ALL or !$v) {
579 $str .= "$k $v\n";
580
581 } elsif ($v & Crossfire::MOVE_ALLBIT) {
582 $str .= "$k all";
583
584 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
585 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
586 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
587 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
588 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
589
590 $str .= "\n";
591
592 } else {
593 $str .= $k;
594
595 $str .= " walk" if $v & Crossfire::MOVE_WALK;
596 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
597 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
598 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
599 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
600
601 $str .= "\n";
602 }
603 } else { 649 } else {
604 $str .= "$k $v\n"; 650 $str .= "$k $v\n";
605 } 651 }
606 } 652 }
607 653
608 if ($inv) { 654 if ($inv) {
609 $append->($_) for @$inv; 655 $append->($_) for @$inv;
610 }
611
612 if ($a{_atype} eq 'object') {
613 $str .= join "\n", "anim", @$anim, "mina\n"
614 if $anim;
615 } 656 }
616 657
617 $str .= "end\n"; 658 $str .= "end\n";
618 659
619 if ($a{_atype} eq 'object') { 660 if ($a{_atype} eq 'object') {
… …
780 ]; 821 ];
781 822
782 $attr 823 $attr
783} 824}
784 825
785sub arch_edit_sections {
786# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
787# edit_type = 0;
788# else if (edit_type != 0) {
789# // all flags from 'check_type' must be unset in this arch because they get recalculated now
790# edit_type &= ~check_type;
791# }
792#
793# }
794# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
795# getAttributeValue("alive", defarch) == 1 &&
796# (getAttributeValue("monster", defarch) == 1 ||
797# getAttributeValue("generator", defarch) == 1)) {
798# // Monster: monsters/npcs/generators
799# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
800# }
801# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
802# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
803# // Walls
804# edit_type |= IGUIConstants.TILE_EDIT_WALL;
805# }
806# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
807# getAttributeValue("connected", defarch) != 0) {
808# // Connected Objects
809# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
810# }
811# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
812# arch_type == 66 || arch_type == 41 || arch_type == 95) {
813# // Exit: teleporter/exit/trapdoors
814# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
815# }
816# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
817# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
818# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
819# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
820# arch_type == 124 || arch_type == 130)) {
821# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
822# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
823# }
824# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
825# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
826# arch_type == 91 || arch_type == 21 || arch_type == 24) {
827# // Door: door/special door/gates + keys
828# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
829# }
830# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
831# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
832# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
833# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
834# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
835# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
836# arch_type == 122 || arch_type == 3)) {
837# // Equipment: weapons/armour/wands/rods
838# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
839# }
840#
841# return(edit_type);
842#
843#
844}
845
846sub cache_file($$&&) { 826sub cache_file($$&&) {
847 my ($src, $cache, $load, $create) = @_; 827 my ($src, $cache, $load, $create) = @_;
848 828
849 my ($size, $mtime) = (stat $src)[7,9] 829 my ($size, $mtime) = (stat $src)[7,9]
850 or Carp::croak "$src: $!"; 830 or Carp::croak "$src: $!";

Diff Legend

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