From: <wel...@us...> - 2009-05-24 15:10:14
|
Revision: 3771 http://planeshift.svn.sourceforge.net/planeshift/?rev=3771&view=rev Author: weltall2 Date: 2009-05-24 15:10:10 +0000 (Sun, 24 May 2009) Log Message: ----------- The calculate damage script in combatmanager must be able to access the stance... Modified Paths: -------------- trunk/src/server/combatmanager.cpp trunk/src/server/database/mysql/math_scripts.sql Modified: trunk/src/server/combatmanager.cpp =================================================================== --- trunk/src/server/combatmanager.cpp 2009-05-24 10:23:49 UTC (rev 3770) +++ trunk/src/server/combatmanager.cpp 2009-05-24 15:10:10 UTC (rev 3771) @@ -450,6 +450,8 @@ MathEnvironment env; env.Define("Attacker", event->GetAttackerData()); env.Define("Target", event->GetTargetData()); + env.Define("AttackerActor", event->GetAttacker()); + env.Define("TargetActor", event->GetTarget()); env.Define("AttackWeapon", event->GetAttackerData()->Inventory().GetEffectiveWeaponInSlot(event->GetWeaponSlot())); env.Define("AttackWeaponSecondary", subWeapon); // FIXME: The original code defined and redefined TargetAttackWeapon, which can't be right. Modified: trunk/src/server/database/mysql/math_scripts.sql =================================================================== --- trunk/src/server/database/mysql/math_scripts.sql 2009-05-24 10:23:49 UTC (rev 3770) +++ trunk/src/server/database/mysql/math_scripts.sql 2009-05-24 15:10:10 UTC (rev 3771) @@ -34,8 +34,8 @@ RequiredInputVars = Target:AttackerTargeted+Attacker:getSkillValue(AttackWeapon:Skill1)+AttackLocationItem:Hardness; - AttackerStance = Attacker:CombatStance; - TargetStance = Target:CombatStance; + AttackerStance = AttackerActor:CombatStance; + TargetStance = TargetActor:CombatStance; AttackValue = WeaponSkill; TargetAttackValue = TargetWeaponSkill; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |