Skip to content

Commit

Permalink
aw hell no
Browse files Browse the repository at this point in the history
Github & Godot trippin' rn
  • Loading branch information
Frakif91 committed Sep 23, 2024
1 parent 4f3ddfd commit f3f3f34
Show file tree
Hide file tree
Showing 3 changed files with 270 additions and 17 deletions.
265 changes: 253 additions & 12 deletions Godot/Scene/battle_scene.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=162 format=3 uid="uid://dp4cs1mjnurxf"]
[gd_scene load_steps=164 format=3 uid="uid://dp4cs1mjnurxf"]

[ext_resource type="Script" path="res://Godot/Scripts/CharacterBody3D.gd" id="1_ad80m"]
[ext_resource type="Script" path="res://Godot/Scripts/game.gd" id="1_k43w1"]
Expand All @@ -14,11 +14,11 @@
[ext_resource type="AudioStream" uid="uid://cm8whqc1dnbfa" path="res://Assets/SFX/SML2_Jump.ogg" id="7_obbi1"]
[ext_resource type="PackedScene" uid="uid://p4r5g73ddt6g" path="res://Godot/Nodes/choosecubes.tscn" id="8_3g76q"]
[ext_resource type="Texture2D" uid="uid://cmacwq34raqa1" path="res://Assets/Battle UI.png" id="9_12403"]
[ext_resource type="AudioStream" uid="uid://xm1f7vowgt0n" path="res://Assets/Music/Okey Dokey! DX - Mario and Luigi BIS DX .mp3" id="9_lj31k"]
[ext_resource type="Texture2D" uid="uid://bp61hwbohrbf2" path="res://Godot/Assets/mushroom.tres" id="11_4m4tf"]
[ext_resource type="PackedScene" uid="uid://jntlvgyqrksk" path="res://Godot/Nodes/item_list.tscn" id="12_6qohb"]
[ext_resource type="AudioStream" uid="uid://cyt320yrhvevo" path="res://Assets/SFX/WU_SE_SYS_INVALID_.wav" id="12_okllj"]
[ext_resource type="AudioStream" uid="uid://dtvi1p5cm4pq1" path="res://Assets/SFX/Mario_&_Luigi_DT_Heal.ogg" id="13_0qoua"]
[ext_resource type="AudioStream" uid="uid://cye64h0u6v3o" path="res://Assets/Music/Joyous Occasion - Mario & Luigi Dream Team Music.mp3" id="13_nmdu7"]
[ext_resource type="AudioStream" uid="uid://cuuhk5ph5ei61" path="res://Assets/SFX/Mario_&_Luigi_PIT_Special_Item.ogg" id="13_xrfkv"]
[ext_resource type="AudioStream" uid="uid://banes0qmrawhh" path="res://Assets/SFX/Hollywoodedge,_Ascending_WhistleS_CRT058003.ogg" id="14_6leu0"]
[ext_resource type="Texture2D" uid="uid://dwiad5hmtb41q" path="res://Assets/Battle UI Paper Mario.png" id="17_fsweh"]
Expand Down Expand Up @@ -656,36 +656,93 @@ length = 0.001
tracks/0/type = "bezier"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite3D:position:x")
tracks/0/path = NodePath("../../Mario:position:x")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(-0.3, -0.25, 0, 0.25, 0),
"points": PackedFloat32Array(0, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/1/type = "bezier"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Sprite3D:position:y")
tracks/1/path = NodePath("../../Mario:position:y")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0.3, -0.25, 0, 0.25, 0),
"points": PackedFloat32Array(0.33174, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/2/type = "bezier"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Sprite3D:position:z")
tracks/2/path = NodePath("../../Mario:position:z")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
"points": PackedFloat32Array(0, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/3/type = "bezier"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../../Luigi:position:x")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(-0.408896, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/4/type = "bezier"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../../Luigi:position:y")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0.311155, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/5/type = "bezier"
tracks/5/imported = false
tracks/5/enabled = true
tracks/5/path = NodePath("../../Luigi:position:z")
tracks/5/interp = 1
tracks/5/loop_wrap = true
tracks/5/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0.760046, -0.0005, 0, 0.0005, 0),
"times": PackedFloat32Array(0)
}
tracks/6/type = "value"
tracks/6/imported = false
tracks/6/enabled = true
tracks/6/path = NodePath("../../Mario/AnimatedSprite3D:animation")
tracks/6/interp = 1
tracks/6/loop_wrap = true
tracks/6/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"jump-up-right"]
}
tracks/7/type = "value"
tracks/7/imported = false
tracks/7/enabled = true
tracks/7/path = NodePath("../../Luigi/AnimatedSprite3D:animation")
tracks/7/interp = 1
tracks/7/loop_wrap = true
tracks/7/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"jump-up-right"]
}

[sub_resource type="Animation" id="Animation_statb"]
resource_name = "point"
Expand Down Expand Up @@ -725,10 +782,14 @@ tracks/2/keys = {
"times": PackedFloat32Array(0, 0.5)
}

[sub_resource type="Animation" id="Animation_qsmph"]
resource_name = "victory"

[sub_resource type="AnimationLibrary" id="AnimationLibrary_flurs"]
_data = {
"RESET": SubResource("Animation_qxujt"),
"point": SubResource("Animation_statb")
"point": SubResource("Animation_statb"),
"victory": SubResource("Animation_qsmph")
}

[sub_resource type="Animation" id="Animation_08v1m"]
Expand Down Expand Up @@ -1128,6 +1189,63 @@ tracks/15/keys = {
"update": 0,
"values": [Vector3(0, 0.33174, 0)]
}
tracks/16/type = "bezier"
tracks/16/imported = false
tracks/16/enabled = true
tracks/16/path = NodePath("../Characters/Luigi:position:x")
tracks/16/interp = 1
tracks/16/loop_wrap = true
tracks/16/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(-0.408896, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0)
}
tracks/17/type = "bezier"
tracks/17/imported = false
tracks/17/enabled = true
tracks/17/path = NodePath("../Characters/Luigi:position:y")
tracks/17/interp = 1
tracks/17/loop_wrap = true
tracks/17/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0.311155, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0)
}
tracks/18/type = "bezier"
tracks/18/imported = false
tracks/18/enabled = true
tracks/18/path = NodePath("../Characters/Luigi:position:z")
tracks/18/interp = 1
tracks/18/loop_wrap = true
tracks/18/keys = {
"handle_modes": PackedInt32Array(0),
"points": PackedFloat32Array(0.760046, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0)
}
tracks/19/type = "value"
tracks/19/imported = false
tracks/19/enabled = true
tracks/19/path = NodePath("../Characters/Luigi/AnimatedSprite3D:animation")
tracks/19/interp = 1
tracks/19/loop_wrap = true
tracks/19/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"hammer_start_charge"]
}
tracks/20/type = "value"
tracks/20/imported = false
tracks/20/enabled = true
tracks/20/path = NodePath("../MainCamera:rotation")
tracks/20/interp = 1
tracks/20/loop_wrap = true
tracks/20/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(-0.523598, 0, 0)]
}

[sub_resource type="Animation" id="Animation_jp8ui"]
resource_name = "_jump_sucess"
Expand Down Expand Up @@ -1394,6 +1512,128 @@ tracks/5/keys = {
"times": PackedFloat32Array(0, 0.3, 0.545665, 0.6, 1.00724, 1.9)
}

[sub_resource type="Animation" id="Animation_oglgf"]
resource_name = "victory"
length = 5.0
step = 0.05
tracks/0/type = "bezier"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../Characters/Mario:position:x")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0.8, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 1.25)
}
tracks/1/type = "bezier"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("../Characters/Mario:position:y")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"handle_modes": PackedInt32Array(0, 0, 0),
"points": PackedFloat32Array(0.33174, 0, 0, 0, 0, 2.8, -0.1, 0, 0.3, 0, 2, 0, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 0.85, 1.25)
}
tracks/2/type = "bezier"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("../Characters/Mario:position:z")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 1.8, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 1.25)
}
tracks/3/type = "bezier"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../Characters/Luigi:position:x")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(-0.408896, -0.25, 0, 0.25, 0, 0.2, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 1.25)
}
tracks/4/type = "bezier"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../Characters/Luigi:position:y")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"handle_modes": PackedInt32Array(0, 0, 0),
"points": PackedFloat32Array(0.33174, 0, 0, 0, 0, 2.8, -0.1, 0, 0.3, 0, 2, 0, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 0.85, 1.25)
}
tracks/5/type = "bezier"
tracks/5/imported = false
tracks/5/enabled = true
tracks/5/path = NodePath("../Characters/Luigi:position:z")
tracks/5/interp = 1
tracks/5/loop_wrap = true
tracks/5/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(0.760046, -0.25, 0, 0.25, 0, 1.8, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0.25, 1.25)
}
tracks/6/type = "value"
tracks/6/imported = false
tracks/6/enabled = true
tracks/6/path = NodePath("../Characters/Luigi/AnimatedSprite3D:animation")
tracks/6/interp = 1
tracks/6/loop_wrap = true
tracks/6/keys = {
"times": PackedFloat32Array(0.25, 1.25),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [&"jump-up-right", &"victory"]
}
tracks/7/type = "value"
tracks/7/imported = false
tracks/7/enabled = true
tracks/7/path = NodePath("../Characters/Mario/AnimatedSprite3D:animation")
tracks/7/interp = 1
tracks/7/loop_wrap = true
tracks/7/keys = {
"times": PackedFloat32Array(0.25, 1.25),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [&"jump-up-right", &"victory"]
}
tracks/8/type = "value"
tracks/8/imported = false
tracks/8/enabled = true
tracks/8/path = NodePath("../MainCamera:rotation")
tracks/8/interp = 1
tracks/8/loop_wrap = true
tracks/8/keys = {
"times": PackedFloat32Array(0.25, 1.25),
"transitions": PackedFloat32Array(0.5, 1),
"update": 0,
"values": [Vector3(-0.523598, 0, 0), Vector3(0.698132, 0, 0)]
}
tracks/9/type = "audio"
tracks/9/imported = false
tracks/9/enabled = true
tracks/9/path = NodePath("../BackgroundMusic")
tracks/9/interp = 1
tracks/9/loop_wrap = true
tracks/9/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("13_nmdu7")
}],
"times": PackedFloat32Array(0)
}
tracks/9/use_blend = true

[sub_resource type="AnimationLibrary" id="AnimationLibrary_quky8"]
_data = {
"Eat": SubResource("Animation_08v1m"),
Expand All @@ -1403,7 +1643,8 @@ _data = {
"_jump_sucess": SubResource("Animation_jp8ui"),
"_jump_sucess_old": SubResource("Animation_qgryf"),
"double_jump_on_goomba": SubResource("Animation_p1hsl"),
"fail_stomp": SubResource("Animation_vm5qf")
"fail_stomp": SubResource("Animation_vm5qf"),
"victory": SubResource("Animation_oglgf")
}

[sub_resource type="Animation" id="Animation_e844i"]
Expand Down Expand Up @@ -2238,6 +2479,7 @@ mesh = SubResource("TubeTrailMesh_1odcr")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.33174, 0)
slide_on_ceiling = false
script = ExtResource("1_ad80m")
metadata/_edit_group_ = true

[node name="CollisionShape3D" type="CollisionShape3D" parent="Characters/Mario"]
shape = SubResource("BoxShape3D_pui0c")
Expand Down Expand Up @@ -2271,6 +2513,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.408896, 0.311155, 0.760046
slide_on_ceiling = false
script = ExtResource("1_ad80m")
who = "Luigi"
metadata/_edit_group_ = true

[node name="CollisionShape3D" type="CollisionShape3D" parent="Characters/Luigi"]
shape = SubResource("BoxShape3D_pui0c")
Expand All @@ -2282,7 +2525,6 @@ billboard = 1
texture_filter = 0
sprite_frames = ExtResource("6_8wy7m")
animation = &"hammer_start_charge"
frame_progress = 0.852744

[node name="RoundShadow" type="MeshInstance3D" parent="Characters/Luigi"]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -0.08, -0.1, 0)
Expand Down Expand Up @@ -2382,7 +2624,6 @@ offset_speed = 400.0
metadata/_edit_pinned_properties_ = [&"pos_offset"]

[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_lj31k")
volume_db = -16.0
autoplay = true

Expand Down
4 changes: 2 additions & 2 deletions Godot/Scene/shop_ui.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
[ext_resource type="FontFile" uid="uid://b7lu2exjpd0hf" path="res://Fonts/Daydream.ttf" id="8_vo4rf"]
[ext_resource type="Texture2D" uid="uid://cjooen3kd8i6e" path="res://Assets/Sprites/Wii U - Paper Mario Color Splash - Toad Green.png" id="9_6rb8r"]
[ext_resource type="Texture2D" uid="uid://0tcuoypplm1p" path="res://Assets/Textbox/3DS - Mario & Luigi Dream Team - Text Box.png" id="12_c5txx"]
[ext_resource type="Texture2D" uid="uid://dv24wmg0mqlm4" path="res://Assets/Handmade/podium_wip_paint_transparent.png" id="13_y16jp"]
[ext_resource type="Texture2D" uid="uid://wkrpyrs4ypgu" path="res://Assets/Textbox/bluebox_glued_x3.png" id="15_eofu3"]
[ext_resource type="Texture2D" path="res://Assets/Handmade/podium_wip_paint_transparent.png" id="13_y16jp"]
[ext_resource type="Texture2D" path="res://Assets/Textbox/bluebox_glued_x3.png" id="15_eofu3"]
[ext_resource type="FontFile" uid="uid://bia54gcp3jvvb" path="res://Fonts/SuperMario256.ttf" id="16_beohj"]

[sub_resource type="AtlasTexture" id="AtlasTexture_o7aqa"]
Expand Down
Loading

0 comments on commit f3f3f34

Please sign in to comment.