-

Author: codenamecpp

gamedata/entities/common.json

@@ -0,0 +1,78 @@
+{
+    "weapons":
+    {
+        "fists":
+        {
+            "fire_type": "melee",
+            "base_fire_rate": 2.0,
+            "base_ammo_limit": 0,
+            "base_melee_hit_distance": "0.2u"
+        },
+        "pistol":
+        {
+            "fire_type": "projectile",
+            "projectile": "bullet",
+            "base_fire_rate": 2.0,
+            "sprite_index": 30,
+            "base_ammo_limit": 999
+        },
+        "machinegun":
+        {
+            "fire_type": "projectile",
+            "projectile": "bullet",
+            "base_fire_rate": 8.0,
+            "sprite_index": 31,
+            "base_ammo_limit": 999
+        },
+        "flamethrower":
+        {
+            "fire_type": "projectile",
+            "projectile": "flame",
+            "base_fire_rate": 16.0,
+            "sprite_index": 33,
+            "base_ammo_limit": 999
+        },
+        "rocket_launcher":
+        {
+            "fire_type": "projectile",
+            "projectile": "rocket",
+            "base_fire_rate": 1.0,
+            "sprite_index": 32,
+            "base_ammo_limit": 999
+        }
+    },
+
+    "projectiles":
+    {
+        "bullet":
+        {
+            "anim_id": "projectile_bullet",
+            "anim_loop": "from_start",
+            "radius": 0.1,
+            "base_distance": "4.5u",
+            "base_primary_damage_radius": 0.0,
+            "base_secondary_damage_radius": 0.0,
+            "speed": "8.0u"
+        },
+        "flame":
+        {
+            "anim_id": "projectile_flame",
+            "anim_loop": "none",
+            "radius": 0.3,
+            "base_distance": "1.1u",
+            "base_primary_damage_radius": 0.0,
+            "base_secondary_damage_radius": 0.0,
+            "speed": "2.75u"
+        },
+        "rocket":
+        {
+            "anim_id": "projectile_rocket",
+            "anim_loop": "from_start",
+            "radius": 0.1,
+            "base_distance": "20.0u",
+            "base_primary_damage_radius": 0.0,
+            "base_secondary_damage_radius": 0.0,
+            "speed": "4.4u"
+        }
+    }
+}

src/Carnage3D.vcxproj

@@ -327,6 +327,7 @@
   <ItemGroup>
     <None Include="..\gamedata\config\inputs.json.default" />
     <None Include="..\gamedata\config\sys_config.json.default" />
+    <None Include="..\gamedata\entities\common.json" />
     <None Include="..\gamedata\shaders\city_mesh.glsl" />
     <None Include="..\gamedata\shaders\debug.glsl" />
     <None Include="..\gamedata\shaders\gui.glsl" />

src/Carnage3D.vcxproj.filters

@@ -62,6 +62,9 @@
     <Filter Include="Game\DebugWindows">
       <UniqueIdentifier>{e0f94144-2eda-4062-a81c-663d85aba012}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Data\entities">
+      <UniqueIdentifier>{ba5abb24-45fc-4800-b80d-acbc30a9f820}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -548,6 +551,9 @@
     <None Include="..\gamedata\config\inputs.json.default">
       <Filter>Data\config</Filter>
     </None>
+    <None Include="..\gamedata\entities\common.json">
+      <Filter>Data\entities</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\docs\CorrectionsToCDS.txt">

src/GameDefs.h

@@ -741,6 +741,16 @@ enum eWeaponType
 
 decl_enum_strings(eWeaponType);
 
+// weapon fire type
+enum eWeaponFireType
+{
+    eWeaponFireType_Melee,
+    eWeaponFireType_Projectile,
+    eWeaponFireType_COUNT
+};
+
+decl_enum_strings(eWeaponFireType);
+
 // pedestrian basic action
 enum ePedestrianAction
 {
@@ -831,17 +841,34 @@ enum eProjectileType
 };
 decl_enum_strings(eProjectileType);
 
-// projectile type info
+// projectile type data
 struct ProjectileStyle
 {
 public:
-    eProjectileType mTypeID;
-    eSpriteAnimID mAnimID;
-    float mBaseDistance; // how far projectile can fly, meters
-    float mProjectileRadius; // size, meters
-    float mSpeed; // how fast projectile moves, meters
-    float mBasePrimaryDamageRadius; // how far projectile can impact, meters
-    float mBaseSecondaryDamageRadius; // // how far projectile can impact, meters
-    // todo: damage
-    // todo: impact type
+    eProjectileType mTypeID = eProjectileType_Bullet;
+
+    eSpriteAnimID mAnimID = eSpriteAnimID_Projectile_Bullet;
+    eSpriteAnimLoop mAnimLoop = eSpriteAnimLoop_FromStart;
+
+    float mBaseDistance = 1.0f; // how far projectile can fly, meters
+    float mProjectileRadius = 1.0f; // size, meters
+    float mSpeed = 1.0f; // how fast projectile moves, meters
+    float mBasePrimaryDamageRadius = 0.0f; // how far projectile can impact, meters
+    float mBaseSecondaryDamageRadius = 0.0f; // // how far projectile can impact, meters
+};
+
+// weapon type data
+struct WeaponStyle
+{
+public:
+    eWeaponType mTypeID = eWeaponType_Fists;
+
+    eWeaponFireType mFireTypeID = eWeaponFireType_Melee;
+    eProjectileType mProjectileID = eProjectileType_Bullet; // has meaning only if mFireTypeID is projectile
+
+    float mBaseFireRate = 1.0f; // num shots per seconds
+    float mBaseMeleeHitDistance = 1.0f; // has meaning only of mFireTypeID is melee
+
+    int mSpriteIndex = 0; // hud sprite
+    int mBaseAmmoLimit = 0; // max ammo, 0 is unlimited
 };

src/GameParams.cpp

@@ -11,7 +11,6 @@ GameParams::GameParams()
 void GameParams::SetToDefaults()
 {
     mPedestrianBoundsSphereRadius = Convert::MapUnitsToMeters(0.10f);
-    mPedestrianFistsHitDistance = mPedestrianBoundsSphereRadius + 0.25f;
     mPedestrianTurnSpeed = 260.0f;
     mPedestrianTurnSpeedSlideOnCar = 120.0f;
     mPedestrianSlideOnCarSpeed = Convert::MapUnitsToMeters(1.2f);
@@ -21,11 +20,4 @@ void GameParams::SetToDefaults()
     mPedestrianKnockedDownTime = 3.0f;
     mPedestrianFallDeathHeight = Convert::MapUnitsToMeters(2.0f);
     mPedestrianDrowningTime = 0.05f;
-
-    // weapons fire rate
-    mWeaponsRechargeTime[eWeaponType_Fists] = 1.0f / 2.0f;
-    mWeaponsRechargeTime[eWeaponType_Pistol] = 1.0f / 2.5f;
-    mWeaponsRechargeTime[eWeaponType_Machinegun] = 1.0f / 8.0f;
-    mWeaponsRechargeTime[eWeaponType_Flamethrower] = 1.0f / 14.0f;
-    mWeaponsRechargeTime[eWeaponType_RocketLauncher] = 1.0f;
 }

src/GameParams.h

@@ -14,7 +14,6 @@ class GameParams
 public:
     // pedestrians
     float mPedestrianBoundsSphereRadius; // bounding sphere radius, meters
-    float mPedestrianFistsHitDistance; // meters
     float mPedestrianTurnSpeed; // degrees per second
     float mPedestrianTurnSpeedSlideOnCar; // degrees per second
     float mPedestrianSlideOnCarSpeed; // meters per second
@@ -24,7 +23,6 @@ class GameParams
     float mPedestrianSpotTheCarDistance; // max distance to detect the car, meters
     float mPedestrianFallDeathHeight; // falling distance which causes pedestrian death, meters
     float mPedestrianDrowningTime; // seconds
-    float mWeaponsRechargeTime[eWeaponType_COUNT]; // weapons reload time, seconds
 };
 
 extern GameParams gGameParams;

src/HUD.cpp

@@ -24,16 +24,8 @@ void HUD::DrawFrame(UiContext& uiContext)
     // temporary
     if (mCharacter->mCurrentWeapon != eWeaponType_Fists)
     {
-        int arrowSpriteIndex = 30;
-        switch (mCharacter->mCurrentWeapon)
-        {
-            case eWeaponType_Pistol: arrowSpriteIndex = 30; break;
-            case eWeaponType_Machinegun: arrowSpriteIndex = 31; break;
-            case eWeaponType_Flamethrower: arrowSpriteIndex = 33; break;
-            case eWeaponType_RocketLauncher: arrowSpriteIndex = 32; break;
-        }
-
-        int spriteIndex = gGameMap.mStyleData.GetSpriteIndex(eSpriteType_Arrow, arrowSpriteIndex);
+        WeaponStyle& weapon = gGameMap.mStyleData.mWeapons[mCharacter->mCurrentWeapon];
+        int spriteIndex = gGameMap.mStyleData.GetSpriteIndex(eSpriteType_Arrow, weapon.mSpriteIndex);
 
         Sprite2D sprite;
         gSpriteManager.GetSpriteTexture(GAMEOBJECT_ID_NULL, spriteIndex, 0, sprite);

src/Pedestrian.cpp

@@ -119,7 +119,10 @@ void Pedestrian::DrawDebug(DebugRenderer& debugRender)
     if (mCurrentCar == nullptr)
     {
         glm::vec3 position = mPhysicsBody->GetPosition();
-        glm::vec2 signVector = mPhysicsBody->GetSignVector() * gGameParams.mPedestrianFistsHitDistance;
+
+        WeaponStyle& meleeWeapon = gGameMap.mStyleData.mWeapons[eWeaponFireType_Melee];
+
+        glm::vec2 signVector = mPhysicsBody->GetSignVector() * meleeWeapon.mBaseMeleeHitDistance;
         debugRender.DrawLine(position, position + glm::vec3(signVector.x, 0.0f, signVector.y), Color32_White, false);
 
         cxx::bounding_sphere_t bsphere (mPhysicsBody->GetPosition(), gGameParams.mPedestrianBoundsSphereRadius);

src/PedestrianStates.cpp

@@ -178,18 +178,24 @@ void PedestrianStatesManager::ProcessMotionActions()
 
 bool PedestrianStatesManager::TryToShoot()
 {
+    debug_assert(mPedestrian->mCurrentWeapon < eWeaponType_COUNT);
+
     float currGameTime = gTimeManager.mGameTime;
-    if (mPedestrian->mWeaponRechargeTime > currGameTime ||
+    if (mPedestrian->mWeaponRechargeTime >= currGameTime ||
         mPedestrian->mWeaponsAmmo[mPedestrian->mCurrentWeapon] == 0)
     {
         return false;
     }
 
     glm::vec3 currPosition = mPedestrian->mPhysicsBody->GetPosition();
-    if (mPedestrian->mCurrentWeapon == eWeaponType_Fists)
+
+    // get weapon params
+    WeaponStyle& weaponParams = gGameMap.mStyleData.mWeapons[mPedestrian->mCurrentWeapon];
+
+    if (weaponParams.mFireTypeID == eWeaponFireType_Melee)
     {
         glm::vec2 posA { currPosition.x, currPosition.z };
-        glm::vec2 posB = posA + (mPedestrian->mPhysicsBody->GetSignVector() * gGameParams.mPedestrianFistsHitDistance);
+        glm::vec2 posB = posA + (mPedestrian->mPhysicsBody->GetSignVector() * weaponParams.mBaseMeleeHitDistance);
         // find candidates
         PhysicsLinecastResult linecastResult;
         gPhysics.QueryObjectsLinecast(posA, posB, linecastResult);
@@ -204,7 +210,7 @@ bool PedestrianStatesManager::TryToShoot()
             pedBody->mReferencePed->ReceiveDamage(mPedestrian->mCurrentWeapon, mPedestrian);
         }
     }
-    else // create projectile
+    else if (weaponParams.mFireTypeID == eWeaponFireType_Projectile)
     {
         glm::vec2 signVector = mPedestrian->mPhysicsBody->GetSignVector();       
         glm::vec2 offset = (signVector * 1.0f); //todo: magic numbers
@@ -213,20 +219,17 @@ bool PedestrianStatesManager::TryToShoot()
             currPosition.y, 
             currPosition.z + offset.y
         };
-        eProjectileType projectileTypeID = eProjectileType_Bullet; // todo: add weapon desc with projectile type
-        switch (mPedestrian->mCurrentWeapon)
-        {
-            case eWeaponType_Flamethrower: projectileTypeID = eProjectileType_Flame;
-            break;
-            case eWeaponType_RocketLauncher: projectileTypeID = eProjectileType_Rocket;
-            break;
-        }
-        gGameObjectsManager.CreateProjectile(projectilePos, mPedestrian->mPhysicsBody->GetRotationAngle(), projectileTypeID);
-    }    
+        debug_assert(weaponParams.mProjectileID < eProjectileType_COUNT);
+        gGameObjectsManager.CreateProjectile(projectilePos, mPedestrian->mPhysicsBody->GetRotationAngle(), weaponParams.mProjectileID);
+    }
+    else
+    {
+        debug_assert(false);
+    }
 
     // setup cooldown time for weapons
-    float rechargeTime = gGameParams.mWeaponsRechargeTime[mPedestrian->mCurrentWeapon];
-    mPedestrian->mWeaponRechargeTime = currGameTime + rechargeTime;
+    float rechargeTime = (1.0f / weaponParams.mBaseFireRate);
+    mPedestrian->mWeaponRechargeTime = (currGameTime + rechargeTime);
     return true;
 }
 

src/PhysicsComponents.cpp

@@ -294,7 +294,7 @@ void PedPhysicsBody::HandleWaterContact()
     mReferencePed->mStatesManager.ProcessEvent(evData);
 }
 
-bool PedPhysicsBody::ShouldCollideWith(unsigned int bits) const
+bool PedPhysicsBody::ShouldContactWith(unsigned int bits) const
 {
     if (mReferencePed->IsDead())
     {
@@ -401,6 +401,11 @@ void CarPhysicsBody::SimulationStep()
     UpdateSteer();
 }
 
+bool CarPhysicsBody::ShouldContactWith(unsigned int objCatBits) const
+{
+    return true; // todo
+}
+
 void CarPhysicsBody::GetChassisCorners(glm::vec2 corners[4]) const
 {
     const b2PolygonShape* shape = (const b2PolygonShape*) mChassisFixture->GetShape();
@@ -727,3 +732,8 @@ void ProjectilePhysicsBody::SimulationStep()
         mReferenceProjectile->MarkForDeletion();
     }
 }
+
+bool ProjectilePhysicsBody::ShouldContactWith(unsigned int objCatBits) const
+{
+    return true; // todo
+}