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.

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

[scripts][combat-trainer] Use Firebase to store warhorn/egg data (2 of 2) #6673

Closed
wants to merge 30 commits into from
Closed
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4f7aff9
[scripts][combat-trainer] Use Firebase to store warhorn/egg data
MahtraDR Aug 23, 2023
3191850
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 23, 2023
53cfeac
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 23, 2023
cb89f3a
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 28, 2023
a9b60f4
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 28, 2023
e51604e
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 28, 2023
94863de
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 30, 2023
73e2676
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Aug 31, 2023
6c21bea
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Sep 1, 2023
ab0a516
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Sep 8, 2023
0f4960e
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Sep 8, 2023
6e93bf6
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Sep 14, 2023
c6d8432
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Dec 19, 2023
dcf01f3
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Dec 20, 2023
d2960d7
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 17, 2024
0329b52
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 17, 2024
1d98fda
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 17, 2024
a346d6b
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 17, 2024
5fd8687
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 17, 2024
1d6a6c0
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 20, 2024
1198719
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 20, 2024
60b9ec9
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Feb 20, 2024
c669f04
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Apr 11, 2024
dcf97c4
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Apr 26, 2024
bb8a41f
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR May 2, 2024
7520ddd
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR May 2, 2024
a279114
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR May 19, 2024
eddd666
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR May 26, 2024
e1c3304
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR May 29, 2024
03ee3ab
Merge branch 'rpherbig:master' into ct_use_hornwatch
MahtraDR Jun 8, 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
7 changes: 7 additions & 0 deletions combat-trainer.lic
Original file line number Diff line number Diff line change
Expand Up @@ -2343,6 +2343,9 @@ class AbilityProcess
# Return if it hasn't been 10 minutes since last warhorn. Room effect lasts 10 minutes.
return unless Time.now > (UserVars.warhorn["last_warhorn_or_egg"] + 600)

# Return if it hasn't been 10 minutes since someone warhorned in the current room.
return unless Time.now > ($hornwatch.get_horn_data(Room.current.id) + 600)

noun = @warhorn_or_egg[0]

# Check timers. Egg is always 15 minutes. Warhorn is 20 minutes, or configurable.
Expand All @@ -2353,6 +2356,8 @@ class AbilityProcess
DRC.message("SUCCESSFUL egg use") if $debug_mode_ct
UserVars.warhorn["last_egg"] = Time.now
UserVars.warhorn["last_warhorn_or_egg"] = Time.now
# If we successfuly horn, we set the timer for the room
$hornwatch.submit_horn_update(Room.current.id, Time.now)
end
else
return unless Time.now > (UserVars.warhorn["last_warhorn"] + @warhorn_cooldown)
Expand All @@ -2361,6 +2366,8 @@ class AbilityProcess
DRC.message("SUCCESSFUL horn use") if $debug_mode_ct
UserVars.warhorn["last_warhorn"] = Time.now
UserVars.warhorn["last_warhorn_or_egg"] = Time.now
# If we successfuly horn, we set the timer for the room
$hornwatch.submit_horn_update(Room.current.id, Time.now)
end
end

Expand Down
Loading