[ScryMUD] SVN Commit Info r695 - trunk/mud/grrmud/server
scrymud at wanfear.com
scrymud at wanfear.com
Sun Jul 25 11:37:49 PDT 2004
Author: eroper
Date: 2004-07-25 11:37:49 -0700 (Sun, 25 Jul 2004)
New Revision: 695
Modified:
trunk/mud/grrmud/server/const.h
trunk/mud/grrmud/server/critter.cc
trunk/mud/grrmud/server/critter.h
trunk/mud/grrmud/server/login.cc
Log:
Selectively rolled back changes between r656:657. This removes that extra
pfile line (and all associated code) for short_base_stats. This was initially
going to be base unaltered stats for pcs to aid in preventing
bug-related-godhood. I've since decided that the double-bookkeeping is more
difficult and thus more prone to error than just taking care of the primary
stats correctly.
Note: I left the "wanted_in" changes that had occured between these revisions
as I deem that to still be useful. =)
Modified: trunk/mud/grrmud/server/const.h
===================================================================
--- trunk/mud/grrmud/server/const.h 2004-07-25 18:21:18 UTC (rev 694)
+++ trunk/mud/grrmud/server/const.h 2004-07-25 18:37:49 UTC (rev 695)
@@ -1348,7 +1348,6 @@
#define OBJ_CUR_STATS 4
#define MOB_LONG_DATA 3
#define MOB_SHORT_CUR_STATS 43
-#define PC_BASE_STATS 24
#define MOB_CUR_STATS 3
#define ROOM_CUR_STATS 4
@@ -1673,30 +1672,6 @@
#define MV_REGEN short_cur_stats[39]
#define GUILD short_cur_stats[40]
-#define BASE_STR pc->short_base_stats[0]
-#define BASE_INT pc->short_base_stats[1]
-#define BASE_CON pc->short_base_stats[2]
-#define BASE_CHA pc->short_base_stats[3]
-#define BASE_WIS pc->short_base_stats[4]
-#define BASE_DEX pc->short_base_stats[5]
-#define BASE_HIT pc->short_base_stats[6]
-#define BASE_DAM pc->short_base_stats[7]
-#define BASE_AC pc->short_base_stats[8]
-#define BASE_ATTACKS pc->short_base_stats[9]
-#define BASE_HP_MAX pc->short_base_stats[10]
-#define BASE_MA_MAX pc->short_base_stats[11]
-#define BASE_MV_MAX pc->short_base_stats[12]
-#define BASE_DAM_REC_MOD pc->short_base_stats[13]
-#define BASE_DAM_GIV_MOD pc->short_base_stats[14]
-#define BASE_HEAT_RESIS pc->short_base_stats[15]
-#define BASE_COLD_RESIS pc->short_base_stats[16]
-#define BASE_ELEC_RESIS pc->short_base_stats[17]
-#define BASE_SPEL_RESIS pc->short_base_stats[18]
-#define BASE_BHDC pc->short_base_stats[19]
-#define BASE_BHDS pc->short_base_stats[20]
-#define BASE_HP_REGEN pc->short_base_stats[21]
-#define BASE_MA_REGEN pc->short_base_stats[22]
-#define BASE_MV_REGEN pc->short_base_stats[23]
// SPEC_PROCS
Modified: trunk/mud/grrmud/server/critter.cc
===================================================================
--- trunk/mud/grrmud/server/critter.cc 2004-07-25 18:21:18 UTC (rev 694)
+++ trunk/mud/grrmud/server/critter.cc 2004-07-25 18:37:49 UTC (rev 695)
@@ -1362,7 +1362,6 @@
}//destructor
void pc_data::Clear() {
- int i;
if (post_msg) {
delete post_msg;
@@ -1430,13 +1429,8 @@
bug_num = 0;
bug_comment.Clear();
- // Base stats
- for (i = 0; i<PC_BASE_STATS; i++) {
- short_base_stats[i] = 0;
- }
-
// Clear wanted_in[] data
- for ( i = 0; i<NUMBER_OF_ZONES+1; i++ ) {
+ for (int i = 0; i<NUMBER_OF_ZONES+1; i++ ) {
wanted_in[i] = 0;
}
@@ -1582,13 +1576,6 @@
ofile << (int)(preferred_language) << " -1 preferred_language\n";
}
- for (i = 0; i<PC_BASE_STATS; i++) {
- if ((i + 1) % 20 == 0)
- ofile << endl;
- ofile << short_base_stats[i] << " ";
- }//for
- ofile << "\tshrt_base_stats\n";
-
// store wanted_in[] information
ii = 0;
for (i = 0; i < NUMBER_OF_ZONES+1; i++) {
@@ -1727,12 +1714,6 @@
ofile.getline(tmp, 80);
}
- // Read in base stats, used to prevent nerfing, etc.
- for (i = 0; i<PC_BASE_STATS; i++) {
- ofile >> short_base_stats[i];
- }
- ofile.getline(tmp, 80);
-
// Read in wanted_in information
ofile >> i;
while (i != -1) {
Modified: trunk/mud/grrmud/server/critter.h
===================================================================
--- trunk/mud/grrmud/server/critter.h 2004-07-25 18:21:18 UTC (rev 694)
+++ trunk/mud/grrmud/server/critter.h 2004-07-25 18:37:49 UTC (rev 695)
@@ -567,15 +567,6 @@
// 30 is_remort, 31 has_sacrificed, 32 is_roleplaying,
// 33 is_afk, 34 gold_only
- // The following is used for fixing nerf screwups on remorting, etc.
- short short_base_stats[PC_BASE_STATS + 1];
- // 0 str, 1 int, 2 con, 3 cha, 4 wis, 5 dex, 6 hit, 7 dam,
- // 8 ac, 9 attacks, 10 hp_max, 11 mana_max, 12 mov_max,
- // 13 dam_received_divisor, 14 dam_given_multiplier,
- // 15 heat_resis, 16 cold_resis, 17 elect_resis, 18 spell_resis,
- // 19 bare_hand_dice_count, 20 bare_hand_dice_sides, 21 hp_regen,
- // 22 mana_regen, 23 mov_regen
-
// Is our PC wanted in any zones?
int wanted_in[NUMBER_OF_ZONES +1];
Modified: trunk/mud/grrmud/server/login.cc
===================================================================
--- trunk/mud/grrmud/server/login.cc 2004-07-25 18:21:18 UTC (rev 694)
+++ trunk/mud/grrmud/server/login.cc 2004-07-25 18:37:49 UTC (rev 695)
@@ -872,32 +872,6 @@
show("\r\nIf your screen is 'stair-stepped', type: toggle carriage\n",
pc);
- // set the base stats info
- pc.BASE_STR = pc.STR;
- pc.BASE_INT = pc.INT;
- pc.BASE_CON = pc.CON;
- pc.BASE_CHA = pc.CHA;
- pc.BASE_WIS = pc.WIS;
- pc.BASE_DEX = pc.DEX;
- pc.BASE_HIT = pc.HIT;
- pc.BASE_DAM = pc.DAM;
- pc.BASE_AC = pc.AC;
- pc.BASE_ATTACKS = pc.ATTACKS;
- pc.BASE_HP_MAX = pc.HP_MAX;
- pc.BASE_MA_MAX = pc.MA_MAX;
- pc.BASE_MV_MAX = pc.MV_MAX;
- pc.BASE_DAM_REC_MOD = pc.DAM_REC_MOD;
- pc.BASE_DAM_GIV_MOD = pc.DAM_GIV_MOD;
- pc.BASE_HEAT_RESIS = pc.HEAT_RESIS;
- pc.BASE_COLD_RESIS = pc.COLD_RESIS;
- pc.BASE_ELEC_RESIS = pc.ELEC_RESIS;
- pc.BASE_SPEL_RESIS = pc.SPEL_RESIS;
- pc.BASE_BHDC = pc.short_cur_stats[35];
- pc.BASE_BHDS = pc.short_cur_stats[36];
- pc.BASE_HP_REGEN = pc.HP_REGEN;
- pc.BASE_MA_REGEN = pc.MA_REGEN;
- pc.BASE_MV_REGEN = pc.MV_REGEN;
-
pc.save(); //make sure they have a Pfile
return 0;
More information about the ScryMUD
mailing list