Skip to content

Commit 01ce3f9

Browse files
author
Liam
authored
Merge pull request #8 from tslashd/personal-best
[RM] Save/load times
2 parents 6ee1d3d + 69ee108 commit 01ce3f9

28 files changed

+1954
-129
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*.vs
2-
*.vscode
2+
*.vscode/*
3+
!.vscode/tasks.json
34
*.idea
45
src/bin/Debug/*
6+
src/bin/Release/*
57
src/obj/*
68
src/SurfTimer.csproj

.vscode/tasks.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build-debug",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/src/SurfTimer.csproj",
11+
"/property:Configuration=Debug"
12+
],
13+
"problemMatcher": "$msCompile"
14+
},
15+
{
16+
"label": "build-release",
17+
"command": "dotnet",
18+
"type": "process",
19+
"args": [
20+
"build",
21+
"${workspaceFolder}/src/SurfTimer.csproj",
22+
"/property:Configuration=Release"
23+
],
24+
"problemMatcher": "$msCompile"
25+
}
26+
]
27+
}

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Bold & Italics = being worked on.
1717
- [ ] Zoning
1818
- [X] Start/End trigger touch hooks
1919
- [X] Load zone information automatically from standardised triggers: https://github.com/CS2Surf/Timer/wiki/CS2-Surf-Mapping
20-
- [ ] _**Support for stages (`/rs`, teleporting with `/s`)**_
20+
- [X] _**Support for stages (`/rs`, teleporting with `/s`)**_
2121
- [ ] _**Support for bonuses (`/rs`, teleporting with `/b #`)**_
2222
- [ ] _**Start/End touch hooks implemented for all zones**_
2323
- [ ] Surf configs
@@ -28,20 +28,21 @@ Bold & Italics = being worked on.
2828
- [X] Base timer class implementation
2929
- [X] Base timer HUD implementation
3030
- [X] Prespeed measurement and display
31-
- [ ] Save/load times
32-
- [ ] **_Save/load map personal bests_**
33-
- [ ] **_Save/load map checkpoints_**
31+
- [X] Save/load times
32+
- [X] **_Save/load map personal bests_**
33+
- [X] **_Save/load map checkpoints_**
3434
- [ ] **_Save/load bonus personal bests_**
3535
- [ ] **_Save/load stage personal bests_**
3636
- [ ] Practice Mode implementation
3737
- [ ] Announce records to Discord
3838
- [ ] Stretch goal: sub-tick timing
3939
- [ ] Player Data
4040
- [X] Base player class
41-
- [ ] Player stat classes
41+
- [ ] **_Player stat classes_**
4242
- [ ] Profile implementation (DB)
4343
- [ ] Points/Skill Groups (DB)
4444
- [ ] Player settings (DB)
45-
- [ ] Run replays
45+
- [X] Run replays
46+
- [X] Saveloc/Tele
4647
- [ ] Style implementation (SW, HSW, BW)
4748
- [ ] Paint (?)

cfg/SurfTimer/server_settings.cfg

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ sv_full_alltalk 1
1818

1919
// Movement Settings
2020
sv_airaccelerate 150
21+
// sv_airaccelerate 2000
2122
sv_gravity 800
2223
sv_friction 5.2
2324
sv_maxspeed 350
@@ -26,6 +27,16 @@ sv_enablebunnyhopping 1
2627
sv_autobunnyhopping 1
2728
sv_staminajumpcost 0
2829
sv_staminalandcost 0
30+
sv_timebetweenducks 0
31+
32+
// Some replay bot shit (took so fucking long to debug)
33+
// bot_quota 1 No need for this, because the server handles it
34+
bot_quota_mode "normal"
35+
bot_join_after_player 1
36+
bot_join_team CT
37+
bot_zombie 1
38+
bot_stop 1
39+
bot_freeze 1
2940

3041
// Player Settings
3142
mp_spectators_max 64
@@ -36,8 +47,8 @@ mp_respawn_on_death_ct 1
3647
mp_respawn_on_death_t 1
3748
mp_ct_default_secondary weapon_usp_silencer
3849
mp_t_default_secondary weapon_usp_silencer
39-
mp_autoteambalance 0
4050
mp_limitteams 0
51+
mp_autoteambalance 0
4152
mp_playercashawards 0
4253
mp_teamcashawards 0
4354
mp_death_drop_c4 1
@@ -63,8 +74,7 @@ mp_freezetime 0
6374
mp_team_intro_time 0
6475
mp_warmup_end
6576
mp_warmuptime 0
66-
bot_quota 0
6777
sv_holiday_mode 0
6878
sv_party_mode 0
6979

70-
sv_cheats 0
80+
sv_cheats 0

src/ST-Commands/MapCommands.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ public void MapTier(CCSPlayerController? player, CommandInfo command)
1919
if (player == null)
2020
return;
2121

22-
player.PrintToChat($"{PluginPrefix} {CurrentMap.Name} - {ChatColors.Green}Tier {CurrentMap.Tier}{ChatColors.Default} - {ChatColors.Yellow}{CurrentMap.Stages} Stages{ChatColors.Default}");
22+
if (CurrentMap.Stages > 1)
23+
player.PrintToChat($"{PluginPrefix} {CurrentMap.Name} - {ChatColors.Green}Tier {CurrentMap.Tier}{ChatColors.Default} - Staged {ChatColors.Yellow}{CurrentMap.Stages} Stages{ChatColors.Default}");
24+
else
25+
player.PrintToChat($"{PluginPrefix} {CurrentMap.Name} - {ChatColors.Green}Tier {CurrentMap.Tier}{ChatColors.Default} - Linear {ChatColors.Yellow}{CurrentMap.Checkpoints} Checkpoints{ChatColors.Default}");
2326
return;
2427
}
2528

0 commit comments

Comments
 (0)