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.60 by root, Mon Mar 27 17:23:35 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));
44 106
45sub MOVE_WALK (){ 0x01 } 107sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 108sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 109sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 110sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 111sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 112sub MOVE_BOAT (){ 0x10 }
113sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 114sub MOVE_ALLBIT (){ 0x10000 }
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 116
53sub load_ref($) { 117sub load_ref($) {
54 my ($path) = @_; 118 my ($path) = @_;
55 119
56 open my $fh, "<", $path 120 open my $fh, "<", $path
… …
79 delete $ob->{$_} for qw( 143 delete $ob->{$_} for qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 144 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 145 can_apply pass_thru can_pass_thru
82 ); 146 );
83 147
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 148 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 149 next unless exists $ob->{$attr};
150
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152
86 next if $ob->{$attr} =~ /^\d+$/; 153 next if $ob->{$attr} =~ /^\d+$/;
87 154
88 my $flags = 0; 155 my $flags = 0;
89 156
90 # assume list 157 # assume list
… …
174 delete $ob->{$k}; 241 delete $ob->{$k};
175 } 242 }
176 } 243 }
177 } 244 }
178 245
246 # a speciality for the editor
247 if (exists $ob->{attack_movement}) {
248 my $am = delete $ob->{attack_movement};
249 $ob->{attack_movement_bits_0_3} = $am & 15;
250 $ob->{attack_movement_bits_4_7} = $am & 240;
251 }
252
179 $ob 253 $ob
180} 254}
181 255
182sub read_pak($) { 256sub read_pak($) {
183 my ($path) = @_; 257 my ($path) = @_;
… …
212 286
213 while (<$fh>) { 287 while (<$fh>) {
214 s/\s+$//; 288 s/\s+$//;
215 if (/^end$/i) { 289 if (/^end$/i) {
216 last; 290 last;
217 } elsif (/^arch (\S+)$/) { 291 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
219 } elsif (/^lore$/) { 293 } elsif (/^lore$/i) {
220 while (<$fh>) { 294 while (<$fh>) {
221 last if /^endlore\s*$/i; 295 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 296 $arc{lore} .= $_;
223 } 297 }
224 } elsif (/^msg$/) { 298 } elsif (/^msg$/i) {
225 while (<$fh>) { 299 while (<$fh>) {
226 last if /^endmsg\s*$/i; 300 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 301 $arc{msg} .= $_;
228 } 302 }
229 } elsif (/^(\S+)\s*(.*)$/) { 303 } elsif (/^(\S+)\s*(.*)$/) {
… …
252 $arc{$name} = $arc; 326 $arc{$name} = $arc;
253 } 327 }
254 $prev = $arc; 328 $prev = $arc;
255 $more = undef; 329 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 330 } elsif (/^arch (\S+)$/i) {
331 my $name = $1;
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 332 my $arc = normalize_arch $parse_block->(_name => $name);
333
334 if ($more) {
335 $more->{more} = $arc;
336 } else {
337 push @{ $arc{arch} }, $arc;
338 }
339 $prev = $arc;
340 $more = undef;
258 } elsif (/^\s*($|#)/) { 341 } elsif (/^\s*($|#)/) {
259 # 342 #
260 } else { 343 } else {
261 warn "$path: unparseable top-level line '$_'"; 344 warn "$path: unparseable top-level line '$_'";
262 } 345 }
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 630 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 631 *FACE = $_[0];
549 }, sub { 632 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 633 my $tile = read_pak "$LIB/crossfire.0";
553 634
554 my %cache; 635 my %cache;
555 636
556 my $idx = 0; 637 my $idx = 0;
557 638
558 for my $name (sort keys %$tile) { 639 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 640 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 641 $pb->write ($tile->{$name});
561 close $fh; 642 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 643 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 644
565 my $tile = $cache{$name} = { 645 my $tile = $cache{$name} = {
566 pb => $pb, 646 pb => $pb,
567 idx => $idx, 647 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 648 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 666 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 667 }
588 } 668 }
589 } 669 }
590 670
591 $pb->save ("$VARDIR/tilecache.png", "png"); 671 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 672
593 \%cache 673 \%cache
594 }; 674 };
595} 675}
596 676

Diff Legend

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