Menu
▾
▴
[Arianne-commits] stendhal/tiled objecttypes.xml,1.2,1.3
|
From: Hendrik B. <nh...@us...> - 2013-11-24 22:59:51
|
Update of /cvsroot/arianne/stendhal/tiled In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17997/tiled Modified Files: objecttypes.xml Log Message: some more object definitions Index: objecttypes.xml =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/objecttypes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objecttypes.xml 20 Oct 2013 19:42:26 -0000 1.2 --- objecttypes.xml 24 Nov 2013 22:59:47 -0000 1.3 *************** *** 92,105 **** </portal> - </objecttype> - <objecttype name="sign" tileset="objects" tileid="2"> - <property name="text" type="longstring" /> ! <attribute name="class">transparent</attribute> ! </objecttype> <entity x="15" y="10"> --- 92,115 ---- </portal> + <entity x="71" y="33"> + <implementation + class-name="games.stendhal.server.entity.mapstuff.portal.RandomDestinationPortal" /> + <attribute name="width">2</attribute> + <attribute name="height">2</attribute> + <attribute name="use" /> + </entity> + </objecttype> + --> ! <!-- Signs --> ! <!-- ! <objecttype name="sign" tileset="objects" tileid="2"> ! <property name="text" type="string" /> ! <attribute name="class">transparent</attribute> ! </objecttype> <entity x="15" y="10"> *************** *** 150,173 **** </entity> ! <configurator class-name="games.stendhal.server.core.config.zone.NoTeleport" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoTeleportIn" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoMoveTo" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoItemMove"> ! <parameter name="message">You should keep your items safe for now.</parameter> ! </configurator> ! <implementation class-name="games.stendhal.server.entity.mapstuff.sign.Clock" /> - <implementation class-name="games.stendhal.server.entity.mapstuff.useable.WellSource" /> - <implementation class-name="games.stendhal.server.entity.mapstuff.useable.CoalSource" /> - <implementation class-name="games.stendhal.server.entity.mapstuff.useable.GoldSource" /> - <implementation class-name="games.stendhal.server.entity.mapstuff.sound.BellSoundSource" /> - <implementation class-name="games.stendhal.server.entity.mapstuff.useable.WaterSpringSource" /> - --> <!-- Music and Sound --> ! <objecttype name="BackgroundMusicSource" tileset="logic/sound" tileid="1"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> --- 160,184 ---- </entity> ! --> + <!-- <implementation class-name="games.stendhal.server.entity.mapstuff.sign.Clock" /> --> + + <!-- 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" /> *************** *** 175,179 **** </objecttype> ! <objecttype name="LoopedAmbientSoundSource" tileset="logic/sound" tileid="2"> <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" /> *************** *** 181,185 **** </objecttype> ! <objecttype name="PeriodicAmbientSoundSource" tileset="logic/sound" tileid="3"> <property name="sound" type="string" /> <property name="min" type="int" default="60" /> --- 192,196 ---- </objecttype> ! <objecttype name="PeriodicAmbientSoundSource" tileset="logic/sound.png" tileid="3"> <property name="sound" type="string" /> <property name="min" type="int" default="60" /> *************** *** 189,193 **** </objecttype> ! <objecttype name="PlaySoundEntity" color="#FFFF00" tileset="logic/sound" tileid="4"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> --- 200,204 ---- </objecttype> ! <objecttype name="PlaySoundEntity" tileset="logic/sound.png" tileid="4"> <property name="sound" type="string" /> <property name="volume" type="int" default="100" /> *************** *** 195,220 **** <property name="description" type="string" default="You see something." /> </objecttype> <!-- - <implementation - class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest"> - <parameter name="slot">bank_nalwor</parameter> - </implementation> ! <implementation class-name="games.stendhal.server.entity.mapstuff.useable.FishSource"> ! <parameter name="species">red lionfish</parameter> ! </implementation> </entity> - - <point-of-interest x="56" y="57"> - <name>Amazon Tunnel East Entrance</name> - <title>Amazon Tunnel</title> - <type>dungeon</type> - <description>The huge tunnel system between Ados mountains and Amazon is quite confusing when you try to find the correct exit.</description> - <url>http://stendhalgame.org/wiki/Amazon_Tunnel</url> - </point-of-interest> <entity x="0" y="0"> <implementation --- 206,276 ---- <property name="description" type="string" default="You see something." /> </objecttype> + + + <!-- 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"/> + <property name="type" type="enum" values="bank, dungeon" /> + <property name="description" type="string" /> + <property name="url" type="string" /> + </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> + --> + + + <!-- Areas --> + + <!-- <entity x="0" y="0"> <implementation *************** *** 245,253 **** - <configurator - class-name="games.stendhal.server.entity.mapstuff.chest.StoredChestConfigurator"> - <parameter name="x">18</parameter> - <parameter name="y">13</parameter> - </configurator> <configurator class-name="games.stendhal.server.maps.semos.city.FertileGrounds"> <parameter name="x">5</parameter> --- 301,304 ---- *************** *** 303,358 **** <attribute name="name">deathmatch spikes</attribute> </entity> ! ! <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="2" y="16"> - <implementation - class-name="games.stendhal.server.entity.mapstuff.chest.NPCOwnedChest"> - <parameter name="npc">Xin Blanca</parameter> - </implementation> - </entity> - - <entity x="71" y="33"> - <implementation - class-name="games.stendhal.server.entity.mapstuff.portal.RandomDestinationPortal" /> - <attribute name="width">2</attribute> - <attribute name="height">2</attribute> - <attribute name="use" /> - </entity> - - <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> - --> </objecttypes> --- 354,368 ---- <attribute name="name">deathmatch spikes</attribute> </entity> + --> ! <!-- Zone wide configurations --> ! <!-- ! <configurator class-name="games.stendhal.server.core.config.zone.NoTeleport" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoTeleportIn" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoMoveTo" /> ! <configurator class-name="games.stendhal.server.core.config.zone.NoItemMove"> ! <parameter name="message">You should keep your items safe for now.</parameter> </configurator> </objecttypes> |