Skip to content

Commit 3ea185e

Browse files
Prop Fixes
1 parent f4fd9c2 commit 3ea185e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

data/js/commands/targeting/get.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ function onCallback0( socket, ourObj )
179179
socket.SysMessage( ourObj.sectionID );
180180
break;
181181
case "SWINGSPEEDINC":
182-
socket.SysMessage( swingSpeedIncrease );
182+
socket.SysMessage( ourObj.swingSpeedIncrease );
183183
break;
184184
case "SHOULDSAVE":
185185
socket.SysMessage( ourObj.shouldSave );

source/cBaseObject.cpp

+10-3
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ void CBaseObject::SetOwner( CChar *newOwner )
734734
//o------------------------------------------------------------------------------------------------o
735735
bool CBaseObject::DumpBody( std::ostream &outStream ) const
736736
{
737-
SI16 temp_st2, temp_dx2, temp_in2;
737+
SI16 temp_st2, temp_dx2, temp_in2, temp_hitChance, temp_defChance, temp_swingSpeedInc, temp_damInc;
738738
const char newLine = '\n';
739739

740740
// Hexadecimal Values
@@ -784,6 +784,10 @@ bool CBaseObject::DumpBody( std::ostream &outStream ) const
784784
temp_st2 = st2;
785785
temp_dx2 = dx2;
786786
temp_in2 = in2;
787+
temp_hitChance = hitChance;
788+
temp_defChance = defenseChance;
789+
temp_swingSpeedInc = swingSpeedIncrease;
790+
temp_damInc = damageIncrease;
787791
if( objType == OT_CHAR )
788792
{
789793
CChar *myChar = (CChar *)( this );
@@ -797,6 +801,10 @@ bool CBaseObject::DumpBody( std::ostream &outStream ) const
797801
temp_st2 -= myItem->GetStrength2();
798802
temp_dx2 -= myItem->GetDexterity2();
799803
temp_in2 -= myItem->GetIntelligence2();
804+
temp_hitChance -= myItem->GetHitChance();
805+
temp_defChance -= myItem->GetDefenseChance();
806+
temp_swingSpeedInc -= myItem->GetSwingSpeedIncrease();
807+
temp_damInc -= myItem->GetDamageIncrease();
800808
}
801809
}
802810
}
@@ -808,8 +816,7 @@ bool CBaseObject::DumpBody( std::ostream &outStream ) const
808816
outStream << "Intelligence=" + std::to_string( intelligence ) + "," + std::to_string( temp_in2 ) + newLine;
809817
outStream << "Strength=" + std::to_string( strength ) + "," + std::to_string( temp_st2 ) + newLine;
810818
outStream << "HitPoints=" + std::to_string( hitpoints ) + newLine;
811-
outStream << "ExtPropCommon=" + std::to_string( GetHitChance() ) + "," + std::to_string( GetDefenseChance() ) + "," + std::to_string( GetSwingSpeedIncrease() ) + "," + std::to_string( GetDamageIncrease() ) + newLine;
812-
outStream << "Race=" + std::to_string( race ) + newLine;
819+
outStream << "ExtPropCommon=" + std::to_string( temp_hitChance ) + "," + std::to_string( temp_defChance ) + "," + std::to_string( temp_swingSpeedInc ) + "," + std::to_string( temp_damInc ) + newLine; outStream << "Race=" + std::to_string( race ) + newLine;
813820
outStream << "Visible=" + std::to_string( visible ) + newLine;
814821
outStream << "Disabled=" << ( IsDisabled() ? "1" : "0" ) << newLine;
815822
outStream << "Damage=" + std::to_string( loDamage ) + "," + std::to_string( hiDamage ) + newLine;

0 commit comments

Comments
 (0)