Merge branch 'master' into rpg-maker-2024

README.md

@@ -1,3 +1,19 @@
+# WARNING! READ!
+
+USE 32 BIT SERVER AS OF NOW!
+this gamemode is ready for 64bit, but it is not possible yet as dhooks and address saving doesnt work for 64bit yet.
+there are some things missing as its still a WIP fix:
+
+-Killfeed bots
+
+-MVM hud setting resetting
+
+-Bob the second not listenign to commands
+
+-EDAlloc remover, i.e. edicts being reserved.
+
+some more...
+
 # TF2 Zombie Riot
 
 You fight against AI enemies/Zombies with allies and try to win/suvive as long as possible, You buy weapons and or upgrade them from previous ones. Stay together and beat them

addons/sourcemod/configs/zombie_riot/weapons.cfg

@@ -1267,7 +1267,7 @@
 				"pap_3_custom_name"     "Wild West Revolver"
 				"pap_3_desc"			"West Pap 1 Desc"
 
-				"pap_3_cost"		"2500"
+				"pap_3_cost"		"4500"
 				"pap_3_classname"	"tf_weapon_revolver"
 				"pap_3_index"		"460"
 				"pap_3_weapon_custom_size"	"3.0"
@@ -1314,7 +1314,7 @@
 				"pap_5_custom_name"     "Wild West Revolver"
 				"pap_5_desc"		"West Pap 2 Desc"
 
-				"pap_5_cost"		"4000"
+				"pap_5_cost"		"6000"
 				"pap_5_classname"	"tf_weapon_revolver"
 				"pap_5_index"		"224"
 				"pap_5_attributes"	"2 ; 28.0 ; 4 ; 1.5 ; 106 ; 0 ; 6 ; 1.0 ; 97 ; 1.0; 205 ; 0.85 ; 206 ; 0.85"  
@@ -1338,7 +1338,7 @@
 				"pap_6_custom_name"     "Wild West Revolver"
 				"pap_6_desc"		"West Pap 3 Desc"
 
-				"pap_6_cost"		"7500"
+				"pap_6_cost"		"8000"
 				"pap_6_classname"	"tf_weapon_revolver"
 				"pap_6_index"		"525"
 				"pap_6_attributes"	"2 ; 34.0 ; 4 ; 2 ; 106 ; 0 ; 6 ; 0.8 ; 97 ; 0.8 ; 205 ; 0.8 ; 206 ; 0.8"  
@@ -7190,7 +7190,7 @@
 			"Dimension Ripper"
 			{
 				"tags"		"DPS;Summon"
-				"cost"		"4750"			//"4750"
+				"cost"		"999999"	//"4750"
 
 				"desc"		"Dim pap0"
 				"filter"	"medieval"
@@ -7208,7 +7208,6 @@
 
 				"func_attack"	"Weapon_Dimension_Wand"
 				"func_attack2"	"Weapon_Dimension_Summon_Normal"
-				"func_attack3"	"Dimension_Modechange"
 				"int_ability_onequip"				"85"
 				"is_a_wand"		"1"
 				"author"	"Beep_G"
@@ -7230,7 +7229,6 @@
 
 				"pap_1_func_attack"		"Weapon_Dimension_Wand"
 				"pap_1_func_attack2"	"Weapon_Dimension_Summon_Normal_PAP"
-				"pap_1_func_attack3"	"Dimension_Modechange"
 
 				"pap_1_lag_comp" 						"0"
 				"pap_1_lag_comp_collision" 		"0"
@@ -7254,7 +7252,6 @@
 
 				"pap_2_func_attack"		"Weapon_Dimension_Wand"
 				"pap_2_func_attack2"	"Weapon_Dimension_Summon_Blitz"
-				"pap_2_func_attack3"	"Dimension_Modechange"
 
 				"pap_2_lag_comp" 						"0"
 				"pap_2_lag_comp_collision" 		"0"
@@ -7277,7 +7274,6 @@
 
 				"pap_3_func_attack"		"Weapon_Dimension_Wand"
 				"pap_3_func_attack2"	"Weapon_Dimension_Summon_Xeno"
-				"pap_3_func_attack3"	"Dimension_Modechange"
 
 				"pap_3_lag_comp" 						"0"
 				"pap_3_lag_comp_collision" 		"0"
@@ -7300,7 +7296,6 @@
 
 				"pap_4_func_attack"		"Weapon_Dimension_Wand"
 				"pap_4_func_attack2"	"Weapon_Dimension_Summon_Medeival"
-				"pap_4_func_attack3"	"Dimension_Modechange"
 
 				"pap_4_lag_comp" 						"0"
 				"pap_4_lag_comp_collision" 		"0"
@@ -7323,7 +7318,6 @@
 
 				"pap_5_func_attack"		"Weapon_Dimension_Wand"
 				"pap_5_func_attack2"	"Weapon_Dimension_Summon_Seaborn"
-				"pap_5_func_attack3"	"Dimension_Modechange"
 
 				"pap_5_lag_comp" 						"0"
 				"pap_5_lag_comp_collision" 		"0"
@@ -7346,7 +7340,6 @@
 
 				"pap_6_func_attack"		"Weapon_Dimension_Wand"
 				"pap_6_func_attack2"	"Weapon_Dimension_Summon_Expidonsa"
-				"pap_6_func_attack3"	"Dimension_Modechange"
 
 				"pap_6_lag_comp" 						"0"
 				"pap_6_lag_comp_collision" 		"0"
@@ -7369,7 +7362,6 @@
 
 				"pap_7_func_attack"		"Weapon_Dimension_Wand"
 				"pap_7_func_attack2"	"Weapon_Dimension_Summon_Interitus"
-				"pap_7_func_attack3"	"Dimension_Modechange"
 
 				"pap_7_lag_comp" 						"0"
 				"pap_7_lag_comp_collision" 		"0"
@@ -7392,7 +7384,6 @@
 
 				"pap_8_func_attack"		"Weapon_Dimension_Wand"
 				"pap_8_func_attack2"	"Weapon_Dimension_Summon_Normal_PAP_PAP"
-				"pap_8_func_attack3"	"Dimension_Modechange"
 
 				"pap_8_lag_comp" 						"0"
 				"pap_8_lag_comp_collision" 		"0"
@@ -7414,7 +7405,6 @@
 
 				"pap_9_func_attack"		"Weapon_Dimension_Wand"
 				"pap_9_func_attack2"	"Weapon_Dimension_Summon_Blitz_PAP"
-				"pap_9_func_attack3"	"Dimension_Modechange"
 
 				"pap_9_lag_comp" 						"0"
 				"pap_9_lag_comp_collision" 		"0"
@@ -7436,7 +7426,6 @@
 
 				"pap_10_func_attack"		"Weapon_Dimension_Wand"
 				"pap_10_func_attack2"	"Weapon_Dimension_Summon_Xeno_PAP"
-				"pap_10_func_attack3"	"Dimension_Modechange"
 
 				"pap_10_lag_comp" 						"0"
 				"pap_10_lag_comp_collision" 		"0"
@@ -7458,7 +7447,6 @@
 
 				"pap_11_func_attack"		"Weapon_Dimension_Wand"
 				"pap_11_func_attack2"	"Weapon_Dimension_Summon_Medeival_PAP"
-				"pap_11_func_attack3"	"Dimension_Modechange"
 
 				"pap_11_lag_comp" 						"0"
 				"pap_11_lag_comp_collision" 		"0"
@@ -7480,7 +7468,6 @@
 
 				"pap_12_func_attack"		"Weapon_Dimension_Wand"
 				"pap_12_func_attack2"	"Weapon_Dimension_Summon_Seaborn_PAP"
-				"pap_12_func_attack3"	"Dimension_Modechange"
 
 				"pap_12_lag_comp" 						"0"
 				"pap_12_lag_comp_collision" 		"0"
@@ -7502,7 +7489,6 @@
 
 				"pap_13_func_attack"		"Weapon_Dimension_Wand"
 				"pap_13_func_attack2"	"Weapon_Dimension_Summon_Expidonsa_PAP"
-				"pap_13_func_attack3"	"Dimension_Modechange"
 
 				"pap_13_lag_comp" 						"0"
 				"pap_13_lag_comp_collision" 		"0"
@@ -7524,7 +7510,6 @@
 
 				"pap_14_func_attack"		"Weapon_Dimension_Wand"
 				"pap_14_func_attack2"		"Weapon_Dimension_Summon_Interitus_PAP"
-				"pap_14_func_attack3"	"Dimension_Modechange"
 
 				"pap_14_lag_comp" 						"0"
 				"pap_14_lag_comp_collision" 		"0"

addons/sourcemod/gamedata/buildonbuildings_defs.games.txt

@@ -18,6 +18,8 @@
 			{
 				"windows"		"340"
 				"linux"			"341"
+				"windows64"		"340"
+				"linux64"			"341"
 			}
 		}
 		//"windows"		"\x53\x8B\xDC\x83\xEC\x08\x83\xE4\xF0\x83\xC4\x04\x55\x8B\x6B\x04\x89\x6C\x24\x04\x8B\xEC\x81\xEC\x48\x01\x00\x00\x56\x57\x8B\xF9\x8B\x07\x8B\x80\x90\x06\x00\x00"

addons/sourcemod/gamedata/lagcompensation.txt

@@ -7,6 +7,8 @@
 			"CLagCompensationManager::FrameUpdatePostEntityThink_OFFSET"
 			{
 				"library"	"server"
+				"linux"		"16"
+				"windows"		"15
 				"linux64"		"16"
 				"windows64"		"15
 			}
@@ -18,20 +20,29 @@
 				//"Trying to start a new lag compensation"
 				"library"	"server"
 				"linux64"		"@_ZN23CLagCompensationManager20StartLagCompensationEP11CBasePlayerP8CUserCmd"
-				"windows64"	"\x40\x55\x57\x41\x55\x48\x81\xEC\xA0\x00\x00\x00"
+				"windows64"	"\x40\x55\x57\x41\x55\x48\x81\xEC\xA0\x00\x00\x00"	
+				"linux"		"@_ZN23CLagCompensationManager20StartLagCompensationEP11CBasePlayerP8CUserCmd"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x28\x57\x8B\xF9\x89\x7D\xE4"
 			}
 			"CLagCompensationManager::FinishLagCompensation"
 			{
 				//"FinishLagCompensation"
 				"library"	"server"
 				"linux64"		"@_ZN23CLagCompensationManager21FinishLagCompensationEP11CBasePlayer" 
 				"windows64"		"\x4C\x8B\xDC\x49\x89\x4B\x08\x53\x48\x81\xEC\xC0\x00\x00\x00"
+
+				"linux"		"@_ZN23CLagCompensationManager20StartLagCompensationEP11CBasePlayerP8CUserCmd"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x40\x8B\x15\x2A\x2A\x2A\x2A\x53\x56\x33\xF6\x8B\xD9"
 			}
 			"CLagCompensationManager::FrameUpdatePostEntityThink_SIGNATURE"
 			{
+				//"FrameUpdatePostEntityThink"
 				"library"	"server"
 				"linux64"		"@_ZN23CLagCompensationManager26FrameUpdatePostEntityThinkEv" //sorry i hate sigs
 				"windows64"	"\x4C\x8B\xDC\x49\x89\x4B\x08\x53\x48\x81\xEC\xB0\x00\x00\x00"
+
+				"linux"		"@_ZN23CLagCompensationManager26FrameUpdatePostEntityThinkEv"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x38\xA1\x2A\x2A\x2A\x2A\x53\x8B\xD9"
 			}
 		}
 		"Functions"