forked from Mirrors/openclonk
Merge ..
commit
7446d01096
Binary file not shown.
|
@ -0,0 +1,5 @@
|
|||
[Script]
|
||||
GlobalNamed=5;Action=p99,CLNK_WalkStates=a[5;s"Stand",s"Walk",s"Run",s"StandTurn",s"RunTurn"],CLNK_HangleStates=a[2;s"HangleStand",s"Hangle"],CLNK_SwimStates=A,jumpx=A
|
||||
|
||||
[Effects]
|
||||
GlobalEffects=IntGoalCheck(1,1,97045,35,0,NONE)[1;O148]
|
Binary file not shown.
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
@ -0,0 +1,225 @@
|
|||
[Object]
|
||||
id=RACE
|
||||
Number=148
|
||||
Category=33
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F3276800
|
||||
FixY=F3211264
|
||||
Width=1
|
||||
Height=1
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=7;fWon=A,iLeader=i0,iTeamCount=A,fTeamTie=A,player_deaths=a[1;i0],team_deaths=A,missionPassword=A
|
||||
|
||||
[Object]
|
||||
id=HUDC
|
||||
Number=151
|
||||
Timer=25
|
||||
Category=65
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F93782016
|
||||
FixY=F42401792
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=2;actionbar=a[3;],wealth=A
|
||||
|
||||
[Object]
|
||||
id=WEAL
|
||||
Number=153
|
||||
Timer=25
|
||||
Category=44040193
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F-3145728
|
||||
FixY=F2621440
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=0
|
||||
Graphics=WEAL::2
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=155
|
||||
Timer=25
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F4194304
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i1,crew=A,hotkey=i1,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=3,ACBT::One,1,,0,0,(0.4,0,-16,0,0.4,-12,1),16777215,0;12,NUMB::1,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=156
|
||||
Timer=25
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F9175040
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i0,crew=A,hotkey=i2,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=12,NUMB::2,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=157
|
||||
Timer=25
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F14155776
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i2,crew=A,hotkey=i3,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=4,ACBT::Two,1,,0,0,(0.4,0,8,0,0.4,-12,1),16777215,0;12,NUMB::3,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=RSTR
|
||||
Number=158
|
||||
Timer=24
|
||||
Category=524289
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F3932160
|
||||
FixY=F3801088
|
||||
Width=1
|
||||
Height=1
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=0
|
||||
|
||||
[Object]
|
||||
id=HGOL
|
||||
Number=159
|
||||
Timer=25
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F-7340032
|
||||
FixY=F2621440
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=1;goal=A
|
||||
GfxOverlay=1,RACE::,4,,0,0,(1,0,0,0,1,0,1),16777215,0
|
||||
|
||||
[Object]
|
||||
id=HUDC
|
||||
Number=162
|
||||
Timer=8
|
||||
Category=65
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F30146560
|
||||
FixY=F31326208
|
||||
Picture=0,0,0,0
|
||||
OCF=35651649
|
||||
LocalNamed=2;actionbar=a[3;O166,O167,O168],wealth=O164
|
||||
|
||||
[Object]
|
||||
id=WEAL
|
||||
Number=164
|
||||
Timer=8
|
||||
Category=44040193
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F-3145728
|
||||
FixY=F2621440
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=0
|
||||
Graphics=WEAL::2
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=166
|
||||
Timer=8
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F4194304
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i1,crew=A,hotkey=i1,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=3,ACBT::One,1,,0,0,(0.4,0,-16,0,0.4,-12,1),16777215,0;12,NUMB::1,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=167
|
||||
Timer=8
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F9175040
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i0,crew=A,hotkey=i2,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=12,NUMB::2,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=ACBT
|
||||
Number=168
|
||||
Timer=8
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F14155776
|
||||
FixY=F-3145728
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=6;selected=i2,crew=A,hotkey=i3,myobject=A,actiontype=i0,subselector=A
|
||||
GfxOverlay=4,ACBT::Two,1,,0,0,(0.4,0,8,0,0.4,-12,1),16777215,0;12,NUMB::3,4,,0,0,(0.3,0,16,0,0.3,-34,1),-6291456,0
|
||||
|
||||
[Object]
|
||||
id=HGOL
|
||||
Number=169
|
||||
Timer=25
|
||||
Category=48234497
|
||||
Size=100000
|
||||
Mass=1
|
||||
FixX=F-7340032
|
||||
FixY=F2621440
|
||||
Width=64
|
||||
Height=64
|
||||
Offset=-32,-32
|
||||
Picture=0,0,0,0
|
||||
OCF=203423809
|
||||
LocalNamed=1;goal=O148
|
||||
GfxOverlay=1,RACE::,4,,0,0,(1,0,0,0,1,0,1),16777215,0
|
||||
|
Binary file not shown.
|
@ -2,7 +2,11 @@
|
|||
|
||||
func Initialize()
|
||||
{
|
||||
CreateObject(DYNA,1050,1150,-1);
|
||||
CreateObject(DYNA,1050,1150,-1);
|
||||
|
||||
CreateObject(DYNA,500,900,-1);
|
||||
CreateObject(DYNA,500,900,-1);
|
||||
}
|
||||
|
||||
func InitializePlayer(int plr)
|
||||
|
@ -14,7 +18,7 @@ private func JoinPlayer(int plr)
|
|||
{
|
||||
var obj=GetCrew(plr);
|
||||
obj->DoEnergy(100000);
|
||||
obj->SetPosition(10+Random(50), LandscapeHeight()/2-30);
|
||||
obj->SetPosition(20+Random(10),1000);
|
||||
obj->CreateContents(MJOW);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[Teams]
|
||||
Active=false
|
||||
Custom=false
|
||||
AllowHostilityChange=true
|
||||
AutoGenerateTeams=true
|
||||
[Teams]
|
||||
Active=false
|
||||
Custom=false
|
||||
AllowHostilityChange=true
|
||||
AutoGenerateTeams=true
|
||||
|
|
|
@ -18,7 +18,7 @@ local iBarrel;
|
|||
|
||||
protected func Initialize()
|
||||
{
|
||||
MaxCap=60; //Changes duration and power of the Jar
|
||||
MaxCap=50; //Changes duration and power of the Jar
|
||||
}
|
||||
|
||||
protected func HoldingEnabled() { return true; }
|
||||
|
@ -76,7 +76,7 @@ protected func ControlUseStop(object pClonk, ix, iy)
|
|||
FireWeapon(pClonk, ix, iy);
|
||||
return 1;
|
||||
}
|
||||
else Message("Not Enough...",pClonk);
|
||||
else Message("Not.",pClonk);
|
||||
//Sound(" :-( ");
|
||||
return 1;
|
||||
}
|
||||
|
@ -115,8 +115,46 @@ private func FireWeapon(object pClonk,iX,iY)
|
|||
{ //Makes the clonk be pushed backwards a bit
|
||||
var x=pClonk->GetXDir();
|
||||
var y=pClonk->GetYDir();
|
||||
pClonk->SetXDir((x)-(sinspeed/4)+6);
|
||||
pClonk->SetYDir((y)-(cosspeed/4)+6);
|
||||
//Sound(" :-( ");
|
||||
return 1;
|
||||
}
|
||||
|
||||
private func FireWeapon(object pClonk,iX,iY)
|
||||
{
|
||||
|
||||
var iAngle=Angle(0,0,iX,iY);
|
||||
|
||||
Message("Bang!", pClonk); //For debug.
|
||||
|
||||
//Find Victims to push
|
||||
for(var i=10; i<32; i++)
|
||||
{
|
||||
|
||||
var R=RandomX(-20,20);
|
||||
var SX=Sin(180-Angle(0,0,iX,iY)+R,i);
|
||||
var SY=Cos(180-Angle(0,0,iX,iY)+R,i);
|
||||
|
||||
if(!GBackSolid(SX,SY))
|
||||
{
|
||||
CreateParticle("Air",
|
||||
SX,SY,
|
||||
Sin(180-Angle(0,0,iX,iY)+(R),(Amount/2)+25),
|
||||
Cos(180-Angle(0,0,iX,iY)+(R),(Amount/2)+25),
|
||||
Max(i,60),
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
var sinspeed=Sin(180-Angle(0,0,iX,iY)+(R/2),(Amount)+15);
|
||||
var cosspeed=Cos(180-Angle(0,0,iX,iY)+(R/2),(Amount)+15);
|
||||
|
||||
if(pClonk->GetAction() != "Walk")
|
||||
{ //Makes the clonk be pushed backwards a bit
|
||||
var x=pClonk->GetXDir();
|
||||
var y=pClonk->GetYDir();
|
||||
pClonk->SetXDir((x)-(sinspeed/3));
|
||||
pClonk->SetYDir((y)-(cosspeed/3));
|
||||
}
|
||||
|
||||
|
||||
|
@ -125,7 +163,8 @@ private func FireWeapon(object pClonk,iX,iY)
|
|||
Find_Distance(10,Sin(180-Angle(0,0,iX,iY),20),Cos(180-Angle(0,0,iX,iY),20)),
|
||||
Find_Distance(18,Sin(180-Angle(0,0,iX,iY),40),Cos(180-Angle(0,0,iX,iY),40)),
|
||||
Find_Distance(25,Sin(180-Angle(0,0,iX,iY),70),Cos(180-Angle(0,0,iX,iY),70))
|
||||
)
|
||||
)
|
||||
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -134,8 +173,37 @@ private func FireWeapon(object pClonk,iX,iY)
|
|||
{
|
||||
var x=obj->GetXDir();
|
||||
var y=obj->GetYDir();
|
||||
obj->SetXDir((x/30)+sinspeed);
|
||||
obj->SetYDir((y/30)+cosspeed);
|
||||
)
|
||||
)
|
||||
|
||||
{
|
||||
if(obj!=pClonk && PathFree(pClonk->GetX(),pClonk->GetY(),obj->GetX(),obj->GetY()))
|
||||
{
|
||||
var x=obj->GetXDir();
|
||||
var y=obj->GetYDir();
|
||||
obj->SetXDir((x)+sinspeed);
|
||||
obj->SetYDir((y)+cosspeed);
|
||||
//enemys are pushed back
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private func CheckCanUse(object pClonk)
|
||||
{
|
||||
if(pClonk->GetOCF() & OCF_NotContained)
|
||||
{
|
||||
if(pClonk->GetAction() == "Walk" || pClonk->GetAction() == "Jump") return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
func Definition(def) {
|
||||
SetProperty("Name", "$Name$", def);
|
||||
}
|
||||
//enemys are pushed back
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue