Adventure Updates

Fix for requiring specific targets for battle objectives.
Small corrections to Island / Mountain capital maps

forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java

@@ -210,13 +210,20 @@ public class AdventureQuestStage implements Serializable {
         }
         else if (this.objective == AdventureQuestController.ObjectiveTypes.Defeat) {
             {
-                List<String> defeatedTags = Arrays.stream(defeated.getData().questTags).collect(Collectors.toList());
+                if (mixedEnemies){
-                for (String targetTag : enemyTags) {
+                    List<String> defeatedTags = Arrays.stream(defeated.getData().questTags).collect(Collectors.toList());
-                    if (!defeatedTags.contains(targetTag)) {
+                    for (String targetTag : enemyTags) {
-                        //Does not count toward objective
+                        if (!defeatedTags.contains(targetTag)) {
-                        return status;
+                            //Does not count toward objective
+                            return status;
+                        }
                     }
                 }
+                else{
+                    if (defeated.getData()!=targetEnemyData)
+                        //Does not count
+                        return status;
+                }
                 //All tags matched, kill confirmed
                 if (++progress1 >= count1){
                     status = AdventureQuestController.QuestStatus.Complete;

forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx

@@ -8,12 +8,12 @@
  <tileset firstgid="11905" source="../../tileset/buildings-nocollide.tsx"/>
  <layer id="1" name="Background" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzNmF1OwzAMx/vQj12ERz40xnE4ATzADXYE2JbtVFwGKBsvE7FaC9c4idMmY5OsaZ2a/GL77zjZVkXxURbFoh7ap322rc7Ddtbuy6GZf+CgfqL+ORc+ymEcz2P4cL3vQn6MyRMX36u17/753trB2irgf7C7+u+6uN3WwzX4eIHj4Jgf2V1+AzYNj5Y3Vn/IvmJMOM5zM52Nc07V0sZ+r6tuvVd1x/+VmHGML6VYAieMI2kpBaeW0ZdnxqH1UzGGNHBsOsvBp2EM+SY3H+bRlPoBfBcJ6ozPeI3TsrVlV3+gFqXUsTRHaP+V3rsk9SA1o2/f0vBR7aauNa2DKya2wLSphrwxPgSGl36PQo3B96GPC40nMMF+PcUHN3VcbqB/npohH/yGdeL/8/rXD2PrLcz32IT5WpZT2P9QPuxteK7hmsbwGTLfxvO+IT3Gm+WYzdz5gPs8jhcTH+4P8F2IjeYscD403Xva+bgGYe5QrhsSoxAbnwvjdx1R28GHO08uwgf7WcyjsXpaV/HxokxSvYDPsRn29TF+c+WttiYhE9UYPQNgPzCFSfIj9Lohxn3prtmozVy9iiZPfOegqXGUDLW/6PURGl/i09SMsRbTO7pim6t3j+Hz5V1OPowXas+lD9+9Bb1HSG24f6FJGg5pNjcj9xONl4btlIy0DmpqHT/HY53OyYn7w1x5rpTuG3L5kvqM9qeSv7hu+Tk5pS/7c9DSd3+H5w1TyXz0P56X/RliCabhxXMZnj18ecY5jMM/Wi2FYh+jSc4nvSvdAcaMqYmBdqxU998p+aT73R87migp
+   eJzNmF1OwzAMxyvRj12ERz40xnE4ATzADXYE2JbtKJyCywBj42UiVmvhGidx2mRskjWtU5NfbP8dJ+uqKD7KopjVffu0z9bVadjG2l3ZN/MPHNRP1D+nwkc5jON5DB+u913IjyF54uJ7sfbdPd9Z21tbBPwPdlv/XRe3m7q/Bh8vcOwd8yO7y2/ApuHR8sbqD9kXjAnHeWrGs3HOsVpa2e9l1a73sm75vxIzDvGlFEvghHEkLaXg1DL68sw4tH4sxpAGDk1rOfg0jCHf5ObDPBpTP4DvPEGd8RmvcVq2bdnWH6hFKXUszRHaf6X3Lkg9SM3o27c0fFS7qWvN1sEVE1tgWlV93hgfAsNzt0ehxuB738WFxhOYYL8e44PrOi430D+PTZ8PfsM68f9p/euHofUW5ntownxbllPY/1A+7G14ruGahvAZMt/K874hPcab5ZhM3PmA+zyOFxMf7g/wXYiN5ixw3jfte9r5uAZh7lCuGxKjEBufC+N3FVHbwYcbTy7C5/Ws39MO1dOyio8XZZLqBXwOTb+vj/GbK2+1NQmZqMboGQD7gTFMkh+h1w0x7kp3zUZt5upVNHniOweNjaNkqP1Zp4/Q+BKfpmYMtZje0RXbXL17DJ8v73LyYbxQey59+O4t6D1CasP9C03ScEizuRm5n2i8NGzHZKR1UFPr+Dke63ROTtwfpspzpXTfkMuX1Ge0P5X8xXXLz8kpfdmdg+a++zs8b5hK5qP/8bzszhBzMA0vnsvw7OHLM85hHP7RaikU+xhNcj7pXekOMGZMTQy0Y6W6/07JJ93v/gBdLifn
   </data>
  </layer>
  <layer id="2" name="Ground" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzVWEtOwzAQNVJqEBX0cwMQC1ilnIJLIMS+IEBC3If+1KogroDYt9yAFVdgjy06dDqZsZ04TeFJI5pgZ57nLyv1v3DYUuqotWkWMi7aSl22N6f/QLDNY7U0RGxvmsCa8Xm8+qy1ObPOrksTpU4T994qMDMc3pPw91UjD78q6YJfgcdIrfq0Svtxaqz+uuG3q3/+dhL5d4eJxTJBYz1d6J8Yuar5ZYy4crmUB1yOUV/Z53kO/3UZnpw98+S3Rr6xtsJcQN91jd87Is/nJzzPGFuCjcCHIVy4muf6dkz+zBbcJF7SHk7n0Mi0JH49QVffyKAgPwpffITApYvOEmmSrSnUzxFUMkiZnHAB/IUltjaPPfq42Ovxy738+nFUfwGzV97eNNDLugH5PnTUDogHKdddtivCL2Rfj6yLiQHorXDG0DIaei7KL7RuArqod/pqgDSzuHTaeLCxYGNAa38u0r4n5QEHsDWetUJ0ztCZJguuuBfFzNrYNmCLOuKEdWqhHgJgXZmgcQYc58JMiDl8EZ5cPITWI6gDdG7D/J7QO1z/8GyI7fOxpdT+jv/MIaB2wfMWno8g3jA37NsO0gv7uW8WqTcDLc/E82RVHwj2LfAFuObsmHmB4z3W2b5GxTejldX7MKAO4L7G8fL1uTLAhHIG1JZSzYBXMO9XiS6aD8qMoxjYeXqInv/KnYYEF7/7Pf9+V6jCveBZw/2NG/P/W0buGkt+rjWheGDOY7lJ95eAadP0DCIvRp6bS37TxTu6zq7xIe/9cp76hP1btKy8Gm5va7r/LiM/1nX/DT049t6C4hvBmdqg
+   eJzVWE1KAzEUjjCNYpG23kBxoasZwTt4CRH3VVQQ72P/GKniFcR96w1ceQX3JjjPvr55+ZtMp/pBsBmTvC/vnwjxv7DfE+Kgt24WZpzvCnGxuz75ewbdPDRLw4jNdRNYMT4Pl+dSqjvL8ro0EeI4se9tAjPF4T3x/940Qvg1SRfsCjwmYtmmTeqPE6PltxW/bfnzN0vMvzPGF+sE9fW0kP+oxmXLPXLElYulEHAxRm2l5/MA+/UZnpw+Q+JbIttoXWEuIO+qxe+dkPnZEc8zRpegI7ChDxcu59nOjomfWcHNxMu0h5M5VmNaE7+BQdZQjVFFfhQu//CBTRbtJdKknFOonSOolJAyMWED2AuP2NycO+Rxvjfglzv5DeOo/gJ6r9DaNJKLvAHxPrbkDvAHU6zbdFeFn8++AVkX4wNQW+GOvmnU916Un2/eBPRR7XTlAFPPYpOp/SEv4k9KdyzSumeKAw6ga9xr+cjE/Y/2We2vuBbF9NpYN6CLNuIE8a9lSkM+hH2wrk5QPwNZc0NPiDl8Jfw5+M6++QjyAO3b8LlP6BvOf7g3xPr52BDiRJbPqZIzqF5wv4X7I/A3zA3bNkNys6R8DtfDhXA09cRzJAfrDssEvgBbnx3TL3C8c1mua3S4erS6ah8G5AFc1zherjpXB7Y81lBdmnIGfIJ+v0n0UX9Qpx/FQPfTYzT/K28aJtj43e2499tcFd4FTzv2M67V/2+YcdtZ8LOt8cU9cx/NzfR+CZh2Vc0g40WN5+6C37T4RtfpNS6Evi+H5Cds36pp5VVxe1vR+3cd8bGq92+owbHvFhTfiPTdaw==
   </data>
  </layer>
  <layer id="8" name="Bridges" width="40" height="40">

forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx

@@ -26,12 +26,12 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJztzgENADAIA7B5QuSRjQxO0ipoAgDAL14lXdsLAAAAuG8Ag6wBdg==
+   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
   </data>
  </layer>
  <layer id="5" name="Overlay" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt1EsKwjAUheGzgy7BztoUZ92fugsfU91E3YT1AboB3UKnXqiitJMqXGrx/yDkJoRwQkgkAACAz1TjvhN0U6TSNq3rnWUuG7mXNl69ze2DdAiP9daXwSfXOpc2uc/egLdjIp2S1/hq7+Tm9FZ+ydnOeAnd66dRJsVZXc/tv1kM5P/8N9/eL4C2SSRNrc2ivpPAA/cLYGju2YIlhA==
+   eJzt1EsKwjAUheGzgy5BZ22Ks+6vOtMd+JjqJuwmrA/QDegWnHqhiqItVCG0xf+DkJvH4ISQSAAAAN+5DppOUM86krKoqDeWOX/LPbfx4mVu66Sdu++3Pnd+ci0TaZWUr41tflKxBrTBPpQO4XN8tndy8fRW2uRoZzy5+vVDL5b6cVFP7b+ZdeT//De/3i+AT2kgDa2NgqaTwAfuF0DX3ABEPSb5
   </data>
  </layer>
  <objectgroup id="4" name="Objects">