Changeset 427

Timestamp:

07/06/08 23:45:25 (2 years ago)

Author:

kyle

Message:

[Added] Deathwatch Bunker
[Fixed] Ft. Tusken Aggro
Thanks to Macrona and rapter13

Files:

• core3devel/MMOCoreORB/bin/config.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/creatureObjects.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/battleDroidDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/blackSunAssassinDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/blackSunHenchmanDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/blackSunThugDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/deathWatchBloodguardDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/deathWatchGhostDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/deathWatchOverlordDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/deathWatchWraithDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/engineerDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/mineRatDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/minerDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/superBattleDroidDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/technicianDWB.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenCaptain.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenEliteGuard.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenExecutioner.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenKing.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenObserver.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenRaider.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenSniper.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWarlord.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWarrior.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWitchDoctor.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/twilekSlave.lua (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/spawns.lua (modified) (1 diff)
• core3devel/MMOCoreORB/bin/scripts/creatures/spawns/endor (added)
• core3devel/MMOCoreORB/bin/scripts/creatures/spawns/endor/deathWatchBunker.lua (added)
• core3devel/MMOCoreORB/bin/scripts/skills/creatureSkills/dwbAttacks.lua (added)
• core3devel/MMOCoreORB/bin/scripts/skills/creatureSkills/dwbMeleeAttacks.lua (added)
• core3devel/MMOCoreORB/bin/scripts/skills/creatureSkills/dwbSBDAttacks.lua (added)
• core3devel/MMOCoreORB/bin/scripts/skills/creatureSkills/mineRatAttacks.lua (added)
• core3devel/MMOCoreORB/bin/scripts/skills/skills.lua (modified) (1 diff)
• core3devel/MMOCoreORB/build/unix/Makefile (modified) (4 diffs)
• core3devel/MMOCoreORB/build/unix/config.log (modified) (7 diffs)
• core3devel/MMOCoreORB/build/unix/config.status (modified) (3 diffs)
• core3devel/MMOCoreORB/src/server/zone/objects/creature/CreatureImplementation.cpp (modified) (85 diffs)
• core3devel/MMOCoreORB/src/server/zone/objects/player/Player.cpp (modified) (1 diff)
• core3devel/MMOCoreORB/src/server/zone/objects/player/PlayerObject.cpp (modified) (1 diff)
• core3devel/MMOCoreORB/src/server/zone/objects/static/firework/FireworkWorld.cpp (modified) (1 diff)
• core3devel/MMOCoreORB/src/server/zone/objects/tangible/firework/Firework.cpp (modified) (1 diff)

core3devel/MMOCoreORB/bin/config.lua

@@ -50 +50 @@
-
-
-27.0.0.1
+92.168.1.180
-DBPort = 3306
-
-swgemu
-123456
+2
+root
+351windsor
-
-LoginPort = 44453

core3devel/MMOCoreORB/bin/scripts/creatures/creatureObjects.lua

@@ -206 +206 @@
-
-----------------------------------------------------
+
+-- Death Watch Bunker
+
+RunCreatureFile("objects/creatures/battleDroidDWB.lua")
+RunCreatureFile("objects/creatures/blackSunThugDWB.lua")
+RunCreatureFile("objects/creatures/blackSunHenchmanDWB.lua")
+RunCreatureFile("objects/creatures/blackSunAssassinDWB.lua")
+RunCreatureFile("objects/creatures/deathWatchGhostDWB.lua")
+RunCreatureFile("objects/creatures/deathWatchBloodguardDWB.lua")
+RunCreatureFile("objects/creatures/deathWatchWraithDWB.lua")
+RunCreatureFile("objects/creatures/superBattleDroidDWB.lua")
+RunCreatureFile("objects/creatures/mineRatDWB.lua")
+RunCreatureFile("objects/creatures/technicianDWB.lua")
+RunCreatureFile("objects/creatures/minerDWB.lua")
+RunCreatureFile("objects/creatures/engineerDWB.lua")
+RunCreatureFile("objects/creatures/deathWatchOverlordDWB.lua")
+
+
+--- lulz
+
+RunCreatureFile("objects/creatures/twilekSlave.lua")

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenCaptain.lua

@@ -50 +50 @@
-        level = 120,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 80000,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenEliteGuard.lua

@@ -50 +50 @@
-        level = 44,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health= 6500,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenExecutioner.lua

@@ -50 +50 @@
-        level = 263,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 290000,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenKing.lua

@@ -50 +50 @@
-        level = 150,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 120000,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenObserver.lua

@@ -50 +50 @@
-        level = 227,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 230765,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenRaider.lua

@@ -50 +50 @@
-        level = 65,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 10400,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenSniper.lua

@@ -50 +50 @@
-        level = 22,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 2400,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWarlord.lua

@@ -50 +50 @@
-        level = 62,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 78000,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWarrior.lua

@@ -50 +50 @@
-        level = 80,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health= 8500,

core3devel/MMOCoreORB/bin/scripts/creatures/objects/creatures/tuskenWitchDoctor.lua

@@ -50 +50 @@
-        level = 202,
-        
-
+ + AGGRESSIVE_FLAG
-
-        health = 178000,

core3devel/MMOCoreORB/bin/scripts/creatures/spawns.lua

@@ -58 +58 @@
-RunCreatureFile("spawns/corellia/lordNyaxCult.lua")
-RunCreatureFile("spawns/corellia/rogueCorsec.lua")
+
+-- Endor
+RunCreatureFile("spawns/endor/deathWatchBunker.lua")

core3devel/MMOCoreORB/bin/scripts/skills/skills.lua

@@ -116 +116 @@
-RunSkillsFile("creatureSkills/afarathuAttacks.lua")
-RunSkillsFile("creatureSkills/drallAttacks.lua")
+RunSkillsFile("creatureSkills/dwbAttacks.lua")
+RunSkillsFile("creatureSkills/mineRatAttacks.lua")
+RunSkillsFile("creatureSkills/dwbSBDAttacks.lua")
+RunSkillsFile("creatureSkills/dwbMeleeAttacks.lua")

core3devel/MMOCoreORB/build/unix/Makefile

@@ -117 +117 @@
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
-AWK = gawk
-CFLAGS = 
@@ -144 +144 @@
-LIBS = 
-LTLIBOBJS = 
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
-MKDIR_P = /usr/bin/mkdir -p
-OBJEXT = o
@@ -163 +163 @@
-USER_LIBS_PATH = /usr/local/lib
-VERSION = 1.0
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
-ac_ct_CXX = g++
-am__include = include
@@ -193 +193 @@
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec

core3devel/MMOCoreORB/build/unix/config.log

@@ -11 +11 @@
-## --------- ##
-
-joe-a3bbb575c6b
+Kyle-PC
-uname -m = i686
-uname -r = 1.5.25(0.156/4/2)
-5.1
-3-05 19:27
+6.0-WOW64
+4-17 12:11
-
-/usr/bin/uname -p = unknown
@@ -28 +28 @@
-/bin/universe          = unknown
-
-
+
+
+
+
+
-PATH: /usr/bin
-
-
-
-
-
-
-
-
-
+
-
-
@@ -130 +126 @@
-  $ ./config.status 
-
-joe-a3bbb575c6b
+Kyle-PC
-
-config.status:651: creating Makefile
@@ -144 +140 @@
-ac_cv_build=i686-pc-cygwin
-ac_cv_cxx_compiler_gnu=yes
+ac_cv_env_build_alias_set=
+ac_cv_env_build_alias_value=
-ac_cv_env_CCC_set=
-ac_cv_env_CCC_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
+ac_cv_env_CXX_set=
+ac_cv_env_CXX_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-CXX
-CXX
+host_alias
+host_alias
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
@@ -167 +163 @@
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_path_mkdir=/usr/bin/mkdir
-ac_cv_prog_AWK=gawk
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_ac_ct_RANLIB=ranlib
+ac_cv_prog_AWK=gawk
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_make_make_set=yes
@@ -179 +175 @@
-## ----------------- ##
-
-ACLOCAL='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run aclocal-1.10'
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run tar'
-AUTOCONF='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run automake-1.10'
-AWK='gawk'
-CFLAGS=''
-CPPFLAGS=''
-CXX='g++'
-CXXDEPMODE='depmode=gcc3'
-CXXFLAGS='  '
-CYGPATH_W='cygpath -w'
-DEFS='-DHAVE_CONFIG_H'
-DEPDIR='.deps'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EXEEXT='.exe'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/Administrator/workspace/MMOCoreORB/build/unix/config/missing --run makeinfo'
-OBJEXT='o'
-PACKAGE='core3'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME='core3'
-PACKAGE_STRING='core3 1.0'
-PACKAGE_TARNAME='core3'
-PACKAGE_VERSION='1.0'
-PATH_SEPARATOR=':'
-RANLIB='ranlib'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-SYSTEM_INCLUDES=''
-SYSTEM_LIBS='-lpthread -lwsock32'
-USER_INCLUDES_PATH='/usr/local/include'
-USER_LIBS_PATH='/usr/local/lib'
-VERSION='1.0'
-ac_ct_CXX='g++'
+ACLOCAL='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run aclocal-1.10'
-am__fastdepCXX_FALSE='#'
-am__fastdepCXX_TRUE=''
@@ -235 +185 @@
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
+AMDEP_FALSE='#'
+AMDEP_TRUE=''
+AMDEPBACKSLASH='\'
+AMTAR='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run tar'
+AUTOCONF='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run autoconf'
+AUTOHEADER='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run autoheader'
+AUTOMAKE='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run automake-1.10'
+AWK='gawk'
-bindir='${exec_prefix}/bin'
-build='i686-pc-cygwin'
-build_alias=''
-build_cpu='i686'
-build_os='cygwin'
-build_vendor='pc'
+build='i686-pc-cygwin'
+CFLAGS=''
+CPPFLAGS=''
+CXX='g++'
+CXXDEPMODE='depmode=gcc3'
+CXXFLAGS='  '
+CYGPATH_W='cygpath -w'
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
+DEFS='-DHAVE_CONFIG_H'
+DEPDIR='.deps'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-dvidir='${docdir}'
+ECHO_C=''
+ECHO_N='-n'
+ECHO_T=''
-exec_prefix='${prefix}'
-host='i686-pc-cygwin
+EXEEXT='.exe
-host_alias=''
-host_cpu='i686'
-host_os='cygwin'
-host_vendor='pc'
+host='i686-pc-cygwin'
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${datarootdir}/info'
-
+
+
+
+
+
+
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
+LIBOBJS=''
+LIBS=''
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}/var'
+LTLIBOBJS=''
+MAKEINFO='${SHELL} /cygdrive/c/workspace2/MMOCoreORB2/build/unix/config/missing --run makeinfo'
-mandir='${datarootdir}/man'
-mkdir_p='/usr/bin/mkdir -p'
+OBJEXT='o'
-oldincludedir='/usr/include'
+PACKAGE_BUGREPORT=''
+PACKAGE_NAME='core3'
+PACKAGE_STRING='core3 1.0'
+PACKAGE_TARNAME='core3'
+PACKAGE_VERSION='1.0'
+PACKAGE='core3'
+PATH_SEPARATOR=':'
-pdfdir='${docdir}'
-prefix='/usr/local'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
+RANLIB='ranlib'
-sbindir='${exec_prefix}/sbin'
+SET_MAKE=''
-sharedstatedir='${prefix}/com'
+SHELL='/bin/sh'
+STRIP=''
-sysconfdir='${prefix}/etc'
-
+
+
-target_alias=''
-target_cpu='i686'
-target_os='cygwin'
-target_vendor='pc'
+target='i686-pc-cygwin'
+USER_INCLUDES_PATH='/usr/local/include'
+USER_LIBS_PATH='/usr/local/lib'
+VERSION='1.0'
-
-## ----------- ##

core3devel/MMOCoreORB/build/unix/config.status

@@ -342 +342 @@
-gives unlimited permission to copy, distribute and modify it."
-
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
-srcdir='../..'
-INSTALL='/usr/bin/install -c'
@@ -553 +553 @@
-s,@PACKAGE@,|#_!!_#|core3,g
-s,@VERSION@,|#_!!_#|1.0,g
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
+cygdrive/c/workspace2/MMOCoreORB2
-s,@STRIP@,|#_!!_#|,g
-s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
@@ -565 +565 @@
-s,@SET_MAKE@,|#_!!_#|,g
-s,@am__leading_dot@,|#_!!_#|.,g
-home/Administrator/workspace/MMOCoreORB
+cygdrive/c/workspace2/MMOCoreORB2
-s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
-s,@am__untar@,|#_!!_#|${AMTAR} xf -,g

core3devel/MMOCoreORB/src/server/zone/objects/creature/CreatureImplementation.cpp

@@ -1 +1 @@
-/*
-Copyright (C) 2007 <SWGEmu>
-
+
-This File is part of Core3.
-
- 
- 
+
+
+
-General Public License as published by the Free Software
- 
+
-or (at your option) any later version.
-
- 
- 
- 
+
+
+
+
-See the GNU Lesser General Public License for
-more details.
-
- 
+
+
-Public License along with this program; if not, write to
-the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- 
- 
- 
+
+
+
+
-cover the whole combination.
-
- 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
-and as the GNU LGPL requires distribution of source code.
-
- 
- 
- 
- 
- 
+
+
+
+
+
+
-which carries forward this exception.
-*/
@@ -48 +48 @@
-#include "../../packets.h"
-
- 
- 
+
+
-
-#include "../terrain/Terrain.h"
@@ -74 +74 @@
-        objectID = oid;
-        type = CREATURE;
-
+
-        baseID = oid;
-
+
-        stfName = "mob/creature_names";
-
-        creatureGroup = group;
-
+
-        setKeeping(true);
-
@@ -89 +89 @@
-        if (nextPosition != NULL) {
-                delete nextPosition;
-
+
-                nextPosition = NULL;
-        }
-
+
-        if (spawnPosition != NULL) {
-                delete spawnPosition;
-
+
-                spawnPosition = NULL;
-        }
@@ -113 +113 @@
-        // constants
-        itemShift = 100;
-
+
-        activityCount = 0;
-        highestMadeDamage = 0;
-
+
-        respawnTimer = 60;
-
+
-        lair = NULL;
-
+
-        level = 250;
-
+
-        nextPosition = new PatrolPoint();
-
+
-        spawnPosition = new PatrolPoint();
-
+
-        randomizeRespawn = false;
-
+
-        actualSpeed = 0.f;
-
+
-        movementCounter = 0;
-
@@ -136 +136 @@
-        aggroedCreature = NULL;
-        willAggro = false;
-
+
-        lootCreated = false;
-
+
-        setObjectKeeping(true);
-
+
-        stringstream logname;
-        logname << "NPC = 0x" << hex << objectID;
-
-        setLockName(logname.str());
-
+
-        setLoggingName(logname.str());
-
+
-        setLogging(false);
-        setGlobalLogging(true);
@@ -180 +180 @@
-        if (stun == 100)
-                alm->insertAttribute("cat_armor_special_protection.armor_eff_stun", "100%");
-
+
-        if (blast == 100)
-                alm->insertAttribute("cat_armor_special_protection.armor_eff_blast", "100%");
@@ -202 +202 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_kinetic", txt.str());
-        }
-
+
-        if (energy > 0 && energy < 100) {
-                stringstream txt;
@@ -208 +208 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_energy", txt.str());
-        }
-
+
-        if (electricity > 0 && electricity < 100) {
-                stringstream txt;
@@ -214 +214 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_elemental_electrical", txt.str());
-        }
-
+
-        if (stun > 0 && stun < 100) {
-                stringstream txt;
@@ -220 +220 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_stun", txt.str());
-        }
-
+
-        if (blast > 0 && blast < 100) {
-                stringstream txt;
@@ -226 +226 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_blast", txt.str());
-        }
-
+
-        if (heat > 0 && heat < 100) {
-                stringstream txt;
@@ -232 +232 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_elemental_heat", txt.str());
-        }
-
+
-        if (cold > 0 && cold < 100) {
-                stringstream txt;
@@ -238 +238 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_elemental_cold", txt.str());
-        }
-
+
-        if (acid > 0 && acid < 100) {
-                stringstream txt;
@@ -244 +244 @@
-                alm->insertAttribute("cat_armor_effectiveness.armor_eff_elemental_acid", txt.str());
-        }
-
+
-        if (lightSaber > 0 && lightSaber < 100) {
-                stringstream txt;
@@ -283 +283 @@
-void CreatureImplementation::reload() {
-        creatureManager->respawnCreature(_this);
-
+
-        resetState();
-
-        insertToZone(zone);
-
+
-        info("creature respawned");
-}
@@ -295 +295 @@
-
-        clearTarget();
-
+
-        clearLootItems();
-
+
-        resetPatrolPoints(false);
-
@@ -304 +304 @@
-
-        creatureManager->despawnCreature(_this);
-
+
-        setPosition(spawnPosition->getPositionX(), spawnPosition->getPositionZ(), spawnPosition->getPositionY());
-
+
-        uint64 respawnCellID = spawnPosition->getCellID();
-
+
-        if (respawnCellID != 0)
-                parent = zone->lookupObject(respawnCellID);
-
+
-        info("creature despawned");
-}
@@ -318 +318 @@
-        while (!lootContainer->isEmpty()) {
-                SceneObject* object = lootContainer->getObject((int)0);
-
+
-                lootContainer->removeObject((int)0);
-
+
-                object->finalize();
-        }
-
+
-        setCashCredits(0);
-
+
-        lootCreated = false;
-}
@@ -331 +331 @@
-void CreatureImplementation::loadItems() {
-        inventory = new Inventory(_this);
-
+
-        lootContainer = new CreatureInventory(_this);
-
+
-        Weapon* weapon = NULL;
-
+
-        if (objectCRC == 0x738E0B1F) { //Zealot of Lord Nyax + Diciple of Lord Nyax
-                weapon = new CarbineRangedWeapon(_this, "object/weapon/ranged/carbine/shared_carbine_laser.iff", unicode("a Laser Carbine"), "carbine_laser", true);
@@ -342 +342 @@
-                weapon->setAttackSpeed(1.5);
-                weapon->setDamageType(WeaponImplementation::ENERGY);
-        
-              
- 
+
+
+
-                //Imperial GeneralMajor // Imperial General // Imperial High Colonel / Imperial Surface Marshall // Imperial Major
-                weapon = new PistolRangedWeapon(_this, "object/weapon/ranged/pistol/shared_pistol_dl44.iff", unicode("a DL-44 Pistol"), "pistol_dl44", true);
@@ -351 +351 @@
-                weapon->setAttackSpeed(2.5);
-                weapon->setDamageType(WeaponImplementation::ENERGY);
- 
+
-                setImperial();
-        }
@@ -362 +362 @@
-                weapon->setArmorPiercing(WeaponImplementation::LIGHT);
-                setImperial();
-      
+
-        else if (objectCRC == 0x4E38DA33) { //Dark trooper
-                //we assign but do not equip the weapon! We just need the line "setImperial" - but without an assigned weapon we will crash (Farmer John, 04. June 2008)
@@ -372 +372 @@
-                weapon->setArmorPiercing(WeaponImplementation::LIGHT);
-                setImperial();
- 
- 
- 
- 
+
+
+
+
-                         objectCRC == 0xFECB7C04 || objectCRC == 0xD96A33B7) { //Corsecs (also used for Rogue Corsecs!)
-                weapon = new PistolRangedWeapon(_this, "object/weapon/ranged/pistol/shared_pistol_cdef_corsec.iff", unicode("Corsec CDEF Pistol"), "pistol_cdef_corsec", true);
@@ -383 +383 @@
-                weapon->setDamageType(WeaponImplementation::ENERGY);
-                weapon->setArmorPiercing(WeaponImplementation::LIGHT);
-      
+
-        else if (objectCRC == 0xFECDC4DE || objectCRC == 0x7EDC1419) { //  AT AT    / AT ST
-                weapon = new RifleRangedWeapon(_this,"object/weapon/ranged/vehicle/shared_vehicle_atst_ranged.iff", unicode("Imperial Cannon"), "vehicle_atst_ranged");
-          
+
-                setImperial();
-        }
-        else if (objectCRC == 0x8C70914) {
- 
- 
+
+
-                                unicode("Darth Saber"), "sword_lightsaber_one_handed_s4_gen4", true);
-                weapon->setDamageType(WeaponImplementation::LIGHTSABER);
-                weapon->setArmorPiercing(WeaponImplementation::NONE);
-        } else if (objectCRC == 0x2B0C220E || objectCRC == 0x476794EB || objectCRC == 0x4A889CCF ||
- 
-                
+
+
-                switch (System::random(1)) {
-                case 0 :
@@ -408 +408 @@
-                        break;
-                case 1 :
- 
+
-                                        "object/weapon/melee/baton/shared_baton_stun.iff", unicode("a Stun Baton"), "baton_stun", true);
-                        weapon->setMinDamage(175 + level);
@@ -425 +425 @@
-                        weapon->setDamageType(WeaponImplementation::ENERGY);
-                        weapon->setArmorPiercing(WeaponImplementation::LIGHT);
-
+
-        } else if (objectCRC ==0x148D60AA) {
-                //melee tusken raider
@@ -435 +435 @@
-                        weapon->setArmorPiercing(WeaponImplementation::NONE);
-
+        } else if (objectCRC ==0xE21E6148) {
+                        //SBD 0xE21E6148
+                        weapon = new CarbineRangedWeapon(_this, "object/weapon/ranged/droid/shared_droid_droideka_ranged.iff", unicode("a SBD"), "droideka_ranged", true);
+                                weapon->setMinDamage(600 + level);
+                                weapon->setMaxDamage(1300 + level);
+                                weapon->setAttackSpeed(1.5);
+                                weapon->setDamageType(WeaponImplementation::ENERGY);
+                                weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
+
+        } else if (objectCRC ==0xD3C915F9 || objectCRC ==0xB8270A11) {
+                        //Death Watch Wraith // Ghosts
+                        weapon = new RifleRangedWeapon(_this, "object/weapon/ranged/rifle/shared_rifle_tenloss_dxr6_disruptor_loot.iff", unicode("a Dxr6_Disrupter"), "rifle_dxr6", true);
+                                weapon->setMinDamage(500 + level);
+                                weapon->setMaxDamage(800 + level);
+                                weapon->setAttackSpeed(1.5);
+                                weapon->setDamageType(WeaponImplementation::ENERGY);
+                                weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
+
+        } else if (objectCRC ==0xD83D2DEC || objectCRC ==0x730E66DF || objectCRC ==0xAD30C613) {
+                        //Black Sun Henchmen Assassin Thug
+                        weapon = new RifleRangedWeapon(_this, "object/weapon/ranged/rifle/shared_rifle_tenloss_dxr6_disruptor_loot.iff", unicode("a Dxr6_Disrupter"), "rifle_dxr6", true);
+                                weapon->setMinDamage(400 + level);
+                                weapon->setMaxDamage(600 + level);
+                                weapon->setAttackSpeed(1.5);
+                                weapon->setDamageType(WeaponImplementation::ENERGY);
+                                weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
+
+        } else if (objectCRC ==0x79BC6EB3) {
+                        //Battle Droid
+                        weapon = new CarbineRangedWeapon(_this, "object/weapon/ranged/carbine/shared_carbine_elite.iff", unicode("a E5_Carbine"), "carbine_elite", true);
+                                weapon->setMinDamage(400 + level);
+                                weapon->setMaxDamage(600 + level);
+                                weapon->setAttackSpeed(1.5);
+                                weapon->setDamageType(WeaponImplementation::ENERGY);
+                                weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
+
+        } else if (objectCRC ==0xC3DE9EF6) {
+                        //Death Watch Blood Guards
+                        weapon = new OneHandedMeleeWeapon(_this, "object/weapon/melee/baton/shared_baton_stun.iff", unicode("a Stun_Baton"), "baton_stun", true);
+                                weapon->setMinDamage(440 + level);
+                                weapon->setMaxDamage(600 + level);
+                                weapon->setAttackSpeed(2);
+                                weapon->setDamageType(WeaponImplementation::STUN);
+                                weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
+
+        } else if (objectCRC ==0x320DD865) {
+                        //Death Watch Overlord
+                        weapon = new OneHandedMeleeWeapon(_this, "object/weapon/melee/baton/shared_baton_stun.iff", unicode("a Stun_Baton"), "baton_stun", true);
+                                weapon->setMinDamage(1850 + level);
+                                weapon->setMaxDamage(2250 + level);
+                                weapon->setAttackSpeed(3);
+                                weapon->setDamageType(WeaponImplementation::STUN);
+                                weapon->setArmorPiercing(WeaponImplementation::HEAVY);
+
+        } else if (objectCRC ==0xEA0D8178 || objectCRC ==0x42DB151E || objectCRC ==0xD5A733A8) {
+                        //DWB Miners
+                        weapon = new PistolRangedWeapon(_this, "object/weapon/ranged/pistol/shared_pistol_cdef.iff", unicode("a CDEF_Pistol"), "pistol_cdef", true);
+                                weapon->setMinDamage(100 + level);
+                                weapon->setMaxDamage(175 + level);
+                                weapon->setAttackSpeed(2.5);
+                                weapon->setDamageType(WeaponImplementation::ENERGY);
+                                weapon->setArmorPiercing(WeaponImplementation::LIGHT);
+
-        } else if (objectCRC == 0x6BABDCC0 || objectCRC == 0x35F5AD39 || objectCRC == 0x113E9DB3 ||
-                           objectCRC == 0x6050E92E || objectCRC == 0x46ABF8A1 || objectCRC == 0x71F874) {
@@ -440 +503 @@
-                switch (System::random(1)) {
-                case 0 :
- 
+
-                                        "object/weapon/melee/polearm/shared_lance_vibrolance.iff", unicode("a Vibrolance"), "lance_vibrolance", true);
-                        weapon->setMinDamage(250 + level);
@@ -449 +512 @@
-                        break;
-                case 1 :
- 
+
-                                        "object/weapon/melee/polearm/shared_polearm_vibro_axe.iff", unicode("a Long Vibro Axe"), "lance_vibro_axe", true);
-                        weapon->setMinDamage(250 + level);
@@ -459 +522 @@
-                }
-
- 
- 
-                
+
+
+
-                switch (System::random(1)) {
-                case 0 :
- 
+
-                                        "object/weapon/melee/baton/shared_baton_gaderiffi.iff", unicode("a Gaderiffi"), "baton_gaderiffi", true);
-                        weapon->setMinDamage(175 + level);
@@ -473 +536 @@
-                        break;
-                case 1 :
- 
+
-                                        "object/weapon/melee/baton/shared_baton_stun.iff", unicode("a Stun Baton"), "baton_stun", true);
-                        weapon->setMinDamage(175 + level);
@@ -481 +544 @@
-                        weapon->setArmorPiercing(WeaponImplementation::NONE);
-                        break;
-      
-
- 
+
+
+
-                           objectCRC == 0x44F934A9) {
-                // High Level NS
-                switch (System::random(1)) {
-                case 0 :
- 
+
-                                        "object/weapon/melee/polearm/shared_lance_vibrolance.iff", unicode("a Vibrolance"), "lance_vibrolance", true);
-                        weapon->setMinDamage(250 + level);
@@ -497 +560 @@
-                        break;
-                case 1 :
- 
+
-                                        "object/weapon/melee/polearm/shared_polearm_vibro_axe.iff", unicode("a Long Vibro Axe"), "lance_vibro_axe", true);
-                        weapon->setMinDamage(250 + level);
@@ -506 +569 @@
-                        break;
-                }
- 
- 
-  
- 
- 
- 
- 
- 
- 
- 
- 
-  
- 
- 
- 
- 
- 
-        
- 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                // NS Queen
-                switch (System::random(1)) {
-                case 0 :
- 
+
-                                "object/weapon/melee/baton/shared_baton_gaderiffi.iff", unicode("a Gaderiffi"), "baton_gaderiffi", true);
-                        weapon->setMinDamage(800 + level);
@@ -537 +600 @@
-                        break;
-                case 1 :
- 
+
-                                "object/weapon/melee/baton/shared_baton_stun.iff", unicode("a Stun Baton"), "baton_stun", true);
-                        weapon->setMinDamage(900 + level);
@@ -546 +609 @@
-                        break;
-                }
- 
- 
- 
+
+
+
-                switch (System::random(1)) {
-                case 0 :
- 
+
-                                "object/weapon/melee/polearm/shared_polearm_vibro_axe.iff", unicode("a Long Vibro Axe"), "lance_vibro_axe", true);
-                        weapon->setMinDamage(250 + level);
@@ -560 +623 @@
-                        break;
-                case 1 :
- 
+
-                                "object/weapon/melee/axe/shared_axe_vibroaxe.iff", unicode("a Vibro Axe"), "axe_vibro", true);
-                        weapon->setMinDamage(200 + level);
@@ -567 +630 @@
-                        weapon->setDamageType(WeaponImplementation::KINETIC);
-                        weapon->setArmorPiercing(WeaponImplementation::MEDIUM);
-         
+
-                }
-        } else if (objectCRC == 0xFB872285) { // lord nyax
- 
+
-                                "object/weapon/ranged/carbine/shared_carbine_e11.iff", unicode("a e11 Carbine"), "carbine_e11", true);
-                weapon->setMinDamage(550);
@@ -594 +657 @@
-        try {
-                zone->lock();
-
+
-                zone->registerObject(_this);
-
-                if (parent != NULL) {
-                        BuildingObject* building = (BuildingObject*)parent->getParent();
-
+
-                        insertToBuilding(building);
-
+
-                        building->notifyInsertToZone(_this);
- 
+
-                        zone->insert(this);
-                        zone->inRange(this, 128);
-                }
-
+
-                zone->unlock();
-        } catch (...) {
@@ -644 +707 @@
-void CreatureImplementation::updateZone(bool lightUpdate, bool sendPackets) {
-        bool insert = false;
-
+
-        try {
-                zone->lock();
-
+
-                if (parent != NULL && parent->isCell()) {
-                        CellObject* cell = (CellObject*)parent;
@@ -661 +724 @@
-                else
-                        zone->update(this);
-
+
-                zone->inRange(this, 128);
-
@@ -737 +800 @@
-void CreatureImplementation::updateCreaturePosition(bool lightUpdate) {
-        ++movementCounter;
-
+
-        for (int i = 0; i < inRangeObjectCount(); ++i) {
-                SceneObject* obj = (SceneObject*) (((SceneObjectImplementation*) getInRangeObject(i))->_getStub());
@@ -766 +829 @@
-void CreatureImplementation::removeFromZone(bool doLock) {
-        deagro();
-
+
-        try {
-                if (zone == NULL || !isInQuadTree())
-                        return;
-
+
-                zone->lock(doLock);
-
+
-                if (parent != NULL && parent->isCell()) {
-                        CellObject* cell = (CellObject*) parent;
@@ -783 +846 @@
-        for (int i = 0; i < inRangeObjectCount(); ++i) {
-                        QuadTreeEntry* obj = getInRangeObject(i);
-
+
-                        if (obj != this)
-                                obj->removeInRangeObject(this);
@@ -789 +852 @@
-
-                removeInRangeObjects();
-
+
-                zone->deleteObject(objectID);
-
@@ -827 +890 @@
-                if (obj == this)
-                        return;
-
+
-                if (!isCreature() || aggroedCreature != NULL || isInCombat()) {
-                        return;
-                }
-
+
-
-                SceneObject* scno = (SceneObject*) (((SceneObjectImplementation*) obj)->_getStub());
-
+
-                if (scno == targetObject) {
-                        return;
@@ -882 +945 @@
-        try {
-                wlock();
-
+
-                if (!checkState() || zone == NULL) {
-                        unlock();
-                        return false;
-                }
-
+
-                bool needMoreActivity = false;
-
@@ -894 +957 @@
-                } else if (doRandomMovement) {
-                        doRandomMovement = false;
-
+
-                        addRandomPatrolPoint(32 + System::random(64), false);
-                }
-
+
-                needMoreActivity |= doMovement();
-
+
-                if (aggroedCreature != NULL) {
-                        if (!aggroedCreature->isAttackable())
@@ -907 +970 @@
-                } else if (isInCombat())
-                        clearCombatState();
-
+
-                needMoreActivity |= doRecovery();
-
+
-                if (needMoreActivity && zone != NULL) {
-                        info("queuing more activities");
-
+
-                        creatureManager->queueActivity(this);
-                } else {
@@ -918 +981 @@
-                        deagro();
-                }
-
+
-                unlock();
-        } catch (Exception& e) {
@@ -930 +993 @@
-                unlock();
-        }
-
-           
+
+
-}
-
@@ -942 +1005 @@
-        if (isDead() && isInActiveState()) {
-                info("queing despawn");
-
+
-                deagro();
-
+
-                creatureState = DESPAWNING;
-
+
-                creatureManager->queueActivity(this, 120000);
-
+
-                return false;
-        } else if (isDeSpawning()) {
-                deagro();
-
+
-                creatureState = RESPAWNING;
-
+
-                unload();
-                if(respawnTimer > 0) { // 0 is do not respawn
@@ -960 +1023 @@
-                        msg << "respawning creature with " << respawnTimer << "s timer";
-                        info(msg);
-
+
-                        creatureManager->queueActivity(this, respawnTimer * 1000);
-                }
@@ -969 +1032 @@
-                return false;
-        }
-
+
-        return true;
-
+
-}
-
-void CreatureImplementation::resetState() {
-        zone = creatureManager->getZone();
-
+
-        creatureState = ACTIVE;
-        postureState = UPRIGHT_POSTURE;
@@ -983 +1046 @@
-        action = actionMax;
-        mind = mindMax;
-
+
-        healthWounds = 0;
-        actionWounds = 0;
-        mindWounds = 0;
-
+
-        damageMap.removeAll();
-        defenderList.removeAll();
-
+
-        clearStates();
-
+
-        aggroedCreature = NULL;
-
+
-        clearLootItems();
-
+
-        resetPatrolPoints(false);
-
@@ -1009 +1072 @@
-
-        ++movementCounter;
-
+
-        if (point == NULL) {
-                if (parent != NULL)
@@ -1017 +1080 @@
-        } else {
-                if (point->getCellID() != 0)
- 
+
-                else
-                        msg = new UpdateTransformMessage(_this, point->getPositionX(), point->getPositionZ(), point->getPositionY());
-        }
-
+
-        broadcastMessage(msg);
-}
@@ -1030 +1093 @@
-
-        stringstream reachedPosition;
- 
+
-        info("reached " + reachedPosition.str());
-
@@ -1053 +1116 @@
-        if (actualSpeed != 0)
-                setNextPosition();
-
+
-        if (isKnockedDown())
-                return true;
-
+
-        if (isKneeled())
-                doStandUp();
@@ -1062 +1125 @@
-        float waypointX, waypointY, waypointZ;
-        uint64 cellID = 0;
-
+
-        float maxSpeed = speed;
-
@@ -1070 +1133 @@
-                waypointY = aggroedCreature->getPositionY();
-                cellID = aggroedCreature->getParentID();
-
+
-        } else if (!patrolPoints.isEmpty()) {
-                PatrolPoint* waypoint = patrolPoints.get(0);
-
+
-                waypointX = waypoint->getPositionX();
-                waypointZ = positionZ;
-                waypointY = waypoint->getPositionY();
-
+
-                cellID = waypoint->getCellID();
-        } else
-                return false;
-
+
-        if (cellID != 0) {
-                SceneObject* obj = zone->lookupObject(cellID);
@@ -1088 +1151 @@
-                        cellID = 0;
-        }
-
- 
+
+
-        float dy = waypointY - positionY;
-
+
-        float dist = sqrt(dx * dx + dy * dy);
-        float directionangle = atan2(dy, dx);
-
+
-        float maxDistance = 5;
-
+
-        if (weaponObject != NULL)
-                maxDistance = weaponObject->getMaxRange();
-
+
-        if (dist < maxDistance) {
-                info("reached destintaion");
-
+
-                if (aggroedCreature == NULL)
-                        resetPatrolPoints(false);
-
+
-                actualSpeed = 0;
-
+
-                checkNewAngle(directionangle);
-
+
-                return false;
-        }
-
+
-        float newPositionX, newPositionZ, newPositionY;
-
+
-        newPositionZ = waypointZ;
-
@@ -1121 +1184 @@
-        else
-                actualSpeed = maxSpeed;
-
+
-        if (((parent != NULL) && (cellID == 0)) || (parent == NULL && cellID != 0)) {
-                newPositionX = waypointX;
@@ -1136 +1199 @@
-        angleMsg << "angle = " << directionangle * 180 / M_PI << " (" << dx << "," << dy << ")\n";
-        info(angleMsg.str());*/
-
+
-        setRadialDirection(M_PI / 2 - directionangle);
-
+
-        stringstream position;
- 
+
-        info("moving to " + position.str());
-
+
-        broadcastNextPositionUpdate(nextPosition);
-
+
-        return true;
-}
@@ -1164 +1227 @@
-
-                aggroedCreature = target;
-
+
-                updateTarget(target);
-
@@ -1176 +1239 @@
-bool CreatureImplementation::attack(CreatureObject* target) {
-        info("attacking target");
-
+
-        if (target == NULL || target == _this || !target->isPlayer())
-                return false;
@@ -1185 +1248 @@
-                return false;
-        }
-
+
-        if (!isInRange(target, 70)) {
- 
+
-                                || (parent == NULL && nextPosition->getCellID() != 0))
-                        return true;
@@ -1201 +1264 @@
-                return true;
-        }
-
+
-        CombatManager* combatManager = server->getCombatManager();
-
-        int skills = creatureSkills.size();
-
+
-        Skill* skill = NULL;
-
+
-        if (skills == 0)
-                return false;
@@ -1214 +1277 @@
-                skill = creatureSkills.get(rand);
-        }
-
+
-        if (skill == NULL)
-                return false;
-
+
-        uint32 actionCRC = skill->getNameCRC();
-
+
-        //updateTarget(target->getObjectID());
-
@@ -1237 +1300 @@
-        action->setSkill(skill);
-        action->setTarget(target);
-
+
-        combatManager->handleAction(action);
-        delete action;
-
+
-        if (target->isIncapacitated() || target->isDead()) {
-                deagro();
-                return false;
-        }
-
+
-        lastCombatAction.update();
-
+
-        float delay = skill->getSpeedRatio();
-
+
-        if (weaponObject != NULL)
-                delay = delay * weaponObject->getAttackSpeed();
-
+
-        nextAttackDelay.update();
-        nextAttackDelay.addMiliTime((uint64)(delay * 1000));
@@ -1264 +1327 @@
-                msg << "deaggroed (0x" << hex << aggroedCreature->getObjectID() << dec << ")";
-                info(msg);
-
+
-                if (aggroedCreature->isDead() || aggroedCreature->isIncapacitated())
-                        doIncapAnimation();
-
+
-                aggroedCreature = NULL;
-        }
@@ -1276 +1339 @@
-
-void CreatureImplementation::activateRecovery() {
-       
+
-                creatureManager->queueActivity(this);
-}
@@ -1283 +1346 @@
-        if ((++activityCount) % 3 == 0) {
-                //info("activating recovery");
-
+
-                if (hasStates())
-                        doStatesRecovery();
-
+
-                calculateHAMregen();
-
-                if ((activityCount) % 6 == 0)
-                        highestMadeDamage = 0;
-              
-
+
+
-        if (isOnFullHealth() && !hasStates()) {
-                highestMadeDamage = 0;
@@ -1298 +1361 @@
-                return false;
-        }
-
+
-        return true;
-}
@@ -1336 +1399 @@
-        default:
-                doAnimation("rude");
-                 
+
-        }
-}
@@ -1352 +1415 @@
-        if (isStunned() && stunRecoveryTime.isPast())
-                clearState(STUNNED_STATE);
-
+
-        if (isIntimidated() && intimidateRecoveryTime.isPast())
-                clearState(INTIMIDATED_STATE);
-
+
-        if (isPoisoned()) {
-                if (poisonRecoveryTime.isPast())
@@ -1361 +1424 @@
-                else doPoisonTick();
-        }
-
+
-        if (isDiseased()) {
-                if (diseasedRecoveryTime.isPast())
@@ -1367 +1430 @@
-                else doDiseaseTick();
-        }
-
+
-        if (isOnFire()) {
-                if (fireRecoveryTime.isPast())
@@ -1373 +1436 @@
-                else doFireTick();
-        }
-
+
-        if (isBleeding()) {
-                if (bleedingRecoveryTime.isPast())
@@ -1385 +1448 @@
-void CreatureImplementation::queueRespawn() {
-        creatureState = RESPAWNING;
-
+
-        stringstream msg;
-        msg << "respawning creature with " << respawnTimer << "s timer";
-        info(msg);
-
+
-        removeFromQueue();
-
+
-        creatureManager->queueActivity(this, respawnTimer * 1000);
-}
@@ -1398 +1461 @@
-        try {
-                wlock(doLock);
-
+
-                patrolPoints.add(0, cord);
-
+
-                if (!isActive())
-                        creatureManager->queueActivity(this);
-
+
-                unlock(doLock);
-        } catch (...) {
@@ -1414 +1477 @@
-        try {
-                wlock(doLock);
-
+
-                while (!patrolPoints.isEmpty()) {
-                        PatrolPoint* point = patrolPoints.remove(0);
-
+
-                        delete point;
-                }
-
+
-                //patrolPoints.removeAll();
-
+
-                unlock(doLock);
-        } catch (...) {
@@ -1441 +1504 @@
-        try {
-                wlock(doLock);
-
+
-                patrolPoints.add(cord);
-
+
-                if (!isActive())
-                        creatureManager->queueActivity(this);
-
+
-                unlock(doLock);
-        } catch (...) {
@@ -1457 +1520 @@
-        float angle = (45 + System::random(200)) / 3.14;
-        float distance = radius + System::random((int) radius);
-
- 
- 
-
+
+
+
+
-        PatrolPoint* cord = new PatrolPoint(newPositionX, positionZ, newPositionY, getParentID());
-
+
-        addPatrolPoint(cord, doLock);
-}

core3devel/MMOCoreORB/src/server/zone/objects/player/Player.cpp

@@ -4540 +4540 @@
-}
-
-
-

core3devel/MMOCoreORB/src/server/zone/objects/player/PlayerObject.cpp

@@ -1059 +1059 @@
-}
-
-
-

core3devel/MMOCoreORB/src/server/zone/objects/static/firework/FireworkWorld.cpp

@@ -139 +139 @@
-}
-
-

core3devel/MMOCoreORB/src/server/zone/objects/tangible/firework/Firework.cpp

@@ -115 +115 @@
-}
-
-