Skip to content

Base rollover adventures and pvp fights #288

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

Merged
Rinn merged 1 commit into from
Aug 29, 2026
Merged

Base rollover adventures and pvp fights #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Source/relay/TourGuide/Sections/Checklists.ash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void generateMisc(Checklist [int] checklists)
description.listAppend("Or equip your wineglass.");
}

int pvp_fights_gained = numeric_modifier("pvp fights").to_int() + 10;
int pvp_fights_gained = numeric_modifier("pvp fights").to_int();
int pvp_fights_after_rollover_before_caps = pvp_attacks_left() + pvp_fights_gained;
int pvp_fights_after_rollover = MIN(pvp_fights_after_rollover_before_caps, 100);
if (today_is_pvp_season_end())
Expand Down
2 changes: 1 addition & 1 deletion Source/relay/TourGuide/State.ash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void setUpState()
__misc_state["in CS aftercore"] = __misc_state["in aftercore"] && get_property("csServicesPerformed").split_string(",").count() == 11;


int adventures_after_rollover = my_adventures() + 40;
int adventures_after_rollover = my_adventures();
if (my_path().id != PATH_SLOW_AND_STEADY) {
adventures_after_rollover += numeric_modifier("adventures");
adventures_after_rollover += get_property_int("extraRolloverAdventures");
Expand Down
2 changes: 1 addition & 1 deletion Source/relay/relay_TourGuide.ash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//This script and its support scripts are in the public domain.

since r28660; // fix: lots and lots of sea stuff
since r29200; // Rollover adventures & pvp fights included in modtrace
import "relay/TourGuide/Main.ash"

void main()
Expand Down
Loading