ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.103 by root, Sun Jul 23 08:58:43 2006 UTC vs.
Revision 1.136 by root, Sat Dec 9 02:21:24 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.97';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB; 29use BerkeleyDB;
29use Pod::POM (); 30use Pod::POM ();
30use Scalar::Util (); 31use Scalar::Util ();
32use File::Path ();
31use Storable (); # finally 33use Storable (); # finally
32 34
33our %STAT_TOOLTIP = ( 35BEGIN {
34 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack", 36 use Crossfire::Protocol::Base ();
35 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed", 37 *to_json = \&Crossfire::Protocol::Base::to_json;
36 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have", 38 *from_json = \&Crossfire::Protocol::Base::from_json;
37 Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have", 39}
38 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
39 Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
40 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
41
42 Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
43 Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
44 Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
45 Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
46 Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
47 WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
48);
49 40
50=item guard { BLOCK } 41=item guard { BLOCK }
51 42
52Returns an object that executes the given block as soon as it is destroyed. 43Returns an object that executes the given block as soon as it is destroyed.
53 44
54=cut 45=cut
55 46
56sub guard(&) { 47sub guard(&) {
57 bless \(my $cb = $_[0]), "CFClient::Guard" 48 bless \(my $cb = $_[0]), "CFPlus::Guard"
58} 49}
59 50
60sub CFClient::Guard::DESTROY { 51sub CFPlus::Guard::DESTROY {
61 ${$_[0]}->() 52 ${$_[0]}->()
62} 53}
63 54
64package CFClient::PodToPango; 55=item shorten $string[, $maxlength]
65 56
66use base Pod::POM::View::Text; 57=cut
67 58
68our $VERSION = 1; # bump if resultant formatting changes 59sub shorten($;$) {
69 60 my ($str, $len) = @_;
70our $indent = 0; 61 substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
71 62 $str
72*view_seq_code =
73*view_seq_bold = sub { "<b>$_[1]</b>" };
74*view_seq_italic = sub { "<i>$_[1]</i>" };
75*view_seq_space =
76*view_seq_link =
77*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
78
79sub view_seq_text {
80 my $text = $_[1];
81 $text =~ s/\s+/ /g;
82 CFClient::UI::Label::escape ($text)
83} 63}
84 64
85sub view_item { 65sub asxml($) {
86 ("\t" x ($indent / 4)) 66 local $_ = $_[0];
87 . $_[1]->title->present ($_[0])
88 . "\n\n"
89 . $_[1]->content->present ($_[0])
90}
91 67
92sub view_verbatim { 68 s/&/&amp;/g;
93 (join "", 69 s/>/&gt;/g;
94 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n", 70 s/</&lt;/g;
95 split /\n/, CFClient::UI::Label::escape ($_[1]))
96 . "\n"
97}
98 71
99sub view_textblock { 72 $_
100 ("\t" x ($indent / 2)) . "$_[1]\n\n"
101} 73}
102 74
103sub view_head1 { 75sub socketpipe() {
104 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
105 . $_[1]->content->present ($_[0]) 77 or die "cannot establish bidiretcional pipe: $!\n";
106};
107 78
108sub view_head2 { 79 ($fh1, $fh2)
109 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
110 . $_[1]->content->present ($_[0])
111};
112
113sub view_head3 {
114 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
115 . $_[1]->content->present ($_[0])
116};
117
118sub view_over {
119 local $indent = $indent + $_[1]->indent;
120 $_[1]->content->present ($_[0])
121} 80}
122 81
82sub background(&;&) {
83 my ($bg, $cb) = @_;
84
85 my ($fh_r, $fh_w) = CFPlus::socketpipe;
86
87 my $pid = fork;
88
89 if (defined $pid && !$pid) {
90 local $SIG{__DIE__};
91
92 open STDOUT, ">&", $fh_w;
93 open STDERR, ">&", $fh_w;
94 close $fh_r;
95 close $fh_w;
96
97 $| = 1;
98
99 eval { $bg->() };
100
101 if ($@) {
102 my $msg = $@;
103 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg";
105 CFPlus::_exit 1;
106 }
107
108 # win32 is fucked up, of course. exit will clean stuff up,
109 # which destroys our database etc. _exit will exit ALL
110 # forked processes, because of the dreaded fork emulation.
111 CFPlus::_exit 0;
112 }
113
114 close $fh_w;
115
116 my $buffer;
117
118 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
119 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
120 undef $w;
121 $cb->();
122 return;
123 }
124
125 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1;
127 $line =~ s/\s+$//;
128 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1);
131 } else {
132 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line,
134 });
135 }
136 }
137 });
138}
139
140sub background_msg {
141 my ($msg) = @_;
142
143 $msg = "\x{e877}json_msg " . to_json $msg;
144 $msg =~ s/\n//g;
145 utf8::encode $msg;
146 print $msg, "\n";
147}
148
123package CFClient::Database; 149package CFPlus::Database;
124 150
125our @ISA = BerkeleyDB::Btree::; 151our @ISA = BerkeleyDB::Btree::;
126 152
127sub get($$) { 153sub get($$) {
128 my $data; 154 my $data;
… …
135my %DB_SYNC; 161my %DB_SYNC;
136 162
137sub put($$$) { 163sub put($$$) {
138 my ($db, $key, $data) = @_; 164 my ($db, $key, $data) = @_;
139 165
166 my $hkey = $db + 0;
167 Scalar::Util::weaken $db;
140 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 168 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
169 delete $DB_SYNC{$hkey};
170 $db->db_sync if $db;
171 });
141 172
142 $db->db_put ($key => $data) 173 $db->db_put ($key => $data)
143} 174}
144 175
145package CFClient; 176package CFPlus;
146 177
147sub find_rcfile($) { 178sub find_rcfile($) {
148 my $path; 179 my $path;
149 180
150 for (grep !ref, @INC) { 181 for (grep !ref, @INC) {
151 $path = "$_/CFClient/resources/$_[0]"; 182 $path = "$_/CFPlus/resources/$_[0]";
152 return $path if -r $path; 183 return $path if -r $path;
153 } 184 }
154 185
155 die "FATAL: can't find required file $_[0]\n"; 186 die "FATAL: can't find required file $_[0]\n";
156} 187}
157 188
158sub read_cfg { 189sub read_cfg {
159 my ($file) = @_; 190 my ($file) = @_;
160 191
161 open CFG, $file 192 open my $fh, $file
162 or return; 193 or return;
163 194
164 my $CFG;
165
166 local $/; 195 local $/;
167 $CFG = eval <CFG>; 196 my $CFG = <$fh>;
168 197
169 $::CFG = $CFG; 198 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 199 require YAML;
171 close CFG; 200 utf8::decode $CFG;
201 $::CFG = YAML::Load ($CFG);
202 } elsif ($CFG =~ /^\{/) {
203 $::CFG = from_json $CFG;
204 } else {
205 $::CFG = eval $CFG; ## todo comaptibility cruft
206 }
172} 207}
173 208
174sub write_cfg { 209sub write_cfg {
175 my ($file) = @_; 210 my ($file) = @_;
176 211
177 open CFG, ">$file" 212 $::CFG->{VERSION} = $::VERSION;
213
214 open my $fh, ">:utf8", $file
178 or return; 215 or return;
216 print $fh to_json $::CFG;
217}
179 218
180 { 219sub http_proxy {
181 require Data::Dumper; 220 my @proxy = win32_proxy_info;
182 local $Data::Dumper::Purity = 1; 221
183 $::CFG->{VERSION} = $::VERSION; 222 if (@proxy) {
184 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 223 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
224 } elsif (exists $ENV{http_proxy}) {
225 $ENV{http_proxy}
226 } else {
227 ()
185 } 228 }
229}
186 230
187 close CFG; 231sub set_proxy {
232 my $proxy = http_proxy
233 or return;
234
235 $ENV{http_proxy} = $proxy;
236}
237
238sub lwp_useragent {
239 require LWP::UserAgent;
240
241 CFPlus::set_proxy;
242
243 my $ua = LWP::UserAgent->new (
244 agent => "cfplus $VERSION",
245 keep_alive => 1,
246 env_proxy => 1,
247 timeout => 30,
248 );
249}
250
251sub lwp_check($) {
252 my ($res) = @_;
253
254 $res->is_error
255 and die $res->status_line;
256
257 $res
188} 258}
189 259
190our $DB_ENV; 260our $DB_ENV;
191 261our $DB_STATE;
192{
193 use strict;
194
195 mkdir "$Crossfire::VARDIR/cfplus", 0777;
196 my $recover = $BerkeleyDB::db_version >= 4.4
197 ? eval "DB_REGISTER | DB_RECOVER"
198 : 0;
199
200 $DB_ENV = new BerkeleyDB::Env
201 -Home => "$Crossfire::VARDIR/cfplus",
202 -Cachesize => 1_000_000,
203 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
204# -ErrPrefix => "DATABASE",
205 -Verbose => 1,
206 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
207 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
208 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
209}
210 262
211sub db_table($) { 263sub db_table($) {
212 my ($table) = @_; 264 my ($table) = @_;
213 265
214 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
215 267
216 new CFClient::Database 268 new CFPlus::Database
217 -Env => $DB_ENV, 269 -Env => $DB_ENV,
218 -Filename => $table, 270 -Filename => $table,
219# -Filename => "database", 271# -Filename => "database",
220# -Subname => $table, 272# -Subname => $table,
221 -Property => DB_CHKSUM, 273 -Property => DB_CHKSUM,
222 -Flags => DB_CREATE | DB_UPGRADE, 274 -Flags => DB_CREATE | DB_UPGRADE,
223 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
224} 276}
225 277
226my $pod_cache = db_table "pod_cache"; 278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
227 279
228sub load_pod($$$$) { 280sub open_db {
229 my ($path, $filtertype, $filterversion, $filtercb) = @_; 281 use strict;
230 282
231 stat $path 283 mkdir $DB_HOME, 0777;
232 or die "$path: $!"; 284 my $recover = $BerkeleyDB::db_version >= 4.4
285 ? eval "DB_REGISTER | DB_RECOVER"
286 : 0;
233 287
234 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9]; 288 $DB_ENV = new BerkeleyDB::Env
289 -Home => $DB_HOME,
290 -Cachesize => 1_000_000,
291 -ErrFile => "$DB_HOME/errorlog.txt",
292# -ErrPrefix => "DATABASE",
293 -Verbose => 1,
294 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
295 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
296 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
235 297
236 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; 298 $DB_STATE = db_table "state";
237 299
238 return $pom if $chash eq $phash;
239
240 my $pod = do {
241 local $/;
242 open my $pod, "<:utf8", $_[0]
243 or die "$_[0]: $!";
244 <$pod>
245 };
246
247 #utf8::downgrade $pod;
248
249 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
250
251 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
252
253 $pom
254}
255
256sub pod_to_pango($) {
257 my ($pom) = @_;
258
259 $pom->present ("CFClient::PodToPango")
260}
261
262sub pod_to_pango_list($) {
263 my ($pom) = @_;
264
265 [ 300 1
266 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
267 split /\n/, $pom->present ("CFClient::PodToPango")
268 ]
269} 301}
270 302
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
271package CFClient::Layout; 308package CFPlus::Layout;
272 309
273$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
274 reset_glyph_cache; 311 reset_glyph_cache;
275}; 312};
276 313
277package CFClient::Item;
278
279use strict;
280use Crossfire::Protocol::Constants;
281
282my $last_enter_count = 1;
283
284sub desc_string {
285 my ($self) = @_;
286
287 my $desc =
288 $self->{nrof} < 2
289 ? $self->{name}
290 : "$self->{nrof} × $self->{name_pl}";
291
292 $self->{flags} & F_OPEN
293 and $desc .= " (open)";
294 $self->{flags} & F_APPLIED
295 and $desc .= " (applied)";
296 $self->{flags} & F_UNPAID
297 and $desc .= " (unpaid)";
298 $self->{flags} & F_MAGIC
299 and $desc .= " (magic)";
300 $self->{flags} & F_CURSED
301 and $desc .= " (cursed)";
302 $self->{flags} & F_DAMNED
303 and $desc .= " (damned)";
304 $self->{flags} & F_LOCKED
305 and $desc .= " *";
306
307 $desc
308}
309
310sub weight_string {
311 my ($self) = @_;
312
313 my $weight = ($self->{nrof} || 1) * $self->{weight};
314
315 $weight < 0 ? "?" : $weight * 0.001
316}
317
318sub do_n_dialog {
319 my ($cb) = @_;
320
321 my $w = new CFClient::UI::FancyFrame
322 on_delete => sub { $_[0]->destroy; 1 },
323 has_close_button => 1,
324 ;
325
326 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
327 $vb->add (new CFClient::UI::Label text => "Enter item count:");
328 $vb->add (my $entry = new CFClient::UI::Entry
329 text => $last_enter_count,
330 on_activate => sub {
331 my ($entry) = @_;
332 $last_enter_count = $entry->get_text;
333 $cb->($last_enter_count);
334 $w->hide;
335 $w->destroy;
336
337 0
338 },
339 on_escape => sub { $w->destroy; 1 },
340 );
341 $entry->grab_focus;
342 $w->show;
343}
344
345sub update_widgets {
346 my ($self) = @_;
347
348 # necessary to avoid cyclic references
349 Scalar::Util::weaken $self;
350
351 my $button_cb = sub {
352 my (undef, $ev, $x, $y) = @_;
353
354 my $targ = $::CONN->{player}{tag};
355
356 if ($self->{container} == $::CONN->{player}{tag}) {
357 $targ = $::CONN->{open_container};
358 }
359
360 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
361 $::CONN->send ("move $targ $self->{tag} 0")
362 if $targ || !($self->{flags} & F_LOCKED);
363 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
364 $self->{flags} & F_LOCKED
365 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
366 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
367 } elsif ($ev->{button} == 1) {
368 $::CONN->send ("examine $self->{tag}");
369 } elsif ($ev->{button} == 2) {
370 $::CONN->send ("apply $self->{tag}");
371 } elsif ($ev->{button} == 3) {
372 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
373 if ($self->{container} == $::CONN->{open_container}) {
374 $move_prefix = "take";
375 }
376
377 my @menu_items = (
378 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
379 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
380 ["ignite/thaw", # first try of an easier use of flint&steel
381 sub {
382 $::CONN->send ("mark ". pack "N", $self->{tag});
383 $::CONN->send ("command apply flint and steel");
384 }
385 ],
386 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
387 (
388 $self->{flags} & F_LOCKED
389 ? (
390 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
391 )
392 : (
393 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
394 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
395 ["$move_prefix <n>",
396 sub {
397 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
398 }
399 ]
400 )
401 ),
402 );
403
404 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
405 }
406
407 1
408 };
409
410 my $tooltip_std = "<small>"
411 . "Left click - examine item\n"
412 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
413 . "Middle click - apply\n"
414 . "Shift-Middle click - lock/unlock\n"
415 . "Right click - further options"
416 . "</small>\n";
417
418 $self->{face_widget} ||= new CFClient::UI::Face
419 can_events => 1,
420 can_hover => 1,
421 anim => $self->{anim},
422 animspeed => $self->{animspeed}, # TODO# must be set at creation time
423 on_button_down => $button_cb,
424 ;
425 $self->{face_widget}{face} = $self->{face};
426 $self->{face_widget}{anim} = $self->{anim};
427 $self->{face_widget}{animspeed} = $self->{animspeed};
428 $self->{face_widget}->set_tooltip (
429 "<b>Face/Animation.</b>\n"
430 . "Item uses face #$self->{face}. "
431 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
432 . "\n\n$tooltip_std"
433 );
434
435 $self->{desc_widget} ||= new CFClient::UI::Label
436 can_events => 1,
437 can_hover => 1,
438 ellipsise => 2,
439 align => -1,
440 on_button_down => $button_cb,
441 ;
442 my $desc = CFClient::Item::desc_string $self;
443 $self->{desc_widget}->set_text ($desc);
444 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
445
446 $self->{weight_widget} ||= new CFClient::UI::Label
447 can_events => 1,
448 can_hover => 1,
449 ellipsise => 0,
450 align => 0,
451 on_button_down => $button_cb,
452 ;
453 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
454
455 $self->{weight_widget}->set_tooltip (
456 "<b>Weight</b>.\n"
457 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
458 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
459 . "\n\n$tooltip_std"
460 );
461}
462
4631; 3141;
464 315
465=back 316=back
466 317
467=head1 AUTHOR 318=head1 AUTHOR

Diff Legend

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