diff --git a/language.version b/language.version index 0936d3119..1acb9e9d9 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r643 \cu(Fri 27 Nov 13:11:29 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r644 \cu(Fri 27 Nov 14:23:13 CET 2020)"; diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 284e729d2..9624e880a 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -23,3 +23,47 @@ Collectible pickup animations: - Milk Breads - Kirin Manga - Kirin Plush + +# Post-release stuff + +Character models: + - White Lady + +Extra collectibles(?): + - BRC Debut Album + - Cat Catcher Poster + - Hege Cactus + - Raidemin Figure + - Hoagie + - Lithium Vol.1 + - PISS Whiskey + - Doomguy Figure + - Eye Obelisk + +# DLC Weaponset + +Weapon models: + - Itamex Hammer + - Puntzer Beta + - Puntzer Gamma + - Quadravol + - Blackfire Igniter + - EMP Rail Carbine + - Ray-Khom + +Ammo models: + - SMW.05 Ammo + - Single + - Beta speedloader + - Gamma mag + - Sheen Ammo + - Single + - 50 Box + - 200 Box + - Quadravol Ammo + - Dark Canister + - Emp Core + - Ray-Khom Ammo + - Single + - Mag + - Battery diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 152e632db..dfb8d831a 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -2098,8 +2098,8 @@ Class SWWMHandler : EventHandler } else if ( (e.Replacee == 'Cell') || (e.Replacee == 'SkullRodAmmo') ) { - if ( Random[Replacements](0,2) ) e.Replacement = Random[Replacements](0,2)?'HellblazerRavagers':'HellblazerWarheads'; - else if ( Random[Replacements](0,3) ) e.Replacement = 'SparkUnit'; + if ( !Random[Replacements](0,2) ) e.Replacement = Random[Replacements](0,2)?'HellblazerRavagers':'HellblazerWarheads'; + else if ( Random[Replacements](0,2) ) e.Replacement = 'SparkUnit'; else if ( !Random[Replacements](0,3) ) e.Replacement = 'CandyGunBullets'; else e.Replacement = Random[Replacements](0,2)?'SilverBullets':'SilverBullets2'; } diff --git a/zscript/swwm_thinkers.zsc b/zscript/swwm_thinkers.zsc index da093564b..341ac5842 100644 --- a/zscript/swwm_thinkers.zsc +++ b/zscript/swwm_thinkers.zsc @@ -438,6 +438,8 @@ Class SWWMLoreLibrary : Thinker text = "SWWM_LORETXT_YNYKRON2"; // confirmed to harm (but not kill) gods else if ( text ~== "SWWM_LORETXT_AKARIPROJECT" ) text = "SWWM_LORETXT_AKARIPROJECT3"; // mentions kirin + else if ( text ~== "SWWM_LORETXT_GODS" ) + text = "SWWM_LORETXT_GODS2"; // beyond gods } if ( gameinfo.gametype&(GAME_Raven|GAME_Strife) ) { @@ -461,8 +463,6 @@ Class SWWMLoreLibrary : Thinker text = "SWWM_LORETXT_BIGSHOT2"; // predictions about crimes_m else if ( text ~== "SWWM_LORETXT_AKARIPROJECT" ) text = "SWWM_LORETXT_AKARIPROJECT2"; // fiction becomes reality - else if ( text ~== "SWWM_LORETXT_GODS" ) - text = "SWWM_LORETXT_GODS2"; // beyond gods } // check if existing for ( int i=0; i