Skip to content
Permalink
Browse files

Merged PR 463: Merge 570_hammer_form to master

Related work items: #570
  • Loading branch information...
realms-mud committed Mar 12, 2019
1 parent 1d06055 commit 85f08768503219653e20122f597b0c16b126dd9e
Showing with 2,050 additions and 3 deletions.
  1. +3 −3 guilds/scion/paths/axe/forms/zucken.c
  2. +310 −0 guilds/scion/paths/hammer.c
  3. +35 −0 guilds/scion/paths/hammer/forms/abschneiden.c
  4. +38 −0 guilds/scion/paths/hammer/forms/advanced-changing.c
  5. +35 −0 guilds/scion/paths/hammer/forms/barrier-guard.c
  6. +39 −0 guilds/scion/paths/hammer/forms/changing-through.c
  7. +37 −0 guilds/scion/paths/hammer/forms/crooked-smite.c
  8. +34 −0 guilds/scion/paths/hammer/forms/dance-of-death.c
  9. +32 −0 guilds/scion/paths/hammer/forms/displacement.c
  10. +33 −0 guilds/scion/paths/hammer/forms/doubling.c
  11. +35 −0 guilds/scion/paths/hammer/forms/eisenport.c
  12. +34 −0 guilds/scion/paths/hammer/forms/evade.c
  13. +29 −0 guilds/scion/paths/hammer/forms/from-the-roof.c
  14. +34 −0 guilds/scion/paths/hammer/forms/hanging-fist.c
  15. +33 −0 guilds/scion/paths/hammer/forms/hanging-parry.c
  16. +35 −0 guilds/scion/paths/hammer/forms/langort.c
  17. +28 −0 guilds/scion/paths/hammer/forms/mauling.c
  18. +33 −0 guilds/scion/paths/hammer/forms/middle-smite.c
  19. +36 −0 guilds/scion/paths/hammer/forms/mordstreich.c
  20. +39 −0 guilds/scion/paths/hammer/forms/mutating-attack.c
  21. +35 −0 guilds/scion/paths/hammer/forms/nachreisen.c
  22. +35 −0 guilds/scion/paths/hammer/forms/near-guard.c
  23. +40 −0 guilds/scion/paths/hammer/forms/off-setting.c
  24. +33 −0 guilds/scion/paths/hammer/forms/over-bash.c
  25. +39 −0 guilds/scion/paths/hammer/forms/over-running.c
  26. +33 −0 guilds/scion/paths/hammer/forms/over-smite.c
  27. +40 −0 guilds/scion/paths/hammer/forms/part-smite.c
  28. +38 −0 guilds/scion/paths/hammer/forms/porta-di-ferro-alta.c
  29. +39 −0 guilds/scion/paths/hammer/forms/porta-di-ferro-e-stretta.c
  30. +36 −0 guilds/scion/paths/hammer/forms/pressing-of-hands.c
  31. +37 −0 guilds/scion/paths/hammer/forms/reverse-strike.c
  32. +35 −0 guilds/scion/paths/hammer/forms/running-through.c
  33. +33 −0 guilds/scion/paths/hammer/forms/side-stepping.c
  34. +33 −0 guilds/scion/paths/hammer/forms/smite.c
  35. +45 −0 guilds/scion/paths/hammer/forms/squinting-smite.c
  36. +28 −0 guilds/scion/paths/hammer/forms/striking.c
  37. +39 −0 guilds/scion/paths/hammer/forms/the-boar.c
  38. +33 −0 guilds/scion/paths/hammer/forms/the-crown.c
  39. +36 −0 guilds/scion/paths/hammer/forms/the-fool.c
  40. +34 −0 guilds/scion/paths/hammer/forms/the-ox.c
  41. +35 −0 guilds/scion/paths/hammer/forms/the-plough.c
  42. +36 −0 guilds/scion/paths/hammer/forms/the-stag.c
  43. +34 −0 guilds/scion/paths/hammer/forms/the-unicorn.c
  44. +36 −0 guilds/scion/paths/hammer/forms/thwart-smite.c
  45. +34 −0 guilds/scion/paths/hammer/forms/under-smite.c
  46. +33 −0 guilds/scion/paths/hammer/forms/undercut.c
  47. +35 −0 guilds/scion/paths/hammer/forms/wechsel.c
  48. +36 −0 guilds/scion/paths/hammer/forms/winding.c
  49. +34 −0 guilds/scion/paths/hammer/forms/wrath-guard.c
  50. +42 −0 guilds/scion/paths/hammer/forms/wrath-smite.c
  51. +40 −0 guilds/scion/paths/hammer/forms/zucken.c
  52. +1 −0 tests/framework/testExecutor.c
  53. +1 −0 tests/support/events/mockEventSubscriber.c
@@ -14,9 +14,9 @@ public void reset(int arg)
addSpecification("source", "Scion of Dhuras Guild");
addSpecification("description", "This skill provides the user with the "
"knowledge of a technique used during a strong bind between "
"blades. The combatant goes weak in the bind so as to disengage "
"their blade from the bind and counter with an attack to the "
"other side of the other combatant's blade. This technique is "
"weapons. The combatant goes weak in the bind so as to disengage "
"their axe from the bind and counter with an attack to the "
"other side of the other combatant's weapon. This technique is "
"based upon the concept of using weakness against strength.");
addSpecification("limited by", (["equipment":({
"axe" })]));
@@ -4,6 +4,291 @@
//*****************************************************************************
inherit "/lib/modules/research/researchTree.c";

/////////////////////////////////////////////////////////////////////////////
private void FirstLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/mauling.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/striking.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/from-the-roof.c");

addChild("lib/guilds/scion/paths/hammer/forms/mauling.c",
"lib/guilds/scion/paths/hammer/root.c");
addChild("lib/guilds/scion/paths/hammer/forms/striking.c",
"lib/guilds/scion/paths/hammer/root.c");
addChild("lib/guilds/scion/paths/hammer/forms/from-the-roof.c",
"lib/guilds/scion/paths/hammer/root.c");
}

/////////////////////////////////////////////////////////////////////////////
private void SecondLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-ox.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-stag.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-unicorn.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/wechsel.c");

addChild("lib/guilds/scion/paths/hammer/forms/the-ox.c",
"lib/guilds/scion/paths/hammer/forms/from-the-roof.c");
addChild("lib/guilds/scion/paths/hammer/forms/the-stag.c",
"lib/guilds/scion/paths/hammer/forms/from-the-roof.c");
addChild("lib/guilds/scion/paths/hammer/forms/the-unicorn.c",
"lib/guilds/scion/paths/hammer/forms/from-the-roof.c");
addChild("lib/guilds/scion/paths/hammer/forms/wechsel.c",
"lib/guilds/scion/paths/hammer/forms/from-the-roof.c");
}

/////////////////////////////////////////////////////////////////////////////
private void ThirdLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/evade.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/over-bash.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/undercut.c");

addChild("lib/guilds/scion/paths/hammer/forms/evade.c",
"lib/guilds/scion/paths/hammer/root.c");
addChild("lib/guilds/scion/paths/hammer/forms/over-bash.c",
"lib/guilds/scion/paths/hammer/root.c");
addChild("lib/guilds/scion/paths/hammer/forms/undercut.c",
"lib/guilds/scion/paths/hammer/root.c");
}

/////////////////////////////////////////////////////////////////////////////
private void FourthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-plough.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-crown.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/near-guard.c");

addChild("lib/guilds/scion/paths/hammer/forms/the-plough.c",
"lib/guilds/scion/paths/hammer/forms/the-ox.c");
addChild("lib/guilds/scion/paths/hammer/forms/the-crown.c",
"lib/guilds/scion/paths/hammer/forms/the-ox.c");
addChild("lib/guilds/scion/paths/hammer/forms/near-guard.c",
"lib/guilds/scion/paths/hammer/forms/the-ox.c");
}

/////////////////////////////////////////////////////////////////////////////
private void FifthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/barrier-guard.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/wrath-guard.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/hanging-fist.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/barrier-guard.c",
"lib/guilds/scion/paths/hammer/forms/the-plough.c");
addChild("lib/guilds/scion/paths/hammer/forms/wrath-guard.c",
"lib/guilds/scion/paths/hammer/forms/the-plough.c");
addChild("lib/guilds/scion/paths/hammer/forms/hanging-fist.c",
"lib/guilds/scion/paths/hammer/forms/the-plough.c");
addChild("lib/guilds/scion/paths/hammer/forms/smite.c",
"lib/guilds/scion/paths/hammer/forms/mauling.c");
}

/////////////////////////////////////////////////////////////////////////////
private void SixthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-fool.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/eisenport.c");

addChild("lib/guilds/scion/paths/hammer/forms/the-fool.c",
"lib/guilds/scion/paths/hammer/forms/the-plough.c");
addChild("lib/guilds/scion/paths/hammer/forms/eisenport.c",
"lib/guilds/scion/paths/hammer/forms/the-plough.c");
}

/////////////////////////////////////////////////////////////////////////////
private void SeventhLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/side-stepping.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/porta-di-ferro-alta.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/porta-di-ferro-e-stretta.c");

addChild("lib/guilds/scion/paths/hammer/forms/side-stepping.c",
"lib/guilds/scion/paths/hammer/forms/evade.c");
addChild("lib/guilds/scion/paths/hammer/forms/porta-di-ferro-alta.c",
"lib/guilds/scion/paths/hammer/forms/eisenport.c");
addChild("lib/guilds/scion/paths/hammer/forms/porta-di-ferro-e-stretta.c",
"lib/guilds/scion/paths/hammer/forms/eisenport.c");
}

/////////////////////////////////////////////////////////////////////////////
private void EighthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/hanging-parry.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/langort.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/the-boar.c");

addChild("lib/guilds/scion/paths/hammer/forms/hanging-parry.c",
"lib/guilds/scion/paths/hammer/forms/the-fool.c");
addChild("lib/guilds/scion/paths/hammer/forms/langort.c",
"lib/guilds/scion/paths/hammer/forms/the-fool.c");
addChild("lib/guilds/scion/paths/hammer/forms/the-boar.c",
"lib/guilds/scion/paths/hammer/forms/eisenport.c");
}

/////////////////////////////////////////////////////////////////////////////
private void NinthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/over-smite.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/middle-smite.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/under-smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/over-smite.c",
"lib/guilds/scion/paths/hammer/forms/smite.c");
addChild("lib/guilds/scion/paths/hammer/forms/middle-smite.c",
"lib/guilds/scion/paths/hammer/forms/smite.c");
addChild("lib/guilds/scion/paths/hammer/forms/under-smite.c",
"lib/guilds/scion/paths/hammer/forms/smite.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TenthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/doubling.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/reverse-strike.c");

addChild("lib/guilds/scion/paths/hammer/forms/doubling.c",
"lib/guilds/scion/paths/hammer/forms/smite.c");
addChild("lib/guilds/scion/paths/hammer/forms/reverse-strike.c",
"lib/guilds/scion/paths/hammer/forms/the-boar.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwelfthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/abschneiden.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/displacement.c");

addChild("lib/guilds/scion/paths/hammer/forms/abschneiden.c",
"lib/guilds/scion/paths/hammer/forms/smite.c");
addChild("lib/guilds/scion/paths/hammer/forms/displacement.c",
"lib/guilds/scion/paths/hammer/forms/the-ox.c");
}

/////////////////////////////////////////////////////////////////////////////
private void ThirteenLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/crooked-smite.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/dance-of-death.c");

addChild("lib/guilds/scion/paths/hammer/forms/crooked-smite.c",
"lib/guilds/scion/paths/hammer/forms/middle-smite.c");
addChild("lib/guilds/scion/paths/hammer/forms/dance-of-death.c",
"lib/guilds/scion/paths/hammer/forms/side-stepping.c");
}

/////////////////////////////////////////////////////////////////////////////
private void FourteenLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/mutating-attack.c");

addChild("lib/guilds/scion/paths/hammer/forms/mutating-attack.c",
"lib/guilds/scion/paths/hammer/forms/doubling.c");
}

/////////////////////////////////////////////////////////////////////////////
private void FifteenthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/wrath-smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/wrath-smite.c",
"lib/guilds/scion/paths/hammer/forms/over-smite.c");
}

/////////////////////////////////////////////////////////////////////////////
private void SixteenthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/nachreisen.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/over-running.c");

addChild("lib/guilds/scion/paths/hammer/forms/nachreisen.c",
"lib/guilds/scion/paths/hammer/forms/striking.c");
addChild("lib/guilds/scion/paths/hammer/forms/over-running.c",
"lib/guilds/scion/paths/hammer/forms/dance-of-death.c");
}

/////////////////////////////////////////////////////////////////////////////
private void SeventeenthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/off-setting.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/thwart-smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/off-setting.c",
"lib/guilds/scion/paths/hammer/forms/dance-of-death.c");
addChild("lib/guilds/scion/paths/hammer/forms/thwart-smite.c",
"lib/guilds/scion/paths/hammer/forms/over-smite.c");
}

/////////////////////////////////////////////////////////////////////////////
private void NineteenthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/changing-through.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/running-through.c");

addChild("lib/guilds/scion/paths/hammer/forms/changing-through.c",
"lib/guilds/scion/paths/hammer/forms/dance-of-death.c");
addChild("lib/guilds/scion/paths/hammer/forms/running-through.c",
"lib/guilds/scion/paths/hammer/forms/dance-of-death.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwentiethLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/squinting-smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/squinting-smite.c",
"lib/guilds/scion/paths/hammer/forms/over-smite.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwentyThirdLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/part-smite.c");

addChild("lib/guilds/scion/paths/hammer/forms/part-smite.c",
"lib/guilds/scion/paths/hammer/forms/over-smite.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwentyFifthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/zucken.c");
addResearchElement("lib/guilds/scion/paths/hammer/forms/winding.c");

addChild("lib/guilds/scion/paths/hammer/forms/zucken.c",
"lib/guilds/scion/paths/hammer/forms/changing-through.c");
addChild("lib/guilds/scion/paths/hammer/forms/winding.c",
"lib/guilds/scion/paths/hammer/forms/off-setting.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwentySeventhLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/mordstreich.c");

addChild("lib/guilds/scion/paths/hammer/forms/mordstreich.c",
"lib/guilds/scion/paths/hammer/forms/dance-of-death.c");
}

/////////////////////////////////////////////////////////////////////////////
private void TwentyNinthLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/advanced-changing.c");

addChild("lib/guilds/scion/paths/hammer/forms/advanced-changing.c",
"lib/guilds/scion/paths/hammer/forms/changing-through.c");
}

/////////////////////////////////////////////////////////////////////////////
private void ThirtiethLevel()
{
addResearchElement("lib/guilds/scion/paths/hammer/forms/pressing-of-hands.c");

addChild("lib/guilds/scion/paths/hammer/forms/pressing-of-hands.c",
"lib/guilds/scion/paths/hammer/forms/changing-through.c");
}

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
@@ -14,6 +299,31 @@ public void reset(int arg)
Description("");
Source("Scion of Dhuras Guild");
addResearchElement("lib/guilds/scion/paths/hammer/root.c");

TreeRoot("lib/guilds/scion/paths/hammer/root.c");

FirstLevel();
SecondLevel();
ThirdLevel();
FourthLevel();
FifthLevel();
SixthLevel();
SeventhLevel();
EighthLevel();
NinthLevel();
TenthLevel();
TwelfthLevel();
ThirteenLevel();
FourteenLevel();
FifteenthLevel();
SixteenthLevel();
SeventeenthLevel();
NineteenthLevel();
TwentiethLevel();
TwentyThirdLevel();
TwentyFifthLevel();
TwentySeventhLevel();
TwentyNinthLevel();
ThirtiethLevel();
}
}
@@ -0,0 +1,35 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/modules/research/passiveResearchItem.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
passiveResearchItem::reset(arg);
addSpecification("name", "Abschneiden");
addSpecification("source", "Scion of Dhuras Guild");
addSpecification("description", "This skill provides the user with the "
"knowledge of a form of attack wherein the hammer's fluke or head "
"is placed against a body and then pulled or pushed along the "
"surface in a slicing motion.");
addSpecification("limited by", (["equipment":({ "hammer" })]));

addPrerequisite("level",
(["type":"level",
"guild": "Scion of Dhuras",
"value": 12 ]));

addPrerequisite("lib/guilds/scion/paths/hammer/forms/smite.c",
(["type":"research"]));

addSpecification("scope", "self");
addSpecification("research type", "points");
addSpecification("research cost", 1);
addSpecification("bonus attack", 1);
addSpecification("bonus damage", 1);
}
}
Oops, something went wrong.

0 comments on commit 85f0876

Please sign in to comment.
You can’t perform that action at this time.