Skip to content

Commit

Permalink
fix mission 5 carcass stuff (issue #172)
Browse files Browse the repository at this point in the history
  • Loading branch information
Die4Ever committed Jul 17, 2021
1 parent 65228f6 commit a511cff
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 12 deletions.
25 changes: 18 additions & 7 deletions DXRModules/DeusEx/Classes/DXRFashion.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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];
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DXRModules/DeusEx/Classes/DXRFlags.uc
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,15 @@ simulated static function CurrentVersion(optional out int major, optional out in
{
major=1;
minor=6;
patch=1;
patch=2;
build=1;//build can't be higher than 99
}

simulated static function string VersionString(optional bool full)
{
local int major,minor,patch,build;
CurrentVersion(major,minor,patch,build);
return VersionToString(major, minor, patch, build, full) $ "";
return VersionToString(major, minor, patch, build, full) $ " Alpha";
}

function CheckConfig()
Expand Down
3 changes: 2 additions & 1 deletion DXRModules/DeusEx/Classes/DXRMissions.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 2 additions & 0 deletions DXRModules/DeusEx/Classes/DXRNames.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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) $ ")";
}
}
Expand Down
3 changes: 3 additions & 0 deletions DXRVanilla/DeusEx/Classes/JCDentonMaleCarcass.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion DXRVanilla/DeusEx/Classes/PaulDentonCarcass.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Binary file modified DeusEx.u
Binary file not shown.
Binary file modified HXRandomizer.u
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions notes/notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down

0 comments on commit a511cff

Please sign in to comment.