Menu
▾
▴
[Arianne-commits] stendhal/tiled objecttypes.xml,1.3,1.4
|
From: Hendrik B. <nh...@us...> - 2013-11-24 23:35:56
|
Update of /cvsroot/arianne/stendhal/tiled In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20804/tiled Modified Files: objecttypes.xml Log Message: use tileset name instead of tileset image, some more cleanup Index: objecttypes.xml =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/objecttypes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** objecttypes.xml 24 Nov 2013 22:59:47 -0000 1.3 --- objecttypes.xml 24 Nov 2013 23:35:52 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> + <objecttypes> *************** *** 169,184 **** <!-- Resources --> ! <objecttype name="CoalSource" tileset="logic/resource.png" tileid="1" /> ! <objecttype name="FishSource" tileset="logic/resource.png" tileid="1"> <property name="species" type="enum" values="char, cod, mackerel, perch, roach, clown fish, red lionfish, surgeonfish, trout"/> </objecttype> ! <objecttype name="GoldSource" tileset="logic/resource.png" tileid="2" /> ! <objecttype name="WaterSpringSource" tileset="logic/resource.png" tileid="3" /> ! <objecttype name="WellSource" tileset="logic/resource.png" tileid="4" /> <!-- Music and Sound --> ! <objecttype name="BackgroundMusicSource" tileset="logic/sound.png" tileid="1"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> --- 170,186 ---- <!-- Resources --> ! <objecttype name="CoalSource" tileset="logic/resource" tileid="1" /> ! <!-- TODO: Use a logic/fish-tileset instead of a species-property --> ! <objecttype name="FishSource" tileset="logic/resource" tileid="2"> <property name="species" type="enum" values="char, cod, mackerel, perch, roach, clown fish, red lionfish, surgeonfish, trout"/> </objecttype> ! <objecttype name="GoldSource" tileset="logic/resource" tileid="3" /> ! <objecttype name="WaterSpringSource" tileset="logic/resource" tileid="4" /> ! <objecttype name="WellSource" tileset="logic/resource" tileid="5" /> <!-- Music and Sound --> ! <objecttype name="BackgroundMusicSource" tileset="logic/sound" tileid="1"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> *************** *** 186,190 **** </objecttype> ! <objecttype name="LoopedAmbientSoundSource" tileset="logic/sound.png" tileid="2"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> --- 188,192 ---- </objecttype> ! <objecttype name="LoopedAmbientSoundSource" tileset="logic/sound" tileid="2"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> *************** *** 192,196 **** </objecttype> ! <objecttype name="PeriodicAmbientSoundSource" tileset="logic/sound.png" tileid="3"> <property name="sound" type="string" /> <property name="min" type="int" default="60" /> --- 194,198 ---- </objecttype> ! <objecttype name="PeriodicAmbientSoundSource" tileset="logic/sound" tileid="3"> <property name="sound" type="string" /> <property name="min" type="int" default="60" /> *************** *** 200,204 **** </objecttype> ! <objecttype name="PlaySoundEntity" tileset="logic/sound.png" tileid="4"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> --- 202,206 ---- </objecttype> ! <objecttype name="PlaySoundEntity" tileset="logic/sound" tileid="4"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> *************** *** 210,224 **** <!-- Chests --> ! <objecttype name="PersonalChest" tileset="logic/chest.png" tileid="1"> ! <property name="slot" type="string" default="bank" /> </objecttype> ! <objecttype name="NPCOwnedChest" tileset="logic/chest.png" tileid="2"> <property name="npc" type="string" /> </objecttype> ! <objecttype name="StoredChest" tileset="logic/chest.png" tileid="3" /> <!-- Other --> ! <objecttype name="PlaySoundEntity" tileset="logic/sound.png" tileid="4"> <property name="name" type="string" /> <property name="title" type="string"/> --- 212,227 ---- <!-- Chests --> ! <objecttype name="PersonalChest" tileset="logic/chest" tileid="1"> ! <property name="slot" type="string" /> </objecttype> ! <objecttype name="NPCOwnedChest" tileset="logic/chest" tileid="2"> <property name="npc" type="string" /> </objecttype> ! <objecttype name="StoredChest" tileset="logic/chest" tileid="3" /> <!-- Other --> ! ! <objecttype name="PointOfInterest" tileset="logic/poi" tileid="1"> <property name="name" type="string" /> <property name="title" type="string"/> *************** *** 228,271 **** </objecttype> ! <!-- ! ! <configurator ! class-name="games.stendhal.server.entity.mapstuff.portal.GateConfigurator"> ! <parameter name="x">77</parameter> ! <parameter name="y">47</parameter> ! <parameter name="image">fence_gate</parameter> ! <parameter name="orientation">v</parameter> ! <parameter name="condition">new AlwaysFalseCondition()</parameter> ! <parameter name="message">The gate is locked.</parameter> ! <parameter name="autoclose">300</parameter> ! </configurator> ! ! ! <configurator ! class-name="games.stendhal.server.entity.mapstuff.block.BlockZoneConfigurator" ! condition="stendhal.testserver"> ! <parameter name="start-x">44</parameter> ! <parameter name="start-y">53</parameter> ! <parameter name="multi">true</parameter> ! <parameter name="class">mine_cart_empty</parameter> ! </configurator> ! <configurator ! class-name="games.stendhal.server.entity.mapstuff.block.BlockTargetZoneConfigurator" ! condition="stendhal.testserver"> ! <parameter name="x">40</parameter> ! <parameter name="y">53</parameter> ! <parameter name="action">new IncreaseXPAction(5)</parameter> ! </configurator> ! ! ! <entity x="86" y="95"> ! <implementation class-name="games.stendhal.server.entity.mapstuff.useable.ViewChangeEntity"> ! <parameter name="x">100</parameter> ! <parameter name="y">86</parameter> ! </implementation> ! </entity> ! ! --> --- 231,255 ---- </objecttype> + <objecttype name="Gate" tileset="logic/gate" tileid="1"> + <property name="image" type="string" default="fence_gate" /> + <property name="orientation" type="string" default="v" /> + <property name="condition" type="string" default="" /> + <property name="message" type="string" default="The gate is locked."/> + <property name="autoclose" type="int" default="300" /> + </objecttype> ! <objecttype name="Block" tileset="logic/block" tileid="1"> ! <property name="multi" type="boolean" default="false" /> ! <property name="class" type="string" /> ! <property name="shape" type="string" default="" /> ! </objecttype> ! <objecttype name="BlockTarget" tileset="logic/block" tileid="2"> ! <property name="action" type="string" default="" /> ! <property name="shape" type="string" default="" /> ! </objecttype> ! <objecttype name="ViewChangeOrb" tileset="logic/orb" tileid="1"> ! <property name="x" type="int"/> ! <property name="y" type="int"/> ! </objecttype> *************** *** 364,368 **** <parameter name="message">You should keep your items safe for now.</parameter> </configurator> ! </objecttypes> --- 348,352 ---- <parameter name="message">You should keep your items safe for now.</parameter> </configurator> ! --> </objecttypes> |