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.51 by root, Mon Mar 20 01:15:10 2006 UTC vs.
Revision 1.56 by root, Thu Mar 23 07:33:16 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.
44our @FIELD_ORDER_MAP = (qw(
45 name swap_time reset_timeout fixed_resettime difficulty region
46 shopitems shopgreed shopmin shopmax shoprace
47 darkness width height enter_x enter_y msg maplore
48 unique template
49 outdoor temp pressure humid windspeed winddir sky nosmooth
50 tile_path_1 tile_path_2 tile_path_3 tile_path_4
51));
52
43our @FIELD_ORDER = (qw(name name_pl)); 53our @FIELD_ORDER = (qw(
54 name name_pl custom_name title race
55 slaying skill msg lore other_arch face
56 #todo-events
57 animation is_animated
58 Str Dex Con Wis Pow Cha Int
59 hp maxhp sp maxsp grace maxgrace
60 exp perm_exp expmul
61 food dam luck wc ac x y speed speed_left move_state attack_movement
62 nrof level direction type subtype
63
64 resist_physical resist_magic resist_fire resist_electricity
65 resist_cold resist_confusion resist_acid resist_drain
66 resist_weaponmagic resist_ghosthit resist_poison resist_slow
67 resist_paralyze resist_turn_undead resist_fear resist_cancellation
68 resist_deplete resist_death resist_chaos resist_counterspell
69 resist_godpower resist_holyword resist_blind resist_internal
70 resist_life_stealing resist_disease
71
72 path_attuned path_repelled path_denied material materialname
73 value carrying weight invisible state magic
74 last_heal last_sp last_grace last_eat
75 connected glow_radius randomitems npx_status npc_program
76 run_away pick_up container will_apply smoothlevel
77 current_weapon_script weapontype tooltype elevation client_type
78 item_power duration range
79 range_modifier duration_modifier dam_modifier gen_sp_armour
80 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
81
82 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
83 friendly generator is_thrown auto_apply treasure player sold see_invisible
84 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
85 splitting hitback startequip blocksview undead scared unaggressive
86 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
87 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
88 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
89 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
90 random_move only_attack confused stealth cursed damned see_anywhere
91 known_magical known_cursed can_use_skill been_applied has_ready_scroll
92 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
93 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
94 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
95 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
96
97 body_range body_arm body_torso body_head body_neck body_skill
98 body_finger body_shoulder body_foot body_hand body_wrist body_waist
99));
44 100
45sub MOVE_WALK (){ 0x01 } 101sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 102sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 103sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 104sub MOVE_FLYING (){ 0x06 }
… …
56 open my $fh, "<", $path 112 open my $fh, "<", $path
57 or die "$path: $!"; 113 or die "$path: $!";
58 binmode $fh; 114 binmode $fh;
59 local $/; 115 local $/;
60 116
61 Storable::thaw <$fh> 117 thaw <$fh>
62} 118}
63 119
64sub save_ref($$) { 120sub save_ref($$) {
65 my ($ref, $path) = @_; 121 my ($ref, $path) = @_;
66 122
67 open my $fh, ">", "$path~" 123 open my $fh, ">", "$path~"
68 or die "$path~: $!"; 124 or die "$path~: $!";
69 binmode $fh; 125 binmode $fh;
70 print $fh Storable::freeze $ref; 126 print $fh freeze $ref;
71 close $fh; 127 close $fh;
72 rename "$path~", $path 128 rename "$path~", $path
73 or die "$path: $!"; 129 or die "$path: $!";
74} 130}
75 131
76sub normalize_arch($) { 132sub normalize_object($) {
77 my ($ob) = @_; 133 my ($ob) = @_;
78
79 my $arch = $ARCH{$ob->{_name}}
80 or (warn "$ob->{_name}: no such archetype", return $ob);
81 134
82 delete $ob->{$_} for qw( 135 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour 136 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru 137 can_apply pass_thru can_pass_thru
85 ); 138 );
139
140 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
141 next unless exists $ob->{$attr};
142 next if $ob->{$attr} =~ /^\d+$/;
143
144 my $flags = 0;
145
146 # assume list
147 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
148 $flags |= MOVE_WALK if $flag eq "walk";
149 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
150 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
151 $flags |= MOVE_FLYING if $flag eq "flying";
152 $flags |= MOVE_SWIM if $flag eq "swim";
153 $flags |= MOVE_BOAT if $flag eq "boat";
154 $flags |= MOVE_ALL if $flag eq "all";
155
156 $flags &= ~MOVE_WALK if $flag eq "-walk";
157 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
158 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
159 $flags &= ~MOVE_FLYING if $flag eq "-flying";
160 $flags &= ~MOVE_SWIM if $flag eq "-swim";
161 $flags &= ~MOVE_BOAT if $flag eq "-boat";
162 $flags &= ~MOVE_ALL if $flag eq "-all";
163 }
164
165 $ob->{$attr} = $flags;
166 }
167
168 if (defined (my $v = delete $ob->{no_pass})) {
169 $ob->{move_block} = $v ? MOVE_ALL : 0;
170 }
171 if (defined (my $v = delete $ob->{slow_move})) {
172 $ob->{move_slow} |= MOVE_WALK;
173 $ob->{move_slow_penalty} = $v;
174 }
175 if (defined (my $v = delete $ob->{walk_on})) {
176 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
177 : $ob->{move_on} & ~MOVE_WALK;
178 }
179 if (defined (my $v = delete $ob->{walk_off})) {
180 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
181 : $ob->{move_off} & ~MOVE_WALK;
182 }
183 if (defined (my $v = delete $ob->{fly_on})) {
184 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
185 : $ob->{move_on} & ~MOVE_FLY_LOW;
186 }
187 if (defined (my $v = delete $ob->{fly_off})) {
188 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
189 : $ob->{move_off} & ~MOVE_FLY_LOW;
190 }
191 if (defined (my $v = delete $ob->{flying})) {
192 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
193 : $ob->{move_type} & ~MOVE_FLY_LOW;
194 }
195
196 $ob
197}
198
199sub normalize_arch($) {
200 my ($ob) = @_;
201
202 normalize_object $ob;
203
204 my $arch = $ARCH{$ob->{_name}}
205 or (warn "$ob->{_name}: no such archetype", return $ob);
86 206
87 if ($arch->{type} == 22) { # map 207 if ($arch->{type} == 22) { # map
88 my %normalize = ( 208 my %normalize = (
89 "enter_x" => "hp", 209 "enter_x" => "hp",
90 "enter_y" => "sp", 210 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 220 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 221 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 222 $ob->{$k2} = $v;
103 } 223 }
104 } 224 }
105 } 225 } 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 226 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 227 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 228 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 229 next if $k eq "_name";
167 delete $ob->{$k}; 230 delete $ob->{$k};
231 }
168 } 232 }
169 } 233 }
170 234
171 $ob 235 $ob
172} 236}
… …
204 268
205 while (<$fh>) { 269 while (<$fh>) {
206 s/\s+$//; 270 s/\s+$//;
207 if (/^end$/i) { 271 if (/^end$/i) {
208 last; 272 last;
209 } elsif (/^arch (\S+)$/) { 273 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 274 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 275 } elsif (/^lore$/i) {
212 while (<$fh>) { 276 while (<$fh>) {
213 last if /^endlore\s*$/i; 277 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 278 $arc{lore} .= $_;
215 } 279 }
216 } elsif (/^msg$/) { 280 } elsif (/^msg$/i) {
217 while (<$fh>) { 281 while (<$fh>) {
218 last if /^endmsg\s*$/i; 282 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 283 $arc{msg} .= $_;
220 } 284 }
221 } elsif (/^(\S+)\s*(.*)$/) { 285 } elsif (/^(\S+)\s*(.*)$/) {
… …
234 s/\s+$//; 298 s/\s+$//;
235 if (/^more$/i) { 299 if (/^more$/i) {
236 $more = $prev; 300 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 301 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 302 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 303 my $arc = normalize_object $parse_block->(_name => $name);
240 304
241 if ($more) { 305 if ($more) {
242 $more->{more} = $arc; 306 $more->{more} = $arc;
243 } else { 307 } else {
244 $arc{$name} = $arc; 308 $arc{$name} = $arc;
245 } 309 }
246 $prev = $arc; 310 $prev = $arc;
247 $more = undef; 311 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 312 } elsif (/^arch (\S+)$/i) {
313 my $name = $1;
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 314 my $arc = normalize_object $parse_block->(_name => $name);
315
316 if ($more) {
317 $more->{more} = $arc;
318 } else {
319 push @{ $arc{arch} }, $arc;
320 }
321 $prev = $arc;
322 $more = undef;
250 } elsif (/^\s*($|#)/) { 323 } elsif (/^\s*($|#)/) {
251 # 324 #
252 } else { 325 } else {
253 warn "$path: unparseable top-level line '$_'"; 326 warn "$path: unparseable top-level line '$_'";
254 } 327 }

Diff Legend

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