nettoyage et apparition de l'item en inventaire dans la main du robot
This commit is contained in:
parent
18b48f5320
commit
0882b06be7
@ -5,8 +5,6 @@ const TERRAIN_IMAGE_GAME_FACTOR = 40
|
|||||||
const DEFAULT_CONTAMINATION_CENTRAL_ZONE_MAX_SIZE = 300
|
const DEFAULT_CONTAMINATION_CENTRAL_ZONE_MAX_SIZE = 300
|
||||||
const DEFAULT_CONTAMINATION_CENTRAL_ZONE_MIN_SIZE = 50
|
const DEFAULT_CONTAMINATION_CENTRAL_ZONE_MIN_SIZE = 50
|
||||||
|
|
||||||
signal terrain_updated
|
|
||||||
|
|
||||||
@export var terrainSize : Vector2 = Vector2(1000,1000)
|
@export var terrainSize : Vector2 = Vector2(1000,1000)
|
||||||
|
|
||||||
@export var contamination : Image = null
|
@export var contamination : Image = null
|
||||||
|
|||||||
@ -13,10 +13,8 @@ func is_one_time_use():
|
|||||||
return true
|
return true
|
||||||
|
|
||||||
func can_use(player : Player, zone : Area2D) -> bool:
|
func can_use(player : Player, zone : Area2D) -> bool:
|
||||||
print(zone.global_position)
|
|
||||||
return player.planet.is_in_zone(zone.global_position)
|
return player.planet.is_in_zone(zone.global_position)
|
||||||
|
|
||||||
func use(player : Player, zone : Area2D) -> bool:
|
func use(player : Player, zone : Area2D) -> bool:
|
||||||
print(zone.global_position)
|
|
||||||
player.planet.instantiate_entity(scene, zone.global_position)
|
player.planet.instantiate_entity(scene, zone.global_position)
|
||||||
return true
|
return true
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
[gd_scene load_steps=23 format=3 uid="uid://bgvbgeq46wee2"]
|
[gd_scene load_steps=24 format=3 uid="uid://bgvbgeq46wee2"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://das7twcy5153p" path="res://entities/player/scripts/player.gd" id="1_abrql"]
|
[ext_resource type="Script" uid="uid://das7twcy5153p" path="res://entities/player/scripts/player.gd" id="1_abrql"]
|
||||||
[ext_resource type="Texture2D" uid="uid://c7ff87jniga5m" path="res://entities/player/assets/sprites/robot.png" id="1_symyc"]
|
[ext_resource type="Texture2D" uid="uid://c7ff87jniga5m" path="res://entities/player/assets/sprites/robot.png" id="1_symyc"]
|
||||||
[ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://entities/player/sounds/dig/dig_1.wav" id="3_gx6sm"]
|
[ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://entities/player/sounds/dig/dig_1.wav" id="3_gx6sm"]
|
||||||
|
[ext_resource type="Texture2D" uid="uid://bf6nw4onkhavr" path="res://common/inventory/assets/icons/shovel.svg" id="3_yqrof"]
|
||||||
[ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://entities/player/sounds/dig/dig_2.wav" id="4_yqrof"]
|
[ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://entities/player/sounds/dig/dig_2.wav" id="4_yqrof"]
|
||||||
[ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://entities/player/sounds/dig/dig_3.wav" id="5_3wlsy"]
|
[ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://entities/player/sounds/dig/dig_3.wav" id="5_3wlsy"]
|
||||||
[ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://entities/player/sounds/harvest/harvest_1.wav" id="6_b2kln"]
|
[ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://entities/player/sounds/harvest/harvest_1.wav" id="6_b2kln"]
|
||||||
@ -60,9 +61,15 @@ script = ExtResource("1_abrql")
|
|||||||
|
|
||||||
[node name="Sprite" type="Sprite2D" parent="."]
|
[node name="Sprite" type="Sprite2D" parent="."]
|
||||||
position = Vector2(2, -46)
|
position = Vector2(2, -46)
|
||||||
scale = Vector2(0.084375, 0.084375)
|
scale = Vector2(0.08, 0.08)
|
||||||
texture = ExtResource("1_symyc")
|
texture = ExtResource("1_symyc")
|
||||||
|
|
||||||
|
[node name="ItemSprite" type="Sprite2D" parent="."]
|
||||||
|
unique_name_in_owner = true
|
||||||
|
visible = false
|
||||||
|
position = Vector2(0, 5)
|
||||||
|
texture = ExtResource("3_yqrof")
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||||
position = Vector2(-2, -18)
|
position = Vector2(-2, -18)
|
||||||
shape = SubResource("CircleShape2D_sglur")
|
shape = SubResource("CircleShape2D_sglur")
|
||||||
|
|||||||
@ -2,6 +2,7 @@ extends CharacterBody2D
|
|||||||
class_name Player
|
class_name Player
|
||||||
|
|
||||||
const MAX_REACH = 100
|
const MAX_REACH = 100
|
||||||
|
const HOLDING_ITEM_SPRITE_SIZE = 40.
|
||||||
|
|
||||||
signal player_updated(player: Player)
|
signal player_updated(player: Player)
|
||||||
signal upgraded
|
signal upgraded
|
||||||
@ -68,8 +69,16 @@ func _process(_delta):
|
|||||||
func _on_inventory_updated(_inventory: Inventory):
|
func _on_inventory_updated(_inventory: Inventory):
|
||||||
if inventory.get_item():
|
if inventory.get_item():
|
||||||
setup_preview_zone(inventory.get_item().use_zone_radius)
|
setup_preview_zone(inventory.get_item().use_zone_radius)
|
||||||
|
var item_texture = inventory.get_item().icon
|
||||||
|
%ItemSprite.texture = item_texture
|
||||||
|
%ItemSprite.scale = Vector2(
|
||||||
|
1./(item_texture.get_width()/HOLDING_ITEM_SPRITE_SIZE),
|
||||||
|
1./(item_texture.get_height()/HOLDING_ITEM_SPRITE_SIZE)
|
||||||
|
)
|
||||||
|
%ItemSprite.visible = inventory.get_item() != null
|
||||||
emit_signal("player_updated", self)
|
emit_signal("player_updated", self)
|
||||||
|
|
||||||
|
|
||||||
func calculate_direction():
|
func calculate_direction():
|
||||||
var input_direction: Vector2 = Input.get_vector("move_left", "move_right", "move_up", "move_down")
|
var input_direction: Vector2 = Input.get_vector("move_left", "move_right", "move_up", "move_down")
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user