vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(d9829ac) v0.9.4.0

Browse Source
This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Particles/DecalManager.cs
+36 -9
View File
@@ -1,6 +1,7 @@
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using System.Xml.Linq;
using System.Linq;
namespace Barotrauma.Particles
{
@@ -10,21 +11,47 @@ namespace Barotrauma.Particles
public DecalManager()
{
prefabs = new Dictionary<string, DecalPrefab>();
var decalElements = new Dictionary<string, XElement>();
foreach (string configFile in GameMain.Instance.GetFilesOfType(ContentType.Decals))
{
XDocument doc = XMLExtensions.TryLoadXml(configFile);
if (doc == null || doc.Root == null) continue;
if (doc == null) { continue; }
foreach (XElement element in doc.Root.Elements())
bool allowOverriding = false;
var mainElement = doc.Root;
if (doc.Root.IsOverride())
{
if (prefabs.ContainsKey(element.Name.ToString()))
{
DebugConsole.ThrowError("Error in " + configFile + "! Each decal prefab must have a unique name.");
continue;
}
prefabs.Add(element.Name.ToString(), new DecalPrefab(element));
mainElement = doc.Root.FirstElement();
allowOverriding = true;
}
foreach (XElement sourceElement in mainElement.Elements())
{
var element = sourceElement.IsOverride() ? sourceElement.FirstElement() : sourceElement;
string name = element.Name.ToString().ToLowerInvariant();
if (decalElements.ContainsKey(name))
{
if (allowOverriding || sourceElement.IsOverride())
{
DebugConsole.NewMessage($"Overriding the existing decal prefab '{name}' using the file '{configFile}'", Color.Yellow);
decalElements.Remove(name);
}
else
{
DebugConsole.ThrowError($"Error in '{configFile}': Duplicate decal prefab '{name}' found in '{configFile}'! Each decal prefab must have a unique name. " +
"Use <override></override> tags to override prefabs.");
continue;
}
}
decalElements.Add(name, element);
}
}
//prefabs = decalElements.ToDictionary(d => d.Key, d => new DecalPrefab(d.Value));
prefabs = new Dictionary<string, DecalPrefab>();
foreach (var kvp in decalElements)
{
prefabs.Add(kvp.Key, new DecalPrefab(kvp.Value));
}
}
Barotrauma/BarotraumaClient/Source/Particles/ParticleManager.cs
+36 -10
View File
@@ -63,22 +63,48 @@ namespace Barotrauma.Particles
public void LoadPrefabs()
{
prefabs = new Dictionary<string, ParticlePrefab>();
var particleElements = new Dictionary<string, XElement>();
foreach (string configFile in GameMain.Instance.GetFilesOfType(ContentType.Particles))
{
XDocument doc = XMLExtensions.TryLoadXml(configFile);
if (doc == null || doc.Root == null) continue;
if (doc == null) { continue; }
foreach (XElement element in doc.Root.Elements())
bool allowOverriding = false;
var mainElement = doc.Root;
if (doc.Root.IsOverride())
{
if (prefabs.ContainsKey(element.Name.ToString()))
{
DebugConsole.ThrowError("Error in " + configFile + "! Each particle prefab must have a unique name.");
continue;
}
prefabs.Add(element.Name.ToString(), new ParticlePrefab(element));
mainElement = doc.Root.FirstElement();
allowOverriding = true;
}
}
foreach (XElement sourceElement in mainElement.Elements())
{
var element = sourceElement.IsOverride() ? sourceElement.FirstElement() : sourceElement;
string name = element.Name.ToString().ToLowerInvariant();
if (particleElements.ContainsKey(name))
{
if (allowOverriding || sourceElement.IsOverride())
{
DebugConsole.NewMessage($"Overriding the existing particle prefab '{name}' using the file '{configFile}'", Color.Yellow);
particleElements.Remove(name);
}
else
{
DebugConsole.ThrowError($"Error in '{configFile}': Duplicate particle prefab '{name}' found in '{configFile}'! Each particle prefab must have a unique name. " +
"Use <override></override> tags to override prefabs.");
continue;
}
}
particleElements.Add(name, element);
}
}
//prefabs = particleElements.ToDictionary(p => p.Key, p => new ParticlePrefab(p.Value));
prefabs = new Dictionary<string, ParticlePrefab>();
foreach (var kvp in particleElements)
{
prefabs.Add(kvp.Key, new ParticlePrefab(kvp.Value));
}
}
public Particle CreateParticle(string prefabName, Vector2 position, float angle, float speed, Hull hullGuess = null)
Barotrauma/BarotraumaClient/Source/Particles/ParticlePrefab.cs
+30 -30
View File
@@ -17,12 +17,12 @@ namespace Barotrauma.Particles
private set;
}
[Editable(0.0f, float.MaxValue, ToolTip = "How many seconds the particle remains alive."), Serialize(5.0f, false)]
[Editable(0.0f, float.MaxValue), Serialize(5.0f, false, description: "How many seconds the particle remains alive.")]
public float LifeTime { get; private set; }
[Editable(ToolTip = "How long it takes for the particle to appear after spawning it."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "How long it takes for the particle to appear after spawning it.")]
public float StartDelayMin { get; private set; }
[Editable(ToolTip = "How long it takes for the particle to appear after spawning it."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "How long it takes for the particle to appear after spawning it.")]
public float StartDelayMax { get; private set; }
//movement -----------------------------------------
@@ -57,7 +57,7 @@ namespace Barotrauma.Particles
private float startRotationMin;
public float StartRotationMinRad { get; private set; }
[Editable(ToolTip = "The minimum initial rotation of the particle (in degrees)."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "The minimum initial rotation of the particle (in degrees).")]
public float StartRotationMin
{
get { return startRotationMin; }
@@ -71,7 +71,7 @@ namespace Barotrauma.Particles
private float startRotationMax;
public float StartRotationMaxRad { get; private set; }
[Editable(ToolTip = "The maximum initial rotation of the particle (in degrees)."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "The maximum initial rotation of the particle (in degrees).")]
public float StartRotationMax
{
get { return startRotationMax; }
@@ -82,19 +82,19 @@ namespace Barotrauma.Particles
}
}
[Editable(ToolTip = "Should the particle face the direction it's moving towards."), Serialize(false, false)]
[Editable, Serialize(false, false, description: "Should the particle face the direction it's moving towards.")]
public bool RotateToDirection { get; private set; }
[Editable(ToolTip = "Drag applied to the particle when it's moving through air."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "Drag applied to the particle when it's moving through air.")]
public float Drag { get; private set; }
[Editable(ToolTip = "Drag applied to the particle when it's moving through water."), Serialize(0.0f, false)]
[Editable, Serialize(0.0f, false, description: "Drag applied to the particle when it's moving through water.")]
public float WaterDrag { get; private set; }
private Vector2 velocityChange;
public Vector2 VelocityChangeDisplay { get; private set; }
[Editable(ToolTip = "How much the velocity of the particle changes per second."), Serialize("0.0,0.0", false)]
[Editable, Serialize("0.0,0.0", false, description: "How much the velocity of the particle changes per second.")]
public Vector2 VelocityChange
{
get { return velocityChange; }
@@ -108,7 +108,7 @@ namespace Barotrauma.Particles
private Vector2 velocityChangeWater;
public Vector2 VelocityChangeWaterDisplay { get; private set; }
[Editable(ToolTip = "How much the velocity of the particle changes per second when in water."), Serialize("0.0,0.0", false)]
[Editable, Serialize("0.0,0.0", false, description: "How much the velocity of the particle changes per second when in water.")]
public Vector2 VelocityChangeWater
{
get { return velocityChangeWater; }
@@ -119,62 +119,62 @@ namespace Barotrauma.Particles
}
}
[Editable(0.0f, 10000.0f, ToolTip = "Drag applied to the particle when it's moving through water."), Serialize(0.0f, false)]
[Editable(0.0f, 10000.0f), Serialize(0.0f, false, description: "Drag applied to the particle when it's moving through water.")]
public float CollisionRadius { get; private set; }
[Editable(ToolTip = "Does the particle collide with the walls of the submarine and the level."), Serialize(false, false)]
[Editable, Serialize(false, false, description: "Does the particle collide with the walls of the submarine and the level.")]
public bool UseCollision { get; private set; }
[Editable(ToolTip = "Does the particle disappear when it collides with something."), Serialize(false, false)]
[Editable, Serialize(false, false, description: "Does the particle disappear when it collides with something.")]
public bool DeleteOnCollision { get; private set; }
[Editable(0.0f, 1.0f, ToolTip = "The friction coefficient of the particle, i.e. how much it slows down when it's sliding against a surface."), Serialize(0.5f, false)]
[Editable(0.0f, 1.0f), Serialize(0.5f, false, description: "The friction coefficient of the particle, i.e. how much it slows down when it's sliding against a surface.")]
public float Friction { get; private set; }
[Editable(0.0f, 1.0f, ToolTip = "How much of the particle's velocity is conserved when it collides with something, i.e. the \"bounciness\" of the particle. (1.0 = the particle stops completely).")]
[Serialize(0.5f, false)]
[Editable(0.0f, 1.0f)]
[Serialize(0.5f, false, description: "How much of the particle's velocity is conserved when it collides with something, i.e. the \"bounciness\" of the particle. (1.0 = the particle stops completely).")]
public float Restitution { get; private set; }
//size -----------------------------------------
[Editable(ToolTip = "The minimum initial size of the particle."), Serialize("1.0,1.0", false)]
[Editable, Serialize("1.0,1.0", false, description: "The minimum initial size of the particle.")]
public Vector2 StartSizeMin { get; private set; }
[Editable(ToolTip = "The maximum initial size of the particle."), Serialize("1.0,1.0", false)]
[Editable, Serialize("1.0,1.0", false, description: "The maximum initial size of the particle.")]
public Vector2 StartSizeMax { get; private set; }
[Editable(ToolTip = "How much the size of the particle changes per second. The rate of growth for each particle is randomize between SizeChangeMin and SizeChangeMax.")]
[Serialize("0.0,0.0", false)]
[Editable]
[Serialize("0.0,0.0", false, description: "How much the size of the particle changes per second. The rate of growth for each particle is randomize between SizeChangeMin and SizeChangeMax.")]
public Vector2 SizeChangeMin { get; private set; }
[Editable(ToolTip = "How much the size of the particle changes per second. The rate of growth for each particle is randomize between SizeChangeMin and SizeChangeMax.")]
[Serialize("0.0,0.0", false)]
[Editable]
[Serialize("0.0,0.0", false, description: "How much the size of the particle changes per second. The rate of growth for each particle is randomize between SizeChangeMin and SizeChangeMax.")]
public Vector2 SizeChangeMax { get; private set; }
[Editable(ToolTip = "How many seconds it takes for the particle to grow to it's initial size.")]
[Serialize(0.0f, false)]
[Editable]
[Serialize(0.0f, false, description: "How many seconds it takes for the particle to grow to it's initial size.")]
public float GrowTime { get; private set; }
//rendering -----------------------------------------
[Editable(ToolTip = "The initial color of the particle."), Serialize("1.0,1.0,1.0,1.0", false)]
[Editable, Serialize("1.0,1.0,1.0,1.0", false, description: "The initial color of the particle.")]
public Color StartColor { get; private set; }
[Editable(ToolTip = "The color of the particle at the end of its lifetime."), Serialize("1.0,1.0,1.0,1.0", false)]
[Editable, Serialize("1.0,1.0,1.0,1.0", false, description: "The color of the particle at the end of its lifetime.")]
public Color EndColor { get; private set; }
[Editable(ToolTip = "Should the particle be rendered in air, water or both."), Serialize(DrawTargetType.Air, false)]
[Editable, Serialize(DrawTargetType.Air, false, description: "Should the particle be rendered in air, water or both.")]
public DrawTargetType DrawTarget { get; private set; }
[Editable(ToolTip = "The type of blending to use when rendering the particle."), Serialize(ParticleBlendState.AlphaBlend, false)]
[Editable, Serialize(ParticleBlendState.AlphaBlend, false, description: "The type of blending to use when rendering the particle.")]
public ParticleBlendState BlendState { get; private set; }
//animation -----------------------------------------
[Editable(0.0f, float.MaxValue, ToolTip = "The duration of the particle's animation cycle (if it's animated)."), Serialize(1.0f, false)]
[Editable(0.0f, float.MaxValue), Serialize(1.0f, false, description: "The duration of the particle's animation cycle (if it's animated).")]
public float AnimDuration { get; private set; }
[Editable(ToolTip = "Should the sprite animation be looped, or stay at the last frame when the animation finishes."), Serialize(true, false)]
[Editable, Serialize(true, false, description: "Should the sprite animation be looped, or stay at the last frame when the animation finishes.")]
public bool LoopAnim { get; private set; }
//----------------------------------------------------