OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Add item sparkles.

Browse source 
Tweak Omnisight pickup behavior (shared in mp).
This commit is contained in:
Mari the Deer 2021-02-22 17:01:58 +01:00
commit 06f79726a8
13 changed files with 83 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cvarinfo.txt
View file

@ -102,6 +102,7 @@ nosave int swwm_numcolor_ap = 3; // font color for armor numbers (default: gree
server int swwm_drlaskill = 3; // [DRLA Monsters] skill setting for monster spawns
nosave bool swwm_showminimap = true; // show a minimap below the score counter
nosave noarchive float swwm_minimapzoom = 1; // zoom level of minimap
nosave bool swwm_itemsparkles = false; // visual aid for low visibility items
server noarchive bool swwm_iseriouslywanttoplaythiswithbd = false; // self-explanatory

4
gldefs.ammo
View file

@ -95,8 +95,8 @@ Object GoldShell
PointLight SPARKUNITLIGHT
{
Color 0.5 0.3 0.6
Size 8
Color 0.25 0.15 0.3
Size 20
Offset 0 16 0
Attenuate 1
}

12
gldefs.pickups
View file

@ -172,6 +172,18 @@ Object Ragekit
Frame "XZW1" { light "RAGELIGHT" }
}
PointLight OMNISIGHTLIGHT
{
Color 0.3 0.0 0.0
Size 20
Offset 0 16 0
Attenuate 1
}
Object Omnisight
{
Frame "XZW1" { light "OMNISIGHTLIGHT" }
}
FlickerLight2 LAMPLIGHT
{
Color 0.6 1.0 0.7

3
language.def_base
View file

@ -560,6 +560,7 @@ OB_ASTRAL = "%o got scorched by a gray ball friend.";
D_BLASTSUIT = "The Blast Suit broke down.";
D_GHOSTARTI = "The Ghost Artifact ran out of energy.";
D_GRAVITYS = "The Gravity Suppressor is out of power.";
D_OMNISHARE = "Omnisight data link received from %s.";
D_LAMP = "The Lamp ran out of oil.";
D_INVINCIBALL = "You are no longer fucking invincible.";
D_RAGEKIT = "The Ragekit has ragequit.";
@ -586,7 +587,7 @@ SWWM_TITLEMODBY = "a mod by \cxMarisa Kirisame";
SWWM_TITLESCROLL = "SWWM GZ ~ Cute Robutt Whomst Love To Explode Demons\n"
"A wondrous GZDoom gameplay mod by Marisa Kirisame of UnSX Team\n"
"Lovingly designed 3D models with hand-painted 256-color dithered textures\n"
"Nearly 40,000 lines of ZScript, and still counting (god help me)\n"
"Nearly 50k lines of ZScript, and still counting (god help me)\n"
"The deepest lore this side of the Doom Modiverse\n"
"And much much more!\n"
"Greetz to Mub, Ribbed, Slemg, Bunr, Kegbine, Term-kun, Hype64, Bartendy, Skelly, Mr. BIG SHOT WildWeasel, Endy, Mima-sama, Sinkie, BillowPlaster, Disgusting Dog Water, Dangle Logo, Lämp Paipu, Leek Spah, MarTREE, Dusty Demon Bread, Roasted Rock, Ed the Netcode Boy, Thirst Cactus, JimJam, Cappy Jay, A Nom, Missy Fits, Minor Cookie, Squid Kid, YukiCute, MafSulk, FineRaff25, NetroRutcase, ShudTheFugUpRyan, Kobl, Cacous Seriodemon, Zomb, Man of Chins, Bun Pun, Zikeous Shadestructor, Blimyot, Baja Blast Tittums, DrySpy.py, Typo Gem, Wantopus, Morf, Daedalus, Popato, SpengRob, Sgt. Shellpost, Loud M, Snk, Donut, C.Kid, Emit Birb, You Go To Sleep, Rach, Le No Chicken, Murasa, Smart Cactus Dude, Phantomboobs, Sanae Kochiya, Gardeboy, Cat, HK417, Smol Koa, Joe Mama, Jahn, Guta, Glue, Atan, Schweet Prints, Angury Teeth Practitioner, Sell Her, MiSiFu, Portuguese Sausage, Scoob Stub, Actually Jabba, Very Honest Cat, Chiaki's Tit Mole, Homie, Snacks, Tubz, Toof, Teef, Frisp, Sanyanya, Trashkat, Succ 'n Spicy, Melissa Follower When, Shokku, Scummyboi, Kat Gravity Rush, John Romero, John Carmack, Tim Allen, Tim Sweeney and last but not least my beloved pet dragon\n"

2
language.def_menu
View file

@ -208,6 +208,7 @@ SWWM_DRLASKILL_TECHNOPHOBIA = "Technophobia";
SWWM_DRLASKILL_ARMAGEDDON = "Armageddon";
SWWM_DRLASKILL_ADAPTIVE = "Adaptive";
SWWM_SHOWMINIMAP = "Show Minimap";
SWWM_ITEMSPARKLES = "Item Sparkles";
TOOLTIP_SWWM_VOICETYPE = "Sets the voice pack for the player.";
TOOLTIP_SWWM_MUTEVOICE = "Control what gets muted, if you'd rather have a more silent protagonist.";
TOOLTIP_SWWM_FLASHSTRENGTH = "Screen flashes usually happen when firing some weapons, you can lower this if these effects are harmful for you.";
@ -299,6 +300,7 @@ TOOLTIP_SWWM_NUMCOLOR_HP = "Select the color for health numbers.";
TOOLTIP_SWWM_NUMCOLOR_AP = "Select the color for armor numbers.";
TOOLTIP_SWWM_DRLASKILL = "[DRLA Monsters] Sets the skill level for enemy spawns.";
TOOLTIP_SWWM_SHOWMINIMAP = "Displays a minimap under the score counter.";
TOOLTIP_SWWM_ITEMSPARKLES = "Nearby items will have particles around them, as a visual aid.";
// knowledge base
SWWM_COMINGSOON = "(coming soon)";
SWWM_MISSTAB = "Mission";

3
language.es_base
View file

@ -496,6 +496,7 @@ OB_ASTRAL = "%o fue escaldad@[ao_esp] por una amigable bola gris.";
D_BLASTSUIT = "El Chaleco Antiexplosivos se ha roto.";
D_GHOSTARTI = "El Artefacto Fantasma se ha agotado.";
D_GRAVITYS = "El Supresor de Gravedad se ha agotado.";
D_OMNISHARE = "Enlace de datos de Omnivisión recibido de %s.";
D_LAMP = "La Lámpara se ha quedado sin aceite.";
D_INVINCIBALL = "Ya no eres jodidamente invencible.";
D_RAGEKIT = "El Ragekit ha hecho ragequit.";
@ -520,7 +521,7 @@ SWWM_TITLEMODBY = "un mod de \cxMarisa Kirisame";
SWWM_TITLESCROLL = "SWWM GZ ~ Cute Robutt Whomst Love To Explode Demons\n"
"Un maravilleante mod de gameplay para GZDoom por Marisa Kirisame de UnSX Team\n"
"Modelos 3D diseñados con cariño con texturas pintadas a mano de 256 colores con dithering\n"
"Casi 40.000 líneas de ZScript, y aun contando (dios me ayude)\n"
"Casi 50 mil líneas de ZScript, y aun contando (dios me ayude)\n"
"El lore más profundo a este lado del Modiverso de Doom\n"
"¡Y mucho mucho más!\nSaludos a Mub, Ribbed, Slemg, Bunr, Kegbine, Term-kun, Hype64, Bartendy, Skelly, Mr. BIG SHOT WildWeasel, Endy, Mima-sama, Sinkie, BillowPlaster, Disgusting Dog Water, Dangle Logo, Lämp Paipu, Leek Spah, MarTREE, Dusty Demon Bread, Roasted Rock, Ed the Netcode Boy, Thirst Cactus, JimJam, Cappy Jay, A Nom, Missy Fits, Minor Cookie, Squid Kid, YukiCute, MafSulk, FineRaff25, NetroRutcase, ShudTheFugUpRyan, Kobl, Cacous Seriodemon, Zomb, Man of Chins, Bun Pun, Zikeous Shadestructor, Blimyot, Baja Blast Tittums, DrySpy.py, Typo Gem, Wantopus, Morf, Daedalus, Popato, SpengRob, Sgt. Shellpost, Loud M, Snk, Donut, C.Kid, Emit Birb, You Go To Sleep, Rach, Le No Chicken, Murasa, Smart Cactus Dude, Phantomboobs, Sanae Kochiya, Gardeboy, Cat, HK417, Smol Koa, Joe Mama, Jahn, Guta, Glue, Atan, Schweet Prints, Angury Teeth Practitioner, Sell Her, MiSiFu, Portuguese Sausage, Scoob Stub, Actually Jabba, Very Honest Cat, Chiaki's Tit Mole, Homie, Snacks, Tubz, Toof, Teef, Frisp, Sanyanya, Trashkat, Succ 'n Spicy, Melissa Follower When, Shokku, Scummyboi, Kat Gravity Rush, John Romero, John Carmack, Tim Allen, Tim Sweeney y por último pero no menos importante mi querido dragón mascota\n"
"He intentado estrujar todos los nombres que he podido ahí, que haya podido recordar, por lo menos, así que si no estás ahí y quieres entrar, solo pídelo\n"

2
language.es_menu
View file

@ -205,6 +205,7 @@ SWWM_DRLASKILL_TECHNOPHOBIA = "Tecnofobia";
SWWM_DRLASKILL_ARMAGEDDON = "Armagedón";
SWWM_DRLASKILL_ADAPTIVE = "Adaptado";
SWWM_SHOWMINIMAP = "Mostrar Minimapa";
SWWM_ITEMSPARKLES = "Partículas de Ítem";
TOOLTIP_SWWM_VOICETYPE = "Selecciona el pack de voz para el jugador.";
TOOLTIP_SWWM_MUTEVOICE = "Controla lo que se mutea, si prefieres tener un protagonista más silencioso.";
TOOLTIP_SWWM_FLASHSTRENGTH = "Los destellos en pantalla suelen ocurrir al disparar algunas armas, puedes reducirlo si este tipo de efectos te causan malestar.";
@ -296,6 +297,7 @@ TOOLTIP_SWWM_NUMCOLOR_HP = "Selecciona el color para los números de salud.";
TOOLTIP_SWWM_NUMCOLOR_AP = "Selecciona el color para los números de armadura.";
TOOLTIP_SWWM_DRLASKILL = "[DRLA Monsters] Elige el nivel de dificultad para spawns de enemigos.";
TOOLTIP_SWWM_SHOWMINIMAP = "Muestra un minimapa bajo el contador de puntuación.";
TOOLTIP_SWWM_ITEMSPARKLES = "Los ítems cercanos tendrán partículas alrededor, para mejor visibilidad.";
// knowledge base
SWWM_COMINGSOON = "(próximamente)";
SWWM_MISSTAB = "Misión";

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r299 \cu(Mon 22 Feb 14:36:42 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r299 \cu(2021-02-22 14:36:42)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r300 \cu(Mon 22 Feb 17:01:58 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r300 \cu(2021-02-22 17:01:58)\c-";

1
menudef.txt
View file

@ -133,6 +133,7 @@ OptionMenu "SWWMOptionMenu"
StaticText "$SWWM_ETITLE", "Blue"
Option "$SWWM_SHADOWS", "swwm_shadows", "SWWMShadows"
ScaleSlider "$SWWM_SHADOWDIST", "swwm_shadowdist", -1, 4000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
Option "$SWWM_ITEMSPARKLES", "swwm_itemsparkles", "YesNo"
Option "$SWWM_BLOOD", "swwm_blood", "YesNo"
ScaleSlider "$SWWM_MAXBLOOD", "swwm_maxblood", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
ScaleSlider "$SWWM_MAXGIBS", "swwm_maxgibs", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"

1
zscript/swwm_handler.zsc
View file

@ -3293,6 +3293,7 @@ Class SWWMHandler : EventHandler
Console.Printf("Bundle: %d",Random2[Bundle]());
Console.Printf("Candy: %d",Random2[Candy]());
Console.Printf("Chancebox: %d",Random2[Chancebox]());
Console.Printf("ClientSparkles: %d",Random2[ClientSparkles]());
Console.Printf("Corrode: %d",Random2[Corrode]());
Console.Printf("DemoLines: %d",Random2[DemoLines]());
Console.Printf("DoBlast: %d",Random2[DoBlast]());

31
zscript/swwm_player.zsc
View file

@ -675,6 +675,36 @@ Class Demolitionist : PlayerPawn
SWWMGesture.SetGesture(self,GS_EmptyMelee);
}
}
void NearbyItemSparkles()
{
if ( (player != players[consoleplayer]) || !swwm_itemsparkles ) return;
let bt = BlockThingsIterator.Create(self,500);
while ( bt.Next() )
{
let t = bt.Thing;
if ( !t || !(t is 'Inventory') || !t.bSPECIAL || t.bINVISIBLE || Inventory(t).Owner || !SWWMUtility.SphereIntersect(t,pos,500) )
continue;
Vector3 bpos = (0,0,16);
if ( t.bFLOATBOB ) bpos.z += BobSin(t.FloatBobPhase)*t.FloatBobStrength;
double alph = clamp((500.-Distance3D(t))/500.,0.,1.);
Color pcol = "Gold";
if ( Inventory(t).PickupFlash is 'SWWMPickupFlash' )
{
let def = GetDefaultByType(Inventory(t).PickupFlash);
pcol = Color(def.Args[1]*85,def.Args[2]*85,def.Args[3]*85);
}
int numpt = clamp(int(max(t.radius,t.height-16)/4),1,8);
for ( int i=0; i<numpt; i++ )
{
double ang = FRandom[ClientSparkles](0,360);
double pt = FRandom[ClientSparkles](0,360);
double dst = FRandom[ClientSparkles](.5,1.25)*max(t.radius,t.height-16);
Vector3 dir = (cos(ang)*cos(pt),sin(ang)*cos(pt),-sin(pt));
Vector3 ppos = bpos+dir*dst;
t.A_SpawnParticle(pcol,SPF_FULLBRIGHT,30,2.,0,ppos.x,ppos.y,ppos.z,dir.x*.2,dir.y*.2,dir.z*.2,0,0,.05,alph,-1,-2./30.);
}
}
}
override void Tick()
{
Vector3 oldpos = pos;
@ -690,6 +720,7 @@ Class Demolitionist : PlayerPawn
selflight.Tick();
}
if ( !player || (player.mo != self) ) return;
NearbyItemSparkles();
// double-check that we have these
if ( !FindInventory("AlmasteelPlating") )
{

24
zscript/swwm_powerup.zsc
View file

@ -1087,10 +1087,28 @@ Class Omnisight : Inventory
{
if ( !level.allmap )
{
Owner.A_StartSound("powerup/omnisight",CHAN_ITEMEXTRA);
if ( Owner.player == players[consoleplayer] )
{
Owner.A_StartSound("powerup/omnisight",CHAN_ITEMEXTRA);
// automatically zoom out so the player can know how far this goes
CVar.FindCVar('swwm_minimapzoom').SetFloat(2.);
}
level.allmap = true;
// automatically zoom out so the player can know how far this goes
CVar.FindCVar('swwm_minimapzoom').SetFloat(2.);
}
// spread to all players
for ( int i=0; i<MAXPLAYERS; i++ )
{
if ( !playeringame[i] || !players[i].mo || players[i].mo.FindInventory(GetClass()) ) continue;
let o = Inventory(Spawn(GetClass()));
o.ClearCounters();
o.AttachToOwner(players[i].mo);
if ( i == consoleplayer )
{
Console.Printf(StringTable.Localize("$D_OMNISHARE"),Owner.player.GetUserName());
players[i].mo.A_StartSound("powerup/omnisight",CHAN_ITEMEXTRA);
// automatically zoom out so the player can know how far this goes
CVar.FindCVar('swwm_minimapzoom').SetFloat(2.);
}
}
// not used up, must be kept for the targetting features to work
return false;

5
zscript/swwm_utility.zsc
View file

@ -185,9 +185,12 @@ Class SWWMUtility
{
// must be two-sided and crossable
if ( !l.sidedef[1] || !(l.Activation&(SPAC_Cross|SPAC_MCross|SPAC_PCross|SPAC_AnyCross)) ) return false;
// filter lines that aren't player-activated (unless checking all)
if ( !all && !(l.Activation&SPAC_PlayerActivate) ) return false;
// typical teleports
if ( (l.special == Teleport) || (l.special == Teleport_NoStop) )
return true;
// also include sneaky teleports
// if checking all, also include sneaky teleports
if ( all && ((l.special == Teleport_Line) || (l.special == Teleport_NoFog)) )
return true;
// exits are included too