wpdev-commits Mailing List for Wolfpack Emu (Page 11)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Thiago B. <hel...@us...> - 2004-10-16 21:48:13
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10846/definitions/items/buildings Modified Files: doors.xml Log Message: Added missing doors (non UOSE) Index: doors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/doors.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** doors.xml 3 Oct 2004 20:19:52 -0000 1.14 --- doors.xml 16 Oct 2004 21:48:04 -0000 1.15 *************** *** 960,963 **** --- 960,970 ---- </item> + <item id="84f"> + <id>0x84f</id> + <nodecay /> + <category>Buildings\Doors\Iron Gate 2\Iron Gate 2 (E/NW)</category> + <basescripts>door</basescripts> + </item> + <item id="850"> <id>0x850</id> *************** *** 967,970 **** --- 974,984 ---- </item> + <item id="851"> + <id>0x851</id> + <nodecay /> + <category>Buildings\Doors\Iron Gate 2\Iron Gate 2 (W/SE)</category> + <basescripts>door</basescripts> + </item> + <item id="852"> <id>0x852</id> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 20:15:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24321/npcs/monsters/daemonic Modified Files: arcane_daemon.xml Log Message: fix for the arcane daemon Index: arcane_daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/arcane_daemon.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** arcane_daemon.xml 16 Oct 2004 20:14:09 -0000 1.9 --- arcane_daemon.xml 16 Oct 2004 20:15:48 -0000 1.10 *************** *** 24,28 **** <tactics><random min="701" max="800"/></tactics> <wrestling><random min="601" max="800"/></wrestling> ! <magery><random min="801" max="900"/></wrestling> <evaluatingintelligence><random min="701" max="800"/></evaluatingintelligence> <meditation><random min="701" max="800"/></meditation> --- 24,28 ---- <tactics><random min="701" max="800"/></tactics> <wrestling><random min="601" max="800"/></wrestling> ! <magery><random min="801" max="900"/></magery> <evaluatingintelligence><random min="701" max="800"/></evaluatingintelligence> <meditation><random min="701" max="800"/></meditation> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 20:14:18
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24071/npcs/monsters/daemonic Modified Files: arcane_daemon.xml Log Message: fix for the arcane daemon Index: arcane_daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/arcane_daemon.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** arcane_daemon.xml 16 Oct 2004 20:13:50 -0000 1.8 --- arcane_daemon.xml 16 Oct 2004 20:14:09 -0000 1.9 *************** *** 27,30 **** --- 27,31 ---- <evaluatingintelligence><random min="701" max="800"/></evaluatingintelligence> <meditation><random min="701" max="800"/></meditation> + <ai>Monster_Mage</ai> <!-- Damage --> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 20:13:59
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996/npcs/monsters/daemonic Modified Files: arcane_daemon.xml Log Message: fix for the arcane daemon Index: arcane_daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/arcane_daemon.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** arcane_daemon.xml 7 Oct 2004 20:13:51 -0000 1.7 --- arcane_daemon.xml 16 Oct 2004 20:13:50 -0000 1.8 *************** *** 21,28 **** <maxhitpoints><random min="101" max="115"/></maxhitpoints> <!-- Skills --> ! <magicresistance>0</magicresistance> ! <tactics>0</tactics> ! <wrestling>0</wrestling> ! <anatomy>0</anatomy> <!-- Damage --> <mindamage>23</mindamage> --- 21,31 ---- <maxhitpoints><random min="101" max="115"/></maxhitpoints> <!-- Skills --> ! <magicresistance><random min="851" max="950"/></magicresistance> ! <tactics><random min="701" max="800"/></tactics> ! <wrestling><random min="601" max="800"/></wrestling> ! <magery><random min="801" max="900"/></wrestling> ! <evaluatingintelligence><random min="701" max="800"/></evaluatingintelligence> ! <meditation><random min="701" max="800"/></meditation> ! <!-- Damage --> <mindamage>23</mindamage> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 20:13:59
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996/npcs/monsters/champions Modified Files: the_true_harrower.xml Log Message: fix for the arcane daemon Index: the_true_harrower.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/the_true_harrower.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** the_true_harrower.xml 16 Oct 2004 18:19:30 -0000 1.8 --- the_true_harrower.xml 16 Oct 2004 20:13:50 -0000 1.9 *************** *** 20,24 **** <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints><random min="65000" max="65000"/></maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> --- 20,24 ---- <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints><random min="32000" max="32000"/></maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 20:01:48
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21871/ai Modified Files: ai_mage.cpp Log Message: fixes Index: ai_mage.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_mage.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ai_mage.cpp 16 Oct 2004 19:42:56 -0000 1.4 --- ai_mage.cpp 16 Oct 2004 20:01:39 -0000 1.5 *************** *** 274,278 **** } ! nextSpellTime = Server::instance()->time() + 5000; // Cast all 5 seconds } --- 274,286 ---- } ! // Calculate the next spell delay ! if (spell == 41) { ! nextSpellTime = Server::instance()->time() + m_npc->actionSpeed(); // Dispel gets special handling ! } else { ! float scale = m_npc->skillValue(MAGERY) * 0.003; ! unsigned int minDelay = 6000 - (scale * 750); ! unsigned int maxDelay = 6000 - (scale * 1250); ! nextSpellTime = Server::instance()->time() + RandomNum(minDelay, maxDelay); ! } } *************** *** 313,334 **** return; ! unsigned int distance = m_npc->dist(currentVictim); ! ! if (distance >= 10 && distance <= 12) { ! return; // Right distance ! } else if (distance > 10) { movePath(currentVictim->pos(), true); ! } else if (distance < 10) { ! // Calculate the opposing direction and get away (at least try it) ! unsigned char direction = (m_npc->pos().direction(currentVictim->pos()) + 4) % 8; ! ! if (direction != m_npc->direction()) { ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; ! } ! } ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction + 1) % 8; if (direction != m_npc->direction()) { --- 321,337 ---- return; ! // If we're not casting a spell and waiting for a new one, move toward the target ! if (!m_npc->hasScript("magic")) { movePath(currentVictim->pos(), true); ! } else { ! unsigned int distance = m_npc->dist(currentVictim); ! if (distance >= 10 && distance <= 12) { ! return; // Right distance ! } else if (distance > 10) { ! movePath(currentVictim->pos(), true); ! } else if (distance < 10) { ! // Calculate the opposing direction and get away (at least try it) ! unsigned char direction = (m_npc->pos().direction(currentVictim->pos()) + 4) % 8; if (direction != m_npc->direction()) { *************** *** 339,343 **** if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction == 1) ? 7 : (direction - 2); if (direction != m_npc->direction()) { --- 342,346 ---- if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction + 1) % 8; if (direction != m_npc->direction()) { *************** *** 348,352 **** if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; // We tried everything but failed } } --- 351,365 ---- if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction == 1) ? 7 : (direction - 2); ! ! if (direction != m_npc->direction()) { ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; ! } ! } ! ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; // We tried everything but failed ! } } } |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 19:43:05
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18774 Modified Files: ChangeLog basechar.h Log Message: fixes Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** basechar.h 15 Oct 2004 14:38:22 -0000 1.91 --- basechar.h 16 Oct 2004 19:42:55 -0000 1.92 *************** *** 1,3 **** ! /* * Wolfpack Emu (WP) * UO Server Emulation Program --- 1,3 ---- ! /* * Wolfpack Emu (WP) * UO Server Emulation Program *************** *** 388,392 **** bool gender() const; P_CHAR guarding() const; ! short hitpoints() const; unsigned char hunger() const; uint hungerTime() const; --- 388,392 ---- bool gender() const; P_CHAR guarding() const; ! unsigned short hitpoints() const; unsigned char hunger() const; uint hungerTime() const; *************** *** 468,472 **** void setGender( bool data ); void setGuarding( P_CHAR data ); ! void setHitpoints( short data ); void setHunger( unsigned char data ); void setHungerTime( uint data ); --- 468,472 ---- void setGender( bool data ); void setGuarding( P_CHAR data ); ! void setHitpoints( unsigned short data ); void setHunger( unsigned char data ); void setHungerTime( uint data ); *************** *** 1051,1060 **** } ! inline short cBaseChar::hitpoints() const { return hitpoints_; } ! inline void cBaseChar::setHitpoints( short data ) { hitpoints_ = data; --- 1051,1060 ---- } ! inline unsigned short cBaseChar::hitpoints() const { return hitpoints_; } ! inline void cBaseChar::setHitpoints( unsigned short data ) { hitpoints_ = data; Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** ChangeLog 16 Oct 2004 18:19:40 -0000 1.116 --- ChangeLog 16 Oct 2004 19:42:55 -0000 1.117 *************** *** 59,62 **** --- 59,63 ---- - Fixed command processing with command char . and body 0x3db. - Added AI Monster_Mage. + - Hitpoints are now unsigned. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 19:43:05
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18774/ai Modified Files: ai_mage.cpp Log Message: fixes Index: ai_mage.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_mage.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ai_mage.cpp 16 Oct 2004 19:09:14 -0000 1.3 --- ai_mage.cpp 16 Oct 2004 19:42:56 -0000 1.4 *************** *** 5,8 **** --- 5,9 ---- #include "../combat.h" #include "../serverconfig.h" + #include "../walking.h" /* *************** *** 297,305 **** virtual float preCondition() { ! return Monster_Aggr_Wander::preCondition(); } virtual void execute() { ! Monster_Aggr_Wander::execute(); } --- 298,360 ---- virtual float preCondition() { ! Monster_Aggressive *ai = static_cast<Monster_Aggressive*>(m_ai); ! ! if (ai->currentVictim()) { ! return 1.0f; // Always keep a distance ! } else { ! return 0.0f; ! } } virtual void execute() { ! P_CHAR currentVictim = static_cast<Monster_Aggressive*>(m_ai)->currentVictim(); ! ! if (!currentVictim || m_npc->isFrozen()) ! return; ! ! unsigned int distance = m_npc->dist(currentVictim); ! ! if (distance >= 10 && distance <= 12) { ! return; // Right distance ! } else if (distance > 10) { ! movePath(currentVictim->pos(), true); ! } else if (distance < 10) { ! // Calculate the opposing direction and get away (at least try it) ! unsigned char direction = (m_npc->pos().direction(currentVictim->pos()) + 4) % 8; ! ! if (direction != m_npc->direction()) { ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; ! } ! } ! ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction + 1) % 8; ! ! if (direction != m_npc->direction()) { ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; ! } ! } ! ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! direction = (direction == 1) ? 7 : (direction - 2); ! ! if (direction != m_npc->direction()) { ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; ! } ! } ! ! if (!Movement::instance()->Walking(m_npc, direction|0x80, 0xFF)) { ! return; // We tried everything but failed ! } ! } ! } ! } ! } ! ! virtual float postCondition() { ! return 1.0f; // This action doesn't last. } |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 19:42:56
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18756/magic Modified Files: __init__.py Log Message: npc casting fix. Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** __init__.py 16 Oct 2004 18:41:35 -0000 1.21 --- __init__.py 16 Oct 2004 19:42:48 -0000 1.22 *************** *** 172,176 **** return amount ! char.socket.clilocmessage(500641) fizzle(char) return amount --- 172,177 ---- return amount ! if char.socket: ! char.socket.clilocmessage(500641) fizzle(char) return amount |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 19:09:23
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13030/ai Modified Files: ai_mage.cpp Log Message: fixes Index: ai_mage.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_mage.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ai_mage.cpp 16 Oct 2004 18:28:05 -0000 1.2 --- ai_mage.cpp 16 Oct 2004 19:09:14 -0000 1.3 *************** *** 174,178 **** */ int getRandomHarmfulSpell() { ! static const mageryPerCircle = (1000.0 / 7.0); unsigned char maxCircle = QMIN(8, QMAX(1, (unsigned char)((m_npc->skillValue(MAGERY) + 200) / mageryPerCircle))); int selected = RandomNum(1, maxCircle * 2) - 1; // Select a random spell --- 174,178 ---- */ int getRandomHarmfulSpell() { ! static const float mageryPerCircle = (1000.0 / 7.0); unsigned char maxCircle = QMIN(8, QMAX(1, (unsigned char)((m_npc->skillValue(MAGERY) + 200) / mageryPerCircle))); int selected = RandomNum(1, maxCircle * 2) - 1; // Select a random spell |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 19:06:15
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12504 Modified Files: ai.pri Log Message: fix Index: ai.pri =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.pri,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ai.pri 16 Oct 2004 18:20:37 -0000 1.2 --- ai.pri 16 Oct 2004 19:06:07 -0000 1.3 *************** *** 6,9 **** $$AI_CPP/ai_animals.cpp \ $$AI_CPP/ai_humans.cpp \ ! $$AI_CPP/ai_monsters.cpp $$AI_CPP/ai_mage.cpp --- 6,9 ---- $$AI_CPP/ai_animals.cpp \ $$AI_CPP/ai_humans.cpp \ ! $$AI_CPP/ai_monsters.cpp \ $$AI_CPP/ai_mage.cpp |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:41:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8706/magic Modified Files: __init__.py spell.py utilities.py Log Message: mage ai updates Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spell.py 16 Oct 2004 14:08:21 -0000 1.31 --- spell.py 16 Oct 2004 18:41:35 -0000 1.32 *************** *** 111,114 **** --- 111,117 ---- # def saymantra(self, char, mode): + if char.npc and char.bodytype != BODY_HUMAN: + return + if self.mantra and mode in [MODE_BOOK, MODE_SCROLL]: char.say(self.mantra) *************** *** 130,139 **** # We are frozen if char.frozen: ! char.socket.clilocmessage(502643) return 0 # We are already casting a spell if char.hasscript('magic') or (socket and socket.hastag('cast_target')): ! char.socket.clilocmessage(502642) return 0 --- 133,148 ---- # We are frozen if char.frozen: ! if socket: ! socket.clilocmessage(502643) ! else: ! npc_debug(char, 'Trying to cast while being frozen.') return 0 # We are already casting a spell if char.hasscript('magic') or (socket and socket.hastag('cast_target')): ! if socket: ! socket.clilocmessage(502642) ! else: ! npc_debug(char, 'Trying to cast spell while already casting a spell.') return 0 *************** *** 141,145 **** # the spell in our spellbook (0-based index) if not self.inherent and mode == MODE_BOOK and not hasSpell(char, self.spellid - 1): ! char.message("You don't know the spell you want to cast.") return 0 --- 150,157 ---- # the spell in our spellbook (0-based index) if not self.inherent and mode == MODE_BOOK and not hasSpell(char, self.spellid - 1): ! if socket: ! char.message("You don't know the spell you want to cast.") ! else: ! npc_debug(char, 'Trying to cast spell %s unknown to the npc.' % self.__class__.__name__) return 0 *************** *** 277,281 **** # Check for Reagents ! if len(self.reagents) > 0: items = countReagents(char.getbackpack(), self.reagents.copy()) --- 289,293 ---- # Check for Reagents ! if not char.npc and len(self.reagents) > 0: items = countReagents(char.getbackpack(), self.reagents.copy()) *************** *** 338,342 **** # Consume Reagents ! if len(self.reagents) > 0: lowerreagentcost = properties.fromchar(char, LOWERREAGENTCOST) --- 350,354 ---- # Consume Reagents ! if not char.npc and len(self.reagents) > 0: lowerreagentcost = properties.fromchar(char, LOWERREAGENTCOST) *************** *** 379,387 **** damage = rolldice(dice, sides, bonus) * 100.0 ! bonus = char.skill[INSCRIPTION] / 100.0 bonus += char.intelligence / 10.0 bonus += properties.fromchar(char, SPELLDAMAGEBONUS) - damage *= 1.0 + bonus / 100.0 char.checkskill(self.damageskill, 0, 1200) damage *= (30 + (9 * char.skill[self.damageskill]) / 100.0) / 100.0 --- 391,400 ---- damage = rolldice(dice, sides, bonus) * 100.0 ! bonus = char.skill[INSCRIPTION] / 100.0 bonus += char.intelligence / 10.0 bonus += properties.fromchar(char, SPELLDAMAGEBONUS) + damage *= 1.0 + bonus / 100.0 + char.checkskill(self.damageskill, 0, 1200) damage *= (30 + (9 * char.skill[self.damageskill]) / 100.0) / 100.0 *************** *** 430,434 **** if item: item = item.serial ! char.socket.attachtarget('magic.target_response', [ self, mode, args, item ], 'magic.target_cancel', 'magic.target_timeout', 8000) # Don't forget the timeout later on else: # Callback to the NPC AI ?? --- 443,447 ---- if item: item = item.serial ! char.socket.attachtarget('magic.target_response', [ self, mode, args, item ], 'magic.target_cancel', 'magic.target_timeout', 30000) # Don't forget the timeout later on else: # Callback to the NPC AI ?? Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** __init__.py 16 Oct 2004 14:08:21 -0000 1.20 --- __init__.py 16 Oct 2004 18:41:35 -0000 1.21 *************** *** 42,45 **** --- 42,47 ---- socket.log(LOG_ERROR, "Trying to cast unknown spell: %d.\n" % spell) socket.sysmessage('ERROR: Unknown Spell') + else: + npc_debug(char, "Trying to cast unknown spell: %d." % spell) return *************** *** 51,55 **** return False else: ! socket.deltag('spell_delay') spells[spell].precast(char, mode, args, target, item) --- 53,57 ---- return False else: ! socket.deltag('spell_delay') spells[spell].precast(char, mode, args, target, item) *************** *** 70,75 **** # Target Response def target_response( char, args, target ): ! # No more npc saftey from here ! char.socket.deltag('cast_target') spell = args[0] --- 72,77 ---- # Target Response def target_response( char, args, target ): ! if char.socket: ! char.socket.deltag('cast_target') spell = args[0] *************** *** 161,166 **** char.socket.clilocmessage(501857) ! def onCastSpell(char, spell): ! castSpell(char, spell) # These Events happen for characters who are casting a spell right now --- 163,168 ---- char.socket.clilocmessage(501857) ! def onCastSpell(char, spell, mode = 0, args = [], target = None, item = None): ! castSpell(char, spell, mode, args, target, item) # These Events happen for characters who are casting a spell right now Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** utilities.py 24 Sep 2004 11:07:04 -0000 1.16 --- utilities.py 16 Oct 2004 18:41:35 -0000 1.17 *************** *** 55,64 **** if char.socket: char.socket.deltag('cast_target') ! ! char.effect(0x3735, 1, 30) ! char.soundeffect(0x5c) # Check whether the spellbook's of a char have that specific spell def hasSpell(char, spell): book = char.itemonlayer(1) --- 55,68 ---- if char.socket: char.socket.deltag('cast_target') ! ! # Only play the fizzle effect for players ! char.effect(0x3735, 1, 30) ! char.soundeffect(0x5c) # Check whether the spellbook's of a char have that specific spell def hasSpell(char, spell): + if char.npc: + return True + book = char.itemonlayer(1) *************** *** 228,229 **** --- 232,241 ---- if item: item.delete() + + # + # Say a NPC debug message. + # + def npc_debug(char, message): + #char.say(message) + pass + |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:28:14
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5891/ai Modified Files: ai_mage.cpp Log Message: mage ai updates Index: ai_mage.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_mage.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ai_mage.cpp 16 Oct 2004 18:19:41 -0000 1.1 --- ai_mage.cpp 16 Oct 2004 18:28:05 -0000 1.2 *************** *** 170,179 **** } - static const mageryPerCircle = (1000.0 / 7.0); - /* Get the id of a random damage spell */ int getRandomHarmfulSpell() { unsigned char maxCircle = QMIN(8, QMAX(1, (unsigned char)((m_npc->skillValue(MAGERY) + 200) / mageryPerCircle))); int selected = RandomNum(1, maxCircle * 2) - 1; // Select a random spell --- 170,178 ---- } /* Get the id of a random damage spell */ int getRandomHarmfulSpell() { + static const mageryPerCircle = (1000.0 / 7.0); unsigned char maxCircle = QMIN(8, QMAX(1, (unsigned char)((m_npc->skillValue(MAGERY) + 200) / mageryPerCircle))); int selected = RandomNum(1, maxCircle * 2) - 1; // Select a random spell *************** *** 240,244 **** spell = 11; // Cure objTarget = m_npc; ! } else if (dispelTarget) { // We have something to dispel that is attacking us. Easily dispatch threat. spell = 41; // Dispel objTarget = dispelTarget; --- 239,243 ---- spell = 11; // Cure objTarget = m_npc; ! } else if (dispelTarget && m_npc->skillValue(MAGERY) * 0.01 * 75 > RandomNum(1, 100)) { // We have something to dispel that is attacking us. Easily dispatch threat. spell = 41; // Dispel objTarget = dispelTarget; *************** *** 267,272 **** } - //m_npc->talk(tr("CASTING SPELL %1").arg(spell)); - if (m_npc->canHandleEvent(EVENT_CASTSPELL)) { PyObject *target = PyGetObjectObject(objTarget); --- 266,269 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:50
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4066/ai Modified Files: ai.pri Log Message: aimage Index: ai.pri =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.pri,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ai.pri 23 Aug 2004 19:35:46 -0000 1.1 --- ai.pri 16 Oct 2004 18:20:37 -0000 1.2 *************** *** 1,7 **** # Input ! HEADERS += $$AI_H/ai.h SOURCES += $$AI_CPP/ai.cpp \ $$AI_CPP/ai_animals.cpp \ $$AI_CPP/ai_humans.cpp \ $$AI_CPP/ai_monsters.cpp --- 1,9 ---- # Input ! HEADERS += $$AI_H/ai.h \ ! $$AI_H/ai_mage.h SOURCES += $$AI_CPP/ai.cpp \ $$AI_CPP/ai_animals.cpp \ $$AI_CPP/ai_humans.cpp \ $$AI_CPP/ai_monsters.cpp + $$AI_CPP/ai_mage.cpp |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:50
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4066 Modified Files: wolf.dsp Log Message: aimage Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.275 retrieving revision 1.276 diff -C2 -d -r1.275 -r1.276 *** wolf.dsp 16 Oct 2004 04:53:59 -0000 1.275 --- wolf.dsp 16 Oct 2004 18:20:37 -0000 1.276 *************** *** 108,111 **** --- 108,115 ---- # Begin Source File + SOURCE=.\ai\ai_mage.cpp + # End Source File + # Begin Source File + SOURCE=.\ai\ai_animals.cpp # End Source File *************** *** 348,351 **** --- 352,359 ---- # Begin Source File + SOURCE=.\ai\ai_mage.h + # End Source File + # Begin Source File + SOURCE=.\basechar.h # PROP Ignore_Default_Tool 1 |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:25
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/elemental Modified Files: acid_elemental.xml air_elemental.xml blood_elemental.xml crystal_elemental.xml efreet.xml fire_elemental.xml ice_elemental.xml poison_elemental.xml water_elemental.xml Log Message: npc mages Index: fire_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/fire_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** fire_elemental.xml 7 Oct 2004 20:13:52 -0000 1.12 --- fire_elemental.xml 16 Oct 2004 18:19:32 -0000 1.13 *************** *** 21,25 **** <maxhitpoints><random min="76" max="93"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="601" max="750"/></evaluatingintel> <magery><random min="601" max="750"/></magery> <magicresistance><random min="752" max="1050"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="76" max="93"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="601" max="750"/></evaluatingintelligence> <magery><random min="601" max="750"/></magery> <magicresistance><random min="752" max="1050"/></magicresistance> Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/air_elemental.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** air_elemental.xml 15 Oct 2004 16:03:01 -0000 1.16 --- air_elemental.xml 16 Oct 2004 18:19:32 -0000 1.17 *************** *** 23,27 **** <maxhitpoints><random min="76" max="93"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="601" max="750"/></evaluatingintel> <magery><random min="601" max="750"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> --- 23,27 ---- <maxhitpoints><random min="76" max="93"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="601" max="750"/></evaluatingintelligence> <magery><random min="601" max="750"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> Index: blood_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/blood_elemental.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** blood_elemental.xml 7 Oct 2004 20:13:52 -0000 1.14 --- blood_elemental.xml 16 Oct 2004 18:19:32 -0000 1.15 *************** *** 22,26 **** <maxhitpoints><random min="316" max="369"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="851" max="1000"/></evaluatingintel> <magery><random min="851" max="1000"/></magery> <meditation><random min="104" max="500"/></meditation> --- 22,26 ---- <maxhitpoints><random min="316" max="369"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="851" max="1000"/></evaluatingintelligence> <magery><random min="851" max="1000"/></magery> <meditation><random min="104" max="500"/></meditation> Index: acid_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/acid_elemental.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** acid_elemental.xml 7 Sep 2004 00:28:03 -0000 1.11 --- acid_elemental.xml 16 Oct 2004 18:19:32 -0000 1.12 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="303" max="600"/></anatomy> ! <evaluatingintel><random min="701" max="850"/></evaluatingintel> <magery><random min="701" max="850"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> --- 22,26 ---- <!-- Skills --> <anatomy><random min="303" max="600"/></anatomy> ! <evaluatingintelligence><random min="701" max="850"/></evaluatingintelligence> <magery><random min="701" max="850"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> Index: ice_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/ice_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ice_elemental.xml 7 Oct 2004 20:13:52 -0000 1.12 --- ice_elemental.xml 16 Oct 2004 18:19:32 -0000 1.13 *************** *** 21,25 **** <maxhitpoints><random min="94" max="111"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="105" max="600"/></evaluatingintel> <magery><random min="105" max="600"/></magery> <magicresistance><random min="301" max="800"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="94" max="111"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="105" max="600"/></evaluatingintelligence> <magery><random min="105" max="600"/></magery> <magicresistance><random min="301" max="800"/></magicresistance> Index: poison_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/poison_elemental.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** poison_elemental.xml 10 Oct 2004 18:24:30 -0000 1.13 --- poison_elemental.xml 16 Oct 2004 18:19:32 -0000 1.14 *************** *** 21,25 **** <maxhitpoints><random min="256" max="309"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="801" max="950"/></evaluatingintel> <magery><random min="801" max="950"/></magery> <meditation><random min="802" max="1200"/></meditation> --- 21,25 ---- <maxhitpoints><random min="256" max="309"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="801" max="950"/></evaluatingintelligence> <magery><random min="801" max="950"/></magery> <meditation><random min="802" max="1200"/></meditation> Index: crystal_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/crystal_elemental.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** crystal_elemental.xml 10 Oct 2004 18:24:30 -0000 1.3 --- crystal_elemental.xml 16 Oct 2004 18:19:32 -0000 1.4 *************** *** 27,31 **** <magery><random min="701" max="750"/></magery> <meditation><random min="701" max="750"/></meditation> ! <evaluatingintel><random min="601" max="750"/></evaluatingintel> <!-- Damage --> <mindamage>20</mindamage> --- 27,31 ---- <magery><random min="701" max="750"/></magery> <meditation><random min="701" max="750"/></meditation> ! <evaluatingintelligence><random min="601" max="750"/></evaluatingintelligence> <!-- Damage --> <mindamage>20</mindamage> Index: water_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/water_elemental.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** water_elemental.xml 7 Oct 2004 20:13:52 -0000 1.13 --- water_elemental.xml 16 Oct 2004 18:19:32 -0000 1.14 *************** *** 21,25 **** <maxhitpoints><random min="76" max="93" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="601" max="750"/></evaluatingintel> <magery><random min="601" max="750"/></magery> <magicresistance><random min="1001" max="1150"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="76" max="93" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="601" max="750"/></evaluatingintelligence> <magery><random min="601" max="750"/></magery> <magicresistance><random min="1001" max="1150"/></magicresistance> Index: efreet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/efreet.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** efreet.xml 10 Oct 2004 18:24:30 -0000 1.13 --- efreet.xml 16 Oct 2004 18:19:32 -0000 1.14 *************** *** 21,25 **** <maxhitpoints><random min="196" max="213" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="601" max="750"/></evaluatingintel> <magery><random min="601" max="750"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="196" max="213" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="601" max="750"/></evaluatingintelligence> <magery><random min="601" max="750"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:25
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/daemonic Modified Files: balron.xml black_gate_daemon.xml daemon.xml exodus_daemon.xml fire_gargoyle.xml gargoyle.xml gargoyle_destroyer.xml gargoyle_enforcer.xml ice_fiend.xml imp.xml succubus.xml Log Message: npc mages Index: balron.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/balron.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** balron.xml 12 Oct 2004 10:24:46 -0000 1.19 --- balron.xml 16 Oct 2004 18:19:31 -0000 1.20 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> --- 22,26 ---- <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> Index: daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/daemon.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** daemon.xml 7 Oct 2004 20:13:51 -0000 1.18 --- daemon.xml 16 Oct 2004 18:19:31 -0000 1.19 *************** *** 21,25 **** <maxhitpoints><random min="286" max="303" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="701" max="800"/></evaluatingintel> <magery><random min="701" max="800"/></magery> <magicresistance><random min="851" max="950"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="286" max="303" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="701" max="800"/></evaluatingintelligence> <magery><random min="701" max="800"/></magery> <magicresistance><random min="851" max="950"/></magicresistance> Index: gargoyle_enforcer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_enforcer.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** gargoyle_enforcer.xml 7 Oct 2004 20:13:51 -0000 1.15 --- gargoyle_enforcer.xml 16 Oct 2004 18:19:31 -0000 1.16 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="701" max="800"/></anatomy> ! <evaluatingintel><random min="703" max="1000"/></evaluatingintel> <magery><random min="801" max="900"/></magery> <meditation><random min="703" max="1000"/></meditation> --- 22,26 ---- <!-- Skills --> <anatomy><random min="701" max="800"/></anatomy> ! <evaluatingintelligence><random min="703" max="1000"/></evaluatingintelligence> <magery><random min="801" max="900"/></magery> <meditation><random min="703" max="1000"/></meditation> Index: gargoyle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** gargoyle.xml 7 Oct 2004 20:13:51 -0000 1.15 --- gargoyle.xml 16 Oct 2004 18:19:31 -0000 1.16 *************** *** 21,25 **** <maxhitpoints><random min="88" max="105" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="701" max="850"/></evaluatingintel> <magery><random min="701" max="850"/></magery> <magicresistance><random min="701" max="850"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="88" max="105" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="701" max="850"/></evaluatingintelligence> <magery><random min="701" max="850"/></magery> <magicresistance><random min="701" max="850"/></magicresistance> Index: exodus_daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/exodus_daemon.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exodus_daemon.xml 20 Sep 2004 03:56:24 -0000 1.4 --- exodus_daemon.xml 16 Oct 2004 18:19:31 -0000 1.5 *************** *** 21,25 **** <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> --- 21,25 ---- <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> Index: succubus.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/succubus.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** succubus.xml 7 Oct 2004 20:13:51 -0000 1.12 --- succubus.xml 16 Oct 2004 18:19:31 -0000 1.13 *************** *** 25,29 **** <magicresistance><random min="1005" max="1500" /></magicresistance> <magery><random min="991" max="1000" /></magery> ! <evaluatingintel><random min="901" max="1000" /></evaluatingintel> <meditation><random min="901" max="1000" /></meditation> <!-- Damage --> --- 25,29 ---- <magicresistance><random min="1005" max="1500" /></magicresistance> <magery><random min="991" max="1000" /></magery> ! <evaluatingintelligence><random min="901" max="1000" /></evaluatingintelligence> <meditation><random min="901" max="1000" /></meditation> <!-- Damage --> Index: gargoyle_destroyer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_destroyer.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** gargoyle_destroyer.xml 7 Oct 2004 20:13:51 -0000 1.15 --- gargoyle_destroyer.xml 16 Oct 2004 18:19:31 -0000 1.16 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="505" max="1000"/></anatomy> ! <evaluatingintel><random min="910" max="1000"/></evaluatingintel> <macefighting><random min="901" max="1000"/></macefighting> <magery><random min="910" max="1000"/></magery> --- 22,26 ---- <!-- Skills --> <anatomy><random min="505" max="1000"/></anatomy> ! <evaluatingintelligence><random min="910" max="1000"/></evaluatingintelligence> <macefighting><random min="901" max="1000"/></macefighting> <magery><random min="910" max="1000"/></magery> Index: black_gate_daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/black_gate_daemon.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** black_gate_daemon.xml 20 Sep 2004 03:56:24 -0000 1.4 --- black_gate_daemon.xml 16 Oct 2004 18:19:31 -0000 1.5 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> --- 22,26 ---- <!-- Skills --> <anatomy><random min="251" max="500"/></anatomy> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="955" max="1000"/></magery> <meditation><random min="251" max="500"/></meditation> Index: ice_fiend.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/ice_fiend.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ice_fiend.xml 7 Oct 2004 20:13:51 -0000 1.14 --- ice_fiend.xml 16 Oct 2004 18:19:31 -0000 1.15 *************** *** 21,25 **** <maxhitpoints><random min="226" max="243" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="801" max="900"/></evaluatingintel> <magery><random min="801" max="900"/></magery> <magicresistance><random min="751" max="850"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="226" max="243" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="801" max="900"/></evaluatingintelligence> <magery><random min="801" max="900"/></magery> <magicresistance><random min="751" max="850"/></magicresistance> Index: imp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/imp.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** imp.xml 7 Oct 2004 20:13:51 -0000 1.15 --- imp.xml 16 Oct 2004 18:19:31 -0000 1.16 *************** *** 25,29 **** <magicresistance><random min="301" max="500"/></magicresistance> <magery><random min="901" max="1000"/></magery> ! <evaluatingintel><random min="201" max="300"/></evaluatingintel> <meditation>0</meditation> <mintaming>831</mintaming> --- 25,29 ---- <magicresistance><random min="301" max="500"/></magicresistance> <magery><random min="901" max="1000"/></magery> ! <evaluatingintelligence><random min="201" max="300"/></evaluatingintelligence> <meditation>0</meditation> <mintaming>831</mintaming> Index: fire_gargoyle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/fire_gargoyle.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** fire_gargoyle.xml 21 Sep 2004 14:01:05 -0000 1.14 --- fire_gargoyle.xml 16 Oct 2004 18:19:31 -0000 1.15 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="751" max="850"/></anatomy> ! <evaluatingintel><random min="901" max="1050"/></evaluatingintel> <magery><random min="901" max="1050"/></magery> <meditation><random min="901" max="1050"/></meditation> --- 22,26 ---- <!-- Skills --> <anatomy><random min="751" max="850"/></anatomy> ! <evaluatingintelligence><random min="901" max="1050"/></evaluatingintelligence> <magery><random min="901" max="1050"/></magery> <meditation><random min="901" max="1050"/></meditation> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/champions Modified Files: barracoon_the_piper.xml lord_oaks.xml neira_the_necromancer.xml semidar.xml silvani.xml the_harrower.xml the_true_harrower.xml Log Message: npc mages Index: the_harrower.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/the_harrower.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** the_harrower.xml 15 Oct 2004 16:03:00 -0000 1.6 --- the_harrower.xml 16 Oct 2004 18:19:30 -0000 1.7 *************** *** 25,29 **** <wrestling><random min="901" max="1000"/></wrestling> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintel><random min="1200" max="1200"/></evaluatingintel> <meditation><random min="1200" max="1200" /></meditation> <anatomy>0</anatomy> --- 25,29 ---- <wrestling><random min="901" max="1000"/></wrestling> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintelligence><random min="1200" max="1200"/></evaluatingintelligence> <meditation><random min="1200" max="1200" /></meditation> <anatomy>0</anatomy> Index: semidar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/semidar.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** semidar.xml 10 Oct 2004 18:24:29 -0000 1.8 --- semidar.xml 16 Oct 2004 18:19:30 -0000 1.9 *************** *** 27,31 **** <anatomy>0</anatomy> <magery><random min="900" max="1050"/></magery> ! <evaluatingintel><random min="951" max="1000"/></evaluatingintel> <meditation><random min="951" max="1000" /></meditation> <!-- Damage --> --- 27,31 ---- <anatomy>0</anatomy> <magery><random min="900" max="1050"/></magery> ! <evaluatingintelligence><random min="951" max="1000"/></evaluatingintelligence> <meditation><random min="951" max="1000" /></meditation> <!-- Damage --> Index: neira_the_necromancer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/neira_the_necromancer.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** neira_the_necromancer.xml 10 Oct 2004 18:24:29 -0000 1.6 --- neira_the_necromancer.xml 16 Oct 2004 18:19:30 -0000 1.7 *************** *** 27,31 **** <anatomy>0</anatomy> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintel><random min="1200" max="1200"/></evaluatingintel> <meditation><random min="1200" max="1200" /></meditation> <!-- Damage --> --- 27,31 ---- <anatomy>0</anatomy> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintelligence><random min="1200" max="1200"/></evaluatingintelligence> <meditation><random min="1200" max="1200" /></meditation> <!-- Damage --> Index: lord_oaks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/lord_oaks.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lord_oaks.xml 10 Oct 2004 18:24:29 -0000 1.6 --- lord_oaks.xml 16 Oct 2004 18:19:30 -0000 1.7 *************** *** 26,30 **** <anatomy><random min="751" max="1000"/></anatomy> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintel><random min="1201" max="1300"/></evaluatingintel> <meditation><random min="1201" max="1300" /></meditation> <!-- Damage --> --- 26,30 ---- <anatomy><random min="751" max="1000"/></anatomy> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintelligence><random min="1201" max="1300"/></evaluatingintelligence> <meditation><random min="1201" max="1300" /></meditation> <!-- Damage --> Index: barracoon_the_piper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/barracoon_the_piper.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** barracoon_the_piper.xml 10 Oct 2004 18:24:29 -0000 1.7 --- barracoon_the_piper.xml 16 Oct 2004 18:19:30 -0000 1.8 *************** *** 27,31 **** <wrestling><random min="976" max="1000"/></wrestling> <meditation>0</meditation> ! <evaluatingintel>0</evaluatingintel> <magery>0</magery> <anatomy>0</anatomy> --- 27,31 ---- <wrestling><random min="976" max="1000"/></wrestling> <meditation>0</meditation> ! <evaluatingintelligence>0</evaluatingintelligence> <magery>0</magery> <anatomy>0</anatomy> Index: the_true_harrower.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/the_true_harrower.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** the_true_harrower.xml 15 Oct 2004 16:03:00 -0000 1.7 --- the_true_harrower.xml 16 Oct 2004 18:19:30 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- <name>The True Harrower</name> <id>780</id> + <skin>0x497</skin> <karma>-25000</karma> <fame>25000</fame> *************** *** 25,29 **** <wrestling><random min="901" max="1000"/></wrestling> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintel><random min="1200" max="1200"/></evaluatingintel> <meditation><random min="1200" max="1200" /></meditation> <anatomy>0</anatomy> --- 26,30 ---- <wrestling><random min="901" max="1000"/></wrestling> <magery><random min="1200" max="1200"/></magery> ! <evaluatingintelligence><random min="1200" max="1200"/></evaluatingintelligence> <meditation><random min="1200" max="1200" /></meditation> <anatomy>0</anatomy> Index: silvani.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/silvani.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** silvani.xml 10 Oct 2004 18:24:29 -0000 1.7 --- silvani.xml 16 Oct 2004 18:19:30 -0000 1.8 *************** *** 26,30 **** <wrestling><random min="976" max="1000"/></wrestling> <magery><random min="976" max="1075"/></magery> ! <evaluatingintel><random min="1000" max="1000"/></evaluatingintel> <meditation><random min="1000" max="1000" /></meditation> <anatomy>0</anatomy> --- 26,30 ---- <wrestling><random min="976" max="1000"/></wrestling> <magery><random min="976" max="1075"/></magery> ! <evaluatingintelligence><random min="1000" max="1000"/></evaluatingintelligence> <meditation><random min="1000" max="1000" /></meditation> <anatomy>0</anatomy> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/common Modified Files: elder_gazer.xml gazer.xml phoenix.xml pixie.xml reaper.xml shadow_wisp.xml wisp.xml Log Message: npc mages Index: wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/wisp.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wisp.xml 10 Oct 2004 18:24:29 -0000 1.12 --- wisp.xml 16 Oct 2004 18:19:31 -0000 1.13 *************** *** 21,25 **** <maxhitpoints><random min="118" max="135" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel>800</evaluatingintel> <magery>800</magery> <magicresistance>800</magicresistance> --- 21,25 ---- <maxhitpoints><random min="118" max="135" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence>800</evaluatingintelligence> <magery>800</magery> <magicresistance>800</magicresistance> Index: pixie.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/pixie.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pixie.xml 10 Oct 2004 18:24:29 -0000 1.4 --- pixie.xml 16 Oct 2004 18:19:31 -0000 1.5 *************** *** 26,30 **** <anatomy>0</anatomy> <magery><random min="901" max="1000"/></magery> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <meditation><random min="901" max="1000" /></meditation> <!-- Damage --> --- 26,30 ---- <anatomy>0</anatomy> <magery><random min="901" max="1000"/></magery> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <meditation><random min="901" max="1000" /></meditation> <!-- Damage --> Index: reaper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/reaper.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** reaper.xml 7 Sep 2004 00:28:03 -0000 1.10 --- reaper.xml 16 Oct 2004 18:19:31 -0000 1.11 *************** *** 22,26 **** <maxstamina>0</maxstamina> <!-- Skills --> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="901" max="1000"/></magery> <magicresistance><random min="1001" max="1250"/></magicresistance> --- 22,26 ---- <maxstamina>0</maxstamina> <!-- Skills --> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="901" max="1000"/></magery> <magicresistance><random min="1001" max="1250"/></magicresistance> Index: elder_gazer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/elder_gazer.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** elder_gazer.xml 7 Sep 2004 00:28:02 -0000 1.11 --- elder_gazer.xml 16 Oct 2004 18:19:31 -0000 1.12 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="620" max="1000"/></anatomy> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="901" max="1000"/></magery> <magicresistance><random min="1151" max="1300"/></magicresistance> --- 22,26 ---- <!-- Skills --> <anatomy><random min="620" max="1000"/></anatomy> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="901" max="1000"/></magery> <magicresistance><random min="1151" max="1300"/></magicresistance> Index: phoenix.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/phoenix.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** phoenix.xml 21 Sep 2004 05:27:12 -0000 1.11 --- phoenix.xml 16 Oct 2004 18:19:31 -0000 1.12 *************** *** 22,26 **** <maxhitpoints><random min="340" max="383" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="902" max="1000"/></evaluatingintel> <magery><random min="902" max="1000"/></magery> <meditation><random min="751" max="1000"/></meditation> --- 22,26 ---- <maxhitpoints><random min="340" max="383" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="902" max="1000"/></evaluatingintelligence> <magery><random min="902" max="1000"/></magery> <meditation><random min="751" max="1000"/></meditation> Index: shadow_wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/shadow_wisp.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** shadow_wisp.xml 7 Sep 2004 00:28:03 -0000 1.11 --- shadow_wisp.xml 16 Oct 2004 18:19:31 -0000 1.12 *************** *** 24,28 **** <maxdamage>13</maxdamage> <!-- Skills --> ! <evaluatingintel>400</evaluatingintel> <magery>500</magery> <meditation>400</meditation> --- 24,28 ---- <maxdamage>13</maxdamage> <!-- Skills --> ! <evaluatingintelligence>400</evaluatingintelligence> <magery>500</magery> <meditation>400</meditation> Index: gazer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/gazer.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gazer.xml 21 Sep 2004 05:27:12 -0000 1.11 --- gazer.xml 16 Oct 2004 18:19:31 -0000 1.12 *************** *** 21,25 **** <maxhitpoints><random min="58" max="75" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="501" max="650"/></evaluatingintel> <magery><random min="501" max="650"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="58" max="75" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="501" max="650"/></evaluatingintelligence> <magery><random min="501" max="650"/></magery> <magicresistance><random min="601" max="750"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/giants Modified Files: titan.xml Log Message: npc mages Index: titan.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/titan.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** titan.xml 21 Sep 2004 05:27:13 -0000 1.14 --- titan.xml 16 Oct 2004 18:19:32 -0000 1.15 *************** *** 21,25 **** <maxhitpoints><random min="322" max="351"/></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="851" max="1000"/></evaluatingintel> <magery><random min="851" max="1000"/></magery> <magicresistance><random min="802" max="1100"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="322" max="351"/></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="851" max="1000"/></evaluatingintelligence> <magery><random min="851" max="1000"/></magery> <magicresistance><random min="802" max="1100"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/dragons Modified Files: ancient_wyrm.xml dragon.xml serpentine_dragon.xml shadow_wyrm.xml skeletal_dragon.xml white_wyrm.xml Log Message: npc mages Index: serpentine_dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/serpentine_dragon.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** serpentine_dragon.xml 7 Oct 2004 20:13:51 -0000 1.14 --- serpentine_dragon.xml 16 Oct 2004 18:19:31 -0000 1.15 *************** *** 21,25 **** <maxhitpoints>480</maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="1001" max="1100"/></evaluatingintel> <magery><random min="1101" max="1200"/></magery> <meditation>1000</meditation> --- 21,25 ---- <maxhitpoints>480</maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="1001" max="1100"/></evaluatingintelligence> <magery><random min="1101" max="1200"/></magery> <meditation>1000</meditation> Index: shadow_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/shadow_wyrm.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** shadow_wyrm.xml 7 Oct 2004 20:13:51 -0000 1.13 --- shadow_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.14 *************** *** 21,25 **** <maxhitpoints><random min="558" max="599" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="801" max="1000"/></evaluatingintel> <magery><random min="801" max="1000"/></magery> <meditation><random min="525" max="750"/></meditation> --- 21,25 ---- <maxhitpoints><random min="558" max="599" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="801" max="1000"/></evaluatingintelligence> <magery><random min="801" max="1000"/></magery> <meditation><random min="525" max="750"/></meditation> Index: ancient_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/ancient_wyrm.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ancient_wyrm.xml 10 Oct 2004 18:24:30 -0000 1.14 --- ancient_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.15 *************** *** 21,25 **** <maxhitpoints><random min="658" max="711" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="801" max="1000"/></evaluatingintel> <magery><random min="801" max="1000"/></magery> <meditation><random min="525" max="750"/></meditation> --- 21,25 ---- <maxhitpoints><random min="658" max="711" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="801" max="1000"/></evaluatingintelligence> <magery><random min="801" max="1000"/></magery> <meditation><random min="525" max="750"/></meditation> Index: white_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/white_wyrm.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** white_wyrm.xml 10 Oct 2004 18:24:30 -0000 1.18 --- white_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.19 *************** *** 21,25 **** <maxhitpoints><random min="433" max="456" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="991" max="1000"/></evaluatingintel> <magery><random min="991" max="1000"/></magery> <magicresistance><random min="991" max="1000"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="433" max="456" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="991" max="1000"/></evaluatingintelligence> <magery><random min="991" max="1000"/></magery> <magicresistance><random min="991" max="1000"/></magicresistance> Index: skeletal_dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/skeletal_dragon.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** skeletal_dragon.xml 7 Oct 2004 20:13:51 -0000 1.6 --- skeletal_dragon.xml 16 Oct 2004 18:19:31 -0000 1.7 *************** *** 26,30 **** <anatomy><random min="0" max="0" /></anatomy> <magery><random min="894" max="998" /></magery> ! <evaluatingintel><random min="729" max="768" /></evaluatingintel> <meditation><random min="624" max="673" /></meditation> <!-- Damage --> --- 26,30 ---- <anatomy><random min="0" max="0" /></anatomy> <magery><random min="894" max="998" /></magery> ! <evaluatingintelligence><random min="729" max="768" /></evaluatingintelligence> <meditation><random min="624" max="673" /></meditation> <!-- Damage --> Index: dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/dragon.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** dragon.xml 7 Oct 2004 20:13:51 -0000 1.16 --- dragon.xml 16 Oct 2004 18:19:31 -0000 1.17 *************** *** 21,25 **** <maxhitpoints><random min="478" max="495" /></maxhitpoints> <!-- Skills --> ! <evaluatingintel><random min="301" max="400"/></evaluatingintel> <magery><random min="301" max="400"/></magery> <magicresistance><random min="991" max="1000"/></magicresistance> --- 21,25 ---- <maxhitpoints><random min="478" max="495" /></maxhitpoints> <!-- Skills --> ! <evaluatingintelligence><random min="301" max="400"/></evaluatingintelligence> <magery><random min="301" max="400"/></magery> <magicresistance><random min="991" max="1000"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:23
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/monsters/clockwork Modified Files: betrayer.xml Log Message: npc mages Index: betrayer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork/betrayer.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** betrayer.xml 21 Sep 2004 05:27:12 -0000 1.12 --- betrayer.xml 16 Oct 2004 18:19:31 -0000 1.13 *************** *** 22,26 **** <!-- Skills --> <anatomy><random min="901" max="1000"/></anatomy> ! <evaluatingintel><random min="901" max="1000"/></evaluatingintel> <magery><random min="501" max="1000"/></magery> <meditation><random min="901" max="1000"/></meditation> --- 22,26 ---- <!-- Skills --> <anatomy><random min="901" max="1000"/></anatomy> ! <evaluatingintelligence><random min="901" max="1000"/></evaluatingintelligence> <magery><random min="501" max="1000"/></magery> <meditation><random min="901" max="1000"/></meditation> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:20:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3623/npcs/animals/mounts Modified Files: kirin.xml nightmare.xml unicorn.xml Log Message: npc mages Index: kirin.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/kirin.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** kirin.xml 21 Sep 2004 05:27:06 -0000 1.12 --- kirin.xml 16 Oct 2004 18:19:30 -0000 1.13 *************** *** 38,42 **** <magicresistance><random min="853" max="1000" /></magicresistance> <magery><random min="604" max="1000" /></magery> ! <evaluatingintel><random min="801" max="900" /></evaluatingintel> <meditation><random min="901" max="1000" /></meditation> <!-- Misc. --> --- 38,42 ---- <magicresistance><random min="853" max="1000" /></magicresistance> <magery><random min="604" max="1000" /></magery> ! <evaluatingintelligence><random min="801" max="900" /></evaluatingintelligence> <meditation><random min="901" max="1000" /></meditation> <!-- Misc. --> Index: unicorn.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/unicorn.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** unicorn.xml 21 Sep 2004 05:27:06 -0000 1.13 --- unicorn.xml 16 Oct 2004 18:19:30 -0000 1.14 *************** *** 37,41 **** <magicresistance><random min="753" max="900" /></magicresistance> <magery><random min="602" max="800" /></magery> ! <evaluatingintel><random min="801" max="900" /></evaluatingintel> <meditation><random min="501" max="600" /></meditation> <anatomy>0</anatomy> --- 37,41 ---- <magicresistance><random min="753" max="900" /></magicresistance> <magery><random min="602" max="800" /></magery> ! <evaluatingintelligence><random min="801" max="900" /></evaluatingintelligence> <meditation><random min="501" max="600" /></meditation> <anatomy>0</anatomy> Index: nightmare.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/nightmare.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** nightmare.xml 10 Oct 2004 18:24:28 -0000 1.15 --- nightmare.xml 16 Oct 2004 18:19:30 -0000 1.16 *************** *** 35,39 **** <magicresistance><random min="853" max="1000" /></magicresistance> <magery><random min="104" max="500" /></magery> ! <evaluatingintel><random min="104" max="500" /></evaluatingintel> <anatomy>0</anatomy> <meditation>0</meditation> --- 35,39 ---- <magicresistance><random min="853" max="1000" /></magicresistance> <magery><random min="104" max="500" /></magery> ! <evaluatingintelligence><random min="104" max="500" /></evaluatingintelligence> <anatomy>0</anatomy> <meditation>0</meditation> |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:19:54
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668 Modified Files: ChangeLog basechar.cpp items.cpp server.cpp timing.cpp wolfpack.vcproj Log Message: npc mages Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** server.cpp 9 Oct 2004 14:28:59 -0000 1.32 --- server.cpp 16 Oct 2004 18:19:40 -0000 1.33 *************** *** 28,31 **** --- 28,32 ---- #include "accounts.h" #include "ai/ai.h" + #include "ai/ai_mage.h" #include "basedef.h" #include "basics.h" *************** *** 466,469 **** --- 467,471 ---- Monster_Aggressive_L0::registerInFactory(); Monster_Aggressive_L1::registerInFactory(); + Monster_Mage::registerInFactory(); Monster_Berserk::registerInFactory(); Human_Vendor::registerInFactory(); Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** basechar.cpp 16 Oct 2004 13:51:35 -0000 1.164 --- basechar.cpp 16 Oct 2004 18:19:40 -0000 1.165 *************** *** 1275,1280 **** { strength_ = Value.toLong(); ! if ( maxHitpoints_ == 0 ) ! maxHitpoints_ = strength_; hitpoints_ = maxHitpoints_; } --- 1275,1279 ---- { strength_ = Value.toLong(); ! maxHitpoints_ = strength_; hitpoints_ = maxHitpoints_; } *************** *** 1282,1287 **** { dexterity_ = Value.toLong(); ! if ( maxStamina_ == 0 ) ! maxStamina_ = dexterity_; stamina_ = maxStamina_; } --- 1281,1285 ---- { dexterity_ = Value.toLong(); ! maxStamina_ = dexterity_; stamina_ = maxStamina_; } *************** *** 1289,1294 **** { intelligence_ = Value.toLong(); ! if ( maxMana_ == 0 ) ! maxMana_ = intelligence_; mana_ = maxMana_; } --- 1287,1291 ---- { intelligence_ = Value.toLong(); ! maxMana_ = intelligence_; mana_ = maxMana_; } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** ChangeLog 16 Oct 2004 14:06:31 -0000 1.115 --- ChangeLog 16 Oct 2004 18:19:40 -0000 1.116 *************** *** 58,61 **** --- 58,62 ---- - Fixed bug #0000353. (Riding horses not possible with body 0x3db) - Fixed command processing with command char . and body 0x3db. + - Added AI Monster_Mage. Wolfpack 12.9.11 Beta (26. September 2004) Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wolfpack.vcproj 8 Oct 2004 10:57:10 -0000 1.52 --- wolfpack.vcproj 16 Oct 2004 18:19:40 -0000 1.53 *************** *** 942,945 **** --- 942,951 ---- </File> <File + RelativePath=".\ai\ai_mage.cpp"> + </File> + <File + RelativePath=".\ai\ai_mage.h"> + </File> + <File RelativePath=".\ai\ai_monsters.cpp"> </File> Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.454 retrieving revision 1.455 diff -C2 -d -r1.454 -r1.455 *** items.cpp 12 Oct 2004 23:59:28 -0000 1.454 --- items.cpp 16 Oct 2004 18:19:40 -0000 1.455 *************** *** 2184,2188 **** P_ITEM pCont = dynamic_cast<P_ITEM>( container_ ); ! if ( pCont->hasScript( "lock" ) ) { return true; --- 2184,2188 ---- P_ITEM pCont = dynamic_cast<P_ITEM>( container_ ); ! if ( pCont->hasScript( "lock" ) && pCont->hasTag("locked") && pCont->getTag("locked").toInt() != 0 ) { return true; Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** timing.cpp 15 Oct 2004 16:29:07 -0000 1.20 --- timing.cpp 16 Oct 2004 18:19:40 -0000 1.21 *************** *** 438,442 **** { // Creatures owned by GMs won't hunger. ! if (!npc->owner() || !npc->owner()->isGMorCounselor()) { if ( npc->hunger() ) { --- 438,442 ---- { // Creatures owned by GMs won't hunger. ! if ( !npc->owner() || !npc->owner()->isGMorCounselor()) { if ( npc->hunger() ) { |
|
From: Sebastian H. <dar...@us...> - 2004-10-16 18:19:54
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668/ai Modified Files: ai.cpp ai.h ai_monsters.cpp Added Files: ai_mage.cpp ai_mage.h Log Message: npc mages --- NEW FILE: ai_mage.h --- #if !defined(__AI_MAGE_H__) class Monster_Mage: public Monster_Aggressive { protected: Monster_Mage() : Monster_Aggressive() { } public: Monster_Mage(P_NPC npc); static AbstractAI *create() { return new Monster_Mage(0); } static void registerInFactory() { AIFactory::instance()->registerType( "Monster_Mage", create ); } virtual QString name() { return "Monster_Mage"; } protected: virtual void selectVictim(); }; #endif --- NEW FILE: ai_mage.cpp --- #include "ai.h" #include "ai_mage.h" #include "../npc.h" #include "../combat.h" #include "../serverconfig.h" /* The additional mage code does: - Meditate while wandering to get more mana back. */ class Monster_Mage_Wander : public Monster_Aggr_Wander { protected: Monster_Mage_Wander() : Monster_Aggr_Wander() {} public: Monster_Mage_Wander(P_NPC npc, AbstractAI* ai) : Monster_Aggr_Wander(npc, ai) {} /* This is a slightly changed version of the combined super class methods. We still execute the wander action even if we dont really move. */ virtual float preCondition() { Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai ); if ( pAI && pAI->currentVictim() ) return 0.0f; if ( m_npc->attackTarget() ) return 0.0f; return 1.0f; } virtual void execute() { // Since we removed this from the precondition method, // we need check for it here. if ( m_npc->wanderType() != enHalt && ( m_npc->wanderType() != enDestination || m_npc->wanderDestination() != m_npc->pos() ) && ( m_npc->wanderType() != enFollowTarget || m_npc->inRange( m_npc->wanderFollowTarget(), Config::instance()->pathfindFollowRadius() ) ) ) { Monster_Aggr_Wander::execute(); } // Should we heal ourself? if (m_npc->hitpoints() < m_npc->maxHitpoints() // Only try to heal if we're not at full health && !m_npc->summoned() // Summoned creatures dont heal && (m_npc->skillValue(MAGERY) / 100) > RandomNum(1, 100) // We dont heal with every step ) { int toheal = m_npc->maxHitpoints() - m_npc->hitpoints(); // How many hitpoints did we loose? if (toheal >= 50 && m_npc->mana() >= 11) { // Is it worth the effort? Do we have enough mana? // Try a greater heal if (m_npc->canHandleEvent(EVENT_CASTSPELL)) { PyObject* args = Py_BuildValue( "(Nii[]N)", m_npc->getPyObject(), 29, 0, m_npc->getPyObject() ); bool result = m_npc->callEventHandler( EVENT_CASTSPELL, args ); Py_DECREF( args ); } } else if (m_npc->mana() >= 4) { // Only bother if we have enough mana // Try a normal heal instead if (m_npc->canHandleEvent(EVENT_CASTSPELL)) { PyObject* args = Py_BuildValue( "(Nii[]N)", m_npc->getPyObject(), 4, 0, m_npc->getPyObject() ); bool result = m_npc->callEventHandler( EVENT_CASTSPELL, args ); Py_DECREF( args ); } } } } virtual const char* name() { return "Monster_Mage_Wander"; } }; /* The additional mage code does: */ class Monster_Mage_Fight : public Monster_Aggr_Fight { protected: Monster_Mage_Fight() : Monster_Aggr_Fight() {} public: Monster_Mage_Fight(P_NPC npc, AbstractAI* ai) : Monster_Aggr_Fight(npc, ai) {} virtual float preCondition() { return Monster_Aggr_Fight::preCondition(); // Casting has precende if possible } virtual const char* name() { return "Monster_Mage_Fight"; } }; class Monster_Mage_Cast : public AbstractAction { protected: Monster_Mage_Cast() : AbstractAction() {} unsigned int nextSpellTime; int spell; cUObject *objTarget; Coord_cl posTarget; public: Monster_Mage_Cast(P_NPC npc, AbstractAI *ai) : AbstractAction(npc, ai) { nextSpellTime = 0; spell = -1; // Current Spell objTarget = 0; posTarget = Coord_cl::null; } // Is the target dispellable? bool canDispel(P_CHAR target) { P_NPC npc = dynamic_cast<P_NPC>(target); return npc && npc->summoned() && m_npc->inRange(npc, 12); } /* Find something to dispel we are fighting. */ P_NPC findDispelOpponent() { if (m_npc->intelligence() < 95 || m_npc->summoned()) { return 0; // No dispelling below 95 int or if the NPC is summoned itself. } QPtrList<cFightInfo> &fights = m_npc->fights(); Monster_Aggressive *ai = static_cast<Monster_Aggressive*>(m_ai); P_NPC currentTarget = 0; unsigned int currentPriority = 0; /* Check our current attack target. It has the highest priority of all since we are fighting it anyway. */ if (!invalidTarget(m_npc, ai->currentVictim()) && canDispel(ai->currentVictim())) { currentTarget = dynamic_cast<P_NPC>(ai->currentVictim()); currentPriority = m_npc->dist(ai->currentVictim()); if (currentPriority <= 2) { return currentTarget; // We found a threat in our range, so dispel it now. } } /* Now check everyone who is fighting us */ for (cFightInfo *info = fights.first(); info; info = fights.next()) { P_NPC checkTarget; if (info->victim() == m_npc) { checkTarget = dynamic_cast<P_NPC>(info->attacker()); } else { checkTarget = dynamic_cast<P_NPC>(info->victim()); } // They have to be fighting us or they are uninteresting for this check if (!checkTarget || checkTarget->attackTarget() != m_npc) { continue; } if (!invalidTarget(m_npc, checkTarget) && canDispel(checkTarget)) { unsigned int newPriority = m_npc->dist(checkTarget); if (!currentTarget || currentPriority > newPriority) { currentTarget = dynamic_cast<P_NPC>(ai->currentVictim()); currentPriority = m_npc->dist(ai->currentVictim()); if (currentPriority <= 2) { return currentTarget; // We found a threat in our range, so dispel it now. } } } } return currentTarget; } static const mageryPerCircle = (1000.0 / 7.0); /* Get the id of a random damage spell */ int getRandomHarmfulSpell() { unsigned char maxCircle = QMIN(8, QMAX(1, (unsigned char)((m_npc->skillValue(MAGERY) + 200) / mageryPerCircle))); int selected = RandomNum(1, maxCircle * 2) - 1; // Select a random spell // 5: Magic Arrow // 12: Harm // 18: Fireball // 30: Lightning // 37: Mind Blast // 42: Energy Bolt // 43: Explosion // 51: FlameStrike (Default) static int const spells[16] = { 5, 5, 12, 12, 18, 18, 30, 30, 37, 37, 42, 43, 51, }; return spells[selected]; } /* Chose a random spell */ void chooseSpell(int &spell, cUObject *&objTarget, Coord_cl &posTarget, P_CHAR currentVictim) { // If we are not summoned, try healing if (m_npc->hitpoints() < m_npc->maxHitpoints() // Only try to heal if we're not at full health && !m_npc->summoned() // Summoned creatures dont heal && (m_npc->skillValue(MAGERY) / 100) > RandomNum(1, 100) // We dont heal with every step ) { int toheal = m_npc->maxHitpoints() - m_npc->hitpoints(); // How many hitpoints did we loose? if (toheal >= 50 && m_npc->mana() >= 11) { // Is it worth the effort? Do we have enough mana? spell = 29; // Greater Heal objTarget = m_npc; return; } else if (toheal >= 10 && m_npc->mana() >= 4) { // Only bother if we have enough mana spell = 4; // Heal objTarget = m_npc; return; } } spell = getRandomHarmfulSpell(); objTarget = currentVictim; } virtual float preCondition() { // Can we cast a spell? if (nextSpellTime > Server::instance()->time()) { return 0.0f; } Monster_Aggressive *ai = static_cast<Monster_Aggressive*>(m_ai); // If we are already casting a spell, cancel this if (m_npc->hasScript("magic")) { return 0.0f; } // Reinitialize to "zero" spell = -1; objTarget = 0; posTarget = Coord_cl::null; // We dont have a spell ready, are ready to cast. P_NPC dispelTarget = findDispelOpponent(); if (m_npc->poison() != -1) { // Always try to cure if poisoned spell = 11; // Cure objTarget = m_npc; } else if (dispelTarget) { // We have something to dispel that is attacking us. Easily dispatch threat. spell = 41; // Dispel objTarget = dispelTarget; } else { P_CHAR currentVictim = ai->currentVictim(); if (currentVictim && m_npc->inRange(currentVictim, 12)) { chooseSpell(spell, objTarget, posTarget, currentVictim); // Choose a spell } } if (spell == -1) { return 0.0f; // We couldn't find a spell to cast } return 2.0f; // Give us priority in the fuzzy logic } virtual float postCondition() { return 1.0f; // One time action } virtual void execute() { if (spell == -1) { return; // Shouldn't happen } //m_npc->talk(tr("CASTING SPELL %1").arg(spell)); if (m_npc->canHandleEvent(EVENT_CASTSPELL)) { PyObject *target = PyGetObjectObject(objTarget); PyObject* args = Py_BuildValue( "(Nii[]N)", m_npc->getPyObject(), spell, 0, target ); bool result = m_npc->callEventHandler( EVENT_CASTSPELL, args ); Py_DECREF( args ); } nextSpellTime = Server::instance()->time() + 5000; // Cast all 5 seconds } virtual const char* name() { return "Monster_Mage_Cast"; } virtual bool isPassive() { return false; } }; /* The additional mage code does: - Run away from the current target if we are casting a spell. */ class Monster_Mage_MoveToTarget : public Monster_Aggr_Wander { protected: Monster_Mage_MoveToTarget() : Monster_Aggr_Wander() {} public: Monster_Mage_MoveToTarget(P_NPC npc, AbstractAI* ai) : Monster_Aggr_Wander(npc, ai) {} virtual float preCondition() { return Monster_Aggr_Wander::preCondition(); } virtual void execute() { Monster_Aggr_Wander::execute(); } virtual const char* name() { return "Monster_Mage_MoveToTarget"; } }; Monster_Mage::Monster_Mage( P_NPC npc ) : Monster_Aggressive( npc ) { m_actions.append( new Monster_Mage_Wander( npc, this ) ); m_actions.append( new Action_FleeAttacker( npc, this ) ); m_actions.append( new Monster_Mage_MoveToTarget( npc, this ) ); m_actions.append( new Monster_Mage_Fight( npc, this ) ); m_actions.append( new Monster_Mage_Cast( npc, this ) ); } void Monster_Mage::selectVictim() { } Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ai.h 16 Oct 2004 04:53:23 -0000 1.20 --- ai.h 16 Oct 2004 18:19:41 -0000 1.21 *************** *** 52,55 **** --- 52,59 ---- // #define AIDEBUG + // Export this for other AI functions + bool invalidTarget(P_NPC npc, P_CHAR victim, int dist = -1); + bool validTarget(P_NPC npc, P_CHAR victim, int dist = -1); + class AbstractAction { Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ai.cpp 16 Oct 2004 04:53:23 -0000 1.39 --- ai.cpp 16 Oct 2004 18:19:40 -0000 1.40 *************** *** 531,534 **** --- 531,535 ---- case enRectangle: case enWanderSpawnregion: + case enHalt: return 1.0f; Index: ai_monsters.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ai_monsters.cpp 16 Oct 2004 04:53:23 -0000 1.27 --- ai_monsters.cpp 16 Oct 2004 18:19:41 -0000 1.28 *************** *** 40,44 **** // Is this an invalid target? ! bool invalidTarget(P_NPC npc, P_CHAR victim, int dist = -1) { if (victim->isInvulnerable() || victim->isDead()) { return true; --- 40,48 ---- // Is this an invalid target? ! bool invalidTarget(P_NPC npc, P_CHAR victim, int dist) { ! if (!victim) { ! return true; ! } ! if (victim->isInvulnerable() || victim->isDead()) { return true; *************** *** 65,69 **** // Is this a valid target? ! bool validTarget(P_NPC npc, P_CHAR victim, int dist = -1) { if (invalidTarget(npc, victim, dist)) { return false; --- 69,73 ---- // Is this a valid target? ! bool validTarget(P_NPC npc, P_CHAR victim, int dist) { if (invalidTarget(npc, victim, dist)) { return false; *************** *** 328,334 **** } if ( Config::instance()->pathfind4Combat() && m_npc->dist(currentVictim) < 5 ) { ! if (!movePath( currentVictim->pos() )) { nextTry = Server::instance()->time() + RandomNum(1250, 2250); } --- 332,340 ---- } + bool run = m_npc->dist(currentVictim) > 3; + if ( Config::instance()->pathfind4Combat() && m_npc->dist(currentVictim) < 5 ) { ! if (!movePath( currentVictim->pos(), run )) { nextTry = Server::instance()->time() + RandomNum(1250, 2250); } *************** *** 336,340 **** else { ! moveTo( currentVictim->pos() ); } } --- 342,346 ---- else { ! moveTo( currentVictim->pos(), run ); } } |
