ld55/hella-farm
ld55/hella-farm
1
Fork 0
mirror of https://github.com/Steffo99/hella-farm.git synced 2024-11-22 08:04:23 +00:00
Code Activity

Again, remove Draggable from Imp

Browse source
This commit is contained in:
Steffo 2024-04-19 01:46:25 +02:00
parent 3b761f2611
commit c20eb76fb9
Signed by: steffo
GPG key ID: 5ADA3868646C3FC0
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
entities/imp.gd
View file

@ -5,7 +5,6 @@ class_name Imp
@onready var skull_spawner: Spawner = $"SkullSpawner" @onready var skull_spawner: Spawner = $"SkullSpawner"
@onready var sprite: SpriteLeftRight = $"Sprite" @onready var sprite: SpriteLeftRight = $"Sprite"
@onready var draggable: Draggable = $"Draggable"
func _on_eat_target_eaten(target: Edible): func _on_eat_target_eaten(target: Edible):
@ -13,13 +12,6 @@ func _on_eat_target_eaten(target: Edible):
if Random.rng.randf() < skull_chance: if Random.rng.randf() < skull_chance:
skull_spawner.spawn() skull_spawner.spawn()
func _on_draggable_move(movement:Vector2):
if draggable.being_dragged:
move_and_collide(movement)
sprite.handle_move(movement)
func _on_move(movement:Vector2): func _on_move(movement:Vector2):
if not draggable.being_dragged:
move_and_collide(movement) move_and_collide(movement)
sprite.handle_move(movement) sprite.handle_move(movement)

6
scenes/game/main_game.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://cxj5aud02f40j"] [gd_scene load_steps=10 format=3 uid="uid://cxj5aud02f40j"]
[ext_resource type="Script" path="res://scenes/game/main_game.gd" id="1_wiglu"] [ext_resource type="Script" path="res://scenes/game/main_game.gd" id="1_wiglu"]
[ext_resource type="PackedScene" uid="uid://dm068vaseh45n" path="res://scenes/game/game_camera.tscn" id="2_db5xs"] [ext_resource type="PackedScene" uid="uid://dm068vaseh45n" path="res://scenes/game/game_camera.tscn" id="2_db5xs"]
@ -6,6 +6,7 @@
[ext_resource type="PackedScene" uid="uid://brvbtvt4em32" path="res://behaviours/counter.tscn" id="3_p6jw3"] [ext_resource type="PackedScene" uid="uid://brvbtvt4em32" path="res://behaviours/counter.tscn" id="3_p6jw3"]
[ext_resource type="PackedScene" uid="uid://col1q3elvkfwk" path="res://scenes/game/cursor.tscn" id="5_g504x"] [ext_resource type="PackedScene" uid="uid://col1q3elvkfwk" path="res://scenes/game/cursor.tscn" id="5_g504x"]
[ext_resource type="PackedScene" uid="uid://bc2bm8lbol18w" path="res://entities/sheep.tscn" id="6_j2kdp"] [ext_resource type="PackedScene" uid="uid://bc2bm8lbol18w" path="res://entities/sheep.tscn" id="6_j2kdp"]
[ext_resource type="PackedScene" uid="uid://4d3ksr3171x4" path="res://entities/imp.tscn" id="7_7od2n"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_058kb"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_058kb"]
texture = ExtResource("2_o7bg5") texture = ExtResource("2_o7bg5")
@ -842,3 +843,6 @@ position = Vector2(307, -33)
[node name="Sheep5" parent="." instance=ExtResource("6_j2kdp")] [node name="Sheep5" parent="." instance=ExtResource("6_j2kdp")]
position = Vector2(182, -217) position = Vector2(182, -217)
[node name="Imp" parent="." instance=ExtResource("7_7od2n")]
position = Vector2(-65, -233)