diff --git a/FuturePlans.md b/FuturePlans.md index 20afb5268..6d38bf63e 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -162,6 +162,6 @@ Add-ons and other related stuff. - Basically a lite version of what you could expect in **UNDEATH** * **Official Game *(VOID - The Dark Alliance)*:** - Retell the events of UnSX 2 *(but with the Demolitionist's participation)* - - Basically give SWWM GZ its own IWAD as a standalone game + - Basically give the Demolitionist their own standalone game - Some new weapons, some renovations - Lots of world exploration, more lore diff --git a/LOCALIZATION.md b/LOCALIZATION.md index 4e2358d2b..e0a6c903f 100644 --- a/LOCALIZATION.md +++ b/LOCALIZATION.md @@ -1,4 +1,4 @@ -# Notes on localizing SWWM GZ +# Notes on localizing this mod There are two parts to this: @@ -22,4 +22,4 @@ Both fonts in use fully support Latin, Greek and Cyrillic scripts. ## Language codes -For a list of these, consult the ZDoom wiki article for [LANGUAGE](https://zdoom.org/wiki/LANGUAGE#Language_codes). \ No newline at end of file +For a list of these, consult the ZDoom wiki article for [LANGUAGE](https://zdoom.org/wiki/LANGUAGE#Language_codes). diff --git a/README.md b/README.md index 0cf8f3e20..13895b6bf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ ![](docimg/logo.png) +--- + +## The Introduction + **Codename: Demolitionist** is an all-original gameplay mod for **GZDoom** with a basis on rapid, fluid movement mechanics as well as very satisfying, punchy, strong weaponry. In it, you play as the titular **Demolitionist**, a robot with quite a personality, who's destined to save the day, as explosively as necessary. The mod's arsenal could be seen as a *"best of"* collection of custom weapons I've made for **Unreal Tournament**, plus many new things that didn't make the cut there. It is also effectively a reboot of the entire **Some Weird Weapons Mod *(SWWM)*** series, which unfortunately ended with the cancelled **SWWM Z**, this mod's direct predecessor *(hence this project originally starting its days under the name of **SWWM GZ**)*. @@ -14,7 +18,7 @@ Hope you have fun exploding demon knees. — *Marisa* -## Disclaimers +## The Disclaimers This mod features loud sounds and flashing lights, which may be harmful to certain people. There are options to dampen some of these effects, but it may still be unsafe nonetheless. @@ -30,7 +34,7 @@ This mod is not compatible with **Brutal Doom** for obvious reasons. If you want This mod is, funny enough, readily compatible with **H-Doom**. You will not be able to engage in erotic acts with the demon girls, however, but they will be very vulnerable to kisses and headpats. -## The Player +## The Demolitionist ![](docimg/demolitionist_actionshot.png) You are an **Akari Labs Demolitionist Bot**, one of the very first units, fresh off the factory. You are the company's greatest achievement in AI-controlled combat units, trained to efficiently use all sorts of weaponry, built with premium quality armor plating and robust but flexible joints. In order to show off your capabilities, your creator has decided to send you out to fight the demonic invasion brought upon by *"those big stinkin' idiots at the **UAC**"*. Your time has come to kick ass and blow 'em up. diff --git a/cvarinfo.base b/cvarinfo.base index 53eb64705..006bc4ceb 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -133,7 +133,7 @@ nosave bool swwm_mm_rotate = true; // rotate minimap nosave bool swwm_mm_grid = false; // show blockmap grid plus (0,0) crosshair nosave bool swwm_mm_portaloverlay = true; // show portal overlays, like the gzdoom automap (but unlike the gzdoom automap, we also overlay actors) nosave bool swwm_mm_missiles = true; // show projectiles (how revolutionary) -nosave int swwm_mm_colorset = 0; // 0: SWWM GZ, 1: GZDoom, 2: Doom, 3: Strife, 4: Raven +nosave int swwm_mm_colorset = 0; // 0: Demolitionist, 1: GZDoom, 2: Doom, 3: Strife, 4: Raven nosave color swwm_mm_backcolor = "10 10 10"; nosave color swwm_mm_cdwallcolor = "30 50 70"; nosave color swwm_mm_efwallcolor = "80 a0 c0"; diff --git a/language.def_base b/language.def_base index fee4fd106..1550c2c44 100644 --- a/language.def_base +++ b/language.def_base @@ -729,7 +729,7 @@ SWWM_YOURSELF = "Yourself"; SWWM_DOKIDOKI = "The Power of Love™"; SWWM_GRAVKILL = "Gravity"; SWWM_PARRYKILL = "Deflected Projectiles"; -SWWM_SETSLOTSTRICT = "\cg!!!WARNING!!!\c-\n\cj\"setslotstrict\" is enabled. This will cause SWWM GZ weapons to not have slots assigned. Please go into Miscellaneous Options and toggle the \"Strict KEYCONF Weapons/Players\" setting.\c-"; +SWWM_SETSLOTSTRICT = "\cg!!!WARNING!!!\c-\n\cj\"setslotstrict\" is enabled. This will cause the mod's weapons to not have slots assigned. Please go into Miscellaneous Options and toggle the \"Strict KEYCONF Weapons/Players\" setting.\c-"; SWWM_FCBSEL = "1.150 FCB"; SWWM_XSBSEL = "1.150 XSB"; SWWM_WIDESPREAD = "Wide Spread Mode"; @@ -751,7 +751,7 @@ SWWM_PLACE2 = "2nd"; SWWM_PLACE3 = "3rd"; SWWM_PAUSE = "PAUSED"; // weapon tooltips -SWWM_TTNOTE = "Note: Weapon tooltips can be deactivated in SWWM GZ Options."; +SWWM_TTNOTE = "Note: Weapon tooltips can be deactivated in DEMOLITIONIST Options."; TT_PUSHER = "\cfFire:\c- Drill.\n" "\cfAltfire:\c- Charged attack."; @@ -1039,7 +1039,7 @@ SWWM_INTERTIP79 = "Punching fascists is perfectly reasonable."; SWWM_INTERTIP80 = "Ceci n'est pas un conseil."; SWWM_INTERTIP81 = "Age only affects appearance, and has no bearing on ability. Gender has no bearing on ability. Everyone has imperfections, prejudice births malcontents, become a dark spirit.\nTime for crab."; SWWM_INTERTIP82 = "\"IF THE ZOO BANS ME FOR HOLLERING AT THE ANIMALS I WILL FACE GOD AND WALK BACKWARDS INTO HELL\" — dril"; -SWWM_INTERTIP83 = "SWWM GZ is truly Some Weird Weapons Mod for GZDoom."; +SWWM_INTERTIP83 = "This is truly some weird weapons mod for GZDoom."; SWWM_INTERTIP84 = "\"In its vastness, the universe is no more than a mere grain of sand when compared to the limitless bounds of one's imagination.\" — Zanaveth Nekuraku III"; SWWM_INTERTIP85 = "You can shuffle the intermission art with Zoom, and these tips with Reload. Holding Altfire will hide the UI so you can see the art in full."; SWWM_INTERTIP86 = "Add minced garlic, white pepper and basil to your tomato sauce, goes really well with pasta, you can thank me later."; diff --git a/language.es_base b/language.es_base index c01de9f25..d05f8c2ee 100644 --- a/language.es_base +++ b/language.es_base @@ -612,7 +612,7 @@ SWWM_YOURSELF = "Tú"; SWWM_DOKIDOKI = "El Poder del Amor™"; SWWM_GRAVKILL = "Gravedad"; SWWM_PARRYKILL = "Proyectiles Devueltos"; -SWWM_SETSLOTSTRICT = "\cg!!!ADVERTENCIA!!!\c-\n\cj\"setslotstrict\" está activado. Esto causará que las armas de SWWM GZ no tengan ranuras asignadas. Por favor, ve a Opciones Misceláneas y cambia la opción de \"KEYCONF de Armas/Jugadores estricto\".\c-"; +SWWM_SETSLOTSTRICT = "\cg!!!ADVERTENCIA!!!\c-\n\cj\"setslotstrict\" está activado. Esto causará que las armas del mod no tengan ranuras asignadas. Por favor, ve a Opciones Misceláneas y cambia la opción de \"KEYCONF de Armas/Jugadores estricto\".\c-"; SWWM_WIDESPREAD = "Modo Amplio"; SWWM_TIGHTSPREAD = "Modo Concentrado"; SWWM_YNYKRONFORWARD = "Modo de Rayo"; // desya / forward @@ -635,7 +635,7 @@ SWWM_PLACE2_GENDER1 = "2ª"; SWWM_PLACE3_GENDER1 = "3ª"; SWWM_PAUSE = "PAUSA"; // weapon tooltips -SWWM_TTNOTE = "Nota: La ayuda de armas se puede desactivar en Opciones de SWWM GZ."; +SWWM_TTNOTE = "Nota: La ayuda de armas se puede desactivar en Opciones de DEMOLITIONIST."; TT_PUSHER = "\cfPrimario:\c- Taladrar.\n" "\cfSecundario:\c- Ataque cargado."; @@ -915,7 +915,7 @@ SWWM_INTERTIP78 = "Xenia > Tux\n\nDevolvednos a la chica zorro molona de Linux. SWWM_INTERTIP79 = "Abofetear fachas es perfectamente razonable."; SWWM_INTERTIP81 = "La edad solo afecta a la apariencia, y no tiene relación a la habilidad. El género no tiene relación a la habilidad. Todo el mundo tiene imperfecciones, los prejuicios traen consigo malcontentos, conviertete en un espíritu oscuro.\nHora de cangrejo."; SWWM_INTERTIP82 = "\"SI EL ZOO ME PROHIBE LA ENTRADA POR GRITAR A LOS ANIMALES PLANTARÉ CARA A DIOS Y CAMINARÉ DE ESPALDAS AL INFIERNO\" — dril"; -SWWM_INTERTIP83 = "SWWM GZ es realmente Un Extraño Mod de Armas (Some Weird Weapons Mod) para GZDoom."; +SWWM_INTERTIP83 = "Este es realmente un extraño mod de armas para GZDoom."; SWWM_INTERTIP84 = "\"En su inmensidad, el universo no es más que un mero grano de arena cuando se compara a los límites ilimitados de nuestra imaginación.\" — Zanaveth Nekuraku III"; SWWM_INTERTIP85 = "Puedes alternar el arte de intermisión con Zoom, y estos consejos con Recarga. Mantener Fuego Secundario ocultará la interfaz para que puedas ver el arte al completo."; SWWM_INTERTIP86 = "Mezcla ajo molido, pimienta blanca y albahaca con tu salsa de tomate, va ideal con pasta, puedes darme las gracias luego."; diff --git a/language.es_menu b/language.es_menu index 5fc7df775..2dff72d1d 100644 --- a/language.es_menu +++ b/language.es_menu @@ -215,6 +215,7 @@ SWWM_DEMOSLAYER = "Modo Demoslayer"; SWWM_BEEPBOOP = "Ruiditos de Activación"; SWWM_VOICEAMP = "Amplificación de Voz"; SWWM_CLEARFX = "Limpiar todos los Efectos"; +SWWM_OLDLOGO = "Marca Antigua"; SWWM_MMTITLE = "Opciones de Minimapa"; SWWM_MM_ENABLE = "Mostrar Minimapa"; SWWM_MM_ROTATE = "Rotar Minimapa"; @@ -378,6 +379,7 @@ TOOLTIP_SWWM_DEMOSLAYER = "Los enemigos que mates soltarán orbes de salud y arm TOOLTIP_SWWM_BEEPBOOP = "La Demolicionista hará ruiditos adorables cuando pulse cualquier línea utilizable. Esto puede que resulte cansino, así que es opcional."; TOOLTIP_SWWM_VOICEAMP = "A su volumen normal, las voces de la Demolicionista pueden ser ahogadas por el audio del juego. Con esto se le dá un nivel de amplificación extra para que sean más estridentes que otros sonidos."; TOOLTIP_NETEVENT_SWWMCLEAREFFECTS = "Desvanece cualquier sangre, vísceras, escombros y casquillos activos."; +TOOLTIP_SWWM_OLDLOGO = "Para quienes echan de menos los viejos tiempos de SWWM GZ, podeis restaurar la antigua pantalla de inicio y menú principal con esto."; TOOLTIP_SWWMMINIMAPMENU = "Configura el minimapa."; TOOLTIP_SWWMACHIEVEMENTMENU = "Revisa tus logros."; TOOLTIP_SWWM_MM_ENABLE = "Muestra un minimapa bajo el contador de puntuación."; diff --git a/language.version b/language.version index c90478aec..b809b6452 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r108 \cu(Thu 13 Jan 15:40:17 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.2pre r108 \cu(2022-01-13 15:40:17)\c-"; +SWWM_MODVER="\cvDEMOLITIONIST \cw1.2pre r110 \cu(Sat 15 Jan 15:37:29 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.2pre r110 \cu(2022-01-15 15:37:29)\c-"; diff --git a/readme.txt b/readme.txt index f474d41f1..019428336 100644 --- a/readme.txt +++ b/readme.txt @@ -41,6 +41,22 @@ Index of contents: 2.3. Armors 2.4. Health 2.5. Others + 2.6. DLC Weapon Set 1 + 2.6.1. Itamex Hammer + 2.6.2. Plasma Blaster + 2.6.3. Puntzer Beta + 2.6.4. Puntzer Gamma + 2.6.5. Sheen HMG + 2.6.6. Quadravol + 2.6.7. Blackfire Igniter + 2.6.8. EMP Carbine + 2.6.9. Ray-Khom + 2.6.A. Grand Lance + 2.7. DLC Weapon Set 2 + 2.7.1. Hand of Divine + 2.7.2. Sparkster Rifle + 2.7.3. Mortal Rifle + 2.7.4. Rafan-Kos 3. Credits 3.1. UnSX Team Is 3.2. Special Thanks @@ -319,6 +335,138 @@ times little pieces of treasure that you might want to collect, as they can be very valuable. +2.6. DLC Weapon Set 1 +- - - - - - - - - - - + +Coming soon. But here's a tease. + +2.6.1. Itamex Hammer + +Slot 1. Melee weapon. +A strong as fuck sledgehammer. +Primary fire does side swings. +Secondary fire does an overhead swing. +Tertiery fire does a spin. Keep pressing it to spin more. + +2.6.2. Plasma Blaster + +Slot 2. Pistol. +A fine plasma gun. Bit of a downgrade compared to its old SWWM counterparts, +but don't let that deceive ya, it's still very useful. +Primary fire does the shootin'. +Secondary fire charges a big blast. +Can also be dual wielded. + +2.6.3. Puntzer Beta + +Slot 3. Revolver. +A six shooter, packing some fine... Drilling power. +Primary fire does a shoot. +Secondary fire is held for fast shooting mode, where spamming primary will +shoot faster. + +2.6.4. Puntzer Gamma + +Slot 4. Submachine gun. +It does the drilling, and it does it fast. +Primary fire schutts, as expected. +Secondary fire switches fire modes. You won't believe how fast this can go. + +2.6.5. Sheen HMG + +Slot 5. Heavy machine gun. +For those who wished for dakka. Here's the dakka. +Primary fire shoots. +Secondary fire shoots faster. +Tertiary fire shoots the fastest. +Watch out for overheating. + +2.6.6. Quadravol + +Slot 6. Fireball launcher. +A signature weapon of the UnSX series, mighty fireball shooting. +Primary fire does a shoot. +Secondary fire pumps for more power. +Tertiary fire toggles scatter shot. +And yes, it's a levergun, have fun. + +2.6.7. Blackfire Igniter + +Slot 7. Freezethrower. +The polar opposite of a flamethrower, it's cold and it's dark. +Primary fire lets loose some dark flames. +Secondary fire shoots out icicles. +Weapon has an internal fuel tank, which can be resupplied with up to two +canisters. Canisters can only be detached once emptied. + +2.6.8. EMP Carbine + +Slot 8. Lightning gun. +The power of lightning at your fingertips, zap 'em good. +Primary fire focuses on a spot, and unloads on release. +Secondary fire just ionizes whatever you're aiming at, so you can discharge at +it later. +Tertiary fire zooms, up to 8x. The scope display also lets you see ionized +spots. +Try not to use this underwater, by the way. + +2.6.9. Ray-Khom + +Slot 9. GEP gun. +The most silent way to eliminate Manderley. +Primary fire lobs a silent plasma grenade. It goes far, and it blows up good. +Secondary fire zaps whatever's in front of you, don't use it underwater. +This weapon has both a primary reload and secondary reload (zoom), as it's +powered by a removable battery. + +2.6.A. Grand Lance + +Slot 0. Railgun. +A huge-ass railgun with a fusion bomb payload. Yeah, just that. +Primary fire launches the projectile, it'll detonate on first impact. +Secondary fire charges a faster shot, it will penetrate multiple targets before +exploding, might even go through walls. + + +2.7. DLC Weapon Set 2 +- - - - - - - - - - - + +Also coming soon. And there's also a tease. + +2.7.1. Hand of Divine + +Slot 1. Melee weapon. +The power of a divine vibe check. +Primary fire punches. +Secondary fire slaps. +Both can be charged by holding each button. + +2.7.2. Sparkster Rifle + +Slot 7. Plasma artillery. +Yet another signature weapon of the UnSX saga, big fat plasma rifle. +Primary fire shoots blue plasma. +Secondary fire spews red plasma. +Both buttons at once release a deadly purple plasma. +Has two reloads, for each ammo type. + +2.7.3. Mortal Rifle + +Slot 9. Battle rifle. +A weird as all hell rifle that does everything. +Primary fire does schumt. +Secondary fire the grenade. +Tertiary fire a switch of modes. +Have fun. + +2.7.4. Rafan-Kos + +Slot 0. Ultimate weapon. +Frickin' laser beams, big of them, very strong. +Primary fire beam. +Secondary fire more beams. +I'm tired from writing these, good night. + 3. Credits ---------- diff --git a/swwmvoicepack.txt b/swwmvoicepack.txt index 83c9b04e7..44db4fb9c 100644 --- a/swwmvoicepack.txt +++ b/swwmvoicepack.txt @@ -1,5 +1,5 @@ # (lines starting with this character are comments) -# if you want to make custom voice packs for SWWM GZ, you need to provide a +# if you want to make custom voice packs for the mod, you need to provide a # file like this in the root of the zip/pk3/whatever, wads are not supported # list the names of your voice types here and don't forget to define your voice # lines using a similar format to the base game's: diff --git a/zmapinfo.txt b/zmapinfo.txt index 999254e51..c4b0c0cde 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -192,7 +192,7 @@ Skill lunatic MustConfirm = "$SWWM_SKLUNATICCONFIRM" } -Map TITLEMAP "SWWM GZ Title Map" +Map TITLEMAP "DEMOLITIONIST Title Map" { Music = "" EventHandlers = "SWWMTitleStuff" diff --git a/zscript.txt b/zscript.txt index dfa65f6d3..d0723b6dc 100644 --- a/zscript.txt +++ b/zscript.txt @@ -1,7 +1,7 @@ version "4.7.1" /* - SWWM GZ Main Codebase + DEMOLITIONIST Main Codebase (C)2020-2022 Marisa Kirisame, UnSX Team This copyright and the attached LICENSE.code file apply to all files included from here, with the exception of any third party libraries diff --git a/zscript/dlc1/swwm_blackfire.zsc b/zscript/dlc1/swwm_blackfire.zsc index db806d9c0..14aeb8c94 100644 --- a/zscript/dlc1/swwm_blackfire.zsc +++ b/zscript/dlc1/swwm_blackfire.zsc @@ -1,4 +1,4 @@ -// Unissix Crafts Blackfire Igniter (from UnSX 4, cut from initial SWWM GZ release) +// Unissix Crafts Blackfire Igniter (from UnSX 4) // Slot 7, spawns shared with Biospark Carbine Class BlackfireIgniter : SWWMWeapon diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index b9cac064e..9fcd38d88 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -213,7 +213,7 @@ extend Class SWWMHandler return; } // dump the values of all mod RNGs (might help someday to track down what desyncs) - String msg = String.Format("\cxSWWM GZ RNG dump for player %d (\c-%s\cx):\c-",consoleplayer,players[consoleplayer].GetUserName()); + String msg = String.Format("\cxRNG dump for player %d (\c-%s\cx):\c-",consoleplayer,players[consoleplayer].GetUserName()); msg.AppendFormat("\n\n\cfPlay RNG (will cause desyncs if mismatched):\c-\n"); msg.AppendFormat("\nBlood: %08x",Random2[Blood]()); msg.AppendFormat("\nBoolet: %08x",Random2[Boolet]()); @@ -336,20 +336,26 @@ extend Class SWWMHandler // drop the swapweapon if we own it first if ( swwm_swapweapons && (item is 'SWWMWeapon') && (sw = SWWMWeapon(def).HasSwapWeapon(players[e.Args[0]].mo)) ) { + // special case, otherwise candy gun won't drop itself + if ( sw is 'CandyGun' ) CandyGun(sw).swapdrop = true; bool swapto = (sw == players[e.Args[0]].ReadyWeapon) || (sw.SisterWeapon && (sw.Sisterweapon == players[e.Args[0]].ReadyWeapon)); int ngun = sw.Amount; - double ang = -15*(ngun-1); - for ( int i=0; i