SoF - various clean-ups (#5397)

* SoF - more description for caravan whip

* terrain graphics - touched some terrain rules for Ias, to allow SoF custom graphics

* SoF terrain - some new graphics for the volcano finale

* SoF S9 - revise map and scenario slightly

data/campaigns/Sceptre_of_Fire/_main.cfg

@@ -124,4 +124,18 @@ Their tale I now relate...</i>
 {campaigns/Sceptre_of_Fire/scenarios}
 #endif
 
+#ifdef EDITOR
+[binary_path]
+    path=data/campaigns/Sceptre_of_Fire/
+[/binary_path]
+
+[editor_group]
+    id=sof
+    name= _ "Sceptre of Fire"
+    icon="group_mainline"
+[/editor_group]
+
+{campaigns/Sceptre_of_Fire/utils/terrain.cfg}
+#endif
+
 # wmllint: directory spellings sceptre Rugnur Alanin Durstorn Thursagan Krawg

data/campaigns/Sceptre_of_Fire/maps/9_Caverns_of_Flame.map

@@ -1,7 +1,7 @@
 Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Ur, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Ur, Ur, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Uu, Uu, Ur, Ur, Uu, Uu, Xu, Xu, Xu, Uu^Vo, Xu, Ur, Xu, Tb^Tf, Xu, Xu, Xu, Uu^Vo, Uu, Uu^Vo, Uu, Xu, Xu
-Xu, Xu, Xu, Xu, Uu, Uh, Uh, Uh, Ql, Ql, Ql, Uu, Uu, Uu, Xu, Uu, Uu, Uh, Uh, Uu^Tf, Uh, Uh, Ur, Uu, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Uu, Uu, Ur, Uu, Ur, Tb^Tf, Tb^Tf, Xu, Qxu, Uu, Uu, Uu, Uu, Uu, Xu
-Xu, Xu, Xu, Xu, Ql, Ql, Ql, Uu, Ql, Ql, Ql, Ql, Uu, Ur, Ur, Uu, Ur^Esd, Uh, Uu, Uu, Uu, Re, Uu^Tf, Uu, Ur, Uu, 1 Ur, Ur, Tb^Tf, Xu, Uh, Xu, Xu, Xu, Uh, Ur, Ur, Uu, Qxu, Qxu, Co, Uu, Re, Re, Re, Uu
+Xu, Xu, Xu, Xu, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xoa, Xu, Uu, Uu, Ur, Ur, Uu, Uu, Xu, Xu, Xu, Uu^Vo, Xu, Ur, Xu, Tb^Tf, Xu, Xu, Xu, Uu^Vo, Uu, Uu^Vo, Uu, Xu, Xu
+Xu, Xu, Xu, Xu, Uu, Uh, Uh, Uh, Ql, Ql, Ql, Uu, Uu, Uu, Xu, Uu, Uu, Uh, Uh, Uu^Tf, Uu, Ias, Ur, Uu, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Uu, Uu, Ur, Uu, Ur, Tb^Tf, Tb^Tf, Xu, Qxu, Uu, Uu, Uu, Uu, Uu, Xu
+Xu, Xu, Xu, Xu, Ql, Ql, Ql, Uu, Ql, Ql, Ql, Ql, Uu, Ur, Ur, Uu, Ur^Esd, Uh, Uu, Uu, Uu, Ur, Uu^Tf, Uu, Ur, Uu, 1 Ur, Ur, Tb^Tf, Xu, Uh, Xu, Xu, Xu, Uh, Ur, Ur, Uu, Qxu, Qxu, Co, Uu, Re, Re, Re, Uu
 Xu, Xu, Xu, Xu, Ql, Ql, Ql, Uu, Ql, Uu, Ql, Ql, Uu, Uu, Ur^Edb, Ur, Ur, Ur, Ur^Es, Ur, Uu, Uu^Tf, Tb^Tf, Uu, Ur, Ur, Uu^Tf, Tb^Tf, Tb^Tf, Uh, Uh, Uh, Uu^Vu, Xu, Qxu, Uu, Re, Qxu, Co, Co, Co, 4 Ko, Uu, Re^Es, Uu^Ecf, Re
 Xu, Xu, Xu, Xu, Xu, Ql, Ql, Ql, Ql, Ql, Xu, Xu, Uh, Uu^Edb, Uu^Edb, Uu^Edb, Uu, Ur^Es, Ur^Es, Uu, Uu, Ur, Ur, Ur, Uu, Uu, Ur^Es, Uu, Uu, Uu, Ur, Uu, Uu, Uu, Qxu, Qxu^Bp/, Qxu^Bp/, Re, Qxu, Co, Xu, Co, Xu, Uu, Uu, Uu
 Xu, Xu, Xu, Xu, Xu, Ql, Xu, Ql, Xu, Xu, Xu, Xu, Xu, Uu^Edb, Uu^Edb, Uu^Edb, Xu, Uu^Tf, Ur, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Ur, Cte, Ur, Cte, Ur, Uu^Es, Ur, Qxu^Bp/, Qxu, Qxu, Uu, Uu, Uu, Uh, Xu, Xu, Uu, Tb^Tf, Uu
@@ -10,23 +10,23 @@ Uu, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Uu^Em, Uu^Em, Uh, Uh, Uh, Ur^Edb, Uu^Edb, Uu
 Uh, Uh, Uu, Uu, Uh, Uh, Ql, Ql, Ql, Uu, Uu, Uu, Ur, Ur, Uu, Uu^Edb, Uu^Tf, Uu, Ur, Uu, Uu, Uu, Ql, Uu, Xu, Xu, Cte, Kte, Uu, Ql, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Ql, Ql, Xu, Xu, Xu, Xu, Xu
 Uh, Uu, Xu, Uu, Uu, Uh, Uh, Ql, Ql, Uu, Uu, Uu^Vu, Uu, Uu^Esd, Uu, Xu, Xu, Uu, Ur, Ur, Uu, Uu, Xu, Uu, Xu, Ur, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Ql, Ql, Ql, Ql, Uh, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Ql, Xu, Ql, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Uu, Uu, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu^Vu, Uu, Ur, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Ql, Ql, Uh, Xu, Uu, Uu, Uu^Vu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Ql, Uh, Xu, Xu, Xu, Xu, Xu, Kte, Cte, Uu, Ur, Ur, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Re, Ur, Uu, Uu, Uu, Uu^Vu, Xu, Xu, Uh, Ql, Ql, Ql, Uh, Ur, Ur, Uu, Xu
-Xu, Xu, Xu, Xu, Uu, Uu^Vu, Uu, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Cte, Cte, Ur, Ur, Xu, Xu, Xu, Uu, Uh, Uu, Uh, Ur, Ur, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Uu, Ql, Uu, Uu^Esd, Uu, Ur, Xu, Xu
-Xu, Xu, Uh, Uh, Uh, Uu, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ur, Uu, Uu, Uu, Ur, Uu, Uu, Uu, Ur, Uu, Uu^Esd, Uh, Uu, Uu, Uu, Xu, Uh, Uu, Re, Uu, Ur, Ur, Uu, Uu, Xu, Xu
-Xu, Xu, Xu, Uh, Tb^Tf, Uu^Em, Re^Em, Re, Ur, Uh, Uu, Tb^Tf, Uu, Uu, Uu, Xu, Xu, Xu, Uh, Ur, Ur^Es, Uu^Es, Re, Ur, Uu, Uu, Uu, Ur, Ur^Es, Uu, Uu, Uu, Uh, Uu^Esd, Uu, Uu, Uu, Uu, Re, Re, Uu, Uu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Ur, Uu, Ur, Uu, Re, Re, Uu, Ur, Ur, Uh, Uh, Uu, Ur, Uu, Re^Es, Uu, Uu, Uu, Ql, Ql^Bs|, Ql, Uu, Uu, Uu^Es, Uh, Uh, Uu, Ur, Ur, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Uh, Uu^Em, Ur^Em, Ur, Uu, Ur, Uu, Uu, Uu, Uu, Uu, Ur, Uu, Uu, Uu, Uu^Esd, Ur, Re^Es, Rd^Es, Uu, Ql, Ql, Ql, Ur, Ql, Ql, Ql, Uu, Uu, Uh, Uu, Ur^Esd, Re, Re^Es, Rd^Es, Uu, Ql, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu^Vu, Uu, Uu, Ur^Em, Ur, Uu, Xu, Uu, Xu, Uu, Xu, Ql, Xu, Uu, Xu, Uu, Uu, Ur, Ur, Ur^Es, Ql, Ql^Bs\, Urb, Ql, Ql, Ql^Bs|, Ql, Ql, Urb, Ql^Bs/, Ql, Uu, Uh, Ur, Ur, Uu^Es, Uu, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uh, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ur, Ur, Uu, Ql, Ql, Ql, Ql^Bs\, Urb^Ii, Urb^Ii, Urb^Ii, Ql^Bs/, Ql, Ql, Ql, Uu, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Cte, Uu, Rd, Rd, Ql, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Kte, Cte, Uu^Es, Uu, Ur, Uh, Ql, Ql, Ql, Ql, Urb^Ii, Urb^Ii, Urb^Ii, Ql, Ql, Ql, Ql, Uu, Uu^Esd, Ur^Es, Ur, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Cte, Ur, Uu, Ql, Ql, Xu, Xu, Xu, Tb^Tf, Tb^Tf, Uh^Em, Uh^Em, Xu, Xu, Xu, Cte, Uu^Es, Ur, Uu, Uu, Ql, Ql, Ur, Ql^Bs/, Ql, Urb^Ii, Ql, Ql^Bs\, Ur, Ql, Ql, Uu, Uu, Ur, Ur^Es, Ur, Cte, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, 5 Kte, Cte, Uu, Xu, Ql, Xu, Xu, Xu, Xu, Uh^Em, Uu^Tf, Uu, Uu^Em, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Ql^Bs/, Ql, Ql, Ql, Ql^Bs|, Ql, Ql, Ql, Ql^Bs\, Ur, Uu, Uu, Ur, Uu, Uu, Cte, Kte, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Cte, Uu, Re, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu^Vu, Ur, Uu, Xu, Xu, Xu, Xu, Uu, Ur, Ur^Esd, Uu, Uu, Uu, Ql, Ql, Urb, Ql, Ql, Uu, Uu, Uu, Ur^Es, Uu^Es, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Ur^Em, Re, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Ur, Uu, Uh, Uu, Ql, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Ur, Ql^Bs|, Uu, Uu, Uu, Uu, Ur, Ur, Ur^Es, Uu^Es, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu^Em, Re^Em, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, Ur, Ur, Uu, Uu, Uu, Ur, Ur, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Ur, Uu, Uu^Esd, Uu, Uu, Uu, Ur, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Rb, Xu
-Xu, Xu, Ur, Rb, Uu^Em, Uu, Xu, Xu, Xu, Xu, Uu^Es, Ql, Ql^Bs/, Ur^Es, Uu^Es, Uu, Uu, Uu, Cte, Uu, Xu, Xu, Xu, Uu, Xu, Uu^Esd, Ur, Uu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Ur, Ur, Uu^Em, Xu, Xu, Xu, Xu, Xoa, Rb, Rb, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Ql, Uh, Xu, Xu, Xu, Xu, Xu, Kte, Cte, Uu, Ur, Ur, Xu, Xu, Xu, Xoa, Xu, Xu, Uu, Uu, Re, Ur, Uu, Uu, Uu, Uu^Vu, Xu, Xu, Uh, Ql, Ql, Ql, Uh, Ur, Ur, Uu, Xu
+Xu, Xu, Xu, Xu, Uu, Uu^Vu, Uu, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Cte, Cte, Ur, Ur, Xu, Xu, Xoa, Ias, Uh, Uu, Uh, Ur, Ur, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Uu, Ql, Uu, Uu^Esd, Uu, Ur, Xu, Xu
+Xu, Xu, Uh, Uh, Uh, Uu, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ur, Uu, Uu, Ias, Ias, Uu, Uu, Uu, Ias, Uu, Uu^Esd, Uh, Uu, Uu, Uu, Xu, Uh, Uu, Re, Uu, Ur, Ur, Uu, Uu, Xu, Xu
+Xu, Xu, Xu, Uh, Tb^Tf, Uu^Em, Re^Em, Re, Ur, Uh, Uu, Tb^Tf, Uu, Uu, Uu, Xu, Xu, Xu, Uh, Ur, Ur^Es, Uu^Es, Re, Ias, Uu, Uu, Uu, Ias, Ur^Es, Uu, Uu, Uu, Uh, Uu^Esd, Uu, Uu, Uu, Uu, Re, Re, Uu, Uu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Ur, Uu, Ur, Uu, Re, Re, Uu, Ur, Ur, Uh, Uh, Uu, Ur, Uu, Re^Es, Uu, Iasy, Uu, Ql, Iasy, Ql, Iasy, Uu, Uu^Es, Uh, Uh, Uu, Ur, Ur, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Uh, Uu^Em, Ur^Em, Ur, Uu, Ur, Uu, Uu, Uu, Uu, Uu, Ur, Uu, Uu, Uu, Uu^Esd, Ur, Re^Es, Rd^Es, Uu, Ql, Ql, Ql, Ql^Bs|, Ql, Ql, Ql, Iasy, Ias, Uh, Uu, Ur^Esd, Re, Re^Es, Rd^Es, Uu, Ql, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu^Vu, Uu, Uu, Ur^Em, Ur, Uu, Xu, Uu, Xu, Uu, Xu, Ql, Xu, Uu, Xu, Uu, Uu, Ur, Ur, Ur^Es, Iasy, Iasy, Ql^Bs\, Ql, Iasy^Ii, Iasy^Ii, Iasy^Ii, Ql, Ql^Bs/, Iasy, Uu, Uu, Uh, Ur, Ur, Uu^Es, Uu, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uh, Uu, Uu, Ur, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ur, Ur, Ias, Uu, Ql, Ql, Iasy^Ii, Iasy^Qov, Iasy^Qov, Iasy^Qov, Iasy^Ii, Ql, Ql, Uu, Uu, Ias, Uu, Ur, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Cte, Uu, Rd, Rd, Ql, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Kte, Cte, Uu^Es, Uu, Ur, Uh, Iasy, Ql, Ql, Iasy^Ii, Iasy^Qov, Ias^Qov, Iasy^Qov, Iasy^Ii, Ql, Ql, Iasy, Uu, Uu^Esd, Ur^Es, Ur, Ur, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Cte, Ur, Uu, Ql, Ql, Xu, Xu, Xu, Tb^Tf, Tb^Tf, Uh^Em, Uh^Em, Xu, Xu, Xu, Cte, Uu^Es, Ur, Uu, Uu, Uu, Ql, Ql^Bs/, Iasy^Ii, Iasy^Ii, Iasy^Qov, Iasy^Ii, Iasy^Ii, Ql^Bs\, Ql, Uu, Uu, Uu, Ur, Ur^Es, Ur, Cte, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, 5 Kte, Cte, Uu, Xu, Ql, Xu, Xu, Xu, Xu, Uh^Em, Uu^Tf, Uu, Uu^Em, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Ias, Iasy, Ql, Ql, Ql, Iasy^Ii, Ql, Ql, Ql, Iasy, Ias, Ias, Uu, Ur, Uu, Uu, Cte, Kte, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Cte, Uu, Re, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu^Vu, Ur, Uu, Xu, Xu, Xu, Xu, Uu, Ur, Ur^Esd, Uu, Iasy, Uu, Ql, Ql, Ql^Bs|, Ql, Ql, Uu, Iasy, Uu, Ur^Es, Uu^Es, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Ur^Em, Re, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Ur, Uu, Uh, Uu, Ql, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Iasy, Uu, Iasy, Iasy, Uu, Uu, Uu, Ur, Ur, Ur^Es, Uu^Es, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu^Em, Re^Em, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, Ur, Ur, Uu, Uu, Uu, Ur, Ur, Uu, Xu, Xu, Uu, Uu, Uu, Ias, Ias, Uu, Uu^Esd, Uu, Uu, Uu, Ias, Ias, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Rb, Xu
+Xu, Xu, Ur, Rb, Uu^Em, Uu, Xu, Xu, Xu, Xu, Uu^Es, Ql, Ql^Bs/, Ur^Es, Uu^Es, Uu, Uu, Uu, Cte, Uu, Xu, Xu, Xu, Uu, Xu, Uu^Esd, Ias, Ias, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Ur, Ur, Uu^Em, Xu, Xu, Xu, Xu, Xoa, Rb, Rb, Xu
 Xu, Uu, Uu^Vu, Rb, Uu^Em, Uu^Em, Xu, Xu, Xu, Tb^Tf, Re, Rd^Es, Ql, Ql, Qxu, Uu, Cte, Kte, Cte, Xu, Xu, Xu, Xu, Xu, Uu, Ur, Ur^Es, Ur, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Ur, Ur^Es, Uu^Es, Uu, Xoa, Xoa, Xoa, Ias, Rr, Xoa, Xu
-Xu, Uu, Rb, Ur, Uh, Tb^Tf, Uh, Uu, Uu^Em, Uu, Re, Re^Es, Uu, Qxu, Uu^Em, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Vu, Ur, Uu, Xu, Xu, Xu, Xu, Uu^Em, Xu, Xu, Xu, Uu^Vu, Uu, Ur, Rb, Rb, Uu^Em, Rr, Ias, Ias^Edt, Ias, Ias, Xoc
+Xu, Uu, Rb, Ur, Uh, Tb^Tf, Uh, Uu, Uu^Em, Uu, Re, Re^Es, Uu, Qxu, Uu^Em, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Vu, Ur, Uu, Xu, Xu, Xu, Xu, Uu^Em, Xu, Xu, Xu, Uu^Vu, Uu, Ur, Rb, Rb, Uu^Em, Rr, Ias, Ias^Edt, Ias, Ias, Xoa
 Xu, Uu, Uu^Em, Rb, Rb, Uh, Rb, Rb, Rb, Rb, Uh, Uu^Vu, Uh, Uu^Em, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Uu, Uu^Em, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Xu, Uu, Ur, Uu^Em, Uu, Uu^Em, Rr, Rr, Rr^Edt, Ias^Edt, Ias, Xoa, Xoa
 Xu, Uu^Em, Uu^Em, Rb, Uu, Rb, Uu, Uu, Uu^Tf, Uu^Tf, Uh^Tf, Uh, Uh, Uh, Xu, Xu, Ql, Uu, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu^Em, Qxu, Qxu, Qxu, Uu^Em, Qxu, Xu, Qxu, Uu, Uu^Em, Tb^Tf, Tb^Tf, Uu, Rb, Rr, Uu, Xoa, Xu, Xu
 Xu, Xu, Tb^Tf, Uu^Tf, Uu^Tf, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Ql, Ql, Ql, Ql, Ql, Ql, Xu, Qxu, Xu, Uu, Uu, Uu, Qxu, Qxu, Uu, Qxu, Qxu, Qxu, Qxu, Uu^Em, Xu, Xu, Uu^Em, Cte, Cte, Uu, Rb, Uu^Vu, Xoa, Xu, Xu

data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg

@@ -222,7 +222,7 @@
             id=Toomak
             name= _ "Toomak"
             type=Troll Hero
-            profile=portraits/orcs/grunt-3.png
+            profile=portraits/trolls/troll-hero.png
             ai_special=guardian
             [modifications]
                 [object]
@@ -346,12 +346,12 @@
         [/item]
         # set 1
         [item]
-            x,y=24,18
-            halo=scenery/rune[1,1,1,1,1,1-glow].png:[200*6]
+            x,y=26,19
+            image=scenery/monolith4.png
         [/item]
         [item]
-            x,y=30,21
-            halo=scenery/rune[1,1,1-glow,1,1,1].png:[200*6]
+            x,y=28,20
+            image=scenery/monolith1.png
         [/item]
         [set_variable]
             name=orcs_dead
@@ -437,16 +437,26 @@
                 x,y=27,20
             [/scroll_to]
             [remove_item]
-                x,y=24,18
+                x,y=28,20
             [/remove_item]
             [remove_item]
-                x,y=30,21
+                x,y=26,19
             [/remove_item]
             [terrain]
-                x=23,24,25,29,30,31
-                y=18,18,19,21,21,22
+                x=24,30
+                y=18,21
                 terrain=Ql
             [/terrain]
+            [terrain]
+                x=25,29
+                y=19-20,21-20
+                terrain=Uh
+            [/terrain]
+            [terrain]
+                x=26,28
+                y=19,20
+                terrain=Ias
+            [/terrain]
             [remove_shroud]
                 side=1
                 x,y=21-33,16-24
@@ -456,8 +466,8 @@
             [/redraw]
             [kill]
                 [and]
-                    x=23,24,25,29,30,31
-                    y=18,18,19,21,21,22
+                    x=24,30
+                    y=18,21
                     [not]
                         race=gryphon
                     [/not]
@@ -501,18 +511,22 @@
         [/event]
         # set 2
         [item]
-            x,y=24,21
-            halo=scenery/rune[2,2,2,2,2-glow,2].png:[200*6]
+            x,y=28,19
+            image=scenery/monolith4.png
         [/item]
         [item]
-            x,y=30,18
-            halo=scenery/rune[2,2-glow,2,2,2,2].png:[200*6]
+            x,y=26,20
+            image=scenery/monolith1.png
         [/item]
         [event]
             name=die
             [filter]
                 id=Toomak
             [/filter]
+            [message]
+                speaker=unit
+                message= _ "All these years we stood guard... to protect these tunnels...  and it comes to this..."
+            [/message]
             [message]
                 speaker=narrator
                 message= _ "As the troll collapsed, a stone tile it had been wearing hit the floor and shattered."
@@ -523,16 +537,26 @@
                 x,y=27,20
             [/scroll_to]
             [remove_item]
-                x,y=24,21
+                x,y=26,20
             [/remove_item]
             [remove_item]
-                x,y=30,18
+                x,y=28,19
             [/remove_item]
             [terrain]
-                x=23,24,25,29,30,31
-                y=22,21,21,19,18,18
+                x=24,30
+                y=21,18
                 terrain=Ql
             [/terrain]
+            [terrain]
+                x=25-26,28,29
+                y=21,18,19
+                terrain=Uh
+            [/terrain]
+            [terrain]
+                x=26,28
+                y=20,19
+                terrain=Ias
+            [/terrain]
             [remove_shroud]
                 side=1
                 x,y=21-33,16-24
@@ -542,8 +566,8 @@
             [/redraw]
             [kill]
                 [and]
-                    x=23,24,25,29,30,31
-                    y=22,21,21,19,18,18
+                    x=24,30
+                    y=21,18
                     [not]
                         race=gryphon
                     [/not]
@@ -579,12 +603,12 @@
         # set 3
         # this contains the end-level event
         [item]
-            x,y=27,17
-            halo=scenery/rune[3-glow,3,3,3,3,3].png:[200*6]
+            x,y=27,19
+            image=scenery/monolith1.png
         [/item]
         [item]
-            x,y=27,23
-            halo=scenery/rune[3,3,3,3-glow,3,3].png:[200*6]
+            x,y=27,21
+            image=scenery/monolith4.png
         [/item]
         [item]
             x,y=29,31
@@ -686,23 +710,33 @@
                 x,y=27,20
             [/scroll_to]
             [remove_item]
-                x,y=27,17
+                x,y=27,19
             [/remove_item]
             [remove_item]
-                x,y=27,23
+                x,y=27,21
             [/remove_item]
             [terrain]
                 x=27,27
-                y=16-18,22-24
+                y=17,23
                 terrain=Ql
             [/terrain]
+            [terrain]
+                x=26-27,27,28
+                y=18,22,21
+                terrain=Uh
+            [/terrain]
+            [terrain]
+                x=27,27
+                y=19,21
+                terrain=Ias
+            [/terrain]
             [redraw]
                 side=1
             [/redraw]
             [kill]
                 [and]
                     x=27,27
-                    y=16-18,22-24
+                    y=17,23
                     [not]
                         race=gryphon
                     [/not]
@@ -884,6 +918,20 @@
             x,y=42,30
             image=items/book1.png
         [/item]
+        [event]
+            name=moveto
+            [filter]
+                side=1
+                race=dwarf
+                [filter_location]
+                    terrain=Ias*
+                [/filter_location]
+            [/filter]
+            [message]
+                speaker=unit
+                message= _ "Ah!  We aren't wandering the bowels o' the earth, this is crafted stone!  It's very old though..."
+            [/message]
+        [/event]
         [event]
             name=moveto
             [filter]
@@ -1118,6 +1166,38 @@
         [/message]
     [/event]
 
+    [event]
+        name=moveto
+        [filter]
+            side=1
+            race=dwarf
+            x=22-31
+            y=17-23
+        [/filter]
+        [message]
+            speaker=unit
+            message= _ "This must be the center of the volcano! It's plugged up with this enchanted courtyard?"
+        [/message]
+        [message]
+            speaker=Thursagan
+            message= _ "Aye, it is, we need to break the enchantment somehow."
+        [/message]
+    [/event]
+
+    [event]
+        name=moveto
+        [filter]
+            side=1
+            race=dwarf
+            x=24,24,27,27,30,30
+            y=18,21,17,23,18,21
+        [/filter]
+        [message]
+            speaker=unit
+            message= _ "It's very hot here, above the lava.  This bridge also seems rather delicate, I'd better not loiter here."
+        [/message]
+    [/event]
+
     #when the elves lose troops, the orcs gain them
     [event]
         name=die

data/campaigns/Sceptre_of_Fire/units/Caravan.cfg

@@ -15,6 +15,9 @@
     cost=20
     usage=null
     description= _ "Caravans are used to carry gold or supplies long distances. Because of the immense weight of the cargo this caravan carries, it is not nimble, but the driver can still try to drive off attackers with his whip."
+    [special_note]
+        note=_"The length of this unit’s improvised weapon allows it to strike first in defensive melee, but it cannot use it to attack."
+    [/special_note]
     {DEFENSE_ANIM "units/dwarves/caravan.png" "units/dwarves/caravan.png" {SOUND_LIST:HORSE_HIT} }
     die_sound={SOUND_LIST:HORSE_HIT}
     [attack]
@@ -26,7 +29,11 @@
         damage=8
         number=2
         [specials]
-            {WEAPON_SPECIAL_FIRSTSTRIKE}
+            [firststrike]
+                id=deterrentstrike
+                name= _ "deterrent strike"
+                description= _ "This unit always strikes first with this attack if they are defending, but cannot attack with it at all."
+            [/firststrike]
         [/specials]
         attack_weight=0.0
     [/attack]

data/campaigns/Sceptre_of_Fire/utils/terrain.cfg

@@ -0,0 +1,51 @@
+#textdomain wesnoth-sof
+
+[terrain_type]
+    name= _ "Stone Floor"
+    id=sof_ancient_stone_floor
+    symbol_image=interior/stone-ancient
+    editor_name= _ "Ancient Stone Floor"
+    string=Iasy
+    aliasof=Gt
+    editor_group=sof
+    hide_help=yes
+[/terrain_type]
+
+{NEW:BASE               Iasy                                                       interior/stone-ancient LAYER=-88}
+{NEW:TRANSITION            (!,Ql*,Ias*)        Iasy                       -87                 flat/dirt-dark FLAG=inside}
+{NEW:TRANSITION            Iasy                       (!,Ql*,Ias*)        -87                 flat/dirt-dark}
+{TRANSITION_COMPLETE_L	Iasy			(Ql)	-87			volcano/edge}
+{TRANSITION_COMPLETE_LF Iasy		(Ql)		-89	transition2	volcano/chasm-wall-fire}
+
+[terrain_graphics]
+    map="
+, 2
+* , *
+, 1
+* , *
+, 3"
+    [tile]
+        pos=1
+        type=Iasy^Qov
+        set_no_flag=sof_rune-@R0
+    [/tile]
+    [tile]
+        pos=2
+        type=Ias^Qov
+        set_no_flag=sof_rune-@R3
+    [/tile]
+    [tile]
+        pos=3
+        type=*
+        [image]
+            layer=-79
+            name=volcano/rune-@R0.png:160,volcano/rune-@R1.png:160,volcano/rune-@R2.png:160,volcano/rune-@R3.png:160,volcano/rune-@R4.png:160,volcano/rune-@R5.png:160
+            random_start=no
+            # variations=";2;3;4;5;6;7;8;9;10;11"
+            # center=90,144
+        [/image]
+    [/tile]
+
+    probability=100
+    rotations=1,2,3,4,5,6
+[/terrain_graphics]

data/core/terrain-graphics.cfg

@@ -37,7 +37,7 @@
 {BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * (Co*,Cu*,Ko*,Ku*) * stonebridge -80 bridge/stonebridge-castle}
 {BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * (C*,K*)           * stonebridge -80 bridge/stonebridge-castle}
 {BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * (C*,K*)           * stonebridge -80 bridge/stonebridge-short}
-{BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * (W*,S*)           * stonebridge -80 bridge/stonebridge-water}
+{BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * (W*,S*,Ql*)       * stonebridge -80 bridge/stonebridge-water}
 {BRIDGE:ENDS      Bsb\ Bsb| Bsb/ * *                 * stonebridge -80 bridge/stonebridge}
 
 # hanging bridge
@@ -985,8 +985,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION            (!,Re,Rr*,Hh*,M*,Q*,D*,T*)           Re                   -379                 flat/dirt FLAG=inside}
 {NEW:TRANSITION            Re                      (!,Re,Rr*,W*,Ai,Q*,D*,T*)         -380                 flat/dirt}
 
-{NEW:TRANSITION            (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias)        Rb,Ias                       -384                 flat/dirt-dark FLAG=inside}
-{NEW:TRANSITION            Rb,Ias                       (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias)        -388                 flat/dirt-dark}
+{NEW:TRANSITION            (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias*)        Rb,Ias                       -384                 flat/dirt-dark FLAG=inside}
+{NEW:TRANSITION            Rb,Ias                       (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias*)        -388                 flat/dirt-dark}
 
 {NEW:TRANSITION            Rb                              Ias                       -384                 flat/dirt-dark FLAG=inside}
 {NEW:TRANSITION            Ias                             Rb                        -388                 flat/dirt-dark}