Skip to content

Commit

Permalink
Merge branch 'develop' into T2A_Armor_Weapons
Browse files Browse the repository at this point in the history
  • Loading branch information
DragonSlayer62 committed Nov 10, 2023
2 parents 72a2e2b + 467a036 commit e81182a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions data/js/npc/ai/vendor_bdo_dispenser.js
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ function onDropItemOnNpc( pDropper, npcDroppedOn, iDropped )
}

// Check if enough time has passed since last time player handed in a BOD
var bodRewardCD = pUser.GetJSTimer( 2, 3214 ); // Fetch timer for BOD reward cooldown
var bodRewardCD = pDropper.GetJSTimer( 2, 3214 ); // Fetch timer for BOD reward cooldown
if( bodRewardCD != 0 )
{
npcDroppedOn.TextMessage( GetDictionaryEntry( 17273, socket.language ), false, 0x3b2, 0, pDropper.serial ); // You'll have to wait a few seconds while I inspect the last order.
Expand All @@ -609,7 +609,7 @@ function onDropItemOnNpc( pDropper, npcDroppedOn, iDropped )
if( DispenseBODRewards( pDropper, npcDroppedOn, iDropped ))
{
// On delivery of a completed BOD, kill cooldown timer to get another BOD offer
var bodOfferCD = pUser.GetJSTimer( 1, 3214 ); // Fetch timer for BOD offer cooldown
var bodOfferCD = pDropper.GetJSTimer( 1, 3214 ); // Fetch timer for BOD offer cooldown
if( bodRewardCD != 0 )
{
pDropper.KillJSTimer( 1, 3214 );
Expand Down Expand Up @@ -657,7 +657,8 @@ function DispenseBODRewards( pDropper, npcDroppedOn, iDropped )
var playerPack = pDropper.pack;
var giveGoldAsCheck = false;
var placeCheckInBank = false;
if( goldToTive >= 5000 || ( playerPack.weight + goldWeight > playerPack.maxWeight ))

if( goldToGive >= 5000 || ( playerPack.weight + goldWeight > playerPack.maxWeight ))
{
if( playerPack.weight + 100 > playerPack.maxWeight )
{
Expand Down

0 comments on commit e81182a

Please sign in to comment.