Merge branch 'master' of /home/wiki/thymewiki/ThymeWiki

diff --git a/index.mdwn b/index.mdwn
index f9796eac46d3adf8cd9ad7e61cb76d20462b3d21..9efb38b23c0c440218216d234f83ac200130f142 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,9 +1,9 @@
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ----
-* [[Storage]]
 * [[Recipes]]
 * [[Shopping]]
+* [[Storage]]
 
 ----
 

diff --git a/sandbox/Test_Test_One.mdwn b/sandbox/Test_Test_One.mdwn
index d50fb50dea77e2f63d50808a151acdb82ee85ab9..936c9dd1f1bf2c502e1346d1af3e2d5ff51b40e2 100644 (file)
--- a/sandbox/Test_Test_One.mdwn
+++ b/sandbox/Test_Test_One.mdwn
@@ -1 +1,62 @@
-tes yest yes
+*Back to [[Systems]] / WhiteWolf / WhiteWolf/Worlds / MagickalEarth*
+
+----
+
+**High Wizard Sarah Amery**
+
+----
+
+[http://www.ysolde.ucam.org/wiki/shadow?MagickalEarthHighWizardSarah Main] / [http://www.ysolde.ucam.org/wiki/shadow?MagickalEarthHighWizardSarah/Wizardry Wizardry] / [http://www.ysolde.ucam.org/wiki/shadow?MagickalEarthHighWizardSarah/BodyMorph Elemental Form] / [http://www.ysolde.ucam.org/wiki/shadow?MagickalEarthHighWizardSarah/Notes Notes] / [http://www.ysolde.ucam.org/wiki/shadow?MagickalEarthHighWizardSarah/Story Story]
+
+----
+
+| | | | | | | | | | | | | |
+|-|-|-|-|-|-|-|-|-|-|-|-|-|
+|**Spirtual Attributes** |
+|*Willpower* | ●●●●● ●●|(7)|  | |*Magick*|●●●●|(4)|  | |*Resonance*|●|(1)|  |
+| |
+|***Attributes***|
+|**Physical**|  | |  | |**Social**|  | |  | |**Mental**|  |
+|*Strength*|●●|(2)|  | |*Charisma*|●●|(2)|  | |*Intelligence*|●●●●|(4)| Patterns |
+|*Dexterity*|●●|(2)|  | |*Manipulation*|●●●●|(4)| Soothing|  |*Wits*|●●●|(3)|  |
+|*Stamina*|●●|(2)|  | |*Appearance*|●●|(2)|  |  |*Perception*|●●●|(3)|  |
+|  |
+|  |
+|***Abilities***| 
+|  |
+|**Strength**|  | |  | |**Dexterity**|  | |  | |**Stamina**|  |
+|*Brawl*|●|(1)|  | |*Athletics*|  |(0)|  | |*Endurance*|  |(0)|  |
+|*Might*|  |(0)|  | |*Drive*|  |(0)|  | |*Resistance*|●● |(2)|  |
+|  | |  | |  |*Firearms*|●●|(2)|  | |  | |  | |
+|  | |  | |  |*Legerdemain*|  |(0)|  | |  | |  | |
+|  | |  | |  |*Martial Arts*|  |(0)|  | |  | |  | |
+|  | |  | |  |*Melee*|  |(0)|  | |  | |  | |
+|  | |  | |  |*Pilot*|  |(0)|  | |  | |  | |
+|  | |  | |  |*Stealth*|  |(0)|  | |  | |  | |
+|  |
+|**Perception**|  | |  | |**Intelligence**|  | |  | |**Wits**|  |
+|*Awareness*|●●|(2)|  | |*Academics*|●●|(2)|  | |*Arts*|● |(1)|  |
+|*Investigation*|●●●|(3)|  | |*Bureaucracy*|●|(1)|  | |*Biz*|● |(1)|  |
+|  | |  | |  |*Computer*|●|(1)|  | |*Rapport*|●●● |(3)|  |
+|  | |  | |  |*Engineering*|●|(1)|  | |  | |  | |
+|  | |  | |  |*Intrusion*|●|(1)|  | |  | |  | |
+|  | |  | |  |*Linguistics*|●|(1)|  | |  | |  | |
+|  | |  | |  |*Medicine*|●|(1)|  | |  | |  | |
+|  | |  | |  |*Science*|●|(1)|  | |  | |  | |
+|  | |  | |  |*Survival*|●|(1)|  | |  | |  | |
+|  |
+|**Appearance**|  | |  | |**Manipulation**|  | |  | |**Charisma**|  |
+|*Intimidation*|  |(0)|  | |*Interrogation*|  |(0)|  | |*Command*|  |(0)|  |
+|*Style*|  |(0)|  | |*Streetwise*|  |(0)|  | |*Etiquette*|●● |(2)|  |
+|  | |  | |  |*Subterfuge*|  |(0)|  | |*Perform*|● |(1)|  |
+|  |
+|  |
+|***Backgrounds***| 
+|Allies|  |(0)|  | |Contacts|●●|(2)|The two wizards|  |Mentor|●●|(2)|*Girion*|
+|Attunement|●●●|(3)|  | |Followers|  |(0)|  | |Resources|●● |(2)|
+|Backing|●● |(2)|Interpol M |  |Influence|  |(0)|  | |Talent|●●●  |(3)|
+|Cipher|●|(1)|  | |Magickal Material|  |(0)|  | |  | |  |
+
+
+
+