diff options
| author | bh28 <bernard@bh28.net> | 2013-04-22 11:28:24 +0200 |
|---|---|---|
| committer | bh28 <bernard@bh28.net> | 2013-04-22 11:28:24 +0200 |
| commit | 1dd6849333d23ccaea63695d75223071bc369278 (patch) | |
| tree | 9f998474ea6b1bec2c26fcdb58fed36c8a638681 | |
| parent | 48010f0fd9d16565e2cb6ec398aa670c4a1a2795 (diff) | |
| parent | abd98af4eb95a08760d40f521701fcc30c7d619c (diff) | |
| download | clientdata-1dd6849333d23ccaea63695d75223071bc369278.tar.gz clientdata-1dd6849333d23ccaea63695d75223071bc369278.tar.bz2 clientdata-1dd6849333d23ccaea63695d75223071bc369278.tar.xz clientdata-1dd6849333d23ccaea63695d75223071bc369278.zip | |
Merge remote-tracking branch 'upstream/master' into Hetchel_1
| -rw-r--r-- | graphics/items/equipment/head/rednose.png | bin | 3107 -> 3244 bytes | |||
| -rw-r--r-- | maps/017-1.tmx | 10 |
2 files changed, 2 insertions, 8 deletions
diff --git a/graphics/items/equipment/head/rednose.png b/graphics/items/equipment/head/rednose.png Binary files differindex a94cf800..4cfc66e8 100644 --- a/graphics/items/equipment/head/rednose.png +++ b/graphics/items/equipment/head/rednose.png diff --git a/maps/017-1.tmx b/maps/017-1.tmx index 4dec3234..ef1d42e3 100644 --- a/maps/017-1.tmx +++ b/maps/017-1.tmx @@ -61,14 +61,8 @@ </object> <object name="Clover Patch" type="spawn" x="3136" y="960" width="96" height="64"> <properties> - <property name="eA_death" value="15000"/> - <property name="max_beings" value="1"/> - <property name="monster_id" value="35"/> - </properties> - </object> - <object name="Clover Patch" type="spawn" x="3104" y="960" width="128" height="32"> - <properties> - <property name="eA_death" value="15000"/> + <property name="eA_death" value="50000"/> + <property name="eA_spawn" value="150000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> |
