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.53 by root, Wed Mar 22 03:32:09 2006 UTC vs.
Revision 1.62 by root, Tue Mar 28 14:44:52 2006 UTC

… …
37 msg => "endmsg", 37 msg => "endmsg",
38 lore => "endlore", 38 lore => "endlore",
39 maplore => "endmaplore", 39 maplore => "endmaplore",
40); 40);
41 41
42# not used yet, maybe alphabetical is ok 42# movement bit type, PITA
43our %FIELD_MOVEMENT = map +($_ => undef),
44 qw(move_type move_block move_allow move_on move_off move_slow);
45
46# same as in server save routine, to (hopefully) be compatible
47# to the other editors.
48our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore
52 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55));
56
43our @FIELD_ORDER = (qw(name name_pl)); 57our @FIELD_ORDER = (qw(
58 elevation
59
60 name name_pl custom_name title race
61 slaying skill msg lore other_arch face
62 #todo-events
63 animation is_animated
64 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype
69
70 resist_physical resist_magic resist_fire resist_electricity
71 resist_cold resist_confusion resist_acid resist_drain
72 resist_weaponmagic resist_ghosthit resist_poison resist_slow
73 resist_paralyze resist_turn_undead resist_fear resist_cancellation
74 resist_deplete resist_death resist_chaos resist_counterspell
75 resist_godpower resist_holyword resist_blind resist_internal
76 resist_life_stealing resist_disease
77
78 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program
82 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour
86 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
87
88 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
89 friendly generator is_thrown auto_apply treasure player sold see_invisible
90 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
91 splitting hitback startequip blocksview undead scared unaggressive
92 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
93 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
94 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
95 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
96 random_move only_attack confused stealth cursed damned see_anywhere
97 known_magical known_cursed can_use_skill been_applied has_ready_scroll
98 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
99 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
100 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
101 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
102
103 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105));
106
107our %EVENT_TYPE = (
108 apply => 1,
109 attack => 2,
110 death => 3,
111 drop => 4,
112 pickup => 5,
113 say => 6,
114 stop => 7,
115 time => 8,
116 throw => 9,
117 trigger => 10,
118 close => 11,
119 timer => 12,
120);
44 121
45sub MOVE_WALK (){ 0x01 } 122sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 123sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 124sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 125sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 126sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 127sub MOVE_BOAT (){ 0x10 }
128sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 131
53sub load_ref($) { 132sub load_ref($) {
54 my ($path) = @_; 133 my ($path) = @_;
55 134
56 open my $fh, "<", $path 135 open my $fh, "<", $path
… …
71 close $fh; 150 close $fh;
72 rename "$path~", $path 151 rename "$path~", $path
73 or die "$path: $!"; 152 or die "$path: $!";
74} 153}
75 154
155# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 156sub normalize_object($) {
77 my ($ob) = @_; 157 my ($ob) = @_;
78 158
159 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 160 delete $ob->{$_} for qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 161 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 162 can_apply pass_thru can_pass_thru
82 ); 163 );
83 164
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 165 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 167 next unless exists $ob->{$attr};
168
169 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
170
86 next if $ob->{$attr} =~ /^\d+$/; 171 next if $ob->{$attr} =~ /^\d+$/;
87 172
88 my $flags = 0; 173 my $flags = 0;
89 174
90 # assume list 175 # assume list
… …
107 } 192 }
108 193
109 $ob->{$attr} = $flags; 194 $ob->{$attr} = $flags;
110 } 195 }
111 196
197 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 198 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 199 $ob->{move_block} = $v ? MOVE_ALL : 0;
114 } 200 }
115 if (defined (my $v = delete $ob->{slow_move})) { 201 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 202 $ob->{move_slow} |= MOVE_WALK;
… …
135 if (defined (my $v = delete $ob->{flying})) { 221 if (defined (my $v = delete $ob->{flying})) {
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
137 : $ob->{move_type} & ~MOVE_FLY_LOW; 223 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 224 }
139 225
226 # convert idiotic event_xxx things into objects
227 while (my ($event, $subtype) = each %EVENT_TYPE) {
228 if (exists $ob->{"event_${event}_plugin"}) {
229 push @{$ob->{inventory}}, {
230 _name => "event_$event",
231 title => delete $ob->{"event_${event}_plugin"},
232 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"},
234 };
235 }
236 }
237
140 $ob 238 $ob
141} 239}
142 240
241# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 242sub normalize_arch($) {
144 my ($ob) = @_; 243 my ($ob) = @_;
145 244
146 normalize_object $ob; 245 normalize_object $ob;
147 246
… …
174 delete $ob->{$k}; 273 delete $ob->{$k};
175 } 274 }
176 } 275 }
177 } 276 }
178 277
278 # a speciality for the editor
279 if (exists $ob->{attack_movement}) {
280 my $am = delete $ob->{attack_movement};
281 $ob->{attack_movement_bits_0_3} = $am & 15;
282 $ob->{attack_movement_bits_4_7} = $am & 240;
283 }
284
179 $ob 285 $ob
180} 286}
181 287
182sub read_pak($) { 288sub read_pak($) {
183 my ($path) = @_; 289 my ($path) = @_;
… …
212 318
213 while (<$fh>) { 319 while (<$fh>) {
214 s/\s+$//; 320 s/\s+$//;
215 if (/^end$/i) { 321 if (/^end$/i) {
216 last; 322 last;
217 } elsif (/^arch (\S+)$/) { 323 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
219 } elsif (/^lore$/) { 325 } elsif (/^lore$/i) {
220 while (<$fh>) { 326 while (<$fh>) {
221 last if /^endlore\s*$/i; 327 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 328 $arc{lore} .= $_;
223 } 329 }
224 } elsif (/^msg$/) { 330 } elsif (/^msg$/i) {
225 while (<$fh>) { 331 while (<$fh>) {
226 last if /^endmsg\s*$/i; 332 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 333 $arc{msg} .= $_;
228 } 334 }
229 } elsif (/^(\S+)\s*(.*)$/) { 335 } elsif (/^(\S+)\s*(.*)$/) {
… …
252 $arc{$name} = $arc; 358 $arc{$name} = $arc;
253 } 359 }
254 $prev = $arc; 360 $prev = $arc;
255 $more = undef; 361 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 362 } elsif (/^arch (\S+)$/i) {
363 my $name = $1;
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 364 my $arc = normalize_arch $parse_block->(_name => $name);
365
366 if ($more) {
367 $more->{more} = $arc;
368 } else {
369 push @{ $arc{arch} }, $arc;
370 }
371 $prev = $arc;
372 $more = undef;
258 } elsif (/^\s*($|#)/) { 373 } elsif (/^\s*($|#)/) {
259 # 374 #
260 } else { 375 } else {
261 warn "$path: unparseable top-level line '$_'"; 376 warn "$path: unparseable top-level line '$_'";
262 } 377 }
… …
273sub editor_archs { 388sub editor_archs {
274 my %paths; 389 my %paths;
275 390
276 for (keys %ARCH) { 391 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 392 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 393 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 394 }
280 395
281 \%paths 396 \%paths
282} 397}
283 398
… …
348 my $type = $obj->{type} || $arch->{type}; 463 my $type = $obj->{type} || $arch->{type};
349 464
350 if ($type > 0) { 465 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 466 $root = $Crossfire::Data::ATTR{$type};
352 } else { 467 } else {
468 my %a = (%$arch, %$obj);
469
470 if ($a{is_floor} && !$a{alive}) {
471 $root = $Crossfire::Data::TYPE{Floor};
472 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
473 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
474 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
475 $root = $Crossfire::Data::TYPE{Wall};
476 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
477 $root = $Crossfire::Data::TYPE{"Weak Wall"};
478 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 479 $root = $Crossfire::Data::TYPE{Misc};
354
355 type:
356 for (@Crossfire::Data::ATTR0) {
357 my $req = $_->{required}
358 or die "internal error: ATTR0 without 'required'";
359
360 keys %$req;
361 while (my ($k, $v) = each %$req) {
362 next type
363 unless $obj->{$k} == $v || $arch->{$k} == $v;
364 }
365
366 $root = $_;
367 } 480 }
368 } 481 }
369 482
370 my @import = ($root); 483 my @import = ($root);
371 484
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 658 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 659 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 660 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 661 *FACE = $_[0];
549 }, sub { 662 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 663 my $tile = read_pak "$LIB/crossfire.0";
553 664
554 my %cache; 665 my %cache;
555 666
556 my $idx = 0; 667 my $idx = 0;
557 668
558 for my $name (sort keys %$tile) { 669 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 670 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 671 $pb->write ($tile->{$name});
561 close $fh; 672 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 673 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 674
565 my $tile = $cache{$name} = { 675 my $tile = $cache{$name} = {
566 pb => $pb, 676 pb => $pb,
567 idx => $idx, 677 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 678 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 696 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 697 }
588 } 698 }
589 } 699 }
590 700
591 $pb->save ("$VARDIR/tilecache.png", "png"); 701 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 702
593 \%cache 703 \%cache
594 }; 704 };
595} 705}
596 706

Diff Legend

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