Compare commits
No commits in common. "dda4a89e53cd753738fcb639ece5b155b95b5a27" and "e123f67eaeb2170a273542a6e4355cca1114fea9" have entirely different histories.
dda4a89e53
...
e123f67eae
2
week2/original_files/.gitattributes
vendored
2
week2/original_files/.gitattributes
vendored
@ -1,2 +0,0 @@
|
|||||||
# Normalize EOL for all files that Git considers text files.
|
|
||||||
* text=auto eol=lf
|
|
||||||
2
week2/original_files/.gitignore
vendored
2
week2/original_files/.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
# Godot 4+ specific ignores
|
|
||||||
.godot/
|
|
||||||
@ -1 +0,0 @@
|
|||||||
<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="2" width="124" height="124" rx="14" fill="#363d52" stroke="#212532" stroke-width="4"/><g transform="scale(.101) translate(122 122)"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 813 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H447l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c3 34 55 34 58 0v-86c-3-34-55-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 950 B |
@ -1,37 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://d24mluxxgy878"
|
|
||||||
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://icon.svg"
|
|
||||||
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
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/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
|
|
||||||
svg/scale=1.0
|
|
||||||
editor/scale_with_editor_scale=false
|
|
||||||
editor/convert_colors_with_editor_theme=false
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
; Engine configuration file.
|
|
||||||
; It's best edited using the editor UI and not directly,
|
|
||||||
; since the parameters that go here are not all obvious.
|
|
||||||
;
|
|
||||||
; Format:
|
|
||||||
; [section] ; section goes between []
|
|
||||||
; param=value ; assign values to parameters
|
|
||||||
|
|
||||||
config_version=5
|
|
||||||
|
|
||||||
[application]
|
|
||||||
|
|
||||||
config/name="GodotSpeedRun"
|
|
||||||
run/main_scene="res://scenes/game.tscn"
|
|
||||||
config/features=PackedStringArray("4.2", "Forward Plus")
|
|
||||||
config/icon="res://icon.svg"
|
|
||||||
|
|
||||||
[file_customization]
|
|
||||||
|
|
||||||
folder_colors={
|
|
||||||
"res://assets/": "green",
|
|
||||||
"res://scenes/": "yellow",
|
|
||||||
"res://scripts/": "red"
|
|
||||||
}
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
[gd_scene load_steps=9 format=3 uid="uid://y083suj12rld"]
|
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://scripts/gamecontroller.gd" id="1_77wyw"]
|
|
||||||
[ext_resource type="Script" path="res://scripts/CharacterBody2D.gd" id="1_u4sui"]
|
|
||||||
[ext_resource type="Script" path="res://scripts/Trigger.gd" id="2_nfj1w"]
|
|
||||||
|
|
||||||
[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_3u4a8"]
|
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4vo4d"]
|
|
||||||
size = Vector2(55, 55)
|
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_cq7kj"]
|
|
||||||
size = Vector2(91, 20)
|
|
||||||
|
|
||||||
[sub_resource type="CircleShape2D" id="CircleShape2D_ubfw4"]
|
|
||||||
radius = 13.0384
|
|
||||||
|
|
||||||
[sub_resource type="CircleShape2D" id="CircleShape2D_x8qck"]
|
|
||||||
radius = 60.2993
|
|
||||||
|
|
||||||
[node name="Game" type="Node2D"]
|
|
||||||
script = ExtResource("1_77wyw")
|
|
||||||
|
|
||||||
[node name="StaticBody2D" type="StaticBody2D" parent="."]
|
|
||||||
position = Vector2(236, 415)
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
|
|
||||||
shape = SubResource("WorldBoundaryShape2D_3u4a8")
|
|
||||||
|
|
||||||
[node name="RigidBody2D" type="RigidBody2D" parent="."]
|
|
||||||
position = Vector2(87, 18)
|
|
||||||
rotation = 0.740513
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"]
|
|
||||||
position = Vector2(206.535, 208.174)
|
|
||||||
rotation = -0.555892
|
|
||||||
shape = SubResource("RectangleShape2D_4vo4d")
|
|
||||||
debug_color = Color(0.815686, 0.4, 0.207843, 0.419608)
|
|
||||||
|
|
||||||
[node name="CollisionShape2D2" type="CollisionShape2D" parent="RigidBody2D"]
|
|
||||||
position = Vector2(206.535, 208.174)
|
|
||||||
rotation = -0.555892
|
|
||||||
shape = SubResource("RectangleShape2D_4vo4d")
|
|
||||||
debug_color = Color(0.815686, 0.4, 0.207843, 0.419608)
|
|
||||||
|
|
||||||
[node name="groundblock" type="StaticBody2D" parent="."]
|
|
||||||
position = Vector2(124, 357)
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="groundblock"]
|
|
||||||
position = Vector2(-1.5, 0)
|
|
||||||
shape = SubResource("RectangleShape2D_cq7kj")
|
|
||||||
|
|
||||||
[node name="groundblock2" type="StaticBody2D" parent="."]
|
|
||||||
position = Vector2(91, 430)
|
|
||||||
scale = Vector2(3.76, 1)
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="groundblock2"]
|
|
||||||
position = Vector2(-1.5, 0)
|
|
||||||
shape = SubResource("RectangleShape2D_cq7kj")
|
|
||||||
|
|
||||||
[node name="level" type="Node2D" parent="."]
|
|
||||||
|
|
||||||
[node name="groundblock2" type="StaticBody2D" parent="level"]
|
|
||||||
position = Vector2(548, 315)
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock2"]
|
|
||||||
position = Vector2(-1.5, 0)
|
|
||||||
shape = SubResource("RectangleShape2D_cq7kj")
|
|
||||||
|
|
||||||
[node name="groundblock3" type="StaticBody2D" parent="level"]
|
|
||||||
position = Vector2(404, 353)
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock3"]
|
|
||||||
position = Vector2(-1.5, 0)
|
|
||||||
shape = SubResource("RectangleShape2D_cq7kj")
|
|
||||||
|
|
||||||
[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
|
|
||||||
position = Vector2(155, 328)
|
|
||||||
script = ExtResource("1_u4sui")
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
|
|
||||||
shape = SubResource("CircleShape2D_ubfw4")
|
|
||||||
|
|
||||||
[node name="Area2D" type="Area2D" parent="."]
|
|
||||||
position = Vector2(260, 352)
|
|
||||||
script = ExtResource("2_nfj1w")
|
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
|
|
||||||
shape = SubResource("CircleShape2D_x8qck")
|
|
||||||
debug_color = Color(0.556863, 0.415686, 0.964706, 0.419608)
|
|
||||||
|
|
||||||
[connection signal="areatrigger" from="Area2D" to="." method="_on_area_2d_areatrigger"]
|
|
||||||
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
extends CharacterBody2D
|
|
||||||
|
|
||||||
|
|
||||||
@export var SPEED = 300.0
|
|
||||||
@export var JUMP_VELOCITY = -300.0
|
|
||||||
@export var PUSH_FORCE = 200
|
|
||||||
|
|
||||||
# Get the gravity from the project settings to be synced with RigidBody nodes.
|
|
||||||
var gravity = ProjectSettings.get_setting("physics/2d/default_gravity")
|
|
||||||
|
|
||||||
func _physics_process(delta):
|
|
||||||
# Add the gravity.
|
|
||||||
if not is_on_floor():
|
|
||||||
velocity.y += gravity * delta
|
|
||||||
|
|
||||||
# Handle jump.
|
|
||||||
if Input.is_action_just_pressed("ui_accept") and is_on_floor():
|
|
||||||
velocity.y = JUMP_VELOCITY
|
|
||||||
|
|
||||||
# Get the input direction and handle the movement/deceleration.
|
|
||||||
# As good practice, you should replace UI actions with custom gameplay actions.
|
|
||||||
var direction = Input.get_axis("ui_left", "ui_right")
|
|
||||||
if direction:
|
|
||||||
velocity.x = direction * SPEED
|
|
||||||
else:
|
|
||||||
velocity.x = move_toward(velocity.x, 0, SPEED)
|
|
||||||
|
|
||||||
move_and_slide()
|
|
||||||
# This represents the player's inertia
|
|
||||||
# after calling move_and_slide()
|
|
||||||
for i in get_slide_collision_count():
|
|
||||||
var c = get_slide_collision(i)
|
|
||||||
if c.get_collider() is RigidBody2D:
|
|
||||||
c.get_collider().apply_central_impulse(-c.get_normal() * PUSH_FORCE)
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
extends Area2D
|
|
||||||
|
|
||||||
@export var effect = "alert"
|
|
||||||
signal areatrigger(effect, Object)
|
|
||||||
|
|
||||||
func _on_body_entered(body):
|
|
||||||
print("detected a body")
|
|
||||||
areatrigger.emit(effect, body)
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
extends Node2D
|
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
|
||||||
func _ready():
|
|
||||||
pass # Replace with function body.
|
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
|
||||||
func _process(delta):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
func _on_area_2d_areatrigger(effect, Object):
|
|
||||||
print("Game Controller sees the trigger")
|
|
||||||
Loading…
Reference in New Issue
Block a user