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.73 by root, Sun Nov 8 13:36:14 2009 UTC vs.
Revision 1.79 by root, Fri Mar 26 01:04:45 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
260 260
261 x = op->x + freearr_x[dir]; 261 x = op->x + freearr_x[dir];
262 y = op->y + freearr_y[dir]; 262 y = op->y + freearr_y[dir];
263 263
264 if (dir == 0) 264 if (dir == 0)
265 { 265 return 0; // you can't steal from ourself!
266 /* Can't steal from ourself! */
267 return 0;
268 }
269 266
270 m = op->map; 267 m = op->map;
271 mflags = get_map_flags (m, &m, x, y, &x, &y); 268 mflags = get_map_flags (m, &m, x, y, &x, &y);
272 /* 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,
273 * don't need to look any further. 270 * don't need to look any further.
… …
281 278
282 /* Find the topmost object at this spot */ 279 /* Find the topmost object at this spot */
283 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);
284 281
285 /* For all the stacked objects at this point, attempt a steal */ 282 /* For all the stacked objects at this point, attempt a steal */
286 for (; tmp != NULL; tmp = next) 283 for (; tmp; tmp = next)
287 { 284 {
288 next = tmp->below; 285 next = tmp->below;
289 /* Minor hack--for multi square beings - make sure we get 286 /* Minor hack--for multi square beings - make sure we get
290 * the 'head' coz 'tail' objects have no inventory! - b.t. 287 * the 'head' coz 'tail' objects have no inventory! - b.t.
291 */ 288 */
… …
296 continue; 293 continue;
297 294
298 /* do not reveal hidden DMs */ 295 /* do not reveal hidden DMs */
299 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)
300 continue; 297 continue;
298
301 if (attempt_steal (tmp, op, skill)) 299 if (attempt_steal (tmp, op, skill))
302 { 300 {
303 if (tmp->type == PLAYER) /* no xp for stealing from another player */ 301 if (tmp->type == PLAYER) /* no xp for stealing from another player */
304 return 0; 302 return 0;
305 303
306 /* no xp for stealing from pets (of players) */ 304 /* no xp for stealing from pets (of players) */
307 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 305 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
308 { 306 {
309 object *owner = tmp->owner; 307 object *owner = tmp->owner;
310 308
311 if (owner != NULL && owner->type == PLAYER) 309 if (owner && owner->type == PLAYER)
312 return 0; 310 return 0;
313 } 311 }
314 312
315 // reduce monster experience by experience we gained, as to 313 // reduce monster experience by experience we gained, as to
316 // 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
… …
320 exp = min (tmp->stats.exp, exp); 318 exp = min (tmp->stats.exp, exp);
321 tmp->stats.exp -= exp; 319 tmp->stats.exp -= exp;
322 return exp; 320 return exp;
323 } 321 }
324 } 322 }
323
325 return 0; 324 return 0;
326} 325}
327 326
328static int 327static int
329attempt_pick_lock (object *door, object *pl, object *skill) 328attempt_pick_lock (object *door, object *pl, object *skill)
… …
482static void 481static void
483stop_jump (object *pl, int dist, int spaces) 482stop_jump (object *pl, int dist, int spaces)
484{ 483{
485 pl->update_stats (); 484 pl->update_stats ();
486 pl->map->insert (pl, pl->x, pl->y, pl); 485 pl->map->insert (pl, pl->x, pl->y, pl);
487 pl->speed_left -= fabs (pl->speed * 8); 486 pl->speed_left -= pl->speed * 8.;
488} 487}
489 488
490static int 489static int
491attempt_jump (object *pl, int dir, int spaces, object *skill) 490attempt_jump (object *pl, int dir, int spaces, object *skill)
492{ 491{
… …
1237 1236
1238 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len)); 1237 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1239 1238
1240 if (char_len <= item->weight_limit) 1239 if (char_len <= item->weight_limit)
1241 { 1240 {
1242 object *newbook = arch_to_object (item->other_arch); 1241 object *newbook = item->other_arch->instance ();
1243 item->decrease (); 1242 item->decrease ();
1244 newbook->nrof = 1; 1243 newbook->nrof = 1;
1245 newbook->msg = shstr (msg); 1244 newbook->msg = shstr (msg);
1246 newbook->flag [FLAG_IDENTIFIED] = true; 1245 newbook->flag [FLAG_IDENTIFIED] = true;
1247 1246
… …
1303 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);
1304 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);
1305 1304
1306 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)
1307 { 1306 {
1308 object *newscroll = arch_to_object (scroll->other_arch); 1307 object *newscroll = scroll->other_arch->instance ();
1309 scroll->decrease (); 1308 scroll->decrease ();
1310 newscroll->nrof = 1; 1309 newscroll->nrof = 1;
1311 1310
1312 pl->contr->play_sound (sound_find ("inscribe_success")); 1311 pl->contr->play_sound (sound_find ("inscribe_success"));
1313 1312
… …
1349 { /* Inscription has failed */ 1348 { /* Inscription has failed */
1350 pl->contr->play_sound (sound_find ("inscribe_fail")); 1349 pl->contr->play_sound (sound_find ("inscribe_fail"));
1351 1350
1352 if (chosen_spell->level > skill->level || confused) 1351 if (chosen_spell->level > skill->level || confused)
1353 { /*backfire! */ 1352 { /*backfire! */
1354 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.>");
1355 1354
1356 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1355 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1357 pl->drain_specific_stat (4); 1356 pl->drain_specific_stat (4);
1358 else 1357 else
1359 { 1358 {

Diff Legend

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