Skip to content
Permalink
Browse files

Merged PR 466: Merge 572_staff_form to master

Related work items: #572
  • Loading branch information...
realms-mud committed Mar 20, 2019
1 parent 68aef59 commit 179a02288372185c20dd54c77520a9de6ffe4cc7
Showing with 2,056 additions and 7 deletions.
  1. +1 −1 guilds/scion/paths/axe/forms/barrier-guard.c
  2. +1 −1 guilds/scion/paths/hammer/forms/barrier-guard.c
  3. +1 −1 guilds/scion/paths/hammer/forms/changing-through.c
  4. +1 −1 guilds/scion/paths/hammer/forms/porta-di-ferro-e-stretta.c
  5. +1 −1 guilds/scion/paths/mace/forms/barrier-guard.c
  6. +1 −1 guilds/scion/paths/mace/forms/changing-through.c
  7. +1 −1 guilds/scion/paths/mace/forms/porta-di-ferro-e-stretta.c
  8. +310 −0 guilds/scion/paths/staff.c
  9. +38 −0 guilds/scion/paths/staff/forms/advanced-changing.c
  10. +35 −0 guilds/scion/paths/staff/forms/barrier-guard.c
  11. +39 −0 guilds/scion/paths/staff/forms/changing-through.c
  12. +37 −0 guilds/scion/paths/staff/forms/crooked-smite.c
  13. +34 −0 guilds/scion/paths/staff/forms/dance-of-death.c
  14. +32 −0 guilds/scion/paths/staff/forms/displacement.c
  15. +33 −0 guilds/scion/paths/staff/forms/doubling.c
  16. +35 −0 guilds/scion/paths/staff/forms/eisenport.c
  17. +34 −0 guilds/scion/paths/staff/forms/evade.c
  18. +29 −0 guilds/scion/paths/staff/forms/from-the-roof.c
  19. +34 −0 guilds/scion/paths/staff/forms/hanging-fist.c
  20. +33 −0 guilds/scion/paths/staff/forms/hanging-parry.c
  21. +35 −0 guilds/scion/paths/staff/forms/langort.c
  22. +28 −0 guilds/scion/paths/staff/forms/mauling.c
  23. +33 −0 guilds/scion/paths/staff/forms/middle-smite.c
  24. +36 −0 guilds/scion/paths/staff/forms/mordstreich.c
  25. +39 −0 guilds/scion/paths/staff/forms/mutating-attack.c
  26. +35 −0 guilds/scion/paths/staff/forms/nachreisen.c
  27. +35 −0 guilds/scion/paths/staff/forms/near-guard.c
  28. +40 −0 guilds/scion/paths/staff/forms/off-setting.c
  29. +33 −0 guilds/scion/paths/staff/forms/over-bash.c
  30. +39 −0 guilds/scion/paths/staff/forms/over-running.c
  31. +33 −0 guilds/scion/paths/staff/forms/over-smite.c
  32. +40 −0 guilds/scion/paths/staff/forms/part-smite.c
  33. +38 −0 guilds/scion/paths/staff/forms/porta-di-ferro-alta.c
  34. +39 −0 guilds/scion/paths/staff/forms/porta-di-ferro-e-stretta.c
  35. +36 −0 guilds/scion/paths/staff/forms/pressing-of-hands.c
  36. +37 −0 guilds/scion/paths/staff/forms/reverse-strike.c
  37. +35 −0 guilds/scion/paths/staff/forms/running-through.c
  38. +33 −0 guilds/scion/paths/staff/forms/side-stepping.c
  39. +34 −0 guilds/scion/paths/staff/forms/smite.c
  40. +45 −0 guilds/scion/paths/staff/forms/squinting-smite.c
  41. +28 −0 guilds/scion/paths/staff/forms/striking.c
  42. +39 −0 guilds/scion/paths/staff/forms/the-boar.c
  43. +34 −0 guilds/scion/paths/staff/forms/the-crown.c
  44. +36 −0 guilds/scion/paths/staff/forms/the-fool.c
  45. +35 −0 guilds/scion/paths/staff/forms/the-ox.c
  46. +35 −0 guilds/scion/paths/staff/forms/the-plough.c
  47. +36 −0 guilds/scion/paths/staff/forms/the-stag.c
  48. +34 −0 guilds/scion/paths/staff/forms/the-unicorn.c
  49. +36 −0 guilds/scion/paths/staff/forms/thwart-smite.c
  50. +34 −0 guilds/scion/paths/staff/forms/under-smite.c
  51. +33 −0 guilds/scion/paths/staff/forms/undercut.c
  52. +35 −0 guilds/scion/paths/staff/forms/wechsel.c
  53. +36 −0 guilds/scion/paths/staff/forms/winding.c
  54. +35 −0 guilds/scion/paths/staff/forms/wrath-guard.c
  55. +42 −0 guilds/scion/paths/staff/forms/wrath-smite.c
  56. +35 −0 guilds/scion/paths/staff/forms/zerschlagen.c
  57. +40 −0 guilds/scion/paths/staff/forms/zucken.c
@@ -14,7 +14,7 @@ public void reset(int arg)
addSpecification("source", "Scion of Dhuras Guild");
addSpecification("description", "This skill provides the user with the "
"knowledge of a defensive maneuver where the dominant foot is "
"forward, the pommel held near the chest with the axe's edge "
"forward, the haft held near the chest with the axe's edge "
"pointed at the foe's face.");
addSpecification("limited by", (["equipment":({ "axe" })]));

@@ -14,7 +14,7 @@ public void reset(int arg)
addSpecification("source", "Scion of Dhuras Guild");
addSpecification("description", "This skill provides the user with the "
"knowledge of a defensive maneuver where the dominant foot is "
"forward, the pommel held near the chest with the hammer's edge "
"forward, the haft held near the chest with the hammer's edge "
"pointed at the foe's face.");
addSpecification("limited by", (["equipment":({ "hammer" })]));

@@ -15,7 +15,7 @@ public void reset(int arg)
addSpecification("description", "This skill provides the user with the "
"knowledge of various techniques of escaping a bind by sliding "
"the hammer's face out from underneath the weapon and then "
"hacking to another opening.");
"striking to another opening.");

addSpecification("limited by", (["equipment":({
"hammer" })]));
@@ -17,7 +17,7 @@ public void reset(int arg)
"forward and the other foot placed sideways, both knees bent. The "
"haft is held just inside and above the knee with the hammer's fluke or head "
"pointed at the foe's face. From this position, it is possible to "
"easily launch several chops and strikes.");
"easily launch several mauls and strikes.");
addSpecification("limited by", (["equipment":({
"hammer" })]));

@@ -14,7 +14,7 @@ public void reset(int arg)
addSpecification("source", "Scion of Dhuras Guild");
addSpecification("description", "This skill provides the user with the "
"knowledge of a defensive maneuver where the dominant foot is "
"forward, the pommel held near the chest with the mace's head "
"forward, the haft held near the chest with the mace's head "
"pointed at the foe's face.");
addSpecification("limited by", (["equipment":({ "mace", "flail" })]));

@@ -15,7 +15,7 @@ public void reset(int arg)
addSpecification("description", "This skill provides the user with the "
"knowledge of various techniques of escaping a bind by sliding "
"the mace's head out from underneath the weapon and then "
"hacking to another opening.");
"striking to another opening.");

addSpecification("limited by", (["equipment":({
"mace", "flail" })]));
@@ -17,7 +17,7 @@ public void reset(int arg)
"forward and the other foot placed sideways, both knees bent. The "
"haft is held just inside and above the knee with the mace's head "
"pointed at the foe's face. From this position, it is possible to "
"easily launch several chops and strikes.");
"easily launch several mauls and strikes.");
addSpecification("limited by", (["equipment":({
"mace", "flail" })]));

@@ -4,6 +4,291 @@
//*****************************************************************************
inherit "/lib/modules/research/researchTree.c";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

addChild("lib/guilds/scion/paths/staff/forms/pressing-of-hands.c",
"lib/guilds/scion/paths/staff/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/staff/root.c");

TreeRoot("lib/guilds/scion/paths/staff/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();
}
}
Oops, something went wrong.

0 comments on commit 179a022

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