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.

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

! bunch of spawn reworks ! #42

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

! bunch of spawn reworks ! #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4cd7b53
! bunch of spawn reworks !
sapphonie Dec 20, 2022
6f6e387
more cleanup
sapphonie Jan 1, 2023
3f3c1ed
yet more cleanup
sapphonie Jan 4, 2023
9801d60
update to 1.11
sapphonie Jan 4, 2023
9cd47f3
make stuff compile and update build scripts / updatefile
sapphonie Jan 4, 2023
8c678ca
update bins
sapphonie Jan 4, 2023
958caf1
cleanup, add gamedata.
sapphonie Jan 4, 2023
5b1c235
spawn box == 256 not 386
sapphonie Feb 5, 2023
25072e1
dont prevent spawns on maps that dont have real spawns
sapphonie Feb 5, 2023
509db24
hopefully fix random spawns into client spawn?
sapphonie Feb 19, 2023
75b5286
oops all rewrites (add spawn protection, dont bother caching cvars, f…
sapphonie Feb 22, 2023
b74f3a4
rm logging
sapphonie May 29, 2023
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 .github/workflows/buildsoap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup SourcePawn Compiler
uses: rumblefrog/setup-sp@master
with:
version: "1.10.x"
version: "1.11.x"

- name: Compile plugins
run: |
Expand Down
43 changes: 43 additions & 0 deletions addons/sourcemod/gamedata/soap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
"Games"
{
"tf"
{
"Functions"
{
"CTFPlayer::ForceRespawn"
{
"signature" "CTFPlayer::ForceRespawn"
"callconv" "thiscall"
"return" "void"
"this" "address"
}
"CTFGameRules::Think"
{
"signature" "CTFGameRules::Think"
"callconv" "thiscall"
"return" "void"
"this" "address"
}
}

"Signatures"
{
"CTFPlayer::ForceRespawn"
{
"linux" "@_ZN9CTFPlayer12ForceRespawnEv"
}
"CTFGameRules::Think"
{
"linux" "@_ZN12CTFGameRules5ThinkEv"
}
}
"Offsets"
{
"CBaseEntity::GetBaseEntity"
{
"windows" "5"
"linux" "6"
}
}
}
}
Binary file modified addons/sourcemod/plugins/soap_tf2dm.smx
View file
Open in desktop
Binary file not shown.
Binary file modified addons/sourcemod/plugins/soap_tournament.smx
View file
Open in desktop
Binary file not shown.
1,883 changes: 1,018 additions & 865 deletions addons/sourcemod/scripting/soap_tf2dm.sp
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions getsoap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/bash
/home/steph/tfTEST/tf2/tf/addons/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ addons/sourcemod/scripting/soap_tf2dm.sp -o addons/sourcemod/plugins/soap_tf2dm.smx
sync; sleep 1
/home/steph/tfTEST/tf2/tf/addons_1.10/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ addons/sourcemod/scripting/soap_tf2dm.sp -o addons/sourcemod/plugins/soap_tf2dm.smx
~/tfTEST/tf2/tf/addons/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ ~/SOAP-TF2DM/addons/sourcemod/scripting/soap_tf2dm.sp -o ~/SOAP-TF2DM/addons/sourcemod/plugins/soap_tf2dm.smx
~/tfTEST/tf2/tf/addons/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ ~/SOAP-TF2DM/addons/sourcemod/scripting/soap_tournament.sp -o ~/SOAP-TF2DM/addons/sourcemod/plugins/soap_tournament.smx

/home/steph/tfTEST/tf2/tf/addons/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ addons/sourcemod/scripting/soap_tournament.sp -o addons/sourcemod/plugins/soap_tournament.smx
sync; sleep 1
/home/steph/tfTEST/tf2/tf/addons_1.10/sourcemod/scripting/spcomp -i ./addons/sourcemod/scripting/include/ addons/sourcemod/scripting/soap_tournament.sp -o addons/sourcemod/plugins/soap_tournament.smx

cp ./addons/sourcemod/plugins/* /home/steph/tfTEST/tf2/tf/addons/sourcemod/plugins/ -rfv
cp ./addons/sourcemod/plugins/* /home/sappho/tfTEST/tf2/tf/addons/sourcemod/plugins/ -rfv
11 changes: 8 additions & 3 deletions updatefile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
{
"Version"
{
"Latest" "4.4.5"
"Latest" "4.4.6"
}
"Notes" "Changes in 4.4.5"
"Notes" "- SOAP will now not delete arena logic if mp_tournament is set to 1, as deleting arena logic breaks legitimate arena play."
"Notes" "Changes in 4.4.6"
"Notes" "- Updated spawn system to hopefully improve player experience:"
"Notes" "- SOAP will now refuse to spawn a player at a spawn point if there are other players or projectiles within 386x386x386 units of it."
"Notes" "- Players will now wait in spectate instead of sitting in spawn if no valid spawn points can be found."
"Notes" "- Players will be teleported instantly to a valid spawn point instead of being spawned in the spawn room and teleported a few frames later, this fixes an annoying behavior where players' screens would flash."
"Notes" "- Sentries will no longer target players while SOAP is active"
"Notes" "- Misc code cleanup, and SOAP now requires SourceMod 1.11 to function"
}

"Files"
Expand Down