diff options
author | bh28 <bernard@bh28.net> | 2013-05-27 15:12:37 +0200 |
---|---|---|
committer | bh28 <bernard@bh28.net> | 2013-05-27 15:12:37 +0200 |
commit | fcd44585a44ee7d9e7bdc0b99cad789e8f299ef3 (patch) | |
tree | 1f01653d54287e7eae413ac888f01c832244ead4 /maps/012-1.tmx | |
parent | 1dd6849333d23ccaea63695d75223071bc369278 (diff) | |
parent | b706bed6c6cc8c023245a5f110bf9cb378485af2 (diff) | |
download | clientdata-fcd44585a44ee7d9e7bdc0b99cad789e8f299ef3.tar.gz clientdata-fcd44585a44ee7d9e7bdc0b99cad789e8f299ef3.tar.bz2 clientdata-fcd44585a44ee7d9e7bdc0b99cad789e8f299ef3.tar.xz clientdata-fcd44585a44ee7d9e7bdc0b99cad789e8f299ef3.zip |
Merge remote-tracking branch 'upstream/master' into Hetchel_1
Diffstat (limited to 'maps/012-1.tmx')
-rw-r--r-- | maps/012-1.tmx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/012-1.tmx b/maps/012-1.tmx index c54ef03e..bde8ef42 100644 --- a/maps/012-1.tmx +++ b/maps/012-1.tmx @@ -128,14 +128,14 @@ <property name="dest_y" value="4480"/> </properties> </object> - <object name="Pink Flower" type="spawn" x="0" y="0"> + <object name="PinkFlower" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="100"/> <property name="max_beings" value="13"/> <property name="monster_id" value="12"/> </properties> </object> - <object name="Spiky Mushroom" type="spawn" x="0" y="0"> + <object name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="10"/> <property name="max_beings" value="25"/> @@ -149,7 +149,7 @@ <property name="monster_id" value="26"/> </properties> </object> - <object name="Mauve Herb" type="spawn" x="0" y="0"> + <object name="MauvePlant" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1800000"/> <property name="eA_spawn" value="2700000"/> @@ -157,7 +157,7 @@ <property name="monster_id" value="27"/> </properties> </object> - <object name="Cobalt Herb" type="spawn" x="0" y="0"> + <object name="CobaltPlant" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1800000"/> <property name="eA_spawn" value="2700000"/> @@ -165,7 +165,7 @@ <property name="monster_id" value="28"/> </properties> </object> - <object name="Gamboge Herb" type="spawn" x="0" y="0"> + <object name="GambogePlant" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1800000"/> <property name="eA_spawn" value="2700000"/> @@ -173,7 +173,7 @@ <property name="monster_id" value="29"/> </properties> </object> - <object name="Alizarin Herb" type="spawn" x="0" y="0"> + <object name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1800000"/> <property name="eA_spawn" value="2700000"/> @@ -189,7 +189,7 @@ <property name="monster_id" value="33"/> </properties> </object> - <object name="Clover Patch" type="spawn" x="0" y="0"> + <object name="CloverPatch" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1000"/> <property name="max_beings" value="2"/> |