Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add polish police Fiat 125p based on CUP Lada (by Renchon) #82

Merged
merged 12 commits into from
Mar 21, 2024
25 changes: 25 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,28 @@ path = "addons/main/script_version.hpp"
exclude = [
".inc.sqf"
]

[hemtt.launch]
workshop = [
"450814997", # CBA_A3
"2369477168", # ADT
]
parameters = [
"-name=dev_sk",
"-window",
]

[hemtt.launch.cup]
workshop = [
"450814997", # CBA_A3
"2369477168", # ADT
"583496184", # CUP Terrains - Core
"583544987", # CUP Terrains - Maps
"497660133", # CUP Weapons
"497661914", # CUP Units
"541888371", # CUP Vehicles
]
parameters = [
"-name=dev_sk",
"-window",
]
1 change: 1 addition & 0 deletions addons/cup_vehicles/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\afsk\addons\cup_vehicles
15 changes: 15 additions & 0 deletions addons/cup_vehicles/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};
class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
};
};
class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
};
};
114 changes: 114 additions & 0 deletions addons/cup_vehicles/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
class CfgVehicles
{
class Car_F;
class CUP_Lada_Base: Car_F
{
class AnimationSources;
class Sounds;
class TextureSources
{
class PolishPolice
{
DisplayName = "Polish Police";
author = "Renchon";
textures[] = {
QPATHTOF(assets\textures\pol57xD.paa),
QPATHTOF(assets\textures\lada_glass_ca5.paa)
};
factions[] = { "BLU_GEN_F" };
};
};

textureList[] += { "PolishPolice", 0 };
};

class CUP_LADA_LM_Base : CUP_Lada_Base
{
class AnimationSources: AnimationSources
{
class hideMilitiaLogo;
};

class Sounds : Sounds
{
class PoliceSiren_01_Ext;
class PoliceSiren_01_Int;
};
};

class CUP_LADA_LM_CIV: CUP_LADA_LM_Base {};
class GVAR(LADA_LM): CUP_LADA_LM_CIV
{
faction = "BLU_GEN_F"; // TODO some own faction

acceleration = 15; // 15 original
enginePower = 82.700001; // 56.700001 original
peakTorque = 142; // 106 original
idleRPM = 700; // 600 original
maxSpeed = 213; // 156 original

class complexGearbox
{
// Sport hatchback:
// GearboxRatios[] = {"R1",-3.8,"N",0,"D1",3.6,"D2",2.15,"D3",1.55,"D4",1.15,"D5",0.9,"D6",0.67};
// Original: GearboxRatios[] = {"R1",-3.87,"N",0,"D1",3.85,"D2",2.3,"D3",1.49,"D4",1};
GearboxRatios[] = {
"R1", -3.87,
"N", 0,
"D1", 3.85,
"D2", 3.1,
"D3", 2.49,
"D4", 1.5,
"D5", 1,
"D6", 0.71
};

TransmissionRatios[] = { "High", 3.994 };

driveString = "D";
neutralString = "N";
reverseString = "R";
moveOffGear = 1;
gearBoxMode = "auto";
};
};

class GVAR(LADA_PolishPolice) : GVAR(LADA_LM)
{
animationList[] = {
"hideRail", 1,
"hideLightBar", 0,
"hideMilitiaLogo", 1
};

displayName = CSTRING(Fiat125p_PolishPolice);
displayNameShort = "Fiat 125p";

hiddenSelectionsTextures[] = {
QPATHTOF(assets\textures\pol57xD.paa),
QPATHTOF(assets\textures\lada_glass_ca5.paa)
};

textureList[] = { "PolishPolice", 1 };

class AnimationSources: AnimationSources
{
class hideMilitiaLogo: hideMilitiaLogo
{
initPhase = 1;
};
};

class Sounds : Sounds
{
class PoliceSiren_01_Ext : PoliceSiren_01_Ext
{
sound[] = { QPATHTOF(assets\sounds\syrena.ogg), "db-8", 1 };
};
class PoliceSiren_01_Int : PoliceSiren_01_Int
{
sound[] = { QPATHTOF(assets\sounds\syrena.ogg), "db-16", 1 };
};
};
};
};
Empty file.
1 change: 1 addition & 0 deletions addons/cup_vehicles/XEH_postInit.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "script_component.hpp"
5 changes: 5 additions & 0 deletions addons/cup_vehicles/XEH_preInit.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "script_component.hpp"
ADDON = false;
#include "XEH_PREP.hpp"

ADDON = true;
2 changes: 2 additions & 0 deletions addons/cup_vehicles/XEH_preStart.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "script_component.hpp"
#include "XEH_PREP.hpp"
Binary file added addons/cup_vehicles/assets/sounds/syrena.ogg
Binary file not shown.
Binary file not shown.
Binary file added addons/cup_vehicles/assets/textures/pol57xD.paa
Binary file not shown.
20 changes: 20 additions & 0 deletions addons/cup_vehicles/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"afsk_common",
"CUP_Vehicles_LoadOrder"
};
skipWhenMissingDependencies = 1;
author = "ArmaForces";
VERSION_CONFIG;
};
};

#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
1 change: 1 addition & 0 deletions addons/cup_vehicles/functions/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "\z\afsk\addons\cup_vehicles\script_component.hpp"
14 changes: 14 additions & 0 deletions addons/cup_vehicles/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#define COMPONENT cup_vehicles
#include "\z\afsk\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE

#ifdef DEBUG_ENABLED_CUP_VEHICLES
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_CUP_VEHICLES
#define DEBUG_SETTINGS DEBUG_SETTINGS_CUP_VEHICLES
#endif

#include "\z\afsk\addons\main\script_macros.hpp"
13 changes: 13 additions & 0 deletions addons/cup_vehicles/stringtable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="AFSK">
<Package name="CUP_Vehicles">
<Key ID="STR_AFSK_CUP_Vehicles_DisplayName">
<English>SerialKillers - CUP Vehicles</English>
<Polish>SerialKillers - CUP Pojazdy</Polish>
</Key>
<Key ID="STR_AFSK_CUP_Vehicles_Fiat125p_PolishPolice">
<English>Fiat 125p (Polish Police)</English>
<Polish>Fiat 125p (Policja)</Polish>
</Key>
</Package>
</Project>
4 changes: 2 additions & 2 deletions addons/equipment/CfgSerialKillers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,8 @@ class CfgSerialKillers
class Vehicles
{
/* Vehicles */
class CUP_LADA_LM_CIV {};
class CUP_C_Volha_Limo_TKCIV {};
class EGVAR(cup_vehicles,LADA_LM) {};
class EGVAR(cup_vehicles,LADA_PolishPolice) {};
class EGVAR(vehicles,Hatchback_cop)
{
requiredScore = 5;
Expand Down
2 changes: 1 addition & 1 deletion addons/vehicles/XEH_preInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ADDON = false;
#include "XEH_PREP.hpp"

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

// We need some improvements in determining civilian vehicles limit
GVAR(emptyVehiclesLimit) = 500;
Expand Down