Added more dialogs, some minor tweaks
This commit is contained in:
Vladislav Khorev
parent
e4bcf62afa
commit
61d806a7a1
@ -9,7 +9,7 @@
|
||||
"type": "Line",
|
||||
"speaker": "Милиция",
|
||||
"portrait": "resources/ghost_avatar.png",
|
||||
"text": "Автомобиль 256 остановитесь немедленно!",
|
||||
"text": "Белый седан 256 остановитесь немедленно!",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
@ -551,14 +551,108 @@
|
||||
"text": "Старший лейтенант Каримов, отдел милиции Чуйской области.",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Я задержан?",
|
||||
"next": "end_1"
|
||||
"text": "Предъявите ваши права.",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Вот, пожалуйста.",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Алексей Смирнов, да?",
|
||||
"next": "line_5"
|
||||
},
|
||||
{
|
||||
"id": "line_5",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Когда в последний раз проходили техосмотр?",
|
||||
"next": "line_6"
|
||||
},
|
||||
{
|
||||
"id": "line_6",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "В прошлом году.",
|
||||
"next": "line_7"
|
||||
},
|
||||
{
|
||||
"id": "line_7",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Страховка у вас есть?",
|
||||
"next": "line_8"
|
||||
},
|
||||
{
|
||||
"id": "line_8",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Да, вот, до ноября.",
|
||||
"next": "line_9"
|
||||
},
|
||||
{
|
||||
"id": "line_9",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "А огнетушитель в машине есть?",
|
||||
"next": "line_10"
|
||||
},
|
||||
{
|
||||
"id": "line_10",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Да он просто тянет время!*",
|
||||
"next": "line_11"
|
||||
},
|
||||
{
|
||||
"id": "line_11",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Давайте напрямую, я задержан или нет?",
|
||||
"next": "line_12"
|
||||
},
|
||||
{
|
||||
"id": "line_12",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Нет...",
|
||||
"next": "line_13"
|
||||
},{
|
||||
"id": "line_13",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Если не отпустите меня сейчас, я позвоню в прокуратуру.",
|
||||
"next": "line_14"
|
||||
},{
|
||||
"id": "line_14",
|
||||
"type": "Line",
|
||||
"speaker": "Hero",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": ".. Счастливого пути!",
|
||||
"next": "end_1"
|
||||
}
|
||||
{
|
||||
"id": "end_1",
|
||||
"type": "End"
|
||||
@ -646,7 +740,55 @@
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Быстро прыгай в окно, я открою.",
|
||||
"text": "Алтынай ты тут?",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Да, я тут!",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Где твоя машина припаркована?",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Прямо тут, недалеко.",
|
||||
"next": "line_5"
|
||||
},
|
||||
{
|
||||
"id": "line_5",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Давай отведи меня в машину, только тихо!",
|
||||
"next": "line_6"
|
||||
},
|
||||
{
|
||||
"id": "line_6",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Постарайся не попадаться на глаза бандитам!",
|
||||
"next": "line_7"
|
||||
},
|
||||
{
|
||||
"id": "line_7",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Я прыгаю!",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
@ -664,7 +806,87 @@
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Мне лучше поехать туда на авто.",
|
||||
"text": "*Моя подруга Алтынай пропала сегодня.*",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*А потом я получил голосовое сообщение от нее.*",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Если ты это слушаешь, то случилась беда.",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Ко мне сватался Нурланбай, местный бизнесмен и авторитет.",
|
||||
"next": "line_5"
|
||||
},
|
||||
{
|
||||
"id": "line_5",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Он мне обещал, что похитит меня, и сегодня он сделал это.",
|
||||
"next": "line_6"
|
||||
},
|
||||
{
|
||||
"id": "line_6",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Я отправила тебе координаты дома, куда могут меня спрятать.",
|
||||
"next": "line_7"
|
||||
},
|
||||
{
|
||||
"id": "line_7",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Не обращайся в милицию, у него есть связи в МВД Чуйской области.",
|
||||
"next": "line_8"
|
||||
},
|
||||
{
|
||||
"id": "line_8",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Приезжай на своей машине и помоги мне сбежать оттуда!",
|
||||
"next": "line_9"
|
||||
},
|
||||
{
|
||||
"id": "line_9",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Мне больше не к кому обращаться. Я жду тебя!",
|
||||
"next": "line_10"
|
||||
},
|
||||
{
|
||||
"id": "line_10",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Село где держат Алтынай, находится впереди по трассе.*",
|
||||
"next": "line_11"
|
||||
},
|
||||
{
|
||||
"id": "line_11",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Пора садится в машину и отправляться в путь!*",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
@ -682,7 +904,31 @@
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Да, похоже это как раз тот дом.",
|
||||
"text": "*Вот этот дом, с охраной!*",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Нужно держаться от этого бандита подальше!*",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Если этот бандит меня заметит, он меня убьет!*",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "*Может стоит прократься мимо него и осмотреть дом сзади?*",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
@ -700,7 +946,62 @@
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Финал 1",
|
||||
"text": "Что сидишь, поехали!",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Дави по газам быстрее пока они нас не заметили!",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Конечно, сейчас...",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Спасибо что помог мне!",
|
||||
"next": "line_5"
|
||||
},
|
||||
{
|
||||
"id": "line_5",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Этот Нурланбай сумасшедший!",
|
||||
"next": "line_6"
|
||||
},
|
||||
{
|
||||
"id": "line_6",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Он владелец сети заправок, а еще свою банду собрал.",
|
||||
"next": "line_7"
|
||||
},{
|
||||
"id": "line_7",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "У него друг начальник милиции Чуйской области.",
|
||||
"next": "line_8"
|
||||
},
|
||||
{
|
||||
"id": "line_8",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Но я не выйду за него, пусть он сдохнет!",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
@ -718,7 +1019,39 @@
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Финал 2",
|
||||
"text": "А куда мы поедем?",
|
||||
"next": "line_2"
|
||||
},
|
||||
{
|
||||
"id": "line_2",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Давай в Талас.",
|
||||
"next": "line_3"
|
||||
},
|
||||
{
|
||||
"id": "line_3",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Там у меня есть дядя в администрации области.",
|
||||
"next": "line_4"
|
||||
},
|
||||
{
|
||||
"id": "line_4",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Я у него спрячусь, и никакой Нурланбай нас там не достанет.",
|
||||
"next": "line_5"
|
||||
},
|
||||
{
|
||||
"id": "line_5",
|
||||
"type": "Line",
|
||||
"speaker": "Игрок",
|
||||
"portrait": "resources/hero.png",
|
||||
"text": "Надо только доехать хотя бы до границы области.",
|
||||
"next": "end_1"
|
||||
},
|
||||
{
|
||||
|
||||
BIN
resources/e/menu/about.png
(Stored with Git LFS)
BIN
resources/e/menu/about.png
(Stored with Git LFS)
Binary file not shown.
BIN
resources/loading.png
(Stored with Git LFS)
BIN
resources/loading.png
(Stored with Git LFS)
Binary file not shown.
@ -15,7 +15,7 @@ namespace ZL {
|
||||
using std::max;
|
||||
#endif
|
||||
|
||||
constexpr float DEFAULT_ZOOM = 4.f;
|
||||
constexpr float DEFAULT_ZOOM = 5.f;
|
||||
|
||||
class Environment {
|
||||
public:
|
||||
|
||||
@ -127,7 +127,7 @@ namespace ZL
|
||||
|
||||
#ifdef EMSCRIPTEN
|
||||
renderer.shaderManager.AddShaderFromFiles("env_sky", "resources/shaders/env_sky.vertex", "resources/shaders/env_sky_web.fragment", CONST_ZIP_FILE);
|
||||
renderer.shaderManager.AddShaderFromFiles("defaultAtmosphere", "resources/shaders/defaultAtmosphere.vertex", "resources/shaders/defaultAtmosphere_web.fragment", CONST_ZIP_FILE);
|
||||
renderer.shcuaderManager.AddShaderFromFiles("defaultAtmosphere", "resources/shaders/defaultAtmosphere.vertex", "resources/shaders/defaultAtmosphere_web.fragment", CONST_ZIP_FILE);
|
||||
renderer.shaderManager.AddShaderFromFiles("planetBake", "resources/shaders/planet_bake.vertex", "resources/shaders/planet_bake_web.fragment", CONST_ZIP_FILE);
|
||||
renderer.shaderManager.AddShaderFromFiles("planetStone", "resources/shaders/planet_stone.vertex", "resources/shaders/planet_stone_web.fragment", CONST_ZIP_FILE);
|
||||
renderer.shaderManager.AddShaderFromFiles("planetLand", "resources/shaders/planet_land.vertex", "resources/shaders/planet_land_web.fragment", CONST_ZIP_FILE);
|
||||
@ -578,13 +578,13 @@ namespace ZL
|
||||
break;*/
|
||||
case SDLK_c:
|
||||
{
|
||||
if (menuManager.getState() == GameState::Gameplay) {
|
||||
/*if (menuManager.getState() == GameState::Gameplay) {
|
||||
std::cout << "[GAME] Location change triggered by key press" << std::endl;
|
||||
static size_t locIndex = 0;
|
||||
static std::vector<std::string> locations = {"forest", "barn", "default"};
|
||||
locIndex = (locIndex + 1) % locations.size();
|
||||
changeLocation(locations[locIndex]);
|
||||
}
|
||||
}*/
|
||||
break;
|
||||
}
|
||||
case SDLK_f:
|
||||
|
||||
@ -78,6 +78,7 @@ void Location::setup()
|
||||
player->isPlayer = true;
|
||||
player->modelCorrectionRotation = Eigen::Quaternionf(Eigen::AngleAxisf(M_PI, Eigen::Vector3f::UnitY()));
|
||||
|
||||
|
||||
//player->position = { 9.43527, 0, 0.952688 };
|
||||
//player->setTarget(player->position);
|
||||
|
||||
@ -320,11 +321,11 @@ void Location::setup()
|
||||
bandit->position = Vector3f{ 12.1782, 0, 62.4014 };
|
||||
bandit->setTarget(bandit->position);
|
||||
|
||||
carPosition = { -6.61929, 0, -30.7197 };
|
||||
carPosition = { -6.61929, 0, -30.7197-300 };
|
||||
carRotation = M_PI;
|
||||
npcCar.position = Vector3f{ 7.1782, 0, 68.4014 };
|
||||
|
||||
player->position = { -6.61929, 0, -40 };
|
||||
player->position = { -6.61929, 0, -40-300 };
|
||||
player->setTarget(player->position);
|
||||
cameraAzimuth = M_PI;
|
||||
|
||||
@ -386,11 +387,13 @@ void Location::setup()
|
||||
|
||||
carTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/e/car002.png", CONST_ZIP_FILE));
|
||||
carMesh.data = LoadFromTextFile02("resources/e/car001.txt", CONST_ZIP_FILE);
|
||||
carMesh.data.Scale(0.8f);
|
||||
carMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI * 0.5, Eigen::Vector3f::UnitY())).toRotationMatrix());
|
||||
carMesh.RefreshVBO();
|
||||
|
||||
carWheelTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/e/Wheel_base002.png", CONST_ZIP_FILE));
|
||||
carWheelMesh.data = LoadFromTextFile02("resources/e/car_wheel001.txt", CONST_ZIP_FILE);
|
||||
carWheelMesh.data.Scale(0.8f);
|
||||
carWheelMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI * 0.5, Eigen::Vector3f::UnitY())).toRotationMatrix());
|
||||
carWheelMesh.RefreshVBO();
|
||||
|
||||
@ -698,14 +701,14 @@ void Location::setup()
|
||||
renderer.DrawVertexRenderStruct(carMesh);
|
||||
|
||||
if (carWheelTexture) {
|
||||
constexpr float track_width = 1.28f;
|
||||
constexpr float wheel_base = 2.25f;
|
||||
constexpr float shift = 0.6f;
|
||||
constexpr float track_width = 1.28f * 0.8f;
|
||||
constexpr float wheel_base = 2.25f * 0.8f;
|
||||
constexpr float shift = 0.6f * 0.8f;
|
||||
const Eigen::Vector3f wheelPositions[4] = {
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21, -(wheel_base + shift)+1.25), // front right
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21, -(wheel_base + shift)+1.25), // front left
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21, (wheel_base - shift)+1.1), // rear right
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21, (wheel_base - shift)+1.1) // rear left
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21, -(wheel_base + shift)+1.25*0.8), // front right
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21, -(wheel_base + shift)+1.25*0.8), // front left
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21, (wheel_base - shift)+1.1*0.8), // rear right
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21, (wheel_base - shift)+1.1*0.8) // rear left
|
||||
};
|
||||
const bool isFront[4] = { true, true, false, false };
|
||||
|
||||
@ -1398,17 +1401,17 @@ void Location::setup()
|
||||
if (player) {
|
||||
distanceRemaining += player->position.z() - playerPosBefore.z();
|
||||
}
|
||||
if (!dialoguePlayedDistance7000 && distanceRemaining < 7000.f / 5.f && !dialogueSystem.isActive()) {
|
||||
if (!dialoguePlayedDistance7000 && distanceRemaining < 7000.f / 2.5f && !dialogueSystem.isActive()) {
|
||||
if (dialogueSystem.startDialogue("driving_dialogue_distance7000")) {
|
||||
dialoguePlayedDistance7000 = true;
|
||||
}
|
||||
}
|
||||
if (!dialoguePlayedDistance5000 && distanceRemaining < 5000.f / 5.f && !dialogueSystem.isActive()) {
|
||||
if (!dialoguePlayedDistance5000 && distanceRemaining < 5000.f / 2.5f && !dialogueSystem.isActive()) {
|
||||
if (dialogueSystem.startDialogue("driving_dialogue_distance5000")) {
|
||||
dialoguePlayedDistance5000 = true;
|
||||
}
|
||||
}
|
||||
if (!dialoguePlayedDistance2000 && distanceRemaining < 2000.f / 5.f && !dialogueSystem.isActive()) {
|
||||
if (!dialoguePlayedDistance2000 && distanceRemaining < 2000.f / 2.5f && !dialogueSystem.isActive()) {
|
||||
if (dialogueSystem.startDialogue("driving_dialogue_distance2000")) {
|
||||
dialoguePlayedDistance2000 = true;
|
||||
}
|
||||
@ -1550,7 +1553,7 @@ void Location::setup()
|
||||
if (locationId == "default")
|
||||
{
|
||||
if (player && !dialoguePlayedVillageIntro1 && !dialogueSystem.isActive()) {
|
||||
if (player->position.z() > -36.f) {
|
||||
if (player->position.z() > -36.f - 300) {
|
||||
if (dialogueSystem.startDialogue("dialogue_village_intro1")) {
|
||||
dialoguePlayedVillageIntro1 = true;
|
||||
}
|
||||
@ -1614,7 +1617,7 @@ void Location::setup()
|
||||
}
|
||||
}
|
||||
|
||||
if (player && !dialoguePlayedVillageFinal2 && !dialogueSystem.isActive()) {
|
||||
if (player && !dialoguePlayedVillageFinal2 && !dialogueSystem.isActive() && dialoguePlayedVillageFinal1) {
|
||||
if (std::abs(player->position.z()) > 250.f) {
|
||||
if (dialogueSystem.startDialogue("dialogue_village_final2", [this]() {
|
||||
if (onLocationChangeRequest) onLocationChangeRequest("forest");
|
||||
@ -1870,14 +1873,14 @@ void Location::setup()
|
||||
renderer.DrawVertexRenderStruct(carMesh);
|
||||
|
||||
if (carWheelTexture) {
|
||||
constexpr float track_width = 1.28f;
|
||||
constexpr float wheel_base = 2.25f;
|
||||
constexpr float shift = 0.6f;
|
||||
constexpr float track_width = 1.28f*0.8f;
|
||||
constexpr float wheel_base = 2.25f * 0.8f;
|
||||
constexpr float shift = 0.6f * 0.8f;
|
||||
const Eigen::Vector3f wheelPositions[4] = {
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21f, -(wheel_base + shift) + 1.25f),
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21f, -(wheel_base + shift) + 1.25f),
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21f, (wheel_base - shift) + 1.1f),
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21f, (wheel_base - shift) + 1.1f)
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21f, -(wheel_base + shift) + 1.25f * 0.8f),
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21f, -(wheel_base + shift) + 1.25f * 0.8f),
|
||||
Eigen::Vector3f( track_width, 0.f - 0.21f, (wheel_base - shift) + 1.1f * 0.8f),
|
||||
Eigen::Vector3f(-track_width, 0.f - 0.21f, (wheel_base - shift) + 1.1f * 0.8f)
|
||||
};
|
||||
const bool isFront[4] = { true, true, false, false };
|
||||
|
||||
|
||||
@ -121,7 +121,7 @@ namespace ZL
|
||||
bool carOutOfGas = false;
|
||||
bool dialoguePlayedDrivingGasOut = false;
|
||||
|
||||
float distanceRemaining = 2000.f;//10000.0f;
|
||||
float distanceRemaining = 4000.f;//10000.0f;
|
||||
bool dialoguePlayedDistance7000 = false;
|
||||
bool dialoguePlayedDistance5000 = false;
|
||||
bool dialoguePlayedDistance2000 = false;
|
||||
|
||||
@ -21,7 +21,7 @@ struct TriggerZone {
|
||||
|
||||
struct AutoSkipConfig {
|
||||
float baseDurationMs = 1200.0f;
|
||||
float msPerCharacter = 45.0f;
|
||||
float msPerCharacter = 25.0f;
|
||||
float minDurationMs = 1500.0f;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user