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

Diff Legend

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