(no commit message)

diff --git a/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn b/Characters/Schola/Magi/AngeloExMercere/Magic.mdwn
index b2986266f7fe9e2597158d2e18f3afb666d3653d..85c997f15d30f1682d12b026a0f9cddb52de91c8 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=33 born=1190/08/30 updated=1224/04/13 covenant="Schola Pythagoranis" parens="Pietro ex Mercere" origin="Harco, Piedmont" ethnicity="Italian" religion="Catholic, mostly" age=33 ]]
+[[!template id=character name="Angelo ex Mercere" house="Mercere" job="Magus" rank="Junior Magus" appage=35 born=1190/08/30 updated=1226/03/26 covenant="Schola Pythagoranis" parens="Pietro ex Mercere" origin="Harco, Piedmont" ethnicity="Italian" religion="Catholic, mostly" age=35 ]]
 ## 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|23|24|35|24+die|5|12+(dStress/2)|6|14.5+(dStress/2)|29+dStress|10|12
- |Aquam|16|17|28|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|11
- |Auram|16|17|28|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|11
- |Corpus|28|29|40|29+die|6|14.5+(dStress/2)|7|17+(dStress/2)|34+dStress|10|13
- |Herbam|15|16|27|16+die|3|8+(dStress/2)|4|10.5+(dStress/2)|21+dStress|10|10
- |Ignem|22|23|34|23+die|5|11.5+(dStress/2)|6|14+(dStress/2)|28+dStress|10|12
- |Imaginem|15|16|27|16+die|3|8+(dStress/2)|4|10.5+(dStress/2)|21+dStress|10|10
- |Mentem|15|16|24|16+die|3|8+(dStress/2)|4|10.5+(dStress/2)|21+dStress|10|10
- |Terram|21|22|30|22+die|4|11+(dStress/2)|5|13.5+(dStress/2)|27+dStress|10|12
- |Vim|21|22|30|22+die|4|11+(dStress/2)|5|13.5+(dStress/2)|27+dStress|10|12
+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|16|17|28|17+die|3|8.5+(dStress/2)|4|11+(dStress/2)|22+dStress|10|10
+ |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
  ||||||||||||
 
-Intellego|Animal|10|11|19|11+die|2|5.5+(dStress/2)|3|8+(dStress/2)|16+dStress|10|12
- |Aquam|3|4|12|4+die|1|2+(dStress/2)|2|4.5+(dStress/2)|9+dStress|10|11
- |Auram|3|4|12|4+die|1|2+(dStress/2)|2|4.5+(dStress/2)|9+dStress|10|11
- |Corpus|15|16|24|16+die|3|8+(dStress/2)|4|10.5+(dStress/2)|21+dStress|10|13
- |Herbam|2|3|11|3+die|1|1.5+(dStress/2)|2|4+(dStress/2)|8+dStress|10|10
- |Ignem|9|10|18|10+die|2|5+(dStress/2)|3|7.5+(dStress/2)|15+dStress|10|12
- |Imaginem|2|3|11|3+die|1|1.5+(dStress/2)|2|4+(dStress/2)|8+dStress|10|10
- |Mentem|2|3|11|3+die|1|1.5+(dStress/2)|2|4+(dStress/2)|8+dStress|10|10
- |Terram|8|9|17|9+die|2|4.5+(dStress/2)|3|7+(dStress/2)|14+dStress|10|12
- |Vim|8|9|17|9+die|2|4.5+(dStress/2)|3|7+(dStress/2)|14+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|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
+ |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
  ||||||||||||
 
-Muto|Animal|19|20|28|20+die|4|10+(dStress/2)|5|12.5+(dStress/2)|25+dStress|10|12
- |Aquam|12|13|21|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|11
- |Auram|12|13|21|13+die|3|6.5+(dStress/2)|4|9+(dStress/2)|18+dStress|10|11
- |Corpus|24|25|33|25+die|5|12.5+(dStress/2)|6|15+(dStress/2)|30+dStress|10|13
- |Herbam|11|12|20|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
- |Ignem|18|19|27|19+die|4|9.5+(dStress/2)|5|12+(dStress/2)|24+dStress|10|12
- |Imaginem|11|12|20|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
- |Mentem|11|12|20|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
- |Terram|17|18|26|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+dStress|10|12
- |Vim|17|18|26|18+die|4|9+(dStress/2)|5|11.5+(dStress/2)|23+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|11|12|23|12+die|2|6+(dStress/2)|3|8.5+(dStress/2)|17+dStress|10|10
+ |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
  ||||||||||||
 
-Perdo|Animal|8|9|17|9+die|2|4.5+(dStress/2)|3|7+(dStress/2)|14+dStress|10|12
- |Aquam|1|2|10|2+die|0|1+(dStress/2)|1|3.5+(dStress/2)|7+dStress|10|11
- |Auram|1|2|10|2+die|0|1+(dStress/2)|1|3.5+(dStress/2)|7+dStress|10|11
- |Corpus|13|14|22|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|13
- |Herbam|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Ignem|7|8|16|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|12
- |Imaginem|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Mentem|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Terram|6|7|15|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|12
- |Vim|6|7|15|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+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|5|6|17|6+die|1|3+(dStress/2)|2|5.5+(dStress/2)|11+dStress|10|10
+ |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
  ||||||||||||
 
-Rego|Animal|8|9|17|9+die|2|4.5+(dStress/2)|3|7+(dStress/2)|14+dStress|10|12
- |Aquam|1|2|10|2+die|0|1+(dStress/2)|1|3.5+(dStress/2)|7+dStress|10|11
- |Auram|1|2|10|2+die|0|1+(dStress/2)|1|3.5+(dStress/2)|7+dStress|10|11
- |Corpus|13|14|22|14+die|3|7+(dStress/2)|4|9.5+(dStress/2)|19+dStress|10|13
- |Herbam|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Ignem|7|8|16|8+die|2|4+(dStress/2)|3|6.5+(dStress/2)|13+dStress|10|12
- |Imaginem|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Mentem|0|1|9|1+die|0|0.5+(dStress/2)|1|3+(dStress/2)|6+dStress|10|10
- |Terram|6|7|15|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|12
- |Vim|6|7|15|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+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|6|7|18|7+die|1|3.5+(dStress/2)|2|6+(dStress/2)|12+dStress|10|10
+ |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
 """]]
 [[!template id=divbox content="""
 <a id="CTNotes" />
@@ -103,11 +103,11 @@ MR | Magic Resistance |
 <a id="Techniques" />
 ### Techniques
 :--|:--
-Creo|12
-Intellego|2
+Creo|13
+Intellego|6
 Muto|11
-Perdo|0
-Rego|0
+Perdo|5
+Rego|6
 &nbsp;|
 """]]
 [[!template id=divbox content="""
@@ -117,7 +117,7 @@ Rego|0
 Animal|8
 Aquam|1
 Auram|1
-Corpus|13
+Corpus|14
 Herbam|0
 &nbsp;|
 """]]