From beb954b74929633da599803c5b0e89548511e155 Mon Sep 17 00:00:00 2001
From: realtradam <github@tradam.dev>
Date: Sat, 12 Nov 2022 06:18:38 -0500
Subject: fleshed out many of the base weapons

---
 cards/card.html         | 261 +++++++++++++++++++++++---
 cards/card.rb           |  42 ++++-
 cards/common_weapons.rb | 474 +++++++++++++++++++++---------------------------
 src/attributes.md       |  15 +-
 4 files changed, 490 insertions(+), 302 deletions(-)

diff --git a/cards/card.html b/cards/card.html
index 3ef3b9f..41b1267 100644
--- a/cards/card.html
+++ b/cards/card.html
@@ -212,6 +212,9 @@
 			p {
 				margin: 0;
 			}
+			body {
+				background-color: #1e1e1e;
+			}
 		</style>
 	</head>
 	<button onclick="downloadAsImage()">
@@ -225,10 +228,10 @@
 						Thrusting Sword
 					</p>
 					<div class="attrib_icon attrib_bl">
-						⚔️ 5
+						⚔️ 3
 					</div>
 					<div class="attrib_icon attrib_br">
-						Pre 🎲
+						Prc 🎲
 					</div>
 				</div>
 				<div class="content">
@@ -240,7 +243,7 @@
 								</span>
 							</div>
 							<div class="action_detail">
-								<p>🎲 <strong>d6 + Prescision</strong> to hit.</p>
+								<p>🎲 <strong>d8 + Prc</strong> to hit.</p>
 							</div>
 						</div>
 					</div>
@@ -256,7 +259,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Thrusting Sword Weapon
 				</div>
 			</div>
 		</div>
@@ -267,7 +270,7 @@
 						Spear
 					</p>
 					<div class="attrib_icon attrib_bl">
-						⚔️ 4
+						⚔️ 2
 					</div>
 					<div class="attrib_icon attrib_br">
 						Str 🎲
@@ -282,7 +285,7 @@
 								</span>
 							</div>
 							<div class="action_detail">
-								<p>🎲 <strong>d6 + (Prescision or Strength)</strong> to hit.</p>
+								<p>🎲 <strong>d6 + Str</strong> to hit.</p>
 							</div>
 						</div>
 					</div>
@@ -298,7 +301,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Spear Weapon
 				</div>
 			</div>
 		</div>
@@ -309,10 +312,10 @@
 						Dagger
 					</p>
 					<div class="attrib_icon attrib_bl">
-						⚔️ 3
+						⚔️ 2
 					</div>
 					<div class="attrib_icon attrib_br">
-						Pre 🎲
+						Prc 🎲
 					</div>
 				</div>
 				<div class="content">
@@ -324,7 +327,7 @@
 								</span>
 							</div>
 							<div class="action_detail">
-								<p>🎲 <strong>d6 + (Prescision or Strength)</strong> to hit.</p>
+								<p>🎲 <strong>d6 + Prc</strong> to hit.</p>
 							</div>
 						</div>
 					</div>
@@ -349,7 +352,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Dagger Weapon
 				</div>
 			</div>
 		</div>
@@ -360,7 +363,10 @@
 						Bow
 					</p>
 					<div class="attrib_icon attrib_bl">
-						⚔️ 5
+						⚔️ 3
+					</div>
+					<div class="attrib_icon attrib_br">
+						1 🎲
 					</div>
 				</div>
 				<div class="content">
@@ -372,13 +378,13 @@
 								</span>
 							</div>
 							<div class="action_detail">
-								<p>🎲 <strong>d8 + Prescision</strong> to hit.</p>
+								<p>🎲 <strong>d4 + (2·Prc)</strong> to hit.</p>
 							</div>
 						</div>
 					</div>
 					<div class="action">
 						<hr>
-						<p><strong>Ranged</strong>: When making an attack, you ignore repostes from your target.</p>
+						<p><strong>Ranged</strong>: When making an attack, you ignore repostes from your target. You can’t deal a reposte either.</p>
 					</div>
 					<div class="flavour_wrapper">
 						<div class="flavour">
@@ -388,7 +394,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Bow Weapon
 				</div>
 			</div>
 		</div>
@@ -399,7 +405,10 @@
 						Crossbow
 					</p>
 					<div class="attrib_icon attrib_bl">
-						⚔️ 7
+						⚔️ 4
+					</div>
+					<div class="attrib_icon attrib_br">
+						1 🎲
 					</div>
 				</div>
 				<div class="content">
@@ -411,7 +420,7 @@
 								</span>
 							</div>
 							<div class="action_detail">
-								<p>(must be loaded) 🎲 <strong>d6 + Prescision</strong> to hit.</p>
+								<p>(must be loaded) 🎲 <strong>d6 + Prc</strong> to hit.</p>
 							</div>
 						</div>
 					</div>
@@ -430,7 +439,7 @@
 					</div>
 					<div class="action">
 						<hr>
-						<p><strong>Ranged</strong>: When making an attack, you ignore repostes from your target.</p>
+						<p><strong>Ranged</strong>: When making an attack, you ignore repostes from your target. You can’t deal a reposte either.</p>
 					</div>
 					<div class="flavour_wrapper">
 						<div class="flavour">
@@ -440,7 +449,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Crossbow Weapon
 				</div>
 			</div>
 		</div>
@@ -448,13 +457,50 @@
 			<div class="group">
 				<div class="title">
 					<p>
-						Warhammer
+						Hammer
 					</p>
+					<div class="attrib_icon attrib_bl">
+						⚔️ 3
+					</div>
+					<div class="attrib_icon attrib_br">
+						Str 🎲
+					</div>
 				</div>
 				<div class="content">
+					<div class="action">
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>🎲 <strong>d6 + Str</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p><strong>Power Swing</strong>: 🎲 <strong>d4 + Str</strong> to hit. Deal <strong>Str + 2</strong> damage.</p>
+							</div>
+						</div>
+					</div>
+					<div class="flavour_wrapper">
+						<div class="flavour">
+							<hr>
+							<p>“If you can pick it up, then you are worthy enough to use it.”</p>
+						</div>
+					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Hammer Weapon
 				</div>
 			</div>
 		</div>
@@ -464,11 +510,48 @@
 					<p>
 						Straight Sword
 					</p>
+					<div class="attrib_icon attrib_bl">
+						⚔️ 3
+					</div>
+					<div class="attrib_icon attrib_br">
+						Str 🎲
+					</div>
 				</div>
 				<div class="content">
+					<div class="action">
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>🎲 <strong>d6 + Str</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>(Two Handed) 🎲 <strong>d6 + Str</strong> to hit. Deal <strong>Str</strong> damage.</p>
+							</div>
+						</div>
+					</div>
+					<div class="flavour_wrapper">
+						<div class="flavour">
+							<hr>
+							<p>“El Classico”</p>
+						</div>
+					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Straight Sword Weapon
 				</div>
 			</div>
 		</div>
@@ -478,11 +561,48 @@
 					<p>
 						Axe
 					</p>
+					<div class="attrib_icon attrib_bl">
+						⚔️ 3
+					</div>
+					<div class="attrib_icon attrib_br">
+						Str 🎲
+					</div>
 				</div>
 				<div class="content">
+					<div class="action">
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>🎲 <strong>d8 + Str</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p><strong>Throw</strong>: 🎲 <strong>d6 + Str</strong> to hit. This attack is <strong>Ranged</strong> and thus you ignore repostes from your target. You lose this weapon by using this attack.</p>
+							</div>
+						</div>
+					</div>
+					<div class="flavour_wrapper">
+						<div class="flavour">
+							<hr>
+							<p>“Looks great with a flannel shirt.”</p>
+						</div>
+					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Axe Weapon
 				</div>
 			</div>
 		</div>
@@ -492,11 +612,61 @@
 					<p>
 						Staff
 					</p>
+					<div class="attrib_icon attrib_bl">
+						⚔️ 2
+					</div>
+					<div class="attrib_icon attrib_br">
+						Str 🎲
+					</div>
 				</div>
 				<div class="content">
+					<div class="action">
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>🎲 <strong>d6 + Str</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>(Two Handed) 🎲 <strong>d8 + Str</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon suit_icon spades_icon">
+									♠️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>(odd) <strong>Swift Attack</strong>: Refresh this card.</p>
+							</div>
+						</div>
+					</div>
+					<div class="flavour_wrapper">
+						<div class="flavour">
+							<hr>
+							<p>“Says ‘Made by the Ninja Custodial Group’ on the handle”</p>
+						</div>
+					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Staff Weapon
 				</div>
 			</div>
 		</div>
@@ -506,11 +676,48 @@
 					<p>
 						Curved Sword
 					</p>
+					<div class="attrib_icon attrib_bl">
+						⚔️ 3
+					</div>
+					<div class="attrib_icon attrib_br">
+						Prc 🎲
+					</div>
 				</div>
 				<div class="content">
+					<div class="action">
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon tap_icon">
+									↪️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>🎲 <strong>d6 + Prc</strong> to hit.</p>
+							</div>
+						</div>
+					</div>
+					<div class="action">
+						<hr>
+						<div class="symbol_wrapper_outer">
+							<div class="symbol_wrapper_inner">
+								<span class="icon suit_icon spades_icon">
+									♠️
+								</span>
+							</div>
+							<div class="action_detail">
+								<p>(odd, recieving a reposte) <strong>Close Quarters</strong>: Deal damage equal to your reposte.</p>
+							</div>
+						</div>
+					</div>
+					<div class="flavour_wrapper">
+						<div class="flavour">
+							<hr>
+							<p>“Arrrgh”</p>
+						</div>
+					</div>
 				</div>
 				<div class="card_type">
-					Weapon
+					Curved Sword Weapon
 				</div>
 			</div>
 		</div>
@@ -523,7 +730,7 @@
 				</div>
 				<div class="content">
 					<div class="action">
-						<p>While equipped: Unarmed Strikes deal <strong>Strength</strong> additional damage.</p>
+						<p>While equipped: Unarmed Strikes deal <strong>Str</strong> additional damage.</p>
 					</div>
 					<div class="flavour_wrapper">
 						<div class="flavour">
@@ -533,7 +740,7 @@
 					</div>
 				</div>
 				<div class="card_type">
-					Equipment
+					Weapon Equipment
 				</div>
 			</div>
 		</div>
diff --git a/cards/card.rb b/cards/card.rb
index 2d53fdc..f40cdf5 100644
--- a/cards/card.rb
+++ b/cards/card.rb
@@ -16,6 +16,42 @@ class Card
     @actions ||= []
   end
 
+  def initialize(
+    title:,
+    color:,
+    attrib_top_right: nil,
+    attrib_top_right_icon: '🩸',
+    blood: nil,
+    attrib_top_left: nil,
+    attrib_top_left_icon: '🛡️',
+    attrib_bottom_right: nil,
+    attrib_bottom_right_icon: '🎲',
+    reposte: nil,
+    attrib_bottom_left: nil,
+    attrib_bottom_left_icon: '⚔️',
+    damage: nil,
+    actions: [],
+    flavour: nil,
+    type: nil
+  )
+    attrib_top_right ||= blood.to_s unless blood.nil?
+    attrib_bottom_right ||= reposte.to_s unless reposte.nil?
+    attrib_bottom_left ||= damage.to_s unless damage.nil?
+    self.title = title
+    self.color = color
+    self.attrib_top_left = attrib_top_left
+    self.attrib_top_left_icon = attrib_top_left_icon
+    self.attrib_top_right = attrib_top_right
+    self.attrib_top_right_icon = attrib_top_right_icon
+    self.attrib_bottom_right = attrib_bottom_right
+    self.attrib_bottom_right_icon = attrib_bottom_right_icon
+    self.attrib_bottom_left = attrib_bottom_left
+    self.attrib_bottom_left_icon = attrib_bottom_left_icon
+    self.actions.push *actions
+    self.flavour = flavour
+    self.type = type
+  end
+
   class Action
     attr_accessor :content, :symbol, :seperator
 
@@ -31,9 +67,9 @@ class Card
       Paggio.html do |_|
         _.head do
           _.style do
-            #rule 'body' do
-            #  height 100.%
-            #end
+            rule 'body' do
+              background color: '#1e1e1e'
+            end
             rule 'p' do
               margin 0
             end
diff --git a/cards/common_weapons.rb b/cards/common_weapons.rb
index 8879c5a..6a7d40b 100644
--- a/cards/common_weapons.rb
+++ b/cards/common_weapons.rb
@@ -2,294 +2,226 @@ load 'card.rb'
 
 cards = []
 
-card = Card.new
-card.title = "Thrusting Sword"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-card.attrib_bottom_right = 'Pre'
-card.attrib_bottom_right_icon = '🎲'
-card.attrib_bottom_left = '5'
-card.attrib_bottom_left_icon = '⚔️'
-card.actions.push Card::Action.new(
-  content: '🎲 **d6 + Prescision** to hit.',
-  symbol: :tap,
+cards.push Card.new(
+  title: "Thrusting Sword",
+  color: 'rebeccapurple',
+  reposte: 'Prc',
+  damage: '3',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d8 + Prc** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Opportune Strike**: When targeting an enemy with this weapon, mark them until the end of their turn. While marked if they attack somone other then you then you can perform a reposte on them.',
+    )
+  ],
+  flavour: '"World Famous Iron Toothpick"',
+  type: 'Thrusting Sword Weapon'
 )
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '**Opportune Strike**: When targeting an enemy with this weapon, mark them until the end of their turn. While marked if they attack somone other then you then you can perform a reposte on them.',
-  #symbol: :spades,
-)
-card.flavour = '"World Famous Iron Toothpick"'
-card.type = 'Weapon'
-cards.push card
 
 
-card = Card.new
-card.title = "Spear"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-card.attrib_bottom_right = 'Str'
-card.attrib_bottom_right_icon = '🎲'
-card.attrib_bottom_left = '4'
-card.attrib_bottom_left_icon = '⚔️'
-card.actions.push Card::Action.new(
-  content: '🎲 **d6 + (Prescision or Strength)** to hit.',
-  symbol: :tap,
-)
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '**Reach**: When making an attack, you ignore repostes from your target.',
-  # TODO: this is the same as the bow making it superiour
-  #symbol: :spades,
+cards.push Card.new(
+  title: "Spear",
+  color: 'rebeccapurple',
+  reposte: 'Str',
+  damage: '2',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Reach**: When making an attack, you ignore repostes from your target.',
+      # TODO: this is the same as the bow making it superiour
+      #symbol: :spades,
+    ),
+  ],
+  flavour: '"Getting up close and personal while staying far away"',
+  type: 'Spear Weapon'
 )
-card.flavour = '"Getting up close and personal while staying far away"'
-card.type = 'Weapon'
-cards.push card
 
 
-card = Card.new
-card.title = "Dagger"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-card.attrib_bottom_right = 'Pre'
-card.attrib_bottom_right_icon = '🎲'
-card.attrib_bottom_left = '3'
-card.attrib_bottom_left_icon = '⚔️'
-card.actions.push Card::Action.new(
-  content: '🎲 **d6 + (Prescision or Strength)** to hit.',
-  symbol: :tap,
-)
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '(even) **Swift Attack**: Refresh this card.',
-  symbol: :spades
-  #symbol: :spades,
+cards.push Card.new(
+  title: "Dagger",
+  color: 'rebeccapurple',
+  reposte: 'Prc',
+  damage: '2',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Prc** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '(even) **Swift Attack**: Refresh this card.',
+      symbol: :spades
+    ),
+  ],
+  flavour: '"A quick and convinient way to turn a spleen into a sheath"',
+  type: 'Dagger Weapon'
 )
-card.flavour = '"A quick and convinient way to turn a spleen into a sheath"'
-card.type = 'Weapon'
-cards.push card
 
-card = Card.new
-card.title = "Bow"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-card.attrib_bottom_left = '5'
-card.attrib_bottom_left_icon = '⚔️'
-card.actions.push Card::Action.new(
-  content: '🎲 **d8 + Prescision** to hit.',
-  symbol: :tap,
+cards.push Card.new(
+  title: "Bow",
+  color: 'rebeccapurple',
+  damage: '3',
+  reposte: 1,
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d4 + (2·Prc)** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Ranged**: When making an attack, you ignore repostes from your target. You can\'t deal a reposte either.',
+    )
+  ],
+  flavour: '"One stringed instrument that got repurposed as a weapon."',
+  type: 'Bow Weapon'
 )
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-)
-card.flavour = '"One stringed instrument that got repurposed as a weapon."'
-card.type = 'Weapon'
-cards.push card
 
-card = Card.new
-card.title = "Crossbow"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-card.attrib_bottom_left = '7'
-card.attrib_bottom_left_icon = '⚔️'
-card.actions.push Card::Action.new(
-  content: '(must be loaded) 🎲 **d6 + Prescision** to hit.',
-  symbol: :tap,
-)
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '**Reload**: Load this weapon.',
-  symbol: :tap,
-)
-card.actions.push Card::Action.new(
-  seperator: true,
-  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
+cards.push Card.new(
+  title: "Crossbow",
+  color: 'rebeccapurple',
+  damage: '4',
+  reposte: 1,
+  actions: [
+    Card::Action.new(
+      content: '(must be loaded) 🎲 **d6 + Prc** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Reload**: Load this weapon.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Ranged**: When making an attack, you ignore repostes from your target. You can\'t deal a reposte either.',
+    )
+  ],
+  flavour: '"No one will cross you with this weapon"',
+  type: 'Crossbow Weapon'
 )
-card.flavour = '"No one will cross you with this weapon"'
-card.type = 'Weapon'
-cards.push card
 
-card = Card.new
-card.title = "Warhammer"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Reload**: Load this weapon.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.type = 'Weapon'
-cards.push card
+cards.push Card.new(
+  title: "Hammer",
+  reposte: 'Str',
+  damage: 3,
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Power Swing**: 🎲 **d4 + Str** to hit. Deal **Str + 2** damage.',
+      symbol: :tap
+    ),
+  ],
+  flavour: '"If you can pick it up, then you are worthy enough to use it."',
+  color: 'rebeccapurple',
+  type: 'Hammer Weapon'
+)
 
-card = Card.new
-card.title = "Straight Sword"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Reload**: Load this weapon.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.type = 'Weapon'
-cards.push card
+cards.push Card.new(
+  title: "Straight Sword",
+  damage: 3,
+  reposte: 'Str',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '(Two Handed) 🎲 **d6 + Str** to hit. Deal **Str** damage.',
+      symbol: :tap,
+    )
+  ],
+  flavour: '"El Classico"',
+  color: 'rebeccapurple',
+  type: 'Straight Sword Weapon'
+)
 
-card = Card.new
-card.title = "Axe"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Reload**: Load this weapon.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.type = 'Weapon'
-cards.push card
+cards.push Card.new(
+  title: "Axe",
+  damage: 3,
+  reposte: 'Str',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d8 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '**Throw**: 🎲 **d6 + Str** to hit. This attack is **Ranged** and thus you ignore repostes from your target. You lose this weapon by using this attack.',
+      symbol: :tap
+    ),
+  ],
+  flavour: '"Looks great with a flannel shirt."',
+  color: 'rebeccapurple',
+  type: 'Axe Weapon',
+)
 
-card = Card.new
-card.title = "Staff"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Reload**: Load this weapon.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.type = 'Weapon'
-cards.push card
+cards.push Card.new(
+  title: "Staff",
+  damage: 2,
+  reposte: 'Str',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '(Two Handed) 🎲 **d8 + Str** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '(odd) **Swift Attack**: Refresh this card.',
+      symbol: :spades
+    ),
+  ],
+  color: 'rebeccapurple',
+  flavour: '"Says \'Made by the Ninja Custodial Group\' on the handle"',
+  type: 'Staff Weapon',
+)
 
-card = Card.new
-card.title = "Curved Sword"
-card.color = 'rebeccapurple'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Reload**: Load this weapon.',
-#  symbol: :tap,
-#)
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.type = 'Weapon'
-cards.push card
+cards.push Card.new(
+  title: "Curved Sword",
+  damage: 3,
+  reposte: 'Prc',
+  actions: [
+    Card::Action.new(
+      content: '🎲 **d6 + Prc** to hit.',
+      symbol: :tap,
+    ),
+    Card::Action.new(
+      seperator: true,
+      content: '(odd, recieving a reposte) **Close Quarters**: Deal damage equal to your reposte.',
+      symbol: :spades
+    ),
+  ],
+  color: 'rebeccapurple',
+  flavour: '"Arrrgh"',
+  type: 'Curved Sword Weapon',
+)
 
-card = Card.new
-card.title = "Caestus"
-card.color = 'DarkBlue'
-#card.attrib_top_right = '1'
-#card.attrib_top_right_icon = '🩸'
-#card.attrib_top_right = '2'
-#card.attrib_top_right_icon = '🛡️'
-#card.attrib_bottom_right = 'Pre'
-#card.attrib_bottom_right_icon = '🎲'
-#card.attrib_bottom_left = '3'
-#card.attrib_bottom_left_icon = '⚔️'
-#card.actions.push Card::Action.new(
-#  content: '(must be loaded) 🎲 **d8 + Prescision** to hit. Deals ⚔️ **7 damage**.',
-#  symbol: :tap,
-#)
-card.actions.push Card::Action.new(
-  #seperator: true,
-  content: 'While equipped: Unarmed Strikes deal **Strength** additional damage.',
-  #symbol: :tap,
+cards.push Card.new(
+  title: "Caestus",
+  color: 'DarkBlue',
+  actions: [
+    Card::Action.new(
+      content: 'While equipped: Unarmed Strikes deal **Str** additional damage.',
+    )
+  ],
+  flavour: '"Weapon of choice for a fit bronze statue"',
+  type: 'Weapon Equipment'
 )
-#card.actions.push Card::Action.new(
-#  seperator: true,
-#  content: '**Ranged**: When making an attack, you ignore repostes from your target.',
-#)
-card.flavour = '"Weapon of choice for a fit bronze statue"'
-card.type = 'Equipment'
-cards.push card
 
 File.write('card.html', Card.build(cards))
diff --git a/src/attributes.md b/src/attributes.md
index 279dbe4..5d07c49 100644
--- a/src/attributes.md
+++ b/src/attributes.md
@@ -5,6 +5,19 @@ All attributes are grouped up into 4 distinct groups, each group representing on
 ## Innate Stats:
 	stats chosen at the start that dont change
 	For new characters: [4, 3, 3, 2, 2, 1]
+| Score | Cost |
+| -- | -- |
+| 1 | 0 |
+| 2 | 1 |
+| 3 | 3 |
+| 4 | 5 |
+
+<!--
+(5, 5, 3, 0, 0, 0)
+(5, 5, 1, 1, 1, 0)
+(5, 3, 3, 1, 1, 0)
+(3, 3, 3, 3, 1, 0)
+-->
 
 ### Fitness
 
@@ -16,7 +29,7 @@ All attributes are grouped up into 4 distinct groups, each group representing on
 
 **Resolve**:			Facing fears or great pain(Maintaining a spell cast)
 **Wisdom**:			Applying Knowledge(Casting a large volume of magic quickly)
-**Perception**:	Noticing details or the big picture(Casting at long ranges with great accuracy)
+**Perception**:	Noticing details, the big picture(Casting at long ranges with great accuracy)
 
 ---
 ## Derived Stats
-- 
cgit v1.2.3