Add a rewritten ZombieReborn to CS2Fixes #154

Vauff · 2024-01-02T03:41:03Z

Reimplements all of the Lua ZombieReborn script within a C++ Metamod plugin (CS2Fixes).

This PR was a collaborative work by @EasterLee @Vauff @Faramour @xen-000

To do:

Add mother zombie immunity
Add check for map item dropping before weapon stripping here

* Add files * Push changes to remote branch

* basic knockback * Update zombiereborn.cpp * Update zombiereborn.cpp * Update zombiereborn.cpp * move detour * add infection * pawn+controller respawn gamedata * add resolve_sig * fix address

* basic knockback * Update zombiereborn.cpp * Update zombiereborn.cpp * Update zombiereborn.cpp * move detour * add infection * pawn+controller respawn gamedata * add resolve_sig * fix address * add zspawn command * mother zombie infection * setmodel + win condition * bug fix

Makesig script did not correctly wildcard certain bytes, this fixes that As a result this now matches two identical functions, which should not matter since behaviours will match

* basic knockback * Update zombiereborn.cpp * Update zombiereborn.cpp * Update zombiereborn.cpp * move detour * add infection * pawn+controller respawn gamedata * add resolve_sig * fix address * add zspawn command * mother zombie infection * setmodel + win condition * bug fix * script weapon on infect * 1 * prevent team hopping, zm can only pick up knife, team score * combine WeaponServices_CanUse detour if statement * ZR_StripAndGiveKnife null check

- Update !ztele to use Zombie:Reborn prefix - Remove unneeded cvars, uncomment bot_quota_mode fill - Moved force CT to ZR

Now it all works!

* basic knockback * Update zombiereborn.cpp * Update zombiereborn.cpp * Update zombiereborn.cpp * move detour * add infection * pawn+controller respawn gamedata * add resolve_sig * fix address * add zspawn command * mother zombie infection * setmodel + win condition * bug fix * script weapon on infect * 1 * prevent team hopping, zm can only pick up knife, team score * combine WeaponServices_CanUse detour if statement * ZR_StripAndGiveKnife null check * manual respawn + misc changes * add setpawn sig for linux * add new cvars to cfg * fix controller respawn offset * remove second player_death * save cteam handles * revise * fix logic & respawn late joiners * move mz infection after teleport

Not using it in ZR anymore, so we should just pull that branch into main if still desired

The swapped overloads were fixed in the sdk

* add weapon config * update example

* add delay to late joiner respawn * make jointeam kills the player

* playerclass + regen timer * Add base class, speed, and gravity attribute * fix typo * rename player class global variable * add model precache * add missing newline * disable "enabled" for now * edit timer

These changes bring us more in line with CS2 round behaviour, possibly fixing an issue where first player would join and never spawn

* initial tweak * Update zombiereborn.cpp

* add mz immunity * tab * add immunity cvar * break infinite loop and implement second fail safe * check mother zombie ratio

Copying the service null checks from ZR weapon stripping, where a similar crash was previously observed during development

Vauff marked this pull request as draft January 2, 2024 03:41

Vauff force-pushed the zombiereborn branch from 020db53 to d209a92 Compare January 4, 2024 00:59

Vauff marked this pull request as ready for review January 6, 2024 06:14

Faramour and others added 27 commits January 12, 2024 23:15

ZombieReborn (#117)

679645f

* Add files * Push changes to remote branch

basic knockback

7f574d6

Fix mathlib linking issue on Linux

2a52298

Unify formatting with rest of project

b907a70

Replace _ZOMBIEREBORN define with the zr_enable "cvar"

c8a72af

Ensure ZR functionality isn't blocked by other cvars

0d7fec6

Comment out cvars we aren't using

ca68a5f

Basic Infection (#122)

f6d83d0

* basic knockback * Update zombiereborn.cpp * Update zombiereborn.cpp * Update zombiereborn.cpp * move detour * add infection * pawn+controller respawn gamedata * add resolve_sig * fix address

Move all ZR code to zombiereborn.cpp

31a4e23

Fix CBaseModelEntity_SetModel Linux signature

fa043e9

Makesig script did not correctly wildcard certain bytes, this fixes that As a result this now matches two identical functions, which should not matter since behaviours will match

Some misc changes

d68a7a3

- Update !ztele to use Zombie:Reborn prefix - Remove unneeded cvars, uncomment bot_quota_mode fill - Moved force CT to ZR

add entity output hook

56e8b3b

add CComponent

307c1b3

Add respawn toggle & entity creation

c4e596a

Fix git merge error

6967ae4

Progress to a respawn toggle fix.. and also no progress at all

a27bb34

Set the relay's name properly

fe2f592

Now it all works!

Remove feat/entityio from ZR branch

a90d726

Not using it in ZR anymore, so we should just pull that branch into main if still desired

Add support for zr_toggle_respawn Enable/Disable inputs

794b58e

Remove the disgusting casts

d6a0d19

The swapped overloads were fixed in the sdk

[ZR] Weapon Config (#140)

b30a327

* add weapon config * update example

[ZR] Add delay to late joiner respawn (#139)

454cd41

* add delay to late joiner respawn * make jointeam kills the player

add infinite ammo (#145)

a549fe5

[ZR] Simple Player Class and Regen Timer (#143)

9472ed6

* playerclass + regen timer * Add base class, speed, and gravity attribute * fix typo * rename player class global variable * add model precache * add missing newline * disable "enabled" for now * edit timer

Vauff and others added 23 commits January 12, 2024 23:33

Infection message grammar fix

127eed5

Misc cleanup

8c5a4e4

Add serverside map configs

679d9cd

Change infinite ammo method & add a cvar

3a98dcf

End round on first player join & stop ending rounds on idling server

5197821

These changes bring us more in line with CS2 round behaviour, possibly fixing an issue where first player would join and never spawn

Further cleanup

4be131c

Add model skin & colour control to player classes

5480f6d

[ZR] small tweaks (#149)

15d88d5

* initial tweak * Update zombiereborn.cpp

Use mp_round_restart_delay value

c394404

Fix ZR blocking spectator access

eb5de06

Fix infection countdown being 1 second off

a68923a

Only allow humans/zombies to be respawned

0929842

Implement an entity listener & drop map items on infection

0f4c684

Use the real variant_t

ad4f754

Add model scale control to player classes

6855930

Switch to using TerminateRound for RTV

555c561

[ZR] MZ Immunity (#156)

e91a9b4

* add mz immunity * tab * add immunity cvar * break infinite loop and implement second fail safe * check mother zombie ratio

Consistent gamedata formatting & ZR formatting pass

0bf711b

Cfg adjustment

0ac2f31

Fix MZ infection using invalid spawns & fix classic spawn

c8bd007

Patch GetHammerUniqueId instead of hooking it

86311a9

Fix rare crash in weapon buy commands

03590fd

Copying the service null checks from ZR weapon stripping, where a similar crash was previously observed during development

A couple small changes

d97df32

xen-000 force-pushed the zombiereborn branch from 2a1ba42 to d97df32 Compare January 12, 2024 21:42

xen-000 approved these changes Jan 12, 2024

View reviewed changes

xen-000 merged commit af0e188 into main Jan 12, 2024
3 checks passed

xen-000 deleted the zombiereborn branch January 12, 2024 21:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a rewritten ZombieReborn to CS2Fixes #154

Add a rewritten ZombieReborn to CS2Fixes #154

Vauff commented Jan 2, 2024 •

edited

Loading

Add a rewritten ZombieReborn to CS2Fixes #154

Add a rewritten ZombieReborn to CS2Fixes #154

Conversation

Vauff commented Jan 2, 2024 • edited Loading

Vauff commented Jan 2, 2024 •

edited

Loading