From 096a6126c1d3a15b75fbf9eeb45caa5d3c516f56 Mon Sep 17 00:00:00 2001
From: Booklordofthedings <Booklordofthedings@tutanota.com>
Date: Fri, 16 Aug 2024 23:16:25 +0200
Subject: [PATCH] character modell change + character movement changes

---
 gmtk_2024/levels/TestingRoom.tscn             |   1 +
 gmtk_2024/player.tscn                         |  11 +++---
 gmtk_2024/scripts/player_movement.gd          |  10 +++---
 .../textures}/Virus_Player.png                | Bin
 gmtk_2024/textures/Virus_Player.png.import    |  34 ++++++++++++++++++
 5 files changed, 48 insertions(+), 8 deletions(-)
 rename {textures => gmtk_2024/textures}/Virus_Player.png (100%)
 create mode 100644 gmtk_2024/textures/Virus_Player.png.import

diff --git a/gmtk_2024/levels/TestingRoom.tscn b/gmtk_2024/levels/TestingRoom.tscn
index 00e2951..2af5779 100644
--- a/gmtk_2024/levels/TestingRoom.tscn
+++ b/gmtk_2024/levels/TestingRoom.tscn
@@ -13,6 +13,7 @@ size = Vector2(1928.3, 529.623)
 [node name="Player" parent="." instance=ExtResource("1_nvifn")]
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
+visible = false
 z_index = -1
 texture = ExtResource("2_qherw")
 
diff --git a/gmtk_2024/player.tscn b/gmtk_2024/player.tscn
index 607c394..6b5390e 100644
--- a/gmtk_2024/player.tscn
+++ b/gmtk_2024/player.tscn
@@ -1,19 +1,22 @@
 [gd_scene load_steps=4 format=3 uid="uid://snxpqx0ony7s"]
 
 [ext_resource type="Script" path="res://scripts/player_movement.gd" id="1_otvu6"]
-[ext_resource type="Texture2D" uid="uid://b6gxkpy33b88g" path="res://temp_assets/player.png" id="2_d4ig1"]
+[ext_resource type="Texture2D" uid="uid://qcx482jc7pqr" path="res://textures/Virus_Player.png" id="2_b0xe3"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jqi2f"]
-radius = 16.0
-height = 32.0
+radius = 9.0
+height = 22.0
 
 [node name="Player" type="Node2D"]
 
 [node name="CharacterBody2D" type="CharacterBody2D" parent="."]
 script = ExtResource("1_otvu6")
+speed = 250
+jump_count = 1
+jump_strength = 600
 
 [node name="Sprite2D" type="Sprite2D" parent="CharacterBody2D"]
-texture = ExtResource("2_d4ig1")
+texture = ExtResource("2_b0xe3")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
 shape = SubResource("CapsuleShape2D_jqi2f")
diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd
index b0eb9dd..41cf1b2 100644
--- a/gmtk_2024/scripts/player_movement.gd
+++ b/gmtk_2024/scripts/player_movement.gd
@@ -3,7 +3,7 @@ extends CharacterBody2D
 @export var speed = 340;
 @export var gravity = 50;
 @export var jump_count = 2;
-@export var jump_strength = 700;
+@export var jump_strength = 100
 
 var jump_count_current = 2;
 var input_direction = 0 #To keep track of which direction we where moving in last frame
@@ -24,14 +24,16 @@ func get_input():
 	
 	velocity.x = input_direction * speed
 	
+	if is_on_floor():
+		jump_count_current = jump_count
+	
 	if Input.is_action_just_pressed("player_jump") and jump_count_current > 0:
 		velocity.y = -1 * jump_strength
 		jump_count_current = jump_count_current-1
 	elif  Input.is_action_pressed("player_jump"): #Fall less fast if we keep holding the button
-		velocity.y += -1 * 20
+		velocity.y += -1 * 25
 		
-	if is_on_floor():
-		jump_count_current = jump_count
+	
 
 func _physics_process(delta):
 	get_input()
diff --git a/textures/Virus_Player.png b/gmtk_2024/textures/Virus_Player.png
similarity index 100%
rename from textures/Virus_Player.png
rename to gmtk_2024/textures/Virus_Player.png
diff --git a/gmtk_2024/textures/Virus_Player.png.import b/gmtk_2024/textures/Virus_Player.png.import
new file mode 100644
index 0000000..7928ab8
--- /dev/null
+++ b/gmtk_2024/textures/Virus_Player.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://qcx482jc7pqr"
+path="res://.godot/imported/Virus_Player.png-4c00daa1e7b5018c0db649deca9e637e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Virus_Player.png"
+dest_files=["res://.godot/imported/Virus_Player.png-4c00daa1e7b5018c0db649deca9e637e.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