OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix a bunch of unfortunate typos.

Browse source 
Add placeholder classes for post-release collectibles.
This commit is contained in:
Mari the Deer 2021-03-24 18:47:37 +01:00
commit 517f49ded5
9 changed files with 350 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/compat/swwm_compat.zsc
View file

@ -20,7 +20,6 @@ Class SWWMLevelCompatibility : LevelPostProcessor
protected void Apply( Name checksum, String mapname )
{
int numcol = SWWMUtility.IsEviternity()?7:6;
int ncellsa = 0, ncellsb = 0;
int nbackpack = 0;
switch ( checksum )
@ -198,15 +197,12 @@ Class SWWMLevelCompatibility : LevelPostProcessor
nbackpack++;
}
break;
// Kinsie's Test Map (HERETIC)
// Kinsie's Test Map
case '0EADB2F82732A968B8513E4DC6138439':
numcol = 7;
// Kinsie's Test Map (HEXEN)
case 'D70250F93C6B6072DA39D9672B37F236':
numcol = 11;
// Kinsie's Test Map (DOOM)
case '959A613006CC3AA912C4A22908B7566A':
for ( int i=0; i<numcol; i++ )
// add collectibles
for ( int i=0; i<18; i++ )
AddThing(4206900+i,(1472+64*i,640,0));
break;
}

89
zscript/items/swwm_collectibles.zsc
View file

@ -14,10 +14,10 @@ Class SWWMCollectible : Inventory abstract
// minimum gametype requirements
enum EAvailability
{
AVAIL_Hexen,
AVAIL_None,
AVAIL_All,
AVAIL_Heretic,
AVAIL_Eviternity,
AVAIL_All
AVAIL_Hexen
};
Default
@ -39,8 +39,8 @@ Class SWWMCollectible : Inventory abstract
}
bool ValidGame() const
{
if ( avail == AVAIL_None ) return false;
if ( avail == AVAIL_All ) return true;
if ( (avail == AVAIL_Eviternity) && ((gameinfo.gametype&GAME_Raven) || SWWMUtility.IsEviternity()) ) return true;
if ( (avail == AVAIL_Heretic) && (gameinfo.gametype&GAME_Raven) ) return true;
if ( (avail == AVAIL_Hexen) && (gameinfo.gametype&GAME_Hexen) ) return true;
return false;
@ -198,20 +198,86 @@ Class SayaBean : SWWMCollectible
Height 23;
}
}
// Eviternity / Heretic
Class MothPlushy : SWWMCollectible
{
Default
{
Tag "$T_MOTHPLUSH";
Inventory.PickupMessage "$T_MOTHPLUSH";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "MothPlushyGesture";
Stamina 7000;
}
}
Class AA12Model : SWWMCollectible
{
Default
{
Tag "$T_AA12";
Inventory.PickupMessage "$T_AA12";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "AA12ModelGesture";
Stamina 10000;
}
}
Class CactusHege : SWWMCollectible
{
Default
{
Tag "$T_HEGE";
Inventory.PickupMessage "$T_HEGE";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "CactusHegeGesture";
Stamina 3000;
}
}
Class TastyHoagie : SWWMCollectible
{
Default
{
Tag "$T_HOAGIE";
Inventory.PickupMessage "$T_HOAGIE";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "TastyHoagieGesture";
Stamina 2000;
}
}
// Heretic
Class DemoPlush : SWWMCollectible
{
Default
{
Tag "$T_DEMOPLUSH";
Inventory.PickupMessage "$T_DEMOPLUSH";
SWWMCollectible.Availability AVAIL_Eviternity;
SWWMCollectible.Availability AVAIL_Heretic;
SWWMCollectible.GestureWeapon "DemoPlushGesture";
Stamina 6000;
Radius 12;
Height 36;
}
}
Class Manarokou : SWWMCollectible
{
Default
{
Tag "$T_MANAROKOU";
Inventory.PickupMessage "$T_MANAROKOU";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "ManarokouGesture";
Stamina 9000;
}
}
Class LithiumNovel : SWWMCollectible
{
Default
{
Tag "$T_LITHIUM";
Inventory.PickupMessage "$T_LITHIUM";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "LithiumNovelGesture";
Stamina 2000;
}
}
// Hexen
Class KirinCummies : SWWMCollectible
{
@ -265,3 +331,14 @@ Class KirinPlush : SWWMCollectible
Height 37;
}
}
Class RubberDuck : SWWMCollectible
{
Default
{
Tag "$T_DUCKIE";
Inventory.PickupMessage "$T_DUCKIE";
SWWMCollectible.Availability AVAIL_None;
SWWMCollectible.GestureWeapon "RubberDuckGesture";
Stamina 700;
}
}

7
zscript/items/swwm_collectibles_gesture.zsc
View file

@ -127,8 +127,15 @@ Class SayaBeanGesture : SWWMItemGesture
Stop;
}
}
Class MothPlushyGesture : SWWMItemGesture {}
Class AA12ModelGesture : SWWMItemGesture {}
Class CactusHegeGesture : SWWMItemGesture {}
Class TastyHoagieGesture : SWWMItemGesture {}
Class DemoPlushGesture : SWWMItemGesture {}
Class ManarokouGesture : SWWMItemGesture {}
Class LithiumNovelGesture : SWWMItemGesture {}
Class KirinCummiesGesture : SWWMItemGesture {}
Class MilkBreadsGesture : SWWMItemGesture {}
Class KirinMangaGesture : SWWMItemGesture {}
Class KirinPlushGesture : SWWMItemGesture {}
Class RubberDuckGesture : SWWMItemGesture {}

8
zscript/kbase/swwm_kbase.zsc
View file

@ -510,9 +510,9 @@ Class DemolitionistMenu : GenericMenu
if ( tabs[curtab] == TAB_HELP )
{
String kstr;
if ( mkey[1] != "" ) kstr = mkey[0].."/"..mkey[1];
else kstr = mkey[0];
str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr);
if ( self.mkey[1] != "" ) kstr = self.mkey[0].."/"..self.mkey[1];
else kstr = self.mkey[0];
String str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr);
BrokenLines l = fnt.BreakLines(str,629);
if ( l.Count() > 28 ) l = fnt.BreakLines(str,620);
if ( (l.Count() > 28) && (sel0 < l.Count()-28) )
@ -2154,7 +2154,7 @@ Class DemolitionistMenu : GenericMenu
double afactor = adone?1.:0., bfactor = bdone?1.:0.;
if ( a.progress )
{
int cur = clamp(a.progress.GetInt(),0,a.maval);
int cur = clamp(a.progress.GetInt(),0,a.maxval);
afactor = cur/double(a.maxval);
}
if ( b.progress )