From 92f0ba6dcf824e2d0ab6d281fc90bbbeaa65e119 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 11 Sep 2010 19:30:19 -0700
Subject: [PATCH] frost / packice

---
 .gitignore            |  3 +++
 res/e3a/ships.xml     | 36 ++++++++++++------------------------
 res/e3a/strings.xml   |  9 +++++++++
 res/e3a/terrains.xml  | 16 ++--------------
 scripts/e3a/frost.lua |  6 ++----
 5 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18c434a75..fe7235a1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ bin/
 *.suo
 *.sdf
 *.bak
+*.opensdf
+ipch/
+*.log
diff --git a/res/e3a/ships.xml b/res/e3a/ships.xml
index 393479234..1174eda8e 100644
--- a/res/e3a/ships.xml
+++ b/res/e3a/ships.xml
@@ -3,6 +3,7 @@
   <ship name="canoe" nocoast="true" range="3" fishing="20" storm="1.00" damage="1.00" cabins="2" cargo="2000" cptskill="1" minskill="1" sumskill="2" opensea="no">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
+    <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
     <coast terrain="highland"/>
@@ -10,8 +11,6 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
     <construction skill="shipcraft" minskill="1" maxsize="3" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -20,10 +19,9 @@
   <ship name="raft" range="1" fishing="20" storm="1.00" damage="1.00" cabins="5" cargo="50000" cptskill="1" minskill="1" sumskill="5" opensea="no">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
+    <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
     <construction skill="shipcraft" minskill="1" maxsize="10" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -32,6 +30,7 @@
   <ship name="cutter" range="2" fishing="20" storm="1.00" damage="1.00" cabins="5" cargo="5500" cptskill="2" minskill="1" sumskill="5" opensea="yes">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
+    <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
     <coast terrain="highland"/>
@@ -39,8 +38,6 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
     <construction skill="shipcraft" minskill="2" maxsize="10" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -49,6 +46,7 @@
   <ship name="barge" range="3" fishing="20" storm="1.00" damage="1.00" cabins="11" cargo="5000" cptskill="2" minskill="1" sumskill="5" opensea="no">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
+    <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
     <coast terrain="highland"/>
@@ -56,8 +54,6 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
     <construction skill="shipcraft" minskill="2" maxsize="10" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -67,6 +63,7 @@
   <ship name="royalbarge" range="5" storm="0.25" damage="1.00" cabins="11" cargo="5000" cptskill="5" minskill="1" sumskill="10" opensea="no">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
+    <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
     <coast terrain="highland"/>
@@ -74,8 +71,6 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
     <construction skill="shipcraft" minskill="6" maxsize="10" reqsize="1">
       <requirement type="mallorn" quantity="1"/>
       <requirement type="money" quantity="100"/>
@@ -85,8 +80,7 @@
   <ship name="catamaran" range="7" storm="0.25" damage="1.00" cabins="22" cargo="10000" cptskill="7" minskill="1" sumskill="20" opensea="yes">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="8" maxsize="30" reqsize="1">
       <requirement type="mallorn" quantity="1"/>
       <requirement type="money" quantity="100"/>
@@ -97,8 +91,7 @@
   <ship name="cog" range="4" storm="0.50" damage="1.00" cabins="50" cargo="200000" cptskill="4" minskill="1" sumskill="20" opensea="yes">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="4" maxsize="100" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -107,8 +100,7 @@
   <ship name="caravel" range="4" storm="0.50" damage="1.00" cabins="150" cargo="600000" cptskill="6" minskill="1" sumskill="30" opensea="yes">
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="6" maxsize="300" reqsize="1">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -119,8 +111,7 @@
     <modifier type="defense" value="+2"/>
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="5" maxsize="100" reqsize="1">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
@@ -131,8 +122,7 @@
     <modifier type="defense" value="+2"/>
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="7" maxsize="300" reqsize="1">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
@@ -145,8 +135,7 @@
     <modifier type="tactics" factor="2.00"/>
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="5" maxsize="100" reqsize="1">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
@@ -158,8 +147,7 @@
     <modifier type="tactics" factor="2.00"/>
     <coast terrain="ocean"/>
     <coast terrain="plain"/>
-    <coast terrain="iceberg_sleep"/>
-    <coast terrain="iceberg"/>
+    <coast terrain="packice"/>
     <construction skill="shipcraft" minskill="7" maxsize="300" reqsize="1">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
diff --git a/res/e3a/strings.xml b/res/e3a/strings.xml
index 3e4c3e9d1..3b368a28e 100644
--- a/res/e3a/strings.xml
+++ b/res/e3a/strings.xml
@@ -13,6 +13,15 @@
     <text locale="en">the third age</text>
   </string>
 
+  <string name="packice">
+    <text locale="de">Packeis</text>
+    <text locale="en">fast ice</text>
+  </string>
+  <string name="packice_trail">
+    <text locale="de">%s</text>
+    <text locale="en">%s</text>
+  </string>
+
   <string name="rpg_item_1_p">
     <text locale="de">Urkunden</text>
     <text locale="en">Certificates</text>
diff --git a/res/e3a/terrains.xml b/res/e3a/terrains.xml
index 512536c38..5312a0aad 100644
--- a/res/e3a/terrains.xml
+++ b/res/e3a/terrains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <terrains>
-    <!-- defaults: walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" size="0" -->
+    <!-- defaults: build="yes" walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" size="0" -->
     <terrain name="ocean" size="100" shallow="no" walk="no" swim="yes" land="no" sea="yes" />
     <terrain name="plain" size="4000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3">
         <herb name="h0" />
@@ -44,19 +44,7 @@
         <resource name="stone" chance="1.0" level="1" base="2" div="100" />
         <resource name="laen" chance="0.05" level="1" base="4" div="100" />
     </terrain>
-    <terrain name="iceberg_sleep" size="150" road="250" arctic="yes">
-        <herb name="h18" />
-        <herb name="h20" />
-        <resource name="iron" chance="0.9" level="1" base="3" div="50" />
-        <resource name="stone" chance="0.9" level="1" base="2" div="100" />
-        <resource name="laen" chance="0.05" level="1" base="4" div="100" />
-    </terrain>
-    <terrain name="iceberg" size="150" arctic="yes">
-        <herb name="h18" />
-        <herb name="h20" />
-        <resource name="iron" chance="0.9" level="1" base="3" div="50" />
-        <resource name="stone" chance="0.9" level="1" base="2" div="100" />
-    </terrain>
+    <terrain name="packice" arctic="yes" swim="yes"/>
     <terrain name="firewall" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
     <terrain name="fog" sail="no" land="no" />
     <terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" />
diff --git a/scripts/e3a/frost.lua b/scripts/e3a/frost.lua
index 1b653c161..235cdc77f 100644
--- a/scripts/e3a/frost.lua
+++ b/scripts/e3a/frost.lua
@@ -9,8 +9,7 @@ local function freeze(r)
     for i, rn in ipairs(r.adj) do
         -- each region has a chance to freeze
         if rn.terrain=="ocean" and math.mod(rng_int(), 100)<20 then
-            print("terraforming .. " .. tostring(rn))
-            rn.terrain = "iceberg_sleep"
+            rn.terrain = "packice"
         end
     end
 end
@@ -22,7 +21,6 @@ end
 function update()
     local turn = get_turn()
     if is_winter(turn) then
-        print "it is winter"
         for r in regions() do
             if r.terrain=="glacier" then
                 freeze(r)
@@ -30,7 +28,7 @@ function update()
         end
     elseif is_winter(turn-1) then
         for r in regions() do
-            if r.terrain=="iceberg_sleep" then
+            if r.terrain=="packice" then
                 thaw(r)
             end
         end