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/044-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/044-1.tmx')
| -rw-r--r-- | maps/044-1.tmx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/044-1.tmx b/maps/044-1.tmx index c2860f9e..9b7942c4 100644 --- a/maps/044-1.tmx +++ b/maps/044-1.tmx @@ -111,7 +111,7 @@ <property name="dest_y" value="5280"/> </properties> </object> - <object name="White Slime" type="spawn" x="1152" y="5568" width="128" height="96"> + <object name="WhiteSlime" type="spawn" x="1152" y="5568" width="128" height="96"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> @@ -119,7 +119,7 @@ <property name="monster_id" value="91"/> </properties> </object> - <object name="Blue Slime" type="spawn" x="1408" y="2368" width="96" height="96"> + <object name="BlueSlime" type="spawn" x="1408" y="2368" width="96" height="96"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> @@ -207,7 +207,7 @@ <property name="monster_id" value="88"/> </properties> </object> - <object name="White Slime" type="spawn" x="3424" y="5344" width="128" height="96"> + <object name="WhiteSlime" type="spawn" x="3424" y="5344" width="128" height="96"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> @@ -215,7 +215,7 @@ <property name="monster_id" value="91"/> </properties> </object> - <object name="Blue Slime" type="spawn" x="3424" y="5024" width="128" height="96"> + <object name="BlueSlime" type="spawn" x="3424" y="5024" width="128" height="96"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> @@ -223,7 +223,7 @@ <property name="monster_id" value="89"/> </properties> </object> - <object name="Ice Goblin" type="spawn" x="3072" y="4608" width="352" height="192"> + <object name="IceGoblin" type="spawn" x="3072" y="4608" width="352" height="192"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> @@ -231,7 +231,7 @@ <property name="monster_id" value="56"/> </properties> </object> - <object name="White Bell" type="spawn" x="0" y="0"> + <object name="WhiteBell" type="spawn" x="0" y="0"> <properties> <property name="eA_death" value="30000"/> <property name="eA_spawn" value="100000"/> |