From fc5898ce7a1eb52c487d5bdd88c557b782b4a4a5 Mon Sep 17 00:00:00 2001 From: Dustin Date: Mon, 7 Apr 2025 20:35:43 -0700 Subject: [PATCH] Punch fist item for punch attack. --- assets/items/doodad.tres | 1 + assets/items/fist.png | Bin 0 -> 153 bytes assets/items/fist.png.import | 35 ++++++++++++++++++++++++++ assets/items/punch.tres | 10 ++++++++ assets/items/sword.png | Bin 0 -> 179 bytes assets/items/sword.png.import | 35 ++++++++++++++++++++++++++ src/actors/players/playerE/PlayerE.gd | 8 +++--- src/classes/item.gd | 1 + src/ui/SelectedInventoryItems.gd | 2 ++ 9 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 assets/items/fist.png create mode 100644 assets/items/fist.png.import create mode 100644 assets/items/punch.tres create mode 100644 assets/items/sword.png create mode 100644 assets/items/sword.png.import diff --git a/assets/items/doodad.tres b/assets/items/doodad.tres index 8b65333..a554281 100644 --- a/assets/items/doodad.tres +++ b/assets/items/doodad.tres @@ -25,3 +25,4 @@ script = ExtResource( 1 ) name = "mushroom" inventory_icon = ExtResource( 3 ) in_game_sprite = SubResource( 3 ) +consumable = true diff --git a/assets/items/fist.png b/assets/items/fist.png new file mode 100644 index 0000000000000000000000000000000000000000..7fcb078adf941b02ade59e2850aa6575d5691dad GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6zM9{GlYxAm0G|+7 zApQUUe;_$keCGb(MQI>)B|(0{Akodb4jn+ghNp{Th{V+7gau*=O$;paCAkEd0uHn| qGn`Y8W4IhJgX54QPX^y%ZieD=h99pLXSM?MFnGH9xvXM4o< literal 0 HcmV?d00001 diff --git a/assets/items/fist.png.import b/assets/items/fist.png.import new file mode 100644 index 0000000..38da5af --- /dev/null +++ b/assets/items/fist.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fist.png-706e5fdb4c3a8f903a9552e9097a3a72.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/items/fist.png" +dest_files=[ "res://.import/fist.png-706e5fdb4c3a8f903a9552e9097a3a72.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 diff --git a/assets/items/punch.tres b/assets/items/punch.tres new file mode 100644 index 0000000..d93b411 --- /dev/null +++ b/assets/items/punch.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://src/classes/item.gd" type="Script" id=1] +[ext_resource path="res://assets/items/fist.png" type="Texture" id=2] + +[resource] +script = ExtResource( 1 ) +name = "punch" +inventory_icon = ExtResource( 2 ) +consumable = false diff --git a/assets/items/sword.png b/assets/items/sword.png new file mode 100644 index 0000000000000000000000000000000000000000..896498e43df840e66a1af45e9260e9104abf663c GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6zM9{GlYxAp0G|+7 zApQUU{{sgO02v=9UAbPpi@*HKVjzdDB*-rqB=`S+RpoJz^~F<}tFLe~f9{D#nT? TkBC)3Qy4s5{an^LB{Ts5LG(I_ literal 0 HcmV?d00001 diff --git a/assets/items/sword.png.import b/assets/items/sword.png.import new file mode 100644 index 0000000..713dc69 --- /dev/null +++ b/assets/items/sword.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sword.png-847a038487b8fb3480b77e98fb70eb52.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/items/sword.png" +dest_files=[ "res://.import/sword.png-847a038487b8fb3480b77e98fb70eb52.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 diff --git a/src/actors/players/playerE/PlayerE.gd b/src/actors/players/playerE/PlayerE.gd index cc67e85..ba0f5d8 100644 --- a/src/actors/players/playerE/PlayerE.gd +++ b/src/actors/players/playerE/PlayerE.gd @@ -8,7 +8,7 @@ export var player_number: int = 1 onready var player_inventory :InventoryManager = InventoryManager.new() -#var mushroom :Item = preload("res://assets/items/doodad.tres") +var punch_item :Item = preload("res://assets/items/punch.tres") # Called when the node enters the scene tree for the first time. func _ready(): @@ -17,8 +17,8 @@ func _ready(): # Set initial player position in world. global_position = LevelInfo.player_start_position -# player_inventory.add_to_inventory(mushroom) -# player_inventory.select_primary(mushroom) + player_inventory.add_to_inventory(punch_item) + player_inventory.select_primary(punch_item) @@ -56,6 +56,6 @@ func touch_the_thing(the_thing: Interactable) -> bool: the_thing.trigger_interaction() if the_thing is ItemPickup: player_inventory.add_to_inventory(the_thing.item) - player_inventory.select_primary(the_thing.item) + player_inventory.select_secondary(the_thing.item) the_thing.trigger_interaction() return true diff --git a/src/classes/item.gd b/src/classes/item.gd index 7604f3e..1d06a1a 100644 --- a/src/classes/item.gd +++ b/src/classes/item.gd @@ -8,6 +8,7 @@ extends Resource export var name :String export var inventory_icon :Texture export var in_game_sprite :SpriteFrames +export var consumable :bool = true # Called when the node enters the scene tree for the first time. func _ready(): diff --git a/src/ui/SelectedInventoryItems.gd b/src/ui/SelectedInventoryItems.gd index 2476635..866f61a 100644 --- a/src/ui/SelectedInventoryItems.gd +++ b/src/ui/SelectedInventoryItems.gd @@ -17,3 +17,5 @@ func _process(delta): if (PlayerInfo.player_inventory.primary_selection): primary_item.texture = PlayerInfo.player_inventory.primary_selection.inventory_icon + if (PlayerInfo.player_inventory.secondary_selection): + secondary_item.texture = PlayerInfo.player_inventory.secondary_selection.inventory_icon