Compare commits

...

3 Commits

Author SHA1 Message Date
Lilith 5aef02e205 add label showing current equipped weapon 2023-12-21 21:05:14 +01:00
Lilith 0001bbe15c Make weapons have 'fancy', human-readable name 2023-12-21 18:19:46 +01:00
Lilith f8112a3f68 make collisionshape2d of enemy scene equal to sprite size
why did i make it smaller again??
2023-12-21 18:14:31 +01:00
6 changed files with 29 additions and 1 deletions

View File

@ -10,7 +10,7 @@ height = 56
noise = SubResource("FastNoiseLite_l16dh")
[sub_resource type="RectangleShape2D" id="RectangleShape2D_18kdi"]
size = Vector2(20, 50)
size = Vector2(24, 56)
[node name="enemy" type="CharacterBody2D"]
script = ExtResource("1_bhqfx")

View File

@ -46,6 +46,13 @@ theme_override_styles/background = SubResource("StyleBoxFlat_awwb1")
step = 1.0
show_percentage = false
[node name="Label" type="Label" parent="CanvasLayer"]
offset_left = 32.0
offset_top = 16.0
offset_right = 176.0
offset_bottom = 39.0
text = "Nothing equipped."
[node name="cooldown_timer" type="Timer" parent="."]
wait_time = 0.5

View File

@ -2,7 +2,10 @@ extends CharacterBody2D
@onready var camera : Camera2D = get_node("Camera2D")
@onready var sprite : Sprite2D = get_node("Sprite2D")
@onready var health_bar : ProgressBar = get_node("CanvasLayer/ProgressBar")
@onready var weapon_label : Label = get_node("CanvasLayer/Label")
@onready var cooldown_timer : Timer = get_node("cooldown_timer") # after taking damage, don't take damage until the timer is worn off.
# Get the gravity from the project settings to be synced with RigidBody nodes.
@ -53,6 +56,10 @@ func equip_weapon(wp : Globals.Weapons) -> void:
add_child(weapon_instance)
weapon = weapon_instance
# Set weapon equip text
weapon_label.set_text(weapon.get_fancy_name() + " equipped.")
return
func _ready() -> void:

View File

@ -6,6 +6,8 @@ extends Node2D
@onready var bullet_scene : Resource = preload("res://src/scenes/weapons/_bullet.tscn")
@onready var tracker_bullet_scene : Resource = preload("res://src/scenes/weapons/_trackerbullet.tscn")
var fancy_name : String = "GIVEMEANAME"
func _ready() -> void:
if arena == null:
push_error("No arena!")
@ -15,6 +17,12 @@ func connect_up(plr : CharacterBody2D) -> void:
plr.attack.connect(_on_player_attack)
pass
func get_fancy_name() -> String:
return fancy_name
func set_fancy_name(fname : String) -> void:
fancy_name = fname
func spawn_tracker_bullet(damage : int = 10) -> void:
var tbullet : RigidBody2D = tracker_bullet_scene.instantiate()

View File

@ -1,4 +1,7 @@
extends Weapon
func _init() -> void:
set_fancy_name("Staff")
func _on_player_attack() -> void:
spawn_bullet(25)

View File

@ -1,4 +1,7 @@
extends Weapon
func _init() -> void:
set_fancy_name("Tracker Staff")
func _on_player_attack() -> void:
spawn_tracker_bullet(25)