diff --git a/maps/main_scene_template.tscn b/maps/main_scene_template.tscn index 9bdca9a0..5d6f03a0 100644 --- a/maps/main_scene_template.tscn +++ b/maps/main_scene_template.tscn @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="4_wlbyq"] [ext_resource type="PackedScene" uid="uid://ccqajqchiw4xu" path="res://menus/scenes/overlaid_menus/pause_menu.tscn" id="5_wwrc3"] [ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="6_vy804"] +[ext_resource type="PackedScene" uid="uid://duju3atqgltkg" path="res://scenes/explosion/explosion.tscn" id="9_r1bdn"] [ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="16_86mdr"] [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="17_clkha"] @@ -67,6 +68,9 @@ transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 0, 0, 0) TutorialDone = true AccelerationAir = 1.5 +[node name="Explosion" parent="Player" unique_id=1876014452 instance=ExtResource("9_r1bdn")] +visible = false + [node name="DebugLayer" type="CanvasLayer" parent="." unique_id=294370189] [connection signal="PlayerDied" from="Player" to="GeneralManager" method="on_player_died"] diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index cb82cd71..92ad81a6 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -12,7 +12,7 @@ [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"] [ext_resource type="PackedScene" uid="uid://hpsg4fqwrx1u" path="res://components/damage/CDamageable.tscn" id="5_jb43f"] [ext_resource type="Resource" uid="uid://f3vs6l4m623s" path="res://systems/inputs/base_mode/move_left.tres" id="5_q14ux"] -[ext_resource type="PackedScene" uid="uid://duju3atqgltkg" path="res://scenes/enemies/explosion.tscn" id="5_ue7xq"] +[ext_resource type="PackedScene" uid="uid://duju3atqgltkg" path="res://scenes/explosion/explosion.tscn" id="5_ue7xq"] [ext_resource type="Resource" uid="uid://dyru7mxo121w6" path="res://player_controller/resources/player_normal_damage_mod.tres" id="6_cmijs"] [ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://systems/inputs/base_mode/move_right.tres" id="6_q7bng"] [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"] diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index aa37b45c..d8790824 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -2115,6 +2115,8 @@ public partial class PlayerController : CharacterBody3D, public void OnInputHitPressed() { + if (_onWallHanging.Active) return; + if (_aiming.Active && WeaponSystem.InHandState.Active) { ThrowWeapon(); diff --git a/scenes/enemies/Explosion.cs b/scenes/explosion/Explosion.cs similarity index 100% rename from scenes/enemies/Explosion.cs rename to scenes/explosion/Explosion.cs diff --git a/scenes/enemies/Explosion.cs.uid b/scenes/explosion/Explosion.cs.uid similarity index 100% rename from scenes/enemies/Explosion.cs.uid rename to scenes/explosion/Explosion.cs.uid diff --git a/scenes/enemies/explosion.tscn b/scenes/explosion/explosion.tscn similarity index 96% rename from scenes/enemies/explosion.tscn rename to scenes/explosion/explosion.tscn index 7f054163..8e83cb90 100644 --- a/scenes/enemies/explosion.tscn +++ b/scenes/explosion/explosion.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://duju3atqgltkg"] -[ext_resource type="Script" uid="uid://cnlu64l7oxvv3" path="res://scenes/enemies/Explosion.cs" id="1_82hkh"] +[ext_resource type="Script" uid="uid://cnlu64l7oxvv3" path="res://scenes/explosion/Explosion.cs" id="1_82hkh"] [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://components/damage/RDamage.cs" id="2_hys74"] [sub_resource type="Resource" id="Resource_ffdh3"]