Container tasks #293
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| extends MarginContainer | ||
|
|
||
| class_name MarginContainerBase | ||
|
|
||
| export (String) var menu_name | ||
|
|
||
| export (bool) var disable_movement | ||
|
|
||
| var ui_data: Dictionary = {} | ||
|
|
||
| func _init(): | ||
| connect("visibility_changed", self, "_on_visibility_changed") | ||
|
|
||
| #called by ui system | ||
| func base_open(): | ||
| show() | ||
|
|
||
| #called by self or ui system | ||
| func base_close(): | ||
| hide() | ||
|
|
||
| # warning-ignore:unused_argument | ||
|
|
||
| func _on_visibility_changed(): | ||
| if not disable_movement: | ||
| return | ||
| if visible: | ||
| UIManager.ui_opened(menu_name) | ||
| else: | ||
| UIManager.ui_closed(menu_name) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,10 +11,11 @@ var can_pickup_with_mouse: bool | |
| var holding_player: Player | ||
| var being_held: bool | ||
| var being_picked_up: bool | ||
| var item_location:NodePath #The location of the item | ||
| var item_from_container:bool #Checks item is from container or not | ||
|
|
||
|
|
||
| func _ready() -> void: | ||
| # Wait another frame for map to finish setting up | ||
| yield(get_tree(), "idle_frame") | ||
| # print("(items.gd/_ready)") | ||
|
|
@@ -34,7 +35,11 @@ func picked_up() -> void: | |
| """Item is picked up.""" | ||
| set_collision_layer_bit(4, false) | ||
| being_held = true | ||
| if item_from_container: | ||
| var path = get_tree().get_root().get_node(item_location) | ||
| path.remove_child(self) | ||
|
There was a problem hiding this comment. the bug @nicemicro and I found(where items get teleported to (0,0) coordinate) is because item_from_container is never set to false. you could set it to false here... |
||
| else: | ||
| map_items.remove_child(self) | ||
| holding_player.item_handler.add_child(self) | ||
| position = Vector2.ZERO | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| extends Area2D | ||
|
|
||
| #export(Resource) var interact_resource | ||
| var pressed:bool = false | ||
| var interacting:bool = false | ||
| var interactor:Dictionary | ||
| #TODO:Add a shader | ||
|
|
||
|
|
||
| func _ready(): | ||
| #interact_resource.init_resource(self) | ||
| pass | ||
|
|
||
| func reset() -> void: #Resets the node | ||
| interacting = false | ||
| pressed = false | ||
| interactor.clear() | ||
|
|
||
| func register(body) -> void:#Register a body | ||
| interactor[body.id] = body.get_path() | ||
| interactor["bool"] = true | ||
|
There was a problem hiding this comment. What does this bool do? more descriptive names can never hurt |
||
| return | ||
|
|
||
| func _input(event):#Checks that the player presses the key is in interacting dic | ||
| if event.is_action_pressed("interact") and interactor.keys().has(Network.get_my_id()): | ||
| interacting = true | ||
| pressed = true | ||
| UIManager.open_ui("container", interactor) | ||
| #interact(interactor) | ||
|
|
||
| func _on_Container_body_entered(_body):#Check wether the body is player or not and record the player | ||
| for bodies in get_overlapping_bodies(): | ||
| if bodies.is_in_group("players"): | ||
| if interactor.empty(): | ||
| register(bodies) | ||
| else: | ||
| return | ||
|
There was a problem hiding this comment. this can be better structured as |
||
|
|
||
|
|
||
| func _on_Container_body_exited(_body):#Closes the ui | ||
| UIManager.close_ui("container") | ||
| reset() | ||
|
|
||
| #func interact(interactor):#The main func to pass data | ||
| # interact_resource.interact(self,interactor) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| [remap] | ||
|
|
||
| importer="texture" | ||
| type="StreamTexture" | ||
| path="res://.import/Container.png-879c764ee37a9377f78340a313b4b235.stex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://assets/ui/tasks/container/Textures/Container.png" | ||
| dest_files=[ "res://.import/Container.png-879c764ee37a9377f78340a313b4b235.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=true | ||
| 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 | ||
| stream=false | ||
| size_limit=0 | ||
| detect_3d=true | ||
| svg/scale=1.0 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what does this function do(maybe a more descriptive name)?