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

prevent bubble from growing infinitely large

shapetextures
Maikel de Vries 2015-09-11 23:15:23 +02:00
parent 17d59de20d
commit ad95a39a1c
2 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c
View File

@ -5,21 +5,14 @@
@author Win
*/
local Plane = 500;
local is_explosive = false;
local grow_time = 2;
local grow_timer = 0;
public func Construction()
{
AddEffect("Move", this, 1, 2, this);
// Sometimes bubbles become darker and explosive
var effect = AddEffect("Move", this, 1, 2, this);
// Sometimes bubbles become darker and explosive.
if (!Random(10))
{
is_explosive = true;
effect.is_explosive = true;
SetGraphics("2");
}
return;
@ -27,39 +20,38 @@ public func Construction()
private func FxMoveTimer(object target, effect fx, int time)
{
if (!GBackLiquid(0, -3) && !GetEffect("ObjFade", this) || time > 200)
// Fade out bubble if outside liquid or time is up.
if ((!GBackLiquid(0, -3) || time > 200) && !GetEffect("ObjFade", this))
{
if (!GBackLiquid(0, -3) && !is_explosive)
if (!GBackLiquid(0, -3) && !fx.is_explosive)
SetGraphics("3");
if(!Random(20))
Sound("Bubble*");
Sound("Bubble*");
FadeOut(50, true);
}
grow_timer++;
if (grow_timer >= grow_time)
{
// Grow bubble over time.
if ((time % 6) == 0)
DoCon(2);
grow_timer = 0;
}
// Causes bubbles to repel each other
var nearbyBubble = FindObject(Find_Distance(GetCon()/15, 0, 0), Find_ID(GetID()));
if (nearbyBubble != nil)
// Causes bubbles to repel each other.
var nearby_bubble = FindObject(Find_Distance(GetCon()/15, 0, 0), Find_ID(GetID()));
if (nearby_bubble)
{
SetXDir(-(nearbyBubble->GetX() - GetX()) / 2);
SetYDir(-(nearbyBubble->GetY() - GetY()) / 2);
SetXDir(-(nearby_bubble->GetX() - GetX()) / 2);
SetYDir(-(nearby_bubble->GetY() - GetY()) / 2);
}
// Deep green bubbles explode when near a living thing
if (is_explosive)
// Deep green bubbles explode when near a living thing.
if (fx.is_explosive)
{
var prey = FindObject(Find_Distance(GetCon()/15, 0, 0), Find_OCF(OCF_Alive));
if (prey != nil)
if (prey)
{
Explode(10);
return FX_OK;
}
}
// Bubble is faster in acid, moves erratically outside
// Bubble is faster in acid, moves erratically outside.
var speed_up = -3;
if (GetEffect("ObjFade", this))
{
@ -68,11 +60,13 @@ private func FxMoveTimer(object target, effect fx, int time)
SetXDir(GetXDir() + RandomX(-6, 6));
}
SetYDir(GetYDir() - RandomX(3, 4) + speed_up - (GetCon() / 50));
return 1;
return FX_OK;
}
// No need to blow up scenario object list with bubble spam.
func SaveScenarioObject() { return false; }
/*-- Properties --*/
local Plane = 500;

70
planet/System.ocg/Fade.c
View File

@ -1,54 +1,70 @@
/**
Fade.c
Function to fade in and out objects.
*/
global func FadeOut(int time, bool del)
{
//if there is an existing effect, remove it
if(GetEffect("ObjFade", this)) RemoveEffect("ObjFade", this);
// If there is an existing effect, remove it.
if (GetEffect("ObjFade", this))
RemoveEffect("ObjFade", this);
//add the effect itself
var effect = AddEffect("ObjFade", this, 1,1);
effect.fadeTime = time;
effect.delete = del; //delete the object when fade-out is done
effect.FadeOut = true;
// Add the effect itself.
var effect = AddEffect("ObjFade", this, 1, 1);
effect.fade_time = time;
effect.fade_out = true;
// Delete the object when fade-out is done.
effect.delete = del;
return effect;
}
global func FadeIn(int time)
{
//if there is an existing effect, remove it
if(GetEffect("ObjFade", this)) RemoveEffect("ObjFade", this);
// If there is an existing effect, remove it.
if (GetEffect("ObjFade", this))
RemoveEffect("ObjFade", this);
//add the effect itself
var effect = AddEffect("ObjFade", this, 1,1);
effect.fadeTime = time;
// Add the effect itself.
var effect = AddEffect("ObjFade", this, 1, 1);
effect.fade_time = time;
return effect;
}
global func FxObjFadeTimer(object target, proplist effect, int timer)
{
//Is the fade timer up?
if(timer >= effect.fadeTime){
//delete object at end if specified
if(effect.delete) target->RemoveObject();
else{
if(effect.FadeOut){
//Callback to object when alpha is completely transparent
// Is the fade timer up?
if (timer >= effect.fade_time)
{
// Delete object at end if specified.
if (effect.delete)
target->RemoveObject();
else
{
if (effect.fade_out)
{
// Callback to object when alpha is completely transparent.
target->~OnFadeDisappear();
target->SetObjAlpha(0);
}
else{
//Callback to object when alpha is fully opaque
else
{
// Callback to object when alpha is fully opaque.
target->~OnFadeAppear();
target->SetObjAlpha(255);
}
}
return -1;
return FX_Execute_Kill;
}
//find out what the alpha should be
var alpha = (timer * 1000 / effect.fadeTime) * 255 / 1000;
// Find out what the alpha should be.
var alpha = (timer * 1000 / effect.fade_time) * 255 / 1000;
//Does the object fade out or in?
if(effect.FadeOut) alpha = 255 - alpha;
// Does the object fade out or in?
if (effect.fade_out)
alpha = 255 - alpha;
//shade object's alpha to match time
// Shade object's alpha to match time.
target->SetObjAlpha(alpha);
return FX_OK;
}