Merge remote-tracking branch 'googlecode/master'

2026-02-23 15:38:29 +01:00 · 2014-12-21 12:18:03 +01:00
parent 3c6da6a1d7 917cd5eb77
commit 0acd31f090
6 changed files with 121 additions and 24 deletions
--- a/AndorsTrail/res/drawable/map_broken_1.png
+++ b/AndorsTrail/res/drawable/map_broken_1.png
--- a/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json
+++ b/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json
@@ -257,7 +257,7 @@
    },
    {
        "id": "remgard_drunk2_4",
-        "message": "That place twists your mind. I tell you, don't go there, even if you think you do!",
+        "message": "That place twists your mind. I tell you, don't go there, even if you think you want to!",
        "replies": [
            {
                "text": "Mount Galmore, where is that?",
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -127,12 +127,22 @@
 </layer>
 <layer name="Objects" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYKANmMbIwLCLF7+adkbs4pNwiKOD7UDzO6FqdZgYGEDMBF4IDQMZrAwM27C4QxuofiYjRB8ICDIg6GSoWAUrqh4vAQaGXAFUsTo0s29yQegyoDgHNwPDVix2+wpgisEAJzeCDXOHLBMkPGHgNQ+qObVIdsD0m7MgxNKA8m94cNv5CioHU/MaTS2MP5UZIRaFww+WLNjFNZH85S2AMLMUye3STAh2uAB2t3gj2QuSQ9aDC4DCr40XohdEE6MHGSQg6SUVpPGiuhkbAACF1R5C
+   eJxjYKANmMbIwLCLF7+adkbs4pNwiKOD7UDzO6FqdZgYGEDMBF4IDQMZrAwM27C4QxuofiYjRB8ICDIg6GSoWAUrqh4vAQaGXAFUsTo0s29yQegyoDgHNwPDVix2+wpgisEAJzeCDXOHLBMkPGHgNQ+qObVIdsD0m7MgxNKA8m94cNv5CioHU/MaTS2MP5UZIRaFww+WLNjFNZH85S2AMLMUye3STAh2uAB2t3gj2QuSQ9aDC8gyoeolRg8ymMYL0XsfTxjiAst4Ud2MDQAAEuAd6g==
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DoAG8ByvS+5iFdXxkv+fa+4oHofYPHXgCuPgTV
  </data>
 </layer>
 <layer name="Above" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYKA+CBcgT186UF8amXqx6bPlJs+s4QbSyQxTECA3LinVK8uEKebNy8Dgw0ueedFAfTFk6gWFny9Qrx8Z+kFhEAvUF4dHLwCUogdh
+   eJxjYKA+CBcgT186UF8amXqx6bPlJs+s4QbSyQxTECA3LinVK8uEKebNy8Dgw0ueedFAfTFA3EaGflD4+QL1+ZGhFxQGsUB9cXj0AgDpkQf0
+  </data>
+ </layer>
+ <layer name="Above_replace" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AU4APpAuTrDSdCLwA+gADf
  </data>
 </layer>
 <layer name="Walkable" width="15" height="15">
@@ -140,6 +150,11 @@
   eJxzFWBgcB1BGAbQxZBpdHF0vfgAujpS9GIzi1z9uPxNqn50MVLsJddOUsN7qGMAZL8uKA==
  </data>
 </layer>
+ <layer name="Walkable_replace" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUDCQAAAOEAAE=
+  </data>
+ </layer>
 <objectgroup name="Mapevents" width="0" height="0">
  <object name="west" type="mapchange" x="0" y="128" width="32" height="96">
   <properties>
@@ -153,6 +168,19 @@
    <property name="place" value="south"/>
   </properties>
  </object>
+  <object name="south" type="mapchange" x="192" y="448" width="96" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain5c"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="quest:queststage" type="replace" x="192" y="352" width="96" height="128">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+    <property name="Walkalbe" value="Walkalbe_replace"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="0" height="0">
  <object name="bwm_agent_1" type="spawn" x="96" y="224" width="224" height="160"/>
@@ -169,4 +197,5 @@
   </properties>
  </object>
 </objectgroup>
+ <objectgroup name="Replace" width="15" height="15"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain51.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain51.tmx
@@ -137,22 +137,37 @@
 </tileset>
 <layer name="Ground" width="14" height="10">
  <data encoding="base64" compression="zlib">
-   eJzTY2Jg0MODHbBgmLgjENtjkQeJewtiYl2geBAQBwNxIJSNjEHi0YKYGKQvBYhPsEFwChMqvsuGHesi6cGGKdX3Fos+GTx68dkHC2+YWhhfBgnj04cP6zOhuplYfej2g/gAxDZDew==
+   eJzTY2Jg0MODHbBgmLgjENvjUAOS8xZExbpAsSAgDgbiQCgbHYPkogVRMUhfChCfYIPgFCZMfJcNE+si6cGFKdH3Fos+GQJ6cdkHC2+YOhk0s2Sw+BFZHz6sj6T3LQn69JgQ7pCB8gErwEPJ
  </data>
 </layer>
 <layer name="Objects" width="14" height="10">
  <data encoding="base64" compression="zlib">
-   eJxjYKAd6GRkYLDnRhWbxYgq/5KLgcEOTc1MqJoWFgiGAR0mBgZtJoi8Ly8Dgx8QTwPiABEGBlOgutc8DAxTmRkYprBAMDIoA6pbBsSxQBwHZYP0gcRBwIcZ0/0g80AgGqgmBojboPpB+tDBGx4EW5YJQr/igdgD049sHwisBNqZKoBqDkivNBOm+cjmanJjl8cHJvBDaHMW/OoIAQBY6hio
+   eJxjYKAd6GRkYLDnRhWbxYgq/5KLgcEOTc1MqJoWFgiGAR0mBgZtJoi8Ly8Dgx8QT+OFyAWIMDCYAtVOZWZgmMICwcigDKhuGRDHAnEclA3TBwI+zBDaVwCh5zUPhI4Gqo0B4jaofmR9MPCGB8GWZYLQr3gg9sD0w/TB7FgJtDNVANUckF5pJux8mLmaaOFFDJjAD6HNWfCrIwQAypYXoQ==
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBg54DUPgj2NkTS9rVD1pbzE63nDQ1jNUAMAzGoDjw==
  </data>
 </layer>
 <layer name="Above" width="14" height="10">
  <data encoding="base64" compression="zlib">
-   eJxjYKANCBcgT18aEfqm8aLydZiIM9sbqM8HqtcXSPvx4lePbidMfxwJ+qSBbpOFui+NBH3UBulkxgc6AADaNgX6
+   eJxjYKAdCBcgT18aAX3TeDHFdJgIm+sN1OcD1esLpP2wmPOWB7edMP1xWPQRA9J48dtBS5BOZlygAwB0zAew
+  </data>
+ </layer>
+ <layer name="Above_replace" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo4B4AAACMAAB
  </data>
 </layer>
 <layer name="Walkable" width="14" height="10">
  <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0mGASwicEAPjl0dfj04dKLTZ6Qe3CZT6p9xOqnNIwB96MkMg==
+   eJxzFWBgcB3GGBngk0NXg08fIb3I8tj0YaOp4R9i9FEangBkrSXb
+  </data>
+ </layer>
+ <layer name="Walkable_replace" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo4B4AAACMAAB
  </data>
 </layer>
 <objectgroup name="Mapevents" width="14" height="10">
@@ -174,4 +189,17 @@
  <object name="restless_dead_1" type="spawn" x="256" y="128" width="160" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="14" height="10"/>
+ <objectgroup name="Replace" width="14" height="10">
+  <object name="quest:queststage" type="replace" x="96" y="128" width="160" height="96">
+   <properties>
+    <property name="Walkable" value="Walkable_replace"/>
+   </properties>
+  </object>
+  <object name="quest:queststage" type="replace" x="96" y="96" width="160" height="128">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain5c.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5c.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="15" height="9" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="10" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
@@ -180,28 +180,40 @@
 <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
- <layer name="Ground" width="15" height="9">
+ <layer name="Ground" width="10" height="8">
  <data encoding="base64" compression="zlib">
-   eJxbx8TAsA4NrwfiLZwIvBaLGlyYVL0HkPBBNL370eRhGGbPJSR8GU3vRTR5GIbpfYKEkfXB8BMmTIzNf8TigdQLwnOgGJ2PDwMAmr1itA==
+   eJxbz8TAsIUTgdcC+euw4PVo6vYD+QewYHR1F4H8S1gwujoQfsKEibGpw4aprQ7k5zlEYADGjzq9
  </data>
 </layer>
- <layer name="Objects" width="15" height="9">
+ <layer name="Objects" width="10" height="8">
  <data encoding="base64" compression="zlib">
-   eJxjYMAOPgkxMFwCYiZhHArwgJNAfaeAWIgMvWeEIHbfESKs9hsbBH9ng/DZ2VFpfICNHYJBatcwMTC8gdoHsns1E6b6rVjc8wkqBnJrPtCvBcII/lEgPgYNw6M4/HIGyc7jQHxCCFUMBN5g0Tsb6L65TAg7QABkzyMhRNjDwpESAABJ5yQn
+   eJxjYICA7WIMBMENQeLUwcy7JojgizFBaFEmhNhDIYR5q4HinEwItbJI6mDmPRJC8K9Dzb6DJAbSdwqobhseDAPIboOZy4tmJzEAAHRvEyM=
  </data>
 </layer>
- <layer name="Above" width="15" height="9">
+ <layer name="Above" width="10" height="8">
  <data encoding="base64" compression="zlib">
-   eJxjYMAOdgoxMOwSwiFJABwWI08fst7vbKTbc4kEe7G5MV6YgSFBmDy9ILAdGF47CIQZMWGDK+wpCVdyAACXJQ17
+   eJxjYGBgOCzGQBQYaeqIAQCL3gXw
  </data>
 </layer>
- <layer name="Walkable" width="15" height="9">
+ <layer name="Walkable" width="10" height="8">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEUj2IsGAB9E2jy
+   eJzbKMaAAjaK4caDQR0uQAt1xGAA99Ef4A==
  </data>
 </layer>
- <objectgroup name="Mapevents" width="15" height="9"/>
- <objectgroup name="Spawn" width="15" height="9"/>
- <objectgroup name="Keys" width="15" height="9"/>
- <objectgroup name="Replace" width="15" height="9"/>
+ <objectgroup name="Mapevents" width="10" height="8">
+  <object name="north " type="mapchange" x="32" y="0" width="96" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain5"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="288" y="128" width="32" height="96">
+   <properties>
+    <property name="map" value="blackwater_mountain9"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="10" height="8"/>
+ <objectgroup name="Keys" width="10" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain9.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain9.tmx
@@ -182,17 +182,22 @@
 </tileset>
 <layer name="Ground" width="19" height="12">
  <data encoding="base64" compression="zlib">
-   eJydkTsSgCAMRBk67996BT6FPXIE5AoeRBzJzJpJwLF4zbIsm+CtMX7ADoy0WUZuHIBrBKalSQ75a+MEKAu10nVtntx92/Im9TNJxxycpwr+m6KcUTfqgfNwb1CyETfpQR5pLo5XeiBx8NZqH2hPs/ei4pH+7sse/mRRZ+mOtB8On3mka17iAn5Zps4=
+   eJyNkbENwCAMBCO67N+yApAiPWEEyAoMEqKA9LFscHHN837Zjzfb5idcwExbZaRGAVwjEC0ucob/blRgZKGWuy7dk7rv3P/E/sbpdL7APtT/koW3sRvOV2GfIGQjbjKPHu4uild4jsnN1nyMvjVZ0r707zQ9aLMsAzfD9aOFdiFpyAPx86bW
  </data>
 </layer>
 <layer name="Objects" width="19" height="12">
  <data encoding="base64" compression="zlib">
-   eJxjYKAf4GRiYPBjQhVTFmZg+MRGvBlSUP2SQDoOiPmRzAOJMbEzMHAxQdjEgDVQdRsFIbQzkr47YhB6NQ6z8oDiisIQ9hkhhPg8qPpgKP2VD2LWdagdSsKYZtUxIdzzEGrWbCR7QW6AuRXmrhuCmG4DqUF2yxc+VPk9QL17kfA7MYj7kO3bJoSwSwjo1ktA/jWo28WQ7HuJZA+6e2HgGFDNSSA+JQRx1yckPXeEEG5+BnTHSyBmxhNvIP03hSDuOQ7EJ4D4DZobDgPN+AbEP4H4kRAiXrEBkFuQ3TwXyP4kiqpmLpI8Nv9RGwAAg2k2Jg==
+   eJxjYKAf4GRiYPBjQhVTFmZg+MRGvBlSUP2SQDoOiPmRzAOJMbEzMHAxQdjEgDVQdRsFGRh2ijEwOCPpuyMGoVfjMCsPKK4oDGGfEYLQIDPmQdUHQ+mvfBCzrgtC+ErCCL/A3FnHhHDPQ6hZs5HsBbkB5laYu24IIty2TQjVPzDwhQ/iJhjYA2TvRcLvxCDuQ7bvGNCsN0B8B4iFgG69BKSvQd0uhmT+SyFUu2ZjCadtYpj4JtQ9d5Dc/Awo9hKImfHEGyiMbwpB3HMJ6rY3aG44DDTjGxD/BOJHQpB4JRbMBdr9SRRTDJ//qA0A/BA4MQ==
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="19" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFwwmsYWJguC5ImRnXoPofCSHEyDVzmxgmvilGHffdoNCfgxEAAPH2CxU=
  </data>
 </layer>
 <layer name="Above" width="19" height="12">
  <data encoding="base64" compression="zlib">
-   eJxjYKAfOCxGnBgxZlyiolmkymFTg809xMiBwGUxwmqIBSBzmIQpN2enEAPDLiHc8pfJcO92oHk7sJhJbLzh0o8M5jIRZ9ZxoDknCJg1EAAAawAURw==
+   eJxjYKAfOCxGnBgxZlyiolmkymFTg809xMiRooZYwCRMmf4dQhAzdgLpXULY1Vwm0r0ngPqFgGadBNKnhLC7jZR4w+cmEJjLRLxZgxEAALAJEt4=
  </data>
 </layer>
 <layer name="Walkable" width="19" height="12">
@@ -200,6 +205,11 @@
   eJzbKMbAsHEYYRAgRw8M4BMj1hx0d6ADUswh1yxc6vABSsKInHCihlm4wotaZuESoxUGAGgrhbU=
  </data>
 </layer>
+ <layer name="Walkable_replace" width="19" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUDBYAAAOQAAE=
+  </data>
+ </layer>
 <objectgroup name="Mapevents" width="19" height="12">
  <object name="north" type="mapchange" x="448" y="64" width="32" height="32">
   <properties>
@@ -213,6 +223,12 @@
    <property name="place" value="up"/>
   </properties>
  </object>
+  <object name="west" type="mapchange" x="0" y="224" width="32" height="96">
+   <properties>
+    <property name="map" value="blackwater_mountain5c"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="19" height="12">
  <object name="gornaud_1" type="spawn" x="128" y="160" width="128" height="128"/>
@@ -220,5 +236,17 @@
  <object name="gornaud_1" type="spawn" x="320" y="192" width="160" height="160"/>
 </objectgroup>
 <objectgroup name="Keys" width="19" height="12"/>
- <objectgroup name="Replace" width="19" height="12"/>
+ <objectgroup name="Replace" width="19" height="12">
+  <object name="quest:queststage" type="replace" x="0" y="224" width="192" height="96">
+   <properties>
+    <property name="Walkalbe" value="Walkalbe_replace"/>
+   </properties>
+  </object>
+  <object name="quest:queststage" type="replace" x="0" y="192" width="192" height="128">
+   <properties>
+    <property name="Above" value="Walkable_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>