marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

object pickup: reworked selector effect 

The reworked effect makes it clearer that this is a meta-action and is not part of the ingame world.
Controls
David Dormagen 2015-09-01 13:36:03 +02:00
parent 37bd5abf87
commit 18808da543
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
planet/Objects.ocd/Effects.ocd/Particles.ocd/Selector.ocd/Graphics.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

3
planet/Objects.ocd/Effects.ocd/Particles.ocd/Selector.ocd/Particle.txt 100644
View File

@ -0,0 +1,3 @@
[Particle]
Name=Selector
Face=0,0,128,128,-64,-64

30
planet/Objects.ocd/Libraries.ocd/ClonkInventoryControl.ocd/Script.c
View File

@ -171,7 +171,7 @@ private func FxIntHighlightItemStart(object target, proplist fx, temp, object it
}
};
fx.dummy.Visibility = VIS_Owner;
fx.dummy.Plane = item.Plane + 1;
fx.dummy.Plane = 1000;
fx.dummy->Message("@%s", item->GetName());
// Center dummy!
@ -181,38 +181,28 @@ private func FxIntHighlightItemStart(object target, proplist fx, temp, object it
fx.width = item->GetDefWidth();
fx.height = item->GetDefHeight();
var particle =
{
Prototype = Particles_Flash(),
Size = Max(fx.width, fx.height),
Attach = ATTACH_Front
};
fx.dummy->CreateParticle("SphereSpark", 0, 0, 0, 0, 20, particle, 1);
// Draw the item's graphics in front of it again to achieve a highlighting effect.
fx.dummy->SetGraphics(nil, nil, 1, GFXOV_MODE_Object, nil, GFX_BLIT_Additive, item);
// And smaller sparks during the effect.
fx.particles =
// Draw a nice selector particle on item change.
var selector =
{
Prototype = particle,
Size = PV_Linear(2, 0),
Rotation = PV_Random(360),
Stretch = PV_Linear(0, 4000),
Size = PV_Step(3, 2, 1, Max(fx.width, fx.height)),
Attach = ATTACH_Front,
Rotation = PV_Step(1, PV_Random(0, 360), 1),
Alpha = 200
};
fx.width /= 2;
fx.height /= 2;
fx.dummy->CreateParticle("Selector", 0, 0, 0, 0, 0, Particles_Colored(selector, GetPlayerColor(GetOwner())), 1);
}
private func FxIntHighlightItemTimer(object target, proplist fx, int time)
{
if (!fx.dummy) return -1;
if (!fx.item) return -1;
if (ObjectDistance(this, fx.item) > 20) return -1;
if (fx.item->Contained()) return -1;
fx.dummy->CreateParticle("StarSpark", PV_Random(-fx.width, fx.width), PV_Random(-fx.height, fx.height), 0, 0, 10, fx.particles, 2);
}
private func FxIntHighlightItemStop(object target, proplist fx, int reason, temp)
{
if (temp) return;
if (fx.dummy) fx.dummy->RemoveObject();