diff --git a/FuturePlans.md b/FuturePlans.md index 0027f1f8b..6457a6d67 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -60,7 +60,6 @@ Re-animation of old FK models. Plus extra score incentives and achievements. - Longshot *(Kill an enemy from over 2000 map units away, +600, add +100 for each extra 1000 map units)* - Redirect *(Kill an enemy with another enemy's projectile, +900)* * **Additional Achievements:** - - Spicy Tennis *(Parry a thrown Explodium Mag)* - Pachinko Code *(Find the Secret Menu)* - Double Succ *(Merge two Ynykron singularities)* - The Ultimate Combo *(Hit a Ynykron singularity with a Ynykron beam)* @@ -68,9 +67,7 @@ Re-animation of old FK models. Plus extra score incentives and achievements. - Arsenal of Olden Times *(Find all classic UnSX weapons)*
*(Quadravol, Biospark Carbine, Sparkster Rifle, Ray-Khom, Mortal Rifle, Ynykron, Rafan-Kos and K79-D)*
*(The K79-D was turned into the generic cube, so it still counts)* - - Know Thy Armaments *(Find all weapons)* - - Assortment of Thingamajigs *(Find all items)* - - Words Words Words *(Read 100 library entries)* + - Words Words Words *(Read 50 library entries)* - Oops I Pressed It *(Turn the engine off)* - Dangerous Ball Action *(Land a lead ball crit on yourself)* - Total Ball Destruction *(Deploy 30 Ballsy Bombs)* @@ -151,7 +148,7 @@ Add-ons and other related stuff. - Things get quite a lot more challenging - No jetpack, just standard humanoid mobility - Simplified mechanics and controls - - Exploring a more conventional arsenal, but with some familiar faces + - Exploring a more conventional arsenal - Demo can use **MAGIC**??? *(yes, they can)* * **Official Game *(VOID - The Dark Alliance)*:** - Retell the events of UnSX 2 *(but with the Demolitionist's participation)* diff --git a/achievements.lst b/achievements.lst index a75a1b094..bfade071a 100644 --- a/achievements.lst +++ b/achievements.lst @@ -8,11 +8,9 @@ # hasformat: the TXT string has a %d in it to substitute for maxval # gametype: the game this belongs to (any, doom, heretic, hexen, raven, etc.) allcoll,-1,no,any -#allinv,-1,yes,any allitems,100,yes,nothexen allkills,100,yes,nothexen allsecrets,100,yes,nothexen -#allweapons,-20,yes,any anom,50,yes,any anone,0,no,any #ara,100,yes,any @@ -109,7 +107,6 @@ stomp,500,yes,any sunny,100,yes,any #tbd,30,no,any tele,0,no,any -#tennis,0,no,any thicc,1000,yes,any thruwall,200,yes,any tornado,0,no,heretic @@ -119,5 +116,5 @@ travel,1000,yes,any untouchable,0,no,nothexen wantdie,0,no,any wave,0,no,any -#words,100,yes,any +#words,50,yes,any yeet,0,no,doom diff --git a/animdefs.misc b/animdefs.misc index a5369c4eb..7f369d516 100644 --- a/animdefs.misc +++ b/animdefs.misc @@ -1,4 +1,6 @@ canvastexture LOGOFADE 4 4 +canvastexture PLASBLED 64 64 +canvastexture PLASBFAD 4 4 canvastexture SHEENLED 128 128 canvastexture QUADRLED 64 64 canvastexture MORTLED1 256 128 diff --git a/docimg/plasmablast.png b/docimg/plasmablast.png index ba46d82a1..d9f453248 100644 Binary files a/docimg/plasmablast.png and b/docimg/plasmablast.png differ diff --git a/gldefs.misc b/gldefs.misc index e3c3b9355..878d8d900 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -154,6 +154,10 @@ HardwareShader Texture "graphics/M_DEMOCHAN_HAMMER.png" { Shader "shaders/glsl/Bilinear.fp" } +HardwareShader Texture "graphics/M_DEMOCHAN_PLASMA.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} HardwareShader Texture "graphics/M_DEMOCHAN_SHEEN.png" { Shader "shaders/glsl/Bilinear.fp" diff --git a/gldefs.plasmablast b/gldefs.plasmablast new file mode 100644 index 000000000..783aee081 --- /dev/null +++ b/gldefs.plasmablast @@ -0,0 +1,15 @@ +HardwareShader Texture "models/PlasmaBlast.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/PlasmaBlast_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1." + Define "RIMFACT" = "1." + Define "RIMSTEP" = "0." +} +Brightmap Texture "models/PlasmaBlast.png" +{ + Map "models/PlasmaBlast_bright.png" +} diff --git a/graphics/Decals/kinymk1.png b/graphics/Decals/kinymk1.png new file mode 100644 index 000000000..ba5bfe49a Binary files /dev/null and b/graphics/Decals/kinymk1.png differ diff --git a/graphics/Decals/kinymk2.png b/graphics/Decals/kinymk2.png new file mode 100644 index 000000000..cd212a1c5 Binary files /dev/null and b/graphics/Decals/kinymk2.png differ diff --git a/graphics/Decals/kinymk3.png b/graphics/Decals/kinymk3.png new file mode 100644 index 000000000..e3498aa96 Binary files /dev/null and b/graphics/Decals/kinymk3.png differ diff --git a/graphics/Decals/kinymk4.png b/graphics/Decals/kinymk4.png new file mode 100644 index 000000000..cd8eb3c23 Binary files /dev/null and b/graphics/Decals/kinymk4.png differ diff --git a/graphics/Decals/nkknmk1.png b/graphics/Decals/nkknmk1.png new file mode 100644 index 000000000..7cc0bd669 Binary files /dev/null and b/graphics/Decals/nkknmk1.png differ diff --git a/graphics/Decals/nkknmk2.png b/graphics/Decals/nkknmk2.png new file mode 100644 index 000000000..ed86337a7 Binary files /dev/null and b/graphics/Decals/nkknmk2.png differ diff --git a/graphics/Decals/nkknmk3.png b/graphics/Decals/nkknmk3.png new file mode 100644 index 000000000..dc4b3efda Binary files /dev/null and b/graphics/Decals/nkknmk3.png differ diff --git a/graphics/Decals/nkknmk4.png b/graphics/Decals/nkknmk4.png new file mode 100644 index 000000000..fcde3eb53 Binary files /dev/null and b/graphics/Decals/nkknmk4.png differ diff --git a/graphics/Decals/nokrmk1.png b/graphics/Decals/nokrmk1.png new file mode 100644 index 000000000..c52382c5d Binary files /dev/null and b/graphics/Decals/nokrmk1.png differ diff --git a/graphics/Decals/nokrmk2.png b/graphics/Decals/nokrmk2.png new file mode 100644 index 000000000..4f4af27be Binary files /dev/null and b/graphics/Decals/nokrmk2.png differ diff --git a/graphics/Decals/nokrmk3.png b/graphics/Decals/nokrmk3.png new file mode 100644 index 000000000..c07f54fe1 Binary files /dev/null and b/graphics/Decals/nokrmk3.png differ diff --git a/graphics/Decals/nokrmk4.png b/graphics/Decals/nokrmk4.png new file mode 100644 index 000000000..cca33b71c Binary files /dev/null and b/graphics/Decals/nokrmk4.png differ diff --git a/graphics/Decals/ultimk1.png b/graphics/Decals/ultimk1.png new file mode 100644 index 000000000..28b8687ae Binary files /dev/null and b/graphics/Decals/ultimk1.png differ diff --git a/graphics/Decals/ultimk2.png b/graphics/Decals/ultimk2.png new file mode 100644 index 000000000..f09b0850a Binary files /dev/null and b/graphics/Decals/ultimk2.png differ diff --git a/graphics/Decals/ultimk3.png b/graphics/Decals/ultimk3.png new file mode 100644 index 000000000..fd8c76d00 Binary files /dev/null and b/graphics/Decals/ultimk3.png differ diff --git a/graphics/Decals/ultimk4.png b/graphics/Decals/ultimk4.png new file mode 100644 index 000000000..4af5e50fd Binary files /dev/null and b/graphics/Decals/ultimk4.png differ diff --git a/graphics/M_DEMOCHAN_PLASMA.png b/graphics/M_DEMOCHAN_PLASMA.png new file mode 100644 index 000000000..a447fad16 Binary files /dev/null and b/graphics/M_DEMOCHAN_PLASMA.png differ diff --git a/language.def_menu b/language.def_menu index 382f68b69..4ba96f61b 100644 --- a/language.def_menu +++ b/language.def_menu @@ -299,7 +299,7 @@ TOOLTIP_NETEVENT_SWWMUPDATESHADOWS = "Adds/Removes simple shadows at runtime, wi TOOLTIP_NETEVENT_SWWMUPDATEGLOWS = "Adds/Removes item glows at runtime, without the need to restart the map. Unclear if it causes issues."; TOOLTIP_NETEVENT_SWWMUPDATEHITBOXES = "Removes extended item hitboxes at runtime. Due to implementation quirks, they can't be added without a map restart."; // main menu poses (do not localize) -SWWM_NMENUPOSE = "24"; +SWWM_NMENUPOSE = "25"; SWWM_MENUPOSE1 = "graphics/M_DEMOCHAN_DEEPIMPACT.png"; SWWM_MENUPOSE2 = "graphics/M_DEMOCHAN_EXPLOGUN.png"; SWWM_MENUPOSE3 = "graphics/M_DEMOCHAN_SPREADGUN.png"; @@ -321,14 +321,14 @@ SWWM_MENUPOSE18 = "graphics/M_DEMOCHAN_SKULL.png"; SWWM_MENUPOSE19 = "graphics/M_DEMOCHAN_THONK.png"; SWWM_MENUPOSE20 = "graphics/M_DEMOCHAN_THUMBUP.png"; SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_HAMMER.png"; -//SWWM_MENUPOSE22 = "graphics/M_DEMOCHAN_PLASMA.png"; +SWWM_MENUPOSE22 = "graphics/M_DEMOCHAN_PLASMA.png"; //SWWM_MENUPOSE23 = "graphics/M_DEMOCHAN_REVOLVER.png"; //SWWM_MENUPOSE24 = "graphics/M_DEMOCHAN_SMG.png"; -SWWM_MENUPOSE22 = "graphics/M_DEMOCHAN_SHEEN.png"; // temp (25) -SWWM_MENUPOSE23 = "graphics/M_DEMOCHAN_QUADRAVOL.png"; // temp (26) +SWWM_MENUPOSE23 = "graphics/M_DEMOCHAN_SHEEN.png"; // temp (25) +SWWM_MENUPOSE24 = "graphics/M_DEMOCHAN_QUADRAVOL.png"; // temp (26) //SWWM_MENUPOSE27 = "graphics/M_DEMOCHAN_SPARKSTER.png"; //SWWM_MENUPOSE28 = "graphics/M_DEMOCHAN_RAYKHOM.png"; -SWWM_MENUPOSE24 = "graphics/M_DEMOCHAN_MISTER.png"; // temp (29) +SWWM_MENUPOSE25 = "graphics/M_DEMOCHAN_MISTER.png"; // temp (29) //SWWM_MENUPOSE30 = "graphics/M_DEMOCHAN_RAFANKOS.png"; //SWWM_MENUPOSE31 = "graphics/M_DEMOCHAN_TRANSRIGHTS.png"; //SWWM_MENUPOSE32 = "graphics/M_DEMOCHAN_PLUSH.png"; diff --git a/language.version b/language.version index b5c5524cb..8e1bc8b78 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r574 \cu(Sat 15 Oct 17:24:52 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r574 \cu(2022-10-15 17:24:52)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r575 \cu(Thu 20 Oct 19:51:25 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r575 \cu(2022-10-20 19:51:25)\c-"; diff --git a/modeldef.plasmablast b/modeldef.plasmablast index 560f0c5ae..483fcad36 100644 --- a/modeldef.plasmablast +++ b/modeldef.plasmablast @@ -1,12 +1,13 @@ Model "PlasmaBlast" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILR" - Scale 0.04 0.04 0.04 + Model 0 "PlasmaBlastPickup_d.3d" + SurfaceSkin 0 0 "PlasmaBlast.png" + SurfaceSkin 0 1 "NoLED.png" + Scale 0.08 0.08 0.08 ZOffset 16 - PitchOffset 30 + AngleOffset 90 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/PlasmaBlast.blend b/models/PlasmaBlast.blend new file mode 100644 index 000000000..7299fc33a Binary files /dev/null and b/models/PlasmaBlast.blend differ diff --git a/models/PlasmaBlast.png b/models/PlasmaBlast.png new file mode 100644 index 000000000..42e8527d2 Binary files /dev/null and b/models/PlasmaBlast.png differ diff --git a/models/PlasmaBlastMag_a.3d b/models/PlasmaBlastMag_a.3d new file mode 100644 index 000000000..371ac37c0 Binary files /dev/null and b/models/PlasmaBlastMag_a.3d differ diff --git a/models/PlasmaBlastMag_d.3d b/models/PlasmaBlastMag_d.3d new file mode 100644 index 000000000..2b8dc4fbf Binary files /dev/null and b/models/PlasmaBlastMag_d.3d differ diff --git a/models/PlasmaBlastPickup_a.3d b/models/PlasmaBlastPickup_a.3d new file mode 100644 index 000000000..a1ed1fd94 Binary files /dev/null and b/models/PlasmaBlastPickup_a.3d differ diff --git a/models/PlasmaBlastPickup_d.3d b/models/PlasmaBlastPickup_d.3d new file mode 100644 index 000000000..4ec50b330 Binary files /dev/null and b/models/PlasmaBlastPickup_d.3d differ diff --git a/models/PlasmaBlast_1st.png b/models/PlasmaBlast_1st.png new file mode 100644 index 000000000..42e8527d2 Binary files /dev/null and b/models/PlasmaBlast_1st.png differ diff --git a/models/PlasmaBlast_battery.png b/models/PlasmaBlast_battery.png new file mode 100644 index 000000000..650d29d1f Binary files /dev/null and b/models/PlasmaBlast_battery.png differ diff --git a/models/PlasmaBlast_bright.png b/models/PlasmaBlast_bright.png new file mode 100644 index 000000000..c1b6d1501 Binary files /dev/null and b/models/PlasmaBlast_bright.png differ diff --git a/models/PlasmaBlast_charge.png b/models/PlasmaBlast_charge.png new file mode 100644 index 000000000..302790733 Binary files /dev/null and b/models/PlasmaBlast_charge.png differ diff --git a/models/PlasmaBlast_grad.png b/models/PlasmaBlast_grad.png new file mode 100644 index 000000000..3e251d1f9 Binary files /dev/null and b/models/PlasmaBlast_grad.png differ diff --git a/models/PlasmaBlast_mask.png b/models/PlasmaBlast_mask.png new file mode 100644 index 000000000..a0b15894f Binary files /dev/null and b/models/PlasmaBlast_mask.png differ diff --git a/models/PlasmaLED.png b/models/PlasmaLED.png new file mode 100644 index 000000000..0fc192ef2 Binary files /dev/null and b/models/PlasmaLED.png differ diff --git a/models/extra/NKGrad.png b/models/extra/NKGrad.png new file mode 100644 index 000000000..b29d6edb6 Binary files /dev/null and b/models/extra/NKGrad.png differ diff --git a/models/extra/NKRim.png b/models/extra/NKRim.png new file mode 100644 index 000000000..667721799 Binary files /dev/null and b/models/extra/NKRim.png differ diff --git a/models/extra/NKRing.png b/models/extra/NKRing.png new file mode 100644 index 000000000..93593f8ed Binary files /dev/null and b/models/extra/NKRing.png differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 7a9b1ccca..452e558c1 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -2,7 +2,7 @@ Weapon models: x Itamex Hammer - - Plasma Blaster + ½ Plasma Blaster - Puntzer Beta - Puntzer Gamma x Sheen HMG @@ -13,7 +13,7 @@ Weapon models: - Rafan-Kos Ammo models: - - Plasma Ammo + x Plasma Ammo - SMW.05 Ammo - Single - Beta speedloader diff --git a/zmapinfo.txt b/zmapinfo.txt index 20318fdf2..68d16eb60 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -135,6 +135,7 @@ GameInfo "graphics/M_DEMOCHAN_THONK.png", "graphics/M_DEMOCHAN_THUMBUP.png", "graphics/M_DEMOCHAN_HAMMER.png", + "graphics/M_DEMOCHAN_PLASMA.png", "graphics/M_DEMOCHAN_SHEEN.png", "graphics/M_DEMOCHAN_QUADRAVOL.png", "graphics/M_DEMOCHAN_MISTER.png"