Bläddra i källkod

some gameplay layout shits

AXCWG 5 månader sedan
förälder
incheckning
4918180786
14 ändrade filer med 671 tillägg och 195 borttagningar
  1. BIN
      .DS_Store
  2. 15 24
      Assets/ascii/ascii.png.import
  3. 149 143
      StartMenu.tscn
  4. 2 0
      characterselect.gd
  5. BIN
      compare.png
  6. 34 0
      compare.png.import
  7. BIN
      compare.psd
  8. 24 6
      easy.gd
  9. 172 0
      gameplay.tscn
  10. 24 5
      hard.gd
  11. 25 4
      lunatic.gd
  12. 30 13
      normal.gd
  13. 16 0
      project.godot
  14. 180 0
      s01/s01.tscn

BIN
.DS_Store


+ 15 - 24
Assets/ascii/ascii.png.import

@@ -1,34 +1,25 @@
 [remap]
 
-importer="texture"
-type="CompressedTexture2D"
+importer="font_data_image"
+type="FontFile"
 uid="uid://ct8il6mcn3g8o"
-path="res://.godot/imported/ascii.png-8e218db0de298cddffb25928b6de0361.ctex"
-metadata={
-"vram_texture": false
-}
+path="res://.godot/imported/ascii.png-8e218db0de298cddffb25928b6de0361.fontdata"
 
 [deps]
 
 source_file="res://Assets/ascii/ascii.png"
-dest_files=["res://.godot/imported/ascii.png-8e218db0de298cddffb25928b6de0361.ctex"]
+dest_files=["res://.godot/imported/ascii.png-8e218db0de298cddffb25928b6de0361.fontdata"]
 
 [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
+character_ranges=PackedStringArray("0-127")
+kerning_pairs=PackedStringArray()
+columns=16
+rows=16
+image_margin=Rect2i(0, 0, 0, 0)
+character_margin=Rect2i(0, 0, 0, 0)
+ascent=0
+descent=0
+fallbacks=[]
+compress=true
+scaling_mode=2

+ 149 - 143
StartMenu.tscn

@@ -120,6 +120,138 @@ tracks/8/keys = {
 "values": [Color(1, 1, 1, 0)]
 }
 
+[sub_resource type="Animation" id="Animation_7obow"]
+resource_name = "easy_select_ani"
+length = 0.05
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Easy:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.0333333),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(365, 190), Vector2(315, 190)]
+}
+
+[sub_resource type="Animation" id="Animation_rmfnf"]
+resource_name = "easy_selected"
+length = 0.1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Easy:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(365, 190), Vector2(160, 525)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Easy:modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
+}
+
+[sub_resource type="Animation" id="Animation_hevwb"]
+resource_name = "hard_select_ani"
+length = 0.05
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Hard:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.0333333),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(398, 393), Vector2(348, 393)]
+}
+
+[sub_resource type="Animation" id="Animation_fw2c0"]
+resource_name = "hard_selected"
+length = 0.1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Hard:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(398, 393), Vector2(160, 525)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Hard:modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
+}
+
+[sub_resource type="Animation" id="Animation_1xwcd"]
+resource_name = "lunatic_select_ani"
+length = 0.05
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Lunatic:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.0333333),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(499, 514), Vector2(449, 514)]
+}
+
+[sub_resource type="Animation" id="Animation_u7kdn"]
+resource_name = "lunatic_selected"
+length = 0.1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Lunatic:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(499, 514), Vector2(160, 525)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Lunatic:modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
+}
+
 [sub_resource type="Animation" id="Animation_6nvv3"]
 resource_name = "new_animation"
 length = 0.1
@@ -232,109 +364,41 @@ tracks/8/keys = {
 "values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
 }
 
-[sub_resource type="Animation" id="Animation_ubub6"]
-resource_name = "normal_selected"
-length = 0.1
+[sub_resource type="Animation" id="Animation_1sfeo"]
+resource_name = "normal_select_ani"
+length = 0.05
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/path = NodePath("Normal:position")
-tracks/0/interp = 2
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(418, 284), Vector2(160, 525)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("Normal:modulate")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
-}
-
-[sub_resource type="Animation" id="Animation_rmfnf"]
-resource_name = "easy_selected"
-length = 0.1
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Easy:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(365, 190), Vector2(160, 525)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("Easy:modulate")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
-}
-
-[sub_resource type="Animation" id="Animation_fw2c0"]
-resource_name = "hard_selected"
-length = 0.1
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Hard:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(398, 393), Vector2(160, 525)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("Hard:modulate")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.1),
+"times": PackedFloat32Array(0, 0.0333333),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
+"values": [Vector2(418, 284), Vector2(368, 284)]
 }
 
-[sub_resource type="Animation" id="Animation_u7kdn"]
-resource_name = "lunatic_selected"
+[sub_resource type="Animation" id="Animation_ubub6"]
+resource_name = "normal_selected"
 length = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Lunatic:position")
-tracks/0/interp = 1
+tracks/0/path = NodePath("Normal:position")
+tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 0.1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(499, 514), Vector2(160, 525)]
+"values": [Vector2(418, 284), Vector2(160, 525)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
-tracks/1/path = NodePath("Lunatic:modulate")
+tracks/1/path = NodePath("Normal:modulate")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
@@ -344,70 +408,6 @@ tracks/1/keys = {
 "values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1)]
 }
 
-[sub_resource type="Animation" id="Animation_7obow"]
-resource_name = "easy_select_ani"
-length = 0.05
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Easy:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.0333333),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(365, 190), Vector2(315, 190)]
-}
-
-[sub_resource type="Animation" id="Animation_1sfeo"]
-resource_name = "normal_select_ani"
-length = 0.05
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Normal:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.0333333),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(418, 284), Vector2(368, 284)]
-}
-
-[sub_resource type="Animation" id="Animation_hevwb"]
-resource_name = "hard_select_ani"
-length = 0.05
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Hard:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.0333333),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(398, 393), Vector2(348, 393)]
-}
-
-[sub_resource type="Animation" id="Animation_1xwcd"]
-resource_name = "lunatic_select_ani"
-length = 0.05
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Lunatic:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.0333333),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector2(499, 514), Vector2(449, 514)]
-}
-
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_ucd7n"]
 _data = {
 "RESET": SubResource("Animation_v7755"),
@@ -495,3 +495,9 @@ libraries = {
 "": SubResource("AnimationLibrary_ucd7n")
 }
 speed_scale = 0.5
+
+[node name="AnimationPlayer3" type="AnimationPlayer" parent="."]
+libraries = {
+"": SubResource("AnimationLibrary_ucd7n")
+}
+speed_scale = 0.5

+ 2 - 0
characterselect.gd

@@ -31,5 +31,7 @@ func _process(delta: float) -> void:
 			
 		get_tree().current_scene.get_node("StartMenu").upmenuopened=false
 		self.queue_free()
+	if(Input.is_action_just_pressed("ui_accept")):
 		
+		get_tree().change_scene_to_file("res://testscene.tscn")
 	pass

BIN
compare.png


+ 34 - 0
compare.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dr8qsbg7ofnwt"
+path="res://.godot/imported/compare.png-8802798560ea5a12077af18032801c58.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://compare.png"
+dest_files=["res://.godot/imported/compare.png-8802798560ea5a12077af18032801c58.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

BIN
compare.psd


+ 24 - 6
easy.gd

@@ -1,6 +1,7 @@
 extends Sprite2D
 
-
+signal onSelected
+signal onDeselected
 
 func ok():
 	var characterselect = load("res://characterselect.tscn").instantiate() as Node2D
@@ -9,11 +10,28 @@ func ok():
 	get_tree().current_scene.add_child(characterselect)
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass # Replace with function body.
+	onSelected.connect(selected)
+	onDeselected.connect(deselected)
 
+func selected():
+	self.set_region_rect(Rect2(0,0,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer3") as AnimationPlayer).play("easy_select_ani")
+	pass
+func deselected():
+	self.set_region_rect(Rect2(256,0,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer3") as AnimationPlayer).play_backwards("easy_select_ani")
+	pass
 
-# Called every frame. 'delta' is the elapsed time since the previous frame.
+var calledSelected = false
+var calledDeselected = false
 func _process(delta: float) -> void:
-	self.set_region_rect(Rect2(256,0,256,80))
-	if(self.get_meta("selected") == true):
-		self.set_region_rect(Rect2(0,0,256,80))
+	if(self.get_meta("selected") == true && calledSelected==false):
+		emit_signal("onSelected")
+		calledSelected=true
+		calledDeselected=false
+		
+	elif(self.get_meta("selected")==false&& calledDeselected==false):
+		calledSelected=false
+		calledDeselected=true
+		emit_signal("onDeselected")
+	

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 172 - 0
gameplay.tscn


+ 24 - 5
hard.gd

@@ -1,6 +1,7 @@
 extends Sprite2D
 
-
+signal onSelected
+signal onDeselected
 
 func ok():
 	var characterselect = load("res://characterselect.tscn").instantiate() as Node2D
@@ -9,11 +10,29 @@ func ok():
 	get_tree().current_scene.add_child(characterselect)
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass # Replace with function body.
+	onSelected.connect(selected)
+	onDeselected.connect(deselected)
 
+func selected():
+	self.set_region_rect(Rect2(0,160,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer3") as AnimationPlayer).play("hard_select_ani")
+	pass
+func deselected():
+	self.set_region_rect(Rect2(256,160,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer3") as AnimationPlayer).play_backwards("hard_select_ani")
+	pass
 
+var calledSelected = false
+var calledDeselected = false
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
-	self.set_region_rect(Rect2(256,160,256,80))
-	if(self.get_meta("selected") == true):
-		self.set_region_rect(Rect2(0,160,256,80))
+	if(self.get_meta("selected") == true && calledSelected==false):
+		emit_signal("onSelected")
+		calledSelected=true
+		calledDeselected=false
+		
+	elif(self.get_meta("selected")==false&& calledDeselected==false):
+		calledSelected=false
+		calledDeselected=true
+		emit_signal("onDeselected")
+	

+ 25 - 4
lunatic.gd

@@ -1,5 +1,7 @@
 extends Sprite2D
 
+signal onSelected
+signal onDeselected
 
 func ok():
 	var characterselect = load("res://characterselect.tscn").instantiate() as Node2D
@@ -8,11 +10,30 @@ func ok():
 	get_tree().current_scene.add_child(characterselect)
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass # Replace with function body.
+	onSelected.connect(selected)
+	onDeselected.connect(deselected)
+	
+func selected():
+	self.set_region_rect(Rect2(0,240,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer2") as AnimationPlayer).play("lunatic_select_ani")
+	pass
+func deselected():
+	self.set_region_rect(Rect2(256,240,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer2") as AnimationPlayer).play_backwards("lunatic_select_ani")
+	pass
+	
+var calledSelected = false
+var calledDeselected = false
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
-	self.set_region_rect(Rect2(256,240,256,80))
-	if(self.get_meta("selected") == true):
-		self.set_region_rect(Rect2(0,240,256,80))
+	if(self.get_meta("selected") == true && calledSelected==false):
+		emit_signal("onSelected")
+		calledSelected=true
+		calledDeselected=false
+		
+	elif(self.get_meta("selected")==false&& calledDeselected==false):
+		calledSelected=false
+		calledDeselected=true
+		emit_signal("onDeselected")

+ 30 - 13
normal.gd

@@ -1,7 +1,11 @@
 extends Sprite2D
 
 
+
 	
+signal onSelected
+signal onDeselected
+
 
 func ok():
 	var characterselect = load("res://characterselect.tscn").instantiate() as Node2D
@@ -10,20 +14,33 @@ func ok():
 	get_tree().current_scene.add_child(characterselect)
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass # Replace with function body.
-
-var selectAnimationPlayed = 0
-
+	onSelected.connect(selected)
+	onDeselected.connect(deselected)
+func selected():
+	self.set_region_rect(Rect2(0,80,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer2") as AnimationPlayer).play("normal_select_ani")
+	pass
+func deselected():
+	self.set_region_rect(Rect2(256,80,256,80))
+	(self.find_parent("StartMenu").get_node("AnimationPlayer2") as AnimationPlayer).play_backwards("normal_select_ani")
+	pass
 # Called every frame. 'delta' is the elapsed time since the previous frame.
+
+var calledSelected = false
+var calledDeselected = false
 func _process(delta: float) -> void:
 	
-	self.set_region_rect(Rect2(256,80,256,80))
-	if(self.get_meta("selected") == true):
-		self.set_region_rect(Rect2(0,80,256,80))
-		if(selectAnimationPlayed == 0):
-			(self.get_parent().get_node("AnimationPlayer2") as AnimationPlayer).play("normal_select_ani")
-			selectAnimationPlayed = 1; 
-	elif selectAnimationPlayed==1:
-		(self.get_parent().get_node("AnimationPlayer2") as AnimationPlayer).play_backwards("normal_select_ani")
-		selectAnimationPlayed = 0;
+	if(self.get_meta("selected") == true && calledSelected==false):
+		emit_signal("onSelected")
+		calledSelected=true
+		calledDeselected=false
+		
+	elif(self.get_meta("selected")==false&& calledDeselected==false):
+		calledSelected=false
+		calledDeselected=true
+		emit_signal("onDeselected")
+	
+		
+
+	
 		

+ 16 - 0
project.godot

@@ -30,6 +30,22 @@ window/stretch/mode="viewport"
 
 project/assembly_name="touhou"
 
+[importer_defaults]
+
+font_data_image={
+"ascent": 0,
+"character_margin": Rect2i(0, 0, 0, 0),
+"character_ranges": PackedStringArray(),
+"columns": 1,
+"compress": true,
+"descent": 0,
+"fallbacks": [],
+"image_margin": Rect2i(0, 0, 0, 0),
+"kerning_pairs": PackedStringArray(),
+"rows": 1,
+"scaling_mode": 2
+}
+
 [input]
 
 ui_accept={

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 180 - 0
s01/s01.tscn


Vissa filer visades inte eftersom för många filer har ändrats