Skip to content

Commit

Permalink
Changes include:
Browse files Browse the repository at this point in the history
- Compiled with Ubuntu 20.04, made it easier to compile yourself
- Added WaveSpawn spawners PointTemplate and HalloweenBoss
- Added more custom attributes
- Added more WaveSchedule keys
  • Loading branch information
rafradek committed Jun 22, 2021
1 parent db149b6 commit 66a678d
Show file tree
Hide file tree
Showing 3,615 changed files with 1,494,701 additions and 1,474 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
26 changes: 4 additions & 22 deletions AMBuildScript
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,7 @@ WinLinux = ['windows', 'linux']
WinLinuxMac = ['windows', 'linux', 'mac']

PossibleSDKs = {
'episode1': SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
'ep2': SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'orangebox'),
'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
'hl2dm': SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
'tf2': SDK('HL2SDKTF2', '2.tf2', '11', 'TF2', WinLinuxMac, 'sdk2013'),
'l4d': SDK('HL2SDKL4D', '2.l4d', '12', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
# 'nucleardawn': SDK('HL2SDKND', '2.nd', '13', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '15', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
# 'darkm': SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
# 'swarm': SDK('HL2SDK-SWARM', '2.swarm', '16', 'ALIENSWARM', WinOnly, 'swarm'),
# 'bgt': SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
# 'eye': SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', WinLinuxMac, 'csgo'),
'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
# 'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinLinux, 'blade'),
# 'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
# 'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
# 'bms': SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
# 'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
}

def ResolveEnvPath(env, folder):
Expand Down Expand Up @@ -229,6 +209,7 @@ class ExtensionConfig(object):
cxx.cxxflags += ['-fvisibility-inlines-hidden']
cxx.cxxflags += ['-Wno-invalid-offsetof']
cxx.cxxflags += ['-fpermissive']
cxx.cxxflags += ['-fno-stack-protector']
# cxx.cxxflags += ['-ferror-limit=100']
# cxx.cxxflags += ['-arch i386']
# cxx.cxxflags += ['-Wno-invalid-constexpr']
Expand Down Expand Up @@ -281,6 +262,8 @@ class ExtensionConfig(object):
############################################################################
if builder.options.opt == '1':
cxx.cflags += ['-O2']
cxx.cflags += ['-fno-builtin']

cxx.linkflags += ['-Wl,-O2']
cxx.linkflags += ['-Wl,--gc-sections']
else:
Expand Down Expand Up @@ -522,8 +505,7 @@ class ExtensionConfig(object):
compiler.linkflags.append(compiler.Dep(lib_path))

for library in dynamic_libs:
source_path = os.path.join('../alliedmodders/hl2sdk-sdk2013/lib/public/linux32', library)
#source_path = os.path.join(lib_folder, library)
source_path = os.path.join(lib_folder, library)
output_path = os.path.join(binary.localFolder, library)

def make_linker(source_path, output_path):
Expand Down
7 changes: 7 additions & 0 deletions AMBuilder
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ sourceFiles += [
'src/sdk2013/debugoverlay_shared.cpp',
]

sourceFiles += [
'src/sdk2013/mathlib_base.cpp',
'src/sdk2013/color_conversion.cpp',
'src/sdk2013/vmatrix.cpp',
'src/sdk2013/strtools.cpp'
]

sourceFiles += [
'src/common.cpp',
'src/concolor.cpp',
Expand Down
1 change: 0 additions & 1 deletion PackageScript
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ CopyFiles('gamedata/sigsegv', 'addons/sourcemod/gamedata/sigsegv',
'datamaps.txt',
'debugoverlay.txt',
'globals.txt',
'item_names.txt',
'misc.txt',
'nav.txt',
'NextBotBehavior.txt',
Expand Down
53 changes: 53 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# sigsegv-mvm
gigantic, obese SourceMod extension library of sigsegv's TF2 mods (mostly MvM related)

# Tips

How to run a TF2 server on Windows using WSL: https://github.com/rafradek/sigsegv-mvm/wiki/Installing-on-Windows-with-WSL

# How to build

1. Install packages:
```
autoconf libtool pip nasm libiberty-dev:i386 libelf-dev:i386 libboost-dev:i386 libbsd-dev:i386 libunwind-dev:i386 lib32stdc++-7-dev lib32z1-dev libc6-dev-i386 linux-libc-dev:i386 g++-multilib python2 python-is-python2
```

2. Init submodules:
```
git submodule init
git submodule update
cd lib/udis86
./autogen.sh
./configure
make
cd ../..
```

3. Install packages:
```
python-is-python3
```

4. Follow this guide, stop after finishing Downloading Source and Dependencies section. In checkout-deps.sh, you can remove mysql and sdks that are not tf2 and sdk2013 to save space : https://wiki.alliedmods.net/Building_SourceMod

5. Update autoconfig.sh with correct hl2sdk, metamod, sourcemod paths

6. Run autoconfig.sh

7. Build

Release:
```
mkdir -p build/release
cd build/release
ambuild
```

Debug (libbsd-dev:i386 libunwind-dev:i386 is required to load the extension):
```
mkdir -p build
cd build
ambuild
```

Build output is created in the current directory
6 changes: 3 additions & 3 deletions autoconfig.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash

CONFIGURE=$(realpath configure.py)
PATHS="--hl2sdk-root=/opt/tfserver/alliedmodders --mms-path=/opt/tfserver/alliedmodders/mmsource-1.10 --sm-path=/opt/tfserver/alliedmodders/sourcemod"
PATHS="--hl2sdk-root=/home/rafradek/dev/alliedmodders --mms-path=/home/rafradek/dev/alliedmodders/mmsource-1.10 --sm-path=/home/rafradek/dev/alliedmodders/sourcemod"

mkdir -p build
cd build
$CONFIGURE $PATHS --sdks=tf2 --enable-debug --exclude-mods-debug --enable-optimize --exclude-mods-visualize
CC=gcc CXX=g++ $CONFIGURE $PATHS --sdks=tf2 --enable-debug --exclude-mods-debug --enable-optimize --exclude-mods-visualize
cd ..

mkdir -p build/release
pushd build/release
$CONFIGURE $PATHS --sdks=tf2 --enable-optimize --exclude-mods-debug --exclude-mods-visualize --exclude-vgui
CC=gcc CXX=g++ $CONFIGURE $PATHS --sdks=tf2 --enable-optimize --exclude-mods-debug --exclude-mods-visualize --exclude-vgui
popd

# mkdir -p build/clang
Expand Down
30 changes: 30 additions & 0 deletions gamedata/sigsegv/NextBotLocomotionInterface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,36 @@
type "sym"
sym "_ZNK23NextBotGroundLocomotion15GetGroundNormalEv"
}
"CZombieLocomotion::GetRunSpeed"
{
type "sym"
sym "_ZNK17CZombieLocomotion11GetRunSpeedEv"
}
"CHeadlessHatmanLocomotion::GetRunSpeed"
{
type "sym"
sym "_ZNK25CHeadlessHatmanLocomotion11GetRunSpeedEv"
}
"CMerasmusLocomotion::GetRunSpeed"
{
type "sym"
sym "_ZNK19CMerasmusLocomotion11GetRunSpeedEv"
}
"CEyeballBossLocomotion::Approach"
{
type "sym"
sym "_ZN22CEyeballBossLocomotion8ApproachERK6Vectorf"
}
"NextBotGroundLocomotion::GetMaxAcceleration"
{
type "sym"
sym "_ZNK23NextBotGroundLocomotion18GetMaxAccelerationEv"
}
"NextBotGroundLocomotion::GetMaxDeceleration"
{
type "sym"
sym "_ZNK23NextBotGroundLocomotion18GetMaxDecelerationEv"
}

}
}
Expand Down
Loading

0 comments on commit 66a678d

Please sign in to comment.