diff options
| author | Micksha <ms-shaman@gmx.de> | 2020-04-22 22:36:42 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2020-04-22 22:36:42 +0000 |
| commit | f3d748609c2a9745a3e5a3d2dc9beca4244a91fb (patch) | |
| tree | 251f126053c03a7a32e230bdda70ffff62562d15 | |
| parent | cdf39dc521564f93ebe043c02cc6b9aeb724efb7 (diff) | |
| parent | bf609fd5ca432a2db4f6d1e3207dc91d23f6e749 (diff) | |
| download | clientdata-f3d748609c2a9745a3e5a3d2dc9beca4244a91fb.tar.gz clientdata-f3d748609c2a9745a3e5a3d2dc9beca4244a91fb.tar.bz2 clientdata-f3d748609c2a9745a3e5a3d2dc9beca4244a91fb.tar.xz clientdata-f3d748609c2a9745a3e5a3d2dc9beca4244a91fb.zip | |
Merge branch 'calamity-rename' into 'master'
rename Calamity dungeon to 008-3-2, a few (minor) fixes - map still needs deep revision.
See merge request evol/clientdata!148
| -rw-r--r-- | maps/008-1.tmx | 2 | ||||
| -rw-r--r-- | maps/008-3-2.tmx | 2 | ||||
| -rw-r--r-- | skills.xml | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/maps/008-1.tmx b/maps/008-1.tmx index 4f92a07c..db912421 100644 --- a/maps/008-1.tmx +++ b/maps/008-1.tmx @@ -4046,7 +4046,7 @@ <properties> <property name="dest_map" value="008-3-2"/> <property name="dest_x" value="175"/> - <property name="dest_y" value="19"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="217" name="To Kytty's Hut" type="warp" x="9248" y="4000" width="32" height="32"> diff --git a/maps/008-3-2.tmx b/maps/008-3-2.tmx index 58f4df8c..5c99acda 100644 --- a/maps/008-3-2.tmx +++ b/maps/008-3-2.tmx @@ -898,7 +898,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <objectgroup color="#ff007f" id="44" name="Spawns" visible="0"> + <objectgroup color="#ff007f" id="44" name="Spawns"> <object id="7" name="Cave Maggot" type="spawn" x="1056" y="320" width="4736" height="4064"> <properties> <property name="death" value="2500"/> @@ -88,6 +88,16 @@ Copyright (C) 2010-2013 Evol Online --> castingSrcEffectId="23" dstEffectId="34" /> + <skill + id="52" + name="Poisoned Touch" + icon="graphics/skills/legacy/resistpoison.png" + description="Increases your attack power, and has a chance to poison your enemy." + castingMissile-particle="graphics/particles/ice-particle.xml" + castingMissile-lifetime="10000" + castingMissile-speed="3" + castingSrcEffectId="23" + /> </set> <set name="Support"> <skill |