From: Luca P. <lpa...@us...> - 2006-07-30 21:16:48
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20674/server Modified Files: combatmanager.cpp Log Message: added more info to combat results Index: combatmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/combatmanager.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** combatmanager.cpp 21 Jul 2006 03:16:38 -0000 1.132 --- combatmanager.cpp 30 Jul 2006 21:16:45 -0000 1.133 *************** *** 458,462 **** psItem* item = event->GetAttackerData()->Inventory().GetEffectiveWeaponInSlot(event->GetWeaponSlot() ); - Debug4(LOG_COMBAT, "%s attacks with slot %d , weapon %s\n",event->attacker->gemobj->GetName(),event->GetWeaponSlot(),item->GetName()); if (var_AttackWeapon) --- 458,461 ---- *************** *** 755,781 **** void psCombatManager::DebugOutput(psCombatGameEvent *event) { psString debug; debug.Append( "-----Debug Combat Summary--------\n"); ! debug.AppendFmt( "%s attacks %s\n",event->attacker->gemobj->GetName(),event->target->gemobj->GetName() ); ! debug.AppendFmt( "IAH: %1.6f AHR: %1.6f \n",var_IAH->GetValue(),var_AHR->GetValue()); debug.AppendFmt( "QOH: %1.6f Damage: %1.1f\n",var_QOH->GetValue(),var_FinalDmg->GetValue()); Debug1(LOG_COMBAT, debug.GetData()); - - /* - CPrintf(CON_DEBUG, "Attack Roll: %1.1f\n",event->AttackRoll); - CPrintf(CON_DEBUG, "Defense Roll: %1.1f\n",event->DefenseRoll); - CPrintf(CON_DEBUG, "Attack Result Code: %d\n",event->AttackResult); - CPrintf(CON_DEBUG, "Dodge Value: %1.1f\n",event->DodgeValue); - CPrintf(CON_DEBUG, "Block Value: %1.1f\n",event->BlockValue); - CPrintf(CON_DEBUG, "CounterBlock Value: %1.1f\n",event->CounterBlockValue); - CPrintf(CON_DEBUG, "Quality of Hit: %1.1f\n",event->QualityOfHit); - CPrintf(CON_DEBUG, "Base Hit Damage: %1.1f\n",event->BaseHitDamage); - CPrintf(CON_DEBUG, "Attack Location: %d\n",event->AttackLocation); - CPrintf(CON_DEBUG, "Armor Dmg Adjust: %1.1f\n",event->ArmorDamageAdjustment); - CPrintf(CON_DEBUG, "Final Base Damage: %1.1f\n",event->FinalBaseDamage); - CPrintf(CON_DEBUG, "Damage Modifiers: %1.1f\n",event->DamageMods); - CPrintf(CON_DEBUG, "Final Damage: %1.1f\n\n",event->FinalDamage); - */ } --- 754,767 ---- void psCombatManager::DebugOutput(psCombatGameEvent *event) { + psItem* item = event->GetAttackerData()->Inventory().GetEffectiveWeaponInSlot(event->GetWeaponSlot() ); psString debug; debug.Append( "-----Debug Combat Summary--------\n"); ! debug.AppendFmt( "%s attacks %s with slot %d , weapon %s, quality %1.2f, basedmg %1.2f/%1.2f/%1.2f\n", ! event->attacker->gemobj->GetName(),event->target->gemobj->GetName(), event->GetWeaponSlot(),item->GetName(),item->GetItemQuality(), ! item->GetDamage(PSITEMSTATS_DAMAGETYPE_SLASH),item->GetDamage(PSITEMSTATS_DAMAGETYPE_BLUNT),item->GetDamage(PSITEMSTATS_DAMAGETYPE_PIERCE)); ! debug.AppendFmt( "IAH: %1.6f AHR: %1.6f ",var_IAH->GetValue(),var_AHR->GetValue()); debug.AppendFmt( "QOH: %1.6f Damage: %1.1f\n",var_QOH->GetValue(),var_FinalDmg->GetValue()); Debug1(LOG_COMBAT, debug.GetData()); } |