Revision 31/07/2024

Wolvin-NET · Jul 31, 2024 · eedee1d · eedee1d
1 parent 28285cb
commit eedee1d
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 4 deletions.
diff --git a/CHANGES.MD b/CHANGES.MD
@@ -2,6 +2,13 @@
 Note: **Prop Hunt X2Z will SOON change it's versioning from "X2Z" to "24XZ" with unique formatted revision versioning.**  
 Example: `VERSION = "24XZ" REVISION = "XZ24.0105A"` where: `XZ24`: X2Z/YY, `0105`: DD/MM, `A`: Quick revisions if occured within same day.
 
+## Revision 31.07.2024
+- Quick Minor fix where players cannot use door or any entities where it supposed to. (This was caused by `ph_allow_pickup_object` that was set to 0 or <team number>)
+- Removed .sw.vtx and .xbox.vtx for models (as it is not needed on Gmod Today Source Engine standard.)
+
+### 'Proper' Prop Collission
+- A propposed feature for proper prop collision will be added in future update. Currently testing any possible way to get this reliable or efficient. See https://github.com/Wolvin-NET/prophuntx/issues/13#issuecomment-2260784230
+
 ## Revision 17.07.2024
 - Re-enabled back a function where you can use accurate prop's hull rather than rounding them.
 - Added ConVar "ph_tmp_accurate_hull" (Enabled by Default) for Accurate Hull - Turn this off if you have a problem such as getting stuck too often

diff --git a/README.MD b/README.MD
@@ -6,7 +6,7 @@
 **"Prop Hunt: X/X2Z" Was Originally given and created by Wolvindra-Vinzuerio and Only Available Exclusively for Garry's Mod.**
 
 ### Versioning
-Version: X2Z, Revision: 17/07/2024 (dd/mm/yyyy)
+Version: X2Z, Revision: 31/07/2024 (dd/mm/yyyy)
 
 ### Public Servers
 - Server #1 [U.S]: **74.91.120.8:27015** (Public Stable Server)

diff --git a/gamemodes/prop_hunt/content/models/props_idbs/phenhanced/box.sw.vtx b/gamemodes/prop_hunt/content/models/props_idbs/phenhanced/box.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/props_idbs/phenhanced/devil.sw.vtx b/gamemodes/prop_hunt/content/models/props_idbs/phenhanced/devil.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/c_mach_brenmk3.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/c_mach_brenmk3.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/hunter_flechette.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/hunter_flechette.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/v_mkbren.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/v_mkbren.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/v_mkbren.xbox.vtx b/gamemodes/prop_hunt/content/models/weapons/v_mkbren.xbox.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_guardgun.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_guardgun.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_mach_brenmk3.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_mach_brenmk3.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_mkbren.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_mkbren.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_mkbren.xbox.vtx b/gamemodes/prop_hunt/content/models/weapons/w_mkbren.xbox.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_phx_mp5.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_phx_mp5.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_phx_pistol.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_phx_pistol.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_phx_rpg.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_phx_rpg.sw.vtx
diff --git a/gamemodes/prop_hunt/content/models/weapons/w_phx_strider_wang.sw.vtx b/gamemodes/prop_hunt/content/models/weapons/w_phx_strider_wang.sw.vtx
diff --git a/gamemodes/prop_hunt/gamemode/init.lua b/gamemodes/prop_hunt/gamemode/init.lua
@@ -747,6 +747,12 @@ function GM:PlayerUse(pl, ent)
 	-- control who can pick up objects
 	if PHX:IsUsablePropEntity(ent:GetClass()) then
 		local state = PHX:GetCVar( "ph_allow_pickup_object" )
+		local cls = ent:GetClass()
+
+		-- Fix where you cant open doors or use+ing any entities.
+		if PHX.EXPLOITABLE_DOORS[cls] then return end
+		if cls == "ph_luckyball" or cls == "ph_devilball" then return end
+		if ent:IsVehicle() then return end -- for ph_factory map
 
 		if state <= 0 then
 			return false

diff --git a/gamemodes/prop_hunt/gamemode/sh_init.lua b/gamemodes/prop_hunt/gamemode/sh_init.lua
@@ -22,7 +22,7 @@ IS_PHX		 	= true	-- an easy check if PHX is installed.
 
 PHX.ConfigPath 	= "phx_data"
 PHX.VERSION		= "X2Z"
-PHX.REVISION	= "17.07.24" --Format: dd/mm/yy.
+PHX.REVISION	= "31.07.24" --Format: dd/mm/yy.
 
 --Include Languages
 PHX.LANGUAGES = {}

diff --git a/updates/update.json b/updates/update.json
@@ -1,6 +1,6 @@
 {
 	"version":"X2Z",
-	"revision":"17.07.24",
+	"revision":"31.07.24",
 	"url":"https:\/\/gmodgameservers.com\/prophuntx\/changelogs",
-	"notice":"July 17: Re-added back for accurate hull function and minor tweaks.\nFor more info: https:\/\/gmodgameservers.com\/prophuntx\/changelogs"
+	"notice":"July 31: Quick minor fix where teams cannot use doors or any entities\nFor more info: https:\/\/gmodgameservers.com\/prophuntx\/changelogs"
 }