diff --git a/README.md b/README.md index c4adeae80..79d8f66e2 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,7 @@ One mighty relic of the beginnings of **UnSX**. This beefy handcannon spews pote **Secondary fire:** Pumps more rounds into the gun, for extra potency *(up to 5x)*. Do note that the shot not only will become stronger, but also more unstable. -**Tertiary fire:** Hold for extended features with either fire button. Tapping primary fire will switch between single-shot and scatter-shot modes, and tapping secondary fire lets you switch the weapon stance, from two-handing to single-handing, you know, so you can give it a full-on spin like in the action movies. +**Tertiary fire:** Switch the weapon stance, from two-handing to single-handing. You know, so you can give it a full-on spin like in the action movies. **Reload:** Loads more rounds in reserve. diff --git a/docimg/quadammo.png b/docimg/quadammo.png new file mode 100644 index 000000000..fa20c2ed9 Binary files /dev/null and b/docimg/quadammo.png differ diff --git a/docimg/quadravol.png b/docimg/quadravol.png index 179e1bbb5..f051fbb9e 100644 Binary files a/docimg/quadravol.png and b/docimg/quadravol.png differ diff --git a/gldefs.ammo b/gldefs.ammo index 191550ef3..91175ff5e 100644 --- a/gldefs.ammo +++ b/gldefs.ammo @@ -18,6 +18,10 @@ HardwareShader Texture "models/Shell_Gold_Used.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } +Brightmap Texture "models/QuadCell.png" +{ + map "models/QuadCell_bright.png" +} Brightmap Texture "models/SparksterAmmo.png" { map "models/SparksterAmmo_bright.png" diff --git a/language.def_base b/language.def_base index aa1bd84ec..91483d2d1 100644 --- a/language.def_base +++ b/language.def_base @@ -795,8 +795,7 @@ TT_QUADRAVOL = "\cfFire:\c- Shoot weapon.\n" "\cfAltfire:\c- Pump weapon.\n" "\cfReload:\c- Load cells.\n" -"\cfZoom+Fire:\c- Toggle spread mode.\n" -"\cfZoom+Altfire:\c- Switch firing stance."; +"\cfZoom:\c- Switch firing stance."; TT_NEWSPARKSTER = "\cfFire:\c- Kinylum shot.\n" "\cfAltfire:\c- Nokron shot.\n" diff --git a/language.def_lore b/language.def_lore index b22bb13ff..dbf149a86 100644 --- a/language.def_lore +++ b/language.def_lore @@ -3144,7 +3144,7 @@ SWWM_LORETXT_QUADRAVOL = "\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" -"\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" +"\cfTertiary Fire:\c- 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 emptied into the weapon's internal \"crucible\", so you can keep loading additional ammo while boosting your charge.\n" "\n" diff --git a/language.es_base b/language.es_base index 06e2a1934..c0ce0672e 100644 --- a/language.es_base +++ b/language.es_base @@ -685,8 +685,7 @@ TT_QUADRAVOL = "\cfPrimario:\c- Disparar arma.\n" "\cfSecundario:\c- Bombear arma.\n" "\cfRecarga:\c- Cargar células.\n" -"\cfZoom+Primario:\c- Alternar modo disperso.\n" -"\cfZoom+Secundario:\c- Cambiar postura de arma."; +"\cfZoom:\c- Cambiar postura de arma."; TT_NEWSPARKSTER = "\cfPrimario:\c- Disparo de Kinylum.\n" "\cfSecundario:\c- Disparo de Nokron.\n" diff --git a/language.es_lore b/language.es_lore index 3d184b73a..1ab2cd5ba 100644 --- a/language.es_lore +++ b/language.es_lore @@ -2918,7 +2918,7 @@ SWWM_LORETXT_QUADRAVOL = "\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" -"\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" +"\cfFuego Terciario:\c- Alterna 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 vaciada immediatemente en el \"crisol\" interno del arma, así que puedes cargar munición adicional mientras incrementas la carga.\n" "\n" diff --git a/language.version b/language.version index 9b0cf2cad..6fec40ef9 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r314 \cu(Sat 13 Aug 03:03:35 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r314 \cu(2022-08-13 03:03:35)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r315 \cu(Sat 13 Aug 11:53:37 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r315 \cu(2022-08-13 11:53:37)\c-"; diff --git a/lore/default/quadravol.txt b/lore/default/quadravol.txt index b7d03f1ea..720b996e7 100644 --- a/lore/default/quadravol.txt +++ b/lore/default/quadravol.txt @@ -26,7 +26,7 @@ The Ardent Cross was the name of the general's sword which, when imbued with mag \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. -\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. +\cfTertiary Fire:\c- 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 emptied into the weapon's internal "crucible", so you can keep loading additional ammo while boosting your charge. diff --git a/lore/es/quadravol.txt b/lore/es/quadravol.txt index 4ca4dc451..fc451a73e 100644 --- a/lore/es/quadravol.txt +++ b/lore/es/quadravol.txt @@ -20,7 +20,7 @@ La Cruz Ardiente era el nombre de la espada del general la cual, al ser imbuida \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. -\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. +\cfFuego Terciario:\c- Alterna 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 vaciada immediatemente en el "crisol" interno del arma, así que puedes cargar munición adicional mientras incrementas la carga. diff --git a/modeldef.dlcammo b/modeldef.dlcammo index 2021384f4..a02bb496d 100644 --- a/modeldef.dlcammo +++ b/modeldef.dlcammo @@ -129,39 +129,40 @@ Model "SheenBigAmmo" Model "QuadravolAmmo" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.025 0.025 0.025 + Model 0 "QuadravolAmmo_d.3d" + Skin 0 "QuadCell.png" + Scale 0.02 0.02 0.02 ZOffset 16 - PitchOffset 30 + RollOffset -30 + AngleOffset -90 ROTATING FrameIndex XZW1 A 0 0 } Model "QuadravolAmmo2" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.025 0.025 0.025 + Model 0 "QuadravolAmmo_Two_d.3d" + Skin 0 "QuadCell.png" + Scale 0.02 0.02 0.02 ZOffset 16 - PitchOffset 30 + AngleOffset -90 ROTATING FrameIndex XZW1 A 0 0 } Model "QuadravolAmmo3" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.025 0.025 0.025 + Model 0 "QuadravolAmmo_Three_d.3d" + Skin 0 "QuadCell.png" + Scale 0.02 0.02 0.02 ZOffset 16 - PitchOffset 30 + AngleOffset -90 ROTATING FrameIndex XZW1 A 0 0 diff --git a/modeldef.quadravol b/modeldef.quadravol index 2cd0ae4e2..1540fe057 100644 --- a/modeldef.quadravol +++ b/modeldef.quadravol @@ -1,12 +1,13 @@ Model "Quadravol" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILR" - Scale 0.05 0.05 0.05 - ZOffset 16 - PitchOffset 30 + Model 0 "QuadravolPickup_d.3d" + SurfaceSkin 0 0 "Quadravol.png" + SurfaceSkin 0 1 "NoLED.png" + Scale 0.2 0.2 0.2 + ZOffset 20 + AngleOffset 90 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/QuadCell.png b/models/QuadCell.png index 26465726e..5e3cb9837 100644 Binary files a/models/QuadCell.png and b/models/QuadCell.png differ diff --git a/models/QuadCell_Used.png b/models/QuadCell_Used.png new file mode 100644 index 000000000..3de7fe36f Binary files /dev/null and b/models/QuadCell_Used.png differ diff --git a/models/QuadCell_bright.png b/models/QuadCell_bright.png new file mode 100644 index 000000000..d034f54ac Binary files /dev/null and b/models/QuadCell_bright.png differ diff --git a/models/QuadLED.png b/models/QuadLED.png index 328b77bb9..4d82d3fd5 100644 Binary files a/models/QuadLED.png and b/models/QuadLED.png differ diff --git a/models/Quadravol.blend b/models/Quadravol.blend index c8a7bf2d3..71249d1ca 100644 Binary files a/models/Quadravol.blend and b/models/Quadravol.blend differ diff --git a/models/Quadravol.png b/models/Quadravol.png index 81e007e8e..f8b90513b 100644 Binary files a/models/Quadravol.png and b/models/Quadravol.png differ diff --git a/models/QuadravolAmmo_Three_a.3d b/models/QuadravolAmmo_Three_a.3d new file mode 100644 index 000000000..b60763778 Binary files /dev/null and b/models/QuadravolAmmo_Three_a.3d differ diff --git a/models/QuadravolAmmo_Three_d.3d b/models/QuadravolAmmo_Three_d.3d new file mode 100644 index 000000000..a5326aec8 Binary files /dev/null and b/models/QuadravolAmmo_Three_d.3d differ diff --git a/models/QuadravolAmmo_Two_a.3d b/models/QuadravolAmmo_Two_a.3d new file mode 100644 index 000000000..0f50a3a2a Binary files /dev/null and b/models/QuadravolAmmo_Two_a.3d differ diff --git a/models/QuadravolAmmo_Two_d.3d b/models/QuadravolAmmo_Two_d.3d new file mode 100644 index 000000000..439d14962 Binary files /dev/null and b/models/QuadravolAmmo_Two_d.3d differ diff --git a/models/QuadravolAmmo_a.3d b/models/QuadravolAmmo_a.3d new file mode 100644 index 000000000..e1699b0dd Binary files /dev/null and b/models/QuadravolAmmo_a.3d differ diff --git a/models/QuadravolAmmo_d.3d b/models/QuadravolAmmo_d.3d new file mode 100644 index 000000000..d77a3b296 Binary files /dev/null and b/models/QuadravolAmmo_d.3d differ diff --git a/models/QuadravolCasing_a.3d b/models/QuadravolCasing_a.3d new file mode 100644 index 000000000..4c935eca8 Binary files /dev/null and b/models/QuadravolCasing_a.3d differ diff --git a/models/QuadravolCasing_d.3d b/models/QuadravolCasing_d.3d new file mode 100644 index 000000000..0aacd06ec Binary files /dev/null and b/models/QuadravolCasing_d.3d differ diff --git a/models/QuadravolPickup_a.3d b/models/QuadravolPickup_a.3d new file mode 100644 index 000000000..163b1833c Binary files /dev/null and b/models/QuadravolPickup_a.3d differ diff --git a/models/QuadravolPickup_d.3d b/models/QuadravolPickup_d.3d new file mode 100644 index 000000000..a5de6f6d9 Binary files /dev/null and b/models/QuadravolPickup_d.3d differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index be355c54f..da3883e36 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -6,7 +6,7 @@ Weapon models: - Puntzer Beta - Puntzer Gamma x Sheen HMG - - Quadravol + ½ Quadravol - Sparkster Rifle - Mortal Rifle - Ray-Khom diff --git a/readme.txt b/readme.txt index 8b8cf79e9..52166a3e2 100644 --- a/readme.txt +++ b/readme.txt @@ -377,7 +377,7 @@ 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. +Tertiary fire toggles two-handing. And yes, it's a levergun, have fun. 2.6.7. Sparkster Rifle