salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing navigation

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-09 12:51:11 +03:00
1 parent dcdeae75bc
commit 77c8471636
29 files changed
+15148 -139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Character.cpp
+2 -1
View File
@@ -433,7 +433,7 @@ void Character::update(int64_t deltaMs) {
}
else
{
if (prevFrame < 50 && static_cast<int>(anim.currentFrame) >= 50 && (currentState == AnimationState::ACTION_ATTACK || currentState == AnimationState::ACTION_ATTACK_2))
if (prevFrame < 19 && static_cast<int>(anim.currentFrame) >= 19 && (currentState == AnimationState::ACTION_ATTACK || currentState == AnimationState::ACTION_ATTACK_2))
{
if (attackTarget != nullptr)
{
@@ -1220,6 +1220,7 @@ void Character::setupHitSparks(std::shared_ptr<Texture> sparkTexture)
void Character::applyDamage(float damageAmount, const Eigen::Vector3f& attackDirection)
{
std::cout << "Character::applyDamage" << std::endl;
hp = hp - damageAmount;
if (hp < 0) hp = 0;
src/Game.cpp
+32 -18
View File
@@ -203,36 +203,49 @@ namespace ZL
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_004.json";
/*
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior3_locked.txt", //0
"resources/navigation/uni_interior3_hall.txt",
"resources/navigation/uni_interior3_lr_hall.txt",
"resources/navigation/uni_interior3_lr_tr_hall.txt",
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.txt",
"resources/navigation/uni_interior4_unlocked_n2_new.txt", //0
"resources/navigation/uni_interior3_n2_hall.txt",
"resources/navigation/uni_interior4_n2_lr_hall.txt",
"resources/navigation/uni_interior4_n2_lr_tr_hall.txt",
"resources/navigation/uni_interior3_n2_lr_tr_hall_aiperi.txt",
"resources/navigation/uni_interior3_darklands_all_open.txt",
"resources/navigation/uni_interior3_unlocked_hall.txt",
"resources/navigation/uni_interior3_unlocked_n3.txt",
"resources/navigation/uni_interior3_unlocked_s1.txt",
"resources/navigation/uni_interior3_unlocked_s2.txt",
"resources/navigation/uni_interior3_unlocked_s3.txt",
"resources/navigation/uni_interior3_unlocked_n2.txt"
};
/*
"resources/navigation/uni_interior3_unlocked_n2.txt",
"resources/navigation/uni_interior4_unlocked_s3_hall.txt",
"resources/navigation/uni_interior4_unlocked_s3_n3.txt",
"resources/navigation/uni_interior4_unlocked_s3_n2.txt",
"resources/navigation/uni_interior4_unlocked_s3_s2.txt",
"resources/navigation/uni_interior4_unlocked_s3_s1.txt",
"resources/navigation/uni_interior4_locked.txt" //17
};*/
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior3_locked.json", //0
"resources/navigation/uni_interior3_hall.json",
"resources/navigation/uni_interior3_lr_hall.json",
"resources/navigation/uni_interior3_lr_tr_hall.json",
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.json",
"resources/navigation/uni_interior3_darklands_all_open.json",
"resources/navigation/uni_interior3_unlocked_hall.json",
"resources/navigation/uni_interior4_unlocked_n2_new.json", //0
"resources/navigation/uni_interior3_n2_hall.json",
"resources/navigation/uni_interior4_n2_lr_hall.json",
"resources/navigation/uni_interior4_n2_lr_tr_hall.json",
"resources/navigation/uni_interior3_n2_lr_tr_hall_aiperi.json",
"resources/navigation/uni_interior3_darklands_all_open.json", //5
"resources/navigation/uni_interior3_unlocked_hall.json",
"resources/navigation/uni_interior3_unlocked_n3.json",
"resources/navigation/uni_interior3_unlocked_s1.json",
"resources/navigation/uni_interior3_unlocked_s2.json",
"resources/navigation/uni_interior3_unlocked_s3.json",
"resources/navigation/uni_interior3_unlocked_n2.json"
};*/
"resources/navigation/uni_interior3_unlocked_n2.json", //11
"resources/navigation/uni_interior4_unlocked_s3_hall.json",
"resources/navigation/uni_interior4_unlocked_s3_n3.json",
"resources/navigation/uni_interior4_unlocked_s3_n2.json",
"resources/navigation/uni_interior4_unlocked_s3_s2.json",
"resources/navigation/uni_interior4_unlocked_s3_s1.json",
"resources/navigation/uni_interior4_locked.json" //17
};
/*
uniInteriorParams.navigationJsonPaths = {
@@ -805,6 +818,7 @@ namespace ZL
}
break;
case SDLK_0:
if (editorMode == EditorMode::InteractiveObjects && currentLocation) {
currentLocation->editor.selectInteractiveObject(event.key.keysym.sym - SDLK_0);
}
src/dialogue/DialogueOverlay.cpp
+1 -4
View File
@@ -20,10 +20,7 @@ bool DialogueOverlay::init(Renderer& renderer, const std::string& zipFile) {
textboxTexture = renderer.textureManager.LoadFromPng("resources/dialogue/textbox_bg.png", zipFile);
textboxChoiceTexture = renderer.textureManager.LoadFromPng("resources/dialogue/DialogChoice001.png", zipFile);
/*choiceMainTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_main.png", zipFile);
choiceOptionalTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_optional.png", zipFile);
choiceSelectedTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_selected.png", zipFile);
*/
choiceMainTexture = renderer.textureManager.LoadFromPng("resources/dialogue/ChoiceNormal001.png", zipFile);
choiceOptionalTexture = renderer.textureManager.LoadFromPng("resources/dialogue/ChoiceNormal001.png", zipFile);
choiceSelectedTexture = renderer.textureManager.LoadFromPng("resources/dialogue/ChoiceSelected001.png", zipFile);