From: oskar.wiksten Date: Wed, 25 Apr 2012 16:18:16 +0000 (+0000) Subject: Added droplists to new monsters for v0.6.11. X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e843cc9669475cd642ef7c96043693106e6fdc17;p=users%2Fmchehab%2Fandors-trail.git Added droplists to new monsters for v0.6.11. Added unique monsters that drop Oegyth crystals. git-svn-id: https://andors-trail.googlecode.com/svn/trunk@231 08aca716-68be-ccc6-4d58-36f5abd142ac --- diff --git a/AndorsTrail/res/values/content_droplist.xml b/AndorsTrail/res/values/content_droplist.xml index df9ea3c..a24dd37 100644 --- a/AndorsTrail/res/values/content_droplist.xml +++ b/AndorsTrail/res/values/content_droplist.xml @@ -619,8 +619,6 @@ [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|} @@ -637,11 +635,27 @@ {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|}}|}; [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|} @@ -681,10 +695,12 @@ {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|}}|}; [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|} @@ -692,8 +708,54 @@ {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|} }|}; diff --git a/AndorsTrail/res/values/content_monsterlist.xml b/AndorsTrail/res/values/content_monsterlist.xml index d13ffc8..ba6359b 100644 --- a/AndorsTrail/res/values/content_monsterlist.xml +++ b/AndorsTrail/res/values/content_monsterlist.xml @@ -245,7 +245,7 @@ {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||||||||}; @@ -547,9 +547,15 @@ {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|}}|}; diff --git a/AndorsTrail/res/xml/mountainlake1.tmx b/AndorsTrail/res/xml/mountainlake1.tmx index 0f386d4..2c6765a 100644 --- a/AndorsTrail/res/xml/mountainlake1.tmx +++ b/AndorsTrail/res/xml/mountainlake1.tmx @@ -121,6 +121,7 @@ + diff --git a/AndorsTrail/res/xml/waterway10.tmx b/AndorsTrail/res/xml/waterway10.tmx index dd088ae..6a8f51d 100644 --- a/AndorsTrail/res/xml/waterway10.tmx +++ b/AndorsTrail/res/xml/waterway10.tmx @@ -66,7 +66,7 @@ eJzFVdsNwjAMNNAugNihrAMbwKgslH7wDzUiworicxxH4n6aKPadX02IiF4H+iB/yzVCqx3ylRzP3RjdFZynim4rLJ8WzkjN/ql7mvo4E7BBfUKI5sL+l5noOvv8ylyWzf/s4NDitnge089mccaMdC30aHFP918/1PuMnj7UwDkegzwoX21WI7XV+ilrUvLnOHJtPfWz+nnbzu+Krtxb8+r9LzSd2t4Dz/zKWeUap8Y7YtT8MqL3Wm8sI94kqa2t3xXTNCU= - + eJzVk8ENACAIA7sC+y/r31QrWI2S+BCIRxECQBQPRAwi5wR3Jf4jV9kJ7m4/XuZWeuniZv5V1VTVm6nlV709d3ZnfscsrZp7ht0sxh3txS0m47IaXDvD3lRx985kctxaHXobu9MZow== @@ -106,6 +106,7 @@ + diff --git a/AndorsTrail/res/xml/waterwaycave.tmx b/AndorsTrail/res/xml/waterwaycave.tmx index 6fae7a6..a700e5c 100644 --- a/AndorsTrail/res/xml/waterwaycave.tmx +++ b/AndorsTrail/res/xml/waterwaycave.tmx @@ -108,6 +108,7 @@ + diff --git a/AndorsTrail/res/xml/waytobrimhavencave3.tmx b/AndorsTrail/res/xml/waytobrimhavencave3.tmx index 0cc2187..ad11a01 100644 --- a/AndorsTrail/res/xml/waytobrimhavencave3.tmx +++ b/AndorsTrail/res/xml/waytobrimhavencave3.tmx @@ -82,7 +82,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -165,6 +165,7 @@ + diff --git a/AndorsTrail/res/xml/waytolake5.tmx b/AndorsTrail/res/xml/waytolake5.tmx index 1637981..a75c6b3 100644 --- a/AndorsTrail/res/xml/waytolake5.tmx +++ b/AndorsTrail/res/xml/waytolake5.tmx @@ -82,7 +82,7 @@ - + @@ -118,11 +118,12 @@ - + + diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java index c5d72ec..75a62b3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java @@ -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 {