Changeset 34 for trunk/src/game/Player.cpp

Timestamp:

11/19/08 13:25:37 (17 years ago)

Author:

yumileroy

Message:

[svn] * Removing useless data accidentally committed.
* Applying ImpConfig? patch.
* Note: QUEUE_FOR_GM currently disabled as it's not compatible with the ACE patch. Anyone care to rewrite it?
* Note2: This is untested - I may have done some mistakes here and there. Will try to compile now.

Original author: XTZGZoReX
Date: 2008-10-10 13:37:21-05:00

Files:

• trunk/src/game/Player.cpp (modified) (11 diffs)

trunk/src/game/Player.cpp

@@ -579 +579 @@
 
     // set starting level
-    SetUInt32Value( UNIT_FIELD_LEVEL, sWorld.getConfig(CONFIG_START_PLAYER_LEVEL) );
+        if(GetSession()->GetSecurity() >= SEC_MODERATOR)
+                SetUInt32Value( UNIT_FIELD_LEVEL, sWorld.getConfig(CONFIG_GM_START_LEVEL) ); //ImpConfig
+        else
+                SetUInt32Value( UNIT_FIELD_LEVEL, sWorld.getConfig(CONFIG_START_PLAYER_LEVEL) );
+        // set starting gold
+        SetUInt32Value( PLAYER_FIELD_COINAGE, sWorld.PlayerStartGold()*10000 );
+
+        // set starting honor
+        SetUInt32Value( PLAYER_FIELD_HONOR_CURRENCY, sWorld.getConfig(CONFIG_PLAYER_START_HONOR) );
+
+        // set starting arena pts
+        SetUInt32Value( PLAYER_FIELD_ARENA_CURRENCY, sWorld.getConfig(CONFIG_PLAYER_START_ARENAPTS) );
+
+        // start with every map explored
+        if(sWorld.getConfig(CONFIG_START_ALL_EXPLORED))
+        {
+                for (uint8 i=0; i<64; i++)
+                        SetFlag(PLAYER_EXPLORED_ZONES_1+i,0xFFFFFFFF);
+        }
 
     // Played time
@@ -755 +773 @@
         return;
 
-    //if have water breath , then remove bar
-    if(waterbreath || isGameMaster() || !isAlive())
+    //if players is GM, have waterbreath, dead or breathing is disabled
+    if(sWorld.getConfig(CONFIG_DISABLE_BREATHING) || waterbreath || isGameMaster() || !isAlive())
     {
         StopMirrorTimer(BREATH_TIMER);
@@ -2128 +2146 @@
 
     UpdateAllStats();
+
+    if(sWorld.getConfig(CONFIG_ALWAYS_MAXSKILL)) // Max weapon skill when leveling up
+    UpdateSkillsToMaxSkillsForLevel();
 
     // set current level health and mana/energy to maximum after applying all mods.
@@ -3602 +3623 @@
     CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = '%u'",guid);
+    CharacterDatabase.PExecute("DELETE FROM has_logged_in_before WHERE guid = %u",guid);
     CharacterDatabase.CommitTransaction();
 
@@ -3726 +3748 @@
     DestroyZoneLimitedItem( true, GetZoneId());
 
-    if(!applySickness || getLevel() <= 10)
+    if(sWorld.getConfig(CONFIG_DISABLE_RES_SICKNESS) || !applySickness || getLevel() <= 10)
         return;
 
@@ -5898 +5920 @@
 ///and the size of the group for which the honor is divided
 ///An exact honor value can also be given (overriding the calcs)
-bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor)
+bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvptoken)
 {
     // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
@@ -6017 +6039 @@
 
     ApplyModUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, uint32(honor), true);
+
+        if( sWorld.getConfig(CONFIG_PVP_TOKEN_ENABLE) && pvptoken )
+        {
+                if(!uVictim || uVictim == this || uVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT))
+                        return true;
+
+                if(uVictim->GetTypeId() == TYPEID_PLAYER)
+                {
+                        // Check if allowed to receive it in current map
+                        uint8 MapType = sWorld.getConfig(CONFIG_PVP_TOKEN_MAP_TYPE);
+                        if(MapType == 1 && !InBattleGround() && !HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_FFA_PVP) || MapType == 2 && !HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_FFA_PVP) || MapType == 3 && !InBattleGround())
+                                return true;
+
+                        uint32 noSpaceForCount = 0;
+                        uint32 itemId = sWorld.getConfig(CONFIG_PVP_TOKEN_ID);
+                        int32 count = sWorld.getConfig(CONFIG_PVP_TOKEN_COUNT);
+
+                        // check space and find places
+                        ItemPosCountVec dest;
+                        uint8 msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount );
+                        if( msg != EQUIP_ERR_OK )   // convert to possible store amount
+                                count = noSpaceForCount;
+
+                        if( count == 0 || dest.empty()) // can't add any
+                        {
+                                // -- TODO: Send to mailbox if no space
+                                ChatHandler(this).PSendSysMessage("You don't have any space in your bags for a token.");
+                                return true;
+                        }
+
+                        Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
+                        SendNewItem(item,count,true,false);
+                        ChatHandler(this).PSendSysMessage("You have been awarded a token for slaying another player.");
+                }
+        }
+
     return true;
 }
@@ -6384 +6442 @@
     else if(duel->opponent->GetComboTarget()==GetPetGUID())
         duel->opponent->ClearComboPoints();
+
+        // Honor points after duel (the winner) - ImpConfig
+        if(sWorld.getConfig(CONFIG_HONOR_AFTER_DUEL > 0))
+        {
+                uint32 amount = sWorld.getConfig(CONFIG_HONOR_AFTER_DUEL);
+                duel->opponent->RewardHonor(NULL,1,amount);
+        }
 
     //cleanups
@@ -7807 +7872 @@
     data << uint64(guid);
     data << uint32(resetTalentsCost());
+        if(sWorld.getConfig(CONFIG_NO_RESET_TALENT_COST))
+                data << uint32(0);
+        else
+                data << uint32(resetTalentsCost());
     GetSession()->SendPacket( &data );
 }
@@ -17896 +17965 @@
 
                 // honor can be in PvP and !PvP (racial leader) cases (for alive)
-                if(pGroupGuy->isAlive() && pGroupGuy->RewardHonor(pVictim,count) && pGroupGuy==this)
+                if(pGroupGuy->isAlive() && pGroupGuy->RewardHonor(pVictim,count, -1, true) && pGroupGuy==this)
                     honored_kill = true;
 
@@ -17934 +18003 @@
 
         // honor can be in PvP and !PvP (racial leader) cases
-        if(RewardHonor(pVictim,1))
+        if(RewardHonor(pVictim,1, -1, true))
             honored_kill = true;