hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

exclude player from IsClickable query, add name to MeteorAceGT

Browse source
This commit is contained in:
yuni 2024-04-05 20:10:45 +02:00
parent 845e938472
commit d8e106c497
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/defs.txt
View file

@ -22,9 +22,9 @@ actor 0 593051 0 suit
thrust 1.2 1 1 300 1.5 thrust 1.2 1 1 300 1.5
rotationy 0.65 rotationy 0.65
engine monopropellant engine monopropellant
clickable no
actor 10 -30 20 MeteorAceGT actor 10 -30 20 MeteorAceGT
name "MeteorAceGT™"
relativeto player relativeto player
scale 5 scale 5
vehicle yes vehicle yes
@ -34,7 +34,6 @@ actor 10 -30 20 MeteorAceGT
camdistance 50 camdistance 50
mass 3000 mass 3000
angularmomentum 0.1 0.1 0.3 angularmomentum 0.1 0.1 0.3
clickable no
actor 0 0 0 io actor 0 0 0 io
name Io name Io
@ -147,6 +146,7 @@ actor -3300 10 0 pizzeria
rotationy 0.30 rotationy 0.30
angularmomentum 0 0 0 angularmomentum 0 0 0
actor -120 0 20 MeteorAceGT actor -120 0 20 MeteorAceGT
name "MeteorAceGT™"
relativeto pizzeria relativeto pizzeria
scale 5 scale 5
vehicle yes vehicle yes
@ -156,7 +156,6 @@ actor -3300 10 0 pizzeria
camdistance 50 camdistance 50
mass 3000 mass 3000
angularmomentum 0 0 0.2 angularmomentum 0 0 0.2
clickable no
actor -100 63 -13 pizzasign actor -100 63 -13 pizzasign
name "Pizzeria Sign" name "Pizzeria Sign"
relativeto pizzeria relativeto pizzeria

2
src/hud.rs
View file

@ -575,7 +575,7 @@ fn handle_input(
mut ew_sfx: EventWriter<audio::PlaySfxEvent>, mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
mut ew_togglemusic: EventWriter<audio::ToggleMusicEvent>, mut ew_togglemusic: EventWriter<audio::ToggleMusicEvent>,
mut ambient_light: ResMut<AmbientLight>, mut ambient_light: ResMut<AmbientLight>,
q_objects: Query<(Entity, &Transform), (With<IsClickable>, Without<IsTargeted>)>, q_objects: Query<(Entity, &Transform), (With<IsClickable>, Without<IsTargeted>, Without<actor::PlayerDrivesThis>, Without<actor::Player>)>,
q_target: Query<Entity, With<IsTargeted>>, q_target: Query<Entity, With<IsTargeted>>,
q_camera: Query<&Transform, With<Camera>>, q_camera: Query<&Transform, With<Camera>>,
) { ) {