TeaSanctuary/1bit-game-jam
4
0
Fork 0
Code Issues 1 Pull requests Projects Releases 2 Packages Wiki Activity

Compare commits

base: TeaSanctuary:69436e2799c4f1248ef10a122e815a4eb37ed305
Branches Tags
TeaSanctuary:master
TeaSanctuary:hotfix
TeaSanctuary:deadline
..
compare: TeaSanctuary:e8f5c3de80964739fbb41830f0fb973eff18f492
Branches Tags
TeaSanctuary:master
TeaSanctuary:hotfix
TeaSanctuary:deadline

No commits in common. "69436e2799c4f1248ef10a122e815a4eb37ed305" and "e8f5c3de80964739fbb41830f0fb973eff18f492" have entirely different histories.
69436e2799 ... e8f5c3de80

6 changed files with 26 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

6
prefabs/entities/And.tscn
View file

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://c1dj6cg6x2nsd"]
[ext_resource type="Script" path="res://scripts/entities/And.cs" id="1_s2pvp"]
[node name="And" type="Node"]
script = ExtResource("1_s2pvp")

72
scenes/level.tscn
View file

File diff suppressed because one or more lines are too long

120
scenes/main_scene.tscn
View file

@ -86,126 +86,6 @@ position = Vector2(166, 256)
[node name="PS" type="Node2D" parent="Zones/PlayZone1"] [node name="PS" type="Node2D" parent="Zones/PlayZone1"]
position = Vector2(55, 127) position = Vector2(55, 127)
[node name="PlayZone2" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(33, 416)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone2"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone2"]
position = Vector2(477, 94)
[node name="PS" type="Node2D" parent="Zones/PlayZone2"]
position = Vector2(48, 22)
[node name="PlayZone3" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(609, 354)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone3"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone3"]
position = Vector2(283, 187)
[node name="PS" type="Node2D" parent="Zones/PlayZone3"]
position = Vector2(23, 110)
[node name="PlayZone4" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(997, -889)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone4"]
position = Vector2(0, 4)
[node name="BR" type="Node2D" parent="Zones/PlayZone4"]
position = Vector2(1129, 1709)
[node name="PS" type="Node2D" parent="Zones/PlayZone4"]
position = Vector2(51, 1290)
[node name="PlayZone5" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(608, -106)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone5"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone5"]
position = Vector2(291, 238)
[node name="PS" type="Node2D" parent="Zones/PlayZone5"]
position = Vector2(143, 214)
[node name="PlayZone6" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(605, -515)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone6"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone6"]
position = Vector2(289, 224)
[node name="PS" type="Node2D" parent="Zones/PlayZone6"]
position = Vector2(153, 209)
[node name="PlayZone7" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(610, -930)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone7"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone7"]
position = Vector2(289, 224)
[node name="PS" type="Node2D" parent="Zones/PlayZone7"]
position = Vector2(153, 209)
[node name="PlayZone8" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(-435, -1211)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone8"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone8"]
position = Vector2(931, 1085)
[node name="PS" type="Node2D" parent="Zones/PlayZone8"]
position = Vector2(738, 1016)
[node name="PlayZone9" parent="Zones" node_paths=PackedStringArray("TopLeftCorner", "BottomRightCorner", "PlayerSpawnPoint") instance=ExtResource("4_5sggf")]
position = Vector2(449, 833)
TopLeftCorner = NodePath("TL")
BottomRightCorner = NodePath("BR")
PlayerSpawnPoint = NodePath("PS")
[node name="TL" type="Node2D" parent="Zones/PlayZone9"]
position = Vector2(1, 0)
[node name="BR" type="Node2D" parent="Zones/PlayZone9"]
position = Vector2(413, 317)
[node name="PS" type="Node2D" parent="Zones/PlayZone9"]
position = Vector2(209, 304)
[node name="Player" parent="." instance=ExtResource("1_65a7v")] [node name="Player" parent="." instance=ExtResource("1_65a7v")]
position = Vector2(74, 147) position = Vector2(74, 147)

10
scripts/enemies/Boss.cs
View file

@ -11,8 +11,7 @@ public partial class Boss : CharacterBody2D
public enum State public enum State
{ {
Default, Default,
Injured, Injured
Killed
} }
private AnimatedSprite2D _sprite; private AnimatedSprite2D _sprite;
@ -46,10 +45,8 @@ public partial class Boss : CharacterBody2D
_state = State.Default; _state = State.Default;
} }
break; break;
case State.Killed:
break;
} }
if (_state != State.Killed && _currentHp <= 0) if (_currentHp <= 0)
{ {
EmitSignal(SignalName.Killed); EmitSignal(SignalName.Killed);
} }
@ -58,9 +55,6 @@ public partial class Boss : CharacterBody2D
private void _OnAttack(Node2D body) private void _OnAttack(Node2D body)
{ {
if (_state == State.Killed)
return;
if (body is LivingArmor armor) if (body is LivingArmor armor)
{ {
_currentHp -= 1; _currentHp -= 1;

2
scripts/enemies/Claw.cs
View file

@ -82,7 +82,7 @@ public partial class Claw : CharacterBody2D
_isPlayerNearBy = false; _isPlayerNearBy = false;
} }
public void Enable(Node2D body) public void Enable()
{ {
GD.Print("Boss enabled"); GD.Print("Boss enabled");
_state = State.Moving; _state = State.Moving;

28
scripts/entities/And.cs
View file

@ -1,28 +0,0 @@
using Godot;
using System;
public partial class And : Node
{
[Export] public int CountOfButtons = 2;
[Signal]
public delegate void ConditionMetEventHandler();
[Signal]
public delegate void ConditionNotMetEventHandler();
private int _buttons = 0;
public void Increment()
{
_buttons++;
if (_buttons == CountOfButtons)
EmitSignal(SignalName.ConditionNotMet);
}
public void Decrement()
{
_buttons--;
if (_buttons != CountOfButtons)
EmitSignal(SignalName.ConditionNotMet);
}
}