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.50 by root, Mon Mar 20 01:12:23 2006 UTC vs.
Revision 1.58 by root, Thu Mar 23 20:15:08 2006 UTC

… …
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable; 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @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
… …
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
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
57 or die "$path: $!"; 121 or die "$path: $!";
58 binmode $fh; 122 binmode $fh;
59 local $/; 123 local $/;
60 124
61 Storable::thaw <$fh> 125 thaw <$fh>
62} 126}
63 127
64sub save_ref($$) { 128sub save_ref($$) {
65 my ($ref, $path) = @_; 129 my ($ref, $path) = @_;
66 130
67 open my $fh, ">", "$path~" 131 open my $fh, ">", "$path~"
68 or die "$path~: $!"; 132 or die "$path~: $!";
69 binmode $fh; 133 binmode $fh;
70 print $fh Storable::freeze $ref; 134 print $fh freeze $ref;
71 close $fh; 135 close $fh;
72 rename "$path~", $path 136 rename "$path~", $path
73 or die "$path: $!"; 137 or die "$path: $!";
74} 138}
75 139
76sub normalize_arch($) { 140sub normalize_object($) {
77 my ($ob) = @_; 141 my ($ob) = @_;
78
79 my $arch = $ARCH{$ob->{_name}}
80 or (warn "$ob->{_name}: no such archetype", return $ob);
81 142
82 delete $ob->{$_} for qw( 143 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour 144 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru 145 can_apply pass_thru can_pass_thru
85 ); 146 );
147
148 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr};
150
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152
153 next if $ob->{$attr} =~ /^\d+$/;
154
155 my $flags = 0;
156
157 # assume list
158 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
159 $flags |= MOVE_WALK if $flag eq "walk";
160 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
161 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
162 $flags |= MOVE_FLYING if $flag eq "flying";
163 $flags |= MOVE_SWIM if $flag eq "swim";
164 $flags |= MOVE_BOAT if $flag eq "boat";
165 $flags |= MOVE_ALL if $flag eq "all";
166
167 $flags &= ~MOVE_WALK if $flag eq "-walk";
168 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
169 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
170 $flags &= ~MOVE_FLYING if $flag eq "-flying";
171 $flags &= ~MOVE_SWIM if $flag eq "-swim";
172 $flags &= ~MOVE_BOAT if $flag eq "-boat";
173 $flags &= ~MOVE_ALL if $flag eq "-all";
174 }
175
176 $ob->{$attr} = $flags;
177 }
178
179 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 }
182 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v;
185 }
186 if (defined (my $v = delete $ob->{walk_on})) {
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK;
189 }
190 if (defined (my $v = delete $ob->{walk_off})) {
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK;
193 }
194 if (defined (my $v = delete $ob->{fly_on})) {
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 }
198 if (defined (my $v = delete $ob->{fly_off})) {
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 }
202 if (defined (my $v = delete $ob->{flying})) {
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 }
206
207 $ob
208}
209
210sub normalize_arch($) {
211 my ($ob) = @_;
212
213 normalize_object $ob;
214
215 my $arch = $ARCH{$ob->{_name}}
216 or (warn "$ob->{_name}: no such archetype", return $ob);
86 217
87 if ($arch->{type} == 22) { # map 218 if ($arch->{type} == 22) { # map
88 my %normalize = ( 219 my %normalize = (
89 "enter_x" => "hp", 220 "enter_x" => "hp",
90 "enter_y" => "sp", 221 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 231 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 232 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 233 $ob->{$k2} = $v;
103 } 234 }
104 } 235 }
105 } 236 } else {
106
107 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
108 next unless exists $ob->{$attr};
109 next if $ob->{$attr} =~ /^\d+$/;
110
111 my $flags = 0;
112
113 # assume list
114 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
115 $flags |= MOVE_WALK if $flag eq "walk";
116 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
117 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
118 $flags |= MOVE_FLYING if $flag eq "flying";
119 $flags |= MOVE_SWIM if $flag eq "swim";
120 $flags |= MOVE_BOAT if $flag eq "boat";
121 $flags |= MOVE_ALL if $flag eq "all";
122
123 $flags &= ~MOVE_WALK if $flag eq "-walk";
124 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
125 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
126 $flags &= ~MOVE_FLYING if $flag eq "-flying";
127 $flags &= ~MOVE_SWIM if $flag eq "-swim";
128 $flags &= ~MOVE_BOAT if $flag eq "-boat";
129 $flags &= ~MOVE_ALL if $flag eq "-all";
130 }
131
132 $ob->{$attr} = $flags;
133 }
134
135 if (defined (my $v = delete $ob->{no_pass})) {
136 $ob->{move_block} = $v ? MOVE_ALL : 0;
137 }
138 if (defined (my $v = delete $ob->{slow_move})) {
139 $ob->{move_slow} |= MOVE_WALK;
140 $ob->{move_slow_penalty} = $v;
141 }
142 if (defined (my $v = delete $ob->{walk_on})) {
143 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
144 : $ob->{move_on} & ~MOVE_WALK;
145 }
146 if (defined (my $v = delete $ob->{walk_off})) {
147 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
148 : $ob->{move_off} & ~MOVE_WALK;
149 }
150 if (defined (my $v = delete $ob->{fly_on})) {
151 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
152 : $ob->{move_on} & ~MOVE_FLY_LOW;
153 }
154 if (defined (my $v = delete $ob->{fly_off})) {
155 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
156 : $ob->{move_off} & ~MOVE_FLY_LOW;
157 }
158 if (defined (my $v = delete $ob->{flying})) {
159 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
160 : $ob->{move_type} & ~MOVE_FLY_LOW;
161 }
162
163 # if value matches archetype default, delete 237 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 238 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 239 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 240 next if $k eq "_name";
167 delete $ob->{$k}; 241 delete $ob->{$k};
168 } 242 }
243 }
244 }
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;
169 } 251 }
170 252
171 $ob 253 $ob
172} 254}
173 255
… …
204 286
205 while (<$fh>) { 287 while (<$fh>) {
206 s/\s+$//; 288 s/\s+$//;
207 if (/^end$/i) { 289 if (/^end$/i) {
208 last; 290 last;
209 } elsif (/^arch (\S+)$/) { 291 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 293 } elsif (/^lore$/i) {
212 while (<$fh>) { 294 while (<$fh>) {
213 last if /^endlore\s*$/i; 295 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 296 $arc{lore} .= $_;
215 } 297 }
216 } elsif (/^msg$/) { 298 } elsif (/^msg$/i) {
217 while (<$fh>) { 299 while (<$fh>) {
218 last if /^endmsg\s*$/i; 300 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 301 $arc{msg} .= $_;
220 } 302 }
221 } elsif (/^(\S+)\s*(.*)$/) { 303 } elsif (/^(\S+)\s*(.*)$/) {
… …
234 s/\s+$//; 316 s/\s+$//;
235 if (/^more$/i) { 317 if (/^more$/i) {
236 $more = $prev; 318 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 319 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 320 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 321 my $arc = normalize_object $parse_block->(_name => $name);
240 322
241 if ($more) { 323 if ($more) {
242 $more->{more} = $arc; 324 $more->{more} = $arc;
243 } else { 325 } else {
244 $arc{$name} = $arc; 326 $arc{$name} = $arc;
245 } 327 }
246 $prev = $arc; 328 $prev = $arc;
247 $more = undef; 329 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 330 } elsif (/^arch (\S+)$/i) {
331 my $name = $1;
249 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;
250 } elsif (/^\s*($|#)/) { 341 } elsif (/^\s*($|#)/) {
251 # 342 #
252 } else { 343 } else {
253 warn "$path: unparseable top-level line '$_'"; 344 warn "$path: unparseable top-level line '$_'";
254 } 345 }
… …
469} 560}
470 561
471sub cache_file($$&&) { 562sub cache_file($$&&) {
472 my ($src, $cache, $load, $create) = @_; 563 my ($src, $cache, $load, $create) = @_;
473 564
474 warn "<@_>\n";#d#
475
476 my ($size, $mtime) = (stat $src)[7,9] 565 my ($size, $mtime) = (stat $src)[7,9]
477 or Carp::croak "$src: $!"; 566 or Carp::croak "$src: $!";
478 567
479 if (-e $cache) { 568 if (-e $cache) {
480 my $ref = eval { load_ref $cache }; 569 my $ref = eval { load_ref $cache };

Diff Legend

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