ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/shop.C
(Generate patch)

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.35 by elmex, Sun Apr 15 19:13:22 2007 UTC vs.
Revision 1.47 by root, Sun Apr 13 01:34:09 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <spells.h> 25#include <spells.h>
27#include <skills.h> 26#include <skills.h>
34 * offer a range of prices around it such that the maximum price is always one 33 * offer a range of prices around it such that the maximum price is always one
35 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
36 * setting this value above 1 or to a negative value would have interesting, 35 * setting this value above 1 or to a negative value would have interesting,
37 * (though not useful) effects. 36 * (though not useful) effects.
38 */ 37 */
39#define SPECIALISATION_EFFECT 0.5 38#define SPECIALISATION_EFFECT .5
40 39
41/* price a shopkeeper will give someone they neither like nor dislike */ 40// price a shopkeeper will give someone that is not of their race
42#define NEUTRAL_RATIO 0.8 41#define DISLIKE_RATIO 0.8
43 42
44static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
45static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop); 44static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
46static double shop_specialisation_ratio (const object *item, const maptile *map); 45static double shop_specialisation_ratio (const object *item, const maptile *map);
47static double shop_greed (const maptile *map); 46static double shop_greed (const maptile *map);
48
49#define NUM_COINS 4 /* number of coin types */
50static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
51 47
52/* Added F_TRUE flag to define.h to mean that the price should not 48/* Added F_TRUE flag to define.h to mean that the price should not
53 * be adjusted by players charisma. With F_TRUE, it returns the amount 49 * be adjusted by players charisma. With F_TRUE, it returns the amount
54 * that the item is worth, if it was sold, but unadjusted by charisma. 50 * that the item is worth, if it was sold, but unadjusted by charisma.
55 * This is needed for alchemy, to to determine what value of gold nuggets 51 * This is needed for alchemy, to to determine what value of gold nuggets
131 if (tmp->arch != NULL) 127 if (tmp->arch != NULL)
132 { 128 {
133 if (flag == F_BUY) 129 if (flag == F_BUY)
134 { 130 {
135 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 131 LOG (llevError, "Asking for buy-value of unidentified object.\n");
136 val = tmp->arch->clone.value * 50 * number; 132 val = tmp->arch->value * 50 * number;
137 } 133 }
138 else 134 else
139 { /* Trying to sell something, or get true value */ 135 { /* Trying to sell something, or get true value */
140 if (tmp->type == POTION) 136 if (tmp->type == POTION)
141 val = number * 40; /* Don't want to give anything away */ 137 val = number * 40; /* Don't want to give anything away */
143 { 139 {
144 /* Get 2/3'rd value for applied objects, 1/3'rd for totally 140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
145 * unknown objects 141 * unknown objects
146 */ 142 */
147 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) 143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
148 val = number * tmp->arch->clone.value * 2 / 3; 144 val = number * tmp->arch->value * 2 / 3;
149 else 145 else
150 val = number * tmp->arch->clone.value / 3; 146 val = number * tmp->arch->value / 3;
151 } 147 }
152 } 148 }
153 } 149 }
154 else 150 else
155 { /* No archetype with this object */ 151 { /* No archetype with this object */
166 162
167 /* If the item has been applied or identifed or does not need to be 163 /* If the item has been applied or identifed or does not need to be
168 * identified, AND the object is magical and the archetype is non 164 * identified, AND the object is magical and the archetype is non
169 * magical, then change values accordingly. The tmp->arch==NULL is 165 * magical, then change values accordingly. The tmp->arch==NULL is
170 * really just a check to prevent core dumps for when it checks 166 * really just a check to prevent core dumps for when it checks
171 * tmp->arch->clone.magic for any magic. The check for archetype 167 * tmp->arch->magic for any magic. The check for archetype
172 * magic is to not give extra money for archetypes that are by 168 * magic is to not give extra money for archetypes that are by
173 * default magical. This is because the archetype value should have 169 * default magical. This is because the archetype value should have
174 * already figured in that value. 170 * already figured in that value.
175 */ 171 */
176 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
177 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 173 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
178 { 174 {
179 if (tmp->magic > 0) 175 if (tmp->magic > 0)
180 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 176 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
181 else 177 else
182 /* Note that tmp->magic is negative, so that this 178 /* Note that tmp->magic is negative, so that this
332 coin = archetype::find (coins[*cointype]); 328 coin = archetype::find (coins[*cointype]);
333 if (coin == NULL) 329 if (coin == NULL)
334 return NULL; 330 return NULL;
335 *cointype += 1; 331 *cointype += 1;
336 } 332 }
337 while (coin->clone.value > c); 333 while (coin->value > c);
338 334
339 return coin; 335 return coin;
340} 336}
341 337
342/* This returns a string of how much something is worth based on 338/* This returns a string of how much something is worth based on
358 354
359 coin = find_next_coin (cost, &cointype); 355 coin = find_next_coin (cost, &cointype);
360 if (coin == NULL) 356 if (coin == NULL)
361 return "nothing"; 357 return "nothing";
362 358
363 num = cost / coin->clone.value; 359 num = cost / coin->value;
364 /* so long as nrof is 32 bit, this is true. 360 /* so long as nrof is 32 bit, this is true.
365 * If it takes more coins than a person can possibly carry, this 361 * If it takes more coins than a person can possibly carry, this
366 * is basically true. 362 * is basically true.
367 */ 363 */
368 if ((cost / coin->clone.value) > UINT32_MAX) 364 if ((cost / coin->value) > UINT32_MAX)
369 { 365 {
370 strcpy (buf, "an unimaginable sum of money"); 366 strcpy (buf, "an unimaginable sum of money");
371 return buf; 367 return buf;
372 } 368 }
373 369
374 cost -= num * (sint64)coin->clone.value; 370 cost -= num * (sint64)coin->value;
375 371
376 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 372 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
377 373
378 next_coin = find_next_coin (cost, &cointype); 374 next_coin = find_next_coin (cost, &cointype);
379 if (next_coin == NULL || approx) 375 if (next_coin == NULL || approx)
380 return buf; 376 return buf;
381 377
382 coin = next_coin; 378 coin = next_coin;
383 num = cost / coin->clone.value; 379 num = cost / coin->value;
384 cost -= num * (sint64)coin->clone.value; 380 cost -= num * (sint64)coin->value;
385 381
386 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 382 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
387 383
388 return buf; 384 return buf;
389} 385}
390 386
391const char * 387const char *
421 archetype *coin = find_next_coin (real_value, &cointype); 417 archetype *coin = find_next_coin (real_value, &cointype);
422 418
423 if (coin == NULL) 419 if (coin == NULL)
424 return "nothing"; 420 return "nothing";
425 421
426 num = real_value / coin->clone.value; 422 num = real_value / coin->value;
427 if (num == 1) 423 if (num == 1)
428 sprintf (buf, "about one %s", &coin->clone.name); 424 sprintf (buf, "about one %s", &coin->object::name);
429 else if (num < 5) 425 else if (num < 5)
430 sprintf (buf, "a few %s", &coin->clone.name_pl); 426 sprintf (buf, "a few %s", &coin->object::name_pl);
431 else if (num < 10) 427 else if (num < 10)
432 sprintf (buf, "several %s", &coin->clone.name_pl); 428 sprintf (buf, "several %s", &coin->object::name_pl);
433 else if (num < 25) 429 else if (num < 25)
434 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 430 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
435 else if (num < 100) 431 else if (num < 100)
436 sprintf (buf, "lots of %s", &coin->clone.name_pl); 432 sprintf (buf, "lots of %s", &coin->object::name_pl);
437 else if (num < 1000) 433 else if (num < 1000)
438 sprintf (buf, "a great many %s", &coin->clone.name_pl); 434 sprintf (buf, "a great many %s", &coin->object::name_pl);
439 else 435 else
440 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 436 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
441 return buf; 437 return buf;
442 } 438 }
443 } 439 }
444 } 440 }
445 441
541 537
542 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 538 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
543 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 539 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
544 pay_from_container (pl, pouch, to_pay); 540 pay_from_container (pl, pouch, to_pay);
545 541
546 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
547 SET_FLAG (op, FLAG_WAS_WIZ);
548
549 pl->update_stats (); 542 pl->update_stats ();
543
550 return 1; 544 return 1;
551} 545}
552 546
553/* This pays for the item, and takes the proper amount of money off 547/* This pays for the item, and takes the proper amount of money off
554 * the player. 548 * the player.
583 577
584 if (tmp->type == MONEY) 578 if (tmp->type == MONEY)
585 { 579 {
586 for (i = 0; i < NUM_COINS; i++) 580 for (i = 0; i < NUM_COINS; i++)
587 { 581 {
588 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 582 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
589 { 583 {
590 // This should not happen, but if it does, just merge the two. 584 // This should not happen, but if it does, just merge the two.
591 if (coin_objs [i]) 585 if (coin_objs [i])
592 { 586 {
593 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 587 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
609 break; 603 break;
610 } 604 }
611 } 605 }
612 606
613 if (i == NUM_COINS) 607 if (i == NUM_COINS)
614 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 608 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
615 } 609 }
616 } 610 }
617 611
618 /* Fill in any gaps in the coin_objs array - needed to make change. */ 612 /* Fill in any gaps in the coin_objs array - needed to make change. */
619 /* Note that the coin_objs array goes from least value to greatest value */ 613 /* Note that the coin_objs array goes from least value to greatest value */
789{ 783{
790 int count = 0; 784 int count = 0;
791 archetype *at = 0; 785 archetype *at = 0;
792 object *pouch = 0, *tmp = 0; 786 object *pouch = 0, *tmp = 0;
793 787
794 for (count = 0; coins[count] != NULL; count++) 788 for (count = 0; coins[count]; count++)
795 { 789 {
796 at = archetype::find (coins[count]); 790 at = archetype::find (coins[count]);
797 791
798 if (at == NULL) 792 if (at == NULL)
799 LOG (llevError, "Could not find %s archetype\n", coins[count]); 793 LOG (llevError, "Could not find %s archetype\n", coins[count]);
800 else if ((amount / at->clone.value) > 0) 794 else if ((amount / at->value) > 0)
801 { 795 {
802 for (pouch = pl->inv; pouch; pouch = pouch->below) 796 for (pouch = pl->inv; pouch; pouch = pouch->below)
803 { 797 {
804 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 798 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
805 { 799 {
806 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 800 int w = at->weight * (100 - pouch->stats.Str) / 100;
807 int n = amount / at->clone.value; 801 int n = amount / at->value;
808 802
809 if (w == 0) 803 if (w == 0)
810 w = 1; /* Prevent divide by zero */ 804 w = 1; /* Prevent divide by zero */
811 805
812 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 806 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
824 esrv_send_item (pl, pl); 818 esrv_send_item (pl, pl);
825 } 819 }
826 } 820 }
827 } 821 }
828 822
829 if (amount / at->clone.value > 0) 823 if (amount / at->value > 0)
830 { 824 {
831 tmp = arch_to_object (at); 825 tmp = arch_to_object (at);
832 tmp->nrof = amount / tmp->value; 826 tmp->nrof = amount / tmp->value;
833 amount -= tmp->nrof * tmp->value; 827 amount -= tmp->nrof * tmp->value;
834 tmp = insert_ob_in_ob (tmp, pl); 828 tmp = insert_ob_in_ob (tmp, pl);
845/* elmex: this is for the bank plugin :( */ 839/* elmex: this is for the bank plugin :( */
846sint64 840sint64
847pay_player_arch (object *pl, const char *arch, sint64 amount) 841pay_player_arch (object *pl, const char *arch, sint64 amount)
848{ 842{
849 archetype *at = archetype::find (arch); 843 archetype *at = archetype::find (arch);
850 object *tmp = NULL;
851 844
852 if (at == NULL) 845 if (!at)
853 return 0; 846 return 0;
854 847
855 if (amount > 0) 848 if (amount > 0)
856 { 849 {
857 tmp = arch_to_object (at); 850 object *tmp = arch_to_object (at);
858 tmp->nrof = amount; 851 tmp->nrof = amount;
859 tmp = insert_ob_in_ob (tmp, pl); 852 tmp = insert_ob_in_ob (tmp, pl);
860 esrv_send_item (pl, tmp); 853 esrv_send_item (pl, tmp);
861 esrv_send_item (pl, pl); 854 esrv_send_item (pl, pl);
862 } 855 }
912 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 905 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
913 906
914 pay_player (pl, amount); 907 pay_player (pl, amount);
915 908
916 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.", query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op)); 909 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.", query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
910 pl->play_sound (sound_find ("shop_sell"));
917 911
918 SET_FLAG (op, FLAG_UNPAID); 912 SET_FLAG (op, FLAG_UNPAID);
919 identify (op); 913 identify (op);
920} 914}
921 915
922
923/* returns a double that is the ratio of the price that a shop will offer for 916/* returns a double that is the ratio of the price that a shop will offer for
924 * item based on the shops specialisation. Does not take account of greed, 917 * item based on the shops specialisation. Does not take account of greed,
925 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 918 * returned value is between SPECIALISATION_EFFECT and 1.
926 * event is never less than 0.1 (calling functions divide by it)
927 */ 919 */
928static double 920static double
929shop_specialisation_ratio (const object *item, const maptile *map) 921shop_specialisation_ratio (const object *item, const maptile *map)
930{ 922{
931 shopitems *items = map->shopitems; 923 shopitems *items = map->shopitems;
932 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 924 double likedness = 0.;
933 int i; 925 int i;
934 926
935 if (item == NULL) 927 if (item == NULL)
936 { 928 {
937 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path); 929 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
943 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 935 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
944 /* 936 /*
945 * I'm not really sure what the /right/ thing to do here is, these types of 937 * I'm not really sure what the /right/ thing to do here is, these types of
946 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 938 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
947 */ 939 */
948 return ratio; 940 return SPECIALISATION_EFFECT;
949 } 941 }
950 942
951 if (map->shopitems) 943 if (map->shopitems)
952 { 944 {
953 for (i = 0; i < items[0].index; i++) 945 for (i = 0; i < items[0].index; i++)
965 { 957 {
966 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path); 958 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
967 likedness = -1.0; 959 likedness = -1.0;
968 } 960 }
969 961
970 ratio = ratio + (1.0 - ratio) * likedness; 962 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
971
972 if (ratio <= 0.1)
973 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
974
975 return ratio;
976} 963}
977 964
978/*returns the greed of the shop on map, or 1 if it isn't specified. */ 965/*returns the greed of the shop on map, or 1 if it isn't specified. */
979static double 966static double
980shop_greed (const maptile *map) 967shop_greed (const maptile *map)
981{ 968{
982 double greed = 1.0;
983
984 if (map->shopgreed)
985 return map->shopgreed; 969 return map->shopgreed
986 return greed; 970 ? map->shopgreed
971 : 1.;
987} 972}
988 973
989/* Returns a double based on how much the shopkeeper approves of the player. 974/* Returns a double based on how much the shopkeeper approves of the player.
990 * this is based on the race of the shopkeeper and that of the player. 975 * this is based on the race of the shopkeeper and that of the player.
991 */ 976 */
992double 977double
993shopkeeper_approval (const maptile *map, const object *player) 978shopkeeper_approval (const maptile *map, const object *player)
994{ 979{
995 double approval = 1.0; 980 return map->shoprace && player->race != map->shoprace
996 981 ? DISLIKE_RATIO
997 if (map->shoprace) 982 : 1.;
998 {
999 approval = NEUTRAL_RATIO;
1000 if (player->race && !strcmp (player->race, map->shoprace))
1001 approval = 1.0;
1002 }
1003
1004 return approval;
1005} 983}
1006 984
1007/* limit the value of items based on the wealth of the shop. If the item is close 985/* limit the value of items based on the wealth of the shop. If the item is close
1008 * to the maximum value a shop will offer, we start to reduce it, if the item is 986 * to the maximum value a shop will offer, we start to reduce it, if the item is
1009 * below the minimum value the shop is prepared to trade in, then we don't 987 * below the minimum value the shop is prepared to trade in, then we don't
1286 return false; 1264 return false;
1287 1265
1288 return is_in_shop (o->map, o->x, o->y); 1266 return is_in_shop (o->map, o->x, o->y);
1289} 1267}
1290 1268
1291/* elmex: this function checks whether we are in a shop or not */ 1269/* elmex: this function checks whether we are in a shop or not
1270 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1271 floor tile. this possibly will make map bugs where shopfloors are above
1272 floors more obvious.
1273*/
1274
1292bool 1275bool
1293is_in_shop (maptile *map, int x, int y) 1276is_in_shop (maptile *map, int x, int y)
1294{ 1277{
1295 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) 1278 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1279 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1296 if (floor->type == SHOP_FLOOR) 1280 return floor->type == SHOP_FLOOR;
1297 return true;
1298
1299 return false; 1281 return false;
1300} 1282}
1283

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines