diff --git a/gldefs.misc b/gldefs.misc index aaa8fad1b..9960d0c44 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -40,14 +40,25 @@ HardwareShader Texture "graphics/tempbg.png" HardwareShader Texture "graphics/SWWMGZLogo.png" { Shader "shaders/glsl/LogoAnimated.fp" - Define "TEX_SZ" = "vec2(2048.,1024.)" - Texture "LogoTex" "graphics/SWWMGZLogo_Layers.png" + // what no 2d arrays does to a mf + Texture "Layer1" "graphics/SWWMGZLogo_Layer1.png" + Texture "Layer2" "graphics/SWWMGZLogo_Layer2.png" + Texture "Layer3" "graphics/SWWMGZLogo_Layer3.png" + Texture "Layer4" "graphics/SWWMGZLogo_Layer4.png" + Texture "Layer5" "graphics/SWWMGZLogo_Layer5.png" + Texture "Layer6" "graphics/SWWMGZLogo_Layer6.png" } HardwareShader Texture "graphics/M_SWWM.png" { Shader "shaders/glsl/LogoAnimated.fp" - Define "TEX_SZ" = "vec2(256.,128.)" - Texture "LogoTex" "graphics/M_SWWM_Layers.png" + // what no 2d arrays does to a mf + Texture "Layer1" "graphics/M_SWWM_Layer1.png" + Texture "Layer2" "graphics/M_SWWM_Layer2.png" + Texture "Layer3" "graphics/M_SWWM_Layer3.png" + Texture "Layer4" "graphics/M_SWWM_Layer4.png" + Texture "Layer5" "graphics/M_SWWM_Layer5.png" + Texture "Layer6" "graphics/M_SWWM_Layer6.png" + Define "NO_BILINEAR" } HardwareShader Sprite "MBRNB0" { diff --git a/graphics/M_SWWM_Layer1.png b/graphics/M_SWWM_Layer1.png new file mode 100644 index 000000000..301d6b6e2 Binary files /dev/null and b/graphics/M_SWWM_Layer1.png differ diff --git a/graphics/M_SWWM_Layer2.png b/graphics/M_SWWM_Layer2.png new file mode 100644 index 000000000..6d61a520f Binary files /dev/null and b/graphics/M_SWWM_Layer2.png differ diff --git a/graphics/M_SWWM_Layer3.png b/graphics/M_SWWM_Layer3.png new file mode 100644 index 000000000..0f6cb7036 Binary files /dev/null and b/graphics/M_SWWM_Layer3.png differ diff --git a/graphics/M_SWWM_Layer4.png b/graphics/M_SWWM_Layer4.png new file mode 100644 index 000000000..4b423de2a Binary files /dev/null and b/graphics/M_SWWM_Layer4.png differ diff --git a/graphics/M_SWWM_Layer5.png b/graphics/M_SWWM_Layer5.png new file mode 100644 index 000000000..e3a1c1698 Binary files /dev/null and b/graphics/M_SWWM_Layer5.png differ diff --git a/graphics/M_SWWM_Layer6.png b/graphics/M_SWWM_Layer6.png new file mode 100644 index 000000000..a43598d03 Binary files /dev/null and b/graphics/M_SWWM_Layer6.png differ diff --git a/graphics/M_SWWM_Layers.png b/graphics/M_SWWM_Layers.png deleted file mode 100644 index 75773e5d2..000000000 Binary files a/graphics/M_SWWM_Layers.png and /dev/null differ diff --git a/graphics/SWWMGZLogo_Layer1.png b/graphics/SWWMGZLogo_Layer1.png new file mode 100644 index 000000000..17a8a6224 Binary files /dev/null and b/graphics/SWWMGZLogo_Layer1.png differ diff --git a/graphics/SWWMGZLogo_Layer2.png b/graphics/SWWMGZLogo_Layer2.png new file mode 100644 index 000000000..9aa13d25b Binary files /dev/null and b/graphics/SWWMGZLogo_Layer2.png differ diff --git a/graphics/SWWMGZLogo_Layer3.png b/graphics/SWWMGZLogo_Layer3.png new file mode 100644 index 000000000..88e434b15 Binary files /dev/null and b/graphics/SWWMGZLogo_Layer3.png differ diff --git a/graphics/SWWMGZLogo_Layer4.png b/graphics/SWWMGZLogo_Layer4.png new file mode 100644 index 000000000..d640a566e Binary files /dev/null and b/graphics/SWWMGZLogo_Layer4.png differ diff --git a/graphics/SWWMGZLogo_Layer5.png b/graphics/SWWMGZLogo_Layer5.png new file mode 100644 index 000000000..6e131dcbc Binary files /dev/null and b/graphics/SWWMGZLogo_Layer5.png differ diff --git a/graphics/SWWMGZLogo_Layer6.png b/graphics/SWWMGZLogo_Layer6.png new file mode 100644 index 000000000..94113170f Binary files /dev/null and b/graphics/SWWMGZLogo_Layer6.png differ diff --git a/graphics/SWWMGZLogo_Layers.png b/graphics/SWWMGZLogo_Layers.png deleted file mode 100644 index 27a98c955..000000000 Binary files a/graphics/SWWMGZLogo_Layers.png and /dev/null differ diff --git a/language.def_lore b/language.def_lore index 3eb5254d2..0cec2d631 100644 --- a/language.def_lore +++ b/language.def_lore @@ -1541,7 +1541,7 @@ SWWM_LORETXT_HEAVYMAHSHEENGUN = "\n" "How much bullet is too much bullet? The answer, according to \cfCyrus Enterprises\c-, is \"never enough\". The \cfSheen Heavy Machinegun\c- is a monstrosity in all aspects when it comes to delivering lead. Steadily feeding directly off \cfHammerspace™\c-, this puppy can be carried anywhere without the need to bring along hefty ammo boxes, ready to rain death upon anything on demand. Additionally, powered by \cfTach-Engine\c-'s \"Magdalene\" Microfusion battery, the weapon can stay in operation for several days without needing to recharge.\n" "\n" -"The ammunition employed by this weapon are AP rounds of 14.5x114mm caliber. Unlike the standard heavy ordnance rounds used within the Soviet Union, these are far more potent, employing an alloy of both mundane and exotic elements known as Meta-Tellubrium, generally used for fusion reactor parts due to its outstanding resilience to both extreme pressure and heat. As reported following the \cfGhoul Hunt\c- of 2007, this ammunition is quite effective in tearing through demon flesh as if it were jelly.\n" +"The ammunition employed by this weapon are AP rounds of 14.5x114mm caliber. Unlike the standard heavy ordnance rounds used within the Soviet Union, these are far more potent, employing an alloy of both mundane and exotic elements known as Meta-Telebrium, generally used for fusion reactor parts due to its outstanding resilience to both extreme pressure and heat. As reported following the \cfGhoul Hunt\c- of 2007, this ammunition is quite effective in tearing through demon flesh as if it were jelly.\n" "\n" "While generally meant for mounted use, on-the-go operation is possible, provided the user is equipped with silver-rated power armor at minimum in order to handle its heavy recoil.\n" "\n" @@ -2900,7 +2900,7 @@ SWWM_LORETXT_QUADRAVOL = "\n" "\cfTertiary Fire:\c- Hold and tap primary fire to toggle scatter shot mode for primary. Several smaller fireballs (number relative to charge), with increased drift and lower effective range, but very useful against multiple targets. Hold and tap secondary fire to switch weapon stances between two-handed and one-handed. This serves no real purpose other than looking cooler when pumping, your accuracy with the weapon is unaffected but you won't shoot it as quickly.\n" "\n" -"\cfReloading:\c- Insert up to five fuel cells into the weapon's tube magazine. Each cell is immediately ejected once it's been emptied into the weapon's internal \"crucible\", so you can hold additional ammo while keeping your charge.\n" +"\cfReloading:\c- Insert up to five fuel cells into the weapon's tube magazine. Each cell is immediately emptied into the weapon's internal \"crucible\", so you can keep loading additional ammo while boosting your charge.\n" "\n" "\cfTechniques:\c- The weapon has a certain \"extra effective\" special move should you be close enough to your target. Plunging the four bayonets into an enemy and immediately pulling the trigger afterwards will result in a potent point blank explosion that will send them flying, covered in flames.\n" "\n" @@ -2909,7 +2909,9 @@ SWWM_LORETXT_QUADRAVOL = "\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" "\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-"; +"\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" +"\cfBy the way, leverguns make me wild out. You know it, we all know it, they're just SO GOOD.\c-"; SWWM_LORETAG_RAFANKOS = "Rafan-Kos"; SWWM_LORETAB_RAFANKOS = "Item"; SWWM_LOREREL_RAFANKOS = "Nekuratek;Saya"; @@ -2927,11 +2929,11 @@ SWWM_LORETXT_RAFANKOS = "\n" "The weapon employs \cfKabbadon\c- as fuel, a common byproduct of \cfNokorokinylum\c- fusion, thus making it fairly easy to produce. However, the density and degree of purity required in the creation of a single fuel pod make its price escalate dramatically.\n" "\n" -"\cfPrimary Fire:\c- Release a radiant blast of energy that punches its way through anything, sending sparks flying in all directions along its path and burning other nearby targets. The blast burns for a total of five seconds before rapidly dissipating.\n" +"\cfPrimary Fire:\c- Release a radiant blast of energy that punches its way through anything, sending sparks flying in all directions along its path and burning other nearby targets. The blast burns for up to five seconds before rapidly dissipating.\n" "\n" -"\cfSecondary Fire:\c- Releases several scattered blasts in a wide cone, with similar destructive potential, but burning quicker, stronger, and dissipating much rapidly.\n" +"\cfSecondary Fire:\c- Releases several scattered blasts in a wide cone, with similar destructive potential, but burning quicker, stronger, and dissipating more rapidly.\n" "\n" -"\cfReload:\c- Loads in a new magazine, each holding four pods.\n" +"\cfReload:\c- Loads in a new magazine, each holding four pods. The currently loaded pod must be fully discharged before a new one can be chambered in.\n" "\n" "\cxSaya's Notes:\c-\n" "\cf\"Ultimate Weapon\"? Talk about pretentious... But you know, something about this was making my brains itch, and then it clicked. This is basically like that one spellcard, the Master Spark. Hell, it almost even sounds and looks the same...\c-\n" diff --git a/language.es_lore b/language.es_lore index 24818bc1b..e3b05b64e 100644 --- a/language.es_lore +++ b/language.es_lore @@ -1426,7 +1426,7 @@ SWWM_LORETXT_HEAVYMAHSHEENGUN = "\n" "¿Cuanta bala es demasiada bala? La respuesta, según \cfCyrus Enterprises\c-, es \"nunca suficiente\". La \cfAmetralladora Pesada Sheen\c- es una monstruosidad en todos los aspectos en lo referente a repartir plomo. Alimentada directamente desde \cfHammerspace™\c-, esta preciosidad se puede llevar a cualquier lado sin la necesidad de llevar encima pesadas cajas de munición, lista para diluviar muerte sobre cualquier cosa cuando se desee. Adicionalmente, teniendo la batería de Microfusión \"Magdalene\" de \cfTach-Engine\c-, el arma puede permanecer operativa durante días sin necesidad de recargarla.\n" "\n" -"La munición empleada por este arma son balas anti-armadura del calibre 14.5x114mm. A diferencia de la munición estándar para armería pesada empleada en la Unión Soviética, esta es mucho más potente, empleando una aleación de elementos tanto mundanos como exóticos conocida como Meta-Tellubrium, generalmente usada para piezas de reactores de fusión dada su excepcional resistencia tanto a presión como calor extremos. Tal y como fue reportado tras la \cfCaza de Ghouls\c- de 2007, esta munición es bastante efectiva atravesando carne demoníaca como si fuese gelatina.\n" +"La munición empleada por este arma son balas anti-armadura del calibre 14.5x114mm. A diferencia de la munición estándar para armería pesada empleada en la Unión Soviética, esta es mucho más potente, empleando una aleación de elementos tanto mundanos como exóticos conocida como Meta-Telebrium, generalmente usada para piezas de reactores de fusión dada su excepcional resistencia tanto a presión como calor extremos. Tal y como fue reportado tras la \cfCaza de Ghouls\c- de 2007, esta munición es bastante efectiva atravesando carne demoníaca como si fuese gelatina.\n" "\n" "Aunque generalmente ideada para el uso montado, la operación al paso es posible, siempre y cuando el usuario tenga una servoarmadura de grado plata como mínimo para manejar el potente retroceso.\n" "\n" @@ -2672,7 +2672,7 @@ SWWM_LORETXT_QUADRAVOL = "\n" "\cfFuego Terciario:\c- Mantén y pulsa fuego primario para alternar el modo de dispersión. Varias bolas de fuego menores (número relativo a la carga), con un desvío incrementado y rango efectivo menor, pero muy útil contra múltiples objetivos. Mantén y pulsa fuego secundario para alternar la postura de arma entre dos manos y una mano. Esto solo sirve para ser más vistoso al bombear, y no altera tu puntería pero si hace los disparos más lentos.\n" "\n" -"\cfRecarga:\c- Inserta hasta cinco células de combustible en el tubo del arma. Cada célula es expulsada inmediatamente tras ser vaciada en el \"crisol\" interno del arma, así que puedes almacenar munición adicional mientras mantienes la carga.\n" +"\cfRecarga:\c- Inserta hasta cinco células de combustible en el tubo del arma. Cada célula es vaciada immediatemente en el \"crisol\" interno del arma, así que puedes cargar munición adicional mientras incrementas la carga.\n" "\n" "\cfTécnicas:\c- El arma tiene un cierto movimiento especial \"extra efectivo\" si te encuentras a poca distancia de tu objetivo. Hundiendo las cuatro bayonetas en el enemigo e inmediatamente después apretando el gatillo resultará en una potente explosión a bocajarro que lo enviará volando, cubierto en llamas.\n" "\n" @@ -2681,7 +2681,9 @@ SWWM_LORETXT_QUADRAVOL = "\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" "\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-"; +"\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" +"\cfPor cierto, las armas de palanca me ponen a tope. Tú lo sabes, todos lo sabemos, es que son BUENÍSIMAS.\c-"; SWWM_LORETXT_RAFANKOS = "\cxDesignación:\c-\n" "\cf Rafan-Kos (\"Arma Definitiva\")\c-\n" @@ -2696,11 +2698,11 @@ SWWM_LORETXT_RAFANKOS = "\n" "El arma emplea \cfKabbadon\c- como combustible, un subproducto común de la fusión de \cfNokorokinylum\c-, haciéndolo así fácil de fabricar. Sin embargo, dada la densidad y pureza requeridas en la creación de una sola cápsula de combustible hacen que su precio escale dramáticamente.\n" "\n" -"\cfFuego Primario:\c- Libera un radiante estallido de energía que se abre paso a través de todo, soltando chispas en todas direcciones a su paso y quemando objetivos cercanos. El estallido arde durante un total de cinco segundos antes de disiparse rápidamente.\n" +"\cfFuego Primario:\c- Libera un radiante estallido de energía que se abre paso a través de todo, soltando chispas en todas direcciones a su paso y quemando objetivos cercanos. El estallido arde durante un máximo de cinco segundos antes de disiparse rápidamente.\n" "\n" "\cfFuego Secundario:\c- Libera varios estallidos dispersos en un cono amplio, con un potencial destructivo similar, pero ardiendo más rápido, con mayor intensidad, y disipándose mucho antes.\n" "\n" -"\cfRecarga:\c- Coloca un nuevo cargador, cada uno almacenando cuatro cápsulas.\n" +"\cfRecarga:\c- Coloca un nuevo cargador, cada uno almacenando cuatro cápsulas. La cápsula cargada debe gastarse completamente antes de poder insertar una nueva en la recámara.\n" "\n" "\cxNotas de Saya:\c-\n" "\cf¿\"Arma Definitiva\"? Menuda cursilada... Pero sabes, algo de todo esto hacía que me picotearan los sesos, y entonces todo encajó. Esta cosa es básicamente como esa carta de hechizo, la Chispa Maestra. Hostia, es que hasta suena y pinta igual...\c-\n" diff --git a/language.version b/language.version index 95a5a536f..65466c8b3 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r72 \cu(Sat 4 Dec 21:50:50 CET 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r72 \cu(2021-12-04 21:50:50)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r73 \cu(Mon 6 Dec 18:10:58 CET 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r73 \cu(2021-12-06 18:10:58)\c-"; diff --git a/lore/default/heavymahsheengun.txt b/lore/default/heavymahsheengun.txt index 6cee88ee8..8067790c5 100644 --- a/lore/default/heavymahsheengun.txt +++ b/lore/default/heavymahsheengun.txt @@ -14,7 +14,7 @@ TXT How much bullet is too much bullet? The answer, according to **Cyrus Enterprises**, is "never enough". The **Sheen Heavy Machinegun** is a monstrosity in all aspects when it comes to delivering lead. Steadily feeding directly off **Hammerspace™**, this puppy can be carried anywhere without the need to bring along hefty ammo boxes, ready to rain death upon anything on demand. Additionally, powered by **Tach-Engine**'s "Magdalene" Microfusion battery, the weapon can stay in operation for several days without needing to recharge. -The ammunition employed by this weapon are AP rounds of 14.5x114mm caliber. Unlike the standard heavy ordnance rounds used within the Soviet Union, these are far more potent, employing an alloy of both mundane and exotic elements known as Meta-Tellubrium, generally used for fusion reactor parts due to its outstanding resilience to both extreme pressure and heat. As reported following the **Ghoul Hunt** of 2007, this ammunition is quite effective in tearing through demon flesh as if it were jelly. +The ammunition employed by this weapon are AP rounds of 14.5x114mm caliber. Unlike the standard heavy ordnance rounds used within the Soviet Union, these are far more potent, employing an alloy of both mundane and exotic elements known as Meta-Telebrium, generally used for fusion reactor parts due to its outstanding resilience to both extreme pressure and heat. As reported following the **Ghoul Hunt** of 2007, this ammunition is quite effective in tearing through demon flesh as if it were jelly. While generally meant for mounted use, on-the-go operation is possible, provided the user is equipped with silver-rated power armor at minimum in order to handle its heavy recoil. diff --git a/lore/default/quadravol.txt b/lore/default/quadravol.txt index c6452b90e..b7d03f1ea 100644 --- a/lore/default/quadravol.txt +++ b/lore/default/quadravol.txt @@ -28,7 +28,7 @@ The Ardent Cross was the name of the general's sword which, when imbued with mag \cfTertiary Fire:\c- Hold and tap primary fire to toggle scatter shot mode for primary. Several smaller fireballs (number relative to charge), with increased drift and lower effective range, but very useful against multiple targets. Hold and tap secondary fire to switch weapon stances between two-handed and one-handed. This serves no real purpose other than looking cooler when pumping, your accuracy with the weapon is unaffected but you won't shoot it as quickly. -\cfReloading:\c- Insert up to five fuel cells into the weapon's tube magazine. Each cell is immediately ejected once it's been emptied into the weapon's internal "crucible", so you can hold additional ammo while keeping your charge. +\cfReloading:\c- Insert up to five fuel cells into the weapon's tube magazine. Each cell is immediately emptied into the weapon's internal "crucible", so you can keep loading additional ammo while boosting your charge. \cfTechniques:\c- The weapon has a certain "extra effective" special move should you be close enough to your target. Plunging the four bayonets into an enemy and immediately pulling the trigger afterwards will result in a potent point blank explosion that will send them flying, covered in flames. @@ -38,3 +38,5 @@ The Ardent Cross was the name of the general's sword which, when imbued with mag \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- \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- + +\cfBy the way, leverguns make me wild out. You know it, we all know it, they're just SO GOOD.\c- diff --git a/lore/default/rafankos.txt b/lore/default/rafankos.txt index 87a0b3b02..402ab066e 100644 --- a/lore/default/rafankos.txt +++ b/lore/default/rafankos.txt @@ -18,11 +18,11 @@ The **Rafan-Kos** project ("Ultimate Weapon" in Nukuribaku) would only be partia The weapon employs **Kabbadon** as fuel, a common byproduct of **Nokorokinylum** fusion, thus making it fairly easy to produce. However, the density and degree of purity required in the creation of a single fuel pod make its price escalate dramatically. -\cfPrimary Fire:\c- Release a radiant blast of energy that punches its way through anything, sending sparks flying in all directions along its path and burning other nearby targets. The blast burns for a total of five seconds before rapidly dissipating. +\cfPrimary Fire:\c- Release a radiant blast of energy that punches its way through anything, sending sparks flying in all directions along its path and burning other nearby targets. The blast burns for up to five seconds before rapidly dissipating. -\cfSecondary Fire:\c- Releases several scattered blasts in a wide cone, with similar destructive potential, but burning quicker, stronger, and dissipating much rapidly. +\cfSecondary Fire:\c- Releases several scattered blasts in a wide cone, with similar destructive potential, but burning quicker, stronger, and dissipating more rapidly. -\cfReload:\c- Loads in a new magazine, each holding four pods. +\cfReload:\c- Loads in a new magazine, each holding four pods. The currently loaded pod must be fully discharged before a new one can be chambered in. \cxSaya's Notes:\c- \cf"Ultimate Weapon"? Talk about pretentious... But you know, something about this was making my brains itch, and then it clicked. This is basically like that one spellcard, the Master Spark. Hell, it almost even sounds and looks the same...\c- diff --git a/lore/es/heavymahsheengun.txt b/lore/es/heavymahsheengun.txt index bbf193574..afce84901 100644 --- a/lore/es/heavymahsheengun.txt +++ b/lore/es/heavymahsheengun.txt @@ -10,7 +10,7 @@ TXT ¿Cuanta bala es demasiada bala? La respuesta, según **Cyrus Enterprises**, es "nunca suficiente". La **Ametralladora Pesada Sheen** es una monstruosidad en todos los aspectos en lo referente a repartir plomo. Alimentada directamente desde **Hammerspace™**, esta preciosidad se puede llevar a cualquier lado sin la necesidad de llevar encima pesadas cajas de munición, lista para diluviar muerte sobre cualquier cosa cuando se desee. Adicionalmente, teniendo la batería de Microfusión "Magdalene" de **Tach-Engine**, el arma puede permanecer operativa durante días sin necesidad de recargarla. -La munición empleada por este arma son balas anti-armadura del calibre 14.5x114mm. A diferencia de la munición estándar para armería pesada empleada en la Unión Soviética, esta es mucho más potente, empleando una aleación de elementos tanto mundanos como exóticos conocida como Meta-Tellubrium, generalmente usada para piezas de reactores de fusión dada su excepcional resistencia tanto a presión como calor extremos. Tal y como fue reportado tras la **Caza de Ghouls** de 2007, esta munición es bastante efectiva atravesando carne demoníaca como si fuese gelatina. +La munición empleada por este arma son balas anti-armadura del calibre 14.5x114mm. A diferencia de la munición estándar para armería pesada empleada en la Unión Soviética, esta es mucho más potente, empleando una aleación de elementos tanto mundanos como exóticos conocida como Meta-Telebrium, generalmente usada para piezas de reactores de fusión dada su excepcional resistencia tanto a presión como calor extremos. Tal y como fue reportado tras la **Caza de Ghouls** de 2007, esta munición es bastante efectiva atravesando carne demoníaca como si fuese gelatina. Aunque generalmente ideada para el uso montado, la operación al paso es posible, siempre y cuando el usuario tenga una servoarmadura de grado plata como mínimo para manejar el potente retroceso. diff --git a/lore/es/quadravol.txt b/lore/es/quadravol.txt index 7f89ad74a..4ca4dc451 100644 --- a/lore/es/quadravol.txt +++ b/lore/es/quadravol.txt @@ -22,7 +22,7 @@ La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida \cfFuego Terciario:\c- Mantén y pulsa fuego primario para alternar el modo de dispersión. Varias bolas de fuego menores (número relativo a la carga), con un desvío incrementado y rango efectivo menor, pero muy útil contra múltiples objetivos. Mantén y pulsa fuego secundario para alternar la postura de arma entre dos manos y una mano. Esto solo sirve para ser más vistoso al bombear, y no altera tu puntería pero si hace los disparos más lentos. -\cfRecarga:\c- Inserta hasta cinco células de combustible en el tubo del arma. Cada célula es expulsada inmediatamente tras ser vaciada en el "crisol" interno del arma, así que puedes almacenar munición adicional mientras mantienes la carga. +\cfRecarga:\c- Inserta hasta cinco células de combustible en el tubo del arma. Cada célula es vaciada immediatemente en el "crisol" interno del arma, así que puedes cargar munición adicional mientras incrementas la carga. \cfTécnicas:\c- El arma tiene un cierto movimiento especial "extra efectivo" si te encuentras a poca distancia de tu objetivo. Hundiendo las cuatro bayonetas en el enemigo e inmediatamente después apretando el gatillo resultará en una potente explosión a bocajarro que lo enviará volando, cubierto en llamas. @@ -32,3 +32,5 @@ La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida \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- \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- + +\cfPor cierto, las armas de palanca me ponen a tope. Tú lo sabes, todos lo sabemos, es que son BUENÍSIMAS.\c- diff --git a/lore/es/rafankos.txt b/lore/es/rafankos.txt index b5b231aaa..78fdbc032 100644 --- a/lore/es/rafankos.txt +++ b/lore/es/rafankos.txt @@ -12,11 +12,11 @@ El proyecto **Rafan-Kos** ("Arma Definitiva" en Nukuribaku) solo sería completa El arma emplea **Kabbadon** como combustible, un subproducto común de la fusión de **Nokorokinylum**, haciéndolo así fácil de fabricar. Sin embargo, dada la densidad y pureza requeridas en la creación de una sola cápsula de combustible hacen que su precio escale dramáticamente. -\cfFuego Primario:\c- Libera un radiante estallido de energía que se abre paso a través de todo, soltando chispas en todas direcciones a su paso y quemando objetivos cercanos. El estallido arde durante un total de cinco segundos antes de disiparse rápidamente. +\cfFuego Primario:\c- Libera un radiante estallido de energía que se abre paso a través de todo, soltando chispas en todas direcciones a su paso y quemando objetivos cercanos. El estallido arde durante un máximo de cinco segundos antes de disiparse rápidamente. \cfFuego Secundario:\c- Libera varios estallidos dispersos en un cono amplio, con un potencial destructivo similar, pero ardiendo más rápido, con mayor intensidad, y disipándose mucho antes. -\cfRecarga:\c- Coloca un nuevo cargador, cada uno almacenando cuatro cápsulas. +\cfRecarga:\c- Coloca un nuevo cargador, cada uno almacenando cuatro cápsulas. La cápsula cargada debe gastarse completamente antes de poder insertar una nueva en la recámara. \cxNotas de Saya:\c- \cf¿"Arma Definitiva"? Menuda cursilada... Pero sabes, algo de todo esto hacía que me picotearan los sesos, y entonces todo encajó. Esta cosa es básicamente como esa carta de hechizo, la Chispa Maestra. Hostia, es que hasta suena y pinta igual...\c- diff --git a/shaders/glsl/LogoAnimated.fp b/shaders/glsl/LogoAnimated.fp index ce8e2e900..afd150b92 100644 --- a/shaders/glsl/LogoAnimated.fp +++ b/shaders/glsl/LogoAnimated.fp @@ -5,36 +5,24 @@ const float pi = 3.14159265358979323846; vec2 warpcoord( in vec2 uv ) { - vec2 offset = vec2(0,0); + vec2 offset; offset.y = sin(pi*2.*(uv.x*8.+timer*.25))*.005; offset.x = cos(pi*2.*(uv.y*4.+timer*.25))*.005; - return fract(uv+offset); + return uv+offset; } // based on gimp color to alpha, but simplified vec4 blacktoalpha( in vec4 src ) { vec4 dst = src; - float dist = 0., alpha = 0.; - float d, a; + float alpha = 0.; + float a; a = clamp(dst.r,0.,1.); - if ( a > alpha ) - { - alpha = a; - dist = d; - } + if ( a > alpha ) alpha = a; a = clamp(dst.g,0.,1.); - if ( a > alpha ) - { - alpha = a; - dist = d; - } + if ( a > alpha ) alpha = a; a = clamp(dst.b,0.,1.); - if ( a > alpha ) - { - alpha = a; - dist = d; - } + if ( a > alpha ) alpha = a; if ( alpha > 0. ) { float ainv = 1./alpha; @@ -43,30 +31,49 @@ vec4 blacktoalpha( in vec4 src ) dst.a *= alpha; return dst; } +#ifdef NO_BILINEAR +#define BilinearSample(x,y,z,w) texture(x,y) +#else +vec4 BilinearSample( in sampler2D tex, in vec2 pos, in vec2 size, in vec2 pxsize ) +{ + vec2 f = fract(pos*size); + pos += (.5-f)*pxsize; + vec4 p0q0 = texture(tex,pos); + vec4 p1q0 = texture(tex,pos+vec2(pxsize.x,0)); + vec4 p0q1 = texture(tex,pos+vec2(0,pxsize.y)); + vec4 p1q1 = texture(tex,pos+vec2(pxsize.x,pxsize.y)); + vec4 pInterp_q0 = mix(p0q0,p1q0,f.x); + vec4 pInterp_q1 = mix(p0q1,p1q1,f.x); + return mix(pInterp_q0,pInterp_q1,f.y); +} +#endif void SetupMaterial( inout Material mat ) { + // store these to save some time + vec2 size = vec2(textureSize(Layer1,0)); + vec2 pxsize = 1./size; // y'all ready for this multilayered madness? vec2 uv = vTexCoord.st; - // base blank layer, copy - vec4 base = texture(LogoTex,uv*vec2(.5,.25)); + // base blank layer + vec4 base = vec4(0.,0.,0.,1.); // first layer, blend - vec4 tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(0.,.25)); + vec4 tmp = BilinearSample(Layer1,uv,size,pxsize); base.rgb = mix(base.rgb,tmp.rgb,tmp.a); // second layer, warp then add - tmp = texture(LogoTex,warpcoord(uv)*vec2(.5,.25)+vec2(0.,.5)); + tmp = BilinearSample(Layer2,warpcoord(uv),size,pxsize); base.rgb += tmp.rgb; // third layer, multiply - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(0.,.75)); + tmp = BilinearSample(Layer3,uv,size,pxsize); base.rgb *= tmp.rgb; // fourth layer, add - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(.5,0.)); + tmp = BilinearSample(Layer4,uv,size,pxsize); base.rgb += tmp.rgb; // fifth layer, add - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(.5,.25)); + tmp = BilinearSample(Layer5,uv,size,pxsize); base.rgb += tmp.rgb; - // sixth layer, overlay (w/ alpha blend) - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(.5,.5)); + // first layer again, overlay (w/ alpha blend) + tmp = BilinearSample(Layer1,uv,size,pxsize); vec4 tmp2; tmp2.r = overlay(base.r,tmp.r); tmp2.g = overlay(base.g,tmp.g); @@ -75,22 +82,13 @@ void SetupMaterial( inout Material mat ) // black to alpha base = blacktoalpha(base); // add alpha of first layer - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(0.,.25)); - base.a += tmp.a; + base.a += BilinearSample(Layer1,uv,size,pxsize).a; // clamp - base = clamp(base,0.,1.); - // seventh layer, alpha blend - tmp = texture(LogoTex,uv*vec2(.5,.25)+vec2(.5,.75)); + base = clamp(base,vec4(0.),vec4(1.)); + // sixth layer, alpha blend + tmp = BilinearSample(Layer6,uv,size,pxsize); tmp2.a = tmp.a+base.a*(1-tmp.a); tmp2.rgb = (tmp.rgb*tmp.a+base.rgb*base.a*(1-tmp.a))/tmp2.a; - if ( tmp2.a == 0. ) tmp2.rgb = vec3(0.); - // clamp borders - vec2 sz = TEX_SZ; - vec2 px = uv*sz; - if ( (px.x <= 1) || (px.x >= (sz.x-1)) || (px.y <= 1) || (px.y >= (sz.y-1)) ) - tmp2 = vec4(0.); // ding, logo's done mat.Base = tmp2; - mat.Normal = ApplyNormalMap(vTexCoord.st); } - diff --git a/zmapinfo.txt b/zmapinfo.txt index 1039d2880..1443edbaa 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -103,7 +103,12 @@ GameInfo "PsykkonovexxGesture" // really damn big textures PrecacheTextures = "graphics/SWWMGZLogo.png", - "graphics/SWWMGZLogo_Layers.png" + "graphics/SWWMGZLogo_Layer1.png", + "graphics/SWWMGZLogo_Layer2.png", + "graphics/SWWMGZLogo_Layer3.png", + "graphics/SWWMGZLogo_Layer4.png", + "graphics/SWWMGZLogo_Layer5.png", + "graphics/SWWMGZLogo_Layer6.png" } ClearSkills