Merge pull request #849 from Logg-y/master

Changes, mostly Bounty Hunter related

Author: Logg-y

seeded_database/tmapsolutions.txt

@@ -24923,6 +24923,10 @@
       }
     ]
   },
+  "TileBrdrDisabled": {
+    "type": "byte",
+    "value": 0
+  },
   "Tileset": {
     "type": "resref",
     "value": "tno01"

src/are/helm1.are.json

@@ -103,7 +103,7 @@
         "Text": {
           "type": "cexolocstring",
           "value": {
-            "0": "It's good to see a friendly soul in these parts. What do you think about teaming up? You can keep any treasures we find - I'm already at capacity, haha."
+            "0": "<CUSTOM100000>"
           }
         }
       },
@@ -954,7 +954,7 @@
   },
   "NumWords": {
     "type": "dword",
-    "value": 251
+    "value": 222
   },
   "PreventZoomIn": {
     "type": "byte",
@@ -1688,7 +1688,7 @@
         "__struct_id": 2,
         "Active": {
           "type": "resref",
-          "value": ""
+          "value": "dlg_adventc"
         },
         "ConditionParams": {
           "type": "list",

src/dlg/adventurer.dlg.json

@@ -6262,6 +6262,20 @@
           "value": ""
         }
       },
+      {
+        "__struct_id": 5,
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        }
+      },
+      {
+        "__struct_id": 5,
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        }
+      },
       {
         "__struct_id": 5,
         "Comment": {

src/gic/core.gic.json

@@ -1064,13 +1064,6 @@
           "value": "Low treasure script. \r\n\r\nDetection DC: 25\r\nHardness DC: 10"
         }
       },
-      {
-        "__struct_id": 9,
-        "Comment": {
-          "type": "cexostring",
-          "value": "Low treasure script. \r\n\r\nDetection DC: 25\r\nHardness DC: 10"
-        }
-      },
       {
         "__struct_id": 9,
         "Comment": {

src/gic/helm1.gic.json

@@ -296853,6 +296853,132 @@
           "type": "float",
           "value": 9.8819
         }
+      },
+      {
+        "__struct_id": 5,
+        "Appearance": {
+          "type": "byte",
+          "value": 2
+        },
+        "Description": {
+          "type": "cexolocstring",
+          "value": {
+            "0": ""
+          }
+        },
+        "HasMapNote": {
+          "type": "byte",
+          "value": 0
+        },
+        "LinkedTo": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "LocalizedName": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "TreasureMapAvoid15m"
+          }
+        },
+        "MapNote": {
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "MapNoteEnabled": {
+          "type": "byte",
+          "value": 0
+        },
+        "Tag": {
+          "type": "cexostring",
+          "value": "TreasureMapAvoid15m"
+        },
+        "TemplateResRef": {
+          "type": "resref",
+          "value": "treasuremapavoid"
+        },
+        "XOrientation": {
+          "type": "float",
+          "value": 0.0
+        },
+        "XPosition": {
+          "type": "float",
+          "value": 87.1653
+        },
+        "YOrientation": {
+          "type": "float",
+          "value": 1.0
+        },
+        "YPosition": {
+          "type": "float",
+          "value": 153.7911
+        },
+        "ZPosition": {
+          "type": "float",
+          "value": 8.123900000000001
+        }
+      },
+      {
+        "__struct_id": 5,
+        "Appearance": {
+          "type": "byte",
+          "value": 2
+        },
+        "Description": {
+          "type": "cexolocstring",
+          "value": {
+            "0": ""
+          }
+        },
+        "HasMapNote": {
+          "type": "byte",
+          "value": 0
+        },
+        "LinkedTo": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "LocalizedName": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "TreasureMapAvoid15m"
+          }
+        },
+        "MapNote": {
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "MapNoteEnabled": {
+          "type": "byte",
+          "value": 0
+        },
+        "Tag": {
+          "type": "cexostring",
+          "value": "TreasureMapAvoid15m"
+        },
+        "TemplateResRef": {
+          "type": "resref",
+          "value": "treasuremapavoid"
+        },
+        "XOrientation": {
+          "type": "float",
+          "value": 0.0
+        },
+        "XPosition": {
+          "type": "float",
+          "value": 63.4737
+        },
+        "YOrientation": {
+          "type": "float",
+          "value": 1.0
+        },
+        "YPosition": {
+          "type": "float",
+          "value": 155.2333
+        },
+        "ZPosition": {
+          "type": "float",
+          "value": 6.5467
+        }
       }
     ]
   }