summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/maps/map1.tmx (renamed from res/map1.tmx)0
-rw-r--r--res/maps/map1_tiles.png (renamed from res/map1_tiles.png)bin22418 -> 22418 bytes
-rw-r--r--res/sfx/bump.wav (renamed from res/bump.wav)bin70868 -> 70868 bytes
-rw-r--r--res/sfx/pageflip.wav (renamed from res/pageflip.wav)bin29606 -> 29606 bytes
-rw-r--r--res/sfx/running_carpet.wav (renamed from res/running_carpet.wav)bin846350 -> 846350 bytes
-rw-r--r--res/sfx/running_grass.wav (renamed from res/running_grass.wav)bin845790 -> 845790 bytes
-rw-r--r--res/sfx/running_land.wav (renamed from res/running_land.wav)bin847046 -> 847046 bytes
-rw-r--r--res/sfx/running_land_light.wav (renamed from res/running_land_light.wav)bin846910 -> 846910 bytes
-rw-r--r--res/sfx/running_mechanical.wav (renamed from res/running_mechanical.wav)bin846350 -> 846350 bytes
-rw-r--r--res/sfx/running_paved.wav (renamed from res/running_paved.wav)bin847186 -> 847186 bytes
-rw-r--r--res/sfx/running_sand.wav (renamed from res/running_sand.wav)bin846770 -> 846770 bytes
-rw-r--r--res/sfx/running_unknown.wav (renamed from res/running_unknown.wav)bin846910 -> 846910 bytes
-rw-r--r--res/sfx/running_water.wav (renamed from res/running_water.wav)bin847606 -> 847606 bytes
-rw-r--r--res/sfx/running_weak_wood.wav (renamed from res/running_weak_wood.wav)bin846350 -> 846350 bytes
-rw-r--r--res/sfx/running_wood.wav (renamed from res/running_wood.wav)bin847746 -> 847746 bytes
-rw-r--r--res/sfx/speaking_boy.wav (renamed from res/speaking_boy.wav)bin8460 -> 8460 bytes
-rw-r--r--res/sfx/speaking_girl.wav (renamed from res/speaking_girl.wav)bin7672 -> 7672 bytes
-rw-r--r--res/sfx/speaking_man.wav (renamed from res/speaking_man.wav)bin9536 -> 9536 bytes
-rw-r--r--res/sfx/speaking_nonhuman.wav (renamed from res/speaking_nonhuman.wav)bin12316 -> 12316 bytes
-rw-r--r--res/sfx/speaking_woman.wav (renamed from res/speaking_woman.wav)bin8384 -> 8384 bytes
-rw-r--r--res/sprites/boney.png (renamed from res/boney.png)bin77904 -> 77904 bytes
-rw-r--r--res/sprites/boney_anim.txt (renamed from res/boney_anim.txt)4
-rw-r--r--res/sprites/boney_frames.txt (renamed from res/boney_frames.txt)0
-rw-r--r--res/sprites/duster.png (renamed from res/duster.png)bin97607 -> 97607 bytes
-rw-r--r--res/sprites/duster_anim.txt (renamed from res/duster_anim.txt)4
-rw-r--r--res/sprites/duster_frames.txt (renamed from res/duster_frames.txt)0
-rw-r--r--res/sprites/kuma_anim.txt (renamed from res/kuma_anim.txt)4
-rw-r--r--res/sprites/kumatora.png (renamed from res/kumatora.png)bin67143 -> 67143 bytes
-rw-r--r--res/sprites/kumatora_frames.txt (renamed from res/kumatora_frames.txt)0
-rw-r--r--res/sprites/lucas.png (renamed from res/lucas.png)bin90846 -> 90846 bytes
-rw-r--r--res/sprites/lucas_anim.txt (renamed from res/lucas_anim.txt)4
-rw-r--r--res/sprites/lucas_frames.txt (renamed from res/lucas_frames.txt)0
-rw-r--r--src/character_system.cpp2
-rw-r--r--src/main.cpp10
-rw-r--r--src/message_system.cpp12
-rw-r--r--src/step_type.h22
36 files changed, 31 insertions, 31 deletions
diff --git a/res/map1.tmx b/res/maps/map1.tmx index fe46192..fe46192 100644 --- a/res/map1.tmx +++ b/res/maps/map1.tmx
diff --git a/res/map1_tiles.png b/res/maps/map1_tiles.png index 1f6d7b9..1f6d7b9 100644 --- a/res/map1_tiles.png +++ b/res/maps/map1_tiles.png
Binary files differ
diff --git a/res/bump.wav b/res/sfx/bump.wav index 81386a3..81386a3 100644 --- a/res/bump.wav +++ b/res/sfx/bump.wav
Binary files differ
diff --git a/res/pageflip.wav b/res/sfx/pageflip.wav index f4b5e5e..f4b5e5e 100644 --- a/res/pageflip.wav +++ b/res/sfx/pageflip.wav
Binary files differ
diff --git a/res/running_carpet.wav b/res/sfx/running_carpet.wav index 29f0d77..29f0d77 100644 --- a/res/running_carpet.wav +++ b/res/sfx/running_carpet.wav
Binary files differ
diff --git a/res/running_grass.wav b/res/sfx/running_grass.wav index a618dcb..a618dcb 100644 --- a/res/running_grass.wav +++ b/res/sfx/running_grass.wav
Binary files differ
diff --git a/res/running_land.wav b/res/sfx/running_land.wav index a2e9ca5..a2e9ca5 100644 --- a/res/running_land.wav +++ b/res/sfx/running_land.wav
Binary files differ
diff --git a/res/running_land_light.wav b/res/sfx/running_land_light.wav index 3c768d7..3c768d7 100644 --- a/res/running_land_light.wav +++ b/res/sfx/running_land_light.wav
Binary files differ
diff --git a/res/running_mechanical.wav b/res/sfx/running_mechanical.wav index 5c5e5fc..5c5e5fc 100644 --- a/res/running_mechanical.wav +++ b/res/sfx/running_mechanical.wav
Binary files differ
diff --git a/res/running_paved.wav b/res/sfx/running_paved.wav index 1d04c09..1d04c09 100644 --- a/res/running_paved.wav +++ b/res/sfx/running_paved.wav
Binary files differ
diff --git a/res/running_sand.wav b/res/sfx/running_sand.wav index 70df4d1..70df4d1 100644 --- a/res/running_sand.wav +++ b/res/sfx/running_sand.wav
Binary files differ
diff --git a/res/running_unknown.wav b/res/sfx/running_unknown.wav index 8d757a4..8d757a4 100644 --- a/res/running_unknown.wav +++ b/res/sfx/running_unknown.wav
Binary files differ
diff --git a/res/running_water.wav b/res/sfx/running_water.wav index c1d9f54..c1d9f54 100644 --- a/res/running_water.wav +++ b/res/sfx/running_water.wav
Binary files differ
diff --git a/res/running_weak_wood.wav b/res/sfx/running_weak_wood.wav index eadd041..eadd041 100644 --- a/res/running_weak_wood.wav +++ b/res/sfx/running_weak_wood.wav
Binary files differ
diff --git a/res/running_wood.wav b/res/sfx/running_wood.wav index bd9d0db..bd9d0db 100644 --- a/res/running_wood.wav +++ b/res/sfx/running_wood.wav
Binary files differ
diff --git a/res/speaking_boy.wav b/res/sfx/speaking_boy.wav index 78c5a95..78c5a95 100644 --- a/res/speaking_boy.wav +++ b/res/sfx/speaking_boy.wav
Binary files differ
diff --git a/res/speaking_girl.wav b/res/sfx/speaking_girl.wav index 67365d3..67365d3 100644 --- a/res/speaking_girl.wav +++ b/res/sfx/speaking_girl.wav
Binary files differ
diff --git a/res/speaking_man.wav b/res/sfx/speaking_man.wav index 0a0f56d..0a0f56d 100644 --- a/res/speaking_man.wav +++ b/res/sfx/speaking_man.wav
Binary files differ
diff --git a/res/speaking_nonhuman.wav b/res/sfx/speaking_nonhuman.wav index 098ab53..098ab53 100644 --- a/res/speaking_nonhuman.wav +++ b/res/sfx/speaking_nonhuman.wav
Binary files differ
diff --git a/res/speaking_woman.wav b/res/sfx/speaking_woman.wav index 6ae42bd..6ae42bd 100644 --- a/res/speaking_woman.wav +++ b/res/sfx/speaking_woman.wav
Binary files differ
diff --git a/res/boney.png b/res/sprites/boney.png index 9c699ad..9c699ad 100644 --- a/res/boney.png +++ b/res/sprites/boney.png
Binary files differ
diff --git a/res/boney_anim.txt b/res/sprites/boney_anim.txt index 754a028..a384105 100644 --- a/res/boney_anim.txt +++ b/res/sprites/boney_anim.txt
@@ -1,5 +1,5 @@
1../res/boney.png 1../res/sprites/boney.png
2../res/boney_frames.txt 2../res/sprites/boney_frames.txt
3still[down]: 0 3still[down]: 0
4still[down_left]: 1 4still[down_left]: 1
5still[left]: 2 5still[left]: 2
diff --git a/res/boney_frames.txt b/res/sprites/boney_frames.txt index 786cac5..786cac5 100644 --- a/res/boney_frames.txt +++ b/res/sprites/boney_frames.txt
diff --git a/res/duster.png b/res/sprites/duster.png index 48e8261..48e8261 100644 --- a/res/duster.png +++ b/res/sprites/duster.png
Binary files differ
diff --git a/res/duster_anim.txt b/res/sprites/duster_anim.txt index 11492e6..4b035f2 100644 --- a/res/duster_anim.txt +++ b/res/sprites/duster_anim.txt
@@ -1,5 +1,5 @@
1../res/duster.png 1../res/sprites/duster.png
2../res/duster_frames.txt 2../res/sprites/duster_frames.txt
3still[down]: 0 3still[down]: 0
4still[down_left]: 1 4still[down_left]: 1
5still[left]: 2 5still[left]: 2
diff --git a/res/duster_frames.txt b/res/sprites/duster_frames.txt index 8335bf3..8335bf3 100644 --- a/res/duster_frames.txt +++ b/res/sprites/duster_frames.txt
diff --git a/res/kuma_anim.txt b/res/sprites/kuma_anim.txt index bc7dd5a..68e8776 100644 --- a/res/kuma_anim.txt +++ b/res/sprites/kuma_anim.txt
@@ -1,5 +1,5 @@
1../res/kumatora.png 1../res/sprites/kumatora.png
2../res/kumatora_frames.txt 2../res/sprites/kumatora_frames.txt
3still[down]: 0 3still[down]: 0
4still[down_left]: 1 4still[down_left]: 1
5still[left]: 2 5still[left]: 2
diff --git a/res/kumatora.png b/res/sprites/kumatora.png index 6fe4b26..6fe4b26 100644 --- a/res/kumatora.png +++ b/res/sprites/kumatora.png
Binary files differ
diff --git a/res/kumatora_frames.txt b/res/sprites/kumatora_frames.txt index 14aecc6..14aecc6 100644 --- a/res/kumatora_frames.txt +++ b/res/sprites/kumatora_frames.txt
diff --git a/res/lucas.png b/res/sprites/lucas.png index dd053e5..dd053e5 100644 --- a/res/lucas.png +++ b/res/sprites/lucas.png
Binary files differ
diff --git a/res/lucas_anim.txt b/res/sprites/lucas_anim.txt index 8e91599..455c321 100644 --- a/res/lucas_anim.txt +++ b/res/sprites/lucas_anim.txt
@@ -1,5 +1,5 @@
1../res/lucas.png 1../res/sprites/lucas.png
2../res/lucas_frames.txt 2../res/sprites/lucas_frames.txt
3still[down]: 0 3still[down]: 0
4still[down_left]: 1 4still[down_left]: 1
5still[left]: 2 5still[left]: 2
diff --git a/res/lucas_frames.txt b/res/sprites/lucas_frames.txt index e64d1e1..e64d1e1 100644 --- a/res/lucas_frames.txt +++ b/res/sprites/lucas_frames.txt
diff --git a/src/character_system.cpp b/src/character_system.cpp index 2f26aee..4d2d338 100644 --- a/src/character_system.cpp +++ b/src/character_system.cpp
@@ -123,7 +123,7 @@ void CharacterSystem::tick(double dt) {
123 123
124 if (blocked && sprite.characterState == CharacterState::Running) { 124 if (blocked && sprite.characterState == CharacterState::Running) {
125 stopRunning(spriteId); 125 stopRunning(spriteId);
126 game_.getMixer().playSound("../res/bump.wav"); 126 game_.getMixer().playSound("../res/sfx/bump.wav");
127 } 127 }
128 128
129 // Move everything 129 // Move everything
diff --git a/src/main.cpp b/src/main.cpp index 8f23881..4c560c7 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -22,28 +22,28 @@ void loop(Renderer& renderer) {
22 game.emplaceSystem<MessageSystem>(); 22 game.emplaceSystem<MessageSystem>();
23 game.emplaceSystem<ScriptSystem>(); 23 game.emplaceSystem<ScriptSystem>();
24 24
25 auto map = std::make_unique<Map>("../res/map1.tmx", renderer); 25 auto map = std::make_unique<Map>("../res/maps/map1.tmx", renderer);
26 game.setMap(std::move(map)); 26 game.setMap(std::move(map));
27 27
28 int lucasSprite = game.emplaceSprite(); 28 int lucasSprite = game.emplaceSprite();
29 game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32}); 29 game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
30 game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/lucas_anim.txt", renderer); 30 game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
31 game.getSprite(lucasSprite).controllable = true; 31 game.getSprite(lucasSprite).controllable = true;
32 game.getSystem<CharacterSystem>().initSprite(lucasSprite); 32 game.getSystem<CharacterSystem>().initSprite(lucasSprite);
33 33
34 int kumaSprite = game.emplaceSprite(); 34 int kumaSprite = game.emplaceSprite();
35 game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32}); 35 game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
36 game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/kuma_anim.txt", renderer); 36 game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt", renderer);
37 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite); 37 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
38 38
39 int dusterSprite = game.emplaceSprite(); 39 int dusterSprite = game.emplaceSprite();
40 game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32}); 40 game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
41 game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/duster_anim.txt", renderer); 41 game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt", renderer);
42 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite); 42 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
43 43
44 int boneySprite = game.emplaceSprite(); 44 int boneySprite = game.emplaceSprite();
45 game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32}); 45 game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
46 game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/boney_anim.txt", renderer); 46 game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt", renderer);
47 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite); 47 game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
48 48
49 game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite); 49 game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
diff --git a/src/message_system.cpp b/src/message_system.cpp index 67c840e..4a31a69 100644 --- a/src/message_system.cpp +++ b/src/message_system.cpp
@@ -27,15 +27,15 @@ void MessageSystem::tick(double dt) {
27 // Every so often play a beep. 27 // Every so often play a beep.
28 if (line.charsRevealed % CHARS_PER_BEEP == 0) { 28 if (line.charsRevealed % CHARS_PER_BEEP == 0) {
29 if (speaker_ == SpeakerType::Man) { 29 if (speaker_ == SpeakerType::Man) {
30 game_.getMixer().playSound("../res/speaking_man.wav"); 30 game_.getMixer().playSound("../res/sfx/speaking_man.wav");
31 } else if (speaker_ == SpeakerType::Woman) { 31 } else if (speaker_ == SpeakerType::Woman) {
32 game_.getMixer().playSound("../res/speaking_woman.wav"); 32 game_.getMixer().playSound("../res/sfx/speaking_woman.wav");
33 } else if (speaker_ == SpeakerType::Boy) { 33 } else if (speaker_ == SpeakerType::Boy) {
34 game_.getMixer().playSound("../res/speaking_boy.wav"); 34 game_.getMixer().playSound("../res/sfx/speaking_boy.wav");
35 } else if (speaker_ == SpeakerType::Girl) { 35 } else if (speaker_ == SpeakerType::Girl) {
36 game_.getMixer().playSound("../res/speaking_girl.wav"); 36 game_.getMixer().playSound("../res/sfx/speaking_girl.wav");
37 } else if (speaker_ == SpeakerType::Nonhuman) { 37 } else if (speaker_ == SpeakerType::Nonhuman) {
38 game_.getMixer().playSound("../res/speaking_nonhuman.wav"); 38 game_.getMixer().playSound("../res/sfx/speaking_nonhuman.wav");
39 } 39 }
40 } 40 }
41 41
@@ -198,7 +198,7 @@ void MessageSystem::advanceText() {
198 if (lines_.empty()) { 198 if (lines_.empty()) {
199 linesToShow_.clear(); 199 linesToShow_.clear();
200 } else { 200 } else {
201 game_.getMixer().playSound("../res/pageflip.wav"); 201 game_.getMixer().playSound("../res/sfx/pageflip.wav");
202 } 202 }
203} 203}
204 204
diff --git a/src/step_type.h b/src/step_type.h index c38d6f9..a961a8f 100644 --- a/src/step_type.h +++ b/src/step_type.h
@@ -36,17 +36,17 @@ inline StepType stepTypeFromString(std::string_view str) {
36 36
37inline std::string_view runningSfxForStepType(StepType step) { 37inline std::string_view runningSfxForStepType(StepType step) {
38 switch (step) { 38 switch (step) {
39 case StepType::wood: return "../res/running_wood.wav"; 39 case StepType::wood: return "../res/sfx/running_wood.wav";
40 case StepType::land_light: return "../res/running_land_light.wav"; 40 case StepType::land_light: return "../res/sfx/running_land_light.wav";
41 case StepType::land: return "../res/running_land.wav"; 41 case StepType::land: return "../res/sfx/running_land.wav";
42 case StepType::sand: return "../res/running_sand.wav"; 42 case StepType::sand: return "../res/sfx/running_sand.wav";
43 case StepType::water: return "../res/running_water.wav"; 43 case StepType::water: return "../res/sfx/running_water.wav";
44 case StepType::mechanical: return "../res/running_mechanical.wav"; 44 case StepType::mechanical: return "../res/sfx/running_mechanical.wav";
45 case StepType::grass: return "../res/running_grass.wav"; 45 case StepType::grass: return "../res/sfx/running_grass.wav";
46 case StepType::unknown: return "../res/running_unknown.wav"; 46 case StepType::unknown: return "../res/sfx/running_unknown.wav";
47 case StepType::paved: return "../res/running_paved.wav"; 47 case StepType::paved: return "../res/sfx/running_paved.wav";
48 case StepType::carpet: return "../res/running_carpet.wav"; 48 case StepType::carpet: return "../res/sfx/running_carpet.wav";
49 case StepType::weak_wood: return "../res/running_weak_wood.wav"; 49 case StepType::weak_wood: return "../res/sfx/running_weak_wood.wav";
50 case StepType::none: throw std::invalid_argument("No running sfx for none step type"); 50 case StepType::none: throw std::invalid_argument("No running sfx for none step type");
51 } 51 }
52} 52}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 20:54:38 +0000