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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.55 by root, Thu May 22 15:37:44 2008 UTC vs.
Revision 1.77 by root, Fri Mar 19 17:48:49 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
41 /* Only prohibit stealing if the player does not have a free 42 /* Only prohibit stealing if the player does not have a free
42 * hand available and in fact does have hands. 43 * hand available and in fact does have hands.
43 */ 44 */
44 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info) 45 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
45 { 46 {
46 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 47 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! "
48 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
47 return -1; 49 return -1;
48 } 50 }
49 51
50 /* ADJUSTMENTS */ 52 /* ADJUSTMENTS */
51 53
52 /* Its harder to steal from hostile beings! */ 54 /* It's harder to steal from hostile beings! */
53 if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 55 if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
54 roll = roll / 2; 56 roll = roll / 2;
55 57
56 /* Easier to steal from sleeping beings, or if the thief is 58 /* Easier to steal from sleeping beings, or if the thief is
57 * unseen */ 59 * unseen */
… …
64 * it quite a bit harder to steal. 66 * it quite a bit harder to steal.
65 */ 67 */
66 for (equip = op->inv; equip; equip = equip->below) 68 for (equip = op->inv; equip; equip = equip->below)
67 { 69 {
68 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED)) 70 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED))
69 {
70 roll -= equip->weight / 10000; 71 roll -= equip->weight / 10000;
71 } 72
72 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 73 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED))
73 roll -= equip->weight / 5000; 74 roll -= equip->weight / 5000;
75
74 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 76 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED))
75 {
76 roll -= equip->weight / 2000; 77 roll -= equip->weight / 2000;
77 } 78
78 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 79 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED))
79 roll -= equip->weight / 5000; 80 roll -= equip->weight / 5000;
81
80 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 82 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED))
81 roll -= equip->weight / 100; 83 roll -= equip->weight / 100;
82 } 84 }
85
83 if (roll < 0) 86 if (roll < 0)
84 roll = 0; 87 roll = 0;
88
85 return roll; 89 return roll;
86} 90}
87 91
88/* 92/*
89 * When stealing: dependent on the intelligence/wisdom of whom you're 93 * When stealing: dependent on the intelligence/wisdom of whom you're
… …
99{ 103{
100 object *success = NULL, *tmp = NULL, *next; 104 object *success = NULL, *tmp = NULL, *next;
101 int roll = 0, chance = 0, stats_value; 105 int roll = 0, chance = 0, stats_value;
102 rv_vector rv; 106 rv_vector rv;
103 107
104 stats_value = ((who->stats.Dex + who->stats.Int) * 3) / 2; 108 stats_value = (who->stats.Dex + who->stats.Int) * 3 / 2;
105 109
106 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them) 110 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them)
107 * they will try to prevent stealing if they can. Only unseen theives will 111 * they will try to prevent stealing if they can. Only unseen theives will
108 * have much chance of success. 112 * have much chance of success.
109 */ 113 */
110 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_NO_STEAL)) 114 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
111 { 115 {
112 if (can_detect_enemy (op, who, &rv)) 116 if (can_detect_enemy (op, who, &rv))
113 { 117 {
114 npc_call_help (op); 118 npc_call_help (op);
115 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 119 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
116 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 120 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!");
117 return 0; 121 return 0;
118 } 122 }
119 else /* help npc to detect thief next time by raising its wisdom */ 123 else /* help npc to detect thief next time by raising its wisdom */
120 op->stats.Wis += (op->stats.Int / 5) + 1; 124 op->stats.Wis += (op->stats.Int / 5) + 1;
125
121 if (op->stats.Wis > MAX_STAT) 126 if (op->stats.Wis > MAX_STAT)
122 op->stats.Wis = MAX_STAT; 127 op->stats.Wis = MAX_STAT;
123 } 128 }
124 129
125 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 130 if (op->is_player () && op->flag [FLAG_WIZ])
126 { 131 {
127 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 132 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
128 return 0; 133 return 0;
129 } 134 }
130 135
131 // only allow stealing between hostile players (TODO: probably should change) 136 // only allow stealing between hostile players (TODO: probably should change)
132 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 137 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
133 { 138 {
134 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 139 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
135 return 0; 140 return 0;
136 } 141 }
137 142
… …
198 203
199 if ((roll >= skill->level) || !chance 204 if ((roll >= skill->level) || !chance
200 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW))))) 205 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW)))))
201 { 206 {
202 /* victim figures out where the thief is! */ 207 /* victim figures out where the thief is! */
203 if (who->hide) 208 if (who->flag [FLAG_HIDDEN])
204 make_visible (who); 209 make_visible (who);
205 210
206 if (op->type != PLAYER) 211 if (op->type != PLAYER)
207 { 212 {
208 /* The unaggressives look after themselves 8) */ 213 /* The unaggressives look after themselves 8) */
… …
255 260
256 x = op->x + freearr_x[dir]; 261 x = op->x + freearr_x[dir];
257 y = op->y + freearr_y[dir]; 262 y = op->y + freearr_y[dir];
258 263
259 if (dir == 0) 264 if (dir == 0)
260 { 265 return 0; // you can't steal from ourself!
261 /* Can't steal from ourself! */
262 return 0;
263 }
264 266
265 m = op->map; 267 m = op->map;
266 mflags = get_map_flags (m, &m, x, y, &x, &y); 268 mflags = get_map_flags (m, &m, x, y, &x, &y);
267 /* Out of map - can't do it. If nothing alive on this space, 269 /* Out of map - can't do it. If nothing alive on this space,
268 * don't need to look any further. 270 * don't need to look any further.
… …
276 278
277 /* Find the topmost object at this spot */ 279 /* Find the topmost object at this spot */
278 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 280 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
279 281
280 /* For all the stacked objects at this point, attempt a steal */ 282 /* For all the stacked objects at this point, attempt a steal */
281 for (; tmp != NULL; tmp = next) 283 for (; tmp; tmp = next)
282 { 284 {
283 next = tmp->below; 285 next = tmp->below;
284 /* Minor hack--for multi square beings - make sure we get 286 /* Minor hack--for multi square beings - make sure we get
285 * the 'head' coz 'tail' objects have no inventory! - b.t. 287 * the 'head' coz 'tail' objects have no inventory! - b.t.
286 */ 288 */
… …
291 continue; 293 continue;
292 294
293 /* do not reveal hidden DMs */ 295 /* do not reveal hidden DMs */
294 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden) 296 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)
295 continue; 297 continue;
298
296 if (attempt_steal (tmp, op, skill)) 299 if (attempt_steal (tmp, op, skill))
297 { 300 {
298 if (tmp->type == PLAYER) /* no xp for stealing from another player */ 301 if (tmp->type == PLAYER) /* no xp for stealing from another player */
299 return 0; 302 return 0;
300 303
301 /* no xp for stealing from pets (of players) */ 304 /* no xp for stealing from pets (of players) */
302 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 305 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
303 { 306 {
304 object *owner = tmp->owner; 307 object *owner = tmp->owner;
305 308
306 if (owner != NULL && owner->type == PLAYER) 309 if (owner && owner->type == PLAYER)
307 return 0; 310 return 0;
308 } 311 }
309 312
310 // reduce monster experience by experience we gained, as to 313 // reduce monster experience by experience we gained, as to
311 // limit the amount of exp that can be gained by stealing from monsters 314 // limit the amount of exp that can be gained by stealing from monsters
312 // (jessies gave ~20,000,000 exp otherwise. 315 // (jessies gave ~20,000,000 exp otherwise.
313 int exp = calc_skill_exp (op, tmp, skill); 316 int exp = calc_skill_exp (op, tmp, skill);
314 317
315 exp = MIN (tmp->stats.exp, exp); 318 exp = min (tmp->stats.exp, exp);
316 tmp->stats.exp -= exp; 319 tmp->stats.exp -= exp;
317 return exp; 320 return exp;
318 } 321 }
319 } 322 }
323
320 return 0; 324 return 0;
321} 325}
322 326
323static int 327static int
324attempt_pick_lock (object *door, object *pl, object *skill) 328attempt_pick_lock (object *door, object *pl, object *skill)
… …
426 op->invisible += 100; /* set the level of 'hiddeness' */ 430 op->invisible += 100; /* set the level of 'hiddeness' */
427 431
428 if (op->type == PLAYER) 432 if (op->type == PLAYER)
429 op->contr->tmp_invis = 1; 433 op->contr->tmp_invis = 1;
430 434
431 op->hide = 1; 435 op->flag [FLAG_HIDDEN] = 1;
432 return 1; 436 return 1;
433 } 437 }
434 438
435 return 0; 439 return 0;
436} 440}
… …
445 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 449 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
446 { 450 {
447 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
448 return 0; 452 return 0;
449 } 453 }
450 else if (!op->hide && op->invisible > 0 && op->type == PLAYER) 454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
451 { 455 {
452 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 456 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
453 make_visible (op); 457 make_visible (op);
454 } 458 }
455 459
… …
477static void 481static void
478stop_jump (object *pl, int dist, int spaces) 482stop_jump (object *pl, int dist, int spaces)
479{ 483{
480 pl->update_stats (); 484 pl->update_stats ();
481 pl->map->insert (pl, pl->x, pl->y, pl); 485 pl->map->insert (pl, pl->x, pl->y, pl);
482 pl->speed_left -= fabs (pl->speed * 8); 486 pl->speed_left -= pl->speed * 8.;
483} 487}
484 488
485static int 489static int
486attempt_jump (object *pl, int dir, int spaces, object *skill) 490attempt_jump (object *pl, int dir, int spaces, object *skill)
487{ 491{
… …
530 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party)) 534 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
531 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */ 535 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
532 536
533 return exp; /* note that calc_skill_exp() is already called by skill_attack() */ 537 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
534 } 538 }
535
536 /* If the space has fly on set (no matter what the space is),
537 * we should get the effects - after all, the player is
538 * effectively flying.
539 */
540 if (tmp->move_on & MOVE_FLY_LOW)
541 {
542 pl->x = x;
543 pl->y = y;
544 pl->map = m;
545 stop_jump (pl, i, spaces);
546
547 return calc_skill_exp (pl, NULL, skill);
548 }
549 } 539 }
550 540
551 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 541 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
552 { 542 {
553 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
… …
556 } 546 }
557 547
558 pl->x = x; 548 pl->x = x;
559 pl->y = y; 549 pl->y = y;
560 pl->map = m; 550 pl->map = m;
551
552 if (m->at (x, y).move_on & pl->move_type)
553 {
554 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is stopped.");
555 stop_jump (pl, i, spaces);
556 return 0;
557 }
561 } 558 }
562 559
563 stop_jump (pl, i, spaces); 560 stop_jump (pl, i, spaces);
564 561
565 return calc_skill_exp (pl, NULL, skill); 562 return calc_skill_exp (pl, NULL, skill);
… …
661} 658}
662 659
663/* Helper function for do_skill_ident, so that we can loop 660/* Helper function for do_skill_ident, so that we can loop
664 * over inventory AND objects on the ground conveniently. 661 * over inventory AND objects on the ground conveniently.
665 */ 662 */
666int 663static int
667do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill) 664do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
668{ 665{
669 int success = 0, chance; 666 int success = 0, chance;
670 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10; 667 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
671 668
… …
927 924
928 if (pl->type != PLAYER) 925 if (pl->type != PLAYER)
929 return 0; /* only players use this skill */ 926 return 0; /* only players use this skill */
930 927
931 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 928 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
932 for (i = 0; i < MIN (skill->level, SIZEOFFREE); i++) 929 for (i = 0; i < min (skill->level, SIZEOFFREE); i++)
933 { 930 {
934 x = pl->x + freearr_x[i]; 931 x = pl->x + freearr_x[i];
935 y = pl->y + freearr_y[i]; 932 y = pl->y + freearr_y[i];
936 m = pl->map; 933 m = pl->map;
937 934
… …
988} 985}
989 986
990/* The find_traps skill (aka, search). Checks for traps 987/* The find_traps skill (aka, search). Checks for traps
991 * on the spaces or in certain objects 988 * on the spaces or in certain objects
992 */ 989 */
993
994int 990int
995find_traps (object *pl, object *skill) 991find_traps (object *pl, object *skill)
996{ 992{
997 object *tmp, *tmp2; 993 object *tmp, *tmp2;
998 int i, expsum = 0, mflags; 994 int i, expsum = 0, mflags;
… …
1000 maptile *m; 996 maptile *m;
1001 997
1002 /* First we search all around us for runes and traps, which are 998 /* First we search all around us for runes and traps, which are
1003 * all type RUNE 999 * all type RUNE
1004 */ 1000 */
1005
1006 for (i = 0; i < 9; i++) 1001 for (i = 0; i < 9; i++)
1007 { 1002 {
1008 x = pl->x + freearr_x[i]; 1003 x = pl->x + freearr_x[i];
1009 y = pl->y + freearr_y[i]; 1004 y = pl->y + freearr_y[i];
1010 m = pl->map; 1005 m = pl->map;
… …
1012 mflags = get_map_flags (m, &m, x, y, &x, &y); 1007 mflags = get_map_flags (m, &m, x, y, &x, &y);
1013 if (mflags & P_OUT_OF_MAP) 1008 if (mflags & P_OUT_OF_MAP)
1014 continue; 1009 continue;
1015 1010
1016 /* Check everything in the square for trapness */ 1011 /* Check everything in the square for trapness */
1017 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1012 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1018 { 1013 {
1019
1020 /* And now we'd better do an inventory traversal of each 1014 /* And now we'd better do an inventory traversal of each
1021 * of these objects' inventory 1015 * of these objects' inventory
1022 * We can narrow this down a bit - no reason to search through 1016 * We can narrow this down a bit - no reason to search through
1023 * the players inventory or monsters for that matter. 1017 * the players inventory or monsters for that matter.
1024 */ 1018 */
1025 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1019 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1026 {
1027 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1020 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1028 if (tmp2->type == RUNE || tmp2->type == TRAP) 1021 if (tmp2->type == RUNE || tmp2->type == TRAP)
1029 if (trap_see (pl, tmp2)) 1022 if (trap_see (pl, tmp2))
1030 { 1023 {
1031 trap_show (tmp2, tmp); 1024 trap_show (tmp2, tmp);
1032 if (tmp2->stats.Cha > 1) 1025 if (tmp2->stats.Cha > 1)
1033 { 1026 {
1034 if (!tmp2->owner || tmp2->owner->type != PLAYER) 1027 if (!tmp2->owner || tmp2->owner->type != PLAYER)
1035 expsum += calc_skill_exp (pl, tmp2, skill); 1028 expsum += calc_skill_exp (pl, tmp2, skill);
1036 1029
1037 tmp2->stats.Cha = 1; /* unhide the trap */ 1030 tmp2->stats.Cha = 1; /* unhide the trap */
1038 } 1031 }
1039 } 1032 }
1040 } 1033
1041 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp)) 1034 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp))
1042 { 1035 {
1043 trap_show (tmp, tmp); 1036 trap_show (tmp, tmp);
1044 if (tmp->stats.Cha > 1) 1037 if (tmp->stats.Cha > 1)
1045 { 1038 {
… …
1048 tmp->stats.Cha = 1; /* unhide the trap */ 1041 tmp->stats.Cha = 1; /* unhide the trap */
1049 } 1042 }
1050 } 1043 }
1051 } 1044 }
1052 } 1045 }
1046
1053 new_draw_info (NDI_BLACK, 0, pl, "You search the area."); 1047 new_draw_info (NDI_BLACK, 0, pl, "You search the area.");
1054 return expsum; 1048 return expsum;
1055} 1049}
1056 1050
1057/* remove_trap() - This skill will disarm any previously discovered trap 1051/* remove_trap() - This skill will disarm any previously discovered trap
1058 * the algorithm is based (almost totally) on the old command_disarm() - b.t. 1052 * the algorithm is based (almost totally) on the old command_disarm() - b.t.
1059 */ 1053 */
1060
1061int 1054int
1062remove_trap (object *op, int dir, object *skill) 1055remove_trap (object *op, int dir, object *skill)
1063{ 1056{
1064 object *tmp, *tmp2; 1057 object *tmp, *tmp2;
1065 int i, success = 0, mflags; 1058 int i, success = 0, mflags;
… …
1075 mflags = get_map_flags (m, &m, x, y, &x, &y); 1068 mflags = get_map_flags (m, &m, x, y, &x, &y);
1076 if (mflags & P_OUT_OF_MAP) 1069 if (mflags & P_OUT_OF_MAP)
1077 continue; 1070 continue;
1078 1071
1079 /* Check everything in the square for trapness */ 1072 /* Check everything in the square for trapness */
1080 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1073 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1081 { 1074 {
1082 /* And now we'd better do an inventory traversal of each 1075 /* And now we'd better do an inventory traversal of each
1083 * of these objects inventory. Like above, only 1076 * of these objects inventory. Like above, only
1084 * do this for interesting objects. 1077 * do this for interesting objects.
1085 */ 1078 */
1086 1079
1087 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1080 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1088 { 1081 {
1089 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1082 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1090 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1083 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1091 { 1084 {
1092 trap_show (tmp2, tmp); 1085 trap_show (tmp2, tmp);
1086
1093 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER)) 1087 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER))
1094 { 1088 {
1095 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1089 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1096 success += calc_skill_exp (op, tmp2, skill); 1090 success += calc_skill_exp (op, tmp2, skill);
1097 } 1091 }
1098 } 1092 }
1099 } 1093 }
1094
1100 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1) 1095 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1)
1101 { 1096 {
1102 trap_show (tmp, tmp); 1097 trap_show (tmp, tmp);
1098
1103 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER)) 1099 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER))
1104 { 1100 {
1105 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1101 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1106 success += calc_skill_exp (op, tmp, skill); 1102 success += calc_skill_exp (op, tmp, skill);
1107 } 1103 }
… …
1133 /* Check all objects - we could stop at floor objects, 1129 /* Check all objects - we could stop at floor objects,
1134 * but if someone buries an altar, I don't see a problem with 1130 * but if someone buries an altar, I don't see a problem with
1135 * going through all the objects, and it shouldn't be much slower 1131 * going through all the objects, and it shouldn't be much slower
1136 * than extra checks on object attributes. 1132 * than extra checks on object attributes.
1137 */ 1133 */
1138 for (tmp = pl->below; tmp != NULL; tmp = tmp->below) 1134 for (tmp = pl->below; tmp; tmp = tmp->below)
1139 { 1135 {
1140 /* Only if the altar actually belongs to someone do you get special benefits */ 1136 /* Only if the altar actually belongs to someone do you get special benefits */
1141 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch) 1137 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch)
1142 { 1138 {
1143 sprintf (buf, "You pray over the %s.", &tmp->name); 1139 sprintf (buf, "You pray over the %s.", &tmp->name);
… …
1218 * ordinary inscribable 'books' (anything that is not a SPELL). b.t. 1214 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1219 */ 1215 */
1220static int 1216static int
1221write_note (object *pl, object *item, const char *msg, object *skill) 1217write_note (object *pl, object *item, const char *msg, object *skill)
1222{ 1218{
1223 if (strstr (msg, "\nendmsg")) 1219 if (!msg_is_safe (msg))
1224 { 1220 {
1225 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1221 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1222 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
1226 return 0; 1223 return 0;
1227 } 1224 }
1228 1225
1229 int len = strlen (msg); 1226 int len = strlen (msg);
1230 1227
… …
1235 } 1232 }
1236 1233
1237 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1234 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1238 return RESULT_INT (0); 1235 return RESULT_INT (0);
1239 1236
1240 char buf[1024]; 1237 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1241 1238
1242 if (len < sizeof (buf) - 2) 1239 if (char_len <= item->weight_limit)
1243 { 1240 {
1244 snprintf (buf, sizeof (buf), "%s\n", msg);
1245
1246 object *newbook = arch_to_object (item->other_arch); 1241 object *newbook = item->other_arch->instance ();
1247 item->decrease (); 1242 item->decrease ();
1248 newbook->nrof = 1; 1243 newbook->nrof = 1;
1249 newbook->msg = buf; 1244 newbook->msg = shstr (msg);
1250 newbook->flag [FLAG_IDENTIFIED] = true; 1245 newbook->flag [FLAG_IDENTIFIED] = true;
1251 1246
1252 if (item->subtype == 1) // mailscrolls 1247 if (item->subtype == 1) // mailscrolls
1253 { 1248 {
1254 newbook->name = item->name; 1249 newbook->name = item->name;
… …
1257 1252
1258 pl->insert (newbook); 1253 pl->insert (newbook);
1259 1254
1260 pl->contr->play_sound (sound_find ("inscribe_success")); 1255 pl->contr->play_sound (sound_find ("inscribe_success"));
1261 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name); 1256 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1262 return strlen (msg); 1257 return char_len;
1263 } 1258 }
1264 else 1259 else
1265 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name); 1260 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s! H<It is only big enough for %d characters, your message had %d characters.>",
1261 &item->name, item->weight_limit, char_len);
1266 1262
1267 return 0; 1263 return 0;
1268} 1264}
1269 1265
1270/* write_scroll() - this routine allows players to inscribe spell scrolls 1266/* write_scroll() - this routine allows players to inscribe spell scrolls
… …
1306 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1302 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1307 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1303 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1308 1304
1309 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1305 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1310 { 1306 {
1311 object *newscroll = arch_to_object (scroll->other_arch); 1307 object *newscroll = scroll->other_arch->instance ();
1312 scroll->decrease (); 1308 scroll->decrease ();
1313 newscroll->nrof = 1; 1309 newscroll->nrof = 1;
1314 1310
1315 pl->contr->play_sound (sound_find ("inscribe_success")); 1311 pl->contr->play_sound (sound_find ("inscribe_success"));
1316 1312
1317 if (!confused) 1313 if (!confused)
1318 { 1314 {
1319 newscroll->level = MAX (skill->level, chosen_spell->level); 1315 newscroll->level = max (skill->level, chosen_spell->level);
1320 newscroll->flag [FLAG_IDENTIFIED] = true; 1316 newscroll->flag [FLAG_IDENTIFIED] = true;
1321 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell."); 1317 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1322 } 1318 }
1323 else 1319 else
1324 { 1320 {
1325 chosen_spell = find_random_spell_in_ob (pl, NULL); 1321 chosen_spell = find_random_spell_in_ob (pl, NULL);
1326 if (!chosen_spell) 1322 if (!chosen_spell)
1327 return 0; 1323 return 0;
1328 1324
1329 newscroll->level = MAX (skill->level, chosen_spell->level); 1325 newscroll->level = max (skill->level, chosen_spell->level);
1330 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1326 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1331 } 1327 }
1332 1328
1333 object *tmp = chosen_spell->clone (); 1329 object *tmp = chosen_spell->clone ();
1334 insert_ob_in_ob (tmp, newscroll); 1330 insert_ob_in_ob (tmp, newscroll);
… …
1352 { /* Inscription has failed */ 1348 { /* Inscription has failed */
1353 pl->contr->play_sound (sound_find ("inscribe_fail")); 1349 pl->contr->play_sound (sound_find ("inscribe_fail"));
1354 1350
1355 if (chosen_spell->level > skill->level || confused) 1351 if (chosen_spell->level > skill->level || confused)
1356 { /*backfire! */ 1352 { /*backfire! */
1357 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1353 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind! H<The spell level is too high for your inscription skill.>");
1358 1354
1359 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1355 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1360 pl->drain_specific_stat (4); 1356 pl->drain_specific_stat (4);
1361 else 1357 else
1362 { 1358 {
… …
1400 object *item = find_marked_object (pl); 1396 object *item = find_marked_object (pl);
1401 1397
1402 /* find an item of correct type to write on */ 1398 /* find an item of correct type to write on */
1403 if (!item) 1399 if (!item)
1404 { 1400 {
1405 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to makr an item.>"); 1401 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
1406 return 0; 1402 return 0;
1407 } 1403 }
1408 1404
1409 if (item->type != INSCRIBABLE) 1405 if (item->type != INSCRIBABLE)
1410 { 1406 {
… …
1483 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1479 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1484 { 1480 {
1485 /* can't toss invisible or inv-locked items */ 1481 /* can't toss invisible or inv-locked items */
1486 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1482 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1487 continue; 1483 continue;
1488 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1484 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1489 break; 1485 break;
1490 } 1486 }
1491 } 1487 }
1492 1488
1493 /* this should prevent us from throwing away 1489 /* this should prevent us from throwing away
… …
1724 { 1720 {
1725 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1721 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1726 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1722 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1727 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1723 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1728 /* only throw objects get directional faces */ 1724 /* only throw objects get directional faces */
1729 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1725 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1730 SET_ANIMATION (throw_ob, dir); 1726 throw_ob->set_anim_frame (dir);
1731 } 1727 }
1732 else 1728 else
1733 { 1729 {
1734 uint16 mat = throw_ob->materials; 1730 uint16 mat = throw_ob->materials;
1735 1731

Diff Legend

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