forked from Mirrors/openclonk
moved sounds into subfolders
This completes http://forum.openclonk.org/topic_show.pl?tid=3215shapetextures
David Dormagen
parent
278584578f
commit
dcfb986e34
|
|
@ -51,7 +51,7 @@ protected func Initialize()
|
|||
AddEffect("FillOtherChest", chest, 100, 5 * 36);
|
||||
|
||||
AddEffect("SnowyWinter", nil, 100, 1);
|
||||
Sound("WindLoop",true,20,nil,+1);
|
||||
Sound("Environment::WindLoop",true,20,nil,+1);
|
||||
AddEffect("GeysirExplosion", nil, 100, 1);
|
||||
// Brick edges, notice the symmetric landscape.
|
||||
PlaceEdges();
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ func Initialize()
|
|||
public func ControlUse(object pClonk, int ix, int iy)
|
||||
{
|
||||
AddEffect("Frostbolt", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY());
|
||||
Sound("Fireball");
|
||||
Sound("Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
RemoveObject();
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -68,7 +68,7 @@ public func FxFrostboltTimer(pTarget, effect, iEffectTime)
|
|||
{
|
||||
CreateObjectAbove(Dynamite,x,y,effect.owner)->BlueExplode();
|
||||
var dummy = CreateObjectAbove(Dummy,x,y,-1);
|
||||
dummy->Sound("GlassShatter");
|
||||
dummy->Sound("Hits::Materials::Glass::GlassShatter");
|
||||
ScheduleCall(dummy, "RemoveObject", 36);
|
||||
for(var i=0; i<=60;i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ global func BlueExplode(int level)
|
|||
|
||||
// Sound must be created before object removal, for it to be played at the right position.
|
||||
var grade = BoundBy(level / 10 - 1, 1, 3);
|
||||
Sound(Format("Blast%d", grade), false);
|
||||
Sound(Format("Fire::Blast%d", grade), false);
|
||||
|
||||
// Explosion parameters.
|
||||
var x = GetX(), y = GetY();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public func ControlUse(object clonk, int ix, int iy)
|
|||
// applies the healing effect even when the Clonk is at full HP
|
||||
// does this because you can block one source of damage
|
||||
AddEffect("GemHealing", clonk, 10, 4, nil, this->GetID());
|
||||
clonk->Sound("Breathing", false, 50, nil);
|
||||
clonk->Sound("Clonk::Action::Breathing", false, 50, nil);
|
||||
this->RemoveObject();
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ public func FinishedAiming(object clonk, int angle)
|
|||
AddEffect("ExplosiveArrow",arrow,100,1,this);
|
||||
arrow->SetClrModulation(RGB(255,128,0));
|
||||
}
|
||||
Sound("BowShoot?");
|
||||
Sound("Objects::Weapons::Bow::Shoot?");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public func DoThrow(object clonk, int angle)
|
|||
javelin->AddEffect("Flight",javelin,1,1,javelin,nil);
|
||||
javelin->AddEffect("HitCheck",javelin,1,1,nil,nil,clonk);
|
||||
|
||||
Sound("ThrowJavelin?");
|
||||
Sound("Objects::Weapons::Javelin::Throw?");
|
||||
|
||||
aiming = -1;
|
||||
clonk->UpdateAttach();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ private func FireWeapon(object clonk, int angle)
|
|||
loaded = false;
|
||||
SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1500,0,-1500),Trans_Rotate(170,0,1,0),Trans_Rotate(30,0,0,1)));
|
||||
|
||||
Sound("GunShoot?");
|
||||
Sound("Objects::Weapons::Musket::GunShoot?");
|
||||
|
||||
// Muzzle Flash & gun smoke
|
||||
var IX=Sin(180-angle,MuskFront);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ protected func Initialize()
|
|||
//Enviroment.
|
||||
Cloud->Place(25);
|
||||
SetSkyAdjust(RGBa(250,250,255,128),RGB(200,200,220));
|
||||
Sound("BirdsLoop", true, 100, nil, 1);
|
||||
Sound("Environment::BirdsLoop", true, 100, nil, 1);
|
||||
|
||||
// Brick edges at horizontal moving bricks.
|
||||
var x=[525, 436, 436, 525, 812, 812, 716, 716, 573, 573, 213, 213];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
public func ControlUse(object pClonk, int ix, int iy)
|
||||
{
|
||||
AddEffect("Fireball", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY());
|
||||
Sound("Fireball");
|
||||
Sound("Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
RemoveObject();
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ protected func Initialize()
|
|||
//Enviroment.
|
||||
//SetSkyAdjust(RGBa(250,250,255,128),RGB(200,200,220));
|
||||
SetSkyParallax(1, 20,20, 0,0, nil, nil);
|
||||
Sound("BirdsLoop",true,100,nil,+1);
|
||||
Sound("Environment::BirdsLoop",true,100,nil,+1);
|
||||
|
||||
CreateObjectAbove(Column,650,379);
|
||||
CreateObjectAbove(Column,350,409);
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
public func ControlUse(object pClonk, int ix, int iy)
|
||||
{
|
||||
AddEffect("Fireball", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY());
|
||||
Sound("Fireball");
|
||||
Sound("Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
Sound("Fire::Fireball");
|
||||
RemoveObject();
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
public func ControlUse(object pClonk)
|
||||
{
|
||||
Sound("Blast3");
|
||||
Sound("Fire::Blast3");
|
||||
Exit(0,-GetY());
|
||||
AddEffect("ThunderStrike",nil,100,1,nil,this->GetID(),pClonk->GetOwner(),this->GetX()-5);
|
||||
RemoveObject();
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
func Fall(int from)
|
||||
{
|
||||
Sound("BowShoot?");
|
||||
Sound("Objects::Weapons::Bow::Shoot?");
|
||||
for(var i=0; i < 10; i++ )
|
||||
{
|
||||
var arrow = TakeObject();
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit*");
|
||||
Sound("Hits::GeneralHit*");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit*");
|
||||
Sound("Hits::GeneralHit*");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ public func ClickBuyButton(int callback_idx, entry_id, int player)
|
|||
{
|
||||
if (player != homebase[0]->GetOwner()) return false; // wat?
|
||||
if (homebase[0]->OnBuySelection(callback_idx)) return true;
|
||||
Sound("DullMetalHit3", true, nil, player);
|
||||
Sound("Hits::Materials::Metal::DullMetalHit3", true, nil, player);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,14 +198,14 @@ public func OnBuySelection(int callback_idx)
|
|||
{
|
||||
if (GetWealth(plr) < entry.cost) return false;
|
||||
DoWealth(plr, -entry.cost);
|
||||
Sound("Cash", true, nil, plr);
|
||||
Sound("UI::Cash", true, nil, plr);
|
||||
// Some items cost only once
|
||||
if (entry.free_rebuy) entry.cost = nil;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Still some feedback even on free selections
|
||||
Sound("Waterdrop1", true, nil, plr);
|
||||
Sound("Liquids::Waterdrop1", true, nil, plr);
|
||||
}
|
||||
// Technology?
|
||||
if (entry.callback)
|
||||
|
|
@ -269,7 +269,7 @@ public func SellItem(item)
|
|||
if (item.GidlValue)
|
||||
{
|
||||
DoWealth(GetOwner(), item.GidlValue);
|
||||
Sound("Cash", true, nil, GetOwner());
|
||||
Sound("UI::Cash", true, nil, GetOwner());
|
||||
}
|
||||
is_selling = true; // no item re-buy during sale
|
||||
var success = item->RemoveObject();
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ func LaunchWave(int wave)
|
|||
{
|
||||
var wave_spawn_time = 0;
|
||||
CustomMessage(Format("$MsgWave$: %s", wave, wave_data.Name));
|
||||
Sound("Ding");
|
||||
Sound("UI::Ding");
|
||||
for (var enemy in ForceVal2Array(wave_data.Enemies)) if (enemy)
|
||||
{
|
||||
if (enemy.Delay)
|
||||
|
|
@ -240,7 +240,7 @@ func OnWaveCleared(int wave)
|
|||
DoWealthForAll(bounty);
|
||||
}
|
||||
CustomMessage(Format("$MsgWaveCleared$%s| ", wave, bounty_msg));
|
||||
Sound("Ding");
|
||||
Sound("UI::Ding");
|
||||
// Fade out corpses
|
||||
if (g_object_fade)
|
||||
for (var obj in FindObjects(Find_Or(Find_And(Find_ID(Clonk), Find_Not(Find_OCF(OCF_Alive))), Find_ID(Catapult))))
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ protected func Hit()
|
|||
{
|
||||
//Message("I have hit something");
|
||||
if(GetEffect("Flight",this)) DoFireworks();
|
||||
else Sound("WoodHit");
|
||||
else Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
protected func HitObject()
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func Initialize()
|
|||
PlaceGrass(100, 800, 1400);
|
||||
SetSkyParallax(0,25,25,0,0,0,0);
|
||||
AddEffect("BoomAttack", nil, 100, 35);
|
||||
Sound("WindLoop",true,40,nil,+1);
|
||||
Sound("Environment::WindLoop",true,40,nil,+1);
|
||||
}
|
||||
|
||||
global func FxBoomAttackTimer(object target, effect, int time)
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ func InitializeEnvironments()
|
|||
var overground = this.env_overground = new Environment {};
|
||||
overground->SetMusic("overground");
|
||||
overground.CheckPlayer = this.EnvCheck_Overground;
|
||||
overground->AddSound("Ding", 100);
|
||||
overground->AddSound("UI::Ding", 100);
|
||||
AddEnvironment(overground, 0);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public func Interact(object clonk)
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("MetalHit?");
|
||||
Sound("Hits::Materials::Metal::LightMetalHit?");
|
||||
}
|
||||
|
||||
func Construction(object constructor)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ public func SetConnectedObjects(obj1, obj2)
|
|||
|
||||
protected func LineBreak(bool no_msg)
|
||||
{
|
||||
Sound("LineBreak");
|
||||
Sound("Objects::Connect");
|
||||
if (!no_msg)
|
||||
BreakMessage();
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("RockHit?");
|
||||
Sound("Hits::Materials::Rock::RockHit?");
|
||||
}
|
||||
|
||||
public func IsToolProduct() { return true; }
|
||||
|
|
@ -26,7 +26,7 @@ protected func ControlUse(object clonk, int x, int y)
|
|||
{
|
||||
// Power line is already connected to obj -> remove line.
|
||||
line->RemoveObject();
|
||||
Sound("Connect");
|
||||
Sound("Objects::Connect");
|
||||
clonk->Message("$TxtLineRemoval$");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ protected func ControlUse(object clonk, int x, int y)
|
|||
line->SetActionTargets(line->GetActionTarget(0), obj);
|
||||
else
|
||||
return;
|
||||
Sound("Connect");
|
||||
Sound("Objects::Connect");
|
||||
line->SetAction("Wait");
|
||||
line->UpdateDraw();
|
||||
obj->AddCableConnection(line);
|
||||
|
|
@ -52,7 +52,7 @@ protected func ControlUse(object clonk, int x, int y)
|
|||
{
|
||||
line = CreateObjectAbove(CableLine, 0, 0, NO_OWNER);
|
||||
line->SetActionTargets(this, obj);
|
||||
Sound("Connect");
|
||||
Sound("Objects::Connect");
|
||||
clonk->Message("$TxtConnect$", obj->GetName());
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ protected func RejectCollect(id object_id, object obj)
|
|||
{
|
||||
if (ContentsCount() < this->MaxContentsCount())
|
||||
{
|
||||
Sound("Clonk");
|
||||
Sound("Objects::Clonk");
|
||||
return false;
|
||||
}
|
||||
if (obj->Contained())
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ func StopWalk()
|
|||
func Footstep()
|
||||
{
|
||||
if (GetMaterialVal("DigFree", "Material", GetMaterial(0,10)) == 0)
|
||||
Sound("StepHard?");
|
||||
Sound("Clonk::Movement::StepHard?");
|
||||
else
|
||||
{
|
||||
var dir = Sign(GetXDir());
|
||||
|
|
@ -34,7 +34,7 @@ func Footstep()
|
|||
B = clr & 0xff,
|
||||
};
|
||||
CreateParticle("Dust", PV_Random(dir * -5, dir * -3), 8, PV_Random(dir * 2, dir * 1), PV_Random(-2, -3), PV_Random(36, 2 * 36), particles, 5);
|
||||
Sound("StepSoft?");
|
||||
Sound("Clonk::Movement::StepSoft?");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ private func CheckBurden()
|
|||
|
||||
private func BreakRight()
|
||||
{
|
||||
Sound("TreeCrack");
|
||||
Sound("Environment::Tree::Crack");
|
||||
CastObjects(Wood, 2, 15, 20, 1, 180, 90);
|
||||
if (GetPhase() == 1)
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@ private func BreakRight()
|
|||
|
||||
private func BreakLeft()
|
||||
{
|
||||
Sound("TreeCrack");
|
||||
Sound("Environment::Tree::Crack");
|
||||
CastObjects(Wood, 2, 15, -20, 1, 180, 90);
|
||||
if (GetPhase() == 2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ func Intro_Stop()
|
|||
func Intro_PlaneHit()
|
||||
{
|
||||
// Plane hit ground! Continue sequence.
|
||||
Sound("PlaneCrash", true);
|
||||
Sound("Objects::Plane::PlaneCrash", true);
|
||||
var particles = Particles_Smoke(true);
|
||||
particles.Size = PV_Linear(PV_Random(20, 60), PV_Random(50, 100));
|
||||
CreateParticle("Smoke", PV_Random(-30,30), PV_Random(-30,30), PV_Random(-60, 60), PV_Random(-20,0), PV_Random(200, 500), particles, 20);
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ public func StartCommunication()
|
|||
Attach = ATTACH_Front | ATTACH_MoveRelative,
|
||||
};
|
||||
// Run effects
|
||||
Sound("CrystalCommCharge");
|
||||
Sound("CrystalCommunicator::CrystalCommCharge");
|
||||
time = 0;
|
||||
AddTimer(this.PreActivity, 5);
|
||||
}
|
||||
|
|
@ -222,13 +222,13 @@ private func PreActivity()
|
|||
else
|
||||
gem_target->CreateParticle("StarFlash", x, y, -x, -y, 10, small_flash_particle, 10);
|
||||
}
|
||||
if (time == 20) Sound("CrystalCommBoost");
|
||||
if (time == 20) Sound("CrystalCommunicator::CrystalCommBoost");
|
||||
if (time > 50)
|
||||
{
|
||||
RemoveTimer(this.PreActivity);
|
||||
time = 0;
|
||||
CreateParticle("StarFlash", PV_Random(-12, +12), PV_Random(-12, +12), PV_Random(-10, +10),PV_Random(-10, +10), PV_Random(20, 100), large_flash_particle, 10);
|
||||
Sound("CrystalCommWumm");
|
||||
Sound("CrystalCommunicator::CrystalCommWumm");
|
||||
SetAction("Active");
|
||||
AddTimer(this.Activity, 1);
|
||||
}
|
||||
|
|
@ -265,12 +265,12 @@ private func Activity()
|
|||
// Next char to send
|
||||
if (send_char == GetChar("."))
|
||||
{
|
||||
Sound("CrystalCommToneA");
|
||||
Sound("CrystalCommunicator::CrystalCommToneA");
|
||||
next_send_time = time + 13;
|
||||
}
|
||||
else
|
||||
{
|
||||
Sound("CrystalCommToneB");
|
||||
Sound("CrystalCommunicator::CrystalCommToneB");
|
||||
next_send_time = time + 27;
|
||||
}
|
||||
}
|
||||
|
|
@ -346,7 +346,7 @@ local ActMap = {
|
|||
Delay = 0,
|
||||
Length = 1,
|
||||
NextAction = "Active",
|
||||
Sound = "CrystalCommActive",
|
||||
Sound = "CrystalCommunicator::CrystalCommActive",
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -116,8 +116,8 @@ func Intro_10()
|
|||
{
|
||||
g_intro_sky_moving = false;
|
||||
Schedule(this, "SetSkyParallax(0, 20, 20, ++this.intro_skyscroll_xdir, 0)", 10, -this.intro_skyscroll_xdir);
|
||||
GetHero()->Sound("Hurt1");
|
||||
GetHero()->Sound("Hurt2");
|
||||
GetHero()->Sound("Clonk::Verbal::Hurt1");
|
||||
GetHero()->Sound("Clonk::Verbal::Hurt2");
|
||||
this.plane.rdir = 0;
|
||||
this.plane->StartInstantFlight(this.plane->GetR(), 15);
|
||||
MessageBoxAll("$Intro10$", GetHero(), true); // aaaah
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ func Outro_10()
|
|||
|
||||
func Outro_11()
|
||||
{
|
||||
Sound("Fanfare");
|
||||
Sound("UI::Fanfare");
|
||||
return GameOver();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ func ControlUseStart(object clonk, int ix, int iy)
|
|||
|
||||
func Hit()
|
||||
{
|
||||
Sound("GlassHit?");
|
||||
Sound("Hits::Materials::Glass::GlassHit?");
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ func FxNewtonHammeringTimer(object c, proplist fx, int time)
|
|||
{
|
||||
// Hammer backswing
|
||||
this.anim = c->PlayAnimation("StrikePickaxe", 10, Anim_Linear(b,b,a, Newton_Hammer_SwingTime, ANIM_Remove), Anim_Const(1000));
|
||||
c->Sound("Clang?");
|
||||
c->Sound("Objects::Pickaxe::Clang?");
|
||||
var x = (c->GetDir()*2-1) * 9;
|
||||
var y = -16;
|
||||
c->CreateParticle("Dust", x,y, PV_Random(-10, 10), PV_Random(-10, 20), PV_Random(10, 20), new Particles_Dust() { R=120, G=100, B=80 }, 10);
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ func Pyrit_HitFx()
|
|||
var x = (GetDir()*2-1) * 14;
|
||||
var y = 4;
|
||||
CreateParticle("StarSpark", x*9/10,y*9/10, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 10);
|
||||
Sound("Clang?");
|
||||
Sound("Objects::Pickaxe::Clang?");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func FxRockyPickaxeingTimer(object c, proplist fx, int time)
|
|||
c->SetDir(DIR_Right);
|
||||
var len = c->GetAnimationLength("StrikePickaxe");
|
||||
this.anim = c->PlayAnimation("StrikePickaxe", CLONK_ANIM_SLOT_Arms, Anim_Linear(0,0,len, Rocky_Pickaxe_SwingTime, ANIM_Remove), Anim_Const(1000));
|
||||
c->Sound("Clang?");
|
||||
c->Sound("Objects::Pickaxe::Clang?");
|
||||
var x = (c->GetDir()*2-1) * 9;
|
||||
var y = 16;
|
||||
c->CreateParticle("StarSpark", x,y, PV_Random(-20, 20), PV_Random(-20, 20), 20, c.pickaxe_particle, Random(10)+3);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ func FuelCheck(object clonk)
|
|||
if (!FindContents(MetalBarrel))
|
||||
{
|
||||
Dialogue->MessageBox("$PlaneNoOil$", clonk, clonk);
|
||||
clonk->Sound("WipfWhine");
|
||||
clonk->Sound("Animals::Wipf::Whine");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ func Attack_DropBomb(int plane_idx, int delay)
|
|||
bomb->SetXDir(plane->GetXDir() + (i-2) * 10);
|
||||
bomb->Fuse(true); // fuse and explode on hit
|
||||
}
|
||||
plane->Sound("BombDrop");
|
||||
plane->Sound("Goal_Raid::BombDrop");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ func CheckLock(object clonk)
|
|||
if (!key)
|
||||
{
|
||||
Dialogue->MessageBox("$DoorNoKey$", clonk, clonk);
|
||||
clonk->Sound("WipfWhine");
|
||||
clonk->Sound("Animals::Wipf::Whine");
|
||||
return false;
|
||||
}
|
||||
// too far away? (may happen when callback is from key)
|
||||
|
|
@ -36,6 +36,6 @@ func CheckLock(object clonk)
|
|||
Dialogue->MessageBox("$DoorUnlocked$", clonk, clonk, nil, true);
|
||||
this.unlocked = true;
|
||||
key->RemoveObject();
|
||||
Sound("Click");
|
||||
Sound("UI::Click");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("WoodHit");
|
||||
Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
public func Definition(proplist def)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("WoodHit");
|
||||
Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
func IsToolProduct() { return true; }
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("WoodHit");
|
||||
Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
public func Definition(proplist def)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ func AddPart(object part)
|
|||
{
|
||||
part->RemoveRestoreMode();
|
||||
part->RemoveObject();
|
||||
Sound("Ding", true);
|
||||
Sound("UI::Ding", true);
|
||||
SetProgress(progress+1);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("WoodHit");
|
||||
Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
public func Definition(proplist def)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("WoodHit");
|
||||
Sound("Hits::Materials::Wood::WoodHit*");
|
||||
}
|
||||
|
||||
public func Definition(proplist def)
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ public func Reinforce(int direction)
|
|||
}
|
||||
|
||||
UpdateInteractionMenus(this.GetExtensionMenuEntries);
|
||||
Sound("DullWoodHit1");
|
||||
Sound("Hits::Materials::Wood::DullWoodHit1");
|
||||
}
|
||||
|
||||
/* Destruction */
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ func Pyrit_HitFx()
|
|||
var x = (GetDir()*2-1) * 14;
|
||||
var y = 4;
|
||||
CreateParticle("StarSpark", x*9/10,y*9/10, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 10);
|
||||
Sound("Clang?");
|
||||
Sound("Objects::Pickaxe::Clang?");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ func DoSellEffect(container)
|
|||
fm->FadeOut(2, 10);
|
||||
fm->SetSpeed(0, -5);
|
||||
fm->SetMessage("+1</c>{{GoldBar}}");
|
||||
container->Sound("Cash");
|
||||
container->Sound("UI::Cash");
|
||||
|
||||
var dust_particles =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ func FuelCheck(object clonk)
|
|||
if (!FindContents(MetalBarrel))
|
||||
{
|
||||
Dialogue->MessageBox("$PlaneNoOil$", clonk, clonk);
|
||||
clonk->Sound("WipfWhine");
|
||||
clonk->Sound("Animals::Wipf::Whine");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func Intro_2()
|
|||
{
|
||||
// Plane drop sound when it enters view range
|
||||
if (this.plane->GetY() > 900)
|
||||
Sound("PlaneDrop", true);
|
||||
Sound("Goal_TreasureHunt::PlaneDrop", true);
|
||||
else
|
||||
ScheduleSame(2);
|
||||
return true;
|
||||
|
|
@ -87,7 +87,7 @@ func Intro_2()
|
|||
func Intro_PlaneHit()
|
||||
{
|
||||
// Plane hit ground! Continue sequence.
|
||||
Sound("PlaneCrash", true);
|
||||
Sound("Objects::Plane::PlaneCrash", true);
|
||||
SetR(-90);
|
||||
var particles = Particles_Smoke(true);
|
||||
particles.Size = PV_Linear(PV_Random(20, 60), PV_Random(50, 100));
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public func Hit(int x, int y)
|
|||
}
|
||||
|
||||
SetRDir(0);
|
||||
Sound("SoftHit*");
|
||||
Sound("Hits::SoftHit*");
|
||||
|
||||
var particles =
|
||||
{
|
||||
|
|
@ -150,7 +150,7 @@ private func Hatch()
|
|||
|
||||
var c = CreateObject(Chippie, 0, 0, GetOwner());
|
||||
c->SetCon(50);
|
||||
c->Sound("ChippieChirp*", false, 25);
|
||||
c->Sound("Animals::Chippie::Chirp*", false, 25);
|
||||
|
||||
var particles =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public func Death()
|
|||
PV_Random(-20, 20), PV_Random(-20, 20),
|
||||
PV_Random(20, 60), particles, 60);
|
||||
}
|
||||
Sound("ChippieChirp*", false, 50);
|
||||
Sound("Animals::Chippie::Chirp*", false, 50);
|
||||
RemoveObject();
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ private func FxJumpCheckTimer(target, effect, time)
|
|||
private func ClawTo(object obj)
|
||||
{
|
||||
// Play the sound on the object, because the chippie turns invisible.
|
||||
obj->Sound("ChippieBite*", false, 50);
|
||||
obj->Sound("Animals::Chippie::Bite*", false, 50);
|
||||
|
||||
energy_sucked += 5 * 1000;
|
||||
obj->DoEnergy(-5, false, FX_Call_EngGetPunched, GetOwner());
|
||||
|
|
@ -221,7 +221,7 @@ private func FxActivityTimer(target, effect, time)
|
|||
else
|
||||
if(!Random(20) && !GetEffect("DanceCooldown", this))
|
||||
{
|
||||
Sound("ChippieTalk*");
|
||||
Sound("Animals::Chippie::Talk*");
|
||||
|
||||
var cnt = 0;
|
||||
for(var obj in FindObjects(Find_Distance(100), Find_ID(GetID()), Find_Allied(GetOwner()), Sort_Distance()))
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@ func FxIsBeingEatenAdd(target, effect)
|
|||
func DoJump()
|
||||
{
|
||||
SetAction("Jump");
|
||||
Sound("SoftTouch*");
|
||||
Sound("Hits::SoftTouch*");
|
||||
|
||||
var x_dir = RandomX(ActMap.Jump.Speed/2, ActMap.Jump.Speed);
|
||||
if (GetComDir() == COMD_Left) x_dir *= -1;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ private func GetAttraction(proplist coordinates)
|
|||
{
|
||||
// GetAttraction will only be called for the swarm master, perfect to have just one being make sound
|
||||
if(!Random(30))
|
||||
Sound("MosquitoBuzz", nil,nil,nil,nil, 200);
|
||||
Sound("Animals::MosquitoBuzz", nil,nil,nil,nil, 200);
|
||||
|
||||
if (!lovely_place) lovely_place = CreateArray(3);
|
||||
if (!lovely_place[1])
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ func DoEat(object obj)
|
|||
|
||||
private func BiteEffect()
|
||||
{
|
||||
Sound("FishMunch*");
|
||||
Sound("Animals::Fish::Munch*");
|
||||
}
|
||||
|
||||
// Make this piranha a little larger than the mesh.
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ private func UpdateVision()
|
|||
|
||||
private func BiteEffect()
|
||||
{
|
||||
Sound("FishMunch*", nil, nil, nil, nil, nil, 100);
|
||||
Sound("Animals::Fish::Munch*", nil, nil, nil, nil, nil, 100);
|
||||
}
|
||||
|
||||
local Name = "$Name$";
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ private func RandomizeColor()
|
|||
|
||||
public func CatchBlow(int damage, object from)
|
||||
{
|
||||
Schedule(this, "Sound(\"PukaHurt*\")", RandomX(5, 20));
|
||||
Schedule(this, "Sound(\"Animals::Puka::Hurt*\")", RandomX(5, 20));
|
||||
}
|
||||
|
||||
private func CheckStuck()
|
||||
|
|
@ -161,7 +161,7 @@ private func StopHangle()
|
|||
public func Death()
|
||||
{
|
||||
AddEffect("IntDeathSparks", this, 1, 1, this);
|
||||
SoundAt("PukaDie");
|
||||
SoundAt("Animals::Puka::Die");
|
||||
}
|
||||
|
||||
private func FxIntDeathSparksStart(object target, effect fx, temp)
|
||||
|
|
@ -270,7 +270,7 @@ private func ActivityWalking()
|
|||
{
|
||||
if (Random(3))
|
||||
{
|
||||
Schedule(this, "Sound(\"PukaGulp\")", 40);
|
||||
Schedule(this, "Sound(\"Animals::Puka::Gulp\")", 40);
|
||||
return SetAction("LookAround");
|
||||
}
|
||||
return SetAction("ScratchFace");
|
||||
|
|
@ -422,7 +422,7 @@ private func FxIntTeleportStart(object target, effect fx, temp)
|
|||
PV_Random(xdir - 5, xdir + 5), PV_Random(ydir - 5, ydir + 5),
|
||||
PV_Random(1, 5), fx.particles, 200);
|
||||
|
||||
SoundAt("PukaTeleportOut");
|
||||
SoundAt("Animals::Puka::TeleportOut");
|
||||
}
|
||||
|
||||
private func FxIntTeleportTimer(object target, effect fx, int time)
|
||||
|
|
@ -492,7 +492,7 @@ private func FxIntTeleportStop(object target, effect fx, int reason, temp)
|
|||
PV_Random(xdir - 5, xdir + 5), PV_Random(ydir - 5, ydir + 5),
|
||||
PV_Random(1, 5), fx.particles, 200);
|
||||
|
||||
SoundAt("PukaTeleportIn");
|
||||
SoundAt("Animals::Puka::TeleportIn");
|
||||
}
|
||||
|
||||
public func TryStartTeleport()
|
||||
|
|
@ -634,7 +634,7 @@ private func ShockWater()
|
|||
|
||||
AddEffect("Sparkle", this, 1, 1, this);
|
||||
|
||||
Sound("PukaHiss*");
|
||||
Sound("Animals::Puka::Hiss*");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ private func UpdateSwim()
|
|||
private func DoJump()
|
||||
{
|
||||
SetAction("Jump");
|
||||
Sound("SoftTouch*");
|
||||
Sound("Hits::SoftTouch*");
|
||||
|
||||
var x_dir = RandomX(ActMap.Jump.Speed/2, ActMap.Jump.Speed);
|
||||
if (GetComDir() == COMD_Left) x_dir *= -1;
|
||||
|
|
|
|||
|
|
@ -517,7 +517,7 @@ public func Eat(object food)
|
|||
{
|
||||
DoEnergy(food->~NutritionalValue());
|
||||
food->RemoveObject();
|
||||
Sound("Munch?");
|
||||
Sound("Clonk::Action::Munch?");
|
||||
SetAction("Eat");
|
||||
}
|
||||
return;
|
||||
|
|
@ -539,7 +539,7 @@ public func IsDead()
|
|||
|
||||
protected func Death(int killed_by)
|
||||
{
|
||||
Sound("WipfAroof");
|
||||
Sound("Animals::Wipf::Aroof");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -571,7 +571,7 @@ protected func CatchBlow()
|
|||
{
|
||||
if (IsDead())
|
||||
return;
|
||||
Sound("Weep?");
|
||||
Sound("Animals::Wipf::Weep?");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ private func Hit2()
|
|||
// Could be instantly dead
|
||||
if (zap)
|
||||
zap->SetEnraged();
|
||||
Sound("OrganicHit?");
|
||||
Sound("Hits::OrganicHit?");
|
||||
CreateParticle("WoodChip", 0,0, PV_Random(-2,2), -4, PV_Random(36 * 3, 36 * 10), Particles_Straw(), 5);
|
||||
RemoveObject();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ private func GetAttraction(proplist coordinates)
|
|||
}
|
||||
// GetAttraction will only be called for the swarm master, perfect to have just one being make sound
|
||||
if(!Random(20))
|
||||
Sound("Zap?", nil,nil,nil,nil, 200, Random(100));
|
||||
Sound("Animals::Zap::Zap?", nil,nil,nil,nil, 200, Random(100));
|
||||
|
||||
coordinates.x = home->GetX() + Random(20)-10;
|
||||
coordinates.y = home->GetY() + Random(20)-10;
|
||||
|
|
@ -170,7 +170,7 @@ private func CheckTurn()
|
|||
|
||||
private func AngryBuzz()
|
||||
{
|
||||
Sound("Zap?", nil,nil,nil,nil, nil, -Random(100));
|
||||
Sound("Animals::Zap::Zap?", nil,nil,nil,nil, nil, -Random(100));
|
||||
}
|
||||
|
||||
/*-- Saving --*/
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ func GetCurrentWalkAnimation()
|
|||
func Footstep()
|
||||
{
|
||||
if (GetMaterialVal("DigFree", "Material", GetMaterial(0,10)) == 0)
|
||||
Sound("StepHard?");
|
||||
Sound("Clonk::Movement::StepHard?");
|
||||
else
|
||||
{
|
||||
var dir = Sign(GetXDir());
|
||||
|
|
@ -408,7 +408,7 @@ func Footstep()
|
|||
B = clr & 0xff,
|
||||
};
|
||||
CreateParticle("Dust", PV_Random(dir * -2, dir * -1), 8, PV_Random(dir * 2, dir * 1), PV_Random(-2, -3), PV_Random(36, 2 * 36), particles, 5);
|
||||
Sound("StepSoft?");
|
||||
Sound("Clonk::Movement::StepSoft?");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -769,7 +769,7 @@ func FxFallTimer(object target, effect, int timer)
|
|||
}
|
||||
if(timer == 2 && GetYDir() < 1)
|
||||
{
|
||||
Sound("Rustle?");
|
||||
Sound("Clonk::Movement::Rustle?");
|
||||
}
|
||||
|
||||
if(GetYDir() > 55 && GetAction() == "Jump")
|
||||
|
|
@ -1035,7 +1035,7 @@ func FxIntSwimTimer(pTarget, effect, iTime)
|
|||
};
|
||||
CreateParticle("Wave", 0, -4, (RandomX(-5,5)-(-1+2*GetDir())*4)/4, 0, 16, particles);
|
||||
}
|
||||
Sound("Splash?");
|
||||
Sound("Liquids::Splash?");
|
||||
}
|
||||
// Animation speed by X
|
||||
if(effect.animation_name != "Swim")
|
||||
|
|
@ -1109,7 +1109,7 @@ func DoKneel(bool create_dust)
|
|||
|
||||
SetXDir(0);
|
||||
SetAction("Kneel");
|
||||
Sound("RustleLand");
|
||||
Sound("Clonk::Movement::RustleLand");
|
||||
PlayAnimation("KneelDown", CLONK_ANIM_SLOT_Movement, Anim_Linear(0, 0, GetAnimationLength("KneelDown"), iKneelDownSpeed, ANIM_Remove), Anim_Linear(0, 0, 1000, 5, ANIM_Remove));
|
||||
|
||||
ScheduleCall(this, "EndKneel", iKneelDownSpeed, 1);
|
||||
|
|
@ -1150,7 +1150,7 @@ func DoRoll()
|
|||
func OnStartRoll()
|
||||
{
|
||||
SetTurnForced(GetDir());
|
||||
Sound("Roll");
|
||||
Sound("Clonk::Movement::Roll");
|
||||
if(GetDir() == 1) lAnim.rollDir = 1;
|
||||
else
|
||||
lAnim.rollDir = -1;
|
||||
|
|
@ -1237,7 +1237,7 @@ func FxIntDigStart(pTarget, effect, fTmp)
|
|||
UpdateAttach();
|
||||
|
||||
// Sound
|
||||
Sound("Dig?");
|
||||
Sound("Clonk::Action::Dig::Dig?");
|
||||
|
||||
// Set proper turn type
|
||||
SetTurnType(0);
|
||||
|
|
@ -1247,7 +1247,7 @@ func FxIntDigTimer(pTarget, effect, iTime)
|
|||
{
|
||||
if(iTime % 36 == 0)
|
||||
{
|
||||
Sound("Dig?");
|
||||
Sound("Clonk::Action::Dig::Dig?");
|
||||
}
|
||||
if( (iTime-18) % 36 == 0 || iTime > 35)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -113,9 +113,9 @@ protected func CatchBlow()
|
|||
protected func Hurt()
|
||||
{
|
||||
if(gender == 0)
|
||||
Sound("Hurt?");
|
||||
Sound("Clonk::Verbal::Hurt?");
|
||||
else
|
||||
Sound("FHurt?");
|
||||
Sound("Clonk::Verbal::FHurt?");
|
||||
}
|
||||
|
||||
protected func Grab(object pTarget, bool fGrab)
|
||||
|
|
@ -149,9 +149,9 @@ protected func Death(int killed_by)
|
|||
if (!this.silent_death)
|
||||
{
|
||||
if(gender == 0)
|
||||
Sound("Die");
|
||||
Sound("Clonk::Verbal::Die");
|
||||
else
|
||||
Sound("FDie");
|
||||
Sound("Clonk::Verbal::FDie");
|
||||
|
||||
DeathAnnounce();
|
||||
}
|
||||
|
|
@ -190,7 +190,7 @@ public func Eat(object food)
|
|||
{
|
||||
Heal(food->NutritionalValue());
|
||||
food->RemoveObject();
|
||||
Sound("Munch?");
|
||||
Sound("Clonk::Action::Munch?");
|
||||
SetAction("Eat");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ private func FxMoveTimer(object target, effect fx, int time)
|
|||
{
|
||||
if (!GBackLiquid(0, -3) && !fx.is_explosive)
|
||||
SetGraphics("3");
|
||||
Sound("Bubble*");
|
||||
Sound("Liquids::Bubble*");
|
||||
FadeOut(50, true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public func Construction()
|
|||
}
|
||||
|
||||
AddEffect("Move", this, 1, 2, this);
|
||||
Sound("Bubble*");
|
||||
Sound("Liquids::Bubble*");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -66,15 +66,15 @@ protected func FxIntEarthquakeStart(object target, effect)
|
|||
{
|
||||
// Start sound at quake local coordinates.
|
||||
// < Maikel> Global until someone implements non-object local sounds
|
||||
Sound("Earthquake", true, 100, nil, 1);
|
||||
Sound("Environment::Disasters::Earthquake", true, 100, nil, 1);
|
||||
return FX_OK;
|
||||
}
|
||||
|
||||
protected func FxIntEarthquakeStop(object target, effect)
|
||||
{
|
||||
// Stop sound.
|
||||
Sound("Earthquake", true, 100, nil, -1);
|
||||
Sound("EarthquakeEnd",true);
|
||||
Sound("Environment::Disasters::Earthquake", true, 100, nil, -1);
|
||||
Sound("Environment::Disasters::EarthquakeEnd",true);
|
||||
return FX_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ protected func Hit(int dx, int dy)
|
|||
// Acid kills rockfall
|
||||
if (GetMaterialVal("Corrosive", "Material", GetMaterial()))
|
||||
{
|
||||
Sound("Pshshsh");
|
||||
Sound("Liquids::Pshshsh");
|
||||
var sz = Max(GetCon()/10, 5);
|
||||
var particles = new Particles_Dust() { Size = sz*3, };
|
||||
if (is_explosive)
|
||||
|
|
@ -244,7 +244,7 @@ protected func Hit(int dx, int dy)
|
|||
}
|
||||
|
||||
// Sound.
|
||||
Sound("EarthquakeEnd", nil, 3 * GetCon() / 2);
|
||||
Sound("Environment::Disasters::EarthquakeEnd", nil, 3 * GetCon() / 2);
|
||||
StonyObjectHit(dx, dy);
|
||||
return;
|
||||
}
|
||||
|
|
@ -289,7 +289,7 @@ private func SplitRock()
|
|||
CreateParticle("SmokeDirty", PV_Random(-5, 5), PV_Random(-5, 5), 0, PV_Random(-2, 0), PV_Random(50, 100), rock_explode, 8);
|
||||
|
||||
// Some sound effects.
|
||||
Sound("EarthquakeEnd", nil, 100);
|
||||
Sound("Environment::Disasters::EarthquakeEnd", nil, 100);
|
||||
|
||||
RemoveObject();
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ private func Hit()
|
|||
if (GetR() != 0) height *= -1;
|
||||
|
||||
CreateParticle("SmokeDirty", PV_Random(-width, width), PV_Random(0, height), PV_Random(-5, 5), PV_Random(-5, 15), PV_Random(10, 60), particles, 200);
|
||||
Sound("Rockfall*");
|
||||
Sound("Hits::Materials::Rock::Rockfall*");
|
||||
|
||||
for (var i = 0; i < 4; i++)
|
||||
{
|
||||
|
|
@ -180,7 +180,7 @@ private func DrawWaterSource()
|
|||
private func DoWaterdrop()
|
||||
{
|
||||
if (Random(9)) return;
|
||||
Sound("Waterdrop*");
|
||||
Sound("Liquids::Waterdrop*");
|
||||
}
|
||||
|
||||
local Name = "$Name$";
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ protected func FxIntWaterfallStart(object target, proplist effect, int temporary
|
|||
effect.Strength = strength;
|
||||
effect.Material = mat;
|
||||
// Start sound.
|
||||
target->Sound("Waterfall", false, 5 * effect.Strength, nil, 1);
|
||||
target->Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, 1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ protected func FxIntWaterfallStop(object target, proplist effect, bool temporary
|
|||
if (temporary)
|
||||
return 1;
|
||||
// Stop sound.
|
||||
target->Sound("Waterfall", false, 5 * effect.Strength, nil, -1);
|
||||
target->Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, -1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ public func SetSoundLocation(int x, int y)
|
|||
// Update sound.
|
||||
var effect = GetEffect("IntWaterfall", this);
|
||||
if (effect)
|
||||
Sound("Waterfall", false, 5 * effect.Strength, nil, 1);
|
||||
Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ protected func CheckForClonks()
|
|||
{
|
||||
var team_clear = !ClearedByTeam(team);
|
||||
cleared_by_plr[plrid] = true;
|
||||
Sound("Cleared", false, 100, plr);
|
||||
Sound("UI::Cleared", false, 100, plr);
|
||||
cp_con->AddPlayerClearedCP(plr, this); // Notify parkour goal.
|
||||
if (ClearedByTeam(team) && team_clear)
|
||||
cp_con->AddTeamClearedCP(team, this); // Notify parkour goal.
|
||||
|
|
@ -232,7 +232,7 @@ protected func CheckForClonks()
|
|||
// Check finish status.
|
||||
if (cp_mode & PARKOUR_CP_Finish)
|
||||
{
|
||||
Sound("Cleared", false, 100, plr);
|
||||
Sound("UI::Cleared", false, 100, plr);
|
||||
cleared_by_plr[plrid] = true;
|
||||
if (team)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -531,12 +531,12 @@ public func OnMoveAllToClicked(int menu_id)
|
|||
|
||||
if (transfered > 0)
|
||||
{
|
||||
Sound("SoftTouch*", true, nil, GetOwner());
|
||||
Sound("Hits::SoftTouch*", true, nil, GetOwner());
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
Sound("BalloonPop", true, nil, GetOwner());
|
||||
Sound("Objects::Balloon::Pop", true, nil, GetOwner());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -869,7 +869,7 @@ private func OnContentsSelection(symbol, extra_data)
|
|||
if (!other_target->~IsContainer())
|
||||
{
|
||||
// Todo: other sound for "nope".
|
||||
Sound("LightMetalHit*", nil, 10, GetController(), nil, nil, -50);
|
||||
Sound("Hits::Materials::Metal::LightMetalHit*", nil, 10, GetController(), nil, nil, -50);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -926,12 +926,12 @@ private func OnContentsSelection(symbol, extra_data)
|
|||
// Did we at least transfer one item?
|
||||
if (successful_transfers > 0)
|
||||
{
|
||||
Sound("SoftTouch*", true, nil, GetOwner());
|
||||
Sound("Hits::SoftTouch*", true, nil, GetOwner());
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Sound("BalloonPop", true, nil, GetOwner());
|
||||
Sound("Objects::Balloon::Pop", true, nil, GetOwner());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public func SetTime(int to_time)
|
|||
var play_for = GetOwner();
|
||||
if (play_for == NO_OWNER)
|
||||
play_for = nil;
|
||||
Sound("Click", true, 80, play_for);
|
||||
Sound("UI::Click", true, 80, play_for);
|
||||
}
|
||||
clock_gui_menu.text.Text = Format("<c %x>%02d:%02d</c>", color, minutes, seconds);
|
||||
GuiUpdate(clock_gui_menu, clock_gui_id);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public func Start(string name, int progress, ...)
|
|||
}
|
||||
started = true;
|
||||
// Sound effect.
|
||||
Sound("Ding", true);
|
||||
Sound("UI::Ding", true);
|
||||
// Call start function of this scene.
|
||||
var fn_start = Format("%s_Start", seq_name);
|
||||
if (!Call(fn_start, ...))
|
||||
|
|
@ -108,7 +108,7 @@ public func Stop(bool no_remove)
|
|||
// Per-player sequence callback.
|
||||
RemovePlayer(plr);
|
||||
}
|
||||
Sound("Ding", true);
|
||||
Sound("UI::Ding", true);
|
||||
started = false;
|
||||
// Call stop function of this scene.
|
||||
var fn_init = Format("~%s_Stop", seq_name);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
/* Eating */
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ protected func Construction()
|
|||
|
||||
func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
/* Eating */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func IsWindmillProduct() { return true; }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("SoftHit1");
|
||||
Sound("Hits::SoftHit1");
|
||||
}
|
||||
|
||||
public func Construction()
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ public func GetCarryTransform(clonk)
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func IsLoomProduct() { return true; }
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public func GetCarryBone() { return "main"; }
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func IsFuel() { return true; }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
public func Hit()
|
||||
{
|
||||
Sound("GlassHit?");
|
||||
Sound("Hits::Materials::Glass::GlassHit?");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ private func CheckFree(bool by_dig_free)
|
|||
AddEffect("MuchSparkle", this, 1, 1, this);
|
||||
this.Visibility = VIS_All;
|
||||
// Also, some sound (delayed for audibility on visibility change)
|
||||
if (by_dig_free) ScheduleCall(this, Global.Sound, 1,1, "DiamondDigOut");
|
||||
if (by_dig_free) ScheduleCall(this, Global.Sound, 1,1, "Objects::DiamondDigOut");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ public func OnHitByPickaxe()
|
|||
if(!c) return;
|
||||
if(Random(3)) return;
|
||||
|
||||
Sound("RockHit*");
|
||||
Sound("Hits::Materials::Rock::RockHit*");
|
||||
DetachMesh(attached_mesh);
|
||||
c->Exit(0, 0, 0, RandomX(-3, 3), RandomX(-3, -1), RandomX(-20, 20));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ protected func Hit()
|
|||
{
|
||||
|
||||
CastPXS("Earth", GetMaterialAmount() * GetStackCount(), 18);
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
RemoveObject();
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ func Hit()
|
|||
|
||||
func Fuse()
|
||||
{
|
||||
Sound("FuseShort");
|
||||
Sound("Fire::FuseShort");
|
||||
CreateParticle("Fire", 0, 0, PV_Random(-5, 5), PV_Random(-15, 5), PV_Random(10, 40), Particles_Glimmer(), 5);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("IceHit?");
|
||||
Sound("Hits::IceHit?");
|
||||
}
|
||||
|
||||
protected func Construction()
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ protected func Construction()
|
|||
// Impact sound
|
||||
func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func RejectUse(object clonk)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ protected func Construction()
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ func OnSale(int to_player, object sale_base)
|
|||
|
||||
func Hit()
|
||||
{
|
||||
Sound("GlassHit*");
|
||||
Sound("Hits::Materials::Glass::GlassHit*");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -41,7 +41,7 @@ public func ControlUse(object clonk, int x, int y, bool box)
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func IsMillIngredient() { return true; }
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ protected func Construction()
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
local Collectible = 1;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("WoodHit?");
|
||||
Sound("Hits::Materials::Wood::WoodHit?");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ func FxIntAxeTimer(object clonk, effect, int time)
|
|||
//This block is executed when the axe hits the tree
|
||||
if((time + 25) % axe_swing_time == 1)
|
||||
{
|
||||
Sound("Chop?");
|
||||
Sound("Environment::Tree::Chop?");
|
||||
|
||||
//Which direction does the clonk face?
|
||||
var x = 10;
|
||||
|
|
@ -243,7 +243,7 @@ func FxIntSplitTimer(object clonk, effect, int time)
|
|||
//This block is executed when the axe hits the tree
|
||||
if ((time + 25) % axe_swing_time == 1)
|
||||
{
|
||||
Sound("Chop?");
|
||||
Sound("Environment::Tree::Chop?");
|
||||
|
||||
//Which direction does the clonk face?
|
||||
var x = 10;
|
||||
|
|
@ -346,7 +346,7 @@ func CheckStrike(iTime)
|
|||
DoWeaponSlow(obj, 200);
|
||||
|
||||
// sound and done. We can only hit one target
|
||||
Sound("WeaponHit?", false);
|
||||
Sound("Objects::Weapons::WeaponHit?", false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ public func OnProjectileHit()
|
|||
{
|
||||
// Pop the balloon and tumble the rider.
|
||||
CreateParticle("Air", 0, -10, PV_Random(-10, 10), PV_Random(-10, 10), 10, Particles_Air(), 30);
|
||||
Sound("BalloonPop");
|
||||
Sound("Objects::Balloon::Pop");
|
||||
if (rider)
|
||||
{
|
||||
rider->SetAction("Tumble");
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public func ControlUseStart(object clonk)
|
|||
balloon->SetParent(this);
|
||||
|
||||
// Sound.
|
||||
Sound("BalloonInflate");
|
||||
Sound("Objects::Balloon::Inflate");
|
||||
|
||||
// Make the clonk ride the balloon.
|
||||
clonk->SetAction("Ride", balloon);
|
||||
|
|
@ -44,7 +44,7 @@ public func QueryRejectDeparture(object clonk)
|
|||
|
||||
public func Hit()
|
||||
{
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
}
|
||||
|
||||
public func IsInventorProduct() { return true; }
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("DullMetalHit?");
|
||||
Sound("Hits::Materials::Metal::DullMetalHit?");
|
||||
if (iVolume >= 1)
|
||||
{
|
||||
if (GBackLiquid(0, 7) && GetMaterial(0, 7) != szLiquid)
|
||||
return 0;
|
||||
EmptyBarrel(GetR());
|
||||
Sound("Splash1");
|
||||
Sound("Liquids::Splash1");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ protected func Initialize()
|
|||
|
||||
private func Hit()
|
||||
{
|
||||
Sound("DullWoodHit?");
|
||||
Sound("Hits::Materials::Wood::DullWoodHit?");
|
||||
if (iVolume >= 1)
|
||||
{
|
||||
if (GBackLiquid(0, 3) && GetMaterial(0, 3) != szLiquid)
|
||||
return 0;
|
||||
EmptyBarrel(GetR());
|
||||
Sound("Splash1");
|
||||
Sound("Liquids::Splash1");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ protected func FxFlightTimer(object pTarget, effect, int iEffectTime)
|
|||
JumpOff(rider,30);
|
||||
}
|
||||
|
||||
if(!Random(105)) Sound("Cracker");
|
||||
if(!Random(105)) Sound("Fire::Cracker");
|
||||
|
||||
if(fuel<=0)
|
||||
{
|
||||
|
|
@ -169,7 +169,7 @@ protected func Hit()
|
|||
JumpOff(rider);
|
||||
}
|
||||
//Message("I have hit something",this);
|
||||
Sound("GeneralHit?");
|
||||
Sound("Hits::GeneralHit?");
|
||||
if(GetEffect("Flight",this)) DoFireworks();
|
||||
}
|
||||
|
||||
|
|
@ -211,9 +211,9 @@ func Launch(int angle, object clonk)
|
|||
SetCategory(C4D_Vehicle);
|
||||
|
||||
Exit();
|
||||
Sound("BoompackLaunch");
|
||||
Sound("Objects::Boompack::Launch");
|
||||
AddEffect("Flight",this,150,1,this);
|
||||
Sound("BoompackFly", false, 60, nil, 1);
|
||||
Sound("Objects::Boompack::Fly", false, 60, nil, 1);
|
||||
//AddEffect("HitCheck", this, 1,1, nil,nil, clonk, true);
|
||||
|
||||
//Ride the rocket!
|
||||
|
|
@ -245,7 +245,7 @@ func DoFireworks()
|
|||
{
|
||||
RemoveEffect("Flight",this);
|
||||
Fireworks();
|
||||
Sound("BlastFirework", false, 200);
|
||||
Sound("Fire::BlastFirework", false, 200);
|
||||
Explode(30);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ private func Spill(int angle)
|
|||
|
||||
protected func Hit()
|
||||
{
|
||||
Sound("DullWoodHit?");
|
||||
Sound("Hits::Materials::Wood::DullWoodHit?");
|
||||
}
|
||||
|
||||
// Can collect IsBucketMaterial?
|
||||
|
|
|
|||
|
|
@ -47,14 +47,14 @@ private func Open()
|
|||
{
|
||||
StopAnimation(crateanim);
|
||||
crateanim = PlayAnimation("Open", 5, Anim_Linear(0, 0, GetAnimationLength("Open"), 22, ANIM_Hold), Anim_Const(1000));
|
||||
Sound("ChestOpen");
|
||||
Sound("Structures::Chest::Open");
|
||||
}
|
||||
|
||||
private func Close()
|
||||
{
|
||||
StopAnimation(crateanim);
|
||||
crateanim = PlayAnimation("Close", 5, Anim_Linear(0, 0, GetAnimationLength("Close"), 15, ANIM_Hold), Anim_Const(1000));
|
||||
Sound("ChestClose");
|
||||
Sound("Structures::Chest::Close");
|
||||
}
|
||||
|
||||
protected func Definition(def)
|
||||
|
|
@ -68,7 +68,7 @@ public func IsContainer() { return true; }
|
|||
|
||||
func Hit()
|
||||
{
|
||||
Sound("DullWoodHit?");
|
||||
Sound("Hits::Materials::Wood::DullWoodHit?");
|
||||
}
|
||||
|
||||
local Name = "$Name$";
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ private func Place(object clonk, int x, int y, bool box)
|
|||
if(box) SetReady();
|
||||
|
||||
// put into ...
|
||||
Sound("Connect");
|
||||
Sound("Objects::Connect");
|
||||
Exit(pos[0], pos[1], Angle(pos[0],pos[1]));
|
||||
SetPosition(clonk->GetX()+pos[0], clonk->GetY()+pos[1]);
|
||||
return true;
|
||||
|
|
@ -74,7 +74,7 @@ public func Fuse()
|
|||
if (GetAction() != "Fuse")
|
||||
{
|
||||
if (!FindObject(Find_Category(C4D_StaticBack), Find_Func("IsFuse"), Find_ActionTargets(this)))
|
||||
Sound("Fuse");
|
||||
Sound("Fire::Fuse");
|
||||
SetAction("Fuse");
|
||||
// Object can't be collected anymore when it fuses.
|
||||
this.Collectible = false;
|
||||
|
|
@ -96,7 +96,7 @@ private func GetWall(int angle)
|
|||
return false;
|
||||
}
|
||||
|
||||
protected func Hit() { Sound("GeneralHit?"); }
|
||||
protected func Hit() { Sound("Hits::GeneralHit?"); }
|
||||
|
||||
protected func Incineration(int caused_by)
|
||||
{
|
||||
|
|
@ -185,7 +185,7 @@ local ActMap = {
|
|||
Delay = 1,
|
||||
Length = 1,
|
||||
FacetBase = 1,
|
||||
Sound = "Fusing",
|
||||
Sound = "Fire::FuseLoop",
|
||||
StartCall = "Fusing"
|
||||
},
|
||||
Ready = {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ protected func FxIntFusingStart(object target, proplist effect, int temporary)
|
|||
if (temporary)
|
||||
return FX_OK;
|
||||
SetAction("Fusing");
|
||||
Sound("FuseLoop", false, 75, nil, 1);
|
||||
Sound("Fire::FuseLoop", false, 75, nil, 1);
|
||||
return FX_OK;
|
||||
}
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ protected func FxIntFusingStop(object target, proplist effect, int reason, bool
|
|||
{
|
||||
if (temporary)
|
||||
return FX_OK;
|
||||
Sound("FuseLoop", false, 75, nil, -1);
|
||||
Sound("Fire::FuseLoop", false, 75, nil, -1);
|
||||
return FX_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue