maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 09:55:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Door opening fix

Browse source
This commit is contained in:
MaddoScientisto 2025-04-26 22:00:55 +02:00
commit 07d49a0b23
10 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cirno.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.4.1">
<Project Sdk="Godot.NET.Sdk/4.4.0">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>

10
Resources/BossPhases/Rumia_NS2.tres
View file

@ -32,6 +32,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
@ -77,6 +78,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
@ -115,6 +117,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
@ -153,6 +156,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
@ -191,6 +195,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
@ -229,6 +234,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
@ -289,6 +295,7 @@ Owner = 0
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
@ -335,6 +342,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
@ -381,6 +389,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
@ -427,6 +436,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])

2
Resources/BossPhases/Rumia_SP1.tres
View file

@ -47,6 +47,7 @@ Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
Modifier = SubResource("Resource_80ngy")
@ -94,6 +95,7 @@ Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
Modifier = SubResource("Resource_e6jj0")

1
Resources/Items/NuclearGunPickup.tres
View file

@ -11,6 +11,7 @@ ShortName = &"MP-42"
ItemDescription = &"Shoots micro suns"
ItemKey = &"NUCLEAR_GUN"
Item = 9
Price = 0
WeaponData = ExtResource("3_5kq8e")
Amount = 1
Max = 1

3
Resources/Patterns/rumia_ns_2.tres
View file

@ -19,6 +19,7 @@ Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = null
@ -57,6 +58,7 @@ Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = null
@ -95,6 +97,7 @@ Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
TimeModifiers = null

1
Resources/Weapons/Enemy/TurretWeapon.tres
View file

@ -22,6 +22,7 @@ Owner = 2
DamageType = 0
RotateSprite = true
Controllable = false
Freezable = true
Grazeable = true
GrazeValue = 1.0
Modifier = SubResource("Resource_ktwe0")

9
Scenes/Door_Horizontal.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://l84on3kv2s52"]
[gd_scene load_steps=25 format=3 uid="uid://l84on3kv2s52"]
[ext_resource type="Script" uid="uid://dwry0643yvdiv" path="res://Scripts/Door.cs" id="1_emfh4"]
[ext_resource type="Texture2D" uid="uid://drllk3ld56b2u" path="res://Sprites/Actors/Doors/horizontal_door_3.png" id="2_nw4l4"]
@ -56,10 +56,6 @@ region = Rect2(96, 0, 32, 32)
atlas = ExtResource("2_nw4l4")
region = Rect2(128, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_31wbl"]
atlas = ExtResource("2_nw4l4")
region = Rect2(160, 0, 32, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_keeml"]
animations = [{
"frames": [{
@ -118,9 +114,6 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_okbwa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_31wbl")
}],
"loop": false,
"name": &"Opening",

8
Scenes/Maps/RogueliteMaps/Boss1.tscn
View file

@ -1,20 +1,14 @@
[gd_scene load_steps=8 format=4 uid="uid://brytwc48xpj78"]
[gd_scene load_steps=5 format=4 uid="uid://brytwc48xpj78"]
[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_vm1u7"]
[ext_resource type="Resource" uid="uid://cgac12krx7vbf" path="res://Resources/RogueliteMaps/Boss1.tres" id="2_vm1u7"]
[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_vo7cb"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_wmvx8"]
[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_5nx6x"]
[ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="4_6d01x"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_vo7cb"]
[node name="Tilemaps" type="Node2D"]
process_mode = 1
script = ExtResource("1_vm1u7")
RoomResource = ExtResource("2_vm1u7")
DoorPrefab = ExtResource("3_vo7cb")
VerticalDoorPrefab = ExtResource("4_6d01x")
WallPrefab = ExtResource("4_5nx6x")
[node name="Floor" type="TileMapLayer" parent="." node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
tile_map_data = PackedByteArray("AAAAAAIAAAACAAAAAAAAAAMAAAACAAAAAAAAAAQAAAACAAAAAAAAAAUAAAACAAAAAAAAAAYAAAACAAAAAAAAAAcAAAACAAAAAAAAAAgAAAACAAAAAAAAAAkAAAACAAAAAAABAAIAAAACAAAAAAABAAMAAAACAAAAAAABAAQAAAACAAAAAAABAAUAAAACAAAAAAABAAYAAAACAAAAAAABAAcAAAACAAAAAAABAAgAAAACAAAAAAABAAkAAAACAAAAAAACAAIAAAACAAAAAAACAAMAAAACAAAAAAACAAQAAAAFAAIAAAACAAUAAAAFAAIAAAACAAYAAAAFAAIAAAACAAcAAAAFAAIAAAACAAgAAAAFAAIAAAACAAkAAAACAAAAAAADAAIAAAACAAAAAAADAAMAAAACAAAAAAADAAQAAAAFAAIAAAADAAUAAAACAAAAAAADAAYAAAAFAAIAAAADAAcAAAACAAAAAAADAAgAAAAFAAIAAAADAAkAAAACAAAAAAAEAAIAAAACAAAAAAAEAAMAAAACAAAAAAAEAAQAAAACAAAAAAAEAAUAAAAFAAIAAAAEAAYAAAACAAAAAAAEAAcAAAAFAAIAAAAEAAgAAAACAAAAAAAEAAkAAAACAAAAAAAFAAIAAAACAAAAAAAFAAMAAAACAAAAAAAFAAQAAAACAAAAAAAFAAUAAAACAAAAAAAFAAYAAAACAAAAAAAFAAcAAAACAAAAAAAFAAgAAAACAAAAAAAFAAkAAAACAAAAAAAGAAIAAAACAAAAAAAGAAMAAAACAAAAAAAGAAQAAAAFAAIAAAAGAAUAAAAFAAIAAAAGAAYAAAAFAAIAAAAGAAcAAAAFAAIAAAAGAAgAAAAFAAIAAAAGAAkAAAACAAAAAAAHAAIAAAACAAAAAAAHAAMAAAACAAAAAAAHAAQAAAAFAAIAAAAHAAUAAAACAAAAAAAHAAYAAAACAAAAAAAHAAcAAAACAAAAAAAHAAgAAAAFAAIAAAAHAAkAAAACAAAAAAAIAAIAAAACAAAAAAAIAAMAAAACAAAAAAAIAAQAAAAFAAIAAAAIAAUAAAAFAAIAAAAIAAYAAAAFAAIAAAAIAAcAAAAFAAIAAAAIAAgAAAAFAAIAAAAIAAkAAAACAAAAAAAJAAIAAAACAAAAAAAJAAMAAAACAAAAAAAJAAQAAAACAAAAAAAJAAUAAAACAAAAAAAJAAYAAAACAAAAAAAJAAcAAAACAAAAAAAJAAgAAAACAAAAAAAJAAkAAAACAAAAAAAKAAIAAAACAAAAAAAKAAMAAAACAAAAAAAKAAQAAAAFAAIAAAAKAAUAAAAFAAIAAAAKAAYAAAAFAAIAAAAKAAcAAAACAAAAAAAKAAgAAAAFAAIAAAAKAAkAAAACAAAAAAALAAIAAAACAAAAAAALAAUAAAACAAAAAAALAAYAAAAFAAIAAAALAAcAAAACAAAAAAALAAgAAAAFAAIAAAALAAkAAAACAAAAAAAMAAIAAAACAAAAAAAMAAUAAAACAAAAAAAMAAYAAAAFAAIAAAAMAAcAAAAFAAIAAAAMAAgAAAAFAAIAAAAMAAkAAAACAAAAAAANAAIAAAACAAAAAAANAAMAAAACAAAAAAANAAQAAAACAAAAAAANAAUAAAACAAAAAAANAAYAAAACAAAAAAANAAcAAAACAAAAAAANAAgAAAACAAAAAAANAAkAAAACAAAAAAAOAAIAAAACAAAAAAAOAAMAAAACAAAAAAAOAAQAAAAFAAIAAAAOAAUAAAAFAAIAAAAOAAYAAAAFAAIAAAAOAAcAAAACAAAAAAAOAAgAAAAFAAIAAAAOAAkAAAACAAAAAAAPAAIAAAACAAAAAAAPAAMAAAACAAAAAAAPAAQAAAAFAAIAAAAPAAUAAAACAAAAAAAPAAYAAAAFAAIAAAAPAAcAAAACAAAAAAAPAAgAAAAFAAIAAAAPAAkAAAACAAAAAAAQAAIAAAACAAAAAAAQAAMAAAACAAAAAAAQAAQAAAAFAAIAAAAQAAUAAAACAAAAAAAQAAYAAAAFAAIAAAAQAAcAAAAFAAIAAAAQAAgAAAAFAAIAAAAQAAkAAAACAAAAAAARAAIAAAACAAAAAAARAAMAAAACAAAAAAARAAQAAAACAAAAAAARAAUAAAACAAAAAAARAAYAAAACAAAAAAARAAcAAAACAAAAAAARAAgAAAACAAAAAAARAAkAAAACAAAAAAASAAIAAAACAAAAAAASAAMAAAACAAAAAAASAAQAAAACAAAAAAASAAUAAAACAAAAAAASAAYAAAACAAAAAAASAAcAAAACAAAAAAASAAgAAAACAAAAAAASAAkAAAACAAAAAAATAAIAAAACAAAAAAATAAMAAAACAAAAAAATAAQAAAACAAAAAAATAAUAAAACAAAAAAATAAYAAAACAAAAAAATAAcAAAACAAAAAAATAAgAAAACAAAAAAATAAkAAAACAAAAAAAAAAAAAAACAAAAAAAAAAEAAAACAAAAAAABAAAAAAACAAAAAAABAAEAAAACAAAAAAACAAAAAAACAAAAAAACAAEAAAACAAAAAAADAAAAAAACAAAAAAADAAEAAAACAAAAAAAEAAAAAAACAAAAAAAEAAEAAAACAAAAAAAFAAAAAAACAAAAAAAFAAEAAAACAAAAAAAGAAAAAAACAAAAAAAGAAEAAAACAAAAAAAHAAAAAAACAAAAAAAHAAEAAAACAAAAAAAIAAAAAAACAAAAAAAIAAEAAAACAAAAAAAJAAAAAAACAAAAAAAJAAEAAAACAAAAAAAKAAAAAAACAAAAAAAKAAEAAAACAAAAAAALAAAAAAACAAAAAAALAAEAAAACAAAAAAALAAMAAAACAAAAAAALAAQAAAAFAAIAAAAMAAAAAAACAAAAAAAMAAEAAAACAAAAAAAMAAMAAAACAAAAAAAMAAQAAAAFAAIAAAANAAAAAAACAAAAAAANAAEAAAACAAAAAAAOAAAAAAACAAAAAAAOAAEAAAACAAAAAAAPAAAAAAACAAAAAAAPAAEAAAACAAAAAAAQAAAAAAACAAAAAAAQAAEAAAACAAAAAAARAAAAAAACAAAAAAARAAEAAAACAAAAAAASAAAAAAACAAAAAAASAAEAAAACAAAAAAATAAAAAAACAAAAAAATAAEAAAACAAAAAAA=")

39
Scenes/test.tscn
View file

File diff suppressed because one or more lines are too long

2
Scripts/Door.cs
View file

@ -44,7 +44,6 @@ public partial class Door : Activable
public virtual void Open()
{
if (State == DoorState.Open) return;
// _animatedSprite.Play("Opening");
State = DoorState.Open;
CallDeferred(MethodName.DeferredDisableCollision, true);
@ -56,7 +55,6 @@ public partial class Door : Activable
public virtual void Close()
{
if (State == DoorState.Closed) return;
// _animatedSprite.Play("Closing");
State = DoorState.Closed;
CallDeferred(MethodName.DeferredDisableCollision, false);