Commit 89bede51 authored by Tim Scheiber's avatar Tim Scheiber

more turrets

parent c0f8960d
Pipeline #3410 failed with stage
in 5 minutes and 16 seconds
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.0
},
"FixedPath": {
"pause_between_steps": 1,
"wait_beats": 1
}
"Shooting": {
"spawn_offset": 1,
"pause_between_shots": 1
},
"Killable": {
"radius": 1
}
}
......@@ -10,9 +10,8 @@ dummy
##########| |#
##########| |#
##########| |#
##########| <p> |#
##########| |#
##########| |#
##########| <@> |#
##########| > < |#
##########| |#
##########| ! |#
##########|-------|#
####################
\ No newline at end of file
......@@ -17,13 +17,13 @@
"blueprint": "dummy_ceiling",
"solid": true
},
"p": {
"@": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "player"
},
"G": {
"!": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
......@@ -94,6 +94,66 @@
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"a": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"b": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"c": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"d": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "moving_turret"
},
"e": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"f": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"g": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"h": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"i": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"j": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
}
}
}
......@@ -143,7 +143,7 @@ namespace phase_shifter::gameplay {
shooting.target_direction *= -1;
}
if(closest_dist <= shooting.attack_radius) {
if(shooting.attack_radius >= 0 && closest_dist <= shooting.attack_radius) {
shooting.idle = false;
} else {
shooting.idle = true;
......
......@@ -32,8 +32,8 @@ namespace phase_shifter::gameplay {
mirrage::ecs::Entity_manager& _entity_manager;
const Beat_system& _beat_system;
const float trigger_distance_shooting = 20.f; // radius around players the turrets have to be in in order to shoot
const float trigger_distance_despawn_bullets = 30.f; // radius around players the bullets have to leave in order to despawn
const float trigger_distance_shooting = 40.f; // radius around players the turrets have to be in in order to shoot
const float trigger_distance_despawn_bullets = 50.f; // radius around players the bullets have to leave in order to despawn
void do_movement(Beat_state& beat);
void do_fixed_path_movement(Beat_state& beat);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment