diff --git a/docimg/quadammo.png b/docimg/quadammo.png index fa20c2ed9..fcd1710b6 100644 Binary files a/docimg/quadammo.png and b/docimg/quadammo.png differ diff --git a/docimg/quadravol.png b/docimg/quadravol.png index f051fbb9e..d3e2f935e 100644 Binary files a/docimg/quadravol.png and b/docimg/quadravol.png differ diff --git a/gldefs.misc b/gldefs.misc index be10c7ddb..b06d82f8e 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -148,6 +148,10 @@ HardwareShader Texture "graphics/M_DEMOCHAN_SHEEN.png" { Shader "shaders/glsl/Bilinear.fp" } +HardwareShader Texture "graphics/M_DEMOCHAN_QUADRAVOL.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} HardwareShader Sprite "MBRNB0" { Shader "shaders/glsl/Whew.fp" diff --git a/graphics/M_DEMOCHAN_QUADRAVOL.png b/graphics/M_DEMOCHAN_QUADRAVOL.png new file mode 100644 index 000000000..138fbb964 Binary files /dev/null and b/graphics/M_DEMOCHAN_QUADRAVOL.png differ diff --git a/language.def_lore b/language.def_lore index dbf149a86..e9c62a131 100644 --- a/language.def_lore +++ b/language.def_lore @@ -3128,7 +3128,7 @@ SWWM_LORETXT_QUADRAVOL = "\cxManufacturer:\c-\n" "\cf Eushura Kmonn Jr.\c-\n" "\cxClassification:\c-\n" -"\cf Igneous Projectile Launcher\c-\n" +"\cf Incendiary Pistol(?)\c-\n" "\n" "A powerful incendiary weapon coming from \cfKmonn Shuna\c-, prized among \cfXekkian\c- commanders. The \cfQuadravol\c- shoots blazing balls of fire that explode spectacularly in contact with anything, releasing intense heat and kinetic force. It is seen to be very useful against crowds as the force of impact is potent enough to disperse them quickly. One very distinctive trait of the weapon is the fact that the flames that burst out of it will burn brightly even underwater.\n" "\n" @@ -3140,7 +3140,7 @@ SWWM_LORETXT_QUADRAVOL = "\n" "The Ardent Cross was the name of the general's sword which, when imbued with magic, would release deadly cross slashes of burning flame.\n" "\n" -"\cfPrimary Fire:\c- Single, large fireball shot. Very minor drift, so its effective range is quite long. Ignites nearby targets on impact.\n" +"\cfPrimary Fire:\c- Large fireball shots, which will ignite nearby targets on impact.\n" "\n" "\cfSecondary Fire:\c- Pumps additional fuel, increasing the strength of your shots, but also their drift, making them less accurate. Excess overcharge will result in a wildly inaccurate misfire, but even this has its uses.\n" "\n" @@ -3153,7 +3153,7 @@ SWWM_LORETXT_QUADRAVOL = "\cxSaya's Notes:\c-\n" "\cfTypical overly dramatic Xekkian stuff. The \"Ardent Cross\", really... But it's as badass as it sounds, at least.\c-\n" "\n" -"\cfAnd of course it's huge af too, even if the grip is supposedly adapted. It honestly weirds me out how you can do that thing of... making your hands bigger, but at least it lets you use stuff like that easily.\c-\n" +"\cfAnd of course it's huge af too for something that's supposedly a pistol. Honestly, with these people, you just never know. Their \"light sidearms\" are humongous.\c-\n" "\n" "\cfAnyway, motherfucking fireballs, that work underwater??? Gonna need to see the science behind this because that makes no fucking sense and yet... it's there.\c-\n" "\n" diff --git a/language.def_menu b/language.def_menu index 92932ee81..68e399d0d 100644 --- a/language.def_menu +++ b/language.def_menu @@ -297,7 +297,7 @@ TOOLTIP_NETEVENT_SWWMUPDATEGLOWS = "Adds/Removes item glows at runtime, without TOOLTIP_NETEVENT_SWWMUPDATEHITBOXES = "Removes extended item hitboxes at runtime. Due to implementation quirks, they can't be added without a map restart."; TOOLTIP_NETEVENT_SWWMUPDATETRACKERS = "Adds/Removes combat trackers at runtime. This command has the potential to cause severe performance issues in certain situations."; // main menu poses (do not localize) -SWWM_NMENUPOSE = "22"; +SWWM_NMENUPOSE = "23"; SWWM_MENUPOSE1 = "graphics/M_DEMOCHAN_DEEPIMPACT.png"; SWWM_MENUPOSE2 = "graphics/M_DEMOCHAN_EXPLOGUN.png"; SWWM_MENUPOSE3 = "graphics/M_DEMOCHAN_SPREADGUN.png"; @@ -323,7 +323,7 @@ SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_HAMMER.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_MENUPOSE26 = "graphics/M_DEMOCHAN_QUADRAVOL.png"; +SWWM_MENUPOSE23 = "graphics/M_DEMOCHAN_QUADRAVOL.png"; // temp (26) //SWWM_MENUPOSE27 = "graphics/M_DEMOCHAN_SPARKSTER.png"; //SWWM_MENUPOSE28 = "graphics/M_DEMOCHAN_RAYKHOM.png"; //SWWM_MENUPOSE29 = "graphics/M_DEMOCHAN_MISTER.png"; diff --git a/language.es_lore b/language.es_lore index 1ab2cd5ba..2dace6aae 100644 --- a/language.es_lore +++ b/language.es_lore @@ -2902,7 +2902,7 @@ SWWM_LORETXT_QUADRAVOL = "\cxFabricante:\c-\n" "\cf Eushura Kmonn Jr.\c-\n" "\cxClasificación:\c-\n" -"\cf Lanzadora de Proyectiles Ígneos\c-\n" +"\cf Pistola(?) Incendiaria\c-\n" "\n" "Una poderosa arma incendiaria proveniente de \cfKmonn Shuna\c-, preciada por comandantes \cfXekkian\c-. La \cfQuadravol\c- dispara bolas de fuego abrasador que explotan espectacularmente en contacto con cualquier cosa, liberando un intenso calor y fuerza cinética. Es considerada muy útil contra grupos ya que la fuerza de impacto es lo suficientemente potente para dispersarlos rápidamente. Un rasgo muy característico del arma es el hecho de que las llamas que salen de ella arderán con fuerza incluso bajo el agua.\n" "\n" @@ -2914,7 +2914,7 @@ SWWM_LORETXT_QUADRAVOL = "\n" "La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida de magia, podía liberar mortíferos cortes cruzados de llamas fulminantes.\n" "\n" -"\cfFuego Primario:\c- Disparo de gran bola de fuego. Desvío mucho menor, por lo que su rango efectivo es muy largo. Incendia objetivos cercanos al impactar.\n" +"\cfFuego Primario:\c- Dispara grandes bolas de fuego, las cuales incendiarán objetivos cercanos al impactar.\n" "\n" "\cfFuego Secundario:\c- Bombea combustible adicional, incrementando la potencia de tus disparos, pero también su desvío, haciéndolos menos precisos. La sobrecarga excesiva puede resultar en una imprecisa descarga accidental, pero incluso esto tiene sus usos.\n" "\n" @@ -2927,7 +2927,7 @@ SWWM_LORETXT_QUADRAVOL = "\cxNotas de Saya:\c-\n" "\cfTípicas ñoñerías superdramáticas de los Xekkian. La \"Cruz Ardiente\", en serio... Pero mola tanto como suena, al menos.\c-\n" "\n" -"\cfY por supuesto es jodidamente enorme, también, aunque la empuñadura está supuestamente adaptada. En serio que se me hace rarísimo como puedes hacer eso de... agrandar las manos, pero al menos te permite usar cosas así fácilmente.\c-\n" +"\cfY por supuesto es jodidamente enorme para lo que se supone que es una pistola. En serio, con esta gente, es que nunca se sabe. Hasta sus \"armas ligeras\" son gigantescas.\c-\n" "\n" "\cfEn fin, putas bolas de fuego, ¿¿¿que funcionan bajo el agua??? Voy a tener que echarle un ojo a la ciencia detrás de esto porque eso no tiene puto sentido y aun así... está ahí.\c-\n" "\n" diff --git a/language.version b/language.version index 9949f860c..9d753f702 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r317 \cu(Sat 13 Aug 14:28:09 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r317 \cu(2022-08-13 14:28:09)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r318 \cu(Sat 13 Aug 16:09:26 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r318 \cu(2022-08-13 16:09:26)\c-"; diff --git a/lore/default/quadravol.txt b/lore/default/quadravol.txt index 720b996e7..eeb6d1ea1 100644 --- a/lore/default/quadravol.txt +++ b/lore/default/quadravol.txt @@ -10,7 +10,7 @@ TXT \cxManufacturer:\c- \cf Eushura Kmonn Jr.\c- \cxClassification:\c- -\cf Igneous Projectile Launcher\c- +\cf Incendiary Pistol(?)\c- A powerful incendiary weapon coming from **Kmonn Shuna**, prized among **Xekkian** commanders. The **Quadravol** shoots blazing balls of fire that explode spectacularly in contact with anything, releasing intense heat and kinetic force. It is seen to be very useful against crowds as the force of impact is potent enough to disperse them quickly. One very distinctive trait of the weapon is the fact that the flames that burst out of it will burn brightly even underwater. @@ -22,7 +22,7 @@ The name of the weapon comes from the **Xekkas** language, and it stands for **" The Ardent Cross was the name of the general's sword which, when imbued with magic, would release deadly cross slashes of burning flame. -\cfPrimary Fire:\c- Single, large fireball shot. Very minor drift, so its effective range is quite long. Ignites nearby targets on impact. +\cfPrimary Fire:\c- Large fireball shots, which will ignite nearby targets on impact. \cfSecondary Fire:\c- Pumps additional fuel, increasing the strength of your shots, but also their drift, making them less accurate. Excess overcharge will result in a wildly inaccurate misfire, but even this has its uses. @@ -35,7 +35,7 @@ The Ardent Cross was the name of the general's sword which, when imbued with mag \cxSaya's Notes:\c- \cfTypical overly dramatic Xekkian stuff. The "Ardent Cross", really... But it's as badass as it sounds, at least.\c- -\cfAnd of course it's huge af too, even if the grip is supposedly adapted. It honestly weirds me out how you can do that thing of... making your hands bigger, but at least it lets you use stuff like that easily.\c- +\cfAnd of course it's huge af too for something that's supposedly a pistol. Honestly, with these people, you just never know. Their "light sidearms" are humongous.\c- \cfAnyway, motherfucking fireballs, that work underwater??? Gonna need to see the science behind this because that makes no fucking sense and yet... it's there.\c- diff --git a/lore/es/quadravol.txt b/lore/es/quadravol.txt index fc451a73e..c24e7a8ae 100644 --- a/lore/es/quadravol.txt +++ b/lore/es/quadravol.txt @@ -4,7 +4,7 @@ TXT \cxFabricante:\c- \cf Eushura Kmonn Jr.\c- \cxClasificación:\c- -\cf Lanzadora de Proyectiles Ígneos\c- +\cf Pistola(?) Incendiaria\c- Una poderosa arma incendiaria proveniente de **Kmonn Shuna**, preciada por comandantes **Xekkian**. La **Quadravol** dispara bolas de fuego abrasador que explotan espectacularmente en contacto con cualquier cosa, liberando un intenso calor y fuerza cinética. Es considerada muy útil contra grupos ya que la fuerza de impacto es lo suficientemente potente para dispersarlos rápidamente. Un rasgo muy característico del arma es el hecho de que las llamas que salen de ella arderán con fuerza incluso bajo el agua. @@ -16,7 +16,7 @@ El nombre del arma viene del idioma **Xekkas**, y se traduce como **Cruz Ardient La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida de magia, podía liberar mortíferos cortes cruzados de llamas fulminantes. -\cfFuego Primario:\c- Disparo de gran bola de fuego. Desvío mucho menor, por lo que su rango efectivo es muy largo. Incendia objetivos cercanos al impactar. +\cfFuego Primario:\c- Dispara grandes bolas de fuego, las cuales incendiarán objetivos cercanos al impactar. \cfFuego Secundario:\c- Bombea combustible adicional, incrementando la potencia de tus disparos, pero también su desvío, haciéndolos menos precisos. La sobrecarga excesiva puede resultar en una imprecisa descarga accidental, pero incluso esto tiene sus usos. @@ -29,7 +29,7 @@ La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida \cxNotas de Saya:\c- \cfTípicas ñoñerías superdramáticas de los Xekkian. La "Cruz Ardiente", en serio... Pero mola tanto como suena, al menos.\c- -\cfY por supuesto es jodidamente enorme, también, aunque la empuñadura está supuestamente adaptada. En serio que se me hace rarísimo como puedes hacer eso de... agrandar las manos, pero al menos te permite usar cosas así fácilmente.\c- +\cfY por supuesto es jodidamente enorme para lo que se supone que es una pistola. En serio, con esta gente, es que nunca se sabe. Hasta sus "armas ligeras" son gigantescas.\c- \cfEn fin, putas bolas de fuego, ¿¿¿que funcionan bajo el agua??? Voy a tener que echarle un ojo a la ciencia detrás de esto porque eso no tiene puto sentido y aun así... está ahí.\c- diff --git a/models/Quadravol.blend b/models/Quadravol.blend index 71249d1ca..ac192693b 100644 Binary files a/models/Quadravol.blend and b/models/Quadravol.blend differ diff --git a/models/Quadravol.png b/models/Quadravol.png index f8b90513b..9e27d5985 100644 Binary files a/models/Quadravol.png and b/models/Quadravol.png differ diff --git a/models/QuadravolPickup_a.3d b/models/QuadravolPickup_a.3d index 163b1833c..c1ce00ebb 100644 Binary files a/models/QuadravolPickup_a.3d and b/models/QuadravolPickup_a.3d differ diff --git a/models/QuadravolPickup_d.3d b/models/QuadravolPickup_d.3d index a5de6f6d9..96a4f43db 100644 Binary files a/models/QuadravolPickup_d.3d and b/models/QuadravolPickup_d.3d differ diff --git a/zmapinfo.txt b/zmapinfo.txt index bc647c425..c7ef3e833 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -132,7 +132,10 @@ GameInfo "graphics/M_DEMOCHAN_SHELLS.png", "graphics/M_DEMOCHAN_SKULL.png", "graphics/M_DEMOCHAN_THONK.png", - "graphics/M_DEMOCHAN_THUMBUP.png" + "graphics/M_DEMOCHAN_THUMBUP.png", + "graphics/M_DEMOCHAN_HAMMER.png", + "graphics/M_DEMOCHAN_SHEEN.png", + "graphics/M_DEMOCHAN_QUADRAVOL.png" } ClearSkills diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index fc2e00598..560de3afb 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -26,7 +26,7 @@ Class Quadravol : SWWMWeapon Stamina 80000; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.EXPLOSIVE; - Radius 32; + Radius 28; Height 32; } States