From 517f68af9303de68f5bbed8c84a965a0dc1820c4 Mon Sep 17 00:00:00 2001
From: Vaqtincha <51029683+Vaqtincha@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:15:34 +0500
Subject: [PATCH] [WIP] Fgd updates (#632) [skip ci]

* fgd game_player_equip fixes
* fgd enhance cycler/cycler_sprite
* fgd minor changes
---
 .../GameDefinitionFile/regamedll-cs.fgd       | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/regamedll/extra/Toolkit/GameDefinitionFile/regamedll-cs.fgd b/regamedll/extra/Toolkit/GameDefinitionFile/regamedll-cs.fgd
index 50ca2b55..3b59afd9 100644
--- a/regamedll/extra/Toolkit/GameDefinitionFile/regamedll-cs.fgd
+++ b/regamedll/extra/Toolkit/GameDefinitionFile/regamedll-cs.fgd
@@ -1017,21 +1017,27 @@
 @PointClass base(Targetname, Angles, Sequence) size(-16 -16 0, 16 16 72) studio() = cycler : "Monster Cycler"
 [
 	model(studio) : "Model"
+	body(integer) : "Skin" : 0
+	skin(integer) : "Body" : 0
 ]
 
 // line below edited by Dmitrich! -->
 // was: @PointClass base(Targetname, Angles, RenderFields) iconsprite("sprites/CS/cycler_sprite.spr") = cycler_sprite : "Sprite Cycler"
 @PointClass base(Targetname, Angles, RenderFields) size(-16 -16 0, 16 16 72) studio() = cycler_sprite : "Sprite Cycler"
 [
-	model(studio) : "Model / Sprite" : ""
-	sequence(string) : "Animation # sequence (Models only)" : ""
-	framerate(integer) : "Frames per second" : 10
+	model(sprite) : "Sprite name" : ""
+	model(studio) : "Model name" : ""
+	scale(string) : "Scale (Sprites only)" : "1.0"
+	body(integer) : "Skin (Models only)" : 0
+	skin(integer) : "Body (Models only)" : 0
+	sequence(integer) : "Animation # sequence (Models only)" : 0
+	framerate(string) : "Frames per second" : "10.0"
 ]
 
 @PointClass sprite() base(Targetname, Angles, RenderFields) size(-4 -4 -4, 4 4 4) iconsprite("sprites/CS/cycler_wreckage.spr") = cycler_wreckage : "Wreckage"
 [
-	framerate(string) : "Framerate" : "10.0"
 	model(sprite) : "Sprite Name" : "sprites/dot.spr"
+	framerate(string) : "Framerate" : "10.0"
 	scale(string) : "Scale" : "1.0"
 	spawnflags(flags) =
 	[
@@ -1524,12 +1530,12 @@
 		0: "No"
 		1: "Yes"
 	]
-	weapon_famas (choices) : "CS 1.6 Famas (762nato)" : 0 =
+	weapon_famas (choices) : "CS 1.6 Famas (556nato Calibre)" : 0 =
 	[
 		0: "No"
 		1: "Yes"
 	]
-	weapon_galil (choices) : "CS 1.6 Galil (556natobox)"  : 0 =
+	weapon_galil (choices) : "CS 1.6 Galil (556natobox Calibre)"  : 0 =
 	[
 		0: "No"
 		1: "Yes"
@@ -1580,8 +1586,8 @@
 		0: "No"
 		1: "1 Clip (30 Bullets Per Clip)"
 		2: "2 Clips"
-		3: "3 Clips (Fill Glock 18)"
-		4: "4 Clips (Fill Elites, MP5 & TMP)"
+		3: "3 Clips"
+		4: "4 Clips (Fill Elites, MP5, TMP, Glock 18)"
 	]
 	ammo_45acp (choices) : "Give .45 ACP Ammo" : 0 =
 	[
@@ -1589,12 +1595,12 @@
 		1: "1 Clip (12 Bullets Per Clip)"
 		2: "2 Clips"
 		3: "3 Clips"
-		4: "4 Clips (Fill USP45)"
+		4: "4 Clips"
 		5: "5 Clips"
 		6: "6 Clips"
 		7: "7 Clips"
-		8: "8 Clips (Fill Mac-10)"
-		9: "9 Clips (Fill UMP 45)"
+		8: "8 Clips"
+		9: "9 Clips (Fill UMP 45, Mac-10, USP45)"
 	]
 	ammo_50ae (choices) : "Give .50 Deagle Ammo" : 0 =
 	[
@@ -1609,7 +1615,7 @@
 	[
 		0: "No"
 		1: "1 Clip (50 Bullets Per Clip)"
-		2: "2 Clips (Fill Five-Seven & P90)"
+		2: "2 Clips (Fill Five-Seven, P90)"
 	]
 	ammo_357sig (choices) : "Give .357 SIG Ammo" : 0 =
 	[
@@ -1631,15 +1637,15 @@
 	[
 		0: "No"
 		1: "1 Clip (30 Bullets Per Clip)"
-		2: "2 Clips (Fill Scout & G3/S-G1)"
-		3: "3 Clips (Fill AK-47)"
+		2: "2 Clips"
+		3: "3 Clips (Fill AK-47, Scout, G3/S-G1)"
 	]
 	ammo_556nato (choices) : "Give 5.56mm NATO Ammo" : 0 =
 	[
 		0: "No"
 		1: "1 Clip (30 Bullets Per Clip)"
 		2: "2 Clips"
-		3: "3 Fill SG552 M4A1 Aug SG550"
+		3: "3 Fill SG552, M4A1, Aug, SG550, Famas"
 	]
 	ammo_556natobox (choices) : "Give 5.56mm NATO Box Ammo" : 0 =
 	[
@@ -1798,7 +1804,7 @@
 
 @PointClass iconsprite("sprites/CS/hostage_entity.spr") base(PlayerClass, RenderFields) = hostage_entity : "Hostage"
 [
-	model(string) : "Model" : "models/hostage.mdl"
+	model(studio) : "Model" : "models/hostage.mdl"
 	skin(choices) : "Skin" : 0 =
 	[
 		0: "Orange Suit Worker"
@@ -1918,7 +1924,7 @@
 
 @PointClass iconsprite("sprites/CS/info_map_parameters.spr") = info_map_parameters : "Miscellaneous mapping parameters"
 [
-	buying(choices)  : "Weapon_Buying" : 0 =
+	buying(choices)  : "Weapon Buying" : 0 =
 	[
 		0: "Both teams can buy guns"
 		1: "Only CT's can buy guns"
@@ -2437,7 +2443,7 @@
 @SolidClass base(Global, RenderFields, ZHLT, TexLightType) = func_healthcharger: "Wall health recharger"
 [
 	health(integer) : "Healthcharger Capacity" : 50
-	dmdelay(integer) : "Deathmatch recharge delay" : 60
+	dmdelay(integer) : "Recharge delay" : 60
 	_minlight(string) : "Minimum light level" : "0"
 ]
 
@@ -2545,7 +2551,7 @@
 @SolidClass base(Global, RenderFields, ZHLT, TexLightType) = func_recharge: "Battery recharger"
 [
 	armorvalue(integer) : "Suitcharger Capacity" : 30
-	dmdelay(integer) : "Deathmatch recharge delay" : 30
+	dmdelay(integer) : "Recharge delay" : 30
 	_minlight(string) : "Minimum light level" : "0"
 ]