Various updates

merit.rb

@@ -5,11 +5,12 @@ class Merit
 					:dot_ratings,
 					:rules_text,
 					:ranks,
+					:drawback,
 					:pdf
 
 	attr_accessor :authors
 
-	def initialize(name:, prerequisites: nil, adjectives: [], dot_ratings: [], rules_text:, ranks: nil, pdf:)
+	def initialize(name:, prerequisites: nil, adjectives: [], dot_ratings: [], rules_text:, ranks: nil, pdf:, drawback: nil)
 		@name = name
 		@prerequisites = prerequisites
 		@adjectives = adjectives
@@ -17,6 +18,7 @@ class Merit
 		@rules_text = rules_text
 		@ranks = ranks
 		@pdf = pdf
+		@drawback = drawback
 
 
 		@dot_ratings = @dot_ratings.arrayify
@@ -61,6 +63,7 @@ class Merit
 			end
 
 			g.text "<b>Effect:</b> #{rules_text}", :inline_format => true, :indent_paragraphs => Awakened2069::INDENT_SIZE
+			g.text "<b>Drawback:</b> #{drawback}", :inline_format => true, :indent_paragraphs => Awakened2069::INDENT_SIZE unless drawback.nil?
 		end
 
 		self

merits.rb

@@ -41,9 +41,9 @@ class Merit
     merits << Merit.new(
       :name          => "Adamant Hand",
       :dot_ratings   => (1..5),
-      :prerequisites => ["Adamantine Arrow Status #{1.to_dots} to #{5.to_dots}", "Brawl, Firearms or Weaponry at #{3.to_dots}"],
+      :prerequisites => ["Adamantine Arrow Status #{2.to_dots}", "Brawl, Firearms or Weaponry at #{3.to_dots}"],
       :adjectives    => ["Order", "Style", "Replacement / House Rule"],
-      :rules_text    => "Your character has studied extensively in the Adamantine Arrow martial arts. This allows her to use combat techniques as Yantras. When taking this Merit, choose Athletics, Weaponry, or Brawl, which your character must have three or more dots in. You may purchase additional skills as two-dot Merits. The dot rating of this Merit cannot exceed the user's Status in the Adamantine Arrow.\n<b>Practical Training (#{1.to_dots}):</b> Your character may use her chosen Skill in combat as a reflexive Yantra, adding dice to a spell cast on subsequent turns.\n<b>Muscle Memory (#{2.to_dots}):</b> Your character may use her chosen skill as a reflexive Yantra on any spell cast reflexively in the same turn as the combat action.\n<b>Specialist Training (#{3.to_dots}):</b> If your character possesses an applicable specialty in their chosen skill, the Yantra bonus it provides increases from +1 to +2.\n<b>Unity (#{4.to_dots}):</b> The Mage’s skill and mystic power become truly one. At this level of proficiency, she may, by spending a point of Willpower and two Reach, reflexively cast spells to enhance an action undertaken with her chosen skill, even if that spell would not normally be reflexive. Effectively, she may lash out with body and magic as one, performing an instant action that combines a mundane attack and a spell action. Normally, the spells that qualify for this enhance the Arrow or harm the target of the mundane attack in some way.\n<b>The Adamant Way (#{5.to_dots}):</b> Internalizing the lessons of the Bladeless Sword, the masters of the Adamantine Hand become deceptively outwardly complacent. By spending a point of both Mana and Willpower before attacking, a master of Adamantine Hand may make any attack (including harmful spells) they want to employ mundanely imperceptible. For the world at large (and more importantly, for the Abyssal shard inside Sleeper onlookers) the harm appears to occur suddenly and without apparent cause, obviating the automatic +2 Paradox dice from Sleeper onlookers. Active Mage Sight and similar powers let one see such an attack normally.",
+      :rules_text    => "Your character has studied extensively in the Adamantine Arrow martial arts. This allows her to use combat techniques as Yantras. When taking this Merit, choose Athletics, Weaponry, or Brawl, which your character must have three or more dots in. You may purchase additional skills as two-dot Merits.\n<b>Practical Training (#{1.to_dots}):</b> Your character may use her chosen Skill in combat as a reflexive Yantra, adding dice to a spell cast on subsequent turns.\n<b>Muscle Memory (#{2.to_dots}):</b> Your character may use her chosen skill as a reflexive Yantra on any spell cast reflexively in the same turn as the combat action.\n<b>Specialist Training (#{3.to_dots}):</b> If your character possesses an applicable specialty in their chosen skill, the Yantra bonus it provides increases from +1 to +2.\n<b>Unity (#{4.to_dots}):</b> The Mage’s skill and mystic power become truly one. At this level of proficiency, she may, by spending a point of Willpower and two Reach, reflexively cast spells to enhance an action undertaken with her chosen skill, even if that spell would not normally be reflexive. Effectively, she may lash out with body and magic as one, performing an instant action that combines a mundane attack and a spell action. Normally, the spells that qualify for this enhance the Arrow or harm the target of the mundane attack in some way.\n<b>The Adamant Way (#{5.to_dots}):</b> Internalizing the lessons of the Bladeless Sword, the masters of the Adamantine Hand become deceptively outwardly complacent. By spending a point of both Mana and Willpower before attacking, a master of Adamantine Hand may make any attack (including harmful spells) they want to employ mundanely imperceptible. For the world at large (and more importantly, for the Abyssal shard inside Sleeper onlookers) the harm appears to occur suddenly and without apparent cause, obviating the automatic +2 Paradox dice from Sleeper onlookers. Active Mage Sight and similar powers let one see such an attack normally.",
       :pdf           => pdf
     )
 
@@ -55,6 +55,45 @@ class Merit
       :rules_text    => "Mystagogues spend so much time in libraries for a reason: it's because the books contain information that is actually valuable. Once per chapter, if she gained an Arcane Beat through first-hand experience, she can inscribe one of her grimoires, or a similar magical tome, with that experience. Others may read this document and gain the Arcane Beat that the willworker gained; they can only use a Supernal Textbook once per chapter, as the Supernal mind can be boosted by second-handy study, but only at a certain pace.\nWhen a person does use one such Supernal Textbook, they get the full anecdote from the writing in addition to its Arcane Beat, and the possibility of learning the Arcane Beat a second time through first-hand experience is eliminated. If the Storyteller determines that the person reading the Supernal Textbook has already had a comparable experience, they gain no Arcane Beat from it.",
       :pdf           => pdf
     )
+
+    merits << Merit.new(
+      :name          => "Thunder",
+      :dot_ratings   => 2,
+      :prerequisites => ["Adamantine Arrow Status #{2.to_dots}", "Adamant Hand #{1.to_dots}"],
+      :adjectives    => ["Order"],
+      :rules_text    => "The meditations of the Thunderous Mind gird the novice’s Wisdom against aggravation. The Mage may add her Adamantine Hand dots to any check for Wisdom degeneration resulting from violence inflicted in line of duty, upholding of her Oaths, or ordered by her superiors in the order.\nIn addition, her chosen skill counts as a Dedicated Tool, stacking with any actual dedicated tool she uses.",
+      :pdf           => pdf
+    )
+
+
+    merits << Merit.new(
+      :name          => "Diamond",
+      :dot_ratings   => 2,
+      :prerequisites => ["Adamantine Arrow Status #{3.to_dots}", "Adamant Hand #{2.to_dots}"],
+      :adjectives    => ["Order"],
+      :rules_text    => "Employing the lessons of the Diamond Fist, the initiate gains skill to pierce defences born of mystic understanding.\nThe Mage may subtract her Adamantine Hand score from effective Arcana ratings of Mage Armor she confronts with her mundane attacks. For those Arcana where the effect is not reliant on the numerical value of the Arcanum, this ability instead allows to have an amount of lethal damage equal to the practitioner’s Adamantine Hand dots to pass through undeterred. Applying the same effect to other inherent defensive abilities may be allowed at ST’s discretion.",
+      :pdf           => pdf
+    )
+
+    merits << Merit.new(
+      :name          => "Star",
+      :dot_ratings   => 3,
+      :prerequisites => ["Adamantine Arrow Status #{4.to_dots}", "Adamant Hand #{3.to_dots}"],
+      :adjectives    => ["Order"],
+      :rules_text    => "An Adamantine Hand practitioner is inherently lord and master of mortal ways of dealing harm, his enlightened skill impossibly broad.\nBy reflexively spending a point of Mana, the Adamantine Hand journeyman may become able to employ any one maneuver with a dot rating equal or lower to their Adamantine Hand score of any combat style allowed in the chronicle, for the use of which she otherwise qualifies. This effect lasts until the end of the scene.",
+      :pdf           => pdf
+    )
+
+    merits << Merit.new(
+      :name          => "Occultation",
+      :dot_ratings   => (1..5),
+      :prerequisites => ["No Fame Merit", "No infamy Flaw"],
+      :adjectives    => ["Replacement"],
+      :rules_text    => "Your character is unnoticeable and inoffensive on a mystical level. Any time a character tries to read your character’s aura, or otherwise use magic to discern bits of truth within her, subtract your Merit dots from their pool. Normally, a mage’s spells carry with them a hint of his Nimbus. This Merit allows a mage to hide that, to metaphysically sweep that under a rug. Your character’s Signature Nimbus is faint, vague, and couched in more symbolism and oblique references than other mages’. When someone attempts to scrutinize her Nimbus to identify her or track her, subtract your Merit dots from their rolls. Add the number of Occultation dots the character has to any Withstand spell that uses sympathy.",
+      :drawback      => "If your character ever gains the Fame Merit, or becomes noticed by the public at large, you can lose this Merit.",
+      :pdf           => pdf
+    )
+
     merits.sort_by! {|m| m.name }
 
     merits