]> www.infradead.org Git - users/mchehab/andors-trail.git/commitdiff
Added droplists to new monsters for v0.6.11.
authoroskar.wiksten <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Wed, 25 Apr 2012 16:18:16 +0000 (16:18 +0000)
committeroskar.wiksten <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Wed, 25 Apr 2012 16:18:16 +0000 (16:18 +0000)
Added unique monsters that drop Oegyth crystals.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@231 08aca716-68be-ccc6-4d58-36f5abd142ac

AndorsTrail/res/values/content_droplist.xml
AndorsTrail/res/values/content_monsterlist.xml
AndorsTrail/res/xml/mountainlake1.tmx
AndorsTrail/res/xml/waterway10.tmx
AndorsTrail/res/xml/waterwaycave.tmx
AndorsTrail/res/xml/waytobrimhavencave3.tmx
AndorsTrail/res/xml/waytolake5.tmx
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java

index df9ea3c01203e07fb1844eaed79f0da4a115ab1a..a24dd37ca557560556df32fd4fd5930e0edc98ba 100644 (file)
 
 <string name="droplists_v0611_monsters">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
-{shop_thorin|{{pot_scaradon|30|30|100|}}|};
-{thorin_bone|{{thorin_bone|1|1|100|}}|};
 {lonelyhouse_sp|{{algangror_rat|1|1|100|}}|};
 {irdegh_spawn|{
        {meat|1|1|1|}
        {irdegh|1|1|5|}
        {ring_crude_combat|1|1|1|}
 }|};
+{scaradon|{{gold|0|4|70|}{shell|1|1|30|}{gem1|1|1|5|}}|};
+{scaradon_b|{{gold|0|12|70|}{shell|1|1|30|}{gem1|1|1|5|}{ring_rough_life|1|1|1|}}|};
+{burrower|{{gold|0|3|70|}{shell|1|1|30|}{gem1|1|1|5|}}|};
+{mwolf|{{gold|1|5|50|}{gem2|1|1|1|}{meat|1|1|5|}{hair|1|1|30|}}|};
+{mwolf_b|{{gold|1|12|50|}{gem4|1|1|20|}{meat|1|1|30|}{hair|1|1|30|}}|};
+{arulir|{{gold|1|12|70|}{meat|1|1|5|}{hair|1|1|10|}{arulir_skin|1|1|1|}}|};
+{maonit|{{gold|1|7|70|}{meat|1|1|5|}{hair|1|1|10|}{ring_crude_block|1|1|1|}}|};
+{allaceph|{{gold|1|20|30|}{gem1|1|1|1|}{health|1|1|5|}{vial_empty2|1|1|5|}}|};
+{allaceph_b|{{gold|1|20|30|}{gem4|1|1|30|}{health|1|2|30|}{vial_empty2|1|1|5|}}|};
+{mbrute|{{bone|1|1|10|}{ring1|1|1|1|}}|};
+{mbrute_b|{{bone|1|1|10|}{hair|1|1|10|}{ring1|1|1|10|}}|};
+{erumen|{{gold|0|3|70|}{gem1|1|1|10|}}|};
+{erumen_b|{{gold|0|9|70|}{gem2|1|1|30|}}|};
+{plaguespider|{{gold|0|3|70|}{gland|1|1|1|}{spider|1|1|5|}}|};
+{plaguespider_b|{{health|0|1|10|}{vial_empty1|1|1|5|}{valugha_gown|1|1|1/1000|}{valugha_hat|1|1|1/1000|}}|};
 </string>
 
 <string name="droplists_v0611_npcs">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
 {sign_toszylae|{{helm_protector0|1|1|100|}}|};
+{thorin_bone|{{thorin_bone|1|1|100|}}|};
 {toszylae|{
        {gold|0|20|100|}
        {toszylae_heart|1|1|100|}
 {armour_chain_remg|{{armour_chain_remg|1|1|100|}}|};
 {marrowtaint|{{marrowtaint|1|1|100|}}|};
 {ervelyn_hat|{{hat_crit|1|1|100|}}|};
+{oegyth1|{{oegyth|1|1|100|}}|};
 </string>
 
 <string name="droplists_v0611_shops">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
+{shop_thorin|{{pot_scaradon|30|30|100|}}|};
 {shop_hjaldar|{
        {pot_focus_dmg|5|5|100|}
        {pot_focus_ac|5|5|100|}
        {pot_focus_ac2|1|1|100|}
        }|};
 {shop_rothses|{
-       {gloves_combat1|1|1|100|}
        {remgard_shield_1|1|1|100|}
+       {helm_combat1|1|1|100|}
+       {helm_combat2|1|1|100|}
+       {helm_combat3|1|1|100|}
+       {helm_defend1|1|1|100|}
+       {gloves_guard1|1|1|100|}
+       {boots_combat1|1|1|100|}
+       {boots_combat2|1|1|100|}
+       {boots_remgard1|1|1|100|}
+       {boots_guard1|1|1|100|}
+       }|};
+{shop_arghes|{
+       {ring_barbrawler|1|1|100|}
+       {boots_brawler|1|1|100|}
+       {helm_redeye1|1|1|100|}
+       {helm_redeye2|1|1|100|}
+       {ring_troublemaker|1|1|100|}
+       }|};
+{shop_arnal|{
+       {sword_hard_iron|1|1|100|}
+       {axe_fine_iron|1|1|100|}
+       {longsword_hard_iron|1|1|100|}
+       {dagger_sharp_steel|1|1|100|}
+       {gloves_combat1|1|1|100|}
+       {gloves_remgard1|1|1|100|}
+       {gloves_remgard2|1|1|100|}
+       }|};
+{shop_ervelyn|{
+       {shirt_weathered|1|1|100|}
+       {shirt_patched_cloth|1|1|100|}
+       {shirt2|1|1|100|}
+       {armour_cvest1|1|1|100|}
+       {armour_cvest2|1|1|100|}
+       {gloves_leather1|1|1|100|}
+       {gloves_arulir|1|1|100|}
+       }|};
+{shop_kendelow|{
+       {meat_cooked|5|5|100|}
+       {carrot|5|5|100|}
+       {mushroom|5|5|100|}
+       {mead|5|5|100|}
+       }|};
+{shop_skylenar|{
+       {health_minor2|10|10|100|}
+       {health|10|10|100|}
+       {health_major2|10|10|100|}
+       {ring_dmg6|1|1|100|}
+       {ring_protector|1|1|100|}
        }|};
 </string>
 
index d13ffc8fbc64981002c0ba8e7a9a229f858613e2..ba6359bd010d2ecc2753143324f29976e6ed6104 100644 (file)
 {prim_armorer|monsters_rltiles1:88|Prim armorer|prim_armorer||0|1|||||||||||||shop_prim_armorer|prim_armorer||||||||};
 {jueth|monsters_men2:0|Jueth|prim_tailor||0|1||||||||||||||prim_tailor||||||||};
 {bjorgur|monsters_karvis2:7|Bjorgur|bjorgur||0|1||||||||||||||bjorgur_start||||||||};
-{prim_prisoner|monsters_rltiles2:81|Prim prisoner|prim_prisoner||0|1||||||||||||||||||||||};
+{prim_prisoner|monsters_rltiles2:81|Prim prisoner|prim_prisoner||0|1||||||||||||||prim_guard1||||||||};
 {fulus|monsters_karvis2:3|Fulus|fulus||0|1||||||||||||||fulus_start||||||||};
 {guthbered|monsters_rltiles1:92|Guthbered|guthbered||0|1||80|10|5|5|70|||4|9|80|4|guthbered|guthbered_start||||||||};
 {guthbereds_bodyguard|monsters_rltiles1:76|Guthbered\'s bodyguard|guthbered_guard||0|1||||||||||||||guthbered_guard||||||||};
 {rg_villager6|monsters_ld1:188|Villager|remgard_villager6||0|1||||||||||||||remgard_villager6||||||||};
 {rg_villager7|monsters_ld1:10|Villager|remgard_villager7||0|1||||||||||||||remgard_villager7||||||||};
 {rg_villager8|monsters_rltiles3:18|Villager|remgard_villager8||0|1||||||||||||||remgard_villager8||||||||};
-{skylenar|monsters_ld1:3|Skylenar|skylenar||0|1||||||||||||||skylenar||||||||};
+{skylenar|monsters_ld1:3|Skylenar|skylenar||0|1|||||||||||||shop_skylenar|skylenar||||||||};
 {taylin|monsters_rltiles1:74|Taylin|taylin||0|1||||||||||||||taylin||||||||};
 {petdog|monsters_dogs:0|Dog|petdog||4|1||||||||||||||petdog||||||||};
+
+{izthiel_cr|monsters_rltiles2:52|Izthiel Guardian|izthiel_cr||7|1||354|10|5|3|120|||3|7|60|11|oegyth1||1||||||{{bleeding_wound|3|5|50|}}|};
+{burrower_cr|monsters_rltiles2:165|Giant larval burrower|burrower_cr||1|1||175|10|5|5|95|||1|25|80|2|oegyth1|||||||||};
+{allaceph_cr|monsters_rltiles2:103|Ancient Allaceph|allaceph_cr||2|1||333|10|5|3|80|40|2|3|7|115|3|oegyth1||1|7|7||||{{feebleness_minor|3|3|20|}}|};
+{plaguesp_cr|monsters_rltiles2:38|Plaguestrider master|plaguespider_cr||6|1||365|10|5|3|85|80|3|2|8|175|2|oegyth1||1||||||{{contagion|4|5|70|}{blister|3|5|50|}}|};
+{maonit_cr|monsters_rltiles1:107|Strong Maonit brute|maonit_cr||5|1||620|5|5|5|65|30|3|1|20|20|6|oegyth1||1||||||{{stunned|1|3|10|}}|};
        </string>
 
 </resources>
index 0f386d4d8f84cc7399199b61db60ec754d4f39ff..2c6765a84ebb0bdd38ef4486a299a1c975bcda7a 100644 (file)
     <property name="quantity" value="1"/>
    </properties>
   </object>
+  <object name="maonit_cr" type="spawn" x="64" y="160" width="224" height="128"/>
  </objectgroup>
  <objectgroup name="Spawn2" width="30" height="30" visible="0">
   <object name="mwolf_1" type="spawn" x="64" y="64" width="832" height="832">
index dd088ae1dd3bb9c122004992588def86de3ae4db..6a8f51d24a7eedd40080cbe5eb2d766a0f25c15a 100644 (file)
@@ -66,7 +66,7 @@
    eJzFVdsNwjAMNNAugNihrAMbwKgslH7wDzUiworicxxH4n6aKPadX02IiF4H+iB/yzVCqx3ylRzP3RjdFZynim4rLJ8WzkjN/ql7mvo4E7BBfUKI5sL+l5noOvv8ylyWzf/s4NDitnge089mccaMdC30aHFP918/1PuMnj7UwDkegzwoX21WI7XV+ilrUvLnOHJtPfWz+nnbzu+Krtxb8+r9LzSd2t4Dz/zKWeUap8Y7YtT8MqL3Wm8sI94kqa2t3xXTNCU=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="18" visible="0">
+ <layer name="Walkable" width="30" height="18">
   <data encoding="base64" compression="zlib">
    eJzVk8ENACAIA7sC+y/r31QrWI2S+BCIRxECQBQPRAwi5wR3Jf4jV9kJ7m4/XuZWeuniZv5V1VTVm6nlV709d3ZnfscsrZp7ht0sxh3txS0m47IaXDvD3lRx985kctxaHXobu9MZow==
   </data>
     <property name="quantity" value="4"/>
    </properties>
   </object>
+  <object name="izthiel_cr" type="spawn" x="320" y="192" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="18"/>
 </map>
index 6fae7a6f77d3fa1e68cbb3f59d30503fe521e503..a700e5ce9358a9264344acd6112040aa0ffbb159 100644 (file)
     <property name="quantity" value="2"/>
    </properties>
   </object>
+  <object name="burrower_cr" type="spawn" x="192" y="288" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="15" height="15"/>
 </map>
index 0cc2187d20cf9f891bcaabc81e5fb5a88ff2bac6..ad11a01e2c8640fd42eada28da98300458ced7b3 100644 (file)
@@ -82,7 +82,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
+ <objectgroup name="Spawn" width="30" height="30">
   <object name="allaceph_2" type="spawn" x="608" y="192" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>
@@ -94,7 +94,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn2" width="30" height="30" visible="0">
+ <objectgroup name="Spawn2" width="30" height="30">
   <object name="allaceph_3" type="spawn" x="416" y="544" width="192" height="64">
    <properties>
     <property name="quantity" value="1"/>
     <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="96" y="576" width="192" height="160">
+  <object name="allaceph_3" type="spawn" x="96" y="608" width="192" height="160">
    <properties>
     <property name="quantity" value="1"/>
    </properties>
     <property name="quantity" value="1"/>
    </properties>
   </object>
+  <object name="allaceph_cr" type="spawn" x="96" y="576" width="96" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="30"/>
 </map>
index 163798177b2e136bd1b14a9d63a75c8a2b556385..a75c6b3bc0ea546633ee5f7d7cd46360fc4d73ff 100644 (file)
@@ -82,7 +82,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="23" height="18" visible="0">
+ <objectgroup name="Spawn" width="23" height="18">
   <object name="plaguespider_6" type="spawn" x="160" y="352" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>
     <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="352" y="352" width="224" height="128">
+  <object name="plaguespider_4" type="spawn" x="384" y="352" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
+  <object name="plaguespider_cr" type="spawn" x="352" y="416" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="23" height="18"/>
 </map>
index c5d72ec7f2b47ec4b597da609e1e512927af2079..75a62b3729cc207eb2177c889eb9f3c41f9bf72d 100644 (file)
@@ -252,8 +252,8 @@ public final class PredefinedMap {
        // ====== PARCELABLE ===================================================================
 
        public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-               final int size1 = src.readInt();
-               for(int i = 0; i < size1; ++i) {
+               final int loadedSpawnAreas = src.readInt();
+               for(int i = 0; i < loadedSpawnAreas; ++i) {
                        this.spawnAreas[i].readFromParcel(src, world, fileversion);
                }
                
@@ -279,6 +279,12 @@ public final class PredefinedMap {
                        return;
                }
                lastVisitTime = src.readLong();
+               
+               for(int i = loadedSpawnAreas; i < spawnAreas.length; ++i) {
+                       MonsterSpawnArea area = this.spawnAreas[i];
+                       if (area.isUnique && visited) spawnAllInArea(world, area, true);
+                       else area.reset();
+               }
        }
 
        public void writeToParcel(DataOutputStream dest, int flags) throws IOException {