Compare commits
No commits in common. "ee5252292580d630ea28a4b092968066eb377562" and "9c8eb77b96be08f06bd0d542e2e15570248b58cf" have entirely different histories.
ee52522925
...
9c8eb77b96
33
Main.tscn
33
Main.tscn
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=26 format=2]
|
[gd_scene load_steps=21 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=1]
|
[ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=1]
|
||||||
[ext_resource path="res://src/playerC/Player.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://src/playerC/Player.tscn" type="PackedScene" id=2]
|
||||||
|
|
@ -7,11 +7,6 @@
|
||||||
[ext_resource path="res://src/CameraControl-Position2D.gd" type="Script" id=5]
|
[ext_resource path="res://src/CameraControl-Position2D.gd" type="Script" id=5]
|
||||||
[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=6]
|
[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=6]
|
||||||
[ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7]
|
[ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7]
|
||||||
[ext_resource path="res://assets/Fonts/QuinqueFive.tres" type="DynamicFont" id=8]
|
|
||||||
[ext_resource path="res://src/UI_Dialog.tscn" type="PackedScene" id=9]
|
|
||||||
[ext_resource path="res://assets/UI/Healthbar.png" type="Texture" id=10]
|
|
||||||
[ext_resource path="res://assets/UI/Healthbar-Indicator.png" type="Texture" id=11]
|
|
||||||
[ext_resource path="res://src/UI/HealthBar.gd" type="Script" id=12]
|
|
||||||
|
|
||||||
[sub_resource type="ConvexPolygonShape2D" id=2]
|
[sub_resource type="ConvexPolygonShape2D" id=2]
|
||||||
points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
|
points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
|
||||||
|
|
@ -221,29 +216,3 @@ position = Vector2( 492, 27 )
|
||||||
[node name="ActorTemplate" parent="." instance=ExtResource( 6 )]
|
[node name="ActorTemplate" parent="." instance=ExtResource( 6 )]
|
||||||
position = Vector2( 262, 44 )
|
position = Vector2( 262, 44 )
|
||||||
actor_type = "NPC"
|
actor_type = "NPC"
|
||||||
|
|
||||||
[node name="UI_Dialog" parent="." instance=ExtResource( 9 )]
|
|
||||||
|
|
||||||
[node name="Label" type="Label" parent="."]
|
|
||||||
visible = false
|
|
||||||
margin_left = 75.0
|
|
||||||
margin_top = 14.0
|
|
||||||
margin_right = 301.0
|
|
||||||
margin_bottom = 53.0
|
|
||||||
custom_fonts/font = ExtResource( 8 )
|
|
||||||
text = "In a world where danger lurks in your plumbing. One thing decides to do another thing and we all determine it wasn't worth it. Hello World"
|
|
||||||
autowrap = true
|
|
||||||
|
|
||||||
[node name="CanvasLayer" type="CanvasLayer" parent="."]
|
|
||||||
layer = 2
|
|
||||||
|
|
||||||
[node name="HealthBar" type="TextureProgress" parent="CanvasLayer"]
|
|
||||||
margin_left = 2.0
|
|
||||||
margin_top = 2.0
|
|
||||||
margin_right = 104.0
|
|
||||||
margin_bottom = 14.0
|
|
||||||
value = 50.0
|
|
||||||
texture_under = ExtResource( 10 )
|
|
||||||
texture_progress = ExtResource( 11 )
|
|
||||||
texture_progress_offset = Vector2( 1, 1 )
|
|
||||||
script = ExtResource( 12 )
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
[gd_resource type="DynamicFont" load_steps=2 format=2]
|
|
||||||
|
|
||||||
[sub_resource type="DynamicFontData" id=1]
|
|
||||||
antialiased = false
|
|
||||||
font_path = "res://assets/Fonts/PublicPixel.ttf"
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
size = 8
|
|
||||||
font_data = SubResource( 1 )
|
|
||||||
Binary file not shown.
|
|
@ -1,8 +0,0 @@
|
||||||
[gd_resource type="DynamicFont" load_steps=2 format=2]
|
|
||||||
|
|
||||||
[sub_resource type="DynamicFontData" id=1]
|
|
||||||
font_path = "res://assets/Fonts/QuinqueFive.ttf"
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
size = 5
|
|
||||||
font_data = SubResource( 1 )
|
|
||||||
Binary file not shown.
|
|
@ -1,9 +0,0 @@
|
||||||
[gd_resource type="DynamicFont" load_steps=2 format=2]
|
|
||||||
|
|
||||||
[sub_resource type="DynamicFontData" id=1]
|
|
||||||
antialiased = false
|
|
||||||
font_path = "res://assets/Fonts/Super Mario Bros. NES.ttf"
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
size = 4
|
|
||||||
font_data = SubResource( 1 )
|
|
||||||
Binary file not shown.
|
|
@ -1,8 +0,0 @@
|
||||||
[gd_resource type="DynamicFont" load_steps=2 format=2]
|
|
||||||
|
|
||||||
[sub_resource type="DynamicFontData" id=1]
|
|
||||||
antialiased = false
|
|
||||||
font_path = "res://assets/Fonts/m5x7.ttf"
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
font_data = SubResource( 1 )
|
|
||||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 174 B |
|
|
@ -1,35 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="StreamTexture"
|
|
||||||
path="res://.import/Healthbar-Indicator.png-cbbde6797adcb3b0445dfd4f9ab1961a.stex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://assets/UI/Healthbar-Indicator.png"
|
|
||||||
dest_files=[ "res://.import/Healthbar-Indicator.png-cbbde6797adcb3b0445dfd4f9ab1961a.stex" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_mode=0
|
|
||||||
compress/bptc_ldr=0
|
|
||||||
compress/normal_map=0
|
|
||||||
flags/repeat=0
|
|
||||||
flags/filter=false
|
|
||||||
flags/mipmaps=false
|
|
||||||
flags/anisotropic=false
|
|
||||||
flags/srgb=2
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/HDR_as_SRGB=false
|
|
||||||
process/invert_color=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
stream=false
|
|
||||||
size_limit=0
|
|
||||||
detect_3d=true
|
|
||||||
svg/scale=1.0
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
[gd_resource type="StreamTexture" format=2]
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 172 B |
|
|
@ -1,35 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="StreamTexture"
|
|
||||||
path="res://.import/Healthbar.png-838f5c013355fbdfe1abb6dec9197215.stex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://assets/UI/Healthbar.png"
|
|
||||||
dest_files=[ "res://.import/Healthbar.png-838f5c013355fbdfe1abb6dec9197215.stex" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_mode=0
|
|
||||||
compress/bptc_ldr=0
|
|
||||||
compress/normal_map=0
|
|
||||||
flags/repeat=0
|
|
||||||
flags/filter=false
|
|
||||||
flags/mipmaps=false
|
|
||||||
flags/anisotropic=false
|
|
||||||
flags/srgb=2
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/HDR_as_SRGB=false
|
|
||||||
process/invert_color=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
stream=false
|
|
||||||
size_limit=0
|
|
||||||
detect_3d=true
|
|
||||||
svg/scale=1.0
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
extends TextureProgress
|
|
||||||
|
|
||||||
|
|
||||||
# Declare member variables here. Examples:
|
|
||||||
# var a = 2
|
|
||||||
# var b = "text"
|
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
|
||||||
func _ready():
|
|
||||||
pass # Replace with function body.
|
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
|
||||||
func _process(delta):
|
|
||||||
value = PlayerInfo.player_health
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
[gd_scene load_steps=3 format=2]
|
|
||||||
|
|
||||||
[ext_resource path="res://assets/Fonts/QuinqueFive.tres" type="DynamicFont" id=1]
|
|
||||||
[ext_resource path="res://icon.png" type="Texture" id=2]
|
|
||||||
|
|
||||||
[node name="UI_Dialog" type="Control"]
|
|
||||||
anchor_right = 1.0
|
|
||||||
anchor_bottom = 1.0
|
|
||||||
|
|
||||||
[node name="PanelContainer" type="PanelContainer" parent="."]
|
|
||||||
margin_left = 2.0
|
|
||||||
margin_top = 2.0
|
|
||||||
margin_right = 318.0
|
|
||||||
margin_bottom = 80.0
|
|
||||||
|
|
||||||
[node name="HSplitContainer" type="HSplitContainer" parent="PanelContainer"]
|
|
||||||
margin_left = 7.0
|
|
||||||
margin_top = 7.0
|
|
||||||
margin_right = 309.0
|
|
||||||
margin_bottom = 71.0
|
|
||||||
size_flags_vertical = 0
|
|
||||||
split_offset = 1
|
|
||||||
|
|
||||||
[node name="TextureRect" type="TextureRect" parent="PanelContainer/HSplitContainer"]
|
|
||||||
margin_right = 64.0
|
|
||||||
margin_bottom = 64.0
|
|
||||||
grow_vertical = 2
|
|
||||||
size_flags_vertical = 5
|
|
||||||
texture = ExtResource( 2 )
|
|
||||||
|
|
||||||
[node name="Label" type="Label" parent="PanelContainer/HSplitContainer"]
|
|
||||||
margin_left = 77.0
|
|
||||||
margin_right = 302.0
|
|
||||||
margin_bottom = 64.0
|
|
||||||
size_flags_vertical = 1
|
|
||||||
size_flags_stretch_ratio = 5.0
|
|
||||||
custom_fonts/font = ExtResource( 1 )
|
|
||||||
text = "In a world where danger lurks in your plumbing. One thing decides to do another thing and we all determine it wasn't worth it. Hello World"
|
|
||||||
autowrap = true
|
|
||||||
|
|
@ -127,7 +127,7 @@ actor_type = "Enemy"
|
||||||
position = Vector2( 11, -7 )
|
position = Vector2( 11, -7 )
|
||||||
frames = SubResource( 20 )
|
frames = SubResource( 20 )
|
||||||
animation = "idle"
|
animation = "idle"
|
||||||
frame = 2
|
frame = 0
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
"_aseprite_wizard_config_": {
|
"_aseprite_wizard_config_": {
|
||||||
"layer": "",
|
"layer": "",
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@ onready var player_hurtbox = $Hurtbox_Component/CollisionShape2D
|
||||||
|
|
||||||
onready var gun = $Gun
|
onready var gun = $Gun
|
||||||
|
|
||||||
func _ready() -> void:
|
|
||||||
PlayerInfo.player_health = $Health_Component.health
|
|
||||||
|
|
||||||
#var sound_effects = preload("res://src/playerC/resources/sound_effects.tres")
|
#var sound_effects = preload("res://src/playerC/resources/sound_effects.tres")
|
||||||
|
|
||||||
|
|
@ -42,7 +40,6 @@ func gotcha(damage):
|
||||||
$Health_Component.take_damage(damage)
|
$Health_Component.take_damage(damage)
|
||||||
if $Health_Component.health > 0:
|
if $Health_Component.health > 0:
|
||||||
movement_state_machine.change_state($movement_state_machine/hurt)
|
movement_state_machine.change_state($movement_state_machine/hurt)
|
||||||
PlayerInfo.player_health = $Health_Component.health
|
|
||||||
yield( get_tree().create_timer(2 + $movement_state_machine/hurt.timeout_seconds), "timeout")
|
yield( get_tree().create_timer(2 + $movement_state_machine/hurt.timeout_seconds), "timeout")
|
||||||
$Hurtbox_Component.set_hurtbox(true)
|
$Hurtbox_Component.set_hurtbox(true)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user