Menu
▾
▴
[Planeshift-cvs] SF.net SVN: planeshift: [272] trunk
|
From: <ke...@us...> - 2007-11-15 17:36:40
|
Revision: 272
http://planeshift.svn.sourceforge.net/planeshift/?rev=272&view=rev
Author: kemedes
Date: 2007-11-15 09:35:54 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
- Added lots of effects for testing on svn.
Modified Paths:
--------------
trunk/docs/history.txt
trunk/src/server/database/mysql/spells.sql
Added Paths:
-----------
trunk/data/effects/examples/casting.eff
trunk/data/effects/examples/clear.eff
trunk/data/effects/examples/clear.part
trunk/data/effects/examples/fire.eff
trunk/data/effects/examples/fire.part
trunk/data/effects/examples/puff.part
trunk/data/effects/examples/puff_01.dds
trunk/data/effects/examples/puff_02.dds
trunk/data/effects/examples/puff_03.dds
trunk/data/effects/examples/sparkle.part
trunk/data/effects/examples/sparkle_02.dds
trunk/data/effects/examples/sparkle_03.dds
trunk/data/effects/examples/test.eff
trunk/data/effects/examples/test2.eff
Added: trunk/data/effects/examples/casting.eff
===================================================================
--- trunk/data/effects/examples/casting.eff (rev 0)
+++ trunk/data/effects/examples/casting.eff 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <textures>
+ <texture name="spark">
+ <file>/this/data/effects/examples/sparkle_03.dds</file>
+ </texture>
+ </textures>
+ <materials>
+ <material name="spark">
+ <texture>spark</texture>
+ </material>
+ </materials>
+ <addon plugin="PSEffects">
+ <effect name="casting">
+ <anchor type="basic" name="pos">
+ <dir>none</dir>
+ </anchor>
+
+ <obj type="spire" name="spark" material="spark" segments="20">
+ <attach>pos</attach>
+ <dir>none</dir>
+ <death>1500</death>
+ <keyFrame time="0">
+ <action name="position" x="0" y="0.01" z="0" />
+ <action name="rotate" x="0" y="0" z="0" />
+ <action name="scale" value="1" />
+ <action name="height" value="0" />
+ <action name="topscale" value="1.1" />
+ <action name="colour" r="10" g="200" b="10" />
+ </keyFrame>
+ <keyFrame time="800">
+ <action name="position" x="0" y="0.01" z="0" />
+ <action name="rotate" x="0" y="0" z="0" />
+ <action name="scale" value="1.5" />
+ <action name="height" value="1" />
+ <action name="topscale" value="1.1" />
+ </keyFrame>
+ <keyFrame time="900">
+ <action name="height" value="0.75" />
+ </keyFrame>
+ <keyFrame time="1200">
+ <action name="rotate" y="360" />
+ <action name="scale" value="1" />
+ <action name="height" value="0.09" />
+ </keyFrame>
+ </obj>
+ <obj type="spire" name="spire2" material="spark" segments="10">
+ <attach>pos</attach>
+ <death>1500</death>
+ <dir>none</dir>
+ <keyFrame time="0">
+ <action name="position" x="0" y="0.01" z="0" />
+ <action name="rotate" x="0" y="0" z="0" />
+ <action name="scale" value="0.5" />
+ <action name="height" value="0" />
+ <action name="topscale" value="1.1" />
+ <action name="colour" r="10" g="200" b="10" />
+ </keyFrame>
+ <keyFrame time="800">
+ <action name="height" value="4" />
+ <action name="topscale" value="1" />
+ </keyFrame>
+ <keyFrame time="1200">
+ <action name="rotate" y="360" />
+ <action name="height" value="0.5" />
+ <action name="topscale" value="3" />
+ </keyFrame>
+ </obj>
+ </effect>
+ </addon>
+</library>
Added: trunk/data/effects/examples/clear.eff
===================================================================
--- trunk/data/effects/examples/clear.eff (rev 0)
+++ trunk/data/effects/examples/clear.eff 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <library>/this/data/effects/examples/clear.part</library>
+ <addon plugin="PSEffects">
+ <effect name="clear">
+ <anchor type="basic" name="pos">
+ </anchor>
+ <anchor type="basic" name="target">
+ <keyFrame time="0">
+ <action name="position" x="0" y="1.5" z="0" />
+ </keyFrame>
+ <keyFrame time="1000">
+ <action name="position" x="0" y="1" z="0" />
+ </keyFrame>
+ <keyFrame time="1500">
+ <action name="position" x="0" y="1" z="0" />
+ </keyFrame>
+ </anchor>
+
+ <obj type="particles" name="clear" fact="clear">
+ <attach>target</attach>
+ <death>3500</death>
+ <mixmode>add</mixmode>
+ <keyFrame time="0">
+ <action name="animate" value="true" />
+ </keyFrame>
+ <keyFrame time="7000">
+ <action name="animate" value="false" />
+ </keyFrame>
+ </obj>
+ </effect>
+ </addon>
+</library>
+
+
Added: trunk/data/effects/examples/clear.part
===================================================================
--- trunk/data/effects/examples/clear.part (rev 0)
+++ trunk/data/effects/examples/clear.part 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <textures>
+ <texture name="clear">
+ <file>/this/data/effects/examples/puff_03.dds</file>
+ </texture>
+ </textures>
+ <materials>
+ <material name="clear">
+ <texture>clear</texture>
+ </material>
+ </materials>
+ <meshfact name="clear">
+ <plugin>crystalspace.mesh.loader.factory.particles</plugin>
+ <params>
+ <material>clear</material>
+
+ <emitter type="sphere">
+ <duration>10</duration>
+ <radius>20</radius>
+ <emissionrate>4</emissionrate>
+ <mass min="1" max="6" />
+ <uniformvelocity />
+ <initialvelocity x="0" y="3" z="0" />
+ <initialttl min="0.1" max="1" />
+ <placement>center</placement>
+ </emitter>
+ <particlesize x="1.5" y="" />
+ <effector type="force">
+ <randomacceleration x="0" y="0" z="0" />
+ </effector>
+
+ <effector type="lincolor">
+ </effector>
+ </params>
+ </meshfact>
+</library>
Added: trunk/data/effects/examples/fire.eff
===================================================================
--- trunk/data/effects/examples/fire.eff (rev 0)
+++ trunk/data/effects/examples/fire.eff 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <library>/this/data/effects/examples/fire.part</library>
+ <addon plugin="PSEffects">
+ <effect name="fire">
+ <anchor type="basic" name="pos">
+ </anchor>
+ <anchor type="basic" name="target">
+ <keyFrame time="0">
+ <action name="position" x="0" y="1.5" z="0" />
+ </keyFrame>
+ <keyFrame time="1000">
+ <action name="position" x="0" y="1" z="0" />
+ <action name="totarget" z=".1" />
+ </keyFrame>
+ <keyFrame time="1500">
+ <action name="position" x="0" y="1" z="0" />
+ <action name="totarget" z=".3" />
+ </keyFrame>
+ <keyFrame time="2000">
+ <action name="position" x="0" y="1" z="0" />
+ <action name="totarget" z=".5" />
+ </keyFrame>
+ <keyFrame time="2500">
+ <action name="position" x="0" y="1" z="0" />
+ <action name="totarget" z=".7" />
+ </keyFrame>
+ <keyFrame time="3500">
+ <action name="position" x="0" y="1" z="0" />
+ <action name="totarget" z="1" />
+ </keyFrame>
+ </anchor>
+
+ <obj type="particles" name="fire" fact="fire">
+ <attach>target</attach>
+ <death>3500</death>
+ <mixmode>add</mixmode>
+ <keyFrame time="0">
+ <action name="animate" value="true" />
+ </keyFrame>
+ <keyFrame time="7000">
+ <action name="animate" value="false" />
+ </keyFrame>
+ </obj>
+ </effect>
+ </addon>
+</library>
+
+
Added: trunk/data/effects/examples/fire.part
===================================================================
--- trunk/data/effects/examples/fire.part (rev 0)
+++ trunk/data/effects/examples/fire.part 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <textures>
+ <texture name="fire">
+ <file>/this/data/effects/examples/puff_01.dds</file>
+ </texture>
+ </textures>
+ <materials>
+ <material name="fire">
+ <texture>fire</texture>
+ </material>
+ </materials>
+ <meshfact name="fire">
+ <plugin>crystalspace.mesh.loader.factory.particles</plugin>
+ <params>
+ <material>fire</material>
+
+ <emitter type="sphere">
+ <duration>10</duration>
+ <radius>20</radius>
+ <emissionrate>4</emissionrate>
+ <mass min="1" max="6" />
+ <uniformvelocity />
+ <initialvelocity x="0" y="3" z="0" />
+ <initialttl min="0.1" max="1" />
+ <placement>center</placement>
+ </emitter>
+ <particlesize x="1.5" y="" />
+ <effector type="force">
+ <randomacceleration x="0" y="0" z="0" />
+ </effector>
+
+ <effector type="lincolor">
+ <color red=".6" green=".4" blue=".5" alpha="1" />
+ </effector>
+ </params>
+ </meshfact>
+</library>
Added: trunk/data/effects/examples/puff.part
===================================================================
--- trunk/data/effects/examples/puff.part (rev 0)
+++ trunk/data/effects/examples/puff.part 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <textures>
+ <texture name="sparkle">
+ <file>/this/data/effects/examples/puff_02.dds</file>
+ </texture>
+ </textures>
+ <materials>
+ <material name="sparkle">
+ <texture>sparkle</texture>
+ </material>
+ </materials>
+ <meshfact name="sparkle">
+ <plugin>crystalspace.mesh.loader.factory.particles</plugin>
+ <params>
+ <material>sparkle</material>
+
+ <emitter type="sphere">
+ <duration>10</duration>
+ <radius></radius>
+ <emissionrate>5</emissionrate>
+ <mass min="1" max="6" />
+ <uniformvelocity />
+ <initialvelocity x="0" y="1" z="0" />
+ <initialttl min="1" max="2" />
+ <placement>volume</placement>
+ </emitter>
+ <particlesize x="1" y="" />
+ <effector type="force">
+ <randomacceleration x="0" y="0" z="0" />
+ </effector>
+
+ <effector type="lincolor">
+ <color red="1" green="1" blue="1" alpha="1" />
+ </effector>
+ </params>
+ </meshfact>
+</library>
Added: trunk/data/effects/examples/puff_01.dds
===================================================================
(Binary files differ)
Property changes on: trunk/data/effects/examples/puff_01.dds
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/effects/examples/puff_02.dds
===================================================================
(Binary files differ)
Property changes on: trunk/data/effects/examples/puff_02.dds
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/effects/examples/puff_03.dds
===================================================================
(Binary files differ)
Property changes on: trunk/data/effects/examples/puff_03.dds
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/effects/examples/sparkle.part
===================================================================
--- trunk/data/effects/examples/sparkle.part (rev 0)
+++ trunk/data/effects/examples/sparkle.part 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<library>
+ <textures>
+ <texture name="sparkle">
+ <file>/this/data/effects/examples/sparkle_02.dds</file>
+ </texture>
+ </textures>
+ <materials>
+ <material name="sparkle">
+ <texture>sparkle</texture>
+ </material>
+ </materials>
+ <meshfact name="sparkle">
+ <plugin>crystalspace.mesh.loader.factory.particles</plugin>
+ <params>
+ <material>sparkle</material>
+
+ <emitter type="sphere">
+ <duration>10</duration>
+ <radius></radius>
+ <emissionrate>5</emissionrate>
+ <mass min="1" max="6" />
+ <uniformvelocity />
+ <initialvelocity x="0" y="1" z="0" />
+ <initialttl min="1" max="2" />
+ <placement>volume</placement>
+ </emitter>
+ <particlesize x="1" y="" />
+ <effector type="force">
+ <randomacceleration x="0" y="0" z="0" />
+ </effector>
+
+ <effector type="lincolor">
+ <color red="1" green="1" blue="1" alpha="1" />
+ </effector>
+ </params>
+ </meshfact>
+</library>
Added: trunk/data/effects/examples/sparkle_02.dds
===================================================================
(Binary files differ)
Property changes on: trunk/data/effects/examples/sparkle_02.dds
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/effects/examples/sparkle_03.dds
===================================================================
(Binary files differ)
Property changes on: trunk/data/effects/examples/sparkle_03.dds
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/effects/examples/test.eff
===================================================================
--- trunk/data/effects/examples/test.eff (rev 0)
+++ trunk/data/effects/examples/test.eff 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+ <library>
+ <library>/this/data/effects/examples/sparkle.part</library>
+ <addon plugin="PSEffects">
+ <effect name="test_">
+ <anchor type="basic" name="pos">
+ </anchor>
+ <anchor type="basic" name="target">
+ <keyFrame time="0">
+ <action name="position" x="0" y="1"/>
+ <action name="totarget" z=".1" />
+ </keyFrame>
+ <keyFrame time="200">
+ <action name="position" x="0" y="1"/>
+ <action name="totarget" z=".5" />
+ </keyFrame>
+ <keyFrame time="500">
+ <action name="position" x="0" y="1"/>
+ <action name="totarget" z="1" />
+ </keyFrame>
+ </anchor>
+
+ <obj type="spire" name="sparkle" material="sparkle" segments="30">
+ <attach>pos</attach>
+ <dir>none</dir>
+ <birth>0</birth>
+ <death>3000</death>
+ <keyFrame time="0">
+ <action name="position" x="0" y="0.3" z="0" />
+ <action name="scale" value="0.9" />
+ <action name="height" value="0.8" />
+ <action name="topscale" value="1.0" />
+ <action name="colour" r="100" g="140" b="110" />
+ </keyFrame>
+ <keyFrame time="2000">
+ <action name="spin" x="0" y="360" z="0" />
+ </keyFrame>
+ </obj>
+ </effect>
+ </addon>
+</library>
+
+
Added: trunk/data/effects/examples/test2.eff
===================================================================
--- trunk/data/effects/examples/test2.eff (rev 0)
+++ trunk/data/effects/examples/test2.eff 2007-11-15 17:35:54 UTC (rev 272)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+ <library>
+ <library>/this/data/effects/examples/puff.part</library>
+<materials>
+ <material name="sparkle">
+ <texture>sparkle</texture>
+ </material>
+ </materials>
+ <addon plugin="PSEffects">
+ <effect name="puff">
+ <anchor type="basic" name="pos">
+ </anchor>
+
+ <obj type="spire" name="test" material="sparkle" fact="sparkle" segments="20">
+ <attach>pos</attach>
+ <death>500</death>
+ <mixmode>add</mixmode>
+ <keyFrame time="0">
+ <action name="animate" value="true" />
+ </keyFrame>
+ <keyFrame time="500">
+ <action name="animate" value="false" />
+ </keyFrame>
+ </obj>
+ </effect>
+ </addon>
+</library>
+
+
Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt 2007-11-15 11:20:52 UTC (rev 271)
+++ trunk/docs/history.txt 2007-11-15 17:35:54 UTC (rev 272)
@@ -1,3 +1,6 @@
+*** 2007-11-15 by Sasha Levin
+- Added lots of effects for testing on svn.
+
*** 2007-11-15 by Kenny Graunke
- Fixed PBT#2086, "Flooding does not take recipient into consideration."
Also greatly simplified the anti-flood code.
Modified: trunk/src/server/database/mysql/spells.sql
===================================================================
--- trunk/src/server/database/mysql/spells.sql 2007-11-15 11:20:52 UTC (rev 271)
+++ trunk/src/server/database/mysql/spells.sql 2007-11-15 17:35:54 UTC (rev 272)
@@ -34,10 +34,10 @@
# Dumping data for table 'spells'
#
-INSERT INTO spells VALUES("1","Summon Missile","1","1","crystal_casting","energy_arrow","","A wooden arrow is summoned and thrown at the target dealing 6*P damages.","1","cast Summon Missile","","0","-1","2","288","163","1.000");
-INSERT INTO spells VALUES("2","Life Infusion","1","1","test","test","","By means of this spell the wizard is able to instill pure energy in a creature. The energy, which has healing effects, is less powerful but similar to the energy of the Great Crystal. It can be cast on the wizard or on another character in touch range.","0","cast Life Infusion","","0","-1","5","24","164","1.000");
-INSERT INTO spells VALUES("3","Gust Of Wind","1","1","test","test","","AoE Example. A nasty smelling breeze passes by you.","0","cast Gust of Wind","","0","-1","20","32","165","1.500");
-INSERT INTO spells VALUES("4","Defensive Wind","1","1","test","test","","Buff Example. A calming effect washes over you.","0","cast Defensive Wind","","0","-1","50","24","166","1.500");
-INSERT INTO spells VALUES("5","Summon Creature","5","1","test","test","","The caster summons a creature as it's familiar.","0","cast Summon Creature","","0","-1","50","24","166","1.500");
-INSERT INTO spells VALUES("6","Fire Warts","3","1","red_casting","","","DoT Example. This spell will cause burning sores appear all over your enemies body, searing their flesh.","0","cast Fire Warts","","0","-1","20","288","165","1.500");
-INSERT INTO spells VALUES("7","Gem of Clarity","1","1","","","","Block Example. The caster will feel very clear minded.","0","GemOfClarity","","0","-1","20","8","165","1.500");
+INSERT INTO spells VALUES("1","Summon Missile","1","1","casting","test_","","A wooden arrow is summoned and thrown at the target dealing 6*P damages.","1","cast Summon Missile","","0","-1","2","288","163","1.000");
+INSERT INTO spells VALUES("2","Life Infusion","1","1","casting","clear","","By means of this spell the wizard is able to instill pure energy in a creature. The energy, which has healing effects, is less powerful but similar to the energy of the Great Crystal. It can be cast on the wizard or on another character in touch range.","0","cast Life Infusion","","0","-1","5","24","164","1.000");
+INSERT INTO spells VALUES("3","Gust Of Wind","1","1","casting","puff","","AoE Example. A nasty smelling breeze passes by you.","0","cast Gust of Wind","","0","-1","20","32","165","1.500");
+INSERT INTO spells VALUES("4","Defensive Wind","1","1","casting","puff","","Buff Example. A calming effect washes over you.","0","cast Defensive Wind","","0","-1","50","24","166","1.500");
+INSERT INTO spells VALUES("5","Summon Creature","5","1","casting","clear","","The caster summons a creature as it's familiar.","0","cast Summon Creature","","0","-1","50","24","166","1.500");
+INSERT INTO spells VALUES("6","Fire Warts","3","1","casting","fire","","DoT Example. This spell will cause burning sores appear all over your enemies body, searing their flesh.","0","cast Fire Warts","","0","-1","20","288","165","1.500");
+INSERT INTO spells VALUES("7","Gem of Clarity","1","1","casting","clear","","Block Example. The caster will feel very clear minded.","0","GemOfClarity","","0","-1","20","8","165","1.500");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|