diff --git a/README.md b/README.md index 97fcd3aab..61ad97be4 100644 --- a/README.md +++ b/README.md @@ -307,7 +307,7 @@ Neatly packaged single-shot charges of **Kinylum**. Recognizable by its cyan glo ### Nokron cells ~ Replaces Cells, Runes ![](docimg/sparksterammored.png) -Neatly packaged single-shot charges of **Nokron**. Recognizable by its red glow and delicious cheese aroma. +Neatly packaged single-shot charges of **Nokron**. Recognizable by its magenta glow and delicious cheese aroma. ### Silver Bullet JET *(slot 8)* ~ Replaces Plasma Rifle, Hellstaff, Arc of Death ![](docimg/silverbullet.png) diff --git a/gldefs/dlc1/dlcammo.txt b/gldefs/dlc1/dlcammo.txt index 1cfb1695e..8885d3519 100644 --- a/gldefs/dlc1/dlcammo.txt +++ b/gldefs/dlc1/dlcammo.txt @@ -116,7 +116,7 @@ Object QuadravolAmmo3 } PointLight NOKRONAMMOLIGHT { - Color 1.0 0.3 0.2 + Color 1.0 0.2 0.8 Size 20 Offset 0 16 0 Attenuate 1 diff --git a/graphics/Decals/nokrmk1.png b/graphics/Decals/nokrmk1.png index 735135318..52de5ba31 100644 Binary files a/graphics/Decals/nokrmk1.png and b/graphics/Decals/nokrmk1.png differ diff --git a/graphics/Decals/nokrmk2.png b/graphics/Decals/nokrmk2.png index 665a21ddd..62345f1d9 100644 Binary files a/graphics/Decals/nokrmk2.png and b/graphics/Decals/nokrmk2.png differ diff --git a/graphics/Decals/nokrmk3.png b/graphics/Decals/nokrmk3.png index 8a390ef92..fd9e2eba3 100644 Binary files a/graphics/Decals/nokrmk3.png and b/graphics/Decals/nokrmk3.png differ diff --git a/graphics/Decals/nokrmk4.png b/graphics/Decals/nokrmk4.png index 5eb3c37bc..565dfeee4 100644 Binary files a/graphics/Decals/nokrmk4.png and b/graphics/Decals/nokrmk4.png differ diff --git a/language.def_lore b/language.def_lore index ff5fc4f15..af512423e 100644 --- a/language.def_lore +++ b/language.def_lore @@ -3346,7 +3346,7 @@ SWWM_LORETXT_PLASMABLAST = "Due to the high availability of the materials used, and a shared friendship between Nuutek and their former competitor \cfNekuratek\c-, you have free access to a practically endless supply of ammunition for this weapon.\n" "\n" "\cxSaya's Notes:\c-\n" -"\cfY'know, if you feel like melting knees is cooler than exploding them, this one's a good option too. Heard there's a buncha crazy variants of this gun around, since it's open source and all. It's been turned into shotguns, rifles, even flamethrowers using Nokron plasma, whew.\c-\n" +"\cfY'know, if you feel like melting knees is cooler than exploding them, this one's a good option too. Heard there's a buncha crazy variants of this gun around, since it's open source and all. It's been turned into shotguns, rifles, even flamethrowers using Sydon plasma, whew.\c-\n" "\n" "\cfAlso because of my very valuable friendship with Zana-sama, as you can see there we get free ammo for the thing. Fairly convenient, that. Wish it could be the case for your entire arsenal, but life ain't that easy.\c-"; SWWM_LORETAG_PROPULSOR = "JetBurst Impulsor"; diff --git a/language.es_lore b/language.es_lore index 5ad01b529..b97f187ff 100644 --- a/language.es_lore +++ b/language.es_lore @@ -3109,7 +3109,7 @@ SWWM_LORETXT_PLASMABLAST = "Dada la alta disponibilidad de los materiales usados, y una amistad compartida entre Nuutek y su antiguo competidor \cfNekuratek\c-, tienes acceso gratuito a un abastecimiento prácticamente ilimitado de munición para este arma.\n" "\n" "\cxNotas de Saya:\c-\n" -"\cfYa sabes, si te parece que derretir rodillas mola más que hacerlas explotar, esta también es una buena opción. He oído que hay toda clase de variantes absurdas de la pistola esta por ahí, ya que es de código abierto y tal. Se han hecho escopetas, rifles, hasta lanzallamas usando plasma de Nokron, buf.\c-\n" +"\cfYa sabes, si te parece que derretir rodillas mola más que hacerlas explotar, esta también es una buena opción. He oído que hay toda clase de variantes absurdas de la pistola esta por ahí, ya que es de código abierto y tal. Se han hecho escopetas, rifles, hasta lanzallamas usando plasma de Sydon, buf.\c-\n" "\n" "\cfTambién gracias a mi muy valiosa amistad con Zana-sama, como puedes ver nos dan munición gratis para la cosa. Bastante cómodo, vaya. Ojalá fuese igual para todo tu arsenal entero, pero la vida no es tan fácil.\c-"; SWWM_LORETAG_PROPULSOR = "Impulsor JetBurst"; diff --git a/language.version b/language.version index 1ea4be967..51d806865 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r982 \cu(Fri 13 Oct 13:30:24 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r982 \cu(2023-10-13 13:30:24)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r984 \cu(Fri 13 Oct 23:48:11 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r984 \cu(2023-10-13 23:48:11)\c-"; diff --git a/lore/default/plasmablast.txt b/lore/default/plasmablast.txt index 8b31172c0..0ae1ba53f 100644 --- a/lore/default/plasmablast.txt +++ b/lore/default/plasmablast.txt @@ -25,6 +25,6 @@ Developed by **Nuutek** in their days of old, nowadays discontinued but still be Due to the high availability of the materials used, and a shared friendship between Nuutek and their former competitor **Nekuratek**, you have free access to a practically endless supply of ammunition for this weapon. \cxSaya's Notes:\c- -\cfY'know, if you feel like melting knees is cooler than exploding them, this one's a good option too. Heard there's a buncha crazy variants of this gun around, since it's open source and all. It's been turned into shotguns, rifles, even flamethrowers using Nokron plasma, whew.\c- +\cfY'know, if you feel like melting knees is cooler than exploding them, this one's a good option too. Heard there's a buncha crazy variants of this gun around, since it's open source and all. It's been turned into shotguns, rifles, even flamethrowers using Sydon plasma, whew.\c- \cfAlso because of my very valuable friendship with Zana-sama, as you can see there we get free ammo for the thing. Fairly convenient, that. Wish it could be the case for your entire arsenal, but life ain't that easy.\c- diff --git a/lore/es/plasmablast.txt b/lore/es/plasmablast.txt index 9211bd055..9f097553c 100644 --- a/lore/es/plasmablast.txt +++ b/lore/es/plasmablast.txt @@ -21,6 +21,6 @@ Desarrollado antaño por **Nuutek**, y actualmente descontinuado pero todavía s Dada la alta disponibilidad de los materiales usados, y una amistad compartida entre Nuutek y su antiguo competidor **Nekuratek**, tienes acceso gratuito a un abastecimiento prácticamente ilimitado de munición para este arma. \cxNotas de Saya:\c- -\cfYa sabes, si te parece que derretir rodillas mola más que hacerlas explotar, esta también es una buena opción. He oído que hay toda clase de variantes absurdas de la pistola esta por ahí, ya que es de código abierto y tal. Se han hecho escopetas, rifles, hasta lanzallamas usando plasma de Nokron, buf.\c- +\cfYa sabes, si te parece que derretir rodillas mola más que hacerlas explotar, esta también es una buena opción. He oído que hay toda clase de variantes absurdas de la pistola esta por ahí, ya que es de código abierto y tal. Se han hecho escopetas, rifles, hasta lanzallamas usando plasma de Sydon, buf.\c- \cfTambién gracias a mi muy valiosa amistad con Zana-sama, como puedes ver nos dan munición gratis para la cosa. Bastante cómodo, vaya. Ojalá fuese igual para todo tu arsenal entero, pero la vida no es tan fácil.\c- diff --git a/models/envmap/nokrenv.png b/models/envmap/nokrenv.png index ea52303c7..f7052c98e 100644 Binary files a/models/envmap/nokrenv.png and b/models/envmap/nokrenv.png differ diff --git a/models/envmap/nokrrim.png b/models/envmap/nokrrim.png index 135bb1c61..987c6a051 100644 Binary files a/models/envmap/nokrrim.png and b/models/envmap/nokrrim.png differ diff --git a/models/extra/NewSparkMuzN.png b/models/extra/NewSparkMuzN.png index 86e73340f..b22566cda 100644 Binary files a/models/extra/NewSparkMuzN.png and b/models/extra/NewSparkMuzN.png differ diff --git a/sprites/RFLMA0.png b/sprites/RFLMA0.png index 05f43b5e7..d0203f3aa 100644 Binary files a/sprites/RFLMA0.png and b/sprites/RFLMA0.png differ diff --git a/sprites/RFLMB0.png b/sprites/RFLMB0.png index acebb0cbc..7c685f5d2 100644 Binary files a/sprites/RFLMB0.png and b/sprites/RFLMB0.png differ diff --git a/sprites/RFLMC0.png b/sprites/RFLMC0.png index 3b04d7592..c3bcf914d 100644 Binary files a/sprites/RFLMC0.png and b/sprites/RFLMC0.png differ diff --git a/sprites/RFLMD0.png b/sprites/RFLMD0.png index 3b9c201be..237809dd3 100644 Binary files a/sprites/RFLMD0.png and b/sprites/RFLMD0.png differ diff --git a/sprites/RFLME0.png b/sprites/RFLME0.png index 62f21cb4d..aebf9b285 100644 Binary files a/sprites/RFLME0.png and b/sprites/RFLME0.png differ diff --git a/sprites/RFLMF0.png b/sprites/RFLMF0.png index 33eb8e495..98d661702 100644 Binary files a/sprites/RFLMF0.png and b/sprites/RFLMF0.png differ diff --git a/sprites/RFLMG0.png b/sprites/RFLMG0.png index ceca92482..82432762a 100644 Binary files a/sprites/RFLMG0.png and b/sprites/RFLMG0.png differ diff --git a/sprites/RFLMH0.png b/sprites/RFLMH0.png index 50992c5e7..f4ff206db 100644 Binary files a/sprites/RFLMH0.png and b/sprites/RFLMH0.png differ diff --git a/sprites/RFLMI0.png b/sprites/RFLMI0.png index 8f5e36ee1..f24d81dbc 100644 Binary files a/sprites/RFLMI0.png and b/sprites/RFLMI0.png differ diff --git a/sprites/RFLMJ0.png b/sprites/RFLMJ0.png index d1360698a..84a03c8f2 100644 Binary files a/sprites/RFLMJ0.png and b/sprites/RFLMJ0.png differ diff --git a/sprites/RFLMK0.png b/sprites/RFLMK0.png index a21b9f843..9158eaf22 100644 Binary files a/sprites/RFLMK0.png and b/sprites/RFLMK0.png differ diff --git a/sprites/RFLML0.png b/sprites/RFLML0.png index e5c28133e..9e8e1621d 100644 Binary files a/sprites/RFLML0.png and b/sprites/RFLML0.png differ diff --git a/sprites/RFLMM0.png b/sprites/RFLMM0.png index ff6310486..d1ce2e709 100644 Binary files a/sprites/RFLMM0.png and b/sprites/RFLMM0.png differ diff --git a/sprites/RFLMN0.png b/sprites/RFLMN0.png index dadd1eee9..fb057dec5 100644 Binary files a/sprites/RFLMN0.png and b/sprites/RFLMN0.png differ diff --git a/sprites/RFLMO0.png b/sprites/RFLMO0.png index e663d4527..9cf55c6dc 100644 Binary files a/sprites/RFLMO0.png and b/sprites/RFLMO0.png differ diff --git a/sprites/RFLMP0.png b/sprites/RFLMP0.png index 5fe1b3b49..2ad53d6c3 100644 Binary files a/sprites/RFLMP0.png and b/sprites/RFLMP0.png differ diff --git a/sprites/RFLMQ0.png b/sprites/RFLMQ0.png index 215398427..1e2da7fbc 100644 Binary files a/sprites/RFLMQ0.png and b/sprites/RFLMQ0.png differ diff --git a/sprites/RFLMR0.png b/sprites/RFLMR0.png index 5c3a7bcef..fa19de58e 100644 Binary files a/sprites/RFLMR0.png and b/sprites/RFLMR0.png differ diff --git a/sprites/RFLMS0.png b/sprites/RFLMS0.png index 28377c863..22b98343c 100644 Binary files a/sprites/RFLMS0.png and b/sprites/RFLMS0.png differ diff --git a/sprites/RFLMT0.png b/sprites/RFLMT0.png index 8eac5f1ce..df8c6b710 100644 Binary files a/sprites/RFLMT0.png and b/sprites/RFLMT0.png differ diff --git a/sprites/RFLMU0.png b/sprites/RFLMU0.png new file mode 100644 index 000000000..5ec3fa8f2 Binary files /dev/null and b/sprites/RFLMU0.png differ