-

Author: codenamecpp

gamedata/entities/common.json

@@ -0,0 +1,75 @@
+[
+    {
+        "weapon_type": "fists",
+        "fire_type": "melee",
+        // base params
+        "base_hit_range": 0.2,
+        "base_fire_rate": 2.0
+    },
+
+    {
+        "weapon_type": "pistol",
+        "fire_type": "projectile",
+        // projectile data
+        "projectile_type": "bullet",
+        "projectile_size": 0.025,
+        "projectile_speed": 8.0,
+        "projectile_object": 74,
+        "projectile_hit_effect": 13, // spark
+        // base params
+        "base_hit_range": 4.5,
+        "base_fire_rate": 2.0,
+        "base_ammo_limit": 999,
+
+        "hud_sprite": 30
+    },
+
+    {
+        "weapon_type": "machinegun",
+        "fire_type": "projectile",
+        // projectile data
+        "projectile_type": "bullet",
+        "projectile_size": 0.025,
+        "projectile_speed": 8.0,
+        "projectile_object": 74,
+        "projectile_hit_effect": 13, // spark
+        // base params
+        "base_hit_range": 4.5,
+        "base_fire_rate": 8.0,
+        "base_ammo_limit": 999,
+
+        "hud_sprite": 31
+    },
+
+    {
+        "weapon_type": "flamethrower",
+        "fire_type": "projectile",
+        // projectile data
+        "projectile_type": "flame",
+        "projectile_size": 0.075,
+        "projectile_speed": 3.1,
+        "projectile_object": 75,
+        // base params
+        "base_hit_range": 1.1,
+        "base_fire_rate": 15.0,
+        "base_ammo_limit": 999,
+
+        "hud_sprite": 33
+    },
+
+    {
+        "weapon_type": "rocket_launcher",
+        "fire_type": "projectile",
+        // projectile data
+        "projectile_type": "missile",
+        "projectile_size": 0.03,
+        "projectile_speed": 4.4,
+        "projectile_object": 31,
+        // base params
+        "base_hit_range": 20.0,
+        "base_fire_rate": 1.0,
+        "base_ammo_limit": 999,
+
+        "hud_sprite": 32
+    }
+]

gamedata/entities/weapons.json

@@ -248,6 +248,7 @@
     <ClInclude Include="PixelsArray.h" />
     <ClInclude Include="TrimeshBuffer.h" />
     <ClInclude Include="Vehicle.h" />
+    <ClInclude Include="WeaponInfo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AiCharacterController.cpp" />
@@ -322,6 +323,7 @@
     <ClCompile Include="PixelsArray.cpp" />
     <ClCompile Include="TrimeshBuffer.cpp" />
     <ClCompile Include="Vehicle.cpp" />
+    <ClCompile Include="WeaponInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Box2D\Box2D.vcxproj">
@@ -334,7 +336,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\entities\weapons.json" />
     <None Include="..\gamedata\entities\gta_objects.json" />
     <None Include="..\gamedata\entities\ped_animations.json" />
     <None Include="..\gamedata\shaders\city_mesh.glsl" />

src/Carnage3D.vcxproj

@@ -350,6 +350,9 @@
     <ClInclude Include="Explosion.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
+    <ClInclude Include="WeaponInfo.h">
+      <Filter>Game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -549,6 +552,9 @@
     <ClCompile Include="Explosion.cpp">
       <Filter>Game\GameObjects</Filter>
     </ClCompile>
+    <ClCompile Include="WeaponInfo.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">
@@ -572,15 +578,15 @@
     <None Include="..\gamedata\config\inputs.json.default">
       <Filter>Data\config</Filter>
     </None>
-    <None Include="..\gamedata\entities\common.json">
-      <Filter>Data\entities</Filter>
-    </None>
     <None Include="..\gamedata\entities\ped_animations.json">
       <Filter>Data\entities</Filter>
     </None>
     <None Include="..\gamedata\entities\gta_objects.json">
       <Filter>Data\entities</Filter>
     </None>
+    <None Include="..\gamedata\entities\weapons.json">
+      <Filter>Data\entities</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\docs\CorrectionsToCDS.txt">

src/Carnage3D.vcxproj.filters

@@ -26,6 +26,11 @@ void Decoration::UpdateFrame()
         gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetCurrentFrame(), 0, mDrawSprite);
         mDrawSprite.SetOriginToCenter();
     }
+
+    if (mLifeDuration > 0 && !mAnimationState.IsAnimationActive())
+    {
+        MarkForDeletion();
+    }
 }
 
 void Decoration::DrawDebug(DebugRenderer& debugRender)
@@ -49,4 +54,5 @@ void Decoration::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotatio
 void Decoration::SetLifeDuration(int numAnimationCycles)
 {
     mLifeDuration = numAnimationCycles;
+    mAnimationState.SetMaxRepeatCycles(numAnimationCycles);
 }

src/Decoration.cpp

@@ -677,33 +677,18 @@ enum ePedestrianAnimID
 
 decl_enum_strings(ePedestrianAnimID);
 
-// various sprites animations
-enum eSpriteAnimID
-{
-    // cops
-
-    // projectiles
-    eSpriteAnimID_Projectile_Missile,
-    eSpriteAnimID_Projectile_Bullet,
-    eSpriteAnimID_Projectile_Flame,
-
-    eSpriteAnimID_COUNT
-};
-
-decl_enum_strings(eSpriteAnimID);
-
 // pedestrian weapon
-enum eWeaponType
+enum eWeaponID
 {
-    eWeaponType_Fists,
-    eWeaponType_Pistol,
-    eWeaponType_Machinegun,
-    eWeaponType_Flamethrower,
-    eWeaponType_RocketLauncher,
-    eWeaponType_COUNT
+    eWeapon_Fists,
+    eWeapon_Pistol,
+    eWeapon_Machinegun,
+    eWeapon_Flamethrower,
+    eWeapon_RocketLauncher,
+    eWeapon_COUNT
 };
 
-decl_enum_strings(eWeaponType);
+decl_enum_strings(eWeaponID);
 
 // weapon fire type
 enum eWeaponFireType
@@ -819,34 +804,4 @@ struct PedestrianCtlState
     }
 public:
     bool mCtlActions[ePedestrianAction_COUNT]; // control actions
-};
-
-// projectile type data
-struct ProjectileStyle
-{
-    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
-{
-    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/GameDefs.h

@@ -43,6 +43,11 @@ decl_enum_as_flags(eGameObjectFlags);
 enum
 {
     GameObjectType_Null = 0,
+    // todo...
+    GameObjectType_MissileProjectile = 31,
+    GameObjectType_BulletProjectile = 74,
+    GameObjectType_FireballProjectile = 75,
+
     // todo...
     GameObjectType_MAX = 102
 };

src/GameObjectDefs.h

@@ -101,33 +101,19 @@ Vehicle* GameObjectsManager::CreateCar(const glm::vec3& position, cxx::angle_t h
     return vehicle;
 }
 
-Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading, eProjectileType typeID)
+Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading)
 {
-    Projectile* projectile = nullptr;
-    debug_assert(typeID < eProjectileType_COUNT);
-    for (ProjectileStyle& currStyle: gGameMap.mStyleData.mProjectiles)
-    {
-        if (currStyle.mTypeID == typeID)
-        {
-            projectile = CreateProjectile(position, heading, &currStyle);
-            break;
-        }
-    }
-    debug_assert(projectile);
-    return projectile;
+    return CreateProjectile(position, heading, nullptr);
 }
 
-Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading, ProjectileStyle* desc)
+Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading, WeaponInfo* weaponInfo)
 {
-    debug_assert(gGameMap.mStyleData.IsLoaded());
-    debug_assert(desc);
-
-    Projectile* instance = mProjectilesPool.create(desc);
+    Projectile* instance = mProjectilesPool.create();
     debug_assert(instance);
 
     mAllObjectsList.push_back(instance);
     // init
-    instance->Spawn(position, heading);
+    instance->Spawn(position, heading, weaponInfo);
     return instance;
 }
 

src/GameObjectsManager.cpp

@@ -38,8 +38,8 @@ class GameObjectsManager final: public cxx::noncopyable
     Vehicle* CreateCar(const glm::vec3& position, cxx::angle_t heading, eCarModel carModel);
 
     // Add new projectile instance to map at specific location
-    Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading, eProjectileType typeID);
-    Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading, ProjectileStyle* desc);
+    Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading);
+    Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading, WeaponInfo* weaponInfo);
 
     // Add new decoration instance to map at specific location
     Decoration* CreateDecoration(const glm::vec3& position, cxx::angle_t heading, GameObjectStyle* desc);

src/GameObjectsManager.h

@@ -22,9 +22,9 @@ void HUD::DrawFrame(UiContext& uiContext)
         return;
 
     // temporary
-    if (mCharacter->mCurrentWeapon != eWeaponType_Fists)
+    if (mCharacter->mCurrentWeapon != eWeapon_Fists)
     {
-        WeaponStyle& weapon = gGameMap.mStyleData.mWeapons[mCharacter->mCurrentWeapon];
+        WeaponInfo& weapon = gGameMap.mStyleData.mWeapons[mCharacter->mCurrentWeapon];
         int spriteIndex = gGameMap.mStyleData.GetSpriteIndex(eSpriteType_Arrow, weapon.mSpriteIndex);
 
         Sprite2D sprite;