OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

Partial implementation of Autocannon.

Browse source 
Fix mouse input in menus (among other things).
This commit is contained in:
Marisa the Magician 2019-09-20 16:03:06 +02:00
commit f6ed8c5281
5 changed files with 195 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

83
zscript/gatling.zsc
View file

@ -69,6 +69,28 @@ Class SMiniGun : UnrealWeapon
Destroy();
}
}
action void A_SMiniFire( bool bAlt = false )
{
if ( bAlt ) invoker.special1 = 0;
else
{
State which = ResolveState("FireOne");
if ( invoker.special1 == 1 ) which = ResolveState("FireTwo");
else if ( invoker.special1 == 2 ) which = ResolveState("FireThree");
else if ( invoker.special1 == 3 ) which = ResolveState("FireFour");
player.SetPSprite(PSP_WEAPON,which);
invoker.special1 = (invoker.special1%4)+1;
}
A_PlaySound(bAlt?"smini/altfire":"smini/fire",CHAN_WEAPON);
// TODO everything
}
action void A_Cooldown()
{
// TODO steam effect
invoker.special2--;
if ( invoker.special2 <= 0 )
player.SetPSprite(PSP_WEAPON,ResolveState("Idle"));
}
Default
{
Tag "$T_SMINI";
@ -94,5 +116,66 @@ Class SMiniGun : UnrealWeapon
Stop;
SMIP B -1;
Stop;
Select:
SMIS A 1 A_Raise(int.max);
Wait;
Ready:
SMIS ABCDEFGHI 2 A_WeaponReady(WRF_NOFIRE);
Goto Idle;
Dummy:
TNT1 A 1
{
A_CheckReload();
A_WeaponReady();
}
Wait;
Idle:
SMII A 0 A_Overlay(-9999,"Dummy");
SMII ABCDE 20;
Goto Idle+1;
Fire:
SMIF A 0
{
A_Overlay(-9999,"Dummy");
A_SMiniFire(false);
}
FireOne:
SMIF ABCDEF 2;
SMII A 0 A_Refire("Fire");
Goto Release;
FireTwo:
SMIF GHIJKL 2;
SMII A 0 A_Refire("Fire");
Goto Release;
FireThree:
SMIF MNOPQR 2;
SMII A 0 A_Refire("Fire");
Goto Release;
FireFour:
SMIF STUVWX 2;
SMII A 0 A_Refire("Fire");
Goto Release;
AltFire:
SMIA A 0
{
A_Overlay(-9999,"Dummy");
A_SMiniFire(true);
}
SMIA ABCDEFGHIJ 3;
SMII A 0 A_Refire("AltFire");
Goto Release;
Release:
SMII A 0
{
A_PlaySound("smini/endfire",CHAN_ITEM);
invoker.special2 = 25;
}
SMII A 1 A_Cooldown();
Wait;
Deselect:
#### # 1 A_Overlay(-9999,"Null");
SMID ABCDEF 1;
SMID F 1 A_Lower(int.max);
Wait;
}
}

42
zscript/unrealmenus.zsc
View file

@ -1,17 +1,16 @@
// draws unreal-style main menu
Class ListMenuItemUnrealBg : ListMenuItem
Class UnrealListMenu : ListMenu
{
TextureID tex[3];
void Init( ListMenuDescriptor desc, String dummy )
override void Init( Menu parent, ListMenuDescriptor desc )
{
Super.Init(0,0);
Super.Init(parent,desc);
tex[0] = TexMan.CheckForTexture("graphics/rmetal.png",TexMan.Type_Any);
tex[1] = TexMan.CheckForTexture("graphics/menubarr.png",TexMan.Type_Any);
tex[2] = TexMan.CheckForTexture("graphics/unlogo.png",TexMan.Type_Any);
}
override void Drawer( bool selected )
override void Drawer()
{
double StartX = 0.5*CleanWidth_1-128;
int num = (CleanHeight_1/512)+1;
@ -19,6 +18,30 @@ Class ListMenuItemUnrealBg : ListMenuItem
Screen.DrawTexture(tex[0],false,StartX*CleanXFac_1,512*CleanYFac_1*i,DTA_CleanNoMove_1,true);
Screen.DrawTexture(tex[1],false,StartX*CleanXFac_1,(CleanHeight_1-58)*CleanYFac_1,DTA_CleanNoMove_1,true,DTA_LegacyRenderStyle,STYLE_Add);
Screen.DrawTexture(tex[2],false,StartX*CleanXFac_1,(CleanHeight_1-52)*CleanYFac_1,DTA_CleanNoMove_1,true);
Super.Drawer();
}
override bool MouseEvent( int type, int x, int y )
{
int sel = -1;
if ( mFocusControl )
{
mFocusControl.MouseEvent(type,x,y);
return true;
}
else
{
for ( int i=0; i<mDesc.mItems.Size(); i++ )
{
if ( mDesc.mItems[i].CheckCoordinate(x,y) )
{
mDesc.mSelectedItem = i;
mDesc.mItems[i].MouseEvent(type,x,y);
return true;
}
}
}
mDesc.mSelectedItem = -1;
return true;
}
}
@ -67,14 +90,13 @@ Class ListMenuItemUnrealTextItem : ListMenuItemSelectable
override bool CheckCoordinate( int x, int y )
{
/*String str = StringTable.Localize(mText);
String str = StringTable.Localize(mText);
let fnt = (generic_ui||!mFont.CanPrint(str))?NewSmallFont:mFont;
int w = fnt.StringWidth(str);
int h = fnt.GetHeight();
double basex = floor(0.5*(CleanWidth_1-w));
double basey = floor(0.25*(CleanHeight_1-mSpacing*5));
return (mEnabled && (x >= basex) && (x < basex+w) && (y >= basey) && (y < basey+h));*/
return false; // since we can't change the main menu class, this won't work anyway
double basex = floor(0.5*(CleanWidth_1-w))+mXPos;
double basey = floor(0.25*(CleanHeight_1-mSpacing*5))+mYPos;
return (mEnabled && (x >= basex) && (x < basex+w) && (y >= basey) && (y < basey+h));
}
override void DrawSelector( double xofs, double yofs, TextureID tex )