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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.7 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.126 by root, Tue Jan 3 11:25:31 2012 UTC

1/* 1/*
2 * static char *rcsid_living_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: living.C,v 1.7 2006/09/09 21:48:28 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
15 (at your option) any later version. 11 * option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
27*/ 23 */
28 24
29#include <global.h> 25#include <global.h>
30#include <funcpoint.h>
31 26
32/* Handy little macro that adds exp and keeps it within bounds. Since 27/* Handy little macro that adds exp and keeps it within bounds. Since
33 * we are now using 64 bit values, I'm not all concerned about overflow issues 28 * we are now using 64 bit values, I'm not all concerned about overflow issues
34 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp 29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
35 */ 30 */
36#define ADD_EXP(exptotal, exp) {exptotal += exp; if (exptotal > MAX_EXPERIENCE) exptotal = MAX_EXPERIENCE; } 31#define ADD_EXP(exptotal, exp) {exptotal += exp; if (exptotal > MAX_EXPERIENCE) exptotal = MAX_EXPERIENCE; }
37 32
38static const int con_bonus[MAX_STAT + 1]={ 33static const int con_bonus[MAX_STAT + 1] = {
39 -6,-5,-4,-3,-2,-1,-1,0,0,0,0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20, 34 -6, -5, -4, -3, -2, -1, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20,
40 22,25,30,40,50 35 22, 25, 30, 40, 50
41}; 36};
42 37
43/* changed the name of this to "sp_bonus" from "int_bonus" 38/* changed the name of this to "sp_bonus" from "int_bonus"
44 * because Pow can now be the stat that controls spellpoint 39 * because Pow can now be the stat that controls spellpoint
45 * advancement. -b.t. 40 * advancement. -b.t.
46 */ 41 */
47static const int sp_bonus[MAX_STAT + 1]={ 42static const int sp_bonus[MAX_STAT + 1] = {
48 -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25, 43 -10, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 25,
49 30,40,50,70,100 44 30, 40, 50, 70, 100
50}; 45};
51 46
52static const int grace_bonus[MAX_STAT +1] = { 47static const int grace_bonus[MAX_STAT + 1] = {
53 -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25, 48 -10, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 25,
54 30,40,50,70,100 49 30, 40, 50, 70, 100
55}; 50};
56 51
57/* 0.92.7 Changed way charisma works. Values now 52/* 0.92.7 Changed way charisma works. Values now
58 * represent how much more it costs to buy something than to sell it 53 * represent how much more it costs to buy something than to sell it
59 * (10, a value of 10 means it is that if it costs 50 gp to buy, you 54 * (10, a value of 10 means it is that if it costs 50 gp to buy, you
… …
69 * This is figured by diff=(y-1)/(1+y), and for buy, it is 1+diff, for sell 64 * This is figured by diff=(y-1)/(1+y), and for buy, it is 1+diff, for sell
70 * it is 1-diff 65 * it is 1-diff
71 */ 66 */
72 67
73const float cha_bonus[MAX_STAT + 1] = { 10.0, 68const float cha_bonus[MAX_STAT + 1] = { 10.0,
74 10.0, 9.0, 8.0, 7.0, 6.0, /* 5 */ 69 10.0, 9.0, 8.0, 7.0, 6.0, /* 5 */
75 5.0, 4.5, 4.0, 3.5, 3.0, /* 10 */ 70 5.0, 4.5, 4.0, 3.5, 3.0, /* 10 */
76 2.9, 2.8, 2.7, 2.6, 2.5, /* 15 */ 71 2.9, 2.8, 2.7, 2.6, 2.5, /* 15 */
77 2.4, 2.3, 2.2, 2.1, 2.0, /* 20 */ 72 2.4, 2.3, 2.2, 2.1, 2.0, /* 20 */
78 1.9, 1.8, 1.7, 1.6, 1.5, /* 25 */ 73 1.9, 1.8, 1.7, 1.6, 1.5, /* 25 */
79 1.4, 1.3, 1.2, 1.1, 1.0 /* 30 */ 74 1.4, 1.3, 1.2, 1.1, 1.0 /* 30 */
80}; 75};
81 76
82const int dex_bonus[MAX_STAT + 1]={ 77const int dex_bonus[MAX_STAT + 1] = {
83 -4,-3,-2,-2,-1,-1,-1,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,4,5,5,6,6,7 78 -4, -3, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7
84}; 79};
85 80
86/* speed_bonus uses dex as its stat */ 81/* speed_bonus uses dex as its stat */
87const float speed_bonus[MAX_STAT + 1]={ 82const float speed_bonus[MAX_STAT + 1] = {
88 -0.4, -0.35, -0.3, -0.25, -0.2, -0.16, -0.12, -0.09, -0.06, -0.03, -0.01, 0, 0.01, 0.03, 83 -0.4, -0.35, -0.3, -0.25, -0.2, -0.16, -0.12, -0.09, -0.06, -0.03, -0.01, 0, 0.01, 0.03,
89 0.05, 0.1, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.4, 84 0.05, 0.1, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.4,
90 1.6, 1.8, 2.0, 2.5, 3.0 85 1.6, 1.8, 2.0, 2.5, 3.0
91}; 86};
92 87
93/* dam_bonus, thaco_bonus, max_carry, weight limit all are based on 88/* dam_bonus, thaco_bonus, max_carry, weight limit all are based on
94 * strength. 89 * strength.
95 */ 90 */
96const int dam_bonus[MAX_STAT + 1]={ 91const int dam_bonus[MAX_STAT + 1] = {
97 -2,-2,-2,-1,-1,-1,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,6,7,8,10,15 92 -2, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 10, 15
98}; 93};
99 94
100const int thaco_bonus[MAX_STAT + 1]={ 95const int thaco_bonus[MAX_STAT + 1] = {
101 -2,-2,-1,-1,0,0,0,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,10 96 -2, -2, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 7, 8, 10
102}; 97};
103 98
104/* Max you can carry before you start getting extra speed penalties */ 99/* Max you can carry before you start getting extra speed penalties */
105const int max_carry[MAX_STAT + 1]={ 100const int max_carry[MAX_STAT + 1] = {
106 2,4,7,11,16,22,29,37,46,56,67,79,92,106,121,137,154,172,191,211,232,254,277, 101 2, 4, 7, 11, 16, 22, 29, 37, 46, 56, 67, 79, 92, 106, 121, 137, 154, 172, 191, 211, 232, 254, 277,
107 301,326,352,400,450,500,600,1000 102 301, 326, 352, 400, 450, 500, 600, 1000
108}; 103};
109 104
110/* weight_limit - the absolute most a character can carry - a character can't 105/* weight_limit - the absolute most a character can carry - a character can't
111 * pick stuff up if it would put him above this limit. 106 * pick stuff up if it would put him above this limit.
112 * value is in grams, so we don't need to do conversion later 107 * value is in grams, so we don't need to do conversion later
113 * These limits are probably overly generous, but being there were no values 108 * These limits are probably overly generous, but being there were no values
114 * before, you need to start someplace. 109 * before, you need to start someplace.
115 */ 110 */
116 111
117const uint32 weight_limit[MAX_STAT+ 1] = { 112const uint32 weight_limit[MAX_STAT + 1] = {
118 200000, /* 0 */ 113 200000, /* 0 */
119 250000,300000,350000,400000,500000, /* 5*/ 114 250000, 300000, 350000, 400000, 500000, /* 5 */
120 600000,700000,800000,900000,1000000, /* 10 */ 115 600000, 700000, 800000, 900000, 1000000, /* 10 */
121 1100000,1200000,1300000,1400000,1500000,/* 15 */ 116 1100000, 1200000, 1300000, 1400000, 1500000, /* 15 */
122 1650000,1800000,1950000,2100000,2250000,/* 20 */ 117 1650000, 1800000, 1950000, 2100000, 2250000, /* 20 */
123 2400000,2550000,2700000,2850000,3000000, /* 25 */ 118 2400000, 2550000, 2700000, 2850000, 3000000, /* 25 */
124 3250000,3500000,3750000,4000000,4500000 /*30 */ 119 3250000, 3500000, 3750000, 4000000, 4500000 /*30 */
125}; 120};
126 121
127const int learn_spell[MAX_STAT + 1]={ 122const int learn_spell[MAX_STAT + 1] = {
128 0,0,0,1,2,4,8,12,16,25,36,45,55,65,70,75,80,85,90,95,100,100,100,100,100, 123 0, 0, 0, 1, 2, 4, 8, 12, 16, 25, 36, 45, 55, 65, 70, 75, 80, 85, 90, 95, 100, 100, 100, 100, 100,
129 100,100,100,100,100,100 124 100, 100, 100, 100, 100, 100
130}; 125};
131 126
132const int cleric_chance[MAX_STAT + 1]={ 127const int cleric_chance[MAX_STAT + 1] = {
133 100,100,100,100,90,80,70,60,50,40,35,30,25,20,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0,0 128 100, 100, 100, 100, 90, 80, 70, 60, 50, 40, 35, 30, 25, 20, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0
134}; 129};
135 130
136const int turn_bonus[MAX_STAT + 1]={ 131const int turn_bonus[MAX_STAT + 1] = {
137 -1,-1,-1,-1,-1,-1,-1,-1,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,9,10,12,15 132 -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 12, 15
138}; 133};
139 134
140const int fear_bonus[MAX_STAT + 1]={ 135const int fear_bonus[MAX_STAT + 1] = {
141 3,3,3,3,2,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 136 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
142}; 137};
143 138
144/* 139/*
145 Since this is nowhere defined ... 140 Since this is nowhere defined ...
146 Both come in handy at least in function add_exp() 141 Both come in handy at least in function add_exp()
147*/ 142*/
148 143
149#define MAX_EXPERIENCE levels[settings.max_level] 144#define MAX_EXPERIENCE levels [settings.max_level]
150 145
151/* because exp_obj sum to make the total score, 146/* because exp_obj sum to make the total score,
152 * we cannot allow that sum to exceed the maximum 147 * we cannot allow that sum to exceed the maximum
153 * amount of experience a player can gain. Thus 148 * amount of experience a player can gain. Thus
154 * we define MAX_EXP_IN_OBJ. It is important to try 149 * we define MAX_EXP_IN_OBJ. It is important to try
… …
161 * line with progression of previous levels, so 156 * line with progression of previous levels, so
162 * if more levels are desired, this should be fixed. 157 * if more levels are desired, this should be fixed.
163 * -b.t. 158 * -b.t.
164 */ 159 */
165 160
166#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1) 161#define MAX_EXP_IN_OBJ MAX_EXP_IN_OBJ / (MAX_EXP_CAT - 1)
167
168#ifndef WIN32
169extern uint64 *levels;
170#else
171extern sint64 *levels;
172#endif
173 162
174#define MAX_SAVE_LEVEL 110 163#define MAX_SAVE_LEVEL 110
164
175/* This no longer needs to be changed anytime the number of 165/* This no longer needs to be changed anytime the number of
176 * levels is increased - rather, did_make_save will do the 166 * levels is increased - rather, did_make_save will do the
177 * right thing and always use range within this table. 167 * right thing and always use range within this table.
178 * for safety, savethrow should not be accessed directly anymore, 168 * for safety, savethrow should not be accessed directly anymore,
179 * and instead did_make_save should be used instead. 169 * and instead did_make_save should be used instead.
180 */ 170 */
181static const int savethrow[MAX_SAVE_LEVEL+1]={ 171static const int savethrow[MAX_SAVE_LEVEL + 1] = {
182 18, 172 18,
183 18,17,16,15,14,14,13,13,12,12,12,11,11,11,11,10,10,10,10, 9, 173 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9,
184 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 174 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
185 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 175 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4,
186 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 176 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2,
187 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 177 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
188 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 178 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
189}; 179};
190 180
191const char *const attacks[NROFATTACKS] = { 181const char *const attacks[NROFATTACKS] = {
192 "physical", "magical", "fire", "electricity", "cold", "confusion", 182 "physical", "magical", "fire", "electricity", "cold", "confusion",
193 "acid", "drain", "weaponmagic", "ghosthit", "poison", "slow", 183 "acid", "drain", "weaponmagic", "ghosthit", "poison", "slow",
194 "paralyze", "turn undead", "fear", "cancellation", "depletion", "death", 184 "paralyze", "turn undead", "fear", "cancellation", "depletion", "death",
195 "chaos","counterspell","god power","holy power","blinding", "", 185 "chaos", "counterspell", "god power", "holy power", "blinding", "",
196 "life stealing" 186 "life stealing"
197}; 187};
198 188
199static const char *const drain_msg[NUM_STATS] = { 189static const char *const drain_msg[NUM_STATS] = {
200 "Oh no! You are weakened!", 190 "Oh no! You are weakened!",
201 "You're feeling clumsy!", 191 "You're feeling clumsy!",
202 "You feel less healthy", 192 "You feel less healthy",
203 "You suddenly begin to lose your memory!", 193 "You suddenly begin to lose your memory!",
194 "Watch out, your mind is going!",
195 "Your spirit feels drained!",
204 "Your face gets distorted!", 196 "Your face gets distorted!",
205 "Watch out, your mind is going!",
206 "Your spirit feels drained!"
207}; 197};
208const char *const restore_msg[NUM_STATS] = { 198const char *const restore_msg[NUM_STATS] = {
209 "You feel your strength return.", 199 "You feel your strength return.",
210 "You feel your agility return.", 200 "You feel your agility return.",
211 "You feel your health return.", 201 "You feel your health return.",
202 "You feel your memory return.",
212 "You feel your wisdom return.", 203 "You feel your wisdom return.",
204 "You feel your spirits return.",
213 "You feel your charisma return.", 205 "You feel your charisma return.",
214 "You feel your memory return.",
215 "You feel your spirits return."
216}; 206};
217const char *const gain_msg[NUM_STATS] = { 207const char *const gain_msg[NUM_STATS] = {
218 "You feel stronger.", 208 "You feel stronger.",
219 "You feel more agile.", 209 "You feel more agile.",
220 "You feel healthy.", 210 "You feel healthy.",
211 "You feel smarter.",
221 "You feel wiser.", 212 "You feel wiser.",
213 "You feel more potent.",
222 "You seem to look better.", 214 "You seem to look better.",
223 "You feel smarter.",
224 "You feel more potent."
225}; 215};
226const char *const lose_msg[NUM_STATS] = { 216const char *const lose_msg[NUM_STATS] = {
227 "You feel weaker!", 217 "You feel weaker!",
228 "You feel clumsy!", 218 "You feel clumsy!",
229 "You feel less healthy!", 219 "You feel less healthy!",
220 "You feel stupid!",
230 "You lose some of your memory!", 221 "You lose some of your memory!",
231 "You look ugly!",
232 "You feel stupid!",
233 "You feel less potent!" 222 "You feel less potent!",
223 "You look ugly!",
234}; 224};
235 225
236const char *const statname[NUM_STATS] = { 226const char *const statname[NUM_STATS] = {
237 "strength", "dexterity", "constitution", "wisdom", "charisma", "intelligence","power" 227 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
238}; 228};
239 229
240const char *const short_stat_name[NUM_STATS] = { 230const char *const short_stat_name[NUM_STATS] = {
241 "Str", "Dex", "Con", "Wis", "Cha", "Int","Pow" 231 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
242}; 232};
243
244/*
245 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
246 * what attr is (STR to POW).
247 */
248
249void
250set_attr_value(living *stats,int attr,sint8 value) {
251 switch(attr) {
252 case STR:
253 stats->Str=value;
254 break;
255 case DEX:
256 stats->Dex=value;
257 break;
258 case CON:
259 stats->Con=value;
260 break;
261 case WIS:
262 stats->Wis=value;
263 break;
264 case POW:
265 stats->Pow=value;
266 break;
267 case CHA:
268 stats->Cha=value;
269 break;
270 case INT:
271 stats->Int=value;
272 break;
273 }
274}
275 233
276/* 234/*
277 * Like set_attr_value(), but instead the value (which can be negative) 235 * Like set_attr_value(), but instead the value (which can be negative)
278 * is added to the specified stat. 236 * is added to the specified stat.
279 */ 237 */
280
281void 238void
282change_attr_value(living *stats,int attr,sint8 value) { 239change_attr_value (living *stats, int attr, sint8 value)
283 if (value==0) return; 240{
284 switch(attr) { 241 stats->stat (attr) += value;
285 case STR:
286 stats->Str+=value;
287 break;
288 case DEX:
289 stats->Dex+=value;
290 break;
291 case CON:
292 stats->Con+=value;
293 break;
294 case WIS:
295 stats->Wis+=value;
296 break;
297 case POW:
298 stats->Pow+=value;
299 break;
300 case CHA:
301 stats->Cha+=value;
302 break;
303 case INT:
304 stats->Int+=value;
305 break;
306 default:
307 LOG(llevError,"Invalid attribute in change_attr_value: %d\n", attr);
308 }
309}
310
311/*
312 * returns the specified stat. See also set_attr_value().
313 */
314
315sint8
316get_attr_value(const living *stats,int attr) {
317 switch(attr) {
318 case STR:
319 return(stats->Str);
320 case DEX:
321 return(stats->Dex);
322 case CON:
323 return(stats->Con);
324 case WIS:
325 return(stats->Wis);
326 case CHA:
327 return(stats->Cha);
328 case INT:
329 return(stats->Int);
330 case POW:
331 return(stats->Pow);
332 }
333 return 0;
334} 242}
335 243
336/* 244/*
337 * Ensures that all stats (str/dex/con/wis/cha/int) are within the 245 * Ensures that all stats (str/dex/con/wis/cha/int) are within the
338 * 1-30 stat limit. 246 * 1-30 stat limit.
339 */ 247 */
340 248void
341void check_stat_bounds(living *stats) { 249check_stat_bounds (living *stats)
342 int i,v; 250{
343 for(i=0;i<NUM_STATS;i++) 251 for (int i = 0; i < NUM_STATS; i++)
344 if((v=get_attr_value(stats,i))>MAX_STAT) 252 {
345 set_attr_value(stats,i,MAX_STAT); 253 sint8 &v = stats->stat (i);
346 else if(v<MIN_STAT) 254 v = clamp (v, MIN_STAT, MAX_STAT);
347 set_attr_value(stats,i,MIN_STAT); 255 }
348} 256}
349 257
350#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) 258#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
351 259
352/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 260/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
353 * make this macro to clean those up. Not usuable outside change_abil 261 * make this macro to clean those up. Not usuable outside change_abil
354 * function since some of the values passed to new_draw_info are hardcoded. 262 * function since some of the values passed to new_draw_info are hardcoded.
355 */ 263 */
356#define DIFF_MSG(flag, msg1, msg2) \ 264#define DIFF_MSG(flag, msg1, msg2) \
357 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 265 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
358 266
359/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 267/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
268
360/* flag is set to 1 if we are applying the object, -1 if we are removing 269/* flag is set to 1 if we are applying the object, -1 if we are removing
361 * the object. 270 * the object.
362 * It is the calling functions responsibilty to check to see if the object 271 * It is the calling functions responsibilty to check to see if the object
363 * can be applied or not. 272 * can be applied or not.
364 * The main purpose of calling this function is the messages that are 273 * The main purpose of calling this function is the messages that are
365 * displayed - fix_player should really always be called after this when 274 * displayed - update_stats should really always be called after this when
366 * removing an object - that is because it is impossible to know if some object 275 * removing an object - that is because it is impossible to know if some object
367 * is the only source of an attacktype or spell attunement, so this function 276 * is the only source of an attacktype or spell attunement, so this function
368 * will clear the bits, but the player may still have some other object 277 * will clear the bits, but the player may still have some other object
369 * that gives them that ability. 278 * that gives them that ability.
370 */ 279 */
280int
371int change_abil(object *op, object *tmp) { 281change_abil (object *op, object *tmp)
372 int flag=QUERY_FLAG(tmp,FLAG_APPLIED)?1:-1,i,j,success=0; 282{
283 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
284 int success = 0;
373 char message[MAX_BUF]; 285 char message[MAX_BUF];
374 int potion_max=0; 286 int potion_max = 0;
375
376 /* remember what object was like before it was changed. note that
377 * refop is a local copy of op only to be used for detecting changes
378 * found by fix_player. refop is not a real object
379 */
380 object_pod refop;
381 memcpy (&refop, static_cast<object_pod *>(op), sizeof (object_pod));
382 287
288 // keep some stats for comparison purposes
289 object::flags_t prev_flag = op->flag;
290 MoveType prev_move_type = op->move_type;
291 sint16 prev_resist [NROFATTACKS]; // clumsy
292 assert (sizeof (prev_resist) == sizeof (op->resist));
293 memcpy (prev_resist, op->resist, sizeof (prev_resist));
294
383 if(op->type==PLAYER) { 295 if (op->type == PLAYER)
296 {
384 if (tmp->type==POTION) { 297 if (tmp->type == POTION)
298 {
385 potion_max=1; 299 potion_max = 1;
300
386 for(j=0;j<NUM_STATS;j++) { 301 for (int j = 0; j < NUM_STATS; j++)
387 int nstat, ostat; 302 {
388
389 ostat = get_attr_value(&(op->contr->orig_stats),j); 303 int ostat = op->contr->orig_stats.stat (j);
390 i = get_attr_value(&(tmp->stats),j); 304 int i = tmp->stats.stat (j);
391 305
392 /* nstat is what the stat will be after use of the potion */ 306 /* nstat is what the stat will be after use of the potion */
393 nstat = flag*i + ostat; 307 int nstat = flag * i + ostat;
394 308
395 /* Do some bounds checking. While I don't think any 309 /* Do some bounds checking. There is the potential for potions
396 * potions do so right now, there is the potential for potions
397 * that adjust that stat by more than one point, so we need 310 * that adjust that stat by more than one point, so we need
398 * to allow for that. 311 * to allow for that.
399 */ 312 */
400 if (nstat < 1 && i*flag < 0 ) nstat = 1; 313 if (nstat < 1 && i * flag < 0)
314 nstat = 1;
401 else if (nstat > 20 + get_attr_value(&(op->arch->clone.stats),j)) { 315 else if (nstat > 20 + op->arch->stats.stat (j))
402 nstat = 20 + get_attr_value(&(op->arch->clone.stats),j); 316 nstat = 20 + op->arch->stats.stat (j);
317
318 if (nstat != ostat)
319 {
320 op->contr->orig_stats.stat (j) = nstat;
321 potion_max = 0;
403 } 322 }
404 if (nstat != ostat) { 323 else if (i)
405 set_attr_value(&(op->contr->orig_stats), j, nstat);
406 potion_max=0;
407 } 324 {
408 else if (i) {
409 /* potion is useless - player has already hit the natural maximum */ 325 /* potion is useless - player has already hit the natural maximum */
410 potion_max = 1; 326 potion_max = 1;
411 } 327 }
412 } 328 }
329
413 /* This section of code ups the characters normal stats also. I am not 330 /* This section of code ups the characters normal stats also. I am not
414 * sure if this is strictly necessary, being that fix_player probably 331 * sure if this is strictly necessary, being that fix_player probably
415 * recalculates this anyway. 332 * recalculates this anyway.
416 */ 333 */
417 for(j=0;j<NUM_STATS;j++) 334 for (int j = 0; j < NUM_STATS; j++)
418 change_attr_value(&(op->stats),j,flag*get_attr_value(&(tmp->stats),j)); 335 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
336
419 check_stat_bounds(&(op->stats)); 337 check_stat_bounds (&op->stats);
420 } /* end of potion handling code */ 338 } /* end of potion handling code */
421 } 339 }
422 340
423 /* reset attributes that fix_player doesn't reset since it doesn't search 341 /* reset attributes that update_stats doesn't reset since it doesn't search
424 * everything to set 342 * everything to set
425 */ 343 */
426 if(flag == -1) { 344 if (flag == -1)
345 {
427 op->attacktype&=~tmp->attacktype; 346 op->attacktype &= ~tmp->attacktype;
428 op->path_attuned&=~tmp->path_attuned; 347 op->path_attuned &= ~tmp->path_attuned;
429 op->path_repelled&=~tmp->path_repelled; 348 op->path_repelled &= ~tmp->path_repelled;
430 op->path_denied&=~tmp->path_denied; 349 op->path_denied &= ~tmp->path_denied;
431 /* Presuming here that creatures only have move_type, 350 /* Presuming here that creatures only have move_type,
432 * and not the other move_ fields. 351 * and not the other move_ fields.
433 */ 352 */
434 op->move_type &= ~tmp->move_type; 353 op->move_type &= ~tmp->move_type;
435 } 354 }
436 355
437 /* call fix_player since op object could have whatever attribute due 356 /* call fix_player since op object could have whatever attribute due
438 * to multiple items. if fix_player always has to be called after 357 * to multiple items. if update_stats always has to be called after
439 * change_ability then might as well call it from here 358 * change_ability then might as well call it from here
440 */ 359 */
441 fix_player(op); 360 op->update_stats ();
442 361
443 /* Fix player won't add the bows ability to the player, so don't 362 /* update_stats won't add the bows ability to the player, so don't
444 * print out message if this is a bow. 363 * print out message if this is a bow.
445 */ 364 */
446 if(tmp->attacktype & AT_CONFUSION && tmp->type != BOW) { 365 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
366 {
447 success=1; 367 success = 1;
448 DIFF_MSG(flag, "Your hands begin to glow red.", 368 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
449 "Your hands stop glowing red."); 369 }
370
371 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
450 } 372 {
451 if ( QUERY_FLAG(op,FLAG_LIFESAVE) != QUERY_FLAG(&refop,FLAG_LIFESAVE)){
452 success=1; 373 success = 1;
453 DIFF_MSG(flag, "You feel very protected.", 374 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
454 "You don't feel protected anymore."); 375 }
376
377 if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
455 } 378 {
456 if ( QUERY_FLAG(op,FLAG_REFL_MISSILE) != QUERY_FLAG(&refop,FLAG_REFL_MISSILE)){
457 success=1; 379 success = 1;
458 DIFF_MSG(flag, "A magic force shimmers around you.", 380 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
459 "The magic force fades away."); 381 }
382
383 if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
460 } 384 {
461 if ( QUERY_FLAG(op,FLAG_REFL_SPELL) != QUERY_FLAG(&refop,FLAG_REFL_SPELL)){
462 success=1; 385 success = 1;
463 DIFF_MSG(flag, "You feel more safe now, somehow.", 386 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
464 "Suddenly you feel less safe, somehow.");
465 } 387 }
388
466 /* movement type has changed. We don't care about cases where 389 /* movement type has changed. We don't care about cases where
467 * user has multiple items giving the same type appled like we 390 * user has multiple items giving the same type appled like we
468 * used to - that is more work than what we gain, plus messages 391 * used to - that is more work than what we gain, plus messages
469 * can be misleading (a little higher could be miscontrued from 392 * can be misleading (a little higher could be miscontrued from
470 * from fly high) 393 * from fly high)
471 */ 394 */
472 if (tmp->move_type && op->move_type != refop.move_type) { 395 if (tmp->move_type && op->move_type != prev_move_type)
396 {
473 success=1; 397 success = 1;
474 398
475 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 399 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
476 * status doesn't make a difference if you are flying high 400 * status doesn't make a difference if you are flying high
477 */ 401 */
478 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) { 402 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
403 {
479 DIFF_MSG(flag, "You start to float in the air!.", "You float down to the ground."); 404 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
480 } 405 }
481 406
482 if (tmp->move_type & MOVE_FLY_HIGH) { 407 if (tmp->move_type & MOVE_FLY_HIGH)
408 {
483 /* double conditional - second case covers if you have move_fly_low - 409 /* double conditional - second case covers if you have move_fly_low -
484 * in that case, you don't actually land 410 * in that case, you don't actually land
485 */ 411 */
486 DIFF_MSG(flag, "You soar into the air air!.", 412 DIFF_MSG (flag, "You soar into the air!",
487 (op->move_type&MOVE_FLY_LOW ? "You fly lower in the air": 413 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
488 "You float down to the ground."));
489 } 414 }
415
490 if (tmp->move_type & MOVE_SWIM) 416 if (tmp->move_type & MOVE_SWIM)
491 DIFF_MSG(flag,"You feel ready for a swim", "You no longer feel like swimming"); 417 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
492
493 /* Changing move status may mean you are affected by things you weren't before */
494 check_move_on(op, op);
495 } 418 }
496 419
497 /* becoming UNDEAD... a special treatment for this flag. Only those not 420 /* becoming UNDEAD... a special treatment for this flag. Only those not
498 * originally undead may change their status 421 * originally undead may change their status
499 */ 422 */
500 if(!QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD)) 423 if (!op->arch->flag [FLAG_UNDEAD])
501 if ( QUERY_FLAG(op,FLAG_UNDEAD) != QUERY_FLAG(&refop,FLAG_UNDEAD)) { 424 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
425 {
502 success=1; 426 success = 1;
503 if(flag>0) { 427 if (flag > 0)
428 {
504 op->race = "undead"; 429 op->race = "undead";
505 new_draw_info(NDI_UNIQUE, 0, op,"Your lifeforce drains away!"); 430 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
431 }
506 } else { 432 else
433 {
507 op->race = op->arch->clone.race; 434 op->race = op->arch->race;
508 new_draw_info(NDI_UNIQUE, 0, op,"Your lifeforce returns!"); 435 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
436 }
437 }
438
439 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
440 {
441 success = 1;
442 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
443 }
444
445 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
446 {
447 success = 1;
448 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
449 }
450
451 /* blinded you can tell if more blinded since blinded player has minimal
452 * vision
453 */
454 if (tmp->flag [FLAG_BLIND])
455 {
456 success = 1;
457 if (flag > 0)
458 {
459 if (op->flag [FLAG_WIZ])
460 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
461 else
462 {
463 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
464 op->set_flag (FLAG_BLIND);
465 if (op->type == PLAYER)
466 op->contr->do_los = 1;
509 } 467 }
510 } 468 }
511 469 else
512 if ( QUERY_FLAG(op,FLAG_STEALTH) != QUERY_FLAG(&refop,FLAG_STEALTH)){ 470 {
513 success=1; 471 if (op->flag [FLAG_WIZ])
514 DIFF_MSG(flag, "You walk more quietly.", "You walk more noisily.");
515 }
516 if ( QUERY_FLAG(op,FLAG_MAKE_INVIS) != QUERY_FLAG(&refop,FLAG_MAKE_INVIS)){
517 success=1;
518 DIFF_MSG(flag, "You become transparent.", "You can see yourself.");
519 }
520 /* blinded you can tell if more blinded since blinded player has minimal
521 * vision
522 */
523 if(QUERY_FLAG(tmp,FLAG_BLIND)) {
524 success=1;
525 if(flag>0) {
526 if(QUERY_FLAG(op,FLAG_WIZ))
527 new_draw_info(NDI_UNIQUE, 0, op,"Your mortal self is blinded."); 472 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
528 else { 473 else
474 {
529 new_draw_info(NDI_UNIQUE, 0, op,"You are blinded."); 475 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
530 SET_FLAG(op,FLAG_BLIND); 476 op->clr_flag (FLAG_BLIND);
531 if(op->type==PLAYER) 477 if (op->type == PLAYER)
532 op->contr->do_los=1; 478 op->contr->do_los = 1;
533 } 479 }
534 } else { 480 }
535 if(QUERY_FLAG(op,FLAG_WIZ)) 481 }
536 new_draw_info(NDI_UNIQUE, 0, op,"Your mortal self can now see again."); 482
483 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
484 {
485 success = 1;
486 if (op->type == PLAYER)
487 op->contr->do_los = 1;
488 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
489 }
490
491 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
492 {
493 success = 1;
494 if (flag > 0)
495 {
496 if (op->flag [FLAG_WIZ])
497 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
537 else { 498 else
538 new_draw_info(NDI_UNIQUE, 0, op,"Your vision returns."); 499 {
539 CLEAR_FLAG(op,FLAG_BLIND); 500 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
540 if(op->type==PLAYER) 501 if (op->type == PLAYER)
541 op->contr->do_los=1; 502 op->contr->do_los = 1;
542 } 503 }
543 } 504 }
544 } 505 else
545 506 {
546 if ( QUERY_FLAG(op,FLAG_SEE_IN_DARK) != QUERY_FLAG(&refop,FLAG_SEE_IN_DARK)){ 507 if (op->flag [FLAG_WIZ])
547 success=1;
548 if(op->type==PLAYER)
549 op->contr->do_los=1;
550 DIFF_MSG(flag, "Your vision is better in the dark.", "You see less well in the dark.");
551 }
552
553 if ( QUERY_FLAG(op,FLAG_XRAYS) != QUERY_FLAG(&refop,FLAG_XRAYS)){
554 success=1;
555 if(flag>0) {
556 if(QUERY_FLAG(op,FLAG_WIZ))
557 new_draw_info(NDI_UNIQUE, 0, op,"Your vision becomes a little clearer."); 508 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
558 else { 509 else
510 {
559 new_draw_info(NDI_UNIQUE, 0, op,"Everything becomes transparent."); 511 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
560 if(op->type==PLAYER) 512 if (op->type == PLAYER)
561 op->contr->do_los=1; 513 op->contr->do_los = 1;
562 } 514 }
563 } else {
564 if(QUERY_FLAG(op,FLAG_WIZ))
565 new_draw_info(NDI_UNIQUE, 0, op,"Your vision becomes a bit out of focus.");
566 else {
567 new_draw_info(NDI_UNIQUE, 0, op,"Everything suddenly looks very solid.");
568 if(op->type==PLAYER)
569 op->contr->do_los=1;
570 } 515 }
571 }
572 } 516 }
573 517
574 if(tmp->stats.luck) { 518 if (tmp->stats.luck)
519 {
575 success=1; 520 success = 1;
576 DIFF_MSG(flag*tmp->stats.luck, "You feel more lucky.", "You feel less lucky."); 521 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");
522 }
523
524 if (digest_types [tmp->type])
577 } 525 {
578
579 if(tmp->stats.hp && op->type==PLAYER) { 526 if (tmp->stats.hp && op->type == PLAYER)
527 {
580 success=1; 528 success = 1;
581 DIFF_MSG(flag*tmp->stats.hp, "You feel much more healthy!", 529 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");
582 "You feel much less healthy!"); 530 }
583 }
584 531
585 if(tmp->stats.sp && op->type==PLAYER && tmp->type!=SKILL) { 532 if (tmp->stats.sp && op->type == PLAYER
533 && tmp->type != SKILL && tmp->type != BOW)
534 {
586 success=1; 535 success = 1;
587 DIFF_MSG(flag*tmp->stats.sp, "You feel one with the powers of magic!", 536 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");
588 "You suddenly feel very mundane."); 537 }
589 }
590 538
591 /* for the future when artifacts set this -b.t. */ 539 /* for the future when artifacts set this -b.t. */
592 if(tmp->stats.grace && op->type==PLAYER) { 540 if (tmp->stats.grace && op->type == PLAYER)
541 {
593 success=1; 542 success = 1;
594 DIFF_MSG(flag*tmp->stats.grace, "You feel closer to your god!", 543 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");
595 "You suddenly feel less holy."); 544 }
596 }
597 545
598 if(tmp->stats.food && op->type==PLAYER) { 546 if (tmp->stats.food && op->type == PLAYER)
547 {
599 success=1; 548 success = 1;
600 DIFF_MSG(flag*tmp->stats.food, "You feel your digestion slowing down.", 549 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
601 "You feel your digestion speeding up."); 550 }
602 } 551 }
603 552
604 /* Messages for changed resistance */ 553 /* Messages for changed resistance */
605 for (i=0; i<NROFATTACKS; i++) { 554 for (int i = 0; i < NROFATTACKS; i++)
606 if (i==ATNR_PHYSICAL) continue; /* Don't display about armour */
607 555 {
556 if (i == ATNR_PHYSICAL)
557 continue; /* Don't display about armour */
558
608 if (op->resist[i] != refop.resist[i]) { 559 if (op->resist [i] != prev_resist [i])
560 {
609 success=1; 561 success = 1;
562
610 if (op->resist[i] > refop.resist[i]) 563 if (op->resist [i] > prev_resist [i])
611 sprintf(message, "Your resistance to %s rises to %d%%.", 564 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
612 change_resist_msg[i], op->resist[i]);
613 else 565 else
614 sprintf(message, "Your resistance to %s drops to %d%%.", 566 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
615 change_resist_msg[i], op->resist[i]); 567
616
617 new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, op, message); 568 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
569 }
570 }
571
572 if (!potion_max)
573 for (int j = 0; j < NUM_STATS; j++)
574 if (int i = tmp->stats.stat (j))
618 } 575 {
619 }
620
621 if(tmp->type!=EXPERIENCE && !potion_max) {
622 for (j=0; j<NUM_STATS; j++) {
623 if ((i=get_attr_value(&(tmp->stats),j))!=0) {
624 success=1; 576 success = 1;
625 DIFF_MSG(i * flag, gain_msg[j], lose_msg[j]); 577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
626 } 578 }
627 } 579
628 }
629 return success; 580 return success;
630} 581}
631 582
632/* 583/*
633 * Stat draining by Vick 930307 584 * Stat draining by Vick 930307
634 * (Feeling evil, I made it work as well now. -Frank 8) 585 * (Feeling evil, I made it work as well now. -Frank 8)
635 */ 586 */
636 587void
637void drain_stat(object *op) { 588object::drain_stat ()
589{
638 drain_specific_stat(op, RANDOM()%NUM_STATS); 590 drain_specific_stat (rndm (NUM_STATS));
639} 591}
640 592
593void
641void drain_specific_stat(object *op, int deplete_stats) { 594object::drain_specific_stat (int deplete_stats)
595{
642 object *tmp; 596 object *tmp;
643 archetype *at; 597 archetype *at;
644 598
645 at = find_archetype(ARCH_DEPLETION); 599 at = archetype::find (shstr_depletion);
646 if (!at) { 600 if (!at)
601 {
647 LOG(llevError, "Couldn't find archetype depletion.\n"); 602 LOG (llevError, "Couldn't find archetype depletion.\n");
648 return; 603 return;
604 }
649 } else { 605 else
606 {
650 tmp = present_arch_in_ob(at, op); 607 tmp = present_arch_in_ob (at, this);
608
651 if (!tmp) { 609 if (!tmp)
652 tmp = arch_to_object(at); 610 {
611 tmp = at->instance ();
653 tmp = insert_ob_in_ob(tmp, op); 612 tmp = insert_ob_in_ob (tmp, this);
654 SET_FLAG(tmp,FLAG_APPLIED); 613 tmp->set_flag (FLAG_APPLIED);
655 } 614 }
656 } 615 }
657 616
658 new_draw_info(NDI_UNIQUE, 0, op, drain_msg[deplete_stats]); 617 new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
659 change_attr_value(&tmp->stats, deplete_stats, -1); 618 change_attr_value (&tmp->stats, deplete_stats, -1);
660 fix_player(op); 619 update_stats ();
661} 620}
662 621
663/* 622/*
664 * A value of 0 indicates timeout, otherwise change the luck of the object. 623 * A value of 0 indicates timeout, otherwise change the luck of the object.
665 * via an applied bad_luck object. 624 * via an applied bad_luck object.
666 */ 625 */
667 626void
668void change_luck(object *op, int value) { 627object::change_luck (int value)
669 object *tmp; 628{
670 archetype *at; 629 archetype *at = archetype::find (shstr_luck);
671 int new_luck;
672
673 at = find_archetype("luck");
674 if (!at) 630 if (!at)
675 LOG(llevError, "Couldn't find archetype luck.\n"); 631 LOG (llevError, "Couldn't find archetype luck.\n");
676 else { 632 else
633 {
677 tmp = present_arch_in_ob(at, op); 634 object *tmp = present_arch_in_ob (at, this);
635
678 if (!tmp) { 636 if (!tmp)
637 {
638 if (!value)
639 return;
640
641 tmp = at->instance ();
642 tmp = insert_ob_in_ob (tmp, this);
643 tmp->set_flag (FLAG_APPLIED);
644 }
645
679 if (!value) 646 if (value)
680 return; 647 {
681 tmp = arch_to_object(at);
682 tmp = insert_ob_in_ob(tmp, op);
683 SET_FLAG(tmp,FLAG_APPLIED);
684 }
685 if (value) {
686 /* Limit the luck value of the bad luck object to +/-100. This 648 /* Limit the luck value of the bad luck object to +/-100. This
687 * (arbitrary) value prevents overflows (both in the bad luck object and 649 * (arbitrary) value prevents overflows (both in the bad luck object and
688 * in op itself). 650 * in op itself).
689 */ 651 */
690 new_luck = tmp->stats.luck+value; 652 int new_luck = tmp->stats.luck + value;
653
691 if (new_luck >= -100 && new_luck <= 100) { 654 if (new_luck >= -100 && new_luck <= 100)
655 {
692 op->stats.luck+=value; 656 stats.luck += value;
693 tmp->stats.luck = new_luck; 657 tmp->stats.luck = new_luck;
658 }
694 } 659 }
695 } else { 660 else
661 {
696 if (!tmp->stats.luck) { 662 if (!tmp->stats.luck)
697 return; 663 return;
698 } 664
699 /* Randomly change the players luck. Basically, we move it 665 /* Randomly change the players luck. Basically, we move it
700 * back neutral (if greater>0, subtract, otherwise add) 666 * back neutral (if greater>0, subtract, otherwise add)
701 */ 667 */
702 if (RANDOM()%(FABS(tmp->stats.luck)) >= RANDOM()%30) { 668 if (rndm (abs (tmp->stats.luck)) >= rndm (30))
669 {
703 int diff = tmp->stats.luck>0?-1:1; 670 int diff = tmp->stats.luck > 0 ? -1 : 1;
671
704 op->stats.luck += diff; 672 stats.luck += diff;
705 tmp->stats.luck += diff; 673 tmp->stats.luck += diff;
674 }
706 } 675 }
707 }
708 } 676 }
709} 677}
710 678
711/* 679/*
712 * Subtracts stat-bonuses given by the class which the player has chosen. 680 * Subtracts stat-bonuses given by the class which the player has chosen.
713 */ 681 */
714 682void
715void remove_statbonus(object *op) { 683object::remove_statbonus ()
716 op->stats.Str -= op->arch->clone.stats.Str; 684{
717 op->stats.Dex -= op->arch->clone.stats.Dex; 685 for (int i = 0; i < NUM_STATS; ++i)
718 op->stats.Con -= op->arch->clone.stats.Con; 686 {
719 op->stats.Wis -= op->arch->clone.stats.Wis; 687 sint8 v = arch->stats.stat (i);
720 op->stats.Pow -= op->arch->clone.stats.Pow; 688 stats.stat (i) -= v;
721 op->stats.Cha -= op->arch->clone.stats.Cha; 689 contr->orig_stats.stat (i) -= v;
722 op->stats.Int -= op->arch->clone.stats.Int; 690 }
723 op->contr->orig_stats.Str -= op->arch->clone.stats.Str;
724 op->contr->orig_stats.Dex -= op->arch->clone.stats.Dex;
725 op->contr->orig_stats.Con -= op->arch->clone.stats.Con;
726 op->contr->orig_stats.Wis -= op->arch->clone.stats.Wis;
727 op->contr->orig_stats.Pow -= op->arch->clone.stats.Pow;
728 op->contr->orig_stats.Cha -= op->arch->clone.stats.Cha;
729 op->contr->orig_stats.Int -= op->arch->clone.stats.Int;
730} 691}
731 692
732/* 693/*
733 * Adds stat-bonuses given by the class which the player has chosen. 694 * Adds stat-bonuses given by the class which the player has chosen.
734 */ 695 */
735 696void
736void add_statbonus(object *op) { 697object::add_statbonus ()
737 op->stats.Str += op->arch->clone.stats.Str; 698{
738 op->stats.Dex += op->arch->clone.stats.Dex; 699 for (int i = 0; i < NUM_STATS; ++i)
739 op->stats.Con += op->arch->clone.stats.Con; 700 {
740 op->stats.Wis += op->arch->clone.stats.Wis; 701 sint8 v = arch->stats.stat (i);
741 op->stats.Pow += op->arch->clone.stats.Pow; 702 stats.stat (i) += v;
742 op->stats.Cha += op->arch->clone.stats.Cha; 703 contr->orig_stats.stat (i) += v;
743 op->stats.Int += op->arch->clone.stats.Int; 704 }
744 op->contr->orig_stats.Str += op->arch->clone.stats.Str;
745 op->contr->orig_stats.Dex += op->arch->clone.stats.Dex;
746 op->contr->orig_stats.Con += op->arch->clone.stats.Con;
747 op->contr->orig_stats.Wis += op->arch->clone.stats.Wis;
748 op->contr->orig_stats.Pow += op->arch->clone.stats.Pow;
749 op->contr->orig_stats.Cha += op->arch->clone.stats.Cha;
750 op->contr->orig_stats.Int += op->arch->clone.stats.Int;
751} 705}
706
707static struct copy_flags : object::flags_t
708{
709 copy_flags ()
710 {
711 set (FLAG_LIFESAVE);
712 set (FLAG_REFL_SPELL);
713 set (FLAG_REFL_MISSILE);
714 set (FLAG_STEALTH);
715 set (FLAG_XRAYS);
716 set (FLAG_BLIND);
717 set (FLAG_SEE_IN_DARK);
718 }
719} copy_flags;
752 720
753/* 721/*
754 * Updates all abilities given by applied objects in the inventory 722 * Updates all abilities given by applied objects in the inventory
755 * of the given object. Note: This function works for both monsters 723 * of the given object. Note: This function works for both monsters
756 * and players; the "player" in the name is purely an archaic inheritance. 724 * and players; the "player" in the name is purely an archaic inheritance.
757 * This functions starts from base values (archetype or player object) 725 * This functions starts from base values (archetype or player object)
758 * and then adjusts them according to what the player has equipped. 726 * and then adjusts them according to what the player has equipped.
759 */ 727 *
760/* July 95 - inserted stuff to handle new skills/exp system - b.t. 728 * July 95 - inserted stuff to handle new skills/exp system - b.t.
761 spell system split, grace points now added to system --peterm 729 * spell system split, grace points now added to system --peterm
762 */ 730 */
763 731void
764void fix_player(object *op) { 732object::update_stats ()
765 int i,j; 733{
766 float f,max=9,added_speed=0,bonus_speed=0, sp_tmp,speed_reduce_from_disease=1; 734 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
767 int weapon_weight=0,weapon_speed=0; 735 int weapon_weight = 0, weapon_speed = 0;
768 int best_wc=0, best_ac=0, wc=0, ac=0; 736 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
769 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 737 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
770 object *grace_obj=NULL,*mana_obj=NULL,*wc_obj=NULL,*tmp; 738 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
739 float old_speed = speed;
740 int stat_sum [NUM_STATS];
771 741
742 MoveType move_type; // we use change_move_type to change it, so use a local copy
743
772 /* First task is to clear all the values back to their original values */ 744 /* First task is to clear all the values back to their original values */
773 if(op->type==PLAYER) { 745 if (type == PLAYER)
746 {
747 contr->delayed_update = false;
748
774 for(i=0;i<NUM_STATS;i++) { 749 for (int i = 0; i < NUM_STATS; i++)
775 set_attr_value(&(op->stats),i,get_attr_value(&(op->contr->orig_stats),i)); 750 stat_sum [i] = contr->orig_stats.stat (i);
776 } 751
777 if (settings.spell_encumbrance == TRUE) 752 if (settings.spell_encumbrance == TRUE)
778 op->contr->encumbrance=0; 753 contr->encumbrance = 0;
779 754
780 op->attacktype=0; 755 attacktype = 0;
756
781 op->contr->digestion = 0; 757 contr->digestion = 0;
782 op->contr->gen_hp = 0; 758 contr->gen_hp = 0;
783 op->contr->gen_sp = 0; 759 contr->gen_sp = 0;
784 op->contr->gen_grace = 0; 760 contr->gen_grace = 0;
785 op->contr->gen_sp_armour = 10; 761 contr->gen_sp_armour = 10;
786 op->contr->item_power = 0; 762 contr->item_power = 0;
787
788 /* Don't clobber all the range_ values. range_golem otherwise
789 * gets reset for no good reason, and we don't want to reset
790 * range_magic (what spell is readied). These three below
791 * well get filled in based on what the player has equipped.
792 */
793 op->contr->ranges[range_bow] = NULL;
794 op->contr->ranges[range_misc] = NULL;
795 op->contr->ranges[range_skill] = NULL;
796 } 763 }
797 memcpy(op->body_used, op->body_info, sizeof(op->body_info));
798 764
765 for (int i = NUM_BODY_LOCATIONS; i--; )
766 slot[i].used = slot[i].info;
767
799 op->slaying = 0; 768 slaying = 0;
800 769
801 if(!QUERY_FLAG(op,FLAG_WIZ)) { 770 if (!this->flag [FLAG_WIZ])
802 CLEAR_FLAG(op, FLAG_XRAYS);
803 CLEAR_FLAG(op, FLAG_MAKE_INVIS);
804 } 771 {
772 this->clr_flag (FLAG_XRAYS);
773 this->clr_flag (FLAG_MAKE_INVIS);
774 }
805 775
806 CLEAR_FLAG(op,FLAG_LIFESAVE); 776 this->clr_flag (FLAG_LIFESAVE);
807 CLEAR_FLAG(op,FLAG_STEALTH); 777 this->clr_flag (FLAG_STEALTH);
808 CLEAR_FLAG(op,FLAG_BLIND); 778 this->clr_flag (FLAG_BLIND);
809 if ( ! QUERY_FLAG (&op->arch->clone, FLAG_REFL_SPELL))
810 CLEAR_FLAG(op,FLAG_REFL_SPELL);
811 if ( ! QUERY_FLAG (&op->arch->clone, FLAG_REFL_MISSILE))
812 CLEAR_FLAG(op,FLAG_REFL_MISSILE);
813 if(!QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD))
814 CLEAR_FLAG(op,FLAG_UNDEAD);
815 if ( ! QUERY_FLAG (&op->arch->clone, FLAG_SEE_IN_DARK))
816 CLEAR_FLAG(op,FLAG_SEE_IN_DARK);
817 779
818 op->path_attuned=op->arch->clone.path_attuned; 780 if (!arch->flag [FLAG_REFL_SPELL ]) this->clr_flag (FLAG_REFL_SPELL);
819 op->path_repelled=op->arch->clone.path_repelled; 781 if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
820 op->path_denied=op->arch->clone.path_denied; 782 if (!arch->flag [FLAG_UNDEAD ]) this->clr_flag (FLAG_UNDEAD);
821 op->glow_radius=op->arch->clone.glow_radius; 783 if (!arch->flag [FLAG_SEE_IN_DARK ]) this->clr_flag (FLAG_SEE_IN_DARK);
822 op->move_type = op->arch->clone.move_type;
823 op->chosen_skill = NULL;
824 784
785 path_attuned = arch->path_attuned;
786 path_repelled = arch->path_repelled;
787 path_denied = arch->path_denied;
788 glow_radius = arch->glow_radius;
789 move_type = arch->move_type;
790
825 /* initializing resistances from the values in player/monster's 791 /* initializing resistances from the values in player/monster's
826 * archetype clone 792 * archetype clone
793 */
794 memcpy (&resist, &arch->resist, sizeof (resist));
795
796 for (int i = 0; i < NROFATTACKS; i++)
797 {
798 if (resist[i] > 0)
799 prot[i] = resist[i], vuln[i] = 0;
800 else
801 vuln[i] = -resist[i], prot[i] = 0;
802
803 potion_resist[i] = -1000;
804 }
805
806 wc = arch->stats.wc;
807 stats.dam = arch->stats.dam;
808
809 /* for players which cannot use armour, they gain AC -1 per 3 levels,
810 * plus a small amount of physical resist, those poor suckers. ;)
811 * the fact that maxlevel is factored in could be considered sort of bogus -
812 * we should probably give them some bonus and cap it off - otherwise,
813 * basically, if a server updates its max level, these playes may find
814 * that their protection from physical goes down
815 */
816 if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
817 {
818 ac = max (-10, arch->stats.ac - level / 3);
819 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
820 }
821 else
822 ac = arch->stats.ac;
823
824 stats.luck = arch->stats.luck;
825 speed = arch->speed;
826
827 chosen_skill = 0;
828
829 /* OK - we've reset most all the objects attributes to sane values.
830 * now go through and make adjustments for what the player has equipped.
831 */
832 for (tmp = inv; tmp; tmp = tmp->below)
833 {
834 /* This happens because apply_potion calls change_abil with the potion
835 * applied so we can tell the player what changed. But change_abil
836 * then calls this function.
827 */ 837 */
828 memcpy(&op->resist, &op->arch->clone.resist, sizeof(op->resist)); 838 if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
839 continue;
840
841 glow_radius += tmp->glow_radius;
842
843 /* For some things, we don't care what is equipped */
844 if (tmp->type == SKILL)
845 {
846 /* Want to take the highest skill here. */
847 if (IS_MANA_SKILL (tmp->subtype))
848 {
849 if (!mana_obj)
850 mana_obj = tmp;
851 else if (tmp->level > mana_obj->level)
852 mana_obj = tmp;
853 }
854
855 if (IS_GRACE_SKILL (tmp->subtype))
856 {
857 if (!grace_obj)
858 grace_obj = tmp;
859 else if (tmp->level > grace_obj->level)
860 grace_obj = tmp;
861 }
862 }
863
864 /* Container objects are not meant to adjust players, but other applied
865 * objects need to make adjustments.
866 * This block should handle all player specific changes
867 * The check for Praying is a bit of a hack - god given bonuses are put
868 * in the praying skill, and the player should always get those.
869 * It also means we need to put in additional checks for applied below,
870 * because the skill shouldn't count against body positions being used
871 * up, etc.
872 */
873 if ((tmp->flag [FLAG_APPLIED]
874 && tmp->type != CONTAINER
875 && tmp->type != CLOSE_CON
876 && tmp->type != SPELL)
877 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
878 {
879 if (type == PLAYER)
880 {
881 contr->item_power += tmp->item_power;
882
883 for (int i = 0; i < NUM_STATS; i++)
884 stat_sum [i] += tmp->stats.stat (i);
885
886 if (digest_types [tmp->type])
887 {
888 contr->digestion += tmp->stats.food;
889 contr->gen_hp += tmp->stats.hp;
890 if (tmp->type != BOW) // ugly exception for bows
891 contr->gen_sp += tmp->stats.sp;
892 contr->gen_grace += tmp->stats.grace;
893 contr->gen_sp_armour += tmp->gen_sp_armour;
894 }
895 } /* if this is a player */
896 else
897 {
898 if (tmp->type == WEAPON)
899 current_weapon = tmp;
900 }
901
902 /* Update slots used for items */
903 if (tmp->flag [FLAG_APPLIED]) // exclude praying...
904 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
905 slot[i].used += tmp->slot[i].info;
906
907 if (tmp->type == SYMPTOM)
908 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
909
910 /* Pos. and neg. protections are counted separate (-> pro/vuln).
911 * (Negative protections are calculated exactly like positive.)
912 * Resistance from potions are treated special as well. If there's
913 * more than one potion-effect, the bigger prot.-value is taken.
914 */
915 if (tmp->type == POTION_EFFECT)
916 for (int i = 0; i < NROFATTACKS; i++)
917 max_it (potion_resist[i], tmp->resist[i]);
918 else if (tmp->type != POTION)
919 for (int i = 0; i < NROFATTACKS; i++)
920 if (tmp->resist[i] > 0)
921 prot[i] += (100 - prot[i]) * tmp->resist[i] / 100;
922 else if (tmp->resist[i] < 0)
923 vuln[i] += (100 - vuln[i]) * -tmp->resist[i] / 100;
924
925 /* There may be other things that should not adjust the attacktype */
926 if (tmp->type != SYMPTOM)
927 {
928 attacktype |= tmp->attacktype;
929 path_attuned |= tmp->path_attuned;
930 path_repelled |= tmp->path_repelled;
931 path_denied |= tmp->path_denied;
932 move_type |= tmp->move_type;
933 stats.luck += tmp->stats.luck;
934 }
935
936 flag |= tmp->flag & copy_flags;
937
938 if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
939 this->set_flag (FLAG_UNDEAD);
940
941 //TODO: copy_flags?
942 if (tmp->flag [FLAG_MAKE_INVIS])
943 {
944 set_flag (FLAG_MAKE_INVIS);
945 invisible = 1;
946 }
947
948 if (tmp->stats.exp && tmp->type != SKILL)
949 {
950 if (tmp->stats.exp > 0)
951 {
952 added_speed += tmp->stats.exp / 3.f;
953 bonus_speed += tmp->stats.exp / 3.f + 1.f;
954 }
955 else
956 added_speed += tmp->stats.exp;
957 }
958
959 switch (tmp->type)
960 {
961 case SKILL:
962 {
963 // some skills will end up here without counting as "applied"
964 if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
965 break;
966
967 if (chosen_skill)
968 {
969 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
970 &name, &chosen_skill->name, &tmp->name);
971
972 tmp->flag [FLAG_APPLIED] = false;
973 update_stats ();
974 return;
975 }
976
977 chosen_skill = tmp;
978
979 if (tmp->stats.dam > 0)
980 { /* skill is a 'weapon' */
981 if (!this->flag [FLAG_READY_WEAPON])
982 weapon_speed = max (0, WEAPON_SPEED (tmp));
983
984 weapon_weight = tmp->weight;
985 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
986
987 if (tmp->magic)
988 stats.dam += tmp->magic;
989 }
990
991 if (tmp->stats.wc)
992 wc -= tmp->stats.wc + tmp->magic;
993
994 if (tmp->slaying)
995 slaying = tmp->slaying;
996
997 if (tmp->stats.ac)
998 ac -= tmp->stats.ac + tmp->magic;
999
1000 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1001 contr->encumbrance += 3 * tmp->weight / 1000;
1002 }
1003
1004 break;
1005
1006 case SHIELD:
1007 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1008 contr->encumbrance += tmp->weight / 2000;
1009 //FALLTHROUGH
1010 case RING:
1011 case AMULET:
1012 case GIRDLE:
1013 case HELMET:
1014 case BOOTS:
1015 case GLOVES:
1016 case CLOAK:
1017 if (tmp->stats.wc)
1018 wc -= tmp->stats.wc + tmp->magic;
1019
1020 if (tmp->stats.dam)
1021 stats.dam += tmp->stats.dam + tmp->magic;
1022
1023 if (tmp->stats.ac)
1024 ac -= tmp->stats.ac + tmp->magic;
1025
1026 break;
1027
1028 case RANGED:
1029 case BOW:
1030 case WEAPON:
1031 wc -= tmp->stats.wc + tmp->magic;
1032
1033 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1034 ac -= tmp->stats.ac + tmp->magic;
1035
1036 stats.dam += tmp->stats.dam + tmp->magic;
1037 weapon_weight = tmp->weight;
1038 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1039
1040 if (weapon_speed < 0)
1041 weapon_speed = 0;
1042
1043 slaying = tmp->slaying;
1044
1045 /* If there is desire that two handed weapons should do
1046 * extra strength damage, this is where the code should
1047 * go.
1048 */
1049
1050 if (type == PLAYER)
1051 if (settings.spell_encumbrance)
1052 contr->encumbrance += tmp->weight * 3 / 1000;
1053
1054 break;
1055
1056 case ARMOUR: /* Only the best of these three are used: */
1057 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1058 contr->encumbrance += tmp->weight / 1000;
1059
1060 case BRACERS:
1061 case FORCE:
1062 if (tmp->stats.wc)
1063 {
1064 if (best_wc < tmp->stats.wc + tmp->magic)
1065 {
1066 wc += best_wc;
1067 best_wc = tmp->stats.wc + tmp->magic;
1068 }
1069 else
1070 wc += tmp->stats.wc + tmp->magic;
1071 }
1072
1073 if (tmp->stats.ac)
1074 {
1075 if (best_ac < tmp->stats.ac + tmp->magic)
1076 {
1077 ac += best_ac; /* Remove last bonus */
1078 best_ac = tmp->stats.ac + tmp->magic;
1079 }
1080 else /* To nullify the below effect */
1081 ac += tmp->stats.ac + tmp->magic;
1082 }
1083
1084 if (tmp->stats.wc)
1085 wc -= tmp->stats.wc + tmp->magic;
1086
1087 if (tmp->stats.ac)
1088 ac -= tmp->stats.ac + tmp->magic;
1089
1090 if (ARMOUR_SPEED (tmp))
1091 min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1092
1093 break;
1094 } /* switch tmp->type */
1095 } /* item is equipped */
1096 } /* for loop of items */
1097
1098 min_it (glow_radius, MAX_LIGHT_RADIUS);
1099
1100 /* We've gone through all the objects the player has equipped. For many things, we
1101 * have generated intermediate values which we now need to assign.
1102 */
1103
1104 /* 'total resistance = total protections - total vulnerabilities'.
1105 * If there is an uncursed potion in effect, granting more protection
1106 * than that, we take: 'total resistance = resistance from potion'.
1107 * If there is a cursed (and no uncursed) potion in effect, we take
1108 * 'total resistance = vulnerability from cursed potion'.
1109 */
1110 for (int i = 0; i < NROFATTACKS; i++)
1111 {
1112 resist[i] = prot[i] - vuln[i];
1113
1114 if (potion_resist[i] != -1000
1115 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1116 resist[i] = potion_resist[i];
1117 }
1118
1119 if (type == PLAYER)
1120 {
1121 // clamp various player stats
1122 for (int i = 0; i < NUM_STATS; ++i)
1123 stats.stat (i) = stat_sum [i];
1124
1125 check_stat_bounds (&stats);
1126
1127 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1128
1129 /* Figure out the players sp/mana/hp totals. */
1130 int pl_level;
1131
1132 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1133
1134 /* You basically get half a con bonus/level. But we do take into account rounding,
1135 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1136 */
1137 stats.maxhp = 0;
1138 for (int i = 1; i <= min (10, pl_level); i++)
1139 {
1140 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1141
1142 if (i % 2 && con_bonus[stats.Con] % 2)
1143 if (con_bonus[stats.Con] > 0)
1144 j++;
1145 else
1146 j--;
1147
1148 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1149 }
1150
1151 stats.maxhp += 2 * max (0, level - 10);
1152
1153 if (stats.hp > stats.maxhp)
1154 stats.hp = stats.maxhp;
1155
1156 /* Sp gain is controlled by the level of the player's
1157 * relevant experience object (mana_obj, see above)
1158 */
1159 /* following happen when skills system is not used */
1160 if (!mana_obj)
1161 mana_obj = this;
1162
1163 if (!grace_obj)
1164 grace_obj = this;
1165
1166 /* set maxsp */
1167 if (!mana_obj || !mana_obj->level || type != PLAYER)
1168 mana_obj = this;
1169
1170 if (mana_obj == this && type == PLAYER)
1171 stats.maxsp = 1;
1172 else
1173 {
1174 float sp_tmp = 0.f;
1175
1176 for (int i = 1; i <= min (10, mana_obj->level); i++)
1177 {
1178 float stmp;
1179
1180 /* Got some extra bonus at first level */
1181 if (i < 2)
1182 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1183 else
1184 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1185
1186 sp_tmp += max (1.f, stmp);
1187 }
1188
1189 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1190 }
1191
1192 /* Characters can get their sp supercharged via rune of transferrance */
1193 stats.sp = min (stats.sp, stats.maxsp * 2);
1194
1195 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1196 if (!grace_obj || !grace_obj->level || type != PLAYER)
1197 grace_obj = this;
1198
1199 if (grace_obj == this && type == PLAYER)
1200 stats.maxgrace = 1;
1201 else
1202 {
1203 /* store grace in a float - this way, the divisions below don't create
1204 * big jumps when you go from level to level - with int's, it then
1205 * becomes big jumps when the sums of the bonuses jump to the next
1206 * step of 8 - with floats, even fractional ones are useful.
1207 */
1208 float sp_tmp = 0.f;
1209
1210 for (int i = 1; i <= min (10, grace_obj->level); i++)
1211 {
1212 float grace_tmp = 0.f;
1213
1214 /* Got some extra bonus at first level */
1215 if (i < 2)
1216 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1217 else
1218 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1219
1220 sp_tmp += max (1.f, grace_tmp);
1221 }
1222
1223 /* two grace points per level after 10 */
1224 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1225 }
1226
1227 /* No limit on grace vs maxgrace */
1228
1229 if (contr->braced)
1230 {
1231 ac += 2;
1232 wc += 4;
1233 }
1234 else
1235 ac -= dex_bonus[stats.Dex];
1236
1237 /* In new exp/skills system, wc bonuses are related to
1238 * the players level in a relevant exp object (wc_obj)
1239 * not the general player level -b.t.
1240 * I changed this slightly so that wc bonuses are better
1241 * than before. This is to balance out the fact that
1242 * the player no longer gets a personal weapon w/ 1
1243 * improvement every level, now its fighterlevel/5. So
1244 * we give the player a bonus here in wc and dam
1245 * to make up for the change. Note that I left the
1246 * monster bonus the same as before. -b.t.
1247 */
1248 object *wc_obj = chosen_skill;
1249
1250 if (contr && wc_obj && wc_obj->level > 1)
1251 {
1252 wc -= wc_obj->level + thaco_bonus[stats.Str];
1253
1254 for (int i = 1; i < wc_obj->level; i++)
1255 {
1256 /* additional wc every 6 levels */
1257 if (!(i % 6))
1258 wc--;
1259
1260 /* additional dam every 4 levels. */
1261 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1262 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1263 }
1264 }
1265 else
1266 wc -= level + thaco_bonus[stats.Str];
1267
1268 stats.dam += dam_bonus[stats.Str];
1269
1270 if (stats.dam < 1)
1271 stats.dam = 1;
1272
1273 speed = 1.f + speed_bonus[stats.Dex];
1274
1275 if (settings.search_items && contr->search_str[0])
1276 speed -= 1;
1277 } /* End if player */
1278
1279 if (added_speed >= 0)
1280 speed += added_speed / 10.f;
1281 else /* Something wrong here...: */
1282 speed /= 1.f - added_speed;
1283
1284 /* Max is determined by armour */
1285 speed = min (speed, max_speed);
1286
1287 if (type == PLAYER)
1288 {
1289 /* f is a number the represents the number of kg above (positive num)
1290 * or below (negative number) that the player is carrying. If above
1291 * weight limit, then player suffers a speed reduction based on how
1292 * much above he is, and what is max carry is
1293 */
1294 float f = (carrying / 1000) - max_carry[stats.Str];
1295 if (f > 0.f)
1296 speed = speed / (1.f + f / max_carry[stats.Str]);
1297 }
1298
1299 speed += bonus_speed / 10.f; /* Not affected by limits */
1300 speed *= speed_reduce_from_disease;
1301
1302 /* Put a lower limit on speed. Note with this speed, you move once every
1303 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1304 */
1305 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1306
1307 if (speed != old_speed)
1308 set_speed (speed);
1309
1310 if (type == PLAYER)
1311 {
1312 /* (This formula was made by vidarl@ifi.uio.no)
1313 * Note that we never used these values again - basically
1314 * all of these could be subbed into one big equation, but
1315 * that would just be a real pain to read.
1316 */
1317 float M = (max_carry[stats.Str] - 121) / 121.f;
1318 float M2 = max_carry[stats.Str] / 100.f;
1319 float W = weapon_weight / 20000.f;
1320 float s = (20 - weapon_speed) / 10.f;
1321 float D = (stats.Dex - 14) / 14.f;
1322 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1323
1324 K *= (4 + level) * 1.2f / (6 + level);
1325
1326 if (K <= 0.01f)
1327 K = 0.01f;
1328
1329 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1330 }
1331
1332 /* I want to limit the power of small monsters with big weapons: */
1333 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1334 stats.dam = arch->stats.dam * 3;
1335
1336 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1337 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1338
1339 /* if for some reason the creature doesn't have any move type,
1340 * give them walking as a default.
1341 * The second case is a special case - to more closely mimic the
1342 * old behaviour - if your flying, your not walking - just
1343 * one or the other.
1344 */
1345 if (move_type == 0)
1346 move_type = MOVE_WALK;
1347 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1348 move_type &= ~MOVE_WALK;
1349
1350 // now apply the new move_type
1351 if (this->move_type != move_type)
1352 change_move_type (move_type);
1353
1354 /* It is quite possible that a player's spell costing might have changed,
1355 * so we will check that now.
1356 */
1357 if (is_player ())
1358 contr->update_spells ();
1359
1360 // update the mapspace, if we are on a map
1361 if (!flag [FLAG_REMOVED] && map)
1362 map->at (x, y).flags_ = 0;
1363}
1364
1365void
1366object::set_glow_radius (sint8 rad)
1367{
1368 glow_radius = rad;
829 1369
830 for (i=0;i<NROFATTACKS;i++) { 1370 if (is_on_map ())
831 if (op->resist[i] > 0) 1371 update_all_los (map, x, y);
832 prot[i]= op->resist[i], vuln[i]=0; 1372 else if (object *env = outer_env ())
833 else
834 vuln[i]= -(op->resist[i]), prot[i]=0;
835 potion_resist[i]=0;
836 } 1373 {
837 1374 env->update_stats ();
838 wc=op->arch->clone.stats.wc;
839 op->stats.dam=op->arch->clone.stats.dam;
840 1375
841 /* for players which cannot use armour, they gain AC -1 per 3 levels, 1376 if (env->is_on_map ())
842 * plus a small amount of physical resist, those poor suckers. ;) 1377 update_all_los (env->map, env->x, env->y);
843 * the fact that maxlevel is factored in could be considered sort of bogus -
844 * we should probably give them some bonus and cap it off - otherwise,
845 * basically, if a server updates its max level, these playes may find
846 * that their protection from physical goes down
847 */
848 if(!QUERY_FLAG(op,FLAG_USE_ARMOUR) && op->type==PLAYER) {
849 ac=MAX(-10,op->arch->clone.stats.ac - op->level/3);
850 prot[ATNR_PHYSICAL] += ((100-prot[AT_PHYSICAL])*(80*op->level/settings.max_level))/100;
851 } 1378 }
852 else
853 ac=op->arch->clone.stats.ac;
854
855 op->stats.luck=op->arch->clone.stats.luck;
856 op->speed = op->arch->clone.speed;
857
858 /* OK - we've reset most all the objects attributes to sane values.
859 * now go through and make adjustments for what the player has equipped.
860 */
861
862 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) {
863 /* See note in map.c:update_position about making this additive
864 * since light sources are never applied, need to put check here.
865 */
866 if (tmp->glow_radius > op->glow_radius) op->glow_radius=tmp->glow_radius;
867
868 /* This happens because apply_potion calls change_abil with the potion
869 * applied so we can tell the player what chagned. But change_abil
870 * then calls this function.
871 */
872 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == POTION) {
873 continue;
874 }
875
876 /* For some things, we don't care what is equipped */
877 if (tmp->type == SKILL) {
878 /* Want to take the highest skill here. */
879 if (IS_MANA_SKILL(tmp->subtype)) {
880 if (!mana_obj) mana_obj=tmp;
881 else if (tmp->level > mana_obj->level) mana_obj = tmp;
882 }
883 if (IS_GRACE_SKILL(tmp->subtype)) {
884 if (!grace_obj) grace_obj=tmp;
885 else if (tmp->level > grace_obj->level) grace_obj = tmp;
886 }
887 }
888
889 /* Container objects are not meant to adjust a players, but other applied
890 * objects need to make adjustments.
891 * This block should handle all player specific changes
892 * The check for Praying is a bit of a hack - god given bonuses are put
893 * in the praying skill, and the player should always get those.
894 * It also means we need to put in additional checks for applied below,
895 * because the skill shouldn't count against body positions being used
896 * up, etc.
897 */
898 if ((QUERY_FLAG(tmp,FLAG_APPLIED) && tmp->type!=CONTAINER && tmp->type!=CLOSE_CON) ||
899 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) {
900 if(op->type==PLAYER) {
901 if (tmp->type == BOW)
902 op->contr->ranges[range_bow] = tmp;
903
904 if (tmp->type == WAND || tmp->type == ROD || tmp->type==HORN)
905 op->contr->ranges[range_misc] = tmp;
906
907 for(i=0;i<NUM_STATS;i++)
908 change_attr_value(&(op->stats),i,get_attr_value(&(tmp->stats),i));
909
910 /* these are the items that currently can change digestion, regeneration,
911 * spell point recovery and mana point recovery. Seems sort of an arbitary
912 * list, but other items store other info into stats array.
913 */
914 if ((tmp->type == EXPERIENCE) || (tmp->type == WEAPON) ||
915 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
916 (tmp->type == SHIELD) || (tmp->type == RING) ||
917 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
918 (tmp->type == AMULET ) || (tmp->type == GIRDLE) ||
919 (tmp->type == BRACERS ) || (tmp->type == CLOAK) ||
920 (tmp->type == DISEASE) || (tmp->type == FORCE) ||
921 (tmp->type == SKILL)) {
922 op->contr->digestion += tmp->stats.food;
923 op->contr->gen_hp += tmp->stats.hp;
924 op->contr->gen_sp += tmp->stats.sp;
925 op->contr->gen_grace += tmp->stats.grace;
926 op->contr->gen_sp_armour+= tmp->gen_sp_armour;
927 op->contr->item_power += tmp->item_power;
928 }
929 } /* if this is a player */
930
931 /* Update slots used for items */
932 if (QUERY_FLAG(tmp,FLAG_APPLIED)) {
933 for (i=0; i<NUM_BODY_LOCATIONS; i++)
934 op->body_used[i] += tmp->body_info[i];
935 }
936
937 if(tmp->type==SYMPTOM) {
938 speed_reduce_from_disease = tmp->last_sp / 100.0;
939 if(speed_reduce_from_disease ==0) speed_reduce_from_disease = 1;
940 }
941
942 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
943 * (Negative protections are calculated extactly like positive.)
944 * Resistance from potions are treated special as well. If there's
945 * more than one potion-effect, the bigger prot.-value is taken.
946 */
947 if (tmp->type != POTION) {
948 for (i=0; i<NROFATTACKS; i++) {
949 /* Potential for cursed potions, in which case we just can use
950 * a straight MAX, as potion_resist is initialized to zero.
951 */
952 if (tmp->type==POTION_EFFECT) {
953 if (potion_resist[i])
954 potion_resist[i] = MAX(potion_resist[i], tmp->resist[i]);
955 else
956 potion_resist[i] = tmp->resist[i];
957 }
958 else if (tmp->resist[i] > 0)
959 prot[i] += ((100-prot[i])*tmp->resist[i])/100;
960 else if (tmp->resist[i] < 0)
961 vuln[i] += ((100-vuln[i])*(-tmp->resist[i]))/100;
962 }
963 }
964
965 /* There may be other things that should not adjust the attacktype */
966 if (tmp->type!=BOW && tmp->type != SYMPTOM)
967 op->attacktype|=tmp->attacktype;
968
969 op->path_attuned|=tmp->path_attuned;
970 op->path_repelled|=tmp->path_repelled;
971 op->path_denied|=tmp->path_denied;
972 op->stats.luck+=tmp->stats.luck;
973 op->move_type |= tmp->move_type;
974
975 if(QUERY_FLAG(tmp,FLAG_LIFESAVE)) SET_FLAG(op,FLAG_LIFESAVE);
976 if(QUERY_FLAG(tmp,FLAG_REFL_SPELL)) SET_FLAG(op,FLAG_REFL_SPELL);
977 if(QUERY_FLAG(tmp,FLAG_REFL_MISSILE)) SET_FLAG(op,FLAG_REFL_MISSILE);
978 if(QUERY_FLAG(tmp,FLAG_STEALTH)) SET_FLAG(op,FLAG_STEALTH);
979 if(QUERY_FLAG(tmp,FLAG_XRAYS)) SET_FLAG(op,FLAG_XRAYS);
980 if(QUERY_FLAG(tmp,FLAG_BLIND)) SET_FLAG(op,FLAG_BLIND);
981 if(QUERY_FLAG(tmp,FLAG_SEE_IN_DARK)) SET_FLAG(op,FLAG_SEE_IN_DARK);
982
983 if(QUERY_FLAG(tmp,FLAG_UNDEAD)&&!QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD))
984 SET_FLAG(op,FLAG_UNDEAD);
985
986 if(QUERY_FLAG(tmp,FLAG_MAKE_INVIS)) {
987 SET_FLAG(op,FLAG_MAKE_INVIS);
988 op->invisible=1;
989 }
990
991 if(tmp->stats.exp && tmp->type!=SKILL) {
992 if(tmp->stats.exp > 0) {
993 added_speed+=(float)tmp->stats.exp/3.0;
994 bonus_speed+=1.0+(float)tmp->stats.exp/3.0;
995 } else
996 added_speed+=(float)tmp->stats.exp;
997 }
998
999 switch(tmp->type) {
1000 /* skills modifying the character -b.t. */
1001 /* for all skills and skill granting objects */
1002 case SKILL:
1003 if (!QUERY_FLAG(tmp,FLAG_APPLIED)) break;
1004
1005 if (IS_COMBAT_SKILL(tmp->subtype)) wc_obj=tmp;
1006
1007 if (op->chosen_skill) {
1008 LOG(llevDebug, "fix_player, op %s has multiple skills applied\n", &op->name);
1009 }
1010 op->chosen_skill = tmp;
1011 if(tmp->stats.dam>0) { /* skill is a 'weapon' */
1012 if(!QUERY_FLAG(op,FLAG_READY_WEAPON))
1013 weapon_speed = (int) WEAPON_SPEED(tmp);
1014 if(weapon_speed<0) weapon_speed = 0;
1015 weapon_weight=tmp->weight;
1016 op->stats.dam+=tmp->stats.dam*(1 + (op->chosen_skill->level/9));
1017 if(tmp->magic) op->stats.dam += tmp->magic;
1018 }
1019 if(tmp->stats.wc)
1020 wc-=(tmp->stats.wc+tmp->magic);
1021
1022 if (tmp->slaying!=NULL)
1023 op->slaying = tmp->slaying;
1024
1025 if(tmp->stats.ac)
1026 ac-=(tmp->stats.ac+tmp->magic);
1027 if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
1028 op->contr->encumbrance+=(int)3*tmp->weight/1000;
1029 if (op->type == PLAYER)
1030 op->contr->ranges[range_skill] = op;
1031 break;
1032
1033 case SKILL_TOOL:
1034 if (op->chosen_skill) {
1035 LOG(llevDebug, "fix_player, op %s has multiple skills applied\n", &op->name);
1036 }
1037 op->chosen_skill = tmp;
1038 if (op->type == PLAYER)
1039 op->contr->ranges[range_skill] = op;
1040 break;
1041
1042 case SHIELD:
1043 if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
1044 op->contr->encumbrance+=(int)tmp->weight/2000;
1045 case RING:
1046 case AMULET:
1047 case GIRDLE:
1048 case HELMET:
1049 case BOOTS:
1050 case GLOVES:
1051 case CLOAK:
1052 if(tmp->stats.wc)
1053 wc-=(tmp->stats.wc+tmp->magic);
1054 if(tmp->stats.dam)
1055 op->stats.dam+=(tmp->stats.dam+tmp->magic);
1056 if(tmp->stats.ac)
1057 ac-=(tmp->stats.ac+tmp->magic);
1058 break;
1059
1060 case WEAPON:
1061 wc-=(tmp->stats.wc+tmp->magic);
1062 if(tmp->stats.ac&&tmp->stats.ac+tmp->magic>0)
1063 ac-=tmp->stats.ac+tmp->magic;
1064 op->stats.dam+=(tmp->stats.dam+tmp->magic);
1065 weapon_weight=tmp->weight;
1066 weapon_speed=((int)WEAPON_SPEED(tmp)*2-tmp->magic)/2;
1067 if(weapon_speed<0) weapon_speed=0;
1068 op->slaying = tmp->slaying;
1069 /* If there is desire that two handed weapons should do
1070 * extra strength damage, this is where the code should
1071 * go.
1072 */
1073 op->current_weapon = tmp;
1074 if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
1075 op->contr->encumbrance+=(int)3*tmp->weight/1000;
1076 break;
1077
1078 case ARMOUR: /* Only the best of these three are used: */
1079 if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
1080 op->contr->encumbrance+=(int)tmp->weight/1000;
1081
1082 case BRACERS:
1083 case FORCE:
1084 if(tmp->stats.wc) {
1085 if(best_wc<tmp->stats.wc+tmp->magic) {
1086 wc+=best_wc;
1087 best_wc=tmp->stats.wc+tmp->magic;
1088 } else
1089 wc+=tmp->stats.wc+tmp->magic;
1090 }
1091 if(tmp->stats.ac) {
1092 if(best_ac<tmp->stats.ac+tmp->magic) {
1093 ac+=best_ac; /* Remove last bonus */
1094 best_ac=tmp->stats.ac+tmp->magic;
1095 }
1096 else /* To nullify the below effect */
1097 ac+=tmp->stats.ac+tmp->magic;
1098 }
1099 if(tmp->stats.wc) wc-=(tmp->stats.wc+tmp->magic);
1100 if(tmp->stats.ac) ac-=(tmp->stats.ac+tmp->magic);
1101 if(ARMOUR_SPEED(tmp)&&ARMOUR_SPEED(tmp)/10.0<max)
1102 max=ARMOUR_SPEED(tmp)/10.0;
1103 break;
1104 } /* switch tmp->type */
1105 } /* item is equipped */
1106 } /* for loop of items */
1107
1108 /* We've gone through all the objects the player has equipped. For many things, we
1109 * have generated intermediate values which we now need to assign.
1110 */
1111
1112 /* 'total resistance = total protections - total vulnerabilities'.
1113 * If there is an uncursed potion in effect, granting more protection
1114 * than that, we take: 'total resistance = resistance from potion'.
1115 * If there is a cursed (and no uncursed) potion in effect, we take
1116 * 'total resistance = vulnerability from cursed potion'.
1117 */
1118 for (i=0; i<NROFATTACKS; i++) {
1119 op->resist[i] = prot[i] - vuln[i];
1120 if (potion_resist[i] && ((potion_resist[i] > op->resist[i]) ||
1121 (potion_resist[i] < 0)))
1122 op->resist[i] = potion_resist[i];
1123 }
1124
1125 /* Figure out the players sp/mana/hp totals. */
1126 if(op->type==PLAYER) {
1127 int pl_level;
1128
1129 check_stat_bounds(&(op->stats));
1130 pl_level=op->level;
1131
1132 if(pl_level<1) pl_level=1; /* safety, we should always get 1 levels worth of hp! */
1133
1134 /* You basically get half a con bonus/level. But we do take into account rounding,
1135 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1136 */
1137 for(i=1,op->stats.maxhp=0;i<=pl_level&&i<=10;i++) {
1138 j=op->contr->levhp[i]+con_bonus[op->stats.Con]/2;
1139 if(i%2 && con_bonus[op->stats.Con]%2) {
1140 if (con_bonus[op->stats.Con]>0)
1141 j++;
1142 else
1143 j--;
1144 }
1145 op->stats.maxhp+=j>1?j:1; /* always get at least 1 hp/level */
1146 }
1147
1148 for(i=11;i<=op->level;i++)
1149 op->stats.maxhp+=2;
1150
1151 if(op->stats.hp>op->stats.maxhp)
1152 op->stats.hp=op->stats.maxhp;
1153
1154 /* Sp gain is controlled by the level of the player's
1155 * relevant experience object (mana_obj, see above)
1156 */
1157 /* following happen when skills system is not used */
1158 if(!mana_obj) mana_obj = op;
1159 if(!grace_obj) grace_obj = op;
1160 /* set maxsp */
1161 if(!mana_obj || !mana_obj->level || op->type!=PLAYER) mana_obj = op;
1162
1163 if (mana_obj == op && op->type == PLAYER) {
1164 op->stats.maxsp = 1;
1165 } else {
1166 sp_tmp=0.0;
1167 for(i=1;i<=mana_obj->level&&i<=10;i++) {
1168 float stmp;
1169
1170 /* Got some extra bonus at first level */
1171 if(i<2) {
1172 stmp = op->contr->levsp[i] +((2.0 * (float)sp_bonus[op->stats.Pow] +
1173 (float)sp_bonus[op->stats.Int])/6.0);
1174 } else {
1175 stmp=(float)op->contr->levsp[i]
1176 +(2.0 * (float)sp_bonus[op->stats.Pow] +
1177 (float)sp_bonus[op->stats.Int])/12.0;
1178 }
1179 if (stmp<1.0) stmp=1.0;
1180 sp_tmp+=stmp;
1181 }
1182 op->stats.maxsp=(int)sp_tmp;
1183
1184 for(i=11;i<=mana_obj->level;i++)
1185 op->stats.maxsp+=2;
1186 }
1187 /* Characters can get their sp supercharged via rune of transferrance */
1188 if(op->stats.sp>op->stats.maxsp*2)
1189 op->stats.sp=op->stats.maxsp*2;
1190
1191 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1192 if(!grace_obj || !grace_obj->level || op->type!=PLAYER) grace_obj = op;
1193
1194 if (grace_obj == op && op->type == PLAYER) {
1195 op->stats.maxgrace = 1;
1196 } else {
1197 /* store grace in a float - this way, the divisions below don't create
1198 * big jumps when you go from level to level - with int's, it then
1199 * becomes big jumps when the sums of the bonuses jump to the next
1200 * step of 8 - with floats, even fractional ones are useful.
1201 */
1202 sp_tmp=0.0;
1203 for(i=1,op->stats.maxgrace=0;i<=grace_obj->level&&i<=10;i++) {
1204 float grace_tmp=0.0;
1205
1206 /* Got some extra bonus at first level */
1207 if(i<2) {
1208 grace_tmp = op->contr->levgrace[i]+(((float)grace_bonus[op->stats.Pow] +
1209 2.0 * (float)grace_bonus[op->stats.Wis])/6.0);
1210 } else {
1211 grace_tmp=(float)op->contr->levgrace[i]
1212 +((float)grace_bonus[op->stats.Pow] +
1213 2.0 * (float)grace_bonus[op->stats.Wis])/12.0;
1214 }
1215 if (grace_tmp<1.0) grace_tmp=1.0;
1216 sp_tmp+=grace_tmp;
1217 }
1218 op->stats.maxgrace=(int)sp_tmp;
1219
1220 /* two grace points per level after 11 */
1221 for(i=11;i<=grace_obj->level;i++)
1222 op->stats.maxgrace+=2;
1223 }
1224 /* No limit on grace vs maxgrace */
1225
1226 if(op->contr->braced) {
1227 ac+=2;
1228 wc+=4;
1229 }
1230 else
1231 ac-=dex_bonus[op->stats.Dex];
1232
1233 /* In new exp/skills system, wc bonuses are related to
1234 * the players level in a relevant exp object (wc_obj)
1235 * not the general player level -b.t.
1236 * I changed this slightly so that wc bonuses are better
1237 * than before. This is to balance out the fact that
1238 * the player no longer gets a personal weapon w/ 1
1239 * improvement every level, now its fighterlevel/5. So
1240 * we give the player a bonus here in wc and dam
1241 * to make up for the change. Note that I left the
1242 * monster bonus the same as before. -b.t.
1243 */
1244
1245 if(op->type==PLAYER && wc_obj && wc_obj->level>1) {
1246 wc-=(wc_obj->level+thaco_bonus[op->stats.Str]);
1247 for(i=1;i<wc_obj->level;i++) {
1248 /* addtional wc every 6 levels */
1249 if(!(i%6)) wc--;
1250 /* addtional dam every 4 levels. */
1251 if(!(i%4) && (dam_bonus[op->stats.Str]>=0))
1252 op->stats.dam+=(1+(dam_bonus[op->stats.Str]/5));
1253 }
1254 } else
1255 wc-=(op->level+thaco_bonus[op->stats.Str]);
1256
1257 op->stats.dam+=dam_bonus[op->stats.Str];
1258
1259 if(op->stats.dam<1)
1260 op->stats.dam=1;
1261
1262 op->speed=1.0+speed_bonus[op->stats.Dex];
1263 if (settings.search_items && op->contr->search_str[0])
1264 op->speed -= 1;
1265 if (op->attacktype==0)
1266 op->attacktype=op->arch->clone.attacktype;
1267
1268 } /* End if player */
1269
1270 if(added_speed>=0)
1271 op->speed+=added_speed/10.0;
1272 else /* Something wrong here...: */
1273 op->speed /= (float)(1.0-added_speed);
1274
1275 /* Max is determined by armour */
1276 if(op->speed>max)
1277 op->speed=max;
1278
1279 if(op->type == PLAYER) {
1280 /* f is a number the represents the number of kg above (positive num)
1281 * or below (negative number) that the player is carrying. If above
1282 * weight limit, then player suffers a speed reduction based on how
1283 * much above he is, and what is max carry is
1284 */
1285 f=(op->carrying/1000)-max_carry[op->stats.Str];
1286 if(f>0) op->speed=op->speed/(1.0+f/max_carry[op->stats.Str]);
1287 }
1288
1289 op->speed+=bonus_speed/10.0; /* Not affected by limits */
1290
1291 /* Put a lower limit on speed. Note with this speed, you move once every
1292 * 100 ticks or so. This amounts to once every 12 seconds of realtime.
1293 */
1294 op->speed = op->speed * speed_reduce_from_disease;
1295
1296 if (op->speed<0.01 && op->type==PLAYER) op->speed=0.01;
1297
1298 if(op->type == PLAYER) {
1299 float M,W,s,D,K,S,M2;
1300
1301 /* (This formula was made by vidarl@ifi.uio.no)
1302 * Note that we never used these values again - basically
1303 * all of these could be subbed into one big equation, but
1304 * that would just be a real pain to read.
1305 */
1306 M=(max_carry[op->stats.Str]-121)/121.0;
1307 M2=max_carry[op->stats.Str]/100.0;
1308 W=weapon_weight/20000.0;
1309 s=2-weapon_speed/10.0;
1310 D=(op->stats.Dex-14)/14.0;
1311 K=1 + M/3.0 - W/(3*M2) + op->speed/5.0 + D/2.0;
1312 K*=(4+op->level)/(float)(6+op->level)*1.2;
1313 if(K<=0) K=0.01;
1314 S=op->speed/(K*s);
1315 op->contr->weapon_sp=S;
1316 }
1317 /* I want to limit the power of small monsters with big weapons: */
1318 if(op->type!=PLAYER&&op->arch!=NULL&&
1319 op->stats.dam>op->arch->clone.stats.dam*3)
1320 op->stats.dam=op->arch->clone.stats.dam*3;
1321
1322 /* Prevent overflows of wc - best you can get is ABS(120) - this
1323 * should be more than enough - remember, AC is also in 8 bits,
1324 * so its value is the same.
1325 */
1326 if (wc>120) wc=120;
1327 else if (wc<-120) wc=-120;
1328 op->stats.wc=wc;
1329
1330 if (ac>120) ac=120;
1331 else if (ac<-120) ac=-120;
1332 op->stats.ac=ac;
1333
1334 /* if for some reason the creature doesn't have any move type,
1335 * give them walking as a default.
1336 * The second case is a special case - to more closely mimic the
1337 * old behaviour - if your flying, your not walking - just
1338 * one or the other.
1339 */
1340 if (op->move_type == 0) op->move_type = MOVE_WALK;
1341 else if (op->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) op->move_type &= ~MOVE_WALK;
1342
1343 update_ob_speed(op);
1344
1345 /* It is quite possible that a player's spell costing might have changed,
1346 * so we will check that now.
1347 */
1348 if (op->type == PLAYER) esrv_update_spells(op->contr);
1349} 1379}
1350 1380
1351/* 1381/*
1352 * Returns true if the given player is a legal class. 1382 * Returns true if the given player is a legal class.
1353 * The function to add and remove class-bonuses to the stats doesn't 1383 * The function to add and remove class-bonuses to the stats doesn't
1354 * check if the stat becomes negative, thus this function 1384 * check if the stat becomes negative, thus this function
1355 * merely checks that all stats are 1 or more, and returns 1385 * merely checks that all stats are 1 or more, and returns
1356 * false otherwise. 1386 * false otherwise.
1357 */ 1387 */
1358 1388int
1359int allowed_class(const object *op) { 1389allowed_class (const object *op)
1360 return op->stats.Dex>0&&op->stats.Str>0&&op->stats.Con>0&& 1390{
1361 op->stats.Int>0&&op->stats.Wis>0&&op->stats.Pow>0&& 1391 return op->stats.Dex > 0
1392 && op->stats.Str > 0
1393 && op->stats.Con > 0
1394 && op->stats.Int > 0
1395 && op->stats.Wis > 0
1396 && op->stats.Pow > 0
1362 op->stats.Cha>0; 1397 && op->stats.Cha > 0;
1363} 1398}
1364 1399
1365/* 1400/*
1366 * set the new dragon name after gaining levels or 1401 * set the new dragon name after gaining levels or
1367 * changing ability focus (later this can be extended to 1402 * changing ability focus (later this can be extended to
1368 * eventually change the player's face and animation) 1403 * eventually change the player's face and animation)
1369 * 1404 */
1370 * Note that the title is written to 'own_title' in the 1405void
1371 * player struct. This should be changed to 'ext_title'
1372 * as soon as clients support this!
1373 * Please, anyone, write support for 'ext_title'.
1374 */
1375void set_dragon_name(object *pl, const object *abil, const object *skin) { 1406set_dragon_name (object *pl, const object *abil, const object *skin)
1407{
1376 int atnr=-1; /* attacknumber of highest level */ 1408 int atnr = -1; /* attacknumber of highest level */
1377 int level=0; /* highest level */ 1409 int level = 0; /* highest level */
1378 int i; 1410 int i;
1379 1411
1380 /* Perhaps do something more clever? */ 1412 /* Perhaps do something more clever? */
1381 if (!abil || !skin) return; 1413 if (!abil || !skin)
1382 1414 return;
1415
1383 /* first, look for the highest level */ 1416 /* first, look for the highest level */
1384 for(i=0; i<NROFATTACKS; i++) { 1417 for (i = 0; i < NROFATTACKS; i++)
1385 if (atnr_is_dragon_enabled(i) && 1418 {
1386 (atnr==-1 || abil->resist[i] > abil->resist[atnr])) { 1419 if (atnr_is_dragon_enabled (i) && (atnr == -1 || abil->resist[i] > abil->resist[atnr]))
1420 {
1387 level = abil->resist[i]; 1421 level = abil->resist[i];
1388 atnr = i; 1422 atnr = i;
1389 } 1423 }
1390 } 1424 }
1391 1425
1392 /* now if there are equals at highest level, pick the one with focus, 1426 /* now if there are equals at highest level, pick the one with focus,
1393 or else at random */ 1427 or else at random */
1394 if (atnr_is_dragon_enabled(abil->stats.exp) && 1428 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1395 abil->resist[abil->stats.exp] >= level)
1396 atnr = abil->stats.exp; 1429 atnr = abil->stats.exp;
1397 1430
1398 level = (int)(level/5.);
1399
1400 /* now set the new title */ 1431 /* now set the new title */
1401 if (pl->contr != NULL) {
1402 if(level == 0)
1403 sprintf(pl->contr->title, "%s hatchling", attacks[atnr]); 1432 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1404 else if (level == 1)
1405 sprintf(pl->contr->title, "%s wyrm", attacks[atnr]); 1433 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1406 else if (level == 2)
1407 sprintf(pl->contr->title, "%s wyvern", attacks[atnr]); 1434 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1408 else if (level == 3)
1409 sprintf(pl->contr->title, "%s dragon", attacks[atnr]); 1435 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1410 else { 1436 else
1437 {
1411 /* special titles for extra high resistance! */ 1438 /* special titles for extra high resistance! */
1412 if (skin->resist[atnr] > 80)
1413 sprintf(pl->contr->title, "legendary %s dragon", attacks[atnr]); 1439 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1414 else if (skin->resist[atnr] > 50)
1415 sprintf(pl->contr->title, "ancient %s dragon", attacks[atnr]); 1440 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1416 else
1417 sprintf(pl->contr->title, "big %s dragon", attacks[atnr]); 1441 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1418 }
1419 } 1442 }
1420 1443
1421 strcpy(pl->contr->own_title, ""); 1444 strcpy (pl->contr->own_title, "");
1422} 1445}
1423 1446
1424/* 1447/*
1425 * This function is called when a dragon-player gains 1448 * This function is called when a dragon-player gains
1426 * an overall level. Here, the dragon might gain new abilities 1449 * an overall level. Here, the dragon might gain new abilities
1427 * or change the ability-focus. 1450 * or change the ability-focus.
1428 */ 1451 */
1452static void
1429void dragon_level_gain(object *who) { 1453dragon_level_gain (object *who)
1454{
1430 object *abil = NULL; /* pointer to dragon ability force*/ 1455 object *abil = NULL; /* pointer to dragon ability force */
1431 object *skin = NULL; /* pointer to dragon skin force*/ 1456 object *skin = NULL; /* pointer to dragon skin force */
1432 object *tmp = NULL; /* tmp. object */ 1457 object *tmp = NULL; /* tmp. object */
1433 char buf[MAX_BUF]; /* tmp. string buffer */ 1458 char buf[MAX_BUF]; /* tmp. string buffer */
1434 1459
1435 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1460 /* now grab the 'dragon_ability'-forces from the player's inventory */
1436 for (tmp=who->inv; tmp!=NULL; tmp=tmp->below) { 1461 for (tmp = who->inv; tmp; tmp = tmp->below)
1437 if (tmp->type == FORCE) { 1462 if (tmp->type == FORCE)
1438 if (strcmp(tmp->arch->name, "dragon_ability_force")==0) 1463 if (tmp->arch->archname == shstr_dragon_ability_force)
1439 abil = tmp; 1464 abil = tmp;
1440 if (strcmp(tmp->arch->name, "dragon_skin_force")==0) 1465 else if (tmp->arch->archname == shstr_dragon_skin_force)
1441 skin = tmp; 1466 skin = tmp;
1442 } 1467
1443 }
1444 /* if the force is missing -> bail out */ 1468 /* if the force is missing -> bail out */
1445 if (abil == NULL) return; 1469 if (abil == NULL)
1446 1470 return;
1471
1447 /* The ability_force keeps track of maximum level ever achieved. 1472 /* The ability_force keeps track of maximum level ever achieved.
1448 * New abilties can only be gained by surpassing this max level 1473 * New abilties can only be gained by surpassing this max level
1449 */ 1474 */
1450 if (who->level > abil->level) { 1475 if (who->level > abil->level)
1476 {
1451 /* increase our focused ability */ 1477 /* increase our focused ability */
1452 abil->resist[abil->stats.exp]++; 1478 abil->resist[abil->stats.exp]++;
1453
1454 1479
1480
1455 if (abil->resist[abil->stats.exp]>0 && abil->resist[abil->stats.exp]%5 == 0) { 1481 if (abil->resist[abil->stats.exp] > 0 && abil->resist[abil->stats.exp] % 5 == 0)
1482 {
1456 /* time to hand out a new ability-gift */ 1483 /* time to hand out a new ability-gift */
1457 dragon_ability_gain(who, (int)abil->stats.exp, 1484 dragon_ability_gain (who, (int) abil->stats.exp, (int) ((1 + abil->resist[abil->stats.exp]) / 5.));
1458 (int)((1+abil->resist[abil->stats.exp])/5.));
1459 } 1485 }
1460 1486
1461 if (abil->last_eat > 0 && atnr_is_dragon_enabled(abil->last_eat)) { 1487 if (abil->last_eat > 0 && atnr_is_dragon_enabled (abil->last_eat))
1488 {
1462 /* apply new ability focus */ 1489 /* apply new ability focus */
1463 sprintf(buf, "Your metabolism now focuses on %s!", 1490 sprintf (buf, "Your metabolism now focuses on %s!", change_resist_msg[abil->last_eat]);
1464 change_resist_msg[abil->last_eat]);
1465 new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, buf); 1491 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
1466 1492
1467 abil->stats.exp = abil->last_eat; 1493 abil->stats.exp = abil->last_eat;
1468 abil->last_eat = 0; 1494 abil->last_eat = 0;
1469 } 1495 }
1470 1496
1471 abil->level = who->level; 1497 abil->level = who->level;
1472 } 1498 }
1473 1499
1474 /* last but not least, set the new title for the dragon */ 1500 /* last but not least, set the new title for the dragon */
1475 set_dragon_name(who, abil, skin); 1501 set_dragon_name (who, abil, skin);
1476} 1502}
1477 1503
1478/* Handy function - given the skill name skill_name, we find the skill 1504/* Handy function - given the skill name skill_name, we find the skill
1479 * archetype/object, set appropriate values, and insert it into 1505 * archetype/object, set appropriate values, and insert it into
1480 * the object (op) that is passed. 1506 * the object (op) that is passed.
1481 * We return the skill - this makes it easier for calling functions that 1507 * We return the skill - this makes it easier for calling functions that
1482 * want to do something with it immediately. 1508 * want to do something with it immediately.
1483 */ 1509 */
1510object *
1484object *give_skill_by_name(object *op, const char *skill_name) 1511give_skill_by_name (object *op, const char *skill_name)
1485{ 1512{
1486 object *skill_obj; 1513 object *skill_obj;
1487 1514
1488 skill_obj = get_archetype_by_skill_name(skill_name, SKILL); 1515 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1489 if (!skill_obj) { 1516 if (!skill_obj)
1517 {
1490 LOG(llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1518 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1491 return NULL; 1519 return NULL;
1492 } 1520 }
1521
1493 /* clear the flag - exp goes into this bucket, but player 1522 /* clear the flag - exp goes into this bucket, but player
1494 * still doesn't know it. 1523 * still doesn't know it.
1495 */ 1524 */
1496 CLEAR_FLAG(skill_obj, FLAG_CAN_USE_SKILL); 1525 skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
1497 skill_obj->stats.exp = 0; 1526 skill_obj->stats.exp = 0;
1498 skill_obj->level = 1; 1527 skill_obj->level = 1;
1499 insert_ob_in_ob(skill_obj, op); 1528 op->insert (skill_obj);
1500 if (op->contr) { 1529
1501 op->contr->last_skill_ob[skill_obj->subtype] = skill_obj; 1530 if (player *pl = op->contr)
1502 op->contr->last_skill_exp[skill_obj->subtype] = -1; 1531 pl->link_skills ();
1503 } 1532
1504 return skill_obj; 1533 return skill_obj;
1505} 1534}
1506
1507 1535
1508/* player_lvl_adj() - for the new exp system. we are concerned with 1536/* player_lvl_adj() - for the new exp system. we are concerned with
1509 * whether the player gets more hp, sp and new levels. 1537 * whether the player gets more hp, sp and new levels.
1510 * Note this this function should only be called for players. Monstes 1538 * Note this this function should only be called for players. Monstes
1511 * don't really gain levels 1539 * don't really gain levels
1512 * who is the player, op is what we are checking to gain the level 1540 * who is the player, op is what we are checking to gain the level
1513 * (eg, skill) 1541 * (eg, skill)
1514 */ 1542 */
1543void
1515void player_lvl_adj(object *who, object *op) { 1544player_lvl_adj (object *who, object *op)
1545{
1516 char buf[MAX_BUF]; 1546 char buf[MAX_BUF];
1517 1547 bool changed = false;
1548
1518 if(!op) /* when rolling stats */ 1549 if (!op) /* when rolling stats */
1519 op = who; 1550 op = who;
1520 1551
1521 if(op->level < settings.max_level && op->stats.exp >= level_exp(op->level+1,who->expmul)) { 1552 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1553 {
1554 changed = true;
1555
1522 op->level++; 1556 op->level++;
1523 1557
1524 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl(who)) 1558 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1525 dragon_level_gain(who); 1559 dragon_level_gain (who);
1526 1560
1527 /* Only roll these if it is the player (who) that gained the level */ 1561 /* Only roll these if it is the player (who) that gained the level */
1528 if(op==who && (who->level < 11) && who->type==PLAYER) { 1562 if (op == who && (who->level < 11) && who->type == PLAYER)
1563 {
1529 who->contr->levhp[who->level] = die_roll(2, 4, who, PREFER_HIGH)+1; 1564 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1530 who->contr->levsp[who->level] = die_roll(2, 3, who, PREFER_HIGH); 1565 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1531 who->contr->levgrace[who->level]=die_roll(2, 2, who, PREFER_HIGH)-1; 1566 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1567 }
1568
1569 if (op->level > 1)
1532 } 1570 {
1533
1534 fix_player(who);
1535 if(op->level>1) {
1536 if (op->type!=PLAYER) 1571 if (op->type != PLAYER)
1572 {
1573 who->contr->play_sound (sound_find ("skill_up"));
1537 sprintf(buf,"You are now level %d in the %s skill.",op->level,&op->name); 1574 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1575 }
1538 else 1576 else
1577 {
1578 who->contr->play_sound (sound_find ("level_up"));
1539 sprintf(buf,"You are now level %d.",op->level); 1579 sprintf (buf, "You are now level %d.", op->level);
1540 if(who) new_draw_info(NDI_UNIQUE|NDI_RED, 0, who,buf);
1541 } 1580 }
1542 player_lvl_adj(who,op); /* To increase more levels */ 1581
1543 } else if (op->level>1 && op->stats.exp<level_exp(op->level,who->expmul)) { 1582 if (who)
1544 op->level--;
1545 fix_player(who);
1546 if(op->type!=PLAYER) {
1547 sprintf(buf,"You are now level %d in the %s skill.",op->level,&op->name);
1548 new_draw_info(NDI_UNIQUE|NDI_RED, 0, who,buf); 1583 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1584 }
1585 }
1586
1587 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1588 {
1589 changed = true;
1590
1591 op->level--;
1592
1593 if (op->type != PLAYER)
1549 } 1594 {
1550 player_lvl_adj(who,op); /* To decrease more levels */ 1595 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1596 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1597 }
1551 } 1598 }
1552 /* check if the spell data has changed */ 1599
1553 esrv_update_spells(who->contr); 1600 if (changed)
1601 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1554} 1602}
1555 1603
1556/* 1604/*
1557 * Returns how much experience is needed for a player to become 1605 * Returns how much experience is needed for a player to become
1558 * the given level. level should really never exceed max_level 1606 * the given level. level should really never exceed max_level
1559 */ 1607 */
1560 1608
1609sint64
1561sint64 level_exp(int level,double expmul) { 1610level_exp (int level, double expmul)
1562 if (level > settings.max_level) 1611{
1563 return (sint64) (expmul * levels[settings.max_level]); 1612 return expmul * level_to_min_exp (level);
1564 return (sint64) (expmul * levels[level]);
1565} 1613}
1566 1614
1567/* 1615/*
1568 * Ensure that the permanent experience requirements in an exp object are met. 1616 * Ensure that the permanent experience requirements in an exp object are met.
1569 * This really just checks 'op to make sure the perm_exp value is within 1617 * This really just checks 'op to make sure the perm_exp value is within
1570 * proper range. Note that the checking of what is passed through 1618 * proper range. Note that the checking of what is passed through
1571 * has been reduced. Since there is now a proper field for perm_exp, 1619 * has been reduced. Since there is now a proper field for perm_exp,
1572 * this can now work on a much larger set of objects. 1620 * this can now work on a much larger set of objects.
1573 */ 1621 */
1622void
1574void calc_perm_exp(object *op) 1623calc_perm_exp (object *op)
1575{ 1624{
1576 int p_exp_min; 1625 int p_exp_min;
1577 1626
1578 /* Ensure that our permanent experience minimum is met. 1627 /* Ensure that our permanent experience minimum is met.
1579 * permenent_exp_ratio is an integer percentage, we divide by 100 1628 * permenent_exp_ratio is an integer percentage, we divide by 100
1580 * to get the fraction */ 1629 * to get the fraction */
1581 p_exp_min = (int)(settings.permanent_exp_ratio * (float)(op->stats.exp)/100); 1630 p_exp_min = (int) (settings.permanent_exp_ratio * (float) (op->stats.exp) / 100);
1582 1631
1583 if (op->perm_exp < p_exp_min) 1632 if (op->perm_exp < p_exp_min)
1584 op->perm_exp = p_exp_min; 1633 op->perm_exp = p_exp_min;
1585 1634
1586 /* Cap permanent experience. */ 1635 /* Cap permanent experience. */
1587 if (op->perm_exp < 0) 1636 if (op->perm_exp < 0)
1588 op->perm_exp = 0; 1637 op->perm_exp = 0;
1589 else if (op->perm_exp > (sint64) MAX_EXPERIENCE) 1638 else if (op->perm_exp > (sint64) MAX_EXPERIENCE)
1590 op->perm_exp = MAX_EXPERIENCE; 1639 op->perm_exp = MAX_EXPERIENCE;
1591} 1640}
1592
1593 1641
1594/* Add experience to a player - exp should only be positive. 1642/* Add experience to a player - exp should only be positive.
1595 * Updates permanent exp for the skill we are adding to. 1643 * Updates permanent exp for the skill we are adding to.
1596 * skill_name is the skill to add exp to. Skill name can be 1644 * skill_name is the skill to add exp to. Skill name can be
1597 * NULL, in which case exp increases the players general 1645 * NULL, in which case exp increases the players general
1598 * total, but not any particular skill. 1646 * total, but not any particular skill.
1599 * flag is what to do if the player doesn't have the skill: 1647 * flag is what to do if the player doesn't have the skill:
1600 */ 1648 */
1601 1649static void
1602static void add_player_exp (object * op, sint64 exp, const char *skill_name, int flag) 1650add_player_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1603{ 1651{
1604 object *skill_obj = NULL; 1652 object *skill_obj;
1605 sint64 limit, exp_to_add; 1653 sint64 limit, exp_to_add;
1606 int i; 1654 int i;
1607 1655
1608 /* prevents some forms of abuse. */ 1656 /* prevents some forms of abuse. */
1609 if (op->contr->braced) 1657 if (op->contr->braced)
1610 exp = exp / 5; 1658 exp /= 5;
1611 1659
1612 /* Try to find the matching skill. 1660 /* Try to find the matching skill.
1613 * We do a shortcut/time saving mechanism first - see if it matches 1661 * We do a shortcut/time saving mechanism first - see if it matches
1614 * chosen_skill. This means we don't need to search through 1662 * chosen_skill. This means we don't need to search through
1615 * the players inventory. 1663 * the players inventory.
1616 */ 1664 */
1665 skill_obj = 0;
1666
1617 if (skill_name) 1667 if (skill_name)
1618 { 1668 {
1619 if (op->chosen_skill && op->chosen_skill->type == SKILL && 1669 skill_obj = op->contr->find_skill (skill_name);
1620 !strcmp (skill_name, op->chosen_skill->skill))
1621 skill_obj = op->chosen_skill;
1622 else
1623 {
1624 for (i = 0; i < NUM_SKILLS; i++)
1625 if (op->contr->last_skill_ob[i] &&
1626 !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1627 {
1628 skill_obj = op->contr->last_skill_ob[i];
1629 break;
1630 }
1631 1670
1632 /* Player doesn't have the skill. Check to see what to do, and give 1671 /* Player doesn't have the skill. Check to see what to do, and give
1633 * it to the player if necessary 1672 * it to the player if necessary
1634 */ 1673 */
1635 if (!skill_obj) 1674 if (!skill_obj)
1636 { 1675 {
1637 if (flag == SK_EXP_NONE) 1676 if (flag == SK_EXP_NONE)
1638 return; 1677 return;
1678
1639 else if (flag == SK_EXP_ADD_SKILL) 1679 if (flag == SK_EXP_ADD_SKILL)
1640 give_skill_by_name (op, skill_name); 1680 skill_obj = give_skill_by_name (op, skill_name);
1641 }
1642 } 1681 }
1643 } 1682 }
1644 1683
1645 if (flag != SK_EXP_SKILL_ONLY) 1684 if (flag != SK_EXP_SKILL_ONLY)
1646 { 1685 {
1647 /* Basically, you can never gain more experience in one shot 1686 /* Basically, you can never gain more experience in one shot
1648 * than half what you need to gain for next level. 1687 * than half what you need to gain for next level.
1649 */ 1688 */
1650 exp_to_add = exp; 1689 exp_to_add = exp;
1651 limit = (levels[op->level + 1] - levels[op->level]) / 2; 1690 limit = (levels [op->level + 1] - levels [op->level]) / 2;
1652 if (exp_to_add > limit) 1691 if (exp_to_add > limit)
1653 exp_to_add = limit; 1692 exp_to_add = limit;
1654 1693
1655 ADD_EXP (op->stats.exp, 1694 ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1)));
1656 (sint64) ((float) exp_to_add *
1657 (skill_obj ? skill_obj->expmul : 1)));
1658 if (settings.permanent_exp_ratio) 1695 if (settings.permanent_exp_ratio)
1659 { 1696 {
1660 ADD_EXP (op->perm_exp, 1697 ADD_EXP (op->perm_exp, (sint64) ((float) exp_to_add * PERM_EXP_GAIN_RATIO * (skill_obj ? skill_obj->expmul : 1)));
1661 (sint64) ((float) exp_to_add * PERM_EXP_GAIN_RATIO *
1662 (skill_obj ? skill_obj->expmul : 1)));
1663 calc_perm_exp (op); 1698 calc_perm_exp (op);
1664 } 1699 }
1665 1700
1666 player_lvl_adj (op, NULL); 1701 player_lvl_adj (op, NULL);
1667 } 1702 }
1668 1703
1669 if (skill_obj) 1704 if (skill_obj)
1670 { 1705 {
1671 exp_to_add = exp; 1706 exp_to_add = exp;
1672 limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2; 1707 limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
1673 if (exp_to_add > limit) 1708 if (exp_to_add > limit)
1674 exp_to_add = limit; 1709 exp_to_add = limit;
1675 1710
1676 ADD_EXP (skill_obj->stats.exp, exp_to_add); 1711 ADD_EXP (skill_obj->stats.exp, exp_to_add);
1677 if (settings.permanent_exp_ratio) 1712 if (settings.permanent_exp_ratio)
1678 { 1713 {
1679 skill_obj->perm_exp +=
1680 (sint64) ((float) exp_to_add * PERM_EXP_GAIN_RATIO); 1714 skill_obj->perm_exp += (sint64) ((float) exp_to_add * PERM_EXP_GAIN_RATIO);
1681 calc_perm_exp (skill_obj); 1715 calc_perm_exp (skill_obj);
1682 } 1716 }
1683 1717
1684 player_lvl_adj (op, skill_obj); 1718 player_lvl_adj (op, skill_obj);
1685 } 1719 }
1686} 1720}
1687 1721
1688/* This function checks to make sure that object 'op' can 1722/* This function checks to make sure that object 'op' can
1689 * lost 'exp' experience. It returns the amount of exp 1723 * lose 'exp' experience. It returns the amount of exp
1690 * object 'op' can in fact lose - it basically makes 1724 * object 'op' can in fact lose - it basically makes
1691 * adjustments based on permanent exp and the like. 1725 * adjustments based on permanent exp and the like.
1692 * This function should always be used for losing experience - 1726 * This function should always be used for losing experience -
1693 * the 'exp' value passed should be positive - this is the 1727 * the 'exp' value passed should be positive - this is the
1694 * amount that should get subtract from the player. 1728 * amount that should get subtract from the player.
1695 */ 1729 */
1730static sint64
1696sint64 check_exp_loss(const object *op, sint64 exp) 1731check_exp_loss (const object *op, sint64 exp)
1697{ 1732{
1698 sint64 del_exp; 1733 sint64 del_exp;
1699 1734
1700 if (exp > op->stats.exp) exp = op->stats.exp; 1735 if (exp > op->stats.exp)
1736 exp = op->stats.exp;
1737
1701 if (settings.permanent_exp_ratio) { 1738 if (settings.permanent_exp_ratio)
1739 {
1702 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1740 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1703 if (del_exp < 0) del_exp = 0; 1741
1742 if (del_exp < 0)
1743 del_exp = 0;
1744
1704 if (exp > del_exp) exp=del_exp; 1745 if (exp > del_exp)
1746 exp = del_exp;
1705 } 1747 }
1748
1706 return exp; 1749 return exp;
1707} 1750}
1708 1751
1752sint64
1709sint64 check_exp_adjust(const object *op, sint64 exp) 1753check_exp_adjust (const object *op, sint64 exp)
1710{ 1754{
1755 if (exp < 0)
1711 if (exp<0) return check_exp_loss(op, exp); 1756 return check_exp_loss (op, exp);
1757 else
1712 else return MIN(exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1758 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1713} 1759}
1714
1715 1760
1716/* Subtracts experience from player. 1761/* Subtracts experience from player.
1717 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1762 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1718 * only subtract from the matching skill. Otherwise, 1763 * only subtract from the matching skill. Otherwise,
1719 * this subtracts a portion from all 1764 * this subtracts a portion from all
… …
1723 * as much as listed. Eg, if player has gotten reduced to the point 1768 * as much as listed. Eg, if player has gotten reduced to the point
1724 * where everything is at the minimum perm exp, he would lose nothing. 1769 * where everything is at the minimum perm exp, he would lose nothing.
1725 * exp is the amount of exp to subtract - thus, it should be 1770 * exp is the amount of exp to subtract - thus, it should be
1726 * a postive number. 1771 * a postive number.
1727 */ 1772 */
1773static void
1728static void subtract_player_exp(object *op, sint64 exp, const char *skill, int flag) 1774subtract_player_exp (object *op, sint64 exp, shstr_tmp skill, int flag)
1729{ 1775{
1730 float fraction = (float) exp/(float) op->stats.exp; 1776 float fraction = (float) exp / (float) op->stats.exp;
1731 object *tmp; 1777 object *tmp;
1732 sint64 del_exp; 1778 sint64 del_exp;
1733 1779
1734 for(tmp=op->inv;tmp;tmp=tmp->below) 1780 for (tmp = op->inv; tmp; tmp = tmp->below)
1735 if(tmp->type==SKILL && tmp->stats.exp) { 1781 if (tmp->type == SKILL && tmp->stats.exp)
1782 {
1736 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp(tmp->skill, skill)) { 1783 if (flag == SK_SUBTRACT_SKILL_EXP && skill && tmp->skill == skill)
1784 {
1737 del_exp = check_exp_loss(tmp, exp); 1785 del_exp = check_exp_loss (tmp, exp);
1738 tmp->stats.exp -= del_exp; 1786 tmp->stats.exp -= del_exp;
1739 player_lvl_adj(op, tmp); 1787 player_lvl_adj (op, tmp);
1788 }
1740 } else if (flag != SK_SUBTRACT_SKILL_EXP) { 1789 else if (flag != SK_SUBTRACT_SKILL_EXP)
1790 {
1741 /* only want to process other skills if we are not trying 1791 /* only want to process other skills if we are not trying
1742 * to match a specific skill. 1792 * to match a specific skill.
1743 */ 1793 */
1744 del_exp = check_exp_loss(tmp, (sint64) (tmp->stats.exp * fraction)); 1794 del_exp = check_exp_loss (tmp, tmp->stats.exp * fraction);
1745 tmp->stats.exp -= del_exp; 1795 tmp->stats.exp -= del_exp;
1746 player_lvl_adj(op, tmp); 1796 player_lvl_adj (op, tmp);
1747 } 1797 }
1748 } 1798 }
1799
1749 if (flag != SK_SUBTRACT_SKILL_EXP) { 1800 if (flag != SK_SUBTRACT_SKILL_EXP)
1801 {
1750 del_exp = check_exp_loss(op, exp); 1802 del_exp = check_exp_loss (op, exp);
1751 op->stats.exp -= del_exp; 1803 op->stats.exp -= del_exp;
1752 player_lvl_adj(op,NULL); 1804 player_lvl_adj (op, NULL);
1753 } 1805 }
1754} 1806}
1755
1756
1757 1807
1758/* change_exp() - changes experience to a player/monster. This 1808/* change_exp() - changes experience to a player/monster. This
1759 * does bounds checking to make sure we don't overflow the max exp. 1809 * does bounds checking to make sure we don't overflow the max exp.
1760 * 1810 *
1761 * The exp passed is typically not modified much by this function - 1811 * The exp passed is typically not modified much by this function -
1762 * it is assumed the caller has modified the exp as needed. 1812 * it is assumed the caller has modified the exp as needed.
1763 * skill_name is the skill that should get the exp added. 1813 * skill_name is the skill that should get the exp added.
1764 * flag is what to do if player doesn't have the skill. 1814 * flag is what to do if player doesn't have the skill.
1765 * these last two values are only used for players. 1815 * these last two values are only used for players.
1766 */ 1816 */
1767 1817void
1768void change_exp(object *op, sint64 exp, const char *skill_name, int flag) { 1818change_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1769 1819{
1770#ifdef EXP_DEBUG 1820#ifdef EXP_DEBUG
1771#ifndef WIN32
1772 LOG(llevDebug,"change_exp() called for %s, exp = %lld\n",query_name(op),exp);
1773#else
1774 LOG(llevDebug,"change_exp() called for %s, exp = %I64d\n",query_name(op),exp); 1821 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1775#endif 1822#endif
1776#endif
1777 1823
1778 /* safety */ 1824 /* safety */
1779 if(!op) { 1825 if (!op)
1826 {
1780 LOG(llevError,"change_exp() called for null object!\n"); 1827 LOG (llevError, "change_exp() called for null object!\n");
1781 return; 1828 return;
1782 } 1829 }
1783 1830
1784 /* if no change in exp, just return - most of the below code 1831 /* if no change in exp, just return - most of the below code
1785 * won't do anything if the value is 0 anyways. 1832 * won't do anything if the value is 0 anyways.
1786 */ 1833 */
1787 if (exp == 0) return; 1834 if (exp == 0)
1835 return;
1788 1836
1789 /* Monsters are easy - we just adjust their exp - we 1837 /* Monsters are easy - we just adjust their exp - we
1790 * don't adjust level, since in most cases it is unrelated to 1838 * don't adjust level, since in most cases it is unrelated to
1791 * the exp they have - the monsters exp represents what its 1839 * the exp they have - the monsters exp represents what its
1792 * worth. 1840 * worth.
1793 */ 1841 */
1794 if(op->type != PLAYER) { 1842 if (op->type != PLAYER)
1843 {
1795 /* Sanity check */ 1844 /* Sanity check */
1796 if (!QUERY_FLAG(op, FLAG_ALIVE)) return; 1845 if (!op->flag [FLAG_ALIVE])
1846 return;
1797 1847
1798 /* reset exp to max allowed value. We subtract from 1848 /* reset exp to max allowed value. We subtract from
1799 * MAX_EXPERIENCE to prevent overflows. If the player somehow has 1849 * MAX_EXPERIENCE to prevent overflows. If the player somehow has
1800 * more than max exp, just return. 1850 * more than max exp, just return.
1851 */
1852 if (exp > 0 && (op->stats.exp > (sint64) (MAX_EXPERIENCE - exp)))
1853 {
1854 exp = MAX_EXPERIENCE - op->stats.exp;
1855 if (exp < 0)
1856 return;
1857 }
1858
1859 op->stats.exp += exp;
1860 }
1861 else
1862 { /* Players only */
1863 if (exp > 0)
1864 add_player_exp (op, exp, skill_name, flag);
1865 else
1866 /* note that when you lose exp, it doesn't go against
1867 * a particular skill, so we don't need to pass that
1868 * along.
1801 */ 1869 */
1802 if (exp > 0 && ( op->stats.exp > (sint64) (MAX_EXPERIENCE - exp))) {
1803 exp = MAX_EXPERIENCE - op->stats.exp;
1804 if (exp < 0) return;
1805 }
1806
1807 op->stats.exp += exp;
1808 }
1809 else { /* Players only */
1810 if(exp>0)
1811 add_player_exp(op, exp, skill_name, flag);
1812 else
1813 /* note that when you lose exp, it doesn't go against
1814 * a particular skill, so we don't need to pass that
1815 * along.
1816 */
1817 subtract_player_exp(op, FABS(exp), skill_name, flag); 1870 subtract_player_exp (op, abs (exp), skill_name, flag);
1818
1819 } 1871 }
1820} 1872}
1821 1873
1822/* Applies a death penalty experience, the size of this is defined by the 1874/* Applies a death penalty experience, the size of this is defined by the
1823 * settings death_penalty_percentage and death_penalty_levels, and by the 1875 * settings death_penalty_percentage and death_penalty_levels, and by the
1824 * amount of permenent experience, whichever gives the lowest loss. 1876 * amount of permenent experience, whichever gives the lowest loss.
1825 */ 1877 */
1826 1878void
1827void apply_death_exp_penalty(object *op) { 1879apply_death_exp_penalty (object *op)
1828 object *tmp; 1880{
1829 sint64 loss; 1881 sint64 loss;
1830 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1882 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1831 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1883 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1832 1884
1833 for(tmp=op->inv;tmp;tmp=tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1834 if(tmp->type==SKILL && tmp->stats.exp) { 1886 if (tmp->type == SKILL && tmp->stats.exp)
1835 1887 {
1836 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio/100; 1888 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1837 level_loss = tmp->stats.exp - levels[MAX(0,tmp->level - settings.death_penalty_level)]; 1889 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1838 1890
1839 /* With the revised exp system, you can get cases where 1891 /* With the revised exp system, you can get cases where
1840 * losing several levels would still require that you have more 1892 * losing several levels would still require that you have more
1841 * exp than you currently have - this is true if the levels 1893 * exp than you currently have - this is true if the levels
1842 * tables is a lot harder. 1894 * tables is a lot harder.
1843 */ 1895 */
1844 if (level_loss < 0) level_loss = 0; 1896 if (level_loss < 0)
1897 level_loss = 0;
1845 1898
1846 loss = check_exp_loss(tmp, MIN(level_loss, percentage_loss)); 1899 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1847 1900
1848 tmp->stats.exp -= loss; 1901 tmp->stats.exp -= loss;
1849 player_lvl_adj(op,tmp); 1902 player_lvl_adj (op, tmp);
1850 } 1903 }
1851 1904
1852 percentage_loss = op->stats.exp * settings.death_penalty_ratio/100; 1905 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1853 level_loss = op->stats.exp - levels[MAX(0,op->level - settings.death_penalty_level)]; 1906 level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
1854 if (level_loss < 0) level_loss = 0; 1907
1908 if (level_loss < 0)
1909 level_loss = 0;
1910
1855 loss = check_exp_loss(op, MIN(level_loss, percentage_loss)); 1911 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1856 1912
1857 op->stats.exp -= loss; 1913 op->stats.exp -= loss;
1858 player_lvl_adj(op,NULL); 1914 player_lvl_adj (op, NULL);
1859} 1915}
1860 1916
1861/* This function takes an object (monster/player, op), and 1917/* This function takes an object (monster/player, op), and
1862 * determines if it makes a basic save throw by looking at the 1918 * determines if it makes a basic save throw by looking at the
1863 * save_throw table. level is the effective level to make 1919 * save_throw table. level is the effective level to make
1864 * the save at, and bonus is any plus/bonus (typically based on 1920 * the save at, and bonus is any plus/bonus (typically based on
1865 * resistance to particular attacktype. 1921 * resistance to particular attacktype.
1866 * Returns 1 if op makes his save, 0 if he failed 1922 * Returns 1 if op makes his save, 0 if he failed
1867 */ 1923 */
1924int
1868int did_make_save(const object *op, int level, int bonus) 1925did_make_save (const object *op, int level, int bonus)
1869{ 1926{
1870 if (level > MAX_SAVE_LEVEL) level = MAX_SAVE_LEVEL; 1927 if (level > MAX_SAVE_LEVEL)
1928 level = MAX_SAVE_LEVEL;
1871 1929
1872 if ((random_roll(1, 20, op, PREFER_HIGH) + bonus) < savethrow[level]) 1930 if ((random_roll (1, 20, op, PREFER_HIGH) + bonus) < savethrow[level])
1873 return 0;
1874 return 1; 1931 return 0;
1932
1933 return 1;
1875} 1934}
1876

Diff Legend

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