cards + other changes

4 files changed, 33 insertions, 44 deletions

diff --git a/src/.obsidian/appearance.json b/src/.obsidian/appearance.json
index 9e26dfe..c8c365d 100644
--- a/src/.obsidian/appearance.json
+++ b/src/.obsidian/appearance.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "accentColor": ""
+}
\ No newline at end of file
diff --git a/src/SUMMARY.md b/src/SUMMARY.md
index d3a5c6f..8be9d04 100644
--- a/src/SUMMARY.md
+++ b/src/SUMMARY.md
@@ -17,10 +17,10 @@
 - [Spellcasting](Spellcasting.md)
 
 - [Running The Game]()
-	- [Fate Deck](fate-deck.md)
-	- [Checks](checks.md)
 	- [Combat](./combat.md)
 	- [Social](social.md)
+	- [Checks](checks.md)
+	- [Fate Deck](fate-deck.md)
 	- [Travel](travel.md)
 
 - [Indices]()
diff --git a/src/attributes.md b/src/attributes.md
index 372a7e0..fd2de25 100644
--- a/src/attributes.md
+++ b/src/attributes.md
@@ -2,38 +2,40 @@
 
 All attributes are grouped up into 4 distinct groups, each group representing one of the four suits in a tarot deck. Each group contains 3 primary stats, and 1 derivative stat that is calculated based on other factors.
 
-## Stats:
-For new characters: assign 4,3,3,2,2,2,1,1,1
+## Innate Stats:
+	stats chosen at the start that dont change
+	For new characters: 16 stat points. max 5 min 1
 
 ### Fitness
 
-	Endurance:	Running a marathon, holding your breath
-	Strength:	Pushing a rock, overpowering an opponent
-	Precision:	Walking a tightrope, picking a lock
+**Endurance**:	Running a marathon, holding your breath
+**Strength**: 	Pushing a rock, overpowering an opponent
+**Precision**:	Walking a tightrope, picking a lock
 
----
 ### Mental
 
-	Resolve:	Facing fears or great pain(Maintaining a spell cast)
-	Wisdom:		Applying Knowledge(Casting a lot of magic quickly)
-	Perception:	Noticing details or the big picture(Casting at long ranges with great accuracy)
+**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)
 
 ---
-### Social
+## Derived Stats
+	stats derived from the innate stats 
+**Health**(End+Res): 		How much damage one can take before being downed.
+**Blood**(Str+Wis):			Consumed some spells, some attacks, and when one is downed. You die when it reaches 0.
+**Memory**(Pre+Per):		How much powerful knowledge you can keep.
 
-	Stoical:	Enduring without showing feeling or complaint
-	Cordiality:	Friendliness and Socialness
-	Eloquence:	Using language with fluency and aptness
+---
+## Skilled Stats
+	stats that can be "leveled"
 
 ---
-### Ideas and Stuff
+<!--
+## Obtained Stats
+	stats dependant 
+**Appearance**:	Is dependant on your character race and outfit. Can augment your communication skills.
+-->
 
-	Health: 	How much damage one can take before being downed
-	Blood:		Consumed some spells, some attacks, and when one is downed. You die when it reaches 0
-	Memory:		How much powerful knowledge you can keep
-	Appearance:	Is dependant on your character race and dressing. Can augment you communication skills
 
----
-	
 
 
diff --git a/src/combat.md b/src/combat.md
index 15d7f08..99abffb 100644
--- a/src/combat.md
+++ b/src/combat.md
@@ -1,34 +1,19 @@
 # Combat
-
-## Bargain
-
-At any point during combat the players and the enemies can bargain with eachother to cease fighting.
  
 ## Start of Combat
 
-GM places enemies on board, draws from environment deck and places them in play as well. GM Rolls to determine which player goes first.
-
-## A Round
-A single round starts from the first player's turn and goes clockwise until all players have gone once. Then the enemy's actions are resolved. Once they are resolved a new round can begin.
-
-## A Player Turn
-
-Regain all energy and draw a card from the player deck. During their turn players can spend their energy however they would like. Once they end their turn the player must discard down to their max hand size(default 3)
-
-## Enemy Turn
+GM places enemies on board, draws from environment deck and places them in play as well. 
 
-The GM resolved the enemy effects in any order they wish. Any enemy that was not targeted this round by a player attack deals damage to a player of the GMs choice equal to the enemy's attack stat. Once all of these are resolve then the enemy turn ends.
+Turn order will be determined by some way in the future(not yet sure)
 
---- 
+All enemy turns are interlaced between player turns
 
-Each round will consist of the following flow:
+All abilities are tapped or "deactivated"
 
-Melee -> Ranged -> Magic
+## Player Turn
 
-At any point before or after an action a character could move(might not have movement?)
-Within each of those phases the order goes like this:
+At the start of the player turn abilities that are applicable are refreshed. Now the player can use their abilities or tap 
 
-Enemy intention -> Player actions(any order) -> enemy actions
 
 ---