JunhanFang/MarchGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing up week3 missing

Browse Source
This commit is contained in:
OddlyTimbot 2026-03-23 17:51:55 -04:00
parent 35280d3a75
commit f52b1edd06
12 changed files with 408 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/player/idle/Player Idle 48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

40
assets/graphics/player/idle/Player Idle 48x48.png.import Normal file
View File

@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dyus25iplw8ei"
path="res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/idle/Player Idle 48x48.png"
dest_files=["res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.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

BIN
assets/graphics/player/jump_fall/player jump 48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1021 B

40
assets/graphics/player/jump_fall/player jump 48x48.png.import Normal file
View File

@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bihghvekq435s"
path="res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/jump_fall/player jump 48x48.png"
dest_files=["res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.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

BIN
assets/graphics/player/running/player run 48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

40
assets/graphics/player/running/player run 48x48.png.import Normal file
View File

@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://3c7ngirfyrkh"
path="res://.godot/imported/player run 48x48.png-3529730a2a1b5884902527ab512e774d.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/running/player run 48x48.png"
dest_files=["res://.godot/imported/player run 48x48.png-3529730a2a1b5884902527ab512e774d.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

2
scenes/bullet.tscn
View File

@ -13,3 +13,5 @@ metadata/_edit_group_ = true
position = Vector2(0, 0.125)
shape = SubResource("RectangleShape2D_h1aey")
debug_color = Color(0.9529412, 0.078431375, 0.019607844, 0.41960785)
[connection signal="body_entered" from="." to="." method="_on_body_entered"]

180
scenes/player.tscn
View File

@ -1,9 +1,182 @@
[gd_scene format=3 uid="uid://s0utas3jmhjk"]
[ext_resource type="Script" uid="uid://cugku4bbar0fk" path="res://scripts/player.gd" id="1_3vyb7"]
[ext_resource type="Texture2D" uid="uid://bihghvekq435s" path="res://assets/graphics/player/jump_fall/player jump 48x48.png" id="2_dqkch"]
[ext_resource type="Texture2D" uid="uid://dyus25iplw8ei" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="3_qlg0r"]
[ext_resource type="Texture2D" uid="uid://3c7ngirfyrkh" path="res://assets/graphics/player/running/player run 48x48.png" id="4_tuyoq"]
[sub_resource type="CircleShape2D" id="CircleShape2D_uwrxv"]
[sub_resource type="AtlasTexture" id="AtlasTexture_fjrip"]
atlas = ExtResource("2_dqkch")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_smehm"]
atlas = ExtResource("3_qlg0r")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_ur7pv"]
atlas = ExtResource("3_qlg0r")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_y4r1p"]
atlas = ExtResource("3_qlg0r")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_d2wvv"]
atlas = ExtResource("3_qlg0r")
region = Rect2(144, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_3v2ag"]
atlas = ExtResource("3_qlg0r")
region = Rect2(192, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_jej6c"]
atlas = ExtResource("3_qlg0r")
region = Rect2(240, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"]
atlas = ExtResource("3_qlg0r")
region = Rect2(288, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_oprun"]
atlas = ExtResource("3_qlg0r")
region = Rect2(336, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_a8ls1"]
atlas = ExtResource("3_qlg0r")
region = Rect2(384, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_qfm1y"]
atlas = ExtResource("3_qlg0r")
region = Rect2(432, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_fulsm"]
atlas = ExtResource("2_dqkch")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_4r5pv"]
atlas = ExtResource("2_dqkch")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_60mlk"]
atlas = ExtResource("4_tuyoq")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_i4ail"]
atlas = ExtResource("4_tuyoq")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_a38lo"]
atlas = ExtResource("4_tuyoq")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_4ni07"]
atlas = ExtResource("4_tuyoq")
region = Rect2(144, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_l71n6"]
atlas = ExtResource("4_tuyoq")
region = Rect2(192, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_ke2ow"]
atlas = ExtResource("4_tuyoq")
region = Rect2(240, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_ujl30"]
atlas = ExtResource("4_tuyoq")
region = Rect2(288, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_31cv2"]
atlas = ExtResource("4_tuyoq")
region = Rect2(336, 0, 48, 48)
[sub_resource type="SpriteFrames" id="SpriteFrames_pf23h"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_fjrip")
}],
"loop": false,
"name": &"falling",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_smehm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ur7pv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_y4r1p")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_d2wvv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3v2ag")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jej6c")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f1ej7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_oprun")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a8ls1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qfm1y")
}],
"loop": true,
"name": &"idle",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_fulsm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4r5pv")
}],
"loop": false,
"name": &"jumping",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_60mlk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_i4ail")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a38lo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4ni07")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_l71n6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ke2ow")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ujl30")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_31cv2")
}],
"loop": false,
"name": &"running",
"speed": 12.0
}]
[node name="player" type="CharacterBody2D" unique_id=1410007482]
script = ExtResource("1_3vyb7")
metadata/_edit_group_ = true
@ -17,3 +190,10 @@ position = Vector2(14, -5)
[node name="LeftTarget" type="Marker2D" parent="." unique_id=1940665709]
position = Vector2(-14, -5)
[node name="PlayerGraphic" type="AnimatedSprite2D" parent="." unique_id=1989795020]
sprite_frames = SubResource("SpriteFrames_pf23h")
animation = &"falling"
autoplay = "idle"
[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"]

9
scripts/bullet.gd
View File

@ -1,13 +1,18 @@
class_name Bullet extends Area2D
var speed: float = 700
signal bulletDamageSignal(body, bullet)
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
func setSpeed(value)->void:
speed = value
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
position +=transform.x * speed * delta
func _on_body_entered(body: Node2D) -> void:
bulletDamageSignal.emit(body, self)

6
scripts/gameController.gd
View File

@ -13,6 +13,7 @@ var timeAvailable := 20
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
get_window().grab_focus()
add_child(timer)
timer.wait_time = 1
timer.one_shot = false
@ -57,3 +58,8 @@ func createUpdate(creatsAmonut):
createTotal = creatsAmonut
print("GC updated creats:" +str(createTotal))
func bulletDamage(body:Node2D, bullet:Bullet)->void:
if body is Create:
#destroy crate
destroySignal.emit(body)
destroySignal.emit(bullet)

111
scripts/player.gd
View File

@ -2,6 +2,7 @@ class_name Player extends CharacterBody2D
@onready var right_target: Marker2D = $RightTarget
@onready var left_target: Marker2D = $LeftTarget
@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic
const SPEED = 300.0
@ -9,59 +10,87 @@ const JUMP_VELOCITY = -400.0
const BUMP_POWER = 50
enum FaceDirection{LEFT, RIGHT}
var facing: FaceDirection = FaceDirection.RIGHT
var direction
enum PlayerState{IDLE,RUNNING, JUMPING, FALLING}
var current_player_state:PlayerState = PlayerState.IDLE
var jumpUp:bool = false
func _physics_process(delta):
# Add the gravity.
if not is_on_floor():
velocity += get_gravity() * delta
#Handler shoot
func _physics_process(delta: float) -> void:
handle_input()
handle_movement(delta)
handle_state()
handle_animation()
move_and_slide()
handle_collisions()
func handle_input()->void:
direction = Input.get_axis("ui_left", "ui_right")
if direction <0:
player_graphic.flip_h = true
if direction >0:
player_graphic.flip_h = false
# Handle jump.
if Input.is_action_just_pressed("ui_accept") and is_on_floor():
velocity.y = JUMP_VELOCITY
current_player_state = PlayerState.JUMPING
jumpUp = true
# Handle Shoot
if Input.is_action_just_pressed("shoot"):
print("Player wants to shoot")
match facing:
FaceDirection.RIGHT:
print("Shoot to the Right")
%SceneManager.makeBullet(right_target.global_transform,700)
print("Shoot to the right")
%SceneManager.makeBullet(right_target.global_transform, 700)
FaceDirection.LEFT:
print("Shoot to the Left")
%SceneManager.makeBullet(left_target.global_transform,-700)
# 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")
print("Shoot to the left")
%SceneManager.makeBullet(left_target.global_transform, -700)
func handle_state()->void:
match current_player_state:
PlayerState.IDLE when velocity.x !=0:
#change to running!!
current_player_state = PlayerState.RUNNING
PlayerState.RUNNING when velocity.x == 0:
current_player_state = PlayerState.IDLE
PlayerState.JUMPING when velocity.y > 0:
current_player_state = PlayerState.FALLING
PlayerState.FALLING when is_on_floor():
if velocity.x ==0:
current_player_state = PlayerState.IDLE
else:
current_player_state = PlayerState.RUNNING
func handle_animation()->void:
match current_player_state:
PlayerState.IDLE:
player_graphic.play("idle")
PlayerState.RUNNING:
player_graphic.play("running")
PlayerState.JUMPING:
if jumpUp:
player_graphic.play("jumping")
PlayerState.FALLING:
player_graphic.play("falling")
func handle_movement(delta)->void:
# Add the gravity.
if not is_on_floor():
velocity += get_gravity() * delta
if direction:
velocity.x = direction * SPEED
if direction <0:
facing = FaceDirection.LEFT
if direction >=0:
facing = FaceDirection.RIGHT
facing=FaceDirection.LEFT
if direction >0:
facing=FaceDirection.RIGHT
else:
velocity.x = move_toward(velocity.x, 0, SPEED)
move_and_slide()
func handle_collisions()->void:
for i in get_slide_collision_count():
var c = get_slide_collision(i)
if c.get_collider() is RigidBody2D:
if c.get_collider() is RigidBody2D:
c.get_collider().apply_central_impulse(-c.get_normal()*BUMP_POWER)
func _on_animation_finished() -> void:
match current_player_state:
PlayerState.JUMPING:
jumpUp = false

24
scripts/scene_manager.gd
View File

@ -4,6 +4,10 @@ class_name SceneManager extends Node2D
@onready var level: Node2D = $"../Level"
@onready var game: GameController = $".."
var bullet = preload("res://scenes/bullet.tscn")
var bulletArray:Array[Bullet] = []
var totalAllowedBullets:int = 7
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
#pass # Replace with function body.
@ -68,5 +72,23 @@ func loadLevel(level:String)->void:
get_tree().call_deferred("change_scene_to_file", level)
func makeBullet(targetPosition, speed):
func bulletFactory()->Bullet :
var myBullet:Bullet
#how many bullets have been made?
if bulletArray.size() <= totalAllowedBullets:
myBullet = bullet.instantiate()
if not myBullet.bulletDamageSignal.is_connected(game.bulletDamage):
myBullet.bulletDamageSignal.connect(game.bulletDamage)
game.add_child(myBullet)
else:
myBullet = bulletArray.pop_back()
bulletArray.push_front(myBullet)
return myBullet
func makeBullet(targetPosition, speed)->void:
print("Make a bullet!")
print("bullets created: "+str( bulletArray.size() ))
var myBullet:Bullet = bulletFactory()
myBullet.transform = targetPosition
myBullet.setSpeed(speed)
myBullet.set_process(true)