diff --git a/GUI/TimesSavedMayuri.tscn b/GUI/TimesSavedMayuri.tscn new file mode 100644 index 0000000..cd64891 --- /dev/null +++ b/GUI/TimesSavedMayuri.tscn @@ -0,0 +1,16 @@ +[gd_scene format=3 uid="uid://boom77xx6tgwd"] + +[node name="TimesSavedMayuri" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Label" type="Label" parent="."] +layout_mode = 0 +offset_right = 1153.0 +offset_bottom = 92.0 +theme_override_font_sizes/font_size = 70 +text = "Times saved Mayuri:" diff --git a/GUI/times_saved_mayuri.gd b/GUI/times_saved_mayuri.gd new file mode 100644 index 0000000..e0cb640 --- /dev/null +++ b/GUI/times_saved_mayuri.gd @@ -0,0 +1,17 @@ +extends Control + +@export var timesSavedMayuri: int = 0 + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(_delta: float) -> void: + $Label.text = "Times Saved Mayuri: "+str(timesSavedMayuri) + pass + + +func _on_mayuri_saved_mayuri() -> void: + timesSavedMayuri += 1 + pass # Replace with function body. diff --git a/GUI/times_saved_mayuri.gd.uid b/GUI/times_saved_mayuri.gd.uid new file mode 100644 index 0000000..c9f09a5 --- /dev/null +++ b/GUI/times_saved_mayuri.gd.uid @@ -0,0 +1 @@ +uid://dnlqmlsbdf81q diff --git a/Images/icon.svg.import b/Images/icon.svg.import index 75cea77..9d70f65 100644 --- a/Images/icon.svg.import +++ b/Images/icon.svg.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/icon.svg-b7ee14c4fc7622c16acfaa49648fa144.cte compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 @@ -25,6 +27,10 @@ mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false diff --git a/Images/mad scientist.jpg b/Images/mad scientist.jpg new file mode 100644 index 0000000..fce33a0 Binary files /dev/null and b/Images/mad scientist.jpg differ diff --git a/Images/mad scientist.jpg.import b/Images/mad scientist.jpg.import new file mode 100644 index 0000000..2d39fc5 --- /dev/null +++ b/Images/mad scientist.jpg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c603velf6orgn" +path="res://.godot/imported/mad scientist.jpg-def1cac3029160b1f2c5c21b4aebf101.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Images/mad scientist.jpg" +dest_files=["res://.godot/imported/mad scientist.jpg-def1cac3029160b1f2c5c21b4aebf101.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Images/mayuri.jpg b/Images/mayuri.jpg new file mode 100644 index 0000000..d437c6d Binary files /dev/null and b/Images/mayuri.jpg differ diff --git a/Images/mayuri.jpg.import b/Images/mayuri.jpg.import new file mode 100644 index 0000000..b4840ce --- /dev/null +++ b/Images/mayuri.jpg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://eebiu55j62fl" +path="res://.godot/imported/mayuri.jpg-522442b33201b6312dd5fa1310f32990.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Images/mayuri.jpg" +dest_files=["res://.godot/imported/mayuri.jpg-522442b33201b6312dd5fa1310f32990.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Mayuri/Mayuri.tscn b/Mayuri/Mayuri.tscn new file mode 100644 index 0000000..33d876b --- /dev/null +++ b/Mayuri/Mayuri.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=4 format=3 uid="uid://cbx0yhwl5jmq7"] + +[ext_resource type="Script" uid="uid://cj5ov5sg41e2j" path="res://Mayuri/mayuri.gd" id="1_mda05"] +[ext_resource type="Texture2D" uid="uid://eebiu55j62fl" path="res://Images/mayuri.jpg" id="1_nvte1"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_1xjg7"] +size = Vector2(58, 76) + +[node name="Mayuri" type="Area2D"] +script = ExtResource("1_mda05") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(-0.2499981, 0) +shape = SubResource("RectangleShape2D_1xjg7") + +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(0.37500012, -0.5000019) +scale = Vector2(0.30283505, 0.2961538) +texture = ExtResource("1_nvte1") + +[connection signal="savedMayuri" from="." to="." method="_on_saved_mayuri"] diff --git a/Mayuri/mayuri.gd b/Mayuri/mayuri.gd new file mode 100644 index 0000000..af72ff5 --- /dev/null +++ b/Mayuri/mayuri.gd @@ -0,0 +1,31 @@ +extends Area2D + + +@export var spawnArea: Rect2 = Rect2(Vector2(0, 0), Vector2(1100, 650)) +@export var pickupScene: PackedScene +signal savedMayuri +@onready var gui = get_node("/root/World/TimesSavedMayuri") +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + connect("body_entered", Callable(self, "_on_body_entered")) + +func spawn_pickup(): + var pickup = pickupScene.instantiate() + var pos = Vector2( + randf_range(spawnArea.position.x, spawnArea.position.x + spawnArea.size.x), + randf_range(spawnArea.position.y, spawnArea.position.y + spawnArea.size.y) + ) + pickup.connect("savedMayuri", Callable(gui, "_on_mayuri_saved_mayuri")) + pickup.pickupScene = pickupScene + pickup.position = pos + get_parent().call_deferred("add_child", pickup) + + + +func _on_body_entered(body): + if body.name == "Player": + queue_free() + spawn_pickup() + emit_signal("savedMayuri") + + diff --git a/Mayuri/mayuri.gd.uid b/Mayuri/mayuri.gd.uid new file mode 100644 index 0000000..3d3d845 --- /dev/null +++ b/Mayuri/mayuri.gd.uid @@ -0,0 +1 @@ +uid://cj5ov5sg41e2j diff --git a/Player/Player.tscn b/Player/Player.tscn index 322e3b4..73693d6 100644 --- a/Player/Player.tscn +++ b/Player/Player.tscn @@ -1,17 +1,21 @@ [gd_scene load_steps=4 format=3 uid="uid://bp5bv2g1ydavl"] -[ext_resource type="Script" path="res://Player/player.gd" id="1_yg0ns"] -[ext_resource type="Texture2D" uid="uid://vu0c2patvoh2" path="res://Images/Kurisu pfp.jpg" id="2_1ixda"] +[ext_resource type="Script" uid="uid://546ym7muel36" path="res://Player/player.gd" id="1_yg0ns"] +[ext_resource type="Texture2D" uid="uid://c603velf6orgn" path="res://Images/mad scientist.jpg" id="2_q3lat"] -[sub_resource type="CircleShape2D" id="CircleShape2D_y60p4"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q3lat"] +size = Vector2(9.099999, 12.1) [node name="Player" type="CharacterBody2D"] script = ExtResource("1_yg0ns") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.5, 0.5) -texture = ExtResource("2_1ixda") +position = Vector2(17.625, 19.599998) +scale = Vector2(0.49054056, 0.44411764) +texture = ExtResource("2_q3lat") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false -shape = SubResource("CircleShape2D_y60p4") +position = Vector2(17.5, 19.499998) +scale = Vector2(10, 10) +shape = SubResource("RectangleShape2D_q3lat") diff --git a/Player/player.gd b/Player/player.gd index e24c6db..3c2a1f1 100644 --- a/Player/player.gd +++ b/Player/player.gd @@ -4,7 +4,18 @@ extends CharacterBody2D #please look away pretty please; this is far later #Also advance programmers: Hello!!! #I'm only taking the most optimal answer: GLGL +# movement by bung1r. And also chatgpt. But mostly me. +@export var speed = 500 +func get_input(): + var input_direction = Input.get_vector("left", "right", "up", "down") + velocity = input_direction * speed + return velocity + func _physics_process(delta: float) -> void: - pass + var vel = get_input() * delta + var collision = move_and_collide(vel) + if collision: + print("Collided with: ", collision.get_collider()) + #this is your only hint and also use docs ;) diff --git a/World/World.tscn b/World/World.tscn index 8e35d53..4c876db 100644 --- a/World/World.tscn +++ b/World/World.tscn @@ -1,8 +1,30 @@ -[gd_scene load_steps=2 format=3 uid="uid://bxass6jkvmten"] +[gd_scene load_steps=6 format=3 uid="uid://bxass6jkvmten"] [ext_resource type="PackedScene" uid="uid://bp5bv2g1ydavl" path="res://Player/Player.tscn" id="1_c5kd8"] +[ext_resource type="PackedScene" uid="uid://cbx0yhwl5jmq7" path="res://Mayuri/Mayuri.tscn" id="2_y6flb"] +[ext_resource type="PackedScene" uid="uid://boom77xx6tgwd" path="res://GUI/TimesSavedMayuri.tscn" id="3_il6x7"] +[ext_resource type="Script" uid="uid://dnlqmlsbdf81q" path="res://GUI/times_saved_mayuri.gd" id="4_o14yy"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_y6flb"] +size = Vector2(1151, 651) [node name="World" type="Node2D"] [node name="Player" parent="." instance=ExtResource("1_c5kd8")] position = Vector2(524, 265) + +[node name="Mayuri" parent="." instance=ExtResource("2_y6flb")] +position = Vector2(395, 273) +pickupScene = ExtResource("2_y6flb") + +[node name="Area2D" type="Area2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +visible = false +position = Vector2(575.5, 325.5) +shape = SubResource("RectangleShape2D_y6flb") + +[node name="TimesSavedMayuri" parent="." instance=ExtResource("3_il6x7")] +script = ExtResource("4_o14yy") + +[connection signal="savedMayuri" from="Mayuri" to="TimesSavedMayuri" method="_on_mayuri_saved_mayuri"] diff --git a/project.godot b/project.godot index 3fb07c5..bb03187 100644 --- a/project.godot +++ b/project.godot @@ -23,6 +23,33 @@ folder_colors={ "res://World/": "green" } +[input] + +left={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) +] +} +up={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} +down={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} +right={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} + [rendering] renderer/rendering_method="gl_compatibility"