diff --git a/assets/animation.json b/assets/animation.json index 6af1f22..aa01bef 100644 --- a/assets/animation.json +++ b/assets/animation.json @@ -1,70 +1,4 @@ { - "burning_animation": { - "sheet": { - "frames": 3, - "frame_width": 256, - "frame_height": 256 - }, - "sequences": { - "idle": {"frames": [0,1,2,1,0], "durations": [5,5,5,5,5] } - }, - "transforms": { - "basic": { - "min_x": 1.0, - "min_y": 1.0, - "max_x": 1.0, - "max_y": 1.0, - "flipped": false, - "scaled": true, - "toggled": false, - "looped": false, - "relative": true, - "easing": "none", - "motion": "move_none" - } - }, - "forms": { - "idle": ["idle", "basic"] - }, - "sounds": { - "idle": [], - "open": [], - "close": [] - } - }, - "lightning_animation": { - "sheet": { - "frames": 5, - "frame_width": 256, - "frame_height": 256 - }, - "sequences": { - "idle": {"frames": [0,1,2,3,4], "durations": [5,5,5,5,5] } - }, - "transforms": { - "basic": { - "min_x": 1.0, - "min_y": 1.0, - "max_x": 1.0, - "max_y": 1.0, - "flipped": false, - "scaled": true, - "toggled": false, - "looped": false, - "relative": false, - "easing": "none", - "motion": "move_none" - } - }, - "forms": { - "idle": ["idle", "basic"] - }, - "sounds": { - "idle": [], - "open": [], - "close": [] - } - }, "spider_bot": { "sheet": { "frames": 1, @@ -72,7 +6,7 @@ "frame_height": 256 }, "sequences": { - "idle": {"frames": [0], "durations": [50] } + "idle": {"frames": [0, 0], "durations": [25, 25] } }, "transforms": { "basic": { @@ -93,7 +27,7 @@ "idle": ["idle", "basic"] }, "sounds": { - "idle": [], + "idle": [[0, "sword_hit_2"]], "open": [], "close": [] } diff --git a/assets/config.json b/assets/config.json index 981fe8f..0882342 100644 --- a/assets/config.json +++ b/assets/config.json @@ -5,7 +5,10 @@ "ui_click": "assets/sounds/ui_click.ogg", "ui_hover": "assets/sounds/ui_hover.ogg", "walk": "assets/sounds/walk.ogg", - "test_story": "assets/sounds/test_story.ogg" + "test_story": "assets/sounds/test_story.ogg", + "sword_hit_1": "assets/sounds/sword_hit_1.ogg", + "sword_hit_2": "assets/sounds/sword_hit_2.ogg", + "ambient_1": "assets/sounds/ambient_1.ogg" }, "sprites": { "spider_bot": diff --git a/assets/enemies.json b/assets/enemies.json index c524359..0c0a731 100644 --- a/assets/enemies.json +++ b/assets/enemies.json @@ -7,7 +7,7 @@ "background": "color:transparent" }, {"_type": "Combat", "max_hp": 200, "max_ap": 12, - "ap_delta": 6, "damage": 40, "attack_rating": 0.5, "toughness_rating": 0.1, + "ap_delta": 6, "damage": 150, "attack_rating": 0.5, "toughness_rating": 0.1, "body_parts": { "head": 200, "chest": 200, diff --git a/assets/sounds/ambient_1.ogg b/assets/sounds/ambient_1.ogg new file mode 100644 index 0000000..f643926 Binary files /dev/null and b/assets/sounds/ambient_1.ogg differ diff --git a/assets/sounds/sword_hit_1.ogg b/assets/sounds/sword_hit_1.ogg new file mode 100644 index 0000000..3204afc Binary files /dev/null and b/assets/sounds/sword_hit_1.ogg differ diff --git a/assets/sounds/sword_hit_2.ogg b/assets/sounds/sword_hit_2.ogg new file mode 100644 index 0000000..1a82cc7 Binary files /dev/null and b/assets/sounds/sword_hit_2.ogg differ diff --git a/src/gui/fsm.cpp b/src/gui/fsm.cpp index 7eead39..69cafdd 100644 --- a/src/gui/fsm.cpp +++ b/src/gui/fsm.cpp @@ -245,7 +245,7 @@ namespace gui { case ATTACK: { $main_ui.play_hands(); $main_ui.dirty(); - sound::play("Sword_Hit_1"); + sound::play("sword_hit_1"); $systems.runCombat(0); run_systems(); $status_ui.update(); diff --git a/src/main.cpp b/src/main.cpp index 7186840..a50ae52 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) { ai::init("ai"); GameDB::init(); cinematic::init(); - sound::mute(true); + sound::mute(false); sf::RenderWindow window(sf::VideoMode({SCREEN_WIDTH, SCREEN_HEIGHT}), "Zed's Raycaster Thing"); window.setVerticalSyncEnabled(VSYNC);