-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New Special Days, Fixes, and Enhancements (#261)
**Summary:** This PR merges the latest changes from the `dev` branch into the `main` branch, encompassing numerous enhancements and fixes. **Key Changes:** 1. **Speedrunners Day:** - Introduced Speedrunners Day with a new trail system. - Added various fixes and improvements. 2. **Teleport Day:** - Implemented Teleport Day. - Fixed teleportation logic. 3. **One in the Chamber (OITC):** - Added OITC as a special day. - Enhanced handling for null values and weapon overrides. 4. **New Special Days:** - Introduced Shot4Shot and Mag4Mag days. 5. **General Fixes and Improvements:** - Fixed SQL messages, zombie logic, and event hooks. - Updated formatting and code clean-up. 6. **Automation:** - Added automatic zone generation.
- Loading branch information
Showing
153 changed files
with
3,187 additions
and
1,300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
using CounterStrikeSharp.API.Core; | ||
using Jailbreak.Formatting.Base; | ||
using Jailbreak.Formatting.Views.LastRequest; | ||
|
||
namespace Jailbreak.English.LastRequest; | ||
|
||
public class B4BLocale : LastRequestLocale, ILRB4BLocale { | ||
public IView PlayerGoesFirst(CCSPlayerController player) { | ||
return new SimpleView { | ||
PREFIX, "Randomly selected", player, "to go first." | ||
}; | ||
} | ||
|
||
public IView WeaponSelected(CCSPlayerController player, string weapon) { | ||
return new SimpleView { PREFIX, player, "picked", weapon }; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
using CounterStrikeSharp.API.Core; | ||
using CounterStrikeSharp.API.Modules.Utils; | ||
using Jailbreak.Formatting.Base; | ||
using Jailbreak.Formatting.Views.LastRequest; | ||
|
||
namespace Jailbreak.English.LastRequest; | ||
|
||
public class CoinflipLocale : LastRequestLocale, ILRCFLocale { | ||
public IView FailedToChooseInTime(bool choice) { | ||
return new SimpleView { | ||
PREFIX, | ||
"You failed to choose in time, defaulting to " + ChatColors.Green, | ||
choice ? "Heads" : "Tails" | ||
}; | ||
} | ||
|
||
public IView GuardChose(CCSPlayerController guard, bool choice) { | ||
return new SimpleView { | ||
PREFIX, | ||
guard, | ||
" chose " + ChatColors.Green, | ||
choice ? "Heads" : "Tails", | ||
ChatColors.Default + ", flipping..." | ||
}; | ||
} | ||
|
||
public IView CoinLandsOn(bool heads) { | ||
return new SimpleView { | ||
PREFIX, "The coin lands on " + ChatColors.Green, heads ? "Heads" : "Tails" | ||
}; | ||
} | ||
|
||
public IView FailedToChooseInTime(string choice) { | ||
return new SimpleView { | ||
PREFIX, | ||
"You failed to choose in time, defaulting to " + ChatColors.Green, | ||
choice | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
using CounterStrikeSharp.API.Core; | ||
using Jailbreak.Formatting.Base; | ||
using Jailbreak.Formatting.Views.LastRequest; | ||
|
||
namespace Jailbreak.English.LastRequest; | ||
|
||
public class RPSLocale : LastRequestLocale, ILRRPSLocale { | ||
public IView PlayerMadeChoice(CCSPlayerController player) { | ||
return new SimpleView { PREFIX, player, "made their choice." }; | ||
} | ||
|
||
public IView BothPlayersMadeChoice() { | ||
return new SimpleView { | ||
PREFIX, "Both players have rocked, papered, and scissored! (ew)" | ||
}; | ||
} | ||
|
||
public IView Tie() { | ||
return new SimpleView { PREFIX, "It's a tie! Let's go again!" }; | ||
} | ||
|
||
public IView Results(CCSPlayerController guard, CCSPlayerController prisoner, | ||
int guardPick, int prisonerPick) { | ||
return new SimpleView { | ||
PREFIX, | ||
"Results: ", | ||
guard, | ||
" picked ", | ||
toRPS(guardPick), | ||
" and ", | ||
prisoner, | ||
" picked ", | ||
toRPS(prisonerPick) | ||
}; | ||
} | ||
|
||
private string toRPS(int pick) { | ||
return pick switch { | ||
0 => "Rock", | ||
1 => "Paper", | ||
2 => "Scissors", | ||
_ => "Unknown" | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
using Jailbreak.Formatting.Base; | ||
|
||
namespace Jailbreak.English.SpecialDay; | ||
|
||
public class HNSDayLocale() : TeamDayLocale("Hide and Seek", | ||
"CTs must hide while the Ts seek!", "Ts have 250 HP!") { | ||
public IView StayInArmory | ||
=> new SimpleView { PREFIX, "Today is", Name, ", stay in the armory!" }; | ||
|
||
public override IView BeginsIn(int seconds) { | ||
if (seconds == 0) | ||
return new SimpleView { PREFIX, "Ready or not, here they come!" }; | ||
return new SimpleView { | ||
PREFIX, | ||
Name, | ||
"begins in", | ||
seconds, | ||
"seconds." | ||
}; | ||
} | ||
|
||
public IView DamageWarning(int seconds) { | ||
return new SimpleView { | ||
PREFIX, "You will be vulnerable to damage in", seconds, "seconds." | ||
}; | ||
} | ||
} |
Oops, something went wrong.