Update version info & python animations

phoenixprojectsoftware · Nov 28, 2020 · dd14b6c · dd14b6c
1 parent 8b8ba35
commit dd14b6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Source code (VS2019)/dlls/python.cpp b/Source code (VS2019)/dlls/python.cpp
@@ -24,14 +24,14 @@
 
 
 enum python_e {
-	PYTHON_IDLE1 = 0,
-	PYTHON_FIDGET,
-	PYTHON_FIRE1,
-	PYTHON_RELOAD,
-	PYTHON_HOLSTER,
-	PYTHON_DRAW,
-	PYTHON_IDLE2,
-	PYTHON_IDLE3
+	PYTHON_IDLE1 = 0, // 1. longidle
+	PYTHON_FIDGET, // 2. idle1
+	PYTHON_GRENADE, // 3. grenade (OG PYTHON_FIRE)
+	PYTHON_RELOAD, // 4. reload
+	PYTHON_DEPLOY, // 5. deploy (OG PYTHON_HOLSTER)
+	PYTHON_FIRE, // 6. shoot_1
+	PYTHON_IDLE2, //  7. shoot_2
+	PYTHON_IDLE3 // 8. shoot_3
 };
 
 LINK_ENTITY_TO_CLASS( weapon_python, CPython );
@@ -112,7 +112,7 @@ BOOL CPython::Deploy( )
 		pev->body = 0;
 	}
 
-	return DefaultDeploy( "models/v_player1mac10.mdl", "models/p_357.mdl", PYTHON_DRAW, "python", UseDecrement(), pev->body );
+	return DefaultDeploy( "models/v_player1mac10.mdl", "models/p_357.mdl", PYTHON_DEPLOY, "python", UseDecrement(), pev->body );
 }
 
 
@@ -127,7 +127,7 @@ void CPython::Holster( int skiplocal /* = 0 */ )
 
 	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.098;
 	m_flTimeWeaponIdle = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
-	SendWeaponAnim( PYTHON_HOLSTER );
+	SendWeaponAnim( PYTHON_DEPLOY );
 }
 
 void CPython::SecondaryAttack( void )
@@ -250,17 +250,17 @@ void CPython::WeaponIdle( void )
 	float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
 	if (flRand <= 0.5)
 	{
-		iAnim = PYTHON_IDLE1;
+		iAnim = PYTHON_FIDGET;
 		m_flTimeWeaponIdle = (70.0/30.0);
 	}
 	else if (flRand <= 0.7)
 	{
-		iAnim = PYTHON_IDLE2;
+		iAnim = PYTHON_IDLE1;
 		m_flTimeWeaponIdle = (60.0/30.0);
 	}
 	else if (flRand <= 0.9)
 	{
-		iAnim = PYTHON_IDLE3;
+		iAnim = PYTHON_IDLE1;
 		m_flTimeWeaponIdle = (88.0/30.0);
 	}
 	else

diff --git a/Source code (VS2019)/game_shared/GreySourceVersionInfo.h b/Source code (VS2019)/game_shared/GreySourceVersionInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // Grey Source version info.
-#define buildType "Propietary" // There are two types of Grey Source builds — Basic, meaning the engine and SDK is unmodified, and Propietary, meaning the engine and/or SDK has been modified for the specific game.
+#define buildType "Proprietary" // There are two types of Grey Source builds — Basic, meaning the engine and SDK is unmodified, and Propietary, meaning the engine and/or SDK has been modified for the specific game.
 #define buildDate __DATE__
 #define buildAuthor "Grey Source 2020 by The Phoenix Project"
 #define build "Grey Source 2020 Proprietary [build 2011-Z]"

diff --git a/Source code (VS2019)/projects/vs2019/hldll.vcxproj b/Source code (VS2019)/projects/vs2019/hldll.vcxproj
@@ -44,7 +44,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>$(Configuration)\$(ProjectName)\int\</IntDir>
-    <TargetName>hl</TargetName>
+    <TargetName>GreySource</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>