diff --git a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/Script.c b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/Script.c index f32c60666..101ca6536 100644 --- a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/Script.c +++ b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/Script.c @@ -161,14 +161,16 @@ func Definition(def) FadeOut=true, CollisionFunc="bounce" }, { Type="proplist", Display="{{Amount}}x{{Name}}", EditorProps = { - Name = { Name="$ParticleName$", EditorHelp="$ParticleNameHelp$", Type="enum", Priority=50, Options = [ + Name = { Name="$ParticleName$", EditorHelp="$ParticleNameHelp$", Type="enum", Priority=50, Sorted=true, Options = [ { Name="$Dust$", Value="Dust" }, { Name="$Flash$", Value="Flash" }, { Name="$Magic$", Value="Magic" }, { Name="$Smoke$", Value="Smoke" }, { Name="$Sphere$", Value="Sphere" }, { Name="$StarFlash$", Value="StarFlash" }, - { Name="$StarSpark$", Value="StarSpark" } + { Name="$StarSpark$", Value="StarSpark" }, + { Name="$Fire$", Value="MagicFire" }, + { Name="$Ring$", Value="MagicRing" } ] }, Position = new Evaluator.Position { EditorHelp="$CastObjectsPositionHelp$" }, Amount = new Evaluator.Integer { Name="$Amount$", EditorHelp="$CastParticlesAmountHelp$" }, diff --git a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblDE.txt b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblDE.txt index d6ed1d5e6..1764153ee 100644 --- a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblDE.txt +++ b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblDE.txt @@ -345,6 +345,8 @@ Smoke=Rauch Sphere=Kreis StarFlash=Stern StarSpark=Sonne +Fire=Feuer +Ring=Ring LastUsePosition=Aktivierungsposition LastUsePositionHelp=Fuer aktivierbare Gegenstaende wie den Zauberstab: Mausposition, an der der Spieler das Objekt aktiviert hat. PlrKnowledge=Bauplan geben diff --git a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblUS.txt b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblUS.txt index 5f138d4a0..60e91346e 100644 --- a/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblUS.txt +++ b/planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblUS.txt @@ -345,6 +345,8 @@ Smoke=Smoke Sphere=Sphere StarFlash=Star StarSpark=Sun +Fire=Fire +Ring=Ring LastUsePosition=Activation position LastUsePositionHelp=Valid for activated items such as the magic wand: Mouse position where the player activated the item. PlrKnowledge=Give knowledge