From 4559b154a14676ef28e3449cc4192c040cd117b0 Mon Sep 17 00:00:00 2001 From: OddlyTimbot Date: Mon, 27 Jul 2026 15:34:12 -0400 Subject: [PATCH] bad guys, player damage, enemy damage --- assets/enemies/slime/slime_green.png | Bin 0 -> 908 bytes assets/enemies/slime/slime_green.png.import | 40 ++++++ assets/player/death/Player Death 64x64.png | Bin 0 -> 1584 bytes .../death/Player Death 64x64.png.import | 40 ++++++ assets/player/hurt/Player Hurt 48x48.png | Bin 0 -> 1448 bytes .../player/hurt/Player Hurt 48x48.png.import | 40 ++++++ scenes/bullet.tscn | 1 + scenes/game.tscn | 9 ++ scenes/player.tscn | 118 +++++++++++++++++- scenes/slime.tscn | 71 +++++++++++ scripts/bullet.gd | 3 +- scripts/game.gd | 47 ++++++- scripts/player.gd | 31 +++-- scripts/scene_manager.gd | 19 +++ scripts/slime.gd | 33 +++++ scripts/slime.gd.uid | 1 + 16 files changed, 437 insertions(+), 16 deletions(-) create mode 100644 assets/enemies/slime/slime_green.png create mode 100644 assets/enemies/slime/slime_green.png.import create mode 100644 assets/player/death/Player Death 64x64.png create mode 100644 assets/player/death/Player Death 64x64.png.import create mode 100644 assets/player/hurt/Player Hurt 48x48.png create mode 100644 assets/player/hurt/Player Hurt 48x48.png.import create mode 100644 scenes/slime.tscn create mode 100644 scripts/slime.gd create mode 100644 scripts/slime.gd.uid diff --git a/assets/enemies/slime/slime_green.png b/assets/enemies/slime/slime_green.png new file mode 100644 index 0000000000000000000000000000000000000000..a21cb6fa253a2142be9bdad248238299dce6e695 GIT binary patch literal 908 zcmeAS@N?(olHy`uVBq!ia0vp^2|(<@!3HEb(?2AGr~;43Vg?3oVGw3ym^DX&fq~i1 z)5S5QV$Rz+)_J!b1lrmiqe6M+oJ(NX&NN4Phv|b`z4{NYP5+>JWrs--17qeTsRD5g z!(g=zZP^CRNrf+-+NH@KR$Td0s&mngVw3+xu0?EXcCBM}?K8i`C}Wk?V1NhZ=gNnL znwH6IezGFZ!~9a6?RHUyhPV4>Uu{?_FnfW>zS{qPKK*<4uVTZ$ce_63>1Q2~5psEW zx_|#J@#X97|9=sRdr@7gG^K>%S{q!=tk;zc{umA757CW^gF~?Y* zzL@Q4_FeSScBuyG05^_0b=8H-_E|RV`0{(oCG+JLF?=tr`x)+BFt>laYl`#E_4#US z^)8yV;ydQc)Lt=IzWv`O|NWa{=kBflzObA3)w^Aa^ZVqko^^cn|Ic5O3*}M*OaJxH zkT2-?mBRcbPJn+~%B^6jY(87p9(Mo#>Q7(h~rm&XFcnS2%Pu(#j4I<=R1EbeZ((y;O5o?wIy5Q|G$2J-k$H; z`tsE}e}z7FZ&xe&&T>;Ie$t&EuHB#RoL~6BudegQ(e6(xj^8Zaa&Il$W#4ySE~~5m zTfmt7%O>)U?6I5hEH)mc^Zy7i2AYE5_cS8+Pd zEL*XBwVBru|99M6hFkZ|y>aAN9DmO}@fM%8>yNRi-8VbG`yY1_&*gmzOfw=rUyaF+ zc6a>UWOJqT@=>+Yz0nhwE57CCn(*tmRI)?YzOxPXujg|0Ui|Qj8JN8oJYD@<);T3K F0RY5^vzq__ literal 0 HcmV?d00001 diff --git a/assets/enemies/slime/slime_green.png.import b/assets/enemies/slime/slime_green.png.import new file mode 100644 index 0000000..29618d8 --- /dev/null +++ b/assets/enemies/slime/slime_green.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bj3ccpqo3t7pv" +path="res://.godot/imported/slime_green.png-e5d60b3e093812754197fdd9edfc7bf5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/enemies/slime/slime_green.png" +dest_files=["res://.godot/imported/slime_green.png-e5d60b3e093812754197fdd9edfc7bf5.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/death/Player Death 64x64.png b/assets/player/death/Player Death 64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..2e6a1ae0514b237d754893f563c87ba5f95dc109 GIT binary patch literal 1584 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 void: func _on_body_entered(body: Node2D) -> void: - if body is Crate: + if body.is_in_group("shootable"): + print("bullet hit!") bulletHitSignal.emit(body,self) diff --git a/scripts/game.gd b/scripts/game.gd index b5000e8..68376d3 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -2,11 +2,19 @@ class_name GameController extends Node2D signal destroySignal(body) signal fanTriggerSignal(body, fanDirection) signal teleportTriggerSignal(body) +signal playerDamagedSignal(currentHealth,maxHealth) +signal playerDeathSignal + var numberOfCrates = 2 var timeAvailable = 50 var totalCoinsCollected = 0 var timer = Timer.new() + +var enemiesDict={} +var playerStartingHealth = 100 +var playerHealth = 100 + # Called when the node enters the scene tree for the first time. func _ready() -> void: get_window().grab_focus() @@ -21,7 +29,7 @@ func countdown()->void: timeAvailable-=1 if timeAvailable<=0 and numberOfCrates>0: print("LOOOOOSAH") - get_tree().reload_current_scene() + playerDeathSignal.emit() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -51,15 +59,48 @@ 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: + print("bullet hit") 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"] -= 10 + if enemiesDict[body]["health"]<=0: + #kill the enemy + 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 addEnemyToLevel(enemy:Slime)->void: + var enemyStat = { + "health": 30, + "damage": 20 + } + enemiesDict[enemy]=enemyStat + +func _on_slime_damage(body, slime:Slime)->void: + #remove damage from player health + print("remove damage from player "+str(enemiesDict[slime]["damage"])) + playerHealth -= enemiesDict[slime]["damage"] + if playerHealth <=0: + print("You DED") + #send a signal about player death + playerDeathSignal.emit() + else: + print("You damaged") + #send a signal about player damage + playerDamagedSignal.emit(playerHealth,playerStartingHealth) + +func loadLevel()->void: + get_tree().reload_current_scene() diff --git a/scripts/player.gd b/scripts/player.gd index 28e5195..2e18dac 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -2,6 +2,8 @@ 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,12 +21,19 @@ 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 hurt(health,maxhealth)->void: + print("player hurt") + current_player_state=PlayerStates.HURT +func kill()->void: + print("player killed") + current_player_state=PlayerStates.DEAD func _physics_process(delta: float) -> void: - handle_input() + if current_player_state != PlayerStates.DEAD: + handle_input() handle_movement(delta) handle_states() handle_animation() @@ -39,7 +48,6 @@ 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 +68,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 +77,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 +103,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 +112,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 +156,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("death") func _on_animation_finished() -> void: @@ -156,3 +168,8 @@ func _on_animation_finished() -> void: upJump = false PlayerStates.SHOVING: current_player_state = PlayerStates.IDLE + PlayerStates.HURT: + current_player_state = PlayerStates.IDLE + PlayerStates.DEAD: + #emit signal for end of death animation + deathAnimationCompleteSignal.emit() diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index 4dc3f75..3a7fc6e 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -4,6 +4,7 @@ extends Node2D @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") @@ -19,11 +20,14 @@ func _ready() -> void: player.pushSignal.connect(pushTarget) player.shootSignal.connect(makeBullet) player.fireSignal.connect(makeRocket) + player.deathAnimationCompleteSignal.connect(game.loadLevel) #signals from the GameController game.destroySignal.connect(destroy) game.fanTriggerSignal.connect(pushTarget) game.teleportTriggerSignal.connect(teleportTarget) + game.playerDamagedSignal.connect(player.hurt) + game.playerDeathSignal.connect(player.kill) #signals from pickups coin.coinCollectedSignal.connect(game.coinCollected) @@ -38,7 +42,17 @@ func buildLevel()->void: #tell GC how many crates... updateCrates() updateCoins() + updateEnemies() +func updateEnemies()->void: + if enemies: + for obj in enemies.get_children(): + if obj is Slime: + game.addEnemyToLevel(obj) + #hook up to game controller + if not obj.slimeDamageSignal.is_connected(game._on_slime_damage): + obj.slimeDamageSignal.connect(game._on_slime_damage) + func updateCrates()->void: var totalCrates = 0 if crates: @@ -50,11 +64,16 @@ func updateCrates()->void: game.crateTotal(totalCrates) +#any time a coin exits tree, game controller is updated func updateCoins()->void: var totalCoins = 0 if coins: for obj in coins.get_children(): if obj is Coin: + if not obj.coinCollectedSignal.is_connected(game.coinCollected): + obj.coinCollectedSignal.connect(game.coinCollected) + if not obj.tree_exited.is_connected(updateCoins): + obj.tree_exited.connect(updateCoins) totalCoins +=1 game.coinTotal(totalCoins) diff --git a/scripts/slime.gd b/scripts/slime.gd new file mode 100644 index 0000000..925813d --- /dev/null +++ b/scripts/slime.gd @@ -0,0 +1,33 @@ +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 + +var speed:int = 100 +var direction = 1 + +signal slimeDamageSignal(body,slime) + +#Animation code +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