diff --git a/language.version b/language.version index 394fbec90..16368a919 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.1 \cu(Sat 18 Sep 00:03:40 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1.1 \cu(2021-09-18 00:03:40)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.2 \cu(Sat 18 Sep 14:10:18 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1.2 \cu(2021-09-18 14:10:18)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index 0f8543ee1..b28001fe2 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -912,11 +912,15 @@ ynykron/wind sounds/ynykron/mc_vortexwind.ogg misc/secret sounds/menu/findsecret.ogg misc/keytry sounds/menu/failuse.ogg misc/w_pkup sounds/general/wpickup.ogg +misc/w_pkup_vip sounds/general/wpickup_vip.ogg misc/p_pkup sounds/general/ppickup.ogg +misc/p_pkup_vip sounds/general/ppickup_vip.ogg misc/i_pkup sounds/general/ipickup.ogg misc/k_pkup sounds/general/kpickup.ogg misc/ammo_pkup sounds/general/apickup.ogg misc/bullet_pkup sounds/general/bpickup.ogg +misc/ammo_pkup_vip sounds/general/apickup_vip.ogg +misc/bullet_pkup_vip sounds/general/bpickup_vip.ogg misc/armor_pkup sounds/general/spickup.ogg misc/health_pkup sounds/general/hpickup.ogg misc/spawn sounds/CORK.ogg diff --git a/sounds/general/apickup_vip.ogg b/sounds/general/apickup_vip.ogg new file mode 100644 index 000000000..13a568e3c Binary files /dev/null and b/sounds/general/apickup_vip.ogg differ diff --git a/sounds/general/bpickup_vip.ogg b/sounds/general/bpickup_vip.ogg new file mode 100644 index 000000000..be1a43764 Binary files /dev/null and b/sounds/general/bpickup_vip.ogg differ diff --git a/sounds/general/ppickup_vip.ogg b/sounds/general/ppickup_vip.ogg new file mode 100644 index 000000000..a69141e59 Binary files /dev/null and b/sounds/general/ppickup_vip.ogg differ diff --git a/sounds/general/wpickup_vip.ogg b/sounds/general/wpickup_vip.ogg new file mode 100644 index 000000000..a7ce956b7 Binary files /dev/null and b/sounds/general/wpickup_vip.ogg differ diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 818f9b62b..f15c19439 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -394,6 +394,7 @@ Class GrandSpear : MagAmmo //$Icon ammo Tag "$T_GRANDSPEAR"; MagAmmo.PickupTag "GRANDSPEAR"; + Inventory.PickupSound "misc/bullet_pkup_vip"; Inventory.Icon "graphics/HUD/Icons/A_GrandSpear.png"; MagAmmo.ParentAmmo "GrandAmmo"; MagAmmo.ClipSize 5; @@ -419,6 +420,7 @@ Class GrandAmmo : SWWMAmmo //$Icon ammo Tag "$T_GRANDAMMO"; SWWMAmmo.PickupTag "GRANDAMMO"; + Inventory.PickupSound "misc/ammo_pkup_vip"; Stamina -1200000; Inventory.Icon "graphics/HUD/Icons/A_GrandAmmo.png"; Inventory.Amount 1; diff --git a/zscript/dlc1/swwm_hugeassrailgun.zsc b/zscript/dlc1/swwm_hugeassrailgun.zsc index dea7e9a4b..eb26fc682 100644 --- a/zscript/dlc1/swwm_hugeassrailgun.zsc +++ b/zscript/dlc1/swwm_hugeassrailgun.zsc @@ -17,6 +17,7 @@ Class GrandLance : SWWMWeapon //$Icon weapon Tag "$T_GRANDLANCE"; Inventory.PickupMessage "$T_GRANDLANCE"; + Inventory.PickupSound "misc/w_pkup_vip"; Obituary "$O_GRANDLANCE"; SWWMWeapon.Tooltip "$TT_GRANDLANCE"; Inventory.Icon "graphics/HUD/Icons/W_GrandLance.png"; diff --git a/zscript/dlc2/swwm_ammoitems_dlc2.zsc b/zscript/dlc2/swwm_ammoitems_dlc2.zsc index 816bea33c..41e8a24b7 100644 --- a/zscript/dlc2/swwm_ammoitems_dlc2.zsc +++ b/zscript/dlc2/swwm_ammoitems_dlc2.zsc @@ -262,6 +262,7 @@ Class UltimatePod : MagAmmo //$Icon ammo Tag "$T_ULTIMATEPOD"; MagAmmo.PickupTag "ULTIMATEPOD"; + Inventory.PickupSound "misc/bullet_pkup_vip"; Inventory.Icon "graphics/HUD/Icons/A_UltimatePod.png"; MagAmmo.ParentAmmo "UltimateAmmo"; MagAmmo.ClipSize 4; @@ -287,6 +288,7 @@ Class UltimateAmmo : SWWMAmmo //$Icon ammo Tag "$T_ULTIMATEAMMO"; SWWMAmmo.PickupTag "ULTIMATEAMMO"; + Inventory.PickupSound "misc/ammo_pkup_vip"; Stamina -2000000; Inventory.Icon "graphics/HUD/Icons/A_UltimateAmmo.png"; Inventory.Amount 1; diff --git a/zscript/dlc2/swwm_ultimate.zsc b/zscript/dlc2/swwm_ultimate.zsc index 55424efbb..220ff2fc8 100644 --- a/zscript/dlc2/swwm_ultimate.zsc +++ b/zscript/dlc2/swwm_ultimate.zsc @@ -16,6 +16,7 @@ Class RafanKos : SWWMWeapon //$Icon weapon Tag "$T_RAFANKOS"; Inventory.PickupMessage "$T_RAFANKOS"; + Inventory.PickupSound "misc/w_pkup_vip"; Obituary "$O_RAFANKOS"; SWWMWeapon.Tooltip "$TT_RAFANKOS"; Inventory.Icon "graphics/HUD/Icons/W_RafanKos.png"; diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index 5b14fb9b5..735b403f8 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -1090,6 +1090,7 @@ Class YnykronAmmo : SWWMAmmo //$Icon ammo Tag "$T_YNYKRONAMMO"; SWWMAmmo.PickupTag "YNYKRONAMMO"; + Inventory.PickupSound "misc/ammo_pkup_vip"; Stamina -3000000; Inventory.Icon "graphics/HUD/Icons/A_Ynykron.png"; Inventory.Amount 1; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index ca62df053..92813af2a 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -2941,7 +2941,7 @@ Class Mykradvo : Inventory Tag "$T_MYKRADVO"; Stamina -1200000; Inventory.Icon "graphics/HUD/Icons/I_Mykradvo.png"; - Inventory.PickupSound "misc/p_pkup"; + Inventory.PickupSound "misc/p_pkup_vip"; Inventory.UseSound "mykradvo/arc"; Inventory.PickupMessage "$T_MYKRADVO"; Inventory.MaxAmount 3; @@ -3357,7 +3357,7 @@ Class AngerySigil : Inventory Tag "$T_DEVASTATION"; Stamina -1500000; Inventory.Icon "graphics/HUD/Icons/I_Devastation.png"; - Inventory.PickupSound "misc/p_pkup"; + Inventory.PickupSound "misc/p_pkup_vip"; Inventory.UseSound "powerup/devastation"; Inventory.PickupMessage "$T_DEVASTATION"; Inventory.MaxAmount 3; @@ -3625,7 +3625,7 @@ Class DivineSprite : Inventory Tag "$T_DIVINE"; Stamina -3600000; Inventory.Icon "graphics/HUD/Icons/I_Divine.png"; - Inventory.PickupSound "misc/p_pkup"; + Inventory.PickupSound "misc/p_pkup_vip"; Inventory.UseSound "powerup/divineuse"; Inventory.PickupMessage "$T_DIVINE"; Inventory.MaxAmount 3; diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index 87ae87f2d..3874afc27 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -236,6 +236,7 @@ Class Ynykron : SWWMWeapon //$Icon weapon Tag "$T_YNYKRON"; Inventory.PickupMessage "$T_YNYKRON"; + Inventory.PickupSound "misc/w_pkup_vip"; Obituary "$O_YNYKRON"; SWWMWeapon.Tooltip "$TT_YNYKRON"; Inventory.Icon "graphics/HUD/Icons/W_Ynykron.png";