Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.5.1.9 hotfix #489

Merged
merged 4 commits into from
Jul 29, 2023
Merged

v2.5.1.9 hotfix #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ffd051
Fix mission masks for MJ12 Commando bingo goals
theastropath Jul 29, 2023
c1b8858
installer create SaveDXRando folder
Die4Ever Jul 29, 2023
94ed86f
tweak scoring
Die4Ever Jul 29, 2023
f4e660a
v2.5.1.9 hotfix builds
Die4Ever Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DXRCore/DeusEx/Classes/DXRVersion.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
major=2;
minor=5;
patch=1;
build=8;//build can't be higher than 99
build=9;//build can't be higher than 99
}

simulated static function string VersionString(optional bool full)
Expand Down
6 changes: 3 additions & 3 deletions DXRModules/DeusEx/Classes/DXREvents.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,7 @@ defaultproperties
bingo_options(78)=(event="UNATCOTroop_ClassDead",desc="Kill %s UNATCO Troopers",max=15,missions=318)
bingo_options(79)=(event="Terrorist_ClassDead",desc="Kill %s NSF Terrorists",max=15,missions=62)
bingo_options(80)=(event="MJ12Troop_ClassDead",desc="Kill %s MJ12 Troopers",max=25,missions=57204)
bingo_options(81)=(event="MJ12Commando_ClassDead",desc="Kill %s MJ12 Commandos",max=10,missions=57204)
bingo_options(81)=(event="MJ12Commando_ClassDead",desc="Kill %s MJ12 Commandos",max=10,missions=56384)
bingo_options(82)=(event="Karkian_ClassDead",desc="Kill %s Karkians",max=5)
bingo_options(83)=(event="MilitaryBot_ClassDead",desc="Destroy %s Military Bots",max=5)
bingo_options(84)=(event="VandenbergToilet",desc="Use the only toilet in Vandenberg",max=1,missions=4096)
Expand All @@ -2182,7 +2182,7 @@ defaultproperties
bingo_options(91)=(event="UNATCOTroop_ClassUnconscious",desc="Knock out %s UNATCO Troopers",max=15,missions=318)
bingo_options(92)=(event="Terrorist_ClassUnconscious",desc="Knock out %s NSF Terrorists",max=15,missions=62)
bingo_options(93)=(event="MJ12Troop_ClassUnconscious",desc="Knock out %s MJ12 Troopers",max=25,missions=57204)
bingo_options(94)=(event="MJ12Commando_ClassUnconscious",desc="Knock out %s MJ12 Commandos",max=2,missions=57204)
bingo_options(94)=(event="MJ12Commando_ClassUnconscious",desc="Knock out %s MJ12 Commandos",max=2,missions=56384)
bingo_options(95)=(event="purge",desc="Release the gas in the MJ12 Helibase",max=1,missions=64)
bingo_options(96)=(event="ChugWater",desc="Chug water %s times",max=30,mission=40830)
#ifndef vmd
Expand Down Expand Up @@ -2307,7 +2307,7 @@ defaultproperties
bingo_options(203)=(event="Terrorist_peeptime",desc="Watch Terrorists for %s seconds",max=30,missions=62)
bingo_options(204)=(event="UNATCOTroop_peeptime",desc="Watch UNATCO Troopers for %s seconds",max=30,missions=318)
bingo_options(205)=(event="MJ12Troop_peeptime",desc="Watch MJ12 Troopers for %s seconds",max=30,missions=57204)
bingo_options(206)=(event="MJ12Commando_peeptime",desc="Watch MJ12 Commandos for %s seconds",max=15,missions=57204)
bingo_options(206)=(event="MJ12Commando_peeptime",desc="Watch MJ12 Commandos for %s seconds",max=15,missions=56384)
bingo_options(207)=(event="PawnState_Dancing",desc="You can dance if you want to",max=1)
bingo_options(208)=(event="BirdWatching",desc="Watch birds for %s seconds",max=30,missions=19838)
bingo_options(209)=(event="NYEagleStatue_peeped",desc="Look at a bronze eagle statue",max=1,missions=28)
Expand Down
16 changes: 8 additions & 8 deletions DXRModules/DeusEx/Classes/DXRFlags.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,10 +862,10 @@ function int ScoreFlags()
else // else we won by hitting the end of the game
score -= settings.starting_map * 120;// basically starting mission * 1200

score -= settings.doorsdestructible * 2;
score -= settings.doorspickable * 2;
score -= settings.doorsdestructible * 5;
score -= settings.doorspickable * 5;
if(settings.keysrando > 0)
score += 200;
score += 500;
//score += settings.keys_containers;
//score += settings.infodevices_containers;
score -= ClampFlagValue(settings.deviceshackable,0,100) * 2;
Expand All @@ -883,10 +883,11 @@ function int ScoreFlags()
//settings.skills_disable_downgrades = 5;
//settings.skills_reroll_missions = 5;
//settings.skills_independent_levels = 100;
score += ClampFlagValue(settings.banned_skills,0,100) * 20;
score += ClampFlagValue(settings.banned_skill_levels,0,100) * 20;
score += sqrt(settings.minskill) * 50; //Square root so the bonus tapers off as you get more extreme
score += sqrt(settings.maxskill) * 30; //Square root so the bonus tapers off as you get more extreme
score += ClampFlagValue(settings.banned_skills,0,100) * 30;
score += ClampFlagValue(settings.banned_skill_levels,0,100) * 30;
score += sqrt(settings.minskill) * 60; //Square root so the bonus tapers off as you get more extreme
score += sqrt(settings.maxskill) * 40; //Square root so the bonus tapers off as you get more extreme
score += ClampFlagValue(settings.skill_value_rando, 0, 100) * 2;
score -= ClampFlagValue(settings.ammo,0,100);
score -= ClampFlagValue(settings.medkits,0,100);
score -= ClampFlagValue(settings.biocells,0,100);
Expand Down Expand Up @@ -916,7 +917,6 @@ function int ScoreFlags()
score += ClampFlagValue(settings.swapcontainers,0,100);
//settings.augcans = 100;
//settings.aug_value_rando = 100;
//settings.skill_value_rando = 100;
//settings.min_weapon_dmg = 50;
//settings.max_weapon_dmg = 150;
//settings.min_weapon_shottime = 50;
Expand Down
8 changes: 4 additions & 4 deletions DXRModules/DeusEx/Classes/DXRStats.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,16 +626,16 @@ function TestScoring()
bingo_win, bingos, bingo_spots, skill_points, nanokeys, cheats;

dxr.flags.SetDifficulty(1);
testint(dxr.flags.ScoreFlags(), 3805, "score bonus for Normal");
testint(dxr.flags.ScoreFlags(), 4570, "score bonus for Normal");

dxr.flags.SetDifficulty(2);
testint(dxr.flags.ScoreFlags(), 7075, "score bonus for Hard");
testint(dxr.flags.ScoreFlags(), 9980, "score bonus for Hard");

dxr.flags.SetDifficulty(3);
testint(dxr.flags.ScoreFlags(), 8585, "score bonus for Extreme");
testint(dxr.flags.ScoreFlags(), 12080, "score bonus for Extreme");

dxr.flags.SetDifficulty(4);
testint(dxr.flags.ScoreFlags(), 10055, "score bonus for Impossible");
testint(dxr.flags.ScoreFlags(), 13795, "score bonus for Impossible");

names[num] = "1 Million Points!";
scores[num++] = 1000000;
Expand Down
Binary file modified DeusEx.u
View file
Open in desktop
Binary file not shown.
Binary file modified GMDXRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified HXRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified RevRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified VMDRandomizer.u
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions installer/Install/Install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ def InstallVanilla(system:Path, settings:dict, speedupfix:bool):

if kentie:
configs_dest = Path.home() / 'Documents' / 'Deus Ex' / 'System'
Mkdir(configs_dest.parent /'SaveDXRando', exist_ok=True)
else:
configs_dest = system
Mkdir(system.parent /'SaveDXRando', exist_ok=True)
DXRandoini = configs_dest / (exename+'.ini')
Mkdir(DXRandoini.parent, parents=True, exist_ok=True)

Expand Down