Merge branch 'halvor'

2026-01-07 03:57:08 +01:00 · 2016-01-06 22:30:58 +01:00
parent d5c358879b 268d8f3023
commit 0dfc18480e
8 changed files with 1920 additions and 53 deletions
--- a/AndorsTrail/res/raw/conversationlist_halvor_surprise.json
+++ b/AndorsTrail/res/raw/conversationlist_halvor_surprise.json
--- a/AndorsTrail/res/raw/monsterlist_halvor_surprise.json
+++ b/AndorsTrail/res/raw/monsterlist_halvor_surprise.json
@@ -0,0 +1,9 @@
+[
+    {
+        "id":"halvor",
+        "phraseID":"halvor_select_begin",
+        "unique":1,
+        "name":"Halvor",
+        "iconID":"monsters_tometik1:67"
+    }
+]
--- a/AndorsTrail/res/raw/questlist_halvor_surprise.json
+++ b/AndorsTrail/res/raw/questlist_halvor_surprise.json
@@ -0,0 +1,141 @@
+[
+    {
+        "id":"halvor_surprise",
+        "name":"Surprise ?",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Halvor asked me to bring him 5 insect wings."
+            },
+            {
+                "progress":15,
+                "logText":"I have given Halvor the 5 insect wings he wanted."
+            },
+            {
+                "progress":20,
+                "logText":"Halvor asked me to bring him 5 rat tails."
+            },
+            {
+                "progress":25,
+                "logText":"I have given Halvor 5 rat tails."
+            },
+            {
+                "progress":30,
+                "logText":"My rat tails weren't good enough for him. He needs more. How much does he really want ?"
+            },
+            {
+                "progress":40,
+                "rewardExperience":500,
+                "logText":"I refused to bring more rat tails to Halvor. He left Crossglen."
+            },
+            {
+                "progress":50,
+                "logText":"I met Halvor at the foot of a mountain."
+            },
+            {
+                "progress":60,
+                "logText":"Halvor still looks for 5 rat tails. I agreed to help again."
+            },
+            {
+                "progress":65,
+                "logText":"The 5 rat tails I gave him were good enough."
+            },
+            {
+                "progress":70,
+                "logText":"Halvor asked for 4 animal hairs now."
+            },
+            {
+                "progress":75,
+                "logText":"I have given him 4 animal hairs."
+            },
+            {
+                "progress":80,
+                "logText":"Halvor liked only one of my animal hairs. He wants me to bring him 3 more."
+            },
+            {
+                "progress":90,
+                "rewardExperience":1500,
+                "logText":"I have given up on finding animal hairs that suit Halvor's taste. He has left."
+            },
+            {
+                "progress":100,
+                "logText":"I met Havlor again. He is standing by the lakeside, near an old house, in the north."
+            },
+            {
+                "progress":110,
+                "logText":"Halvor is in bad condition. He asked me to give him a healing potion."
+            },
+            {
+                "progress":111,
+                "rewardExperience":500,
+                "logText":"I gave Halvor a small healing potion."
+            },
+            {
+                "progress":112,
+                "rewardExperience":1000,
+                "logText":"I gave Halvor an healing potion."
+            },
+            {
+                "progress":113,
+                "rewardExperience":1500,
+                "logText":"I gave Halvor a powerful healing potion."
+            },
+            {
+                "progress":114,
+                "rewardExperience":5000,
+                "logText":"I gave Halvor a potion made by Lodar."
+            },
+            {
+                "progress":115,
+                "logText":"He is healed."
+            },
+            {
+                "progress":120,
+                "logText":"Halvor still looks for 3 animal hairs."
+            },
+            {
+                "progress":125,
+                "logText":"This time, the animal hairs I gave him were soft enough."
+            },
+            {
+                "progress":130,
+                "logText":"Halvor wants to find two long bones. I'll try to find some."
+            },
+            {
+                "progress":135,
+                "logText":"I have given Halvor two bones, but they weren't long enough. Should I really bring him more bones ?"
+            },
+            {
+                "progress":140,
+                "rewardExperience":3500,
+                "logText":"Halvor left the lakeside when I refused to get him more bones."
+            },
+            {
+                "progress":150,
+                "logText":"Exploring the ruins of Charwood, I stumbled upon Halvor."
+            },
+            {
+                "progress":160,
+                "logText":"He found one long bone since I last met him, but he's still looking for one."
+            },
+            {
+                "progress":165,
+                "logText":"I found a long enough bone, and gave it to Halvor."
+            },
+            {
+                "progress":170,
+                "logText":"Now, Halvor wants me to find 10 scales from Venomscales snakes."
+            },
+            {
+                "progress":175,
+                "rewardExperience":5000,
+                "logText":"I brought Halvor the 10 Venomscale scales."
+            },
+            {
+                "progress":180,
+                "logText":"Halvor left, asking me to pay a visit to his friend Kayla if I ever come to Stoutford."
+            }
+        ]
+    }
+]
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -76,6 +76,7 @@
 		<item>@raw/questlist_v070_misc</item>
 		<item>@raw/questlist_shortcut_lodar</item>
 		<item>@raw/questlist_pathway_fallhaven</item>
+		<item>@raw/questlist_halvor_surprise</item>
 	</array>

 	<array name="loadresource_conversationlists">
@@ -232,6 +233,7 @@
 		<item>@raw/conversationlist_fallhaven_potions</item>
 		<item>@raw/conversationlist_shortcut_lodar</item>
 		<item>@raw/conversationlist_pathway_fallhaven</item>
+		<item>@raw/conversationlist_halvor_surprise</item>
 	</array>

 	<array name="loadresource_monsters">
@@ -260,6 +262,7 @@
 		<item>@raw/monsterlist_v070_roadcave</item>
 		<item>@raw/monsterlist_v070_npcs</item>
 		<item>@raw/monsterlist_pathway_fallhaven</item>
+		<item>@raw/monsterlist_halvor_surprise</item>
 	</array>

 	<array name="loadresource_maps">
--- a/AndorsTrail/res/xml/blackwater_mountain4.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
   eJxzFWBgcB1kGARorZdYQK4+bGbA2Mji6OoI6cVmDjKfUDjg0ktKGJKiF5s/8PmNkDpcgBZ6iQGkpDNcagDElCwq
  </data>
 </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="192" y="448" width="96" height="32">
   <properties>
    <property name="map" value="blackwater_mountain3"/>
@@ -157,7 +158,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
  <object name="gornaud_2" type="spawn" x="192" y="224" width="96" height="96"/>
  <object name="gornaud_2" type="spawn" x="32" y="128" width="416" height="96">
   <properties>
@@ -169,6 +170,11 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="halvor" type="spawn" x="416" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
   eJzFlNERwCAIQx2hS7n/Sv3teTUJCbbc+dMKDwI4rzHmzweZ4qsyVN8urloDur9qcZKLesDioZ6hGCoX8Zluqu1yZuxUf5a38s+t2TGnLlUzheXmzOKle1Lh7u5+UW/Xu4C4rlVnAb0RLMYpbtf8n+A6Gin5d+37s7a3b8k87+Kq9SLtTuySa6znipYJM425ap4wE+3dea+y05lms9nNXLWpGvPt7GNH/7tny62/sr/uuQG+VaKz
  </data>
 </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
  <object name="cave" type="mapchange" x="576" y="32" width="32" height="32">
   <properties>
    <property name="map" value="crossglen_cave"/>
@@ -187,7 +188,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
  <object name="crossglen_wasp" type="spawn" x="736" y="160" width="192" height="160">
   <properties>
    <property name="quantity" value="3"/>
@@ -206,8 +207,9 @@
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="Odair" type="spawn" x="896" y="32" width="32" height="32"/>
-  <object name="Oromir" type="spawn" x="896" y="864" width="32" height="32"/>
+  <object name="odair" type="spawn" x="896" y="32" width="32" height="32"/>
+  <object name="oromir" type="spawn" x="896" y="864" width="32" height="32"/>
+  <object name="halvor" type="spawn" x="736" y="608" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/mountainlake10a.tmx
+++ b/AndorsTrail/res/xml/mountainlake10a.tmx
@@ -5,124 +5,124 @@
  <property name="outdoors" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
 </tileset>
 <layer name="Ground" width="25" height="20">
  <data encoding="base64" compression="zlib">
@@ -159,11 +159,7 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn">
-  <object name="mwolf_2" type="spawn" x="544" y="64" width="32" height="32">
-   <properties>
-    <property name="quantity" value="1"/>
-   </properties>
-  </object>
+  <object name="mwolf_2" type="spawn" x="544" y="64" width="32" height="32"/>
  <object name="mwolf_1" type="spawn" x="160" y="64" width="384" height="224">
   <properties>
    <property name="quantity" value="2"/>
@@ -174,6 +170,11 @@
    <property name="quantity" value="3"/>
   </properties>
  </object>
+  <object name="halvor" type="spawn" x="128" y="352" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/waytolostmine1.tmx
+++ b/AndorsTrail/res/xml/waytolostmine1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="27" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
@@ -220,6 +221,11 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="halvor" type="spawn" x="448" y="672" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys"/>
 </map>