Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@DragonSlayer62
DragonSlayer62 committed Jan 15, 2025
1 parent bc3cfdb commit b82b9dc
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 19 deletions.
3 changes: 3 additions & 0 deletions data/js/commands/targeting/get.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ function onCallback0( socket, ourObj )
case "SECTIONID":
socket.SysMessage( ourObj.sectionID );
break;
case "SWINGSPEEDINC":
socket.SysMessage( swingSpeedIncrease );
break;
case "SHOULDSAVE":
socket.SysMessage( ourObj.shouldSave );
break;
Expand Down
5 changes: 1 addition & 4 deletions data/js/commands/targeting/set.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,8 @@ function onCallback0( socket, ourObj )
ourObj.tempdex = nVal;
okMsg( socket );
break;
case "SPEEDINC":
case "SPEEDINCREASE":
case "SWINGSPEEDINC":
case "SWINGSPEEDINCREASE":
ourObj.speedIncrease = nVal;
ourObj.swingSpeedIncrease = nVal;
okMsg( socket );
break;
case "WIPABLE":
Expand Down
4 changes: 2 additions & 2 deletions source/UOXJSPropertyEnums.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ enum CC_Properties
CCP_SPAWNSERIAL,
CCP_SPATTACK,
CCP_SPDELAY,
CCP_SPEEDINCREASE,
CCP_SWINGSPEEDINCREASE,
CCP_AITYPE,
CCP_SPLIT,
CCP_SPLITCHANCE,
Expand Down Expand Up @@ -517,7 +517,7 @@ enum CI_Properties
CIP_ISCONTTYPE,
CIP_CARVESECTION,
CIP_SPEED,
CIP_SPEEDINCREASE ,
CIP_SWINGSPEEDINCREASE,
CIP_MULTI,
CIP_AMMOID,
CIP_AMMOHUE,
Expand Down
8 changes: 4 additions & 4 deletions source/UOXJSPropertyFuncs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ JSBool CItemProps_getProperty( JSContext *cx, JSObject *obj, jsval id, jsval *vp
case CIP_DAMAGEPOISON: *vp = BOOLEAN_TO_JSVAL( gPriv->GetWeatherDamage( POISON )); break;
case CIP_DAMAGERAIN: *vp = BOOLEAN_TO_JSVAL( gPriv->GetWeatherDamage( RAIN )); break;
case CIP_DAMAGESNOW: *vp = BOOLEAN_TO_JSVAL( gPriv->GetWeatherDamage( SNOW )); break;
case CIP_SPEEDINCREASE: *vp = INT_TO_JSVAL( gPriv->GetSwingSpeedIncrease() ); break;
case CIP_SWINGSPEEDINCREASE: *vp = INT_TO_JSVAL( gPriv->GetSwingSpeedIncrease() ); break;
case CIP_SPEED: *vp = INT_TO_JSVAL( gPriv->GetSpeed() ); break;
case CIP_NAME2:
tString = JS_NewStringCopyZ( cx, gPriv->GetName2().c_str() );
Expand Down Expand Up @@ -1322,7 +1322,7 @@ JSBool CItemProps_setProperty( JSContext *cx, JSObject *obj, jsval id, jsval *vp
case CIP_DAMAGERAIN: gPriv->SetWeatherDamage( RAIN, encaps.toBool() ); break;
case CIP_DAMAGESNOW: gPriv->SetWeatherDamage( SNOW, encaps.toBool() ); break;
case CIP_SPEED: gPriv->SetSpeed( static_cast<UI08>( encaps.toInt() )); break;
case CIP_SPEEDINCREASE: gPriv->SetSwingSpeedIncrease( static_cast<SI16>( encaps.toInt() )); break;
case CIP_SWINGSPEEDINCREASE: gPriv->SetSwingSpeedIncrease( static_cast<SI16>( encaps.toInt() )); break;
case CIP_NAME2: gPriv->SetName2( encaps.toString() ); break;
case CIP_RACE: gPriv->SetRace( static_cast<RACEID>( encaps.toInt() )); break;
case CIP_MAXHP: gPriv->SetMaxHP( static_cast<SI16>( encaps.toInt() )); break;
Expand Down Expand Up @@ -1996,7 +1996,7 @@ JSBool CCharacterProps_getProperty( JSContext *cx, JSObject *obj, jsval id, jsva
case CCP_HOUSEICONS: *vp = BOOLEAN_TO_JSVAL( gPriv->ViewHouseAsIcon() ); break;
case CCP_SPATTACK: *vp = INT_TO_JSVAL( gPriv->GetSpAttack() ); break;
case CCP_SPDELAY: *vp = INT_TO_JSVAL( gPriv->GetSpDelay() ); break;
case CCP_SPEEDINCREASE: *vp = INT_TO_JSVAL( gPriv->GetSwingSpeedIncrease() ); break;
case CCP_SWINGSPEEDINCREASE: *vp = INT_TO_JSVAL( gPriv->GetSwingSpeedIncrease() ); break;
case CCP_AITYPE: *vp = INT_TO_JSVAL( gPriv->GetNpcAiType() ); break;
case CCP_SPLIT: *vp = INT_TO_JSVAL( gPriv->GetSplit() ); break;
case CCP_SPLITCHANCE: *vp = INT_TO_JSVAL( gPriv->GetSplitChance() ); break;
Expand Down Expand Up @@ -2502,7 +2502,7 @@ JSBool CCharacterProps_setProperty( JSContext *cx, JSObject *obj, jsval id, jsva
case CCP_HOUSEICONS: gPriv->SetViewHouseAsIcon( encaps.toBool() ); break;
case CCP_SPATTACK: gPriv->SetSpAttack( static_cast<SI16>( encaps.toInt() )); break;
case CCP_SPDELAY: gPriv->SetSpDelay( static_cast<SI08>( encaps.toInt() )); break;
case CCP_SPEEDINCREASE: gPriv->SetSwingSpeedIncrease( static_cast<SI16>( encaps.toInt() )); break;
case CCP_SWINGSPEEDINCREASE: gPriv->SetSwingSpeedIncrease( static_cast<SI16>( encaps.toInt() )); break;
case CCP_AITYPE: gPriv->SetNPCAiType( static_cast<SI16>( encaps.toInt() )); break;
case CCP_SPLIT: gPriv->SetSplit( static_cast<UI08>( encaps.toInt() )); break;
case CCP_SPLITCHANCE: gPriv->SetSplitChance( static_cast<UI08>( encaps.toInt() ));break;
Expand Down
4 changes: 2 additions & 2 deletions source/UOXJSPropertySpecs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ inline JSPropertySpec CCharacterProps[] =
{ "houseicons", CCP_HOUSEICONS, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "spattack", CCP_SPATTACK, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "spdelay", CCP_SPDELAY, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "speedIncrease", CCP_SPEEDINCREASE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "swingSpeedIncrease", CCP_SWINGSPEEDINCREASE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "aitype", CCP_AITYPE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "split", CCP_SPLIT, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "splitchance", CCP_SPLITCHANCE, JSPROP_ENUMANDPERM, nullptr, nullptr },
Expand Down Expand Up @@ -536,7 +536,7 @@ inline JSPropertySpec CItemProps[] =
{ "ammoFXHue", CIP_AMMOFXHUE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "ammoFXRender", CIP_AMMOFXRENDER, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "speed", CIP_SPEED, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "speedIncrease", CIP_SPEEDINCREASE , JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "swingSpeedIncrease", CIP_SWINGSPEEDINCREASE , JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "multi", CIP_MULTI, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "maxRange", CIP_MAXRANGE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "baseRange", CIP_BASERANGE, JSPROP_ENUMANDPERM, nullptr, nullptr },
Expand Down
7 changes: 4 additions & 3 deletions source/cBaseObject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1572,9 +1572,10 @@ Point3_st CBaseObject::GetLocation( void ) const

//o------------------------------------------------------------------------------------------------o
//| Function - CBaseObject::GetSwingSpeedIncrease()
//| CBaseObject::SetSwingSpeedIncrease()
//| CBaseObject::SetSwingSpeedBonus()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Gets/Sets the item's Swing Speed Increase property (in percentage), which adjusts the base swing speed of the equipped weapon
//| Purpose - Gets/Sets the item's Swing Speed Bonus property (in percentage), which
//| adjusts the base swing speed of the equipped weapon, or characters
//o------------------------------------------------------------------------------------------------o
SI16 CBaseObject::GetSwingSpeedIncrease( void ) const
{
Expand Down Expand Up @@ -1686,7 +1687,7 @@ void CBaseObject::IncIntelligence( SI16 toInc )
//o------------------------------------------------------------------------------------------------o
//| Function - CBaseObject::IncSwingSpeedIncrease()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Increments the object's swing speed value
//| Purpose - Increments the object's swing speed bonus value
//o------------------------------------------------------------------------------------------------o
void CBaseObject::IncSwingSpeedIncrease( SI16 toInc )
{
Expand Down
4 changes: 2 additions & 2 deletions source/cChar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3140,7 +3140,7 @@ bool CChar::DumpBody( std::ostream &outStream ) const
//-------------------------------------------------------------------------------------------
outStream << "CanRun=" + std::to_string((( CanRun() && IsNpc() ) ? 1 : 0 )) + newLine;
outStream << "CanAttack=" + std::to_string(( GetCanAttack() ? 1 : 0 )) + newLine;
outStream << "SpeedInc=" + std::to_string( GetSwingSpeedIncrease() ) + newLine;
outStream << "SwingSpeedInc=" + std::to_string( GetSwingSpeedIncrease() ) + newLine;
outStream << "AllMove=" + std::to_string(( AllMove() ? 1 : 0 )) + newLine;
outStream << "IsNpc=" + std::to_string(( IsNpc() ? 1 : 0 )) + newLine;
outStream << "IsShop=" + std::to_string(( IsShop() ? 1 : 0 )) + newLine;
Expand Down Expand Up @@ -4824,7 +4824,7 @@ bool CChar::HandleLine( std::string &UTag, std::string &data )
SetEmoteColour( static_cast<UI16>( std::stoul (oldstrutil::trim( oldstrutil::removeTrailing( csecs[1], "//" )), nullptr, 0 )));
rValue = true;
}
else if( UTag == "SPEEDINC" )
else if( UTag == "SWINGSPEEDINCREASE" )
{
SetSwingSpeedIncrease( static_cast<SI16>( std::stoul( oldstrutil::trim( oldstrutil::removeTrailing( data, "//" )), nullptr, 0 )));
rValue = true;
Expand Down
5 changes: 3 additions & 2 deletions source/cItem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1644,6 +1644,7 @@ auto CItem::CopyData( CItem *target ) -> void
target->SetStamina( GetStamina() );
target->SetStrength( GetStrength() );
target->SetStrength2( GetStrength2() );
target->SetSwingSpeedIncrease( GetSwingSpeedIncrease() );
target->SetTitle( GetTitle() );
target->SetType( GetType() );
target->SetBuyValue( GetBuyValue() );
Expand Down Expand Up @@ -1743,7 +1744,7 @@ bool CItem::DumpBody( std::ostream &outStream ) const
outStream << "Restock=" + std::to_string( GetRestock() ) + newLine;
outStream << "AC=" + std::to_string( GetArmourClass() ) + newLine;
outStream << "Rank=" + std::to_string( GetRank() ) + newLine;
outStream << "SpeedIncrease=" + std::to_string( GetSwingSpeedIncrease() ) + newLine;
outStream << "SwingSpeedInc=" + std::to_string( GetSwingSpeedIncrease() ) + newLine;
outStream << "Sk_Made=" + std::to_string( GetMadeWith() ) + newLine;
outStream << "Bools=" + std::to_string(( bools.to_ulong() )) + newLine;
outStream << "Good=" + std::to_string( GetGood() ) + newLine;
Expand Down Expand Up @@ -2128,7 +2129,7 @@ bool CItem::HandleLine( std::string &UTag, std::string &data )
SetStealable( static_cast<UI08>( std::stoul( oldstrutil::trim( oldstrutil::removeTrailing( data, "//" )), nullptr, 0 )));
rValue = true;
}
else if( UTag == "SPEEDINCREASE" )
else if( UTag == "SWINGSPEEDINCREASE" )
{
SetSwingSpeedIncrease( static_cast<SI16>( std::stoul( oldstrutil::trim( oldstrutil::removeTrailing( data, "//" )), nullptr, 0 )));
rValue = true;
Expand Down

0 comments on commit b82b9dc

Please sign in to comment.