(no commit message)

diff --git a/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn b/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn
index f3ee71f7d106720c0ea1d5ca58e51b8676b05656..105ee498ee1746553cb058a8beda8401b46bc6db 100644 (file)
--- a/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn
+++ b/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn
@@ -1,4 +1,4 @@
-[[!template id=character name="Angelo ex Mercere" house="Mercere" job="Magus" rank="Junior Magus" appage=36 born=1190/08/30 updated=1226/09/08 covenant="Schola Pythagoranis" parens="Pietro ex Mercere" origin="Harco, Piedmont" ethnicity="Italian" religion="Catholic, mostly" age=36 ]]
+[[!template id=character name="Angelo ex Mercere" house="Mercere" job="Magus" rank="Junior Magus" appage=35 born=1190/08/30 updated=1233/06/21 covenant="Schola Pythagoranis" parens="Pietro ex Mercere" origin="Harco, Piedmont" ethnicity="Italian" religion="Catholic, mostly" age=42 ]]
 ## Angelo ex Mercere
 
 ----
@@ -13,64 +13,64 @@
 ### Casting Table
 Technique|Form|T+F|CS|LT|FC|SC|SS|C(NS)|C(S)|R|P|MR
 :--|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:
-Creo|Animal|24|25|36|25+die|5|12.5+(dStress/2)|6|15+(dStress/2)|30+dStress|10|12
- |Aquam|17|18|29|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|11
- |Auram|17|18|29|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|11
- |Corpus|30|31|42|31+die|6|15.5+(dStress/2)|7|18+(dStress/2)|36+dStress|10|13
- |Herbam|16|17|28|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|10
- |Ignem|23|24|35|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
- |Imaginem|22|23|34|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|12
- |Mentem|16|17|28|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|10
- |Terram|22|23|34|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|12
- |Vim|22|23|34|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|12
+Creo|Animal|25|26|39|26+die|5|13+(dStress/2)|6|15.5+(dStress/2)|31+dStress|10|12
+ |Aquam|22|23|36|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|11
+ |Auram|23|24|37|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
+ |Corpus|32|33|46|33+die|7|16.5+(dStress/2)|8|19+(dStress/2)|38+dStress|10|13
+ |Herbam|22|23|36|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|11
+ |Ignem|24|25|38|25+die|5|12.5+(dStress/2)|6|15+(dStress/2)|30+dStress|10|12
+ |Imaginem|23|24|37|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
+ |Mentem|22|23|36|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|11
+ |Terram|23|24|37|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
+ |Vim|23|24|37|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
  ||||||||||||
 
-Intellego|Animal|14|15|26|15+die|3|7.5+(dStress/2)|4|10+(dStress/2)|20+dStress|10|12
- |Aquam|7|8|19|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|11
- |Auram|7|8|19|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|11
- |Corpus|20|21|32|21+die|4|10.5+(dStress/2)|5|13+(dStress/2)|26+dStress|10|13
- |Herbam|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
- |Ignem|13|14|25|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
- |Imaginem|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
- |Mentem|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
- |Terram|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
- |Vim|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+Intellego|Animal|14|15|28|15+die|3|7.5+(dStress/2)|4|10+(dStress/2)|20+dStress|10|12
+ |Aquam|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Auram|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Corpus|21|22|35|22+die|4|11+(dStress/2)|5|13.5+(dStress/2)|27+dStress|10|13
+ |Herbam|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Ignem|13|14|27|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
+ |Imaginem|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Mentem|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Terram|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Vim|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
  ||||||||||||
 
-Muto|Animal|19|20|31|20+die|4|10+(dStress/2)|5|12.5+(dStress/2)|25+dStress|10|12
- |Aquam|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|11
- |Auram|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|11
- |Corpus|25|26|37|26+die|5|13+(dStress/2)|6|15.5+(dStress/2)|31+dStress|10|13
- |Herbam|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
- |Ignem|18|19|30|19+die|4|9.5+(dStress/2)|5|12+(dStress/2)|24+dStress|10|12
- |Imaginem|17|18|29|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
- |Mentem|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
- |Terram|17|18|29|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
- |Vim|17|18|29|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
+Muto|Animal|19|20|33|20+die|4|10+(dStress/2)|5|12.5+(dStress/2)|25+dStress|10|12
+ |Aquam|16|17|30|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|11
+ |Auram|17|18|31|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
+ |Corpus|26|27|40|27+die|5|13.5+(dStress/2)|6|16+(dStress/2)|32+dStress|10|13
+ |Herbam|16|17|30|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|11
+ |Ignem|18|19|32|19+die|4|9.5+(dStress/2)|5|12+(dStress/2)|24+dStress|10|12
+ |Imaginem|17|18|31|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
+ |Mentem|16|17|30|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|11
+ |Terram|17|18|31|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
+ |Vim|17|18|31|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
  ||||||||||||
 
-Perdo|Animal|13|14|25|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
- |Aquam|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|11
- |Auram|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|11
- |Corpus|19|20|31|20+die|4|10+(dStress/2)|5|12.5+(dStress/2)|25+dStress|10|13
- |Herbam|5|6|17|6+die|1|3+(dStress/2)|2|5.5+(dStress/2)|11+dStress|10|10
- |Ignem|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
- |Imaginem|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
- |Mentem|5|6|17|6+die|1|3+(dStress/2)|2|5.5+(dStress/2)|11+dStress|10|10
- |Terram|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
- |Vim|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
+Perdo|Animal|13|14|27|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
+ |Aquam|10|11|24|11+die|2|5.5+(dStress/2)|3|8+(dStress/2)|16+dStress|10|11
+ |Auram|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
+ |Corpus|20|21|34|21+die|4|10.5+(dStress/2)|5|13+(dStress/2)|26+dStress|10|13
+ |Herbam|10|11|24|11+die|2|5.5+(dStress/2)|3|8+(dStress/2)|16+dStress|10|11
+ |Ignem|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Imaginem|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
+ |Mentem|10|11|24|11+die|2|5.5+(dStress/2)|3|8+(dStress/2)|16+dStress|10|11
+ |Terram|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
+ |Vim|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|12
  ||||||||||||
 
-Rego|Animal|14|15|26|15+die|3|7.5+(dStress/2)|4|10+(dStress/2)|20+dStress|10|12
- |Aquam|7|8|19|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|11
- |Auram|7|8|19|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|11
- |Corpus|20|21|32|21+die|4|10.5+(dStress/2)|5|13+(dStress/2)|26+dStress|10|13
- |Herbam|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
- |Ignem|13|14|25|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
- |Imaginem|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
- |Mentem|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
- |Terram|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
- |Vim|12|13|24|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+Rego|Animal|14|15|28|15+die|3|7.5+(dStress/2)|4|10+(dStress/2)|20+dStress|10|12
+ |Aquam|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Auram|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Corpus|21|22|35|22+die|4|11+(dStress/2)|5|13.5+(dStress/2)|27+dStress|10|13
+ |Herbam|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Ignem|13|14|27|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|12
+ |Imaginem|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Mentem|11|12|25|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|11
+ |Terram|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
+ |Vim|12|13|26|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|12
 """]]
 [[!template id=divbox content="""
 <a id="CTNotes" />
@@ -103,7 +103,7 @@ MR | Magic Resistance |
 <a id="Techniques" />
 ### Techniques
 :--|:--
-Creo|13
+Creo|14
 Intellego|6
 Muto|11
 Perdo|5
@@ -115,10 +115,10 @@ Rego|6
 ### Forms
 :--|:--
 Animal|8
-Aquam|1
-Auram|1
-Corpus|14
-Herbam|0
+Aquam|5
+Auram|6
+Corpus|15
+Herbam|5
 &nbsp;|
 """]]
 [[!template id=divbox content="""
@@ -126,7 +126,7 @@ Herbam|0
 :--|:--
 Ignem|7
 Imaginem|6
-Mentem|0
+Mentem|5
 Terram|6
 Vim|6
 &nbsp;|