Bring in some sounds and tweak the damage so it's not annoying.'
This commit is contained in:
parent
568171c4a2
commit
0f9777988d
8 changed files with 9 additions and 72 deletions
|
|
@ -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": {
|
"spider_bot": {
|
||||||
"sheet": {
|
"sheet": {
|
||||||
"frames": 1,
|
"frames": 1,
|
||||||
|
|
@ -72,7 +6,7 @@
|
||||||
"frame_height": 256
|
"frame_height": 256
|
||||||
},
|
},
|
||||||
"sequences": {
|
"sequences": {
|
||||||
"idle": {"frames": [0], "durations": [50] }
|
"idle": {"frames": [0, 0], "durations": [25, 25] }
|
||||||
},
|
},
|
||||||
"transforms": {
|
"transforms": {
|
||||||
"basic": {
|
"basic": {
|
||||||
|
|
@ -93,7 +27,7 @@
|
||||||
"idle": ["idle", "basic"]
|
"idle": ["idle", "basic"]
|
||||||
},
|
},
|
||||||
"sounds": {
|
"sounds": {
|
||||||
"idle": [],
|
"idle": [[0, "sword_hit_2"]],
|
||||||
"open": [],
|
"open": [],
|
||||||
"close": []
|
"close": []
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,10 @@
|
||||||
"ui_click": "assets/sounds/ui_click.ogg",
|
"ui_click": "assets/sounds/ui_click.ogg",
|
||||||
"ui_hover": "assets/sounds/ui_hover.ogg",
|
"ui_hover": "assets/sounds/ui_hover.ogg",
|
||||||
"walk": "assets/sounds/walk.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": {
|
"sprites": {
|
||||||
"spider_bot":
|
"spider_bot":
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
"background": "color:transparent"
|
"background": "color:transparent"
|
||||||
},
|
},
|
||||||
{"_type": "Combat", "max_hp": 200, "max_ap": 12,
|
{"_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": {
|
"body_parts": {
|
||||||
"head": 200,
|
"head": 200,
|
||||||
"chest": 200,
|
"chest": 200,
|
||||||
|
|
|
||||||
BIN
assets/sounds/ambient_1.ogg
Normal file
BIN
assets/sounds/ambient_1.ogg
Normal file
Binary file not shown.
BIN
assets/sounds/sword_hit_1.ogg
Normal file
BIN
assets/sounds/sword_hit_1.ogg
Normal file
Binary file not shown.
BIN
assets/sounds/sword_hit_2.ogg
Normal file
BIN
assets/sounds/sword_hit_2.ogg
Normal file
Binary file not shown.
|
|
@ -245,7 +245,7 @@ namespace gui {
|
||||||
case ATTACK: {
|
case ATTACK: {
|
||||||
$main_ui.play_hands();
|
$main_ui.play_hands();
|
||||||
$main_ui.dirty();
|
$main_ui.dirty();
|
||||||
sound::play("Sword_Hit_1");
|
sound::play("sword_hit_1");
|
||||||
$systems.runCombat(0);
|
$systems.runCombat(0);
|
||||||
run_systems();
|
run_systems();
|
||||||
$status_ui.update();
|
$status_ui.update();
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ int main(int argc, char* argv[]) {
|
||||||
ai::init("ai");
|
ai::init("ai");
|
||||||
GameDB::init();
|
GameDB::init();
|
||||||
cinematic::init();
|
cinematic::init();
|
||||||
sound::mute(true);
|
sound::mute(false);
|
||||||
|
|
||||||
sf::RenderWindow window(sf::VideoMode({SCREEN_WIDTH, SCREEN_HEIGHT}), "Zed's Raycaster Thing");
|
sf::RenderWindow window(sf::VideoMode({SCREEN_WIDTH, SCREEN_HEIGHT}), "Zed's Raycaster Thing");
|
||||||
window.setVerticalSyncEnabled(VSYNC);
|
window.setVerticalSyncEnabled(VSYNC);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue