diff --git a/assets/enemies/slime/slime_purple.png b/assets/enemies/slime/slime_purple.png new file mode 100644 index 0000000..76f564e Binary files /dev/null and b/assets/enemies/slime/slime_purple.png differ diff --git a/assets/enemies/slime/slime_purple.png.import b/assets/enemies/slime/slime_purple.png.import new file mode 100644 index 0000000..18a621b --- /dev/null +++ b/assets/enemies/slime/slime_purple.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b51p3mo2o7uxa" +path="res://.godot/imported/slime_purple.png-4674ec1226b290767ac60aef13cd0376.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/enemies/slime/slime_purple.png" +dest_files=["res://.godot/imported/slime_purple.png-4674ec1226b290767ac60aef13cd0376.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/assets/player/dead/Player Death 64x64.png b/assets/player/dead/Player Death 64x64.png new file mode 100644 index 0000000..2e6a1ae Binary files /dev/null and b/assets/player/dead/Player Death 64x64.png differ diff --git a/assets/player/dead/Player Death 64x64.png.import b/assets/player/dead/Player Death 64x64.png.import new file mode 100644 index 0000000..d52ebc2 --- /dev/null +++ b/assets/player/dead/Player Death 64x64.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2ajlg788xas2" +path="res://.godot/imported/Player Death 64x64.png-19e98a15db451ac6dd6faaec1fd6a386.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/dead/Player Death 64x64.png" +dest_files=["res://.godot/imported/Player Death 64x64.png-19e98a15db451ac6dd6faaec1fd6a386.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/assets/player/hurt/Player Hurt 48x48.png b/assets/player/hurt/Player Hurt 48x48.png new file mode 100644 index 0000000..57d8783 Binary files /dev/null and b/assets/player/hurt/Player Hurt 48x48.png differ diff --git a/assets/player/hurt/Player Hurt 48x48.png.import b/assets/player/hurt/Player Hurt 48x48.png.import new file mode 100644 index 0000000..d45f339 --- /dev/null +++ b/assets/player/hurt/Player Hurt 48x48.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7ike4q1xl2gy" +path="res://.godot/imported/Player Hurt 48x48.png-4f3bee63f7b077a423955d655b236738.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/hurt/Player Hurt 48x48.png" +dest_files=["res://.godot/imported/Player Hurt 48x48.png-4f3bee63f7b077a423955d655b236738.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/project.godot b/project.godot index 050c56d..2193a7f 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,10 @@ run/main_scene="uid://ch6sfehmsskcs" config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" +[autoload] + +Gamecontroller="*uid://dtv434qd1rfmu" + [display] window/size/viewport_width=480 diff --git a/scenes/bullet.tscn b/scenes/bullet.tscn index c4dc2e3..060283c 100644 --- a/scenes/bullet.tscn +++ b/scenes/bullet.tscn @@ -20,4 +20,5 @@ rotation = -3.1367095 scale = Vector2(0.07999989, 0.08039169) texture = ExtResource("2_y25gk") +[connection signal="area_entered" from="." to="." method="_on_body_entered"] [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/game.tscn b/scenes/game.tscn index d381f47..dcf9a97 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,6 +1,5 @@ [gd_scene format=4 uid="uid://ch6sfehmsskcs"] -[ext_resource type="Script" uid="uid://dtv434qd1rfmu" path="res://scripts/game.gd" id="1_lnu2h"] [ext_resource type="Texture2D" uid="uid://dfikkb3kxl5vf" path="res://assets/environment/bg/sky.png" id="2_0tnpc"] [ext_resource type="Script" uid="uid://b5c00ybml8rj" path="res://scripts/scene_manager.gd" id="2_lbhrr"] [ext_resource type="Texture2D" uid="uid://b6fqvrq70n5al" path="res://assets/environment/Terrain (32x32).png" id="2_p57ef"] @@ -13,6 +12,7 @@ [ext_resource type="PackedScene" uid="uid://b6cmg0k8qjoxi" path="res://scenes/crate.tscn" id="5_iywne"] [ext_resource type="PackedScene" uid="uid://b3hgbbmb0nohj" path="res://scenes/trigger.tscn" id="5_p57ef"] [ext_resource type="PackedScene" uid="uid://cfmbd0jdbrvd1" path="res://scenes/coin.tscn" id="13_kvuet"] +[ext_resource type="PackedScene" uid="uid://b23q2ppkeamyh" path="res://scenes/slime.tscn" id="14_trtic"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u5sy4"] texture = ExtResource("2_p57ef") @@ -404,7 +404,6 @@ sources/2 = SubResource("TileSetAtlasSource_kvpfn") [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_iywne"] [node name="Game" type="Node2D" unique_id=981419409] -script = ExtResource("1_lnu2h") [node name="bg" type="Node2D" parent="." unique_id=2006279143] @@ -448,7 +447,7 @@ tile_set = SubResource("TileSet_gee14") script = ExtResource("2_lbhrr") [node name="Player" parent="." unique_id=2145223914 instance=ExtResource("4_iywne")] -position = Vector2(495, 379) +position = Vector2(575, 368.00003) [node name="Crates" type="Node2D" parent="." unique_id=207771395] @@ -526,6 +525,14 @@ position = Vector2(116, -31) [node name="Coin3" parent="Coins" unique_id=1071266659 instance=ExtResource("13_kvuet")] position = Vector2(164, -65) +[node name="Enemies" type="Node2D" parent="." unique_id=998893132] +position = Vector2(484, 406) + +[node name="Slime" parent="Enemies" unique_id=250926168 instance=ExtResource("14_trtic")] + +[node name="Slime2" parent="Enemies" unique_id=777259292 instance=ExtResource("14_trtic")] +position = Vector2(-108, 65) + [connection signal="areaTriggerSignal" from="Triggers/Trigger" to="." method="_on_trigger"] [connection signal="areaTriggerSignal" from="Triggers/Trigger2" to="." method="_on_trigger"] [connection signal="areaTriggerSignal" from="Triggers/Trigger3" to="." method="_on_trigger"] diff --git a/scenes/player.tscn b/scenes/player.tscn index 9134b3e..b2a739d 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -4,7 +4,9 @@ [ext_resource type="Texture2D" uid="uid://b1ai5l50rwv4u" path="res://assets/player/idle/Player Idle 48x48.png" id="2_g2els"] [ext_resource type="Texture2D" uid="uid://dngnhx41kw3mw" path="res://assets/player/charging/Player Punch 64x64.png" id="2_qlg0r"] [ext_resource type="Texture2D" uid="uid://cgyc5mlhrd472" path="res://assets/player/jump_fall/player jump 48x48.png" id="3_dqkch"] +[ext_resource type="Texture2D" uid="uid://2ajlg788xas2" path="res://assets/player/dead/Player Death 64x64.png" id="3_fjrip"] [ext_resource type="Texture2D" uid="uid://di17x5ovjtvtt" path="res://assets/player/run/player run 48x48.png" id="3_qhqgy"] +[ext_resource type="Texture2D" uid="uid://c7ike4q1xl2gy" path="res://assets/player/hurt/Player Hurt 48x48.png" id="5_smehm"] [sub_resource type="CircleShape2D" id="CircleShape2D_uwrxv"] @@ -12,10 +14,66 @@ atlas = ExtResource("2_qlg0r") region = Rect2(128, 0, 64, 64) +[sub_resource type="AtlasTexture" id="AtlasTexture_pf23h"] +atlas = ExtResource("3_fjrip") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dt7fs"] +atlas = ExtResource("3_fjrip") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_wqfne"] +atlas = ExtResource("3_fjrip") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_wnwbv"] +atlas = ExtResource("3_fjrip") +region = Rect2(144, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gl8cc"] +atlas = ExtResource("3_fjrip") +region = Rect2(192, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_487ah"] +atlas = ExtResource("3_fjrip") +region = Rect2(240, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_md1ol"] +atlas = ExtResource("3_fjrip") +region = Rect2(288, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bj30b"] +atlas = ExtResource("3_fjrip") +region = Rect2(336, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jc3p3"] +atlas = ExtResource("3_fjrip") +region = Rect2(384, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hax0n"] +atlas = ExtResource("3_fjrip") +region = Rect2(432, 0, 48, 48) + [sub_resource type="AtlasTexture" id="AtlasTexture_4ni07"] atlas = ExtResource("3_dqkch") region = Rect2(96, 0, 48, 48) +[sub_resource type="AtlasTexture" id="AtlasTexture_t4otl"] +atlas = ExtResource("5_smehm") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_j2b1d"] +atlas = ExtResource("5_smehm") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_cs1tg"] +atlas = ExtResource("5_smehm") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2dvfe"] +atlas = ExtResource("5_smehm") +region = Rect2(144, 0, 48, 48) + [sub_resource type="AtlasTexture" id="AtlasTexture_qhqgy"] atlas = ExtResource("2_g2els") region = Rect2(0, 0, 48, 48) @@ -120,6 +178,41 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": SubResource("AtlasTexture_pf23h") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dt7fs") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_wqfne") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_wnwbv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gl8cc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_487ah") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_md1ol") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bj30b") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jc3p3") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_hax0n") +}], +"loop": false, +"name": &"dying", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, "texture": SubResource("AtlasTexture_4ni07") }], "loop": false, @@ -128,6 +221,23 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": SubResource("AtlasTexture_t4otl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_j2b1d") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_cs1tg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2dvfe") +}], +"loop": false, +"name": &"hurt", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, "texture": SubResource("AtlasTexture_qhqgy") }, { "duration": 1.0, @@ -232,19 +342,17 @@ target_position = Vector2(16.891893, 0) target_position = Vector2(-17.56757, -0.67567575) [node name="RightSpawn" type="Marker2D" parent="." unique_id=72314368] -position = Vector2(12.837839, -8.1081085) +position = Vector2(12.837839, -2.702703) [node name="LeftSpawn" type="Marker2D" parent="." unique_id=374152113] -position = Vector2(-12.837839, -8.108109) +position = Vector2(-12.837839, -2.7027035) [node name="PlayerGraphic" type="AnimatedSprite2D" parent="." unique_id=174634956] texture_filter = 1 position = Vector2(0, -6.081082) sprite_frames = SubResource("SpriteFrames_jej6c") -animation = &"shoving" +animation = &"dying" autoplay = "idle" -frame = 2 -frame_progress = 1.0 [node name="Camera2D" type="Camera2D" parent="." unique_id=839648774] offset = Vector2(0, -60) diff --git a/scenes/slime.tscn b/scenes/slime.tscn new file mode 100644 index 0000000..56ebc1d --- /dev/null +++ b/scenes/slime.tscn @@ -0,0 +1,74 @@ +[gd_scene format=3 uid="uid://b23q2ppkeamyh"] + +[ext_resource type="Texture2D" uid="uid://b51p3mo2o7uxa" path="res://assets/enemies/slime/slime_purple.png" id="1_371uh"] +[ext_resource type="Script" uid="uid://d215jspbbgtq6" path="res://scripts/slime.gd" id="1_p2gj0"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_p2gj0"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_n6pvg"] +atlas = ExtResource("1_371uh") +region = Rect2(0, 24, 24, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_pjw23"] +atlas = ExtResource("1_371uh") +region = Rect2(24, 24, 24, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2npkn"] +atlas = ExtResource("1_371uh") +region = Rect2(48, 24, 24, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fd6lc"] +atlas = ExtResource("1_371uh") +region = Rect2(72, 24, 24, 24) + +[sub_resource type="SpriteFrames" id="SpriteFrames_gstla"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_n6pvg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pjw23") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2npkn") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fd6lc") +}], +"loop": true, +"name": &"idle", +"speed": 12.0 +}] + +[node name="Slime" type="Area2D" unique_id=250926168 groups=["shootable"]] +script = ExtResource("1_p2gj0") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=588756743] +shape = SubResource("CircleShape2D_p2gj0") +debug_color = Color(0.83704245, 0.20573696, 0.8053471, 0.41960785) + +[node name="SlimeGraphic" type="AnimatedSprite2D" parent="." unique_id=69804785] +texture_filter = 1 +position = Vector2(0, -2) +sprite_frames = SubResource("SpriteFrames_gstla") +animation = &"idle" +autoplay = "idle" +frame = 1 +frame_progress = 0.67487884 + +[node name="RightCast" type="RayCast2D" parent="." unique_id=18403424] +target_position = Vector2(16, 0) + +[node name="RightDownCast" type="RayCast2D" parent="." unique_id=1848380842] +position = Vector2(9, 0) +target_position = Vector2(0, 16) + +[node name="LeftDownCast" type="RayCast2D" parent="." unique_id=858346924] +position = Vector2(-10, 0) +target_position = Vector2(0, 16) + +[node name="LeftCast" type="RayCast2D" parent="." unique_id=382510816] +target_position = Vector2(-16, 0) + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scripts/bullet.gd b/scripts/bullet.gd index ec6b130..5b9c597 100644 --- a/scripts/bullet.gd +++ b/scripts/bullet.gd @@ -9,5 +9,5 @@ func _process(delta: float) -> void: func _on_body_entered(body: Node2D) -> void: - if body is Crate: + if body.is_in_group("shootable"): bulletHitSignal.emit(body,self) diff --git a/scripts/game.gd b/scripts/game.gd index b5000e8..3947151 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -2,14 +2,33 @@ class_name GameController extends Node2D signal destroySignal(body) signal fanTriggerSignal(body, fanDirection) signal teleportTriggerSignal(body) +signal playerHurtSignal(playerHealth, maxHealth) +signal playerDeadSignal + var numberOfCrates = 2 var timeAvailable = 50 var totalCoinsCollected = 0 var timer = Timer.new() + +var currentPlayerHealth = 100 +var startingHealth = 100 + +var enemiesDict={} + +var enemy:CharacterStats +var player:CharacterStats + +func reset()->void: + print("GC reset") + currentPlayerHealth=player.startingHealth + # Called when the node enters the scene tree for the first time. func _ready() -> void: get_window().grab_focus() + enemy = load("res://scripts/rscs/slimeStats.tres") + player = load("res://scripts/rscs/playerStats.tres") + add_child(timer) timer.wait_time = 1 timer.one_shot = false @@ -21,7 +40,7 @@ func countdown()->void: timeAvailable-=1 if timeAvailable<=0 and numberOfCrates>0: print("LOOOOOSAH") - get_tree().reload_current_scene() + playerDeadSignal.emit() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -51,15 +70,45 @@ func coinCollected(body,coin)->void: totalCoinsCollected +=1 print("GC knows coin collected") destroySignal.emit(coin) + func coinTotal(totalAmount)->void: print("GC knows total coins "+str(totalAmount)) func bulletDamage(body, _bullet)->void: if body.is_in_group("shootable"): - destroySignal.emit(body) - destroySignal.emit(_bullet) + if body is Crate: + destroySignal.emit(body) + destroySignal.emit(_bullet) + if body is Slime: + enemiesDict[body]["health"] -= player.rangeDamage + if enemiesDict[body]["health"]<=0: + enemiesDict.erase(body) + destroySignal.emit(body) + destroySignal.emit(_bullet) func rocketDamage(body, rocket)->void: if body.is_in_group("shootable"): print("Rocket strikes target!") destroySignal.emit(body) + +func totalEnemies(numberOfEnemies)->void: + print("GC knows this many badguy: "+str(numberOfEnemies)) +func slimeAttack(body,slime)->void: + print("GC knows slime attack "+str(enemiesDict[slime]["damage"])) + currentPlayerHealth -= enemiesDict[slime]["damage"] + if currentPlayerHealth>0: + #damage + print("player damaged") + playerHurtSignal.emit(currentPlayerHealth, startingHealth) + else: + #ded + print("player ded") + playerDeadSignal.emit() +func levelChange()->void: + get_tree().reload_current_scene() +func addEnemyToLevel(slime)->void: + var stats = { + "health": enemy.startingHealth, + "damage": enemy.meleeDamage + } + enemiesDict[slime]=stats diff --git a/scripts/player.gd b/scripts/player.gd index 28e5195..4ed8479 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -2,6 +2,7 @@ class_name Player extends CharacterBody2D signal pushSignal(body, direction) signal shootSignal(markerPosition, speed) signal fireSignal(markerPosition, direction, speed) +signal deathAnimationCompleteSignal @onready var right_cast: RayCast2D = $RightCast @onready var left_cast: RayCast2D = $LeftCast @onready var right_spawn: Marker2D = $RightSpawn @@ -19,18 +20,24 @@ const JUMP_VELOCITY = -400.0 enum FaceDirection {RIGHT,LEFT} var facing:FaceDirection = FaceDirection.RIGHT -enum PlayerStates {IDLE,RUNNING,JUMPING,FALLING,CHARGING,SHOVING} +enum PlayerStates {IDLE,RUNNING,JUMPING,FALLING,CHARGING,SHOVING,HURT,DEAD} var current_player_state:PlayerStates = PlayerStates.IDLE var upJump:bool = false func _physics_process(delta: float) -> void: - handle_input() + if current_player_state != PlayerStates.DEAD: + handle_input() handle_movement(delta) handle_states() handle_animation() move_and_slide() handle_collisions() - + +func hurt(playerHealth,maxHealth)->void: + current_player_state = PlayerStates.HURT +func kill()->void: + current_player_state = PlayerStates.DEAD + func handle_input()->void: # Handle jump. if Input.is_action_just_pressed("ui_accept") and is_on_floor(): @@ -39,7 +46,7 @@ func handle_input()->void: upJump = true # Handle shove. if Input.is_action_just_pressed("shove"): - print("I want to shove") + if pushRightEnabled and facing==FaceDirection.RIGHT: current_player_state= PlayerStates.CHARGING pushTimer = Time.get_ticks_msec() @@ -60,7 +67,7 @@ func handle_input()->void: current_player_state = PlayerStates.SHOVING #Handle Shoot Bullet if Input.is_action_just_pressed("shoot"): - print("Ima shoot a bullet") + #marker postion, speed match facing: FaceDirection.RIGHT: @@ -69,7 +76,7 @@ func handle_input()->void: shootSignal.emit(left_spawn.global_transform, -800) #Handle fire rocket if Input.is_action_just_pressed("fire"): - print("Ima fire rocket") + match facing: FaceDirection.RIGHT: fireSignal.emit(right_spawn.global_transform,Vector2(1,0), 800) @@ -95,7 +102,7 @@ func handle_movement(delta)->void: velocity += get_gravity() * delta func handle_collisions()->void: if right_cast.is_colliding(): - print("Right raycast collision") + var collider = right_cast.get_collider() if collider is Node: pushRightEnabled = true @@ -104,7 +111,7 @@ func handle_collisions()->void: pushRightEnabled = false if left_cast.is_colliding(): - print("Left raycast collision") + var collider = left_cast.get_collider() if collider is Node: pushLeftEnabled = true @@ -148,6 +155,10 @@ func handle_animation()->void: player_graphic.play("charging") PlayerStates.SHOVING: player_graphic.play("shoving") + PlayerStates.HURT: + player_graphic.play("hurt") + PlayerStates.DEAD: + player_graphic.play("dying") func _on_animation_finished() -> void: @@ -156,3 +167,7 @@ func _on_animation_finished() -> void: upJump = false PlayerStates.SHOVING: current_player_state = PlayerStates.IDLE + PlayerStates.HURT: + current_player_state = PlayerStates.IDLE + PlayerStates.DEAD: + deathAnimationCompleteSignal.emit() diff --git a/scripts/rscs/characterstats.gd b/scripts/rscs/characterstats.gd new file mode 100644 index 0000000..02696e6 --- /dev/null +++ b/scripts/rscs/characterstats.gd @@ -0,0 +1,9 @@ +class_name CharacterStats extends Resource + +@export var currentHealth := 100 +@export var maxHealth := 150 +@export var startingHealth:int = 100 + +#damage +@export var meleeDamage:int = 20 +@export var rangeDamage:int = 15 diff --git a/scripts/rscs/characterstats.gd.uid b/scripts/rscs/characterstats.gd.uid new file mode 100644 index 0000000..d92af08 --- /dev/null +++ b/scripts/rscs/characterstats.gd.uid @@ -0,0 +1 @@ +uid://cye1467wwip7u diff --git a/scripts/rscs/playerStats.tres b/scripts/rscs/playerStats.tres new file mode 100644 index 0000000..7559b20 --- /dev/null +++ b/scripts/rscs/playerStats.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="CharacterStats" format=3 uid="uid://dt55hoe718r1x"] + +[ext_resource type="Script" uid="uid://cye1467wwip7u" path="res://scripts/rscs/characterstats.gd" id="1_sqkfu"] + +[resource] +script = ExtResource("1_sqkfu") +maxHealth = 200 +meleeDamage = 30 +rangeDamage = 20 +metadata/_custom_type_script = "uid://cye1467wwip7u" diff --git a/scripts/rscs/slimeStats.tres b/scripts/rscs/slimeStats.tres new file mode 100644 index 0000000..8ff5dcd --- /dev/null +++ b/scripts/rscs/slimeStats.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" script_class="CharacterStats" format=3 uid="uid://c0ghdtxe11f0"] + +[ext_resource type="Script" uid="uid://cye1467wwip7u" path="res://scripts/rscs/characterstats.gd" id="1_ppipo"] + +[resource] +script = ExtResource("1_ppipo") +currentHealth = 60 +maxHealth = 80 +startingHealth = 60 +rangeDamage = 0 +metadata/_custom_type_script = "uid://cye1467wwip7u" diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index 4dc3f75..4babeb3 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -1,9 +1,10 @@ extends Node2D -@onready var game: GameController = $".." + @onready var crates: Node2D = $"../Crates" @onready var player: Player = $"../Player" @onready var coin: Coin = $"../Coins/Coin" @onready var coins: Node2D = $"../Coins" +@onready var enemies: Node2D = $"../Enemies" var bullet = preload("res://scenes/bullet.tscn") var rocket = preload("res://scenes/rocket.tscn") @@ -15,18 +16,22 @@ var totalAllowedRockets:int = 3 # Called when the node enters the scene tree for the first time. func _ready() -> void: + Gamecontroller.reset() #signals from the view player.pushSignal.connect(pushTarget) player.shootSignal.connect(makeBullet) player.fireSignal.connect(makeRocket) + player.deathAnimationCompleteSignal.connect(Gamecontroller.levelChange) #signals from the GameController - game.destroySignal.connect(destroy) - game.fanTriggerSignal.connect(pushTarget) - game.teleportTriggerSignal.connect(teleportTarget) + Gamecontroller.destroySignal.connect(destroy) + Gamecontroller.fanTriggerSignal.connect(pushTarget) + Gamecontroller.teleportTriggerSignal.connect(teleportTarget) + Gamecontroller.playerHurtSignal.connect(player.hurt) + Gamecontroller.playerDeadSignal.connect(player.kill) #signals from pickups - coin.coinCollectedSignal.connect(game.coinCollected) + coin.coinCollectedSignal.connect(Gamecontroller.coinCollected) buildLevel() @@ -38,6 +43,7 @@ func buildLevel()->void: #tell GC how many crates... updateCrates() updateCoins() + updateEnemies() func updateCrates()->void: var totalCrates = 0 @@ -48,15 +54,28 @@ func updateCrates()->void: obj.tree_exited.connect(updateCrates) totalCrates +=1 - game.crateTotal(totalCrates) + Gamecontroller.crateTotal(totalCrates) func updateCoins()->void: var totalCoins = 0 if coins: for obj in coins.get_children(): if obj is Coin: + if not obj.tree_exited.is_connected(updateCoins): + obj.tree_exited.connect(updateCoins) + if not obj.coinCollectedSignal.is_connected(Gamecontroller.coinCollected): + obj.coinCollectedSignal.connect(Gamecontroller.coinCollected) totalCoins +=1 - game.coinTotal(totalCoins) + Gamecontroller.coinTotal(totalCoins) +func updateEnemies()->void: + var totalEnemies = 0 + if enemies: + for obj in enemies.get_children(): + if obj is Slime: + Gamecontroller.addEnemyToLevel(obj) + obj.slimeDamageSignal.connect(Gamecontroller.slimeAttack) + totalEnemies +=1 + Gamecontroller.totalEnemies(totalEnemies) func pushTarget(body,pushDirection)->void: if body is RigidBody2D: @@ -91,8 +110,8 @@ func bulletFactory()->Bullet: #make a new bullet myBullet = bullet.instantiate() add_sibling(myBullet) - if not myBullet.bulletHitSignal.is_connected(game.bulletDamage): - myBullet.bulletHitSignal.connect(game.bulletDamage) + if not myBullet.bulletHitSignal.is_connected(Gamecontroller.bulletDamage): + myBullet.bulletHitSignal.connect(Gamecontroller.bulletDamage) else: myBullet = bulletArray.pop_back() @@ -119,6 +138,6 @@ func makeRocket(spawnPosition, direction, speed)->void: print("make a rocket") var myRocket:Rocket = rocketFactory() myRocket.splodeSignal.connect(destroy) - myRocket.impactSignal.connect(game.rocketDamage) + myRocket.impactSignal.connect(Gamecontroller.rocketDamage) myRocket.transform = spawnPosition pushTarget(myRocket,direction*speed) diff --git a/scripts/slime.gd b/scripts/slime.gd new file mode 100644 index 0000000..b73bf46 --- /dev/null +++ b/scripts/slime.gd @@ -0,0 +1,31 @@ +class_name Slime extends Area2D +@onready var right_cast: RayCast2D = $RightCast +@onready var right_down_cast: RayCast2D = $RightDownCast +@onready var left_down_cast: RayCast2D = $LeftDownCast +@onready var left_cast: RayCast2D = $LeftCast +@onready var slime_graphic: AnimatedSprite2D = $SlimeGraphic + +signal slimeDamageSignal(body,slime) + +@export var speed:int = 100 +var direction = 1 + +func _process(delta: float) -> void: + if not right_down_cast.is_colliding(): + direction =-1 + slime_graphic.flip_h = true + if not left_down_cast.is_colliding(): + direction = 1 + slime_graphic.flip_h = false + if right_cast.is_colliding() && not right_cast.get_collider() is Player: + direction = -1 + slime_graphic.flip_h = true + if left_cast.is_colliding() && not left_cast.get_collider() is Player: + direction = 1 + slime_graphic.flip_h = false + position.x += direction*speed*delta + + +func _on_body_entered(body: Node2D) -> void: + if body is Player: + slimeDamageSignal.emit(body,self) diff --git a/scripts/slime.gd.uid b/scripts/slime.gd.uid new file mode 100644 index 0000000..4c69c7b --- /dev/null +++ b/scripts/slime.gd.uid @@ -0,0 +1 @@ +uid://d215jspbbgtq6