From 1c838a79bd9df3bcd1e763a4c9ed0432bf91c8c8 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 20 Jul 2014 14:43:46 +0100
Subject: [PATCH] Added new ruleset and states to support it.

---
 resources/public/docs/mw-parser/uberdoc.html |   2 +-
 resources/public/img/tiles/abandoned.png     | Bin 0 -> 605 bytes
 resources/public/img/tiles/inn.png           | Bin 0 -> 587 bytes
 resources/public/img/tiles/plague.png        | Bin 0 -> 643 bytes
 resources/rulesets/settlement.txt            | 116 +++++++++++++++++++
 resources/templates/rules.html               |   3 -
 src/mw_ui/render_world.clj                   |   6 +-
 7 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 resources/public/img/tiles/abandoned.png
 create mode 100644 resources/public/img/tiles/inn.png
 create mode 100644 resources/public/img/tiles/plague.png
 create mode 100644 resources/rulesets/settlement.txt

diff --git a/resources/public/docs/mw-parser/uberdoc.html b/resources/public/docs/mw-parser/uberdoc.html
index e7b0e9f..9a00606 100644
--- a/resources/public/docs/mw-parser/uberdoc.html
+++ b/resources/public/docs/mw-parser/uberdoc.html
@@ -3162,7 +3162,7 @@ front of the sequence of tokens it returns nil.</p>
   ([tokens expect-int]
     (or 
       (parse-disjunct-value tokens expect-int)
-      (parse-simple-value tokens)))
+      (parse-simple-value tokens expect-int)))
   ([tokens]
     (parse-value tokens false)))</pre></td></tr><tr><td class="docs"><p>Parses a condition of the form '[property] in [value] or [value]...'</p>
 </td><td class="codes"><pre class="brush: clojure">(defn parse-member-condition
diff --git a/resources/public/img/tiles/abandoned.png b/resources/public/img/tiles/abandoned.png
new file mode 100644
index 0000000000000000000000000000000000000000..1492e7e66d088a98ad33947f61cf8a00af94a8ba
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vo6bcjos)CuM0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbO*GWV{R5;7Ul+jBRQ543%JA20+r<q+t3|GlAanaRrK|#WY
z2+N0zi2Vb44f+E_{{<g<$ewyH1PLSp1rdCV9`+%`MTB%ir*<QCM`vfo-JN@SP{-9u
zwnRE_hs%%e-1B|+vepF^|5_3*P#1#vpAJHR0!Tmw@BpeEmVv7XwL|I$K0st4ED+TK
z*8xr7-I98rH#UKF(!oq+XN^1y<e!-?@<a|A2FO4R+~E31_-2pZ)p_lKCd$pAg7Avu
zd#CkJ!C^=-aDzA83%40s;@gTg{o*AP?MC88qhHz=MVrcQ)%{Ok1!#rR%cFOd>wQ|+
z$9G@SOY;Eon;ULH?@z`XM9KEuB2`?FsD|r+7RZT^HmtN6diT=n<&DgzV504unP2yY
zZYLvtX-_yd`5s6d!VHK4aqv;z(yPVaK409)nP;|WTf3X9)}6sbv}A9IeGB3s2+0+~
zuq8U2(EC?u*WUZBf7?0J%yz^a?V*KwI!+h?KNyC1CH3s{?sxN?NG-gXdODF!vT}h{
z`RoECD!y)67|<tYPn5?~k)V|%Y3#9<$>bmD^}mFKfy9vu&YTKB9d!=dfm<?w^m-Wp
r2?D#khY@K0H9Ve*)Tqq<+fVWn2F|f8T5fv^00000NkvXXu0mjfC`$=9

literal 0
HcmV?d00001

diff --git a/resources/public/img/tiles/inn.png b/resources/public/img/tiles/inn.png
new file mode 100644
index 0000000000000000000000000000000000000000..67cbf58850ad6177c2ab2f85451dd077e455efef
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vo6bcd=0lLRn0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbO#Ysd#R5;7Ulud5aKorOSZ#=F&j_ov{R4HkkP$^OjPC>u{
z5Q0VF1T0VyMJzZ0_vo66Z8-o)y+BuNx~WtN)DHxUN~o!b?O=Nzi_o-9g%qd|vwJi8
z&2RKRhU)7M{&opmU|k57zdJAh8xTMaqySG2n?MD|Rft=_2J{Ye56qLmQ$Q6m6wZBl
zxe99Y;BEeGo6{b+7<--n#2f_#n7}M#S9%Yu)^)Gbo>_EtRs$dEw9iF))-TUGMGZzI
z%lE9gs1yc`$Bt^1DtBoA4UP<Ru)C@I2dDfeW*ex(j%4|+-B@rt^UWp4zbU3_rdcVe
zx|M#N)<3=%NuTostVib0&ywT2lC`xka>Hh@WP4o_J^+$s$Lj{cGVQ$vg9p2tIzB*=
zpHEm<wOYZla>F4xOa&R!ju$n8=k#%fviL~v$0&N|o1{AP((xlQ{IPv9Jmp<;FFl=&
z-A6qrKJKu&Rn=ZqTPvz5%E}G%!Wtu)Im`0AunfEN;?>R#$_@zt=wvV$UltQxXd*g|
zjY1(rmSxhESKceoSg8oCe^oJl=KydX#>4RTyb0jLr%VXJnnC|=Fh<TlhM9RnGyS)p
Z<R>cJlOJ$daku~g002ovPDHLkV1n-w^w|Ia

literal 0
HcmV?d00001

diff --git a/resources/public/img/tiles/plague.png b/resources/public/img/tiles/plague.png
new file mode 100644
index 0000000000000000000000000000000000000000..4235d08d05ddeaf346c1a6cade24d35fbb6d13d2
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vo6bcnP0+K<&0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbO{YgYYR5;7UR84CWQ4~FI@+L{gH%+BfjIAGSX=q|%A*n80
zh#xIzMWjE#jSImaAk9y(3m59jwTK{sicq15E=6rO1*?c+N+-3|8Z-HrNhUMzx=0;U
zMTqUfySVV)<#6udo%2}ltcI<Yf^F2c!2EB601yTgzy)dmwGUQ-oe1<pNdqq+bC4#8
z+5rcF9`LxLjq&atupz47a|`dOW`exmw(Gp0`UeK6KomU1_3_YwgZl8$t}{Y5c7uwt
zRwb{tnST>F1SJZd;$5dg`%)tD`Hi@H{U($Bsl@(n&ne4lg&KB?{$JoQ(2H=AM~;X0
z9umVZA1%#4e*$1_`IBAL(<8Ai=~O(sO0Er(t(t>C6ly%6oe1?MMf}<A1>?iptFOz=
zX%??ah4s@H(;!fNX+c_F;kiv_21I}u_ypgR6tVl)o)%W~J`%v#it|ud%kRu%M-maI
zV#u-yS@%t{gK*N6gI3`2t$DjrYF>^8x!(bNTg~TlgHcPIHPJyo9Y(-9!%^-|UjF#~
zOWr4(b6meSYxd5KOWE8AYZO_FW*ZpSuwt0V=+h5M0Hy)zW1~Sn=eW!u7$rqfuACQ(
zi)-ifjz7H3Kyu?1tQpOk(R|v>fSMUlrIY|j5?C9-U<PFm>&&2k3x+mfZ823-lbvlw
dlKr=z<Oj^!$Bge$894v|002ovPDHLkV1f;)8LI#Q

literal 0
HcmV?d00001

diff --git a/resources/rulesets/settlement.txt b/resources/rulesets/settlement.txt
new file mode 100644
index 0000000..df21d8b
--- /dev/null
+++ b/resources/rulesets/settlement.txt
@@ -0,0 +1,116 @@
+# Human settlement
+
+;; nomads make their first significant camp near water because of fish and
+;; shellfish (kitchen-midden people)
+if state is in grassland or heath and more than 3 neighbours are water and generation is more than 20 then state should be camp
+
+;; sooner or later nomads learn to keep flocks
+if state is in grassland or heath and some neighbours are camp then state should be meadow
+
+;; and more herds support more people
+if state is in grassland or heath and more than 2 neighbours are meadow then state should be camp
+if state is meadow and more than 3 neighbours are meadow and 
+
+;; the idea of agriculture spreads
+if state is in grassland or heath and some neighbours are meadow and some neighbours within 3 are house then state should be meadow
+
+;; nomads move on
+if state is camp then 1 chance in 5 state should be waste
+
+;; meadow that's too far from a house or camp will be abandoned
+if state is meadow and fewer than 1 neighbours within 3 are house and fewer than 1 neighbours within 2 are camp then state should be heath
+
+;; good fertile pasture close to settlement will be ploughed for crops
+if state is meadow and fertility is more than 10 and altitude is less than 100 and some neighbours are camp or some neighbours are house then state should be ploughland
+
+if state is ploughland then state should be crop
+
+;; after the crop is harvested, the land is allowed to lie fallow
+if state is crop then state should be grassland
+
+;; if there's reliable food available, nomads build permanent settlements
+if state is in camp or abandoned and some neighbours are crop then state should be house
+;; people camp near to markets
+if state is in waste or grassland and some neighbours are market then state should be camp
+
+;; markets spring up near settlements
+if state is meadow and more than 1 neighbours are house then 1 chance in 10 state should be market
+
+;; a market in a settlement survives
+if state is market and more than 3 neighbours are house then state should be market
+if state is market and some neighbours are inn then state should be market
+if state is market then state should be grassland
+
+;; a house near a market in a settlement will become an inn
+if state is house and some neighbours are market and more than 1 neighbours are house then state should be inn
+;; but it will need some local custom to survive
+if state is inn and fewer than 2 neighbours are house then state should be house
+
+;; if there aren't enough resources houses should be abandoned
+;; resources from fishing
+if state is house and more than 2 neighbours are water then state should be house
+;; from farming
+if state is house and some neighbours are meadow then state should be house
+if state is house and some neighbours are crop then state should be house
+;; from the market
+if state is house and some neighbours are market then state should be house
+if state is house then 1 chance in 2 state should be abandoned
+if state is abandoned then 1 chance in 5 state should be waste  
+
+
+## Vegetation rules
+;; rules which populate the world with plants
+
+;; Occasionally, passing birds plant tree seeds into grassland 
+
+if state is grassland then 1 chance in 10 state should be heath
+
+;; heath below the treeline grows gradually into forest, providing browsing pressure is not to high
+
+if state is heath and deer are fewer than 6 and altitude is less than 150 then state should be scrub 
+if state is scrub then 1 chance in 5 state should be forest
+
+;; Forest on fertile land grows to climax
+
+if state is forest and fertility is more than 5 then state should be climax   
+    
+;; Climax forest occasionally catches fire (e.g. lightning strikes)
+
+if state is climax then 1 chance in 500 state should be fire
+
+;; Climax forest neighbouring fires is likely to catch fire. So are buildings.
+if state is in climax or camp or house or inn and some neighbours are fire then 1 chance in 3 state should be fire
+
+;; After fire we get waste
+
+if state is fire then state should be waste
+
+;; And after waste we get pioneer species; if there's a woodland seed
+;; source, it's going to be heath, otherwise grassland.
+
+if state is waste and some neighbours are scrub then state should be heath
+if state is waste and some neighbours are forest then state should be heath
+if state is waste and some neighbours are climax then state should be heath
+if state is waste then state should be grassland
+
+
+## Potential blockers
+
+;; Forest increases soil fertility. 
+if state is in forest or climax then fertility should be fertility + 1
+
+## Initialisation rules
+
+;; Rules which deal with state 'new' will waste less time if they're near the
+;; end of the file
+
+;; below the waterline we have water.
+
+if state is new and altitude is less than 10 then state should be water
+
+;; above the snowline we have snow.
+if state is new and altitude is more than 200 then state should be snow
+
+;; otherwise, we have grassland.
+if state is new then state should be grassland
+
diff --git a/resources/templates/rules.html b/resources/templates/rules.html
index 9eaf279..24ac35d 100644
--- a/resources/templates/rules.html
+++ b/resources/templates/rules.html
@@ -4,9 +4,6 @@
 	<textarea name="src" id="src" rows="10" cols="80">
 {{rule-text}}
 	</textarea>
-	{% if error %}
-	<p class="error">{{error}}</p>
-    {% endif %}
 	<p class="widget">
 		<label for="submit">When you have finished editing</label>
         <input name="submit" id="submit" type="submit" value="Save your rules"/>
diff --git a/src/mw_ui/render_world.clj b/src/mw_ui/render_world.clj
index 896b1d1..15af785 100644
--- a/src/mw_ui/render_world.clj
+++ b/src/mw_ui/render_world.clj
@@ -28,7 +28,7 @@
   (let [state (:state cell)]
     [:td {:class (format-css-class state) :title (format-mouseover cell)}
      [:a {:href (format "inspect?x=%d&amp;y=%d" (:x cell) (:y cell))}       
-      [:img {:alt (world/format-cell cell) :src (format-image-path state)}]]]))
+      [:img {:alt (:state cell) :src (format-image-path state)}]]]))
 
 (defn render-world-row
   "Render this world row as a Hiccup table row."
@@ -41,8 +41,8 @@
   (let [world (or (session/get :world)
                   (engine/transform-world
                    (heightmap/apply-heightmap
-                     ;;"resources/public/img/20x20/hill.png"
-                     "resources/public/img/heightmaps/great_britain_and_ireland_small.png"
+                     "resources/public/img/20x20/hill.png"
+                     ;; "resources/public/img/heightmaps/great_britain_and_ireland_small.png"
                      )
                    rules/init-rules))
         rules (or (session/get :rules)