diff --git a/entities/player/player.tscn b/entities/player/player.tscn index c892b4d..5f5463d 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://entities/player/player.gd" id="1_mk68k"] [ext_resource type="PackedScene" uid="uid://drbefw6akui2v" path="res://entities/player/assets/vanguard.tscn" id="2_beyex"] -[ext_resource type="Shape3D" path="res://entities/player/collision_shape.tres" id="2_vjqny"] +[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_vjqny"] [ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://interfaces/hud/hud.tscn" id="3_ccety"] [ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://weapons/space_gun/space_gun.tscn" id="4_lhn5w"] [ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://weapons/space_gun/projectile.tscn" id="5_lvaut"] @@ -220,7 +220,7 @@ shape = ExtResource("2_vjqny") transform = Transform3D(1.05, 0, 0, 0, 1.05, 0, 0, 0, 1.05, 0, 0, 0) shape = ExtResource("2_vjqny") target_position = Vector3(0, 0, 0) -collision_mask = 2147483656 +collision_mask = 2147483648 collide_with_areas = true [node name="Sensor" type="Area3D" parent="."] diff --git a/weapons/space_gun/projectile_explosion.gd b/weapons/space_gun/projectile_explosion.gd index 9eff72d..05aa422 100644 --- a/weapons/space_gun/projectile_explosion.gd +++ b/weapons/space_gun/projectile_explosion.gd @@ -1,15 +1,15 @@ # This file is part of open-fpsz. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . extends Node3D