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.103 by root, Mon Apr 16 12:31:22 2007 UTC vs.
Revision 1.109 by elmex, Sun May 27 08:08:59 2007 UTC

… …
58 outdoor temp pressure humid windspeed winddir sky nosmooth 58 outdoor temp pressure humid windspeed winddir sky nosmooth
59 tile_path_1 tile_path_2 tile_path_3 tile_path_4 59 tile_path_1 tile_path_2 tile_path_3 tile_path_4
60)); 60));
61 61
62our @FIELD_ORDER = (qw( 62our @FIELD_ORDER = (qw(
63 inherit
64
63 elevation 65 elevation
64 66
65 name name_pl custom_name attach title race 67 name name_pl custom_name attach title race
66 slaying skill msg lore other_arch 68 slaying skill msg lore other_arch
67 animation face is_animated 69 face animation is_animated
68 magicmap smoothlevel smoothface 70 magicmap smoothlevel smoothface
69 str dex con wis pow cha int 71 str dex con wis pow cha int
70 hp maxhp sp maxsp grace maxgrace 72 hp maxhp sp maxsp grace maxgrace
71 exp perm_exp expmul 73 exp perm_exp expmul
72 food dam luck wc ac x y speed speed_left move_state attack_movement 74 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
81 resist_life_stealing resist_disease 83 resist_life_stealing resist_disease
82 84
83 path_attuned path_repelled path_denied material materialname 85 path_attuned path_repelled path_denied material materialname
84 value carrying weight invisible state magic 86 value carrying weight invisible state magic
85 last_heal last_sp last_grace last_eat 87 last_heal last_sp last_grace last_eat
86 connected glow_radius randomitems npx_status npc_program 88 connected glow_radius randomitems tresure_env npx_status npc_program
87 run_away pick_up container will_apply smoothlevel 89 run_away pick_up container will_apply smoothlevel
88 current_weapon_script weapontype tooltype elevation client_type 90 current_weapon_script weapontype tooltype elevation client_type
89 item_power duration range 91 item_power duration range
90 range_modifier duration_modifier dam_modifier gen_sp_armour 92 range_modifier duration_modifier dam_modifier gen_sp_armour
91 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
102 known_magical known_cursed can_use_skill been_applied has_ready_scroll 104 known_magical known_cursed can_use_skill been_applied has_ready_scroll
103 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
104 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
105 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
106 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
109 precious
107 110
108 body_range body_arm body_torso body_head body_neck body_skill 111 body_range body_arm body_torso body_head body_neck body_skill
109 body_finger body_shoulder body_foot body_hand body_wrist body_waist 112 body_finger body_shoulder body_foot body_hand body_wrist body_waist
110)); 113));
111 114
… …
128sub MOVE_FLY_LOW (){ 0x02 } 131sub MOVE_FLY_LOW (){ 0x02 }
129sub MOVE_FLY_HIGH (){ 0x04 } 132sub MOVE_FLY_HIGH (){ 0x04 }
130sub MOVE_FLYING (){ 0x06 } 133sub MOVE_FLYING (){ 0x06 }
131sub MOVE_SWIM (){ 0x08 } 134sub MOVE_SWIM (){ 0x08 }
132sub MOVE_BOAT (){ 0x10 } 135sub MOVE_BOAT (){ 0x10 }
136sub MOVE_SHIP (){ 0x20 }
133sub MOVE_KNOWN (){ 0x1f } # all of above 137sub MOVE_KNOWN (){ 0x3f } # all of above
134sub MOVE_ALL (){ 0x10000 } # very special value 138sub MOVE_ALL (){ 0x10000 } # very special value
135 139
136our %MOVE_TYPE = ( 140our %MOVE_TYPE = (
137 walk => MOVE_WALK, 141 walk => MOVE_WALK,
138 fly_low => MOVE_FLY_LOW, 142 fly_low => MOVE_FLY_LOW,
139 fly_high => MOVE_FLY_HIGH, 143 fly_high => MOVE_FLY_HIGH,
140 flying => MOVE_FLYING, 144 flying => MOVE_FLYING,
141 swim => MOVE_SWIM, 145 swim => MOVE_SWIM,
142 boat => MOVE_BOAT, 146 boat => MOVE_BOAT,
147 ship => MOVE_SHIP,
143 all => MOVE_ALL, 148 all => MOVE_ALL,
144); 149);
145 150
146our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 151our @MOVE_TYPE = keys %MOVE_TYPE;
147 152
148{ 153{
149 package Crossfire::MoveType; 154 package Crossfire::MoveType;
150 155
151 use overload 156 use overload
… …
342 } else { 347 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 } 349 }
345 } 350 }
346 351
352 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1);
356
357 if (defined $arch->{attach}
358 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
359 delete $ob->{attach}
360 }
361 }
362
347 # color_fg is used as default for magicmap if magicmap does not exist 363 # color_fg is used as default for magicmap if magicmap does not exist
348 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 364 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
349 365
350 # nuke outdated or never supported fields 366 # nuke outdated or never supported fields
351 delete @$ob{qw( 367 delete @$ob{qw(

Diff Legend

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