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

Standardize default fight length across sims #1143

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Standardize default fight length across sims #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c155b9
Standardize default fight length across sims
Oct 30, 2024
a76739a
Merge branch 'master' into unify-fight-length
Oct 30, 2024
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
8 changes: 4 additions & 4 deletions ui/core/encounter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { EventID, TypedEvent } from './typed_event';
export class Encounter {
readonly sim: Sim;

private duration = 180;
private durationVariation = 5;
private duration = 300;
private durationVariation = 60;
private executeProportion20 = 0.2;
private executeProportion25 = 0.25;
private executeProportion35 = 0.35;
Expand Down Expand Up @@ -157,8 +157,8 @@ export class Encounter {
this.fromProto(
eventID,
EncounterProto.create({
duration: 180,
durationVariation: 5,
duration: 300,
durationVariation: 60,
executeProportion20: 0.2,
executeProportion25: 0.25,
executeProportion35: 0.35,
Expand Down
4 changes: 0 additions & 4 deletions ui/core/individual_sim_ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ export interface OtherDefaults {
distanceFromTarget?: number;
channelClipDelay?: number;
darkIntentUptime?: number;
duration?: number;
durationVariation?: number;
highHpThreshold?: number;
iterationCount?: number;
}
Expand Down Expand Up @@ -548,8 +546,6 @@ export abstract class IndividualSimUI<SpecType extends Spec> extends SimUI {
} else {
this.sim.raid.setTargetDummies(eventID, healingSpec ? 9 : 0);
this.sim.encounter.applyDefaults(eventID);
this.sim.encounter.setDuration(eventID, this.individualConfig.defaults.other?.duration || 180);
this.sim.encounter.setDurationVariation(eventID, this.individualConfig.defaults.other?.durationVariation || 5);
this.sim.encounter.setExecuteProportion90(eventID, this.individualConfig.defaults.other?.highHpThreshold || 0.9);
this.sim.raid.setDebuffs(eventID, this.individualConfig.defaults.debuffs);
this.sim.applyDefaults(eventID, tankSpec, healingSpec);
Expand Down
2 changes: 0 additions & 2 deletions ui/druid/feral/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 25,
duration: 240,
durationVariation: 15,
highHpThreshold: 0.8,
iterationCount: 25000,
profession1: Profession.Engineering,
Expand Down
2 changes: 0 additions & 2 deletions ui/hunter/beast_mastery/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 24,
duration: 240,
durationVariation: 20,
profession1: Profession.Engineering,
profession2: Profession.Jewelcrafting,
};
2 changes: 0 additions & 2 deletions ui/hunter/marksmanship/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 24,
duration: 240,
durationVariation: 20,
profession1: Profession.Engineering,
profession2: Profession.Jewelcrafting,
};
2 changes: 0 additions & 2 deletions ui/hunter/survival/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 24,
duration: 240,
durationVariation: 20,
profession1: Profession.Engineering,
profession2: Profession.Jewelcrafting,
};
2 changes: 0 additions & 2 deletions ui/paladin/retribution/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,5 @@ export const OtherDefaults = {
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
distanceFromTarget: 5,
duration: 240,
durationVariation: 15,
iterationCount: 25000,
};
2 changes: 0 additions & 2 deletions ui/rogue/assassination/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,4 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 5,
duration: 240,
durationVariation: 20,
};
2 changes: 0 additions & 2 deletions ui/rogue/combat/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,4 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 5,
duration: 240,
durationVariation: 20,
};
2 changes: 0 additions & 2 deletions ui/rogue/subtlety/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,4 @@ export const DefaultConsumes = Consumes.create({

export const OtherDefaults = {
distanceFromTarget: 5,
duration: 240,
durationVariation: 20,
};
1 change: 0 additions & 1 deletion ui/shaman/elemental/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export const OtherDefaults = {
distanceFromTarget: 20,
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
duration: 180,
};

export const DefaultConsumes = Consumes.create({
Expand Down
1 change: 0 additions & 1 deletion ui/shaman/enhancement/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ export const DefaultOptions = EnhancementShamanOptions.create({
});

export const OtherDefaults = {
duration: 180,
distanceFromTarget: 5,
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
Expand Down
2 changes: 0 additions & 2 deletions ui/warlock/affliction/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ export const OtherDefaults = {
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
channelClipDelay: 150,
duration: 180,
durationVariation: 30,
darkIntentUptime: 90,
};

Expand Down
2 changes: 0 additions & 2 deletions ui/warlock/demonology/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ export const OtherDefaults = {
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
channelClipDelay: 150,
duration: 180,
durationVariation: 30,
darkIntentUptime: 90,
};

Expand Down
2 changes: 0 additions & 2 deletions ui/warlock/destruction/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ export const OtherDefaults = {
profession1: Profession.Engineering,
profession2: Profession.Tailoring,
channelClipDelay: 150,
duration: 180,
durationVariation: 30,
darkIntentUptime: 90,
};

Expand Down
Loading