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.55 by root, Thu Mar 23 07:06:17 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# same as in server save routine, to (hopefully) be compatible
43# to the other editors.
43our @FIELD_ORDER = (qw(name name_pl)); 44our @FIELD_ORDER = (qw(
45 name name_pl custom_name title race
46 slaying skill msg lore other_arch face
47 #events
48 animation is_animated
49 Str Dex Con Wis Pow Cha Int
50 hp maxhp sp maxsp grace maxgrace
51 exp perm_exp expmul
52 food dam luck wc ac x y speed speed_left move_state attack_movement
53 nrof level direction type subtype
54
55 resist_physical resist_magic resist_fire resist_electricity
56 resist_cold resist_confusion resist_acid resist_drain
57 resist_weaponmagic resist_ghosthit resist_poison resist_slow
58 resist_paralyze resist_turn_undead resist_fear resist_cancellation
59 resist_deplete resist_death resist_chaos resist_counterspell
60 resist_godpower resist_holyword resist_blind resist_internal
61 resist_life_stealing resist_disease
62
63 path_attuned path_repelled path_denied material materialname
64 value carrying weight invisible state magic
65 last_heal last_sp last_grace last_eat
66 connected glow_radius randomitems npx_status npc_program
67 run_away pick_up container will_apply smoothlevel
68 current_weapon_script weapontype tooltype elevation client_type
69 item_power duration range
70 range_modifier duration_modifier dam_modifier gen_sp_armour
71 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
72
73 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
74 friendly generator is_thrown auto_apply treasure player sold see_invisible
75 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
76 splitting hitback startequip blocksview undead scared unaggressive
77 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
78 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
79 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
80 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
81 random_move only_attack confused stealth cursed damned see_anywhere
82 known_magical known_cursed can_use_skill been_applied has_ready_scroll
83 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
84 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
85 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
86 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
87
88 body_range body_arm body_torso body_head body_neck body_skill
89 body_finger body_shoulder body_foot body_hand body_wrist body_waist
90));
44 91
45sub MOVE_WALK (){ 0x01 } 92sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 93sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 94sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 95sub MOVE_FLYING (){ 0x06 }
… …
56 open my $fh, "<", $path 103 open my $fh, "<", $path
57 or die "$path: $!"; 104 or die "$path: $!";
58 binmode $fh; 105 binmode $fh;
59 local $/; 106 local $/;
60 107
61 Storable::thaw <$fh> 108 thaw <$fh>
62} 109}
63 110
64sub save_ref($$) { 111sub save_ref($$) {
65 my ($ref, $path) = @_; 112 my ($ref, $path) = @_;
66 113
67 open my $fh, ">", "$path~" 114 open my $fh, ">", "$path~"
68 or die "$path~: $!"; 115 or die "$path~: $!";
69 binmode $fh; 116 binmode $fh;
70 print $fh Storable::freeze $ref; 117 print $fh freeze $ref;
71 close $fh; 118 close $fh;
72 rename "$path~", $path 119 rename "$path~", $path
73 or die "$path: $!"; 120 or die "$path: $!";
74} 121}
75 122
76sub normalize_arch($) { 123sub normalize_object($) {
77 my ($ob) = @_; 124 my ($ob) = @_;
78
79 my $arch = $ARCH{$ob->{_name}}
80 or (warn "$ob->{_name}: no such archetype", return $ob);
81 125
82 delete $ob->{$_} for qw( 126 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour 127 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru 128 can_apply pass_thru can_pass_thru
85 ); 129 );
130
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
132 next unless exists $ob->{$attr};
133 next if $ob->{$attr} =~ /^\d+$/;
134
135 my $flags = 0;
136
137 # assume list
138 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
139 $flags |= MOVE_WALK if $flag eq "walk";
140 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
141 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
142 $flags |= MOVE_FLYING if $flag eq "flying";
143 $flags |= MOVE_SWIM if $flag eq "swim";
144 $flags |= MOVE_BOAT if $flag eq "boat";
145 $flags |= MOVE_ALL if $flag eq "all";
146
147 $flags &= ~MOVE_WALK if $flag eq "-walk";
148 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
149 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
150 $flags &= ~MOVE_FLYING if $flag eq "-flying";
151 $flags &= ~MOVE_SWIM if $flag eq "-swim";
152 $flags &= ~MOVE_BOAT if $flag eq "-boat";
153 $flags &= ~MOVE_ALL if $flag eq "-all";
154 }
155
156 $ob->{$attr} = $flags;
157 }
158
159 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 }
162 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v;
165 }
166 if (defined (my $v = delete $ob->{walk_on})) {
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK;
169 }
170 if (defined (my $v = delete $ob->{walk_off})) {
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK;
173 }
174 if (defined (my $v = delete $ob->{fly_on})) {
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 }
178 if (defined (my $v = delete $ob->{fly_off})) {
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 }
182 if (defined (my $v = delete $ob->{flying})) {
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 }
186
187 $ob
188}
189
190sub normalize_arch($) {
191 my ($ob) = @_;
192
193 normalize_object $ob;
194
195 my $arch = $ARCH{$ob->{_name}}
196 or (warn "$ob->{_name}: no such archetype", return $ob);
86 197
87 if ($arch->{type} == 22) { # map 198 if ($arch->{type} == 22) { # map
88 my %normalize = ( 199 my %normalize = (
89 "enter_x" => "hp", 200 "enter_x" => "hp",
90 "enter_y" => "sp", 201 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 211 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 212 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 213 $ob->{$k2} = $v;
103 } 214 }
104 } 215 }
105 } 216 } 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 217 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 218 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 219 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 220 next if $k eq "_name";
167 delete $ob->{$k}; 221 delete $ob->{$k};
222 }
168 } 223 }
169 } 224 }
170 225
171 $ob 226 $ob
172} 227}
… …
204 259
205 while (<$fh>) { 260 while (<$fh>) {
206 s/\s+$//; 261 s/\s+$//;
207 if (/^end$/i) { 262 if (/^end$/i) {
208 last; 263 last;
209 } elsif (/^arch (\S+)$/) { 264 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 266 } elsif (/^lore$/i) {
212 while (<$fh>) { 267 while (<$fh>) {
213 last if /^endlore\s*$/i; 268 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 269 $arc{lore} .= $_;
215 } 270 }
216 } elsif (/^msg$/) { 271 } elsif (/^msg$/i) {
217 while (<$fh>) { 272 while (<$fh>) {
218 last if /^endmsg\s*$/i; 273 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 274 $arc{msg} .= $_;
220 } 275 }
221 } elsif (/^(\S+)\s*(.*)$/) { 276 } elsif (/^(\S+)\s*(.*)$/) {
… …
234 s/\s+$//; 289 s/\s+$//;
235 if (/^more$/i) { 290 if (/^more$/i) {
236 $more = $prev; 291 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 292 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 293 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 294 my $arc = normalize_object $parse_block->(_name => $name);
240 295
241 if ($more) { 296 if ($more) {
242 $more->{more} = $arc; 297 $more->{more} = $arc;
243 } else { 298 } else {
244 $arc{$name} = $arc; 299 $arc{$name} = $arc;
245 } 300 }
246 $prev = $arc; 301 $prev = $arc;
247 $more = undef; 302 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 303 } elsif (/^arch (\S+)$/i) {
304 my $name = $1;
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 305 my $arc = normalize_object $parse_block->(_name => $name);
306
307 if ($more) {
308 $more->{more} = $arc;
309 } else {
310 push @{ $arc{arch} }, $arc;
311 }
312 $prev = $arc;
313 $more = undef;
250 } elsif (/^\s*($|#)/) { 314 } elsif (/^\s*($|#)/) {
251 # 315 #
252 } else { 316 } else {
253 warn "$path: unparseable top-level line '$_'"; 317 warn "$path: unparseable top-level line '$_'";
254 } 318 }
… …
469} 533}
470 534
471sub cache_file($$&&) { 535sub cache_file($$&&) {
472 my ($src, $cache, $load, $create) = @_; 536 my ($src, $cache, $load, $create) = @_;
473 537
474 warn "<@_>\n";#d#
475
476 my ($size, $mtime) = (stat $src)[7,9] 538 my ($size, $mtime) = (stat $src)[7,9]
477 or Carp::croak "$src: $!"; 539 or Carp::croak "$src: $!";
478 540
479 if (-e $cache) { 541 if (-e $cache) {
480 my $ref = eval { load_ref $cache }; 542 my $ref = eval { load_ref $cache };

Diff Legend

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