From fe4890e0b2a1d3f49690dca2d00ba7d37ed33a08 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Fri, 21 May 2021 10:49:11 +0000
Subject: [PATCH] Improved particles by @wowgetoffyourcellphone

This was SVN commit r25496.
---
 .../public/art/actors/particle/bigflame.xml   |  9 +++++
 .../actors/particle/cloud_moving_small.xml    | 10 ++++++
 .../particle/falling_leaf_cherryblossom.xml   |  9 +++++
 .../public/art/actors/particle/snow_mist.xml  |  8 ++---
 .../public/art/actors/particle/snow_storm.xml |  9 +++++
 .../data/mods/public/art/particles/cloud.xml  | 25 +++++++------
 .../art/particles/dust_storm_reddish.xml      | 36 ++++++++-----------
 .../art/particles/leaf_cherryblossom.xml      | 17 +++++++++
 .../mods/public/art/particles/snow_01.xml     | 25 ++++++-------
 .../mods/public/art/particles/snow_02.xml     | 25 ++++++-------
 .../mods/public/art/particles/snow_03.xml     | 25 ++++++-------
 .../mods/public/art/particles/snow_04.xml     | 25 ++++++-------
 .../public/art/particles/snow_storm_01.xml    | 16 +++++++++
 .../tower_artillery_impact_smoke_01.xml       |  5 +--
 .../art/textures/particles/blowing_snow.png   |  4 +--
 .../textures/particles/leaf_cherryblossom.png |  3 ++
 .../art/textures/particles/snowflake_01.png   |  4 +--
 .../art/textures/particles/snowflake_02.png   |  4 +--
 .../art/textures/particles/snowflakes_02.png  |  3 ++
 19 files changed, 169 insertions(+), 93 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/particle/bigflame.xml
 create mode 100644 binaries/data/mods/public/art/actors/particle/cloud_moving_small.xml
 create mode 100644 binaries/data/mods/public/art/actors/particle/falling_leaf_cherryblossom.xml
 create mode 100644 binaries/data/mods/public/art/actors/particle/snow_storm.xml
 create mode 100644 binaries/data/mods/public/art/particles/leaf_cherryblossom.xml
 create mode 100644 binaries/data/mods/public/art/particles/snow_storm_01.xml
 create mode 100644 binaries/data/mods/public/art/textures/particles/leaf_cherryblossom.png
 create mode 100644 binaries/data/mods/public/art/textures/particles/snowflakes_02.png

diff --git a/binaries/data/mods/public/art/actors/particle/bigflame.xml b/binaries/data/mods/public/art/actors/particle/bigflame.xml
new file mode 100644
index 0000000000..6d2f1fe4ba
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/particle/bigflame.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="bigflame.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/particle/cloud_moving_small.xml b/binaries/data/mods/public/art/actors/particle/cloud_moving_small.xml
new file mode 100644
index 0000000000..c7035b5433
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/particle/cloud_moving_small.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <float/>
+  <group>
+    <variant name="Base">
+      <particles file="cloud.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/particle/falling_leaf_cherryblossom.xml b/binaries/data/mods/public/art/actors/particle/falling_leaf_cherryblossom.xml
new file mode 100644
index 0000000000..8d64f73dc8
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/particle/falling_leaf_cherryblossom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Falling Green Leaf">
+      <particles file="leaf_cherryblossom.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/particle/snow_mist.xml b/binaries/data/mods/public/art/actors/particle/snow_mist.xml
index 47eb887db7..8c7945c260 100644
--- a/binaries/data/mods/public/art/actors/particle/snow_mist.xml
+++ b/binaries/data/mods/public/art/actors/particle/snow_mist.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <group>
-    <variant frequency="1" name="Rain Shower">
+    <variant frequency="1" name="Snow Shower">
       <particles file="snow_01.xml"/>
     </variant>
-    <variant frequency="1" name="Rain Shower 2">
+    <variant frequency="1" name="Snow Shower 2">
       <particles file="snow_02.xml"/>
     </variant>
-    <variant frequency="1" name="Rain Shower 3">
+    <variant frequency="1" name="Snow Shower 3">
       <particles file="snow_03.xml"/>
     </variant>
-    <variant frequency="1" name="Rain Shower 4">
+    <variant frequency="1" name="Snow Shower 4">
       <particles file="snow_04.xml"/>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/particle/snow_storm.xml b/binaries/data/mods/public/art/actors/particle/snow_storm.xml
new file mode 100644
index 0000000000..8fa2211918
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/particle/snow_storm.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="snow_storm_01.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/particles/cloud.xml b/binaries/data/mods/public/art/particles/cloud.xml
index c85b71b3e1..9a7fa6be75 100644
--- a/binaries/data/mods/public/art/particles/cloud.xml
+++ b/binaries/data/mods/public/art/particles/cloud.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-  <texture>art/textures/particles/cloud_1_512.png</texture>
-  <blend mode="over"/>
-  <use_relative_velocity/>
-  <constant name="emissionrate" value="1.0"/>
-  <constant name="lifetime" value="0.0"/>
-  <uniform name="position.x" min="5.0" max="0.0"/>
-  <uniform name="position.z" min="5.0" max="0.0"/>
-  <constant name="position.y" value="2.0"/>
-  <constant name="size" value="5.0"/>
-  <force x="4"/>
-  <force z="0"/>
+    <texture>art/textures/particles/cloud_1_512.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="0.075"/>
+    <uniform name="lifetime" min="50.0" max="100.0"/>
+    <uniform name="position.x" min="-1.0" max="5.0"/>
+    <uniform name="position.z" min="-1.0" max="1.0"/>
+    <constant name="position.y" value="120.0"/>
+    <uniform name="angle" min="-10" max="10"/>
+    <uniform name="velocity.x" min="0.75" max="1.0"/>
+    <uniform name="velocity.y" min="-0.5" max="0.75"/>
+    <uniform name="velocity.angle" min="-0.05" max="0.05"/>
+    <uniform name="size" min="25.0" max="60.0"/>
+    <uniform name="size.growthRate" min="-0.5" max="1.0"/>
 </particles>
diff --git a/binaries/data/mods/public/art/particles/dust_storm_reddish.xml b/binaries/data/mods/public/art/particles/dust_storm_reddish.xml
index 4b584f2cb9..9e5edc125b 100644
--- a/binaries/data/mods/public/art/particles/dust_storm_reddish.xml
+++ b/binaries/data/mods/public/art/particles/dust_storm_reddish.xml
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-
-	<texture>art/textures/particles/blowing_sand.png</texture>
-	<blend mode="over"/>
-
-	<start_full/>
-
-	<constant name="emissionrate" value="2.0"/>
-	<uniform name="lifetime" min="15.0" max="30.0"/>
-
-	<uniform name="position.x" min="-50.0" max="50.0"/>
-	<uniform name="position.z" min="-50.0" max="50.0"/>
-	<constant name="position.y" value="3.0"/>
-
-	<uniform name="velocity.x" min="1.0" max="2.0"/>
-	<uniform name="velocity.angle" min="-0.1" max="0.15"/>
-	<uniform name="size" min="20.0" max="40.0"/>
-	
-	<uniform name="color.r" min="1.0" max="0.9"/>
-	<uniform name="color.g" min="0.6" max="0.6"/>
-	<uniform name="color.b" min="0.4" max="0.4"/>
-
+    <texture>art/textures/particles/blowing_sand.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="2.0"/>
+    <uniform name="lifetime" min="15.0" max="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="3.0"/>
+    <uniform name="velocity.x" min="1.0" max="2.0"/>
+    <uniform name="velocity.angle" min="-0.1" max="0.15"/>
+    <uniform name="size" min="20.0" max="40.0"/>
+    <uniform name="color.r" min="1.0" max="1.0"/>
+    <uniform name="color.g" min="0.25" max="0.25"/>
+    <uniform name="color.b" min="0.20" max="0.20"/>
 </particles>
-
diff --git a/binaries/data/mods/public/art/particles/leaf_cherryblossom.xml b/binaries/data/mods/public/art/particles/leaf_cherryblossom.xml
new file mode 100644
index 0000000000..6b04f60cdc
--- /dev/null
+++ b/binaries/data/mods/public/art/particles/leaf_cherryblossom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<particles>
+    <texture>art/textures/particles/leaf_cherryblossom.png</texture>
+    <blend mode="over"/>
+    <constant name="emissionrate" value="1.0"/>
+    <uniform name="lifetime" min="3.0" max="4.5"/>
+    <uniform name="position.x" min="-5.0" max="5.0"/>
+    <uniform name="position.z" min="-5.0" max="5.0"/>
+    <uniform name="position.y" min="6.0" max="8.0"/>
+    <uniform name="angle" min="-3.14" max="3.14"/>
+    <uniform name="velocity.x" min="-0.5" max="0.5"/>
+    <uniform name="velocity.y" min="-0.25" max="0.25"/>
+    <uniform name="velocity.z" min="-1.0" max="-1.0"/>
+    <uniform name="velocity.angle" min="-1.5" max="1.5"/>
+    <uniform name="size" min="0.25" max="0.75"/>
+    <force y="-1.50"/>
+</particles>
diff --git a/binaries/data/mods/public/art/particles/snow_01.xml b/binaries/data/mods/public/art/particles/snow_01.xml
index ee2346101a..884e6507c4 100644
--- a/binaries/data/mods/public/art/particles/snow_01.xml
+++ b/binaries/data/mods/public/art/particles/snow_01.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-  <texture>art/textures/particles/snowflake_01.png</texture>
-  <blend mode="over"/>
-  <start_full/>
-  <constant name="emissionrate" value="900.0"/>
-  <constant name="lifetime" value="10.0"/>
-  <uniform name="position.x" min="-500.0" max="50.0"/>
-  <uniform name="position.z" min="-500.0" max="50.0"/>
-  <constant name="position.y" value="75.0"/>
-  <constant name="size" value="0.4"/>
-  <force y="-4"/>
-  <force x="0"/>
-  <force z="0"/>
+    <texture>art/textures/particles/snowflake_01.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="300.0"/>
+    <constant name="lifetime" value="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="120.0"/>
+    <constant name="size" value="0.2"/>
+    <uniform name="velocity.angle" min="-0.5" max="0.5"/>
+    <force y="-0.5"/>
+    <force x="0.5"/>
+    <force z="0.5"/>
 </particles>
diff --git a/binaries/data/mods/public/art/particles/snow_02.xml b/binaries/data/mods/public/art/particles/snow_02.xml
index 151e68c354..9e5c3ba84b 100644
--- a/binaries/data/mods/public/art/particles/snow_02.xml
+++ b/binaries/data/mods/public/art/particles/snow_02.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-  <texture>art/textures/particles/snowflake_02.png</texture>
-  <blend mode="over"/>
-  <start_full/>
-  <constant name="emissionrate" value="900.0"/>
-  <constant name="lifetime" value="10.0"/>
-  <uniform name="position.x" min="-500.0" max="50.0"/>
-  <uniform name="position.z" min="-500.0" max="50.0"/>
-  <constant name="position.y" value="75.0"/>
-  <constant name="size" value="0.3"/>
-  <force y="-4"/>
-  <force x="0"/>
-  <force z="0"/>
+    <texture>art/textures/particles/snowflake_02.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="300.0"/>
+    <constant name="lifetime" value="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="120.0"/>
+    <constant name="size" value="0.2"/>
+    <uniform name="velocity.angle" min="-0.5" max="0.5"/>
+    <force y="-0.5"/>
+    <force x="-0.5"/>
+    <force z="-0.5"/>
 </particles>
diff --git a/binaries/data/mods/public/art/particles/snow_03.xml b/binaries/data/mods/public/art/particles/snow_03.xml
index 3abccaafb0..d0c8bf3b8d 100644
--- a/binaries/data/mods/public/art/particles/snow_03.xml
+++ b/binaries/data/mods/public/art/particles/snow_03.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-  <texture>art/textures/particles/snowflake_01.png</texture>
-  <blend mode="over"/>
-  <start_full/>
-  <constant name="emissionrate" value="900.0"/>
-  <constant name="lifetime" value="10.0"/>
-  <uniform name="position.x" min="-500.0" max="50.0"/>
-  <uniform name="position.z" min="-500.0" max="50.0"/>
-  <constant name="position.y" value="75.0"/>
-  <constant name="size" value="0.3"/>
-  <force y="-3"/>
-  <force x="0"/>
-  <force z="0"/>
+    <texture>art/textures/particles/snowflake_01.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="300.0"/>
+    <constant name="lifetime" value="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="120.0"/>
+    <constant name="size" value="0.2"/>
+    <uniform name="velocity.angle" min="-0.5" max="0.5"/>
+    <force y="-0.5"/>
+    <force x="0.5"/>
+    <force z="-0.5"/>
 </particles>
diff --git a/binaries/data/mods/public/art/particles/snow_04.xml b/binaries/data/mods/public/art/particles/snow_04.xml
index 7d61521130..6ae3d87ca3 100644
--- a/binaries/data/mods/public/art/particles/snow_04.xml
+++ b/binaries/data/mods/public/art/particles/snow_04.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
-  <texture>art/textures/particles/snowflake_02.png</texture>
-  <blend mode="over"/>
-  <start_full/>
-  <constant name="emissionrate" value="900.0"/>
-  <constant name="lifetime" value="10.0"/>
-  <uniform name="position.x" min="-500.0" max="50.0"/>
-  <uniform name="position.z" min="-500.0" max="50.0"/>
-  <constant name="position.y" value="75.0"/>
-  <constant name="size" value="0.3"/>
-  <force y="-3"/>
-  <force x="0"/>
-  <force z="0"/>
+    <texture>art/textures/particles/snowflake_02.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="300.0"/>
+    <constant name="lifetime" value="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="120.0"/>
+    <constant name="size" value="0.2"/>
+    <uniform name="velocity.angle" min="-0.5" max="0.5"/>
+    <force y="-0.75"/>
+    <force x="-1.5"/>
+    <force z="1.5"/>
 </particles>
diff --git a/binaries/data/mods/public/art/particles/snow_storm_01.xml b/binaries/data/mods/public/art/particles/snow_storm_01.xml
new file mode 100644
index 0000000000..06ecb28b0e
--- /dev/null
+++ b/binaries/data/mods/public/art/particles/snow_storm_01.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<particles>
+    <texture>art/textures/particles/snowflakes_02.png</texture>
+    <blend mode="over"/>
+    <start_full/>
+    <constant name="emissionrate" value="200.0"/>
+    <constant name="lifetime" value="30.0"/>
+    <uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="120.0"/>
+    <uniform name="size" min="4.0" max="4.50"/>
+    <uniform name="velocity.angle" min="-0.5" max="0.5"/>
+    <force y="-0.5"/>
+    <force x="-0.5"/>
+    <force z="-0.5"/>
+</particles>
diff --git a/binaries/data/mods/public/art/particles/tower_artillery_impact_smoke_01.xml b/binaries/data/mods/public/art/particles/tower_artillery_impact_smoke_01.xml
index 76502975d5..8d786330f6 100644
--- a/binaries/data/mods/public/art/particles/tower_artillery_impact_smoke_01.xml
+++ b/binaries/data/mods/public/art/particles/tower_artillery_impact_smoke_01.xml
@@ -5,10 +5,11 @@
     <blend mode="over"/>
     <constant name="emissionrate" value="4.0"/>
     <constant name="lifetime" value="1"/>
-    <constant name="size" value="8"/>
+    <constant name="size" value="5"/>
+    <constant name="size.growthRate" value="2.0"/>
     <uniform name="angle" min="-3.14" max="3.14"/>
     <constant name="position.x" value="-2"/>
-    <constant name="velocity.y" value="7"/>
+    <constant name="velocity.y" value="6"/>
     <constant name="color.r" value="0.4" />
     <constant name="color.g" value="0.2"/>
     <constant name="color.b" value="0.16"/>
diff --git a/binaries/data/mods/public/art/textures/particles/blowing_snow.png b/binaries/data/mods/public/art/textures/particles/blowing_snow.png
index c27f0ddba4..80ae9f3546 100644
--- a/binaries/data/mods/public/art/textures/particles/blowing_snow.png
+++ b/binaries/data/mods/public/art/textures/particles/blowing_snow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8670901500be204311d8c612b1e35091a799672008e8ae8dadfe197eed99698
-size 58346
+oid sha256:d6da6b6013844e25cf9e8b93149401833dd4496589d54b2a748f8dac7f55d834
+size 60418
diff --git a/binaries/data/mods/public/art/textures/particles/leaf_cherryblossom.png b/binaries/data/mods/public/art/textures/particles/leaf_cherryblossom.png
new file mode 100644
index 0000000000..f99d165299
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/particles/leaf_cherryblossom.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b85848762346e0d3dd82a387fd82ec918b691ee5efcf3277d1818252f2d4a89
+size 15762
diff --git a/binaries/data/mods/public/art/textures/particles/snowflake_01.png b/binaries/data/mods/public/art/textures/particles/snowflake_01.png
index 660de34e3a..d073c564c3 100644
--- a/binaries/data/mods/public/art/textures/particles/snowflake_01.png
+++ b/binaries/data/mods/public/art/textures/particles/snowflake_01.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51a43b2b3ade294753b1ad8e29caa21dc545352bfc63256a52cb078b9ccb43ae
-size 21598
+oid sha256:9122be2c90538e85644b0acb0926b018475acf4df693a55d4a046a166874478f
+size 10923
diff --git a/binaries/data/mods/public/art/textures/particles/snowflake_02.png b/binaries/data/mods/public/art/textures/particles/snowflake_02.png
index 69c0ae9146..8cb35f9b2b 100644
--- a/binaries/data/mods/public/art/textures/particles/snowflake_02.png
+++ b/binaries/data/mods/public/art/textures/particles/snowflake_02.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:158c748062caff10607fadcc946a0bd9f1135fd68523a5719dc27ef090b6910b
-size 6763
+oid sha256:2f20c6470d0f71fbc49703fd8e564d3e09dc69a1fc802cc4294ec0d435dd48db
+size 10292
diff --git a/binaries/data/mods/public/art/textures/particles/snowflakes_02.png b/binaries/data/mods/public/art/textures/particles/snowflakes_02.png
new file mode 100644
index 0000000000..0d478fa9b1
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/particles/snowflakes_02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1db75ab443cef91bd51901d0921353ee3265f5370ee244dab1744fddf8e3542b
+size 200452