diff --git a/DXRModules/DeusEx/Classes/DXRFashion.uc b/DXRModules/DeusEx/Classes/DXRFashion.uc index b5a8a1709..5f6b5454d 100644 --- a/DXRModules/DeusEx/Classes/DXRFashion.uc +++ b/DXRModules/DeusEx/Classes/DXRFashion.uc @@ -259,9 +259,16 @@ simulated function ApplyOutfit(Actor p, texture coat1, texture coat2, texture sh isTrench = (coat1 != None && coat2 != None); if (isTrench) { - p.Mesh = LodMesh'DeusExCharacters.GM_Trench'; + if( DeusExCarcass(p) != None ) { + p.Mesh = LodMesh'DeusExCharacters.GM_Trench_Carcass'; + DeusExCarcass(p).Mesh2 = LodMesh'DeusExCharacters.GM_Trench_CarcassB'; + DeusExCarcass(p).Mesh3 = LodMesh'DeusExCharacters.GM_Trench_CarcassC'; + } + else { + p.Mesh = LodMesh'DeusExCharacters.GM_Trench'; + } p.MultiSkins[1] = coat1; - p.MultiSkins[2] = pants; + p.MultiSkins[2] = pants; p.MultiSkins[4] = shirt; p.MultiSkins[5] = coat2; @@ -270,11 +277,18 @@ simulated function ApplyOutfit(Actor p, texture coat1, texture coat2, texture sh p.MultiSkins[7] = Texture'DeusExCharacters.Skins.LensesTex5'; } else { p.MultiSkins[6] = Texture'DeusExItems.Skins.GrayMaskTex'; - p.MultiSkins[7] = Texture'DeusExItems.Skins.BlackMaskTex'; + p.MultiSkins[7] = Texture'DeusExItems.Skins.BlackMaskTex'; } } else { - p.Mesh = LodMesh'MPCharacters.mp_jumpsuit'; + if( DeusExCarcass(p) != None ) { + p.Mesh = LodMesh'DeusExCharacters.GM_Jumpsuit_Carcass'; + DeusExCarcass(p).Mesh2 = LodMesh'DeusExCharacters.GM_Jumpsuit_CarcassB'; + DeusExCarcass(p).Mesh3 = LodMesh'DeusExCharacters.GM_Jumpsuit_CarcassC'; + } + else { + p.Mesh = LodMesh'MPCharacters.mp_jumpsuit'; + } p.MultiSkins[1] = pants; p.MultiSkins[2] = shirt; p.MultiSkins[3] = p.MultiSkins[0]; @@ -286,10 +300,7 @@ simulated function ApplyOutfit(Actor p, texture coat1, texture coat2, texture sh p.Texture = Texture'DeusExItems.Skins.PinkMaskTex'; //Jumpsuit doesn't support glasses - } - - } //Brothers gotta match, mom got their clothes out in advance diff --git a/DXRModules/DeusEx/Classes/DXRFlags.uc b/DXRModules/DeusEx/Classes/DXRFlags.uc index f7bdc6ddf..1db24453d 100644 --- a/DXRModules/DeusEx/Classes/DXRFlags.uc +++ b/DXRModules/DeusEx/Classes/DXRFlags.uc @@ -181,8 +181,8 @@ simulated static function CurrentVersion(optional out int major, optional out in { major=1; minor=6; - patch=1; - build=1;//build can't be higher than 99 + patch=2; + build=2;//build can't be higher than 99 } simulated static function string VersionString(optional bool full) diff --git a/DXRModules/DeusEx/Classes/DXRMissions.uc b/DXRModules/DeusEx/Classes/DXRMissions.uc index 2ded2b167..a3b0a305d 100644 --- a/DXRModules/DeusEx/Classes/DXRMissions.uc +++ b/DXRModules/DeusEx/Classes/DXRMissions.uc @@ -36,7 +36,7 @@ function CheckConfig() local int i; local string map; - if( ConfigOlderThan(1,5,9,8) ) { + if( ConfigOlderThan(1,6,2,1) ) { allow_vanilla = false; i=0; @@ -197,6 +197,7 @@ function CheckConfig() goals[i].actor_name = 'DataLinkTrigger6'; goals[i].allow_vanilla = true; goals[i].move_with_previous = true; + goals[i].physics = PHYS_None; i++; map = "05_NYC_UnatcoHQ"; diff --git a/DXRModules/DeusEx/Classes/DXRNames.uc b/DXRModules/DeusEx/Classes/DXRNames.uc index 86903f62c..6fee25ae7 100644 --- a/DXRModules/DeusEx/Classes/DXRNames.uc +++ b/DXRModules/DeusEx/Classes/DXRNames.uc @@ -25,6 +25,8 @@ function FirstEntry() { if ( c.itemName != "Dead Body" && c.itemName != "Unconscious" && c.itemName != "Animal Carcass" ) return; + if ( c.BindName == "PaulDentonCarcass" ) + return; c.itemName = c.itemName $ " (" $ RandomName(dxr) $ ")"; } } diff --git a/DXRVanilla/DeusEx/Classes/JCDentonMaleCarcass.uc b/DXRVanilla/DeusEx/Classes/JCDentonMaleCarcass.uc index 3bfd1e43c..7a8065df5 100644 --- a/DXRVanilla/DeusEx/Classes/JCDentonMaleCarcass.uc +++ b/DXRVanilla/DeusEx/Classes/JCDentonMaleCarcass.uc @@ -5,6 +5,9 @@ function SetSkin(DeusExPlayer player) local int i; Super.SetSkin(player); + if( player == None ) { + return; + } //FASHION! if (player.Mesh == LodMesh'DeusExCharacters.GM_Trench') { Mesh = LodMesh'DeusExCharacters.GM_Trench_Carcass'; diff --git a/DXRVanilla/DeusEx/Classes/PaulDentonCarcass.uc b/DXRVanilla/DeusEx/Classes/PaulDentonCarcass.uc index e464f4e2e..379d6344d 100644 --- a/DXRVanilla/DeusEx/Classes/PaulDentonCarcass.uc +++ b/DXRVanilla/DeusEx/Classes/PaulDentonCarcass.uc @@ -6,7 +6,9 @@ function SetSkin(DeusExPlayer player) Super.SetSkin(player); - + if( player == None ) { + return; + } //FASHION! if (player.Mesh == LodMesh'DeusExCharacters.GM_Trench') { Mesh = LodMesh'DeusExCharacters.GM_Trench_Carcass'; diff --git a/DeusEx.u b/DeusEx.u index 23a898d43..6481b5f3e 100644 Binary files a/DeusEx.u and b/DeusEx.u differ diff --git a/HXRandomizer.u b/HXRandomizer.u index 4420909c4..8be8cd177 100644 Binary files a/HXRandomizer.u and b/HXRandomizer.u differ diff --git a/README.md b/README.md index 3d640a497..3236b4d94 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Then copy the `DeusEx.u` file into your `Deus Ex\System\` folder, which is proba [![v1.5 Trailer](https://img.youtube.com/vi/A0Li3XuBjGg/0.jpg)](https://www.youtube.com/watch?v=A0Li3XuBjGg) -### Currently in v1.6.1, DXRando randomizes +### Currently in v1.6.2, DXRando randomizes * locations of goals, NPCs, and some starting locations * medbots and repair bots (with hint datacubes near them) * adding and moving turrets, cameras, security computers, and datacubes for them diff --git a/notes/notes.txt b/notes/notes.txt index 1440b575f..319227b3b 100644 --- a/notes/notes.txt +++ b/notes/notes.txt @@ -35,6 +35,7 @@ EditPackages=HXRandomizer v1.6.1 Alpha: + notify player when skill costs are rerolled does HX need more ammo? "Race" difficulty, same as hard mode but disable rando goals? crowd control auto save when giving items?