fix wind bag rename

scancodes-fix
Tobias Zwick 2013-05-25 14:36:04 +02:00
parent 52a1d5c18e
commit ba426651ad
10 changed files with 18 additions and 18 deletions

View File

@ -140,7 +140,7 @@ protected func Initialize()
grass->SetR(r[i]);
}
// Blue chest with jar of winds.
// Blue chest with wind bag
var chest_blue = CreateObject(Chest, 850, 648, NO_OWNER);
chest_blue->SetClrModulation(RGB(100,180,255));
AddEffect("FillBlueChest", chest_blue, 100, 72);
@ -267,7 +267,7 @@ global func FxFillBlueChestStart(object target, proplist effect, int temporary)
{
if (temporary)
return 1;
target->CreateContents(JarOfWinds);
target->CreateContents(WindBag);
var w_list = [Firestone, Boompack, Balloon, FireballScroll, WindScroll];
for (var i = 0; i < 4; i++)
target->CreateContents(w_list[Random(GetLength(w_list))]);
@ -282,8 +282,8 @@ global func FxFillBlueChestTimer(object target, proplist effect)
if (target->ContentsCount() < 6)
target->CreateContents(w_list[Random(GetLength(w_list))]);
if (!FindObject(Find_ID(JarOfWinds)))
target->CreateContents(JarOfWinds);
if (!FindObject(Find_ID(WindBag)))
target->CreateContents(WindBag);
return 1;
}

View File

@ -1,6 +1,6 @@
// Limits the use of an object to a certain amount.
#appendto JarOfWinds
#appendto WindBag
#appendto Club
local use_count;

View File

@ -366,4 +366,4 @@ public func FxIntGrappleControlStop(object target, fxnum, int reason, int tmp)
}
}
public func NoWindjarForce() { return true; }
public func NoWindbagForce() { return true; }

View File

@ -34,7 +34,7 @@ public func DoFullLoad()
protected func Initialize()
{
MaxCap = 60; //Changes duration and power of the Jar
MaxCap = 60; //Changes duration and power
SetR(-45);
AddEffect("JarReload",this,100,2,this);
sound=false;
@ -158,7 +158,7 @@ private func FireWeapon(object pClonk,iX,iY)
),
Find_Not(Find_Category(C4D_Structure)),
Find_Not(Find_Func("IsEnvironment")),
Find_Not(Find_Func("NoWindjarForce")),
Find_Not(Find_Func("NoWindbagForce")),
Find_Layer(GetObjectLayer()), Find_NoContainer()
)
)

View File

@ -1,9 +1,9 @@
#appendto Clonk
// The clonk can only hold one item and only collect Jar of Winds.
// The clonk can only hold one item and only collect the windbag
protected func RejectCollect(id objid, object obj)
{
if (objid != JarOfWinds)
if (objid != WindBag)
return true;
return _inherited(objid, obj);
}

View File

@ -3,7 +3,7 @@
Authors: Mimmo_O, Asmageddon, Maikel
Parkour on a dynamic map, the player starts on the bottom left and has to make it to the upper right.
The landscape consists of several pillers seperated by abyss, the player must use the grappler, jar of winds
The landscape consists of several pillers seperated by abyss, the player must use the grappler, wind bag
and shovel to cover the abyss and climb the pillars.
--*/
@ -55,7 +55,7 @@ protected func OnPlayerRespawn(int plr, object cp)
{
var clonk = GetCrew(plr);
clonk->CreateContents(GrappleBow);
clonk->CreateContents(JarOfWinds)->DoFullLoad();
clonk->CreateContents(WindBag)->DoFullLoad();
clonk->CreateContents(Shovel);
return;
}

View File

@ -1,4 +1,4 @@
// Clonks may only have one grapplebow and jar of winds.
// Clonks may only have one grapplebow and wind bag
#appendto Clonk
@ -7,8 +7,8 @@ protected func RejectCollect(id def)
if (def == GrappleBow)
if (ObjectCount(Find_Container(this), Find_ID(GrappleBow)) >= 1)
return true;
if (def == JarOfWinds)
if (ObjectCount(Find_Container(this), Find_ID(JarOfWinds)) >= 1)
if (def == WindBag)
if (ObjectCount(Find_Container(this), Find_ID(WindBag)) >= 1)
return true;
return _inherited(def, ...);
}

View File

@ -72,7 +72,7 @@ func CreateBonus(int x, int y, int value)
if (obj)
{
if (Random(value) > 90) obj->CreateContents(Shovel);
if (Random(value) > 90) obj->CreateContents(JarOfWinds);
if (Random(value) > 90) obj->CreateContents(WindBag);
if (Random(value) > 90) obj->CreateContents(TeleGlove);
if (Random(value) > 90) obj->CreateContents(Sword);
if (Random(value) > 5) obj->CreateContents(Loam, 1+Random(2));

View File

@ -63,7 +63,7 @@ func JoinPlayer(int plr)
if (!i)
{
crew->CreateContents(GrappleBow, 2);
crew->CreateContents(JarOfWinds);
crew->CreateContents(WindBag);
crew->CreateContents(TeleGlove);
crew->CreateContents(Dynamite, 2);
}

View File

@ -58,7 +58,7 @@ private func InitBase(int owner)
if (lorry)
{
//lorry->CreateContents(GrappleBow, GetStartupPlayerCount());
//lorry->CreateContents(JarOfWinds, 2);
//lorry->CreateContents(WindBag, 2);
//lorry->CreateContents(TeleGlove, 1);
lorry->CreateContents(Axe, 1);
lorry->CreateContents(Hammer, 1);