Brought in some sounds from Soundly so now it's more complete with audible attacks and death sounds.

master
Zed A. Shaw 10 months ago
parent 976b353901
commit a8ae6df13b
  1. BIN
      assets/ambient_1.ogg
  2. 24
      assets/config.json
  3. 18
      assets/enemies.json
  4. BIN
      assets/monster-1.ogg
  5. BIN
      assets/monster-16.ogg
  6. BIN
      assets/sounds/Creature_Sounds-Creature_Death_1.ogg
  7. BIN
      assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg
  8. BIN
      assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg
  9. BIN
      assets/sounds/Creature_Sounds-Giant_Voice_1.ogg
  10. BIN
      assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg
  11. BIN
      assets/sounds/Creature_Sounds-Medium_Rat.ogg
  12. BIN
      assets/sounds/Creature_Sounds-Ranger_1.ogg
  13. BIN
      assets/sounds/Creature_Sounds-Small_Rat.ogg
  14. BIN
      assets/sounds/Creature_Sounds-Spider_1-001.ogg
  15. BIN
      assets/sounds/Creature_Sounds-Spider_1-002.ogg
  16. BIN
      assets/sounds/Creature_Sounds-Sword_Hit_1.ogg
  17. BIN
      assets/sounds/Creature_Sounds-Sword_Hit_2.ogg
  18. BIN
      assets/sounds/Creature_Sounds-Walk.ogg
  19. BIN
      assets/sounds/ambient_1.ogg
  20. 0
      assets/sounds/blank.ogg
  21. 0
      assets/sounds/pickup.ogg
  22. BIN
      assets/sword.1.ogg
  23. 2
      gui_fsm.cpp

Binary file not shown.

@ -1,12 +1,22 @@
{ {
"sounds": { "sounds": {
"sword_1": "assets/sword.1.ogg", "Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg",
"monster_16": "assets/monster-16.ogg", "Evil_Eye_Sound_1": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg",
"monster_1": "assets/monster-1.ogg", "Evil_Eye_Sound_2": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg",
"walk": "assets/blank.ogg", "Giant_Voice_1": "assets/sounds/Creature_Sounds-Giant_Voice_1.ogg",
"blank": "assets/blank.ogg", "Medium_Rat": "assets/sounds/Creature_Sounds-Medium_Rat.ogg",
"pickup": "assets/pickup.ogg", "Ranger_1": "assets/sounds/Creature_Sounds-Ranger_1.ogg",
"ambient_1": "assets/ambient_1.ogg" "Small_Rat": "assets/sounds/Creature_Sounds-Small_Rat.ogg",
"Spider_1": "assets/sounds/Creature_Sounds-Spider_1-001.ogg",
"Spider_2": "assets/sounds/Creature_Sounds-Spider_1-002.ogg",
"Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg",
"Sword_Hit_2": "assets/sounds/Creature_Sounds-Sword_Hit_2.ogg",
"walk": "assets/sounds/Creature_Sounds-Walk.ogg",
"Creature_Death_1": "assets/sounds/Creature_Sounds-Creature_Death_1.ogg",
"Humanoid_Death_1": "assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg",
"blank": "assets/sounds/blank.ogg",
"pickup": "assets/sounds/pickup.ogg",
"ambient_1": "assets/sounds/ambient_1.ogg"
}, },
"sprites": { "sprites": {
"armored_knight": "assets/armored_knight_1-256.png", "armored_knight": "assets/armored_knight_1-256.png",

@ -6,11 +6,9 @@
"foreground": [255, 200, 125], "foreground": [255, 200, 125],
"background": [30, 20, 75] "background": [30, 20, 75]
}, },
{"_type": "Combat", "hp": 200, "max_hp": 200, "damage": 50, "dead": false}, {"_type": "Combat", "hp": 200, "max_hp": 200, "damage": 10, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": false}, {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "LightSource", "strength": 45, "radius": 2.0}, {"_type": "LightSource", "strength": 45, "radius": 2.0}
{"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0}
] ]
}, },
"KNIGHT": { "KNIGHT": {
@ -24,7 +22,7 @@
{"_type": "EnemyConfig", "hearing_distance": 5}, {"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 0.3}, {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 0.3},
{"_type": "Sprite", "name": "armored_knight"}, {"_type": "Sprite", "name": "armored_knight"},
{"_type": "Sound", "attack": "monster_1", "death": "monster_16"} {"_type": "Sound", "attack": "Sword_Hit_2", "death": "Humanoid_Death_1"}
] ]
}, },
"AXE_RANGER": { "AXE_RANGER": {
@ -38,7 +36,7 @@
{"_type": "EnemyConfig", "hearing_distance": 5}, {"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Sprite", "name": "axe_ranger"}, {"_type": "Sprite", "name": "axe_ranger"},
{"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.6}, {"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.6},
{"_type": "Sound", "attack": "sword_1", "death": "monster_16"} {"_type": "Sound", "attack": "Sword_Hit_1", "death": "Humanoid_Death_1"}
] ]
}, },
"EVIL_EYE": { "EVIL_EYE": {
@ -52,7 +50,7 @@
{"_type": "EnemyConfig", "hearing_distance": 5}, {"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Sprite", "name": "evil_eye"}, {"_type": "Sprite", "name": "evil_eye"},
{"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.3}, {"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.3},
{"_type": "Sound", "attack": "monster_1", "death": "monster_16"} {"_type": "Sound", "attack": "Evil_Eye_Sound_2", "death": "Evil_Eye_Sound_1"}
] ]
}, },
"RAT_GIANT": { "RAT_GIANT": {
@ -66,7 +64,7 @@
{"_type": "EnemyConfig", "hearing_distance": 10}, {"_type": "EnemyConfig", "hearing_distance": 10},
{"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0}, {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
{"_type": "Sprite", "name": "rat_with_sword"}, {"_type": "Sprite", "name": "rat_with_sword"},
{"_type": "Sound", "attack": "sword_1", "death": "monster_16"} {"_type": "Sound", "attack": "Small_Rat", "death": "Creature_Death_1"}
] ]
}, },
"RAT_KING": { "RAT_KING": {
@ -80,7 +78,7 @@
{"_type": "EnemyConfig", "hearing_distance": 3}, {"_type": "EnemyConfig", "hearing_distance": 3},
{"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0}, {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
{"_type": "Sprite", "name": "rat_king"}, {"_type": "Sprite", "name": "rat_king"},
{"_type": "Sound", "attack": "sword_1", "death": "monster_16"} {"_type": "Sound", "attack": "Medium_Rat", "death": "Creature_Death_1"}
] ]
}, },
"SPIDER_GIANT_HAIRY": { "SPIDER_GIANT_HAIRY": {
@ -94,7 +92,7 @@
{"_type": "EnemyConfig", "hearing_distance": 10}, {"_type": "EnemyConfig", "hearing_distance": 10},
{"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0}, {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
{"_type": "Sprite", "name": "hairy_spider"}, {"_type": "Sprite", "name": "hairy_spider"},
{"_type": "Sound", "attack": "sword_1", "death": "monster_16"} {"_type": "Sound", "attack": "Spider_1", "death": "Spider_2"}
] ]
} }
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -194,7 +194,7 @@ namespace gui {
switch(ev) { switch(ev) {
case ATTACK: case ATTACK:
$main_ui.dirty(); $main_ui.dirty();
$status_ui.log("You attack!"); sound::play("Sword_Hit_1");
state(State::ATTACKING); state(State::ATTACKING);
break; break;
case ROTATE_LEFT: case ROTATE_LEFT: