Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified assets/database/db.bin
Binary file not shown.
2,756 changes: 1,378 additions & 1,378 deletions assets/database/db.json

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
Binary file not shown.
48 changes: 24 additions & 24 deletions assets/database/leftover_db.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ message ProtoVersion {
// protos need to define an api_version field so that the UI code knows
// to up-convert these protos to the new format whenever api_version is
// missing (0) or lower than current_version_number.
option (current_version_number) = 2;
option (current_version_number) = 3;

// The actual field value is only used within unit tests.
int32 saved_version_number = 1;
Expand Down
4 changes: 2 additions & 2 deletions proto/db.proto
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ message SimEnchant {
string name = 2; // Only needed for unit tests.
ItemType type = 3; // Only needed for unit tests.
repeated double stats = 4;
ItemEffect enchant_effect = 5;
repeated ItemEffect enchant_effects = 5;
}

// Contains only the Item info needed by the sim.
Expand All @@ -45,7 +45,7 @@ message SimItem {
int32 set_id = 12;

map<int32, ScalingItemProperties> scaling_options = 13; // keys are the all ItemLevelState variants that this item could potentially have
ItemEffect item_effect = 14;
repeated ItemEffect item_effects = 14;
}

message Consumable {
Expand Down
15 changes: 8 additions & 7 deletions proto/spell.proto
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ message ScalingItemEffectProperties {
map<int32, double> stats = 1;
}
message ItemEffect {
int32 buff_id = 1;
string buff_name = 6;
int32 effect_duration_ms = 2; // milliseconds
int32 buff_id = 1;
string buff_name = 6;
int32 effect_duration_ms = 2; // milliseconds
int32 max_cumulative_stacks = 7;
// Keyed to itemlevelstate
map<int32, ScalingItemEffectProperties> scaling_options = 3;
map<int32, ScalingItemEffectProperties> scaling_options = 3;

oneof effect {
ProcEffect proc = 4;
Expand All @@ -29,11 +30,11 @@ message ScalingItemEffectProperties {
}

message ProcEffect {
int32 icd_ms = 1; // internal cooldown in milliseconds
int32 icd_ms = 1; // internal cooldown in milliseconds
oneof procRate {
double proc_chance = 2; // e.g. 0.20 = 20%
double ppm = 3;
RppmProc rppm = 4;
double ppm = 3;
RppmProc rppm = 4;
}
}

Expand Down
4 changes: 2 additions & 2 deletions proto/ui.proto
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ message UIItem {

FactionRestriction faction_restriction = 25;
map<int32, ScalingItemProperties> scaling_options = 29; // keys are the other ilvl variants that this item could potentially have
ItemEffect item_effect = 30;
repeated ItemEffect item_effects = 30;
}

enum Expansion {
Expand Down Expand Up @@ -235,7 +235,7 @@ message UIEnchant {
// Classes that are allowed to use the enchant. Empty indicates no special class restrictions.
repeated Class class_allowlist = 11;
Profession required_profession = 12;
ItemEffect enchant_effect = 14;
repeated ItemEffect enchant_effects = 14;
}

message UIGem {
Expand Down
745 changes: 586 additions & 159 deletions sim/common/mop/stat_bonus_cds_auto_gen.go

Large diffs are not rendered by default.

Loading
Loading