[ScryMUD] SVN Commit Info r872 - trunk/mud/grrmud/server
scrymud at wanfear.com
scrymud at wanfear.com
Sun Feb 11 20:06:14 PST 2007
Author: eroper
Date: 2007-02-11 20:06:13 -0800 (Sun, 11 Feb 2007)
New Revision: 872
Modified:
trunk/mud/grrmud/server/command3.cc
trunk/mud/grrmud/server/command5.cc
trunk/mud/grrmud/server/commands.cc
trunk/mud/grrmud/server/dam_skll.cc
trunk/mud/grrmud/server/dam_spll.cc
trunk/mud/grrmud/server/ez_skll.cc
trunk/mud/grrmud/server/ez_spll.cc
trunk/mud/grrmud/server/misc.cc
trunk/mud/grrmud/server/misc2.cc
trunk/mud/grrmud/server/pet_spll.cc
trunk/mud/grrmud/server/rm_spll.cc
trunk/mud/grrmud/server/skills.cc
trunk/mud/grrmud/server/spells.cc
trunk/mud/grrmud/server/spells2.cc
trunk/mud/grrmud/server/trv_spll.cc
trunk/mud/grrmud/server/wep_skll.cc
Log:
In a world without battle-stun.... Part 1
Modified: trunk/mud/grrmud/server/command3.cc
===================================================================
--- trunk/mud/grrmud/server/command3.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/command3.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -1586,7 +1586,7 @@
Sprintf(buf, "prevents %S from fleeing!!\n",
name_of_crit(pc, ~0));
emote(buf, *crit_ptr, ROOM, TRUE, &pc);
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
return -1;
}//if
}//if
@@ -1604,7 +1604,7 @@
}//while
if (!have_exit) {
show("Death may be your only exit!\n", pc);
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
return -1;
}//if
@@ -1651,13 +1651,13 @@
if (is_dead)
return 0;
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
pc.MOV -= 25;
return 0;
}//if
else { //didn't even beat the odds...
show("You can't elude your foe.\n", pc);
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//else
}//if in battle
else {
@@ -1700,7 +1700,7 @@
if (is_dead)
return 0;
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
pc.MOV -= 25;
return 0;
}//else
@@ -2246,7 +2246,7 @@
if (ptr->pc && ptr->pc->imm_data) { //if vict is an IMM
if (ptr->IMM_LEVEL >= pc.IMM_LEVEL) {
show("You cannot enslave one so powerful, fool!!\n", pc);
- pc.PAUSE += 10;
+ pc.PAUSE = 1;
return -1;
}//if
}//if
Modified: trunk/mud/grrmud/server/command5.cc
===================================================================
--- trunk/mud/grrmud/server/command5.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/command5.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -980,7 +980,7 @@
Sprintf(buf2, "%S beeps you.\n", name_of_crit(pc, ptr->SEE_BIT));
ptr->show(buf2);
- pc.PAUSE += 1; //slow down spammers....
+ pc.PAUSE = 1; //slow down spammers....
show("Done...\n", pc);
return 0;
Modified: trunk/mud/grrmud/server/commands.cc
===================================================================
--- trunk/mud/grrmud/server/commands.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/commands.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -2766,7 +2766,7 @@
}//if
else {
pc.show(CS_MED_NO_CONCENTRATE);
- pc.PAUSE += 2;
+ pc.PAUSE = 1;
}//else
}//if
else {
Modified: trunk/mud/grrmud/server/dam_skll.cc
===================================================================
--- trunk/mud/grrmud/server/dam_skll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/dam_skll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -124,8 +124,8 @@
vict.notifyHasBeenHurled();
vict.doRemoveFromBattle();
- vict.PAUSE += d(1,4) + 2;
- pc.PAUSE += d(1,3);
+ vict.PAUSE = 1;
+ pc.PAUSE = 1;
if ((dptr = door::findDoor(ROOM.DOORS, 1,
door_list[d(1,10)].names.peekFront(),
@@ -286,9 +286,9 @@
if (skill_did_hit(pc, BODYSLAM_SKILL_NUM, vict)) {
- pc.PAUSE += d(1,3); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
exact_raw_damage(d(5, pc.STR) + pc.LEVEL, NORMAL, vict, pc);
- vict.PAUSE += (d(1,3) + 1);
+ vict.PAUSE = 1;
Sprintf(buf, "lifts %S over %s head!!\n",
name_of_crit(vict, ~0), get_his_her(pc));
@@ -341,7 +341,7 @@
name_of_crit(vict, ~0), get_his_her(pc));
emote(buf, pc, ROOM, TRUE, &vict);
- pc.PAUSE += d(1,3); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
}//else
if (do_fatality) {
Modified: trunk/mud/grrmud/server/dam_spll.cc
===================================================================
--- trunk/mud/grrmud/server/dam_spll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/dam_spll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -207,7 +207,7 @@
pemote(buf, agg, room_list[agg.getCurRoomNum()], TRUE, &victim);
// Kinda stops you in yer tracks, don't it?
- victim.PAUSE+=d(1,3);
+ victim.PAUSE = 1;
} // if nasty gaping wound time
}
} // agg not victim
@@ -768,7 +768,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (!do_fatality && do_join_in_battle &&
!agg.IS_FIGHTING.haveData(&vict)) {
@@ -923,7 +923,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (!do_fatality && do_join_in_battle &&
!agg.IS_FIGHTING.haveData(&vict)) {
@@ -1078,7 +1078,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (!do_fatality && do_join_in_battle &&
!agg.IS_FIGHTING.haveData(&vict)) {
@@ -1236,7 +1236,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (!do_fatality && do_join_in_battle &&
!agg.IS_FIGHTING.haveData(&vict)) {
@@ -1390,7 +1390,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (do_join_in_battle && !agg.IS_FIGHTING.haveData(&vict)) {
join_in_battle(agg, vict);
@@ -1544,7 +1544,7 @@
else {
mudlog.log(ERROR, "ERROR: in default of a spell.\n");
}//else
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (do_join_in_battle && !agg.IS_FIGHTING.haveData(&vict)) {
join_in_battle(agg, vict);
Modified: trunk/mud/grrmud/server/ez_skll.cc
===================================================================
--- trunk/mud/grrmud/server/ez_skll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/ez_skll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -372,7 +372,7 @@
show("You strain your eyes and fingers, but accomplish nothing.\n",
pc);
emote("fiddles with the lock in vain.", pc, ROOM, TRUE);
- pc.PAUSE += 3;
+ pc.PAUSE = 1;
}//else
return -1;
}//do_picklock
@@ -400,7 +400,7 @@
show("You strain your eyes and fingers, but accomplish nothing.\n",
pc);
emote("fiddles with the lock in vain.", pc, ROOM, TRUE);
- pc.PAUSE += 3;
+ pc.PAUSE = 1;
}//else
return -1;
}//do_picklock, for objects
Modified: trunk/mud/grrmud/server/ez_spll.cc
===================================================================
--- trunk/mud/grrmud/server/ez_spll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/ez_spll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -140,7 +140,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
}
void cast_detect_alignment(int i_th, const String* victim,
@@ -214,7 +214,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
}//do_cast_detect_alignment
@@ -280,7 +280,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
}//do_cast_detect_poison
@@ -363,7 +363,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -457,7 +457,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -551,7 +551,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -645,7 +645,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -748,7 +748,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -853,7 +853,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -948,7 +948,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (vict.pc) {
@@ -1052,7 +1052,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
clear_obj_list(vict.inv);
@@ -1135,7 +1135,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
/* first do dice incrementation */
@@ -1254,7 +1254,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
stat_spell_cell* ac_ptr = has_stat_affect(9, vict);
@@ -1345,7 +1345,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if ((sp = is_affected_by(FROST_BLADE_SKILL_NUM, vict))) {
@@ -1432,7 +1432,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if ((sp = is_affected_by(FIRE_BLADE_SKILL_NUM, vict))) {
@@ -1524,7 +1524,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -1634,7 +1634,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -1692,7 +1692,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
if (sp)
@@ -1752,7 +1752,7 @@
pc.MANA -= spell_mana / 2;
}//else
- pc.PAUSE++;
+ pc.PAUSE = 1;
}//do_cast_mirror_image
@@ -1827,7 +1827,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
vict.HP += (short)(((float)(10 + d(1,15)) / spell_objs_ratio(spell_num)));
@@ -1908,7 +1908,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
vict.HP += (20 + d(1, lvl));
@@ -1988,7 +1988,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
vict.HP += (d(4, lvl) + 150);
@@ -2072,7 +2072,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
vict.HP += (d(7, 100) + 2 * lvl);
@@ -2220,7 +2220,7 @@
agg.MANA -= spell_mana / 2;
}//else
- agg.PAUSE++;
+ agg.PAUSE = 1;
if (do_effects) {
stat_spell_cell* sp;
@@ -2300,7 +2300,7 @@
buf.Cap();
show(buf, vict);
}//else
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//else, missed with canned magic
else { //lost concentration
show(LOST_CONCENTRATION_MSG_SELF, agg);
@@ -2311,7 +2311,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else
if (do_effects) {
@@ -2496,7 +2496,7 @@
emote("brings peace to all.\n", agg, room_list[agg.getCurRoomNum()],
TRUE);
agg.MANA -= spell_mana;
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if ! lost concentration
else { //lost concentration
show(LOST_CONCENTRATION_MSG_SELF, agg);
@@ -2505,7 +2505,7 @@
*(agg.getCurRoom()), FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else
}//else !canned
Modified: trunk/mud/grrmud/server/misc.cc
===================================================================
--- trunk/mud/grrmud/server/misc.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/misc.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -312,7 +312,7 @@
}//if we found a PC responsible
}//if
- agg.PAUSE += 1; //vict should get at least one hit in
+ agg.PAUSE = 1; //vict should get at least one hit in
}//join_in_battle
Modified: trunk/mud/grrmud/server/misc2.cc
===================================================================
--- trunk/mud/grrmud/server/misc2.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/misc2.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -1347,7 +1347,7 @@
if (do_msg) {
show("You lose your footing and almost fall!!\n", pc);
emote("slips and almost falls!!\n", pc, ROOM, TRUE);
- pc.PAUSE++; //punish them a bit
+ pc.PAUSE = 1; //punish them a bit
}//if
}//if
else if ((rm.needsFly()) && //need fly
Modified: trunk/mud/grrmud/server/pet_spll.cc
===================================================================
--- trunk/mud/grrmud/server/pet_spll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/pet_spll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -255,7 +255,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_create_golem
@@ -377,7 +377,7 @@
name_of_crit(pc, vict.SEE_BIT), get_his_her(pc));
show(buf, vict);
}//else if didn't hit
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_charm
@@ -498,7 +498,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_raise_undead
@@ -586,7 +586,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_create_golem
@@ -640,7 +640,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_create_light
@@ -693,7 +693,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_create_food
@@ -764,7 +764,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_heros_feast
@@ -848,7 +848,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_illusion
@@ -941,7 +941,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_conjure_minion
@@ -1051,5 +1051,5 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_summon_horde
Modified: trunk/mud/grrmud/server/rm_spll.cc
===================================================================
--- trunk/mud/grrmud/server/rm_spll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/rm_spll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -113,7 +113,7 @@
agg.MANA -= spell_mana / 2;
}//else !canned
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (do_effects) {
do_door_to(room_list[agg.getCurRoomNum()], rm, 0, agg, &NULL_STRING,
@@ -178,7 +178,7 @@
if (!is_canned)
lvl = agg.LEVEL;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (is_canned || !lost_concentration(agg, spell_num)) {
if (!is_canned)
@@ -250,7 +250,7 @@
if (!is_canned)
lvl = agg.LEVEL;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (is_canned) {
do_effects = TRUE;
@@ -328,7 +328,7 @@
if (!is_canned)
lvl = agg.LEVEL;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (is_canned) {
if (rm.isSmallWater() || rm.isBigWater()) { //if water
@@ -444,7 +444,7 @@
} // else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
} // do_cast_necrophilia()
void cast_necrophilia(critter &agg)
Modified: trunk/mud/grrmud/server/skills.cc
===================================================================
--- trunk/mud/grrmud/server/skills.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/skills.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -197,15 +197,15 @@
emote(buf,vict, ROOM, TRUE, &pc);
- pc.PAUSE+=1;
+ pc.PAUSE = 1;
return 0;
}
if (skill_did_hit(pc, TRIP_SKILL_NUM, vict)) {
- pc.PAUSE += 2; //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
exact_raw_damage(d(4, 5), NORMAL, vict, pc);
- vict.PAUSE += d(1,3);
+ vict.PAUSE = 1;
vict.setPosn(POS_SIT);
@@ -237,7 +237,7 @@
name_of_crit(vict, pc.SEE_BIT), get_him_her(vict));
show(buf, pc);
- pc.PAUSE += 2; //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
}//else
if (do_fatality) {
agg_kills_vict(&pc, vict);
@@ -298,7 +298,7 @@
return -1;
}
/* it worked */
- pc.PAUSE += 1; //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
if (obj) {
vict.loseInv(obj);
pc.gainInv(obj);
@@ -420,10 +420,10 @@
if (skill_did_hit(pc, KICK_SKILL_NUM, vict)) {
- pc.PAUSE += d(1,2); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
float d1 = (((float)(pc.STR)) * (float)(pc.getLevel()) + 5.0) / 60.0;
exact_raw_damage(d((int)d1, 5), NORMAL, vict, pc);
- vict.PAUSE += d(1,3);
+ vict.PAUSE = 1;
if (vict.HP < 0) {
Sprintf(buf, "kicks in %S's temple with %s foot!!\n",
@@ -466,7 +466,7 @@
name_of_crit(vict, pc.SEE_BIT));
show(buf, pc);
- pc.PAUSE += 2; //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
}//else
if (do_fatality) {
agg_kills_vict(&pc, vict);
@@ -567,7 +567,7 @@
emote(buf, pc, ROOM, TRUE);
}//else
- pc.PAUSE += d(2,2); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
return 0;
}//do_bash()//door
@@ -593,8 +593,8 @@
exact_raw_damage( (d(pc.STR/2, 5) + pc.DEX/2)+(wd*2) + (int)(pc.LEVEL/5),
NORMAL, vict, pc);
- pc.PAUSE += 1;
- vict.PAUSE += d(1,2);
+ pc.PAUSE = 1;
+ vict.PAUSE = 1;
if (vict.HP < 0) {
Sprintf(buf, "crushes the skull of %S with %s fist!!\n",
@@ -637,7 +637,7 @@
name_of_crit(vict, pc.SEE_BIT));
show(buf, pc);
- pc.PAUSE += d(2,2); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
return -1;
}//else
if (do_fatality) {
@@ -694,7 +694,7 @@
}//if
if (skill_did_hit(pc, BLOCK_SKILL_NUM, vict)) {
- pc.PAUSE += d(1,3); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
vict.CRIT_FLAGS.turn_on(21); //now is blocked
Sprintf(buf, "You block %S.\n", name_of_crit(vict, pc.SEE_BIT));
@@ -751,7 +751,7 @@
return 0;
}//else
else {
- pc.PAUSE += d(1, 2); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
show(
"You can't find a suitable spot, maybe if you tried a little harder.\n",
pc);
@@ -822,7 +822,7 @@
join_in_battle(pc, vict);
}//if
- pc.PAUSE += d(1,3); //increment pause_count
+ pc.PAUSE = 1; //increment pause_count
if (skill_did_hit(pc, CLAW_SKILL_NUM, vict)) {
@@ -1133,7 +1133,7 @@
}//if
}//do_lose_contents
- pc.PAUSE += 2;
+ pc.PAUSE = 1;
return 0;
}//construct()
@@ -1353,7 +1353,7 @@
}//if
}// do_lose_contents
- pc.PAUSE += 2;
+ pc.PAUSE = 1;
return 0;
}//concoct()
@@ -1449,7 +1449,7 @@
&(obj_list[scroll_num].short_desc));
show(buf, pc);
pc.MANA -= get_mana_cost(spell_num, pc);
- pc.PAUSE += 4;
+ pc.PAUSE = 1;
}//if
else { //scroll object not created yet
Sprintf(buf, "ERROR: need to create scroll for spell: %i.\n",
@@ -1472,7 +1472,7 @@
if (pc.EQ[10]->isModified())
delete pc.EQ[10];
pc.EQ[10] = NULL; //no more parchment
- pc.PAUSE += 4;
+ pc.PAUSE = 1;
pc.MANA -= (get_mana_cost(spell_num, pc) / 2);
}//else
return 0;
Modified: trunk/mud/grrmud/server/spells.cc
===================================================================
--- trunk/mud/grrmud/server/spells.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/spells.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -105,7 +105,7 @@
return FALSE;
}
agg->MANA -= spell_mana;
- agg->PAUSE += pause;
+ agg->PAUSE = 1;
clvl = agg->LEVEL;
return TRUE;
@@ -141,7 +141,7 @@
return FALSE;
}
pc.MANA -= spell_mana;
- pc.PAUSE += pause;
+ pc.PAUSE = 1;
// lvl = agg.level;
clvl = pc.LEVEL;
return doCastEffects();
@@ -182,7 +182,7 @@
agg->show(LOST_CONCENTRATION_MSG_SELF);
agg->emote(msg_lost_con);
agg->MANA -= spell_mana / 2;
- agg->PAUSE += pause;
+ agg->PAUSE = 1;
}
void Spell::doFailureCanned(){
@@ -646,7 +646,7 @@
if (did_spell_hit(agg, FIRE, vict, lvl, TRUE)) {
vict.HP -= d(4, 20) +
lvl - (int)((100.0 / (vict.HEAT_RESIS + 100)) * 20);
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
if (&vict == &agg) {
if (vict.HP < 0) {
show("You burn the flesh from your bones!\n", agg);
@@ -695,7 +695,7 @@
}//else
}//if did_hit
else { //missed
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
if (&agg == &vict) {
show("You miss yourself with your sulpherous inferno.\n", agg);
Sprintf(buf, "misses %s with %s fireball.\n",
@@ -788,7 +788,7 @@
}//else no fatality
}//missed
agg.MANA -= spell_mana;
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if !lost concentration
else { //lost concentration
show(LOST_CONCENTRATION_MSG_SELF, agg);
@@ -797,7 +797,7 @@
room_list[agg.getCurRoomNum()], TRUE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -962,7 +962,7 @@
vict.getCurRoomNum(), 1); //vict is always a PC
}//if do_affects
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
// RJY [Trice] attempt to slap on ending tags
if( vict.isPc() && vict.isInBattle() ) {
@@ -1058,7 +1058,7 @@
room_list[vict.getCurRoomNum()], TRUE);
}
}//if do_affects
- vict.PAUSE += 1; // increment pause_count
+ vict.PAUSE = 1; // increment pause_count
}//do_cast_passdoor
void cast_tammuz(int i_th, const String* victim, critter& pc) {
@@ -1133,7 +1133,7 @@
}//if
}//if do_affects
- vict.PAUSE += 1; // increment pause_count
+ vict.PAUSE = 1; // increment pause_count
}//do_cast_tammuz
void cast_recall(int i_th, const String* victim, critter& pc) {
@@ -1213,7 +1213,7 @@
}//if
}//if do_affects
- vict.PAUSE += 1; // increment pause_count
+ vict.PAUSE = 1; // increment pause_count
}//do_cast_recall
@@ -1356,7 +1356,7 @@
vict.doRemoveFromBattle();
}//if do_affects
- vict.PAUSE += 1; // increment pause_count
+ vict.PAUSE = 1; // increment pause_count
// RJY [Trice] attempt to slap in ending battle TAGS
if( vict.isInBattle() ) {
if (vict.isUsingClient()) {
@@ -1446,7 +1446,7 @@
buf.Cap();
show(buf, vict);
}//else
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//else, missed with canned magic
}//if canned
else {//not canned
@@ -1479,7 +1479,7 @@
}//missed
agg.MANA -= spell_mana;
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if ! lost concentration
else { //lost concentration
show(LOST_CONCENTRATION_MSG_SELF, agg);
@@ -1487,7 +1487,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg, *(agg.getCurRoom()), TRUE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else
}//else !canned
@@ -1540,7 +1540,7 @@
if (!is_canned)
lvl = agg.LEVEL;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (is_canned) {
do_effects = TRUE;
Modified: trunk/mud/grrmud/server/spells2.cc
===================================================================
--- trunk/mud/grrmud/server/spells2.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/spells2.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -106,7 +106,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 2;
+ agg.PAUSE = 1;
}//do_cast_locate
@@ -170,7 +170,7 @@
if (!is_canned)
pc.MANA -= spell_mana / 2;
}//else lost concentration
- pc.PAUSE += 1;
+ pc.PAUSE = 1;
}//do_cast_wizard_eye
@@ -244,7 +244,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 2;
+ agg.PAUSE = 1;
}//do_cast_recharge
@@ -317,7 +317,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_identify
@@ -398,7 +398,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_bind_wound
@@ -483,7 +483,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_shadows_blessing
@@ -568,7 +568,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_cure_blind
@@ -651,7 +651,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_remove_poison
@@ -766,7 +766,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
if (do_join_in_battle && !agg.IS_FIGHTING.haveData(&vict))
join_in_battle(agg, vict);
@@ -866,7 +866,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_sleep
@@ -966,7 +966,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_strength
@@ -1048,7 +1048,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_remove_curse (mob)
@@ -1092,7 +1092,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_remove_curse (obj)
@@ -1254,7 +1254,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_curse (mob)
@@ -1299,7 +1299,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_curse (obj)
void do_cast_blindness(critter& vict, critter& agg, int is_canned, int lvl) {
@@ -1367,7 +1367,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_blindness
@@ -1482,7 +1482,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//do_cast_weaken
@@ -1560,7 +1560,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_fly
@@ -1655,7 +1655,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_haste
@@ -1755,7 +1755,7 @@
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_dispel_magic
@@ -1817,7 +1817,7 @@
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
} // do_cast_dispel_magic
void cast_dispel_magic(int i_th, const String* victim, critter& pc) {
@@ -1904,7 +1904,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_fireproof
@@ -1985,7 +1985,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_magic_shield
@@ -2071,7 +2071,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_sanctuary
@@ -2151,7 +2151,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_prismatic_globe
@@ -2238,7 +2238,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_stone_skin
@@ -2325,7 +2325,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_armor
@@ -2407,7 +2407,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_absorb_blows
@@ -2478,7 +2478,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_divine_protection
@@ -2658,7 +2658,7 @@
if (!is_canned)
agg.MANA -= spell_mana / 2;
}//else lost concentration
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//do_cast_sober
Modified: trunk/mud/grrmud/server/trv_spll.cc
===================================================================
--- trunk/mud/grrmud/server/trv_spll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/trv_spll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -71,7 +71,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -94,7 +94,7 @@
name_of_crit(agg, ptr->SEE_BIT));
show(buf, *ptr);
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_group_heal
@@ -133,7 +133,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -181,7 +181,7 @@
}//else
}//if TRUE
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_flame_strike
@@ -220,7 +220,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -269,7 +269,7 @@
}//else
}//if TRUE
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_meteorstorm
@@ -308,7 +308,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -357,7 +357,7 @@
}//else
}//if TRUE
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_icestorm
@@ -396,7 +396,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -444,7 +444,7 @@
}//else
}//if TRUE
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_firestorm
@@ -470,7 +470,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -513,7 +513,7 @@
}//else
}//if TRUE
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_lightning_storm
@@ -549,7 +549,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
return;
}//else lost concentration
}//else !canned
@@ -597,7 +597,7 @@
room_list[ptr->getCurRoomNum()], TRUE);
}//else
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_quake
@@ -645,7 +645,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -740,7 +740,7 @@
}//if
}//while
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_typhoon
@@ -784,7 +784,7 @@
emote(LOST_CONCENTRATION_MSG_OTHER, agg,
room_list[agg.getCurRoomNum()], FALSE);
agg.MANA -= spell_mana / 2;
- agg.PAUSE += 1;
+ agg.PAUSE = 1;
}//else lost concentration
}//else !canned
@@ -875,7 +875,7 @@
}//if
}//while
}//while
- agg.PAUSE += 1; // increment pause_count
+ agg.PAUSE = 1; // increment pause_count
}//if do_affects
}//do_cast_tornado
Modified: trunk/mud/grrmud/server/wep_skll.cc
===================================================================
--- trunk/mud/grrmud/server/wep_skll.cc 2007-02-11 23:23:59 UTC (rev 871)
+++ trunk/mud/grrmud/server/wep_skll.cc 2007-02-12 04:06:13 UTC (rev 872)
@@ -112,7 +112,7 @@
name_of_crit(pc, ~0), get_his_her(vict));
emote(buf, vict, ROOM, TRUE, &pc);
- pc.PAUSE += 3;
+ pc.PAUSE = 1;
return 0;
}
wd = pc.DAM + d(pc.EQ[10]->OBJ_DAM_DICE_COUNT,
@@ -167,7 +167,7 @@
agg_kills_vict(&pc, vict);
}//if
- pc.PAUSE += 3;
+ pc.PAUSE = 1;
return 0;
}//do_circle
@@ -257,7 +257,7 @@
exact_raw_damage(((pc.LEVEL / 4 + 1) * wd), NORMAL, vict, pc);
- vict.PAUSE += d(1,2);
+ vict.PAUSE = 1;
if (vict.HP < 0) { //do fatality
show("You collapse as a blade enters your back!\n", vict);
@@ -284,7 +284,7 @@
}//if hit
else { //missed
- pc.PAUSE += d(1,3);
+ pc.PAUSE = 1;
Sprintf(buf,
"You whirl just in time to avoid %S's blade in your back.\n",
@@ -370,8 +370,8 @@
missed = TRUE;
}//if
- pc.PAUSE += 2;
- vict.PAUSE += d(1,3);
+ pc.PAUSE = 1;
+ vict.PAUSE = 1;
if (!missed && skill_did_hit(pc, DISARM_SKILL_NUM, vict)) {
Sprintf(buf, "%S disarms you!!\n",
More information about the ScryMUD
mailing list