From 10c494a51f6ae81136dff2410eea2c86051a3603 Mon Sep 17 00:00:00 2001 From: this-is-bennyk Date: Sat, 23 Jul 2022 21:14:18 +0200 Subject: [PATCH] 2.2.1 --- addons/dialogic/Nodes/DialogNode.tscn | 9 +--- addons/godot-openxr/scenes/controller.gd | 4 +- .../graphics/boyfriend/anims/Down_Miss.tres | 42 +++++++++++++++ assets/graphics/boyfriend/anims/Fear.tres | 43 +++++++++++++++ assets/graphics/boyfriend/anims/Hey.tres | 42 +++++++++++++++ .../graphics/boyfriend/anims/Left_Miss.tres | 42 +++++++++++++++ .../graphics/boyfriend/anims/Right_Miss.tres | 42 +++++++++++++++ assets/graphics/boyfriend/anims/Up_Miss.tres | 41 ++++++++++++++ assets/graphics/game/notes/NOTE_assets.xml | 53 +++++++++++++++++++ packages/benjine_test_mod/desc/mod_desc.tres | 4 +- .../benjine_test_mod/levels/Level_Test.tscn | 2 +- packages/fnf/levels/Level_EvilSchool.tscn | 14 ++--- packages/fnf/levels/Level_Halloween.tscn | 7 ++- packages/fnf/levels/Level_Limo.tscn | 7 ++- packages/fnf/levels/Level_Pico.tscn | 4 +- packages/fnf/levels/Level_School.tscn | 15 +++--- packages/fnf/levels/Level_Tankman.tscn | 8 ++- .../fnf/scripts/game/levels/Level_Limo.gd | 4 +- .../fnf/scripts/game/levels/Level_Pico.gd | 12 ++--- .../fnf/scripts/game/levels/Level_Tankman.gd | 2 +- scripts/FreeplayOnlyMain.gd | 15 ++++-- scripts/game/Level.gd | 1 + scripts/game/notes/Lane.gd | 2 +- scripts/general/DriverIndependentParticles.gd | 2 + scripts/general/PitchScaledAnimSprite.gd | 4 ++ .../general/PitchScaledAudioStreamPlayer.gd | 4 ++ scripts/menus/story_mode/StoryModeMenu.gd | 1 + tools/chart_parser/ChartParser.tscn | 12 ++--- tools/pck_packer/PCK_Packer.tscn | 2 +- tools/xml/XML_To_SpriteFrames.tscn | 4 +- 30 files changed, 392 insertions(+), 52 deletions(-) create mode 100644 assets/graphics/boyfriend/anims/Down_Miss.tres create mode 100644 assets/graphics/boyfriend/anims/Fear.tres create mode 100644 assets/graphics/boyfriend/anims/Hey.tres create mode 100644 assets/graphics/boyfriend/anims/Left_Miss.tres create mode 100644 assets/graphics/boyfriend/anims/Right_Miss.tres create mode 100644 assets/graphics/boyfriend/anims/Up_Miss.tres create mode 100644 assets/graphics/game/notes/NOTE_assets.xml create mode 100644 scripts/general/PitchScaledAnimSprite.gd create mode 100644 scripts/general/PitchScaledAudioStreamPlayer.gd diff --git a/addons/dialogic/Nodes/DialogNode.tscn b/addons/dialogic/Nodes/DialogNode.tscn index cd02ec5..3b9c3ba 100644 --- a/addons/dialogic/Nodes/DialogNode.tscn +++ b/addons/dialogic/Nodes/DialogNode.tscn @@ -20,9 +20,6 @@ expand_margin_left = 10.0 anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 6 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Portraits" type="Control" parent="."] anchor_left = 0.5 @@ -39,8 +36,8 @@ margin_bottom = -40.0 [node name="Options" type="VBoxContainer" parent="."] visible = false -margin_right = 1024.0 -margin_bottom = 600.0 +margin_right = 1280.0 +margin_bottom = 720.0 grow_horizontal = 2 grow_vertical = 2 alignment = 1 @@ -81,13 +78,11 @@ samples = [ ExtResource( 9 ) ] random_strategy = 2 [node name="Hovering" type="AudioStreamPlayer" parent="FX/Audio"] -pitch_scale = 0.0001 script = ExtResource( 8 ) samples = [ ExtResource( 9 ) ] random_strategy = 2 [node name="Selecting" type="AudioStreamPlayer" parent="FX/Audio"] -pitch_scale = 0.0001 script = ExtResource( 8 ) samples = [ ExtResource( 9 ) ] random_strategy = 2 diff --git a/addons/godot-openxr/scenes/controller.gd b/addons/godot-openxr/scenes/controller.gd index 40bf45e..c0f0c50 100644 --- a/addons/godot-openxr/scenes/controller.gd +++ b/addons/godot-openxr/scenes/controller.gd @@ -24,11 +24,11 @@ func _process(delta): func check_activation(): if get_is_active(): - visible = true +# visible = true print("Activated " + name) emit_signal("activated") elif visible: - visible = false +# visible = false print("Deactivated " + name) emit_signal("deactivated") diff --git a/assets/graphics/boyfriend/anims/Down_Miss.tres b/assets/graphics/boyfriend/anims/Down_Miss.tres new file mode 100644 index 0000000..f767b9f --- /dev/null +++ b/assets/graphics/boyfriend/anims/Down_Miss.tres @@ -0,0 +1,42 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Down_Miss" +length = 1.20833 +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF NOTE DOWN MISS" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 1.16667 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 28 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 11, 19 ) ] +} diff --git a/assets/graphics/boyfriend/anims/Fear.tres b/assets/graphics/boyfriend/anims/Fear.tres new file mode 100644 index 0000000..eb00c29 --- /dev/null +++ b/assets/graphics/boyfriend/anims/Fear.tres @@ -0,0 +1,43 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Fear" +length = 0.166667 +loop = true +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF idle shaking" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.0416667, 0.0833334, 0.125 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 3 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 4, 0 ) ] +} diff --git a/assets/graphics/boyfriend/anims/Hey.tres b/assets/graphics/boyfriend/anims/Hey.tres new file mode 100644 index 0000000..36fcddb --- /dev/null +++ b/assets/graphics/boyfriend/anims/Hey.tres @@ -0,0 +1,42 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Hey" +length = 1.08333 +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF HEY!!" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 1.04167 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 25 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( -7, -4 ) ] +} diff --git a/assets/graphics/boyfriend/anims/Left_Miss.tres b/assets/graphics/boyfriend/anims/Left_Miss.tres new file mode 100644 index 0000000..c74986c --- /dev/null +++ b/assets/graphics/boyfriend/anims/Left_Miss.tres @@ -0,0 +1,42 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Left_Miss" +length = 1.41667 +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF NOTE LEFT MISS" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 1.375 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 33 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( -12, -24 ) ] +} diff --git a/assets/graphics/boyfriend/anims/Right_Miss.tres b/assets/graphics/boyfriend/anims/Right_Miss.tres new file mode 100644 index 0000000..1d14371 --- /dev/null +++ b/assets/graphics/boyfriend/anims/Right_Miss.tres @@ -0,0 +1,42 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Right_Miss" +length = 1.91667 +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF NOTE RIGHT MISS" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 1.875 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 45 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 30, -21 ) ] +} diff --git a/assets/graphics/boyfriend/anims/Up_Miss.tres b/assets/graphics/boyfriend/anims/Up_Miss.tres new file mode 100644 index 0000000..2966c22 --- /dev/null +++ b/assets/graphics/boyfriend/anims/Up_Miss.tres @@ -0,0 +1,41 @@ +[gd_resource type="Animation" format=2] + +[resource] +resource_name = "Up_Miss" +step = 0.0416667 +tracks/0/type = "value" +tracks/0/path = NodePath(".:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ "BF NOTE UP MISS" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.958334 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 23 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 29, -27 ) ] +} diff --git a/assets/graphics/game/notes/NOTE_assets.xml b/assets/graphics/game/notes/NOTE_assets.xml new file mode 100644 index 0000000..82a997a --- /dev/null +++ b/assets/graphics/game/notes/NOTE_assets.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/benjine_test_mod/desc/mod_desc.tres b/packages/benjine_test_mod/desc/mod_desc.tres index 057c8d6..2d20b64 100644 --- a/packages/benjine_test_mod/desc/mod_desc.tres +++ b/packages/benjine_test_mod/desc/mod_desc.tres @@ -6,8 +6,8 @@ script = ExtResource( 1 ) mod_name = "Benjine Example Mod" mod_author = "ThisIsBennyK" -mod_version = "2.2.0" -mod_package_name = "Benjine_Example_Mod_V2.2.0" +mod_version = "2.2.1" +mod_package_name = "Benjine_Example_Mod_V2.2.1" advanced_mod = false main_path = "res://scenes/Main.tscn" description = "Shows off what a level in the Benjine is capable of, with little new code added." diff --git a/packages/benjine_test_mod/levels/Level_Test.tscn b/packages/benjine_test_mod/levels/Level_Test.tscn index be674e8..8ef6f03 100644 --- a/packages/benjine_test_mod/levels/Level_Test.tscn +++ b/packages/benjine_test_mod/levels/Level_Test.tscn @@ -363,7 +363,7 @@ lane_type = 1 position = Vector2( 167.25, 0 ) lane_type = 1 -[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="2"] +[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="3"] visible = false [editable path="HUDPackage2D"] diff --git a/packages/fnf/levels/Level_EvilSchool.tscn b/packages/fnf/levels/Level_EvilSchool.tscn index 4ff53f5..4a559ac 100644 --- a/packages/fnf/levels/Level_EvilSchool.tscn +++ b/packages/fnf/levels/Level_EvilSchool.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://scenes/shared/game/notes/2d/pixel/Up_Pixel_Lane.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://scenes/effects/hxf_trail/HXF_GhostTrail.tscn" type="PackedScene" id=11] [ext_resource path="res://scripts/game/notes/StepZone2D.gd" type="Script" id=12] [ext_resource path="res://assets/graphics/game/hud/pixel/countdown_messages.tres" type="SpriteFrames" id=13] +[ext_resource path="res://scripts/general/PitchScaledAnimSprite.gd" type="Script" id=14] [node name="Level" type="Node"] script = ExtResource( 4 ) @@ -44,6 +45,7 @@ scale = Vector2( 6, 6 ) frames = ExtResource( 10 ) animation = "background 2 instance 1" centered = false +script = ExtResource( 14 ) [node name="Stage" type="Node2D" parent="."] scale = Vector2( 6, 6 ) @@ -69,10 +71,7 @@ position = Vector2( -30, -6 ) resting_zoom = 1.05 zoom_on_quarter_hit = 1.065 -[node name="Player_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="0"] -visible = false - -[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="1"] +[node name="Player_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="1"] visible = false [node name="Pixel_Player_Zone" type="Node2D" parent="HUDPackage2D/HUD/Visible_Elements" index="2"] @@ -111,7 +110,10 @@ lane_type = 1 position = Vector2( 167.25, 0 ) lane_type = 1 -[node name="Countdown_Msgs" parent="HUDPackage2D/HUD/Visible_Elements" index="6"] +[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="4"] +visible = false + +[node name="Countdown_Msgs" parent="HUDPackage2D/HUD/Visible_Elements" index="7"] scale = Vector2( 6, 6 ) frames = ExtResource( 13 ) diff --git a/packages/fnf/levels/Level_Halloween.tscn b/packages/fnf/levels/Level_Halloween.tscn index 4ac2c3f..6f5280a 100644 --- a/packages/fnf/levels/Level_Halloween.tscn +++ b/packages/fnf/levels/Level_Halloween.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://scenes/shared/game/characters/Girlfriend.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -7,6 +7,8 @@ [ext_resource path="res://packages/fnf/resources/graphics/week2/halloween_bg.res" type="SpriteFrames" id=5] [ext_resource path="res://packages/fnf/characters/spooky_kids/Spooky_Kids.tscn" type="PackedScene" id=6] [ext_resource path="res://packages/fnf/characters/monster/Monster.tscn" type="PackedScene" id=7] +[ext_resource path="res://scripts/general/PitchScaledAnimPlayer.gd" type="Script" id=8] +[ext_resource path="res://scripts/general/PitchScaledAudioStreamPlayer.gd" type="Script" id=9] [sub_resource type="Animation" id=1] resource_name = "Lightning" @@ -92,6 +94,7 @@ centered = false [node name="AnimationPlayer" type="AnimationPlayer" parent="BG"] anims/Lightning = SubResource( 1 ) anims/RESET = SubResource( 2 ) +script = ExtResource( 8 ) [node name="Girlfriend" parent="." instance=ExtResource( 1 )] @@ -104,6 +107,8 @@ idle_frequency = 2 visible = false [node name="Thunder" type="AudioStreamPlayer" parent="."] +bus = "SFX" +script = ExtResource( 9 ) [node name="HUDPackage2D" parent="." instance=ExtResource( 2 )] diff --git a/packages/fnf/levels/Level_Limo.tscn b/packages/fnf/levels/Level_Limo.tscn index 159cdf6..3965268 100644 --- a/packages/fnf/levels/Level_Limo.tscn +++ b/packages/fnf/levels/Level_Limo.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://scenes/shared/game/characters/Girlfriend.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -12,6 +12,8 @@ [ext_resource path="res://packages/fnf/resources/graphics/week4/fastCarLol.png" type="Texture" id=10] [ext_resource path="res://packages/fnf/resources/graphics/week4/limoOverlay.png" type="Texture" id=11] [ext_resource path="res://packages/fnf/scripts/Screen_Overlay.tres" type="Shader" id=12] +[ext_resource path="res://scripts/general/PitchScaledAnimSprite.gd" type="Script" id=13] +[ext_resource path="res://scripts/general/PitchScaledAudioStreamPlayer.gd" type="Script" id=14] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 12 ) @@ -58,6 +60,7 @@ position = Vector2( -200, 480 ) frames = ExtResource( 7 ) animation = "background limo pink" centered = false +script = ExtResource( 13 ) [node name="Dancing_Demon" parent="ParallaxBackground/Dancing_Demons" instance=ExtResource( 8 )] position = Vector2( 130, 80 ) @@ -92,6 +95,7 @@ position = Vector2( -120, 550 ) frames = ExtResource( 9 ) animation = "Limo stage" centered = false +script = ExtResource( 13 ) [node name="BF_Car" parent="." instance=ExtResource( 3 )] idle_frequency = 2 @@ -105,6 +109,7 @@ position = Vector2( 841, 236 ) [node name="Car_Pass_Sound" type="AudioStreamPlayer" parent="."] volume_db = -3.098 bus = "SFX" +script = ExtResource( 14 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = 0 diff --git a/packages/fnf/levels/Level_Pico.tscn b/packages/fnf/levels/Level_Pico.tscn index 9e7ef67..a6db6eb 100644 --- a/packages/fnf/levels/Level_Pico.tscn +++ b/packages/fnf/levels/Level_Pico.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://scenes/shared/game/characters/Girlfriend.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -16,6 +16,7 @@ [ext_resource path="res://packages/fnf/resources/graphics/week3/train.png" type="Texture" id=14] [ext_resource path="res://packages/fnf/resources/graphics/week3/street.png" type="Texture" id=15] [ext_resource path="res://packages/fnf/resources/sounds/train_passes.ogg" type="AudioStream" id=16] +[ext_resource path="res://scripts/general/PitchScaledAudioStreamPlayer.gd" type="Script" id=17] [sub_resource type="Animation" id=1] length = 0.001 @@ -164,6 +165,7 @@ idle_frequency = 2 [node name="Train_Pass_Noise" type="AudioStreamPlayer" parent="."] stream = ExtResource( 16 ) bus = "SFX" +script = ExtResource( 17 ) [node name="Train_Cooldown" type="Timer" parent="."] one_shot = true diff --git a/packages/fnf/levels/Level_School.tscn b/packages/fnf/levels/Level_School.tscn index 5cf34b0..cac87ba 100644 --- a/packages/fnf/levels/Level_School.tscn +++ b/packages/fnf/levels/Level_School.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://scenes/shared/game/notes/2d/pixel/Up_Pixel_Lane.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -18,6 +18,7 @@ [ext_resource path="res://packages/fnf/resources/scenes/week6/Fangirls.tscn" type="PackedScene" id=16] [ext_resource path="res://scripts/game/notes/StepZone2D.gd" type="Script" id=17] [ext_resource path="res://assets/graphics/game/hud/pixel/countdown_messages.tres" type="SpriteFrames" id=18] +[ext_resource path="res://scripts/general/PitchScaledAnimSprite.gd" type="Script" id=19] [node name="Level" type="Node"] script = ExtResource( 4 ) @@ -91,6 +92,7 @@ position = Vector2( -580, -800 ) scale = Vector2( 5.102, 5.102 ) frames = ExtResource( 14 ) centered = false +script = ExtResource( 19 ) [node name="Petals" type="AnimatedSprite" parent="ParallaxBackground/Tree_Tops"] position = Vector2( -200, -40 ) @@ -98,6 +100,7 @@ scale = Vector2( 6, 6 ) frames = ExtResource( 15 ) animation = "PETALS ALL" centered = false +script = ExtResource( 19 ) [node name="Position2D" type="Position2D" parent="ParallaxBackground/Tree_Tops"] position = Vector2( -200, -40 ) @@ -127,10 +130,7 @@ position = Vector2( 148.667, 72 ) resting_zoom = 1.05 zoom_on_quarter_hit = 1.065 -[node name="Player_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="0"] -visible = false - -[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="1"] +[node name="Player_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="1"] visible = false [node name="Pixel_Player_Zone" type="Node2D" parent="HUDPackage2D/HUD/Visible_Elements" index="2"] @@ -169,7 +169,10 @@ lane_type = 1 position = Vector2( 167.25, 0 ) lane_type = 1 -[node name="Countdown_Msgs" parent="HUDPackage2D/HUD/Visible_Elements" index="6"] +[node name="Opponent_Step_Zone" parent="HUDPackage2D/HUD/Visible_Elements" index="4"] +visible = false + +[node name="Countdown_Msgs" parent="HUDPackage2D/HUD/Visible_Elements" index="7"] scale = Vector2( 6, 6 ) frames = ExtResource( 18 ) diff --git a/packages/fnf/levels/Level_Tankman.tscn b/packages/fnf/levels/Level_Tankman.tscn index f7b453d..d2f5873 100644 --- a/packages/fnf/levels/Level_Tankman.tscn +++ b/packages/fnf/levels/Level_Tankman.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=46 format=2] +[gd_scene load_steps=48 format=2] [ext_resource path="res://packages/fnf/resources/graphics/week7/tankSky.png" type="Texture" id=1] [ext_resource path="res://scenes/shared/game/HUDPackage2D.tscn" type="PackedScene" id=2] @@ -28,6 +28,8 @@ [ext_resource path="res://packages/fnf/resources/graphics/week7/tankRolling.res" type="SpriteFrames" id=26] [ext_resource path="res://scenes/shared/game/characters/Partners.tscn" type="PackedScene" id=27] [ext_resource path="res://packages/fnf/characters/w7_pico/Pico_Speaker.tscn" type="PackedScene" id=28] +[ext_resource path="res://scripts/general/PitchScaledAnimPlayer.gd" type="Script" id=29] +[ext_resource path="res://scripts/general/PitchScaledAnimSprite.gd" type="Script" id=30] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 8 ) @@ -351,6 +353,7 @@ centered = false [node name="AnimationPlayer" type="AnimationPlayer" parent="ParallaxBackground/Ruins/SmokeLeft"] autoplay = "Smoking" anims/Smoking = ExtResource( 15 ) +script = ExtResource( 29 ) [node name="SmokeRight" type="AnimatedSprite" parent="ParallaxBackground/Ruins"] position = Vector2( 1145, -85 ) @@ -362,6 +365,7 @@ centered = false autoplay = "Smoking" anims/RESET = SubResource( 2 ) anims/Smoking = ExtResource( 15 ) +script = ExtResource( 29 ) [node name="Watchtower" type="ParallaxLayer" parent="ParallaxBackground"] motion_scale = Vector2( 0.4, 0.4 ) @@ -401,6 +405,7 @@ centered = false autoplay = "Roll" anims/RESET = SubResource( 16 ) anims/Roll = SubResource( 17 ) +script = ExtResource( 29 ) [node name="Tween" type="Tween" parent="ParallaxBackground/Behind_Ground/Tank_Path/Tank_PathFollow"] @@ -421,6 +426,7 @@ motion_offset = Vector2( -32, -18 ) [node name="Pico_Speaker" parent="ParallaxBackground/Metronomes" instance=ExtResource( 28 )] visible = false position = Vector2( 400, -5 ) +script = ExtResource( 30 ) [node name="Partners" parent="." instance=ExtResource( 27 )] visible = false diff --git a/packages/fnf/scripts/game/levels/Level_Limo.gd b/packages/fnf/scripts/game/levels/Level_Limo.gd index 1095d25..270082e 100644 --- a/packages/fnf/scripts/game/levels/Level_Limo.gd +++ b/packages/fnf/scripts/game/levels/Level_Limo.gd @@ -24,8 +24,6 @@ onready var fast_car_tween = $ParallaxBackground/Fast_Car/FastCarLol/Tween onready var car_pass_sound = $Car_Pass_Sound func do_level_specific_prep(): - - bg_limo.play("background limo pink") fg_limo.play("Limo stage") @@ -37,7 +35,7 @@ func send_fast_car(): fast_car.position.x = CAR_START_X fast_car.position.y = randi() % CAR_Y_MIN + (CAR_Y_MAX - CAR_Y_MIN) - fast_car_tween.interpolate_property(fast_car, "position:x", fast_car.position.x, final_x, CAR_DURATION) + fast_car_tween.interpolate_property(fast_car, "position:x", fast_car.position.x, final_x, CAR_DURATION / Conductor.pitch_scale) fast_car_tween.start() car_pass_sound.stop() diff --git a/packages/fnf/scripts/game/levels/Level_Pico.gd b/packages/fnf/scripts/game/levels/Level_Pico.gd index 641796a..aadeeae 100644 --- a/packages/fnf/scripts/game/levels/Level_Pico.gd +++ b/packages/fnf/scripts/game/levels/Level_Pico.gd @@ -13,25 +13,25 @@ func do_train_pass(past_state): match past_state: TrainStates.NOT_MOVING: if randf() <= 0.3 && !train_passing && !train_passing_noise.playing && train_cooldown.time_left == 0: - train_cooldown.start(Conductor.get_seconds_per_beat() * (9 + randi() % 4) * Conductor.pitch_scale) + train_cooldown.start(Conductor.get_seconds_per_beat() * (9 + randi() % 4) / Conductor.pitch_scale) train_passing = true train_passing_noise.play() - train_event_timer.start(4.7 * Conductor.pitch_scale) + train_event_timer.start(4.7 / Conductor.pitch_scale) train_event_timer.connect("timeout", self, "do_train_pass", [TrainStates.APPROACHING], CONNECT_DEFERRED | CONNECT_ONESHOT) TrainStates.APPROACHING: train_anim.play("Train_Pass") - get_performer("metronome").play_anim("W3_Hair_Blow", 2.0 * Conductor.pitch_scale) + get_performer("metronome").play_anim("W3_Hair_Blow", 2.0 / Conductor.pitch_scale) - train_event_timer.start(1.8 * Conductor.pitch_scale) + train_event_timer.start(1.8 / Conductor.pitch_scale) train_event_timer.connect("timeout", self, "do_train_pass", [TrainStates.PASSING], CONNECT_DEFERRED | CONNECT_ONESHOT) TrainStates.PASSING: train_passing = false - get_performer("metronome").play_anim("W3_Hair_Land", 0.5 * Conductor.pitch_scale) + get_performer("metronome").play_anim("W3_Hair_Land", 0.5 / Conductor.pitch_scale) get_performer("metronome").danced_right = false - train_event_timer.start(0.5 * Conductor.pitch_scale) + train_event_timer.start(0.5 / Conductor.pitch_scale) diff --git a/packages/fnf/scripts/game/levels/Level_Tankman.gd b/packages/fnf/scripts/game/levels/Level_Tankman.gd index 18b3b87..b59181c 100644 --- a/packages/fnf/scripts/game/levels/Level_Tankman.gd +++ b/packages/fnf/scripts/game/levels/Level_Tankman.gd @@ -36,7 +36,7 @@ func roll_tank(): "unit_offset", 0, 1, - Conductor.get_seconds_per_beat() * 8 * 4 + Conductor.get_seconds_per_beat() * 8 * 4 / Conductor.pitch_scale ) tank_tween.start() diff --git a/scripts/FreeplayOnlyMain.gd b/scripts/FreeplayOnlyMain.gd index aa51ced..3840c6d 100644 --- a/scripts/FreeplayOnlyMain.gd +++ b/scripts/FreeplayOnlyMain.gd @@ -2,6 +2,7 @@ extends "res://scripts/general/StateManager.gd" const FREEPLAY_MENU = preload("res://scenes/shared/menus/default_menus/FreeplayMenu.tscn") +export(PackedScene) var alt_freeplay = null export(bool) var quit = true export(String) var package_name export(String, DIR) var prev_menu_path @@ -9,7 +10,13 @@ export(bool) var immediate_load = true func _ready(): randomize() - switch_state(FREEPLAY_MENU, { - "freeplay_list": UserData.get_freeplay_list(package_name), - "prev_menu_path": "QUIT" if quit else prev_menu_path - }) + if alt_freeplay: + switch_state(alt_freeplay, { + "freeplay_list": UserData.get_freeplay_list(package_name), + "prev_menu_path": "QUIT" if quit else prev_menu_path + }) + else: + switch_state(FREEPLAY_MENU, { + "freeplay_list": UserData.get_freeplay_list(package_name), + "prev_menu_path": "QUIT" if quit else prev_menu_path + }) diff --git a/scripts/game/Level.gd b/scripts/game/Level.gd index 73d5bba..a1f82c3 100644 --- a/scripts/game/Level.gd +++ b/scripts/game/Level.gd @@ -12,6 +12,7 @@ extends Node # - Also applies when missing the sustained part of a sustained note. # - The vocals mute when applying a miss penalty. +const MAX_HEALTH = 2 const HEALTH_BOOST = 0.023 const HEALTH_PENALTY_OVERTAP = -0.04 const HEALTH_PENALTY_MISS = -0.0475 diff --git a/scripts/game/notes/Lane.gd b/scripts/game/notes/Lane.gd index 0d42b0e..d7ad193 100644 --- a/scripts/game/notes/Lane.gd +++ b/scripts/game/notes/Lane.gd @@ -186,7 +186,7 @@ func add_notes_from_data(): if cur_note_data.has("note_data"): for variable in cur_note_data.note_data: - note_instance.set(variable, cur_note_data.note_data[variable]) + sus_note_instance.set(variable, cur_note_data.note_data[variable]) spawn_note(sus_note_instance) else: diff --git a/scripts/general/DriverIndependentParticles.gd b/scripts/general/DriverIndependentParticles.gd index 2cce77d..566e448 100644 --- a/scripts/general/DriverIndependentParticles.gd +++ b/scripts/general/DriverIndependentParticles.gd @@ -12,6 +12,8 @@ func _ready(): else: particles = get_node(gles2_particles_path) get_node(gles3_particles_path).queue_free() + + particles.speed_scale = Conductor.pitch_scale func restart(): particles.restart() diff --git a/scripts/general/PitchScaledAnimSprite.gd b/scripts/general/PitchScaledAnimSprite.gd new file mode 100644 index 0000000..545f6bd --- /dev/null +++ b/scripts/general/PitchScaledAnimSprite.gd @@ -0,0 +1,4 @@ +extends AnimatedSprite + +func _ready(): + speed_scale = Conductor.pitch_scale diff --git a/scripts/general/PitchScaledAudioStreamPlayer.gd b/scripts/general/PitchScaledAudioStreamPlayer.gd new file mode 100644 index 0000000..82c0155 --- /dev/null +++ b/scripts/general/PitchScaledAudioStreamPlayer.gd @@ -0,0 +1,4 @@ +extends AudioStreamPlayer + +func _ready(): + pitch_scale = Conductor.pitch_scale diff --git a/scripts/menus/story_mode/StoryModeMenu.gd b/scripts/menus/story_mode/StoryModeMenu.gd index 8f57593..5d23c8f 100644 --- a/scripts/menus/story_mode/StoryModeMenu.gd +++ b/scripts/menus/story_mode/StoryModeMenu.gd @@ -155,6 +155,7 @@ func change_week_info(): week_name_display.text = week_names[week_idx] week_tracklist_display.text = "Tracks:\n\n" + week_tracklists[week_idx].join("\n") cur_week_score = week_scores[week_idx][difficulty_idx] + week_difficulty_display.frames = week_difficulties[week_idx] week_difficulty_display.play(str(difficulty_idx)) func _tween_difficulty(): diff --git a/tools/chart_parser/ChartParser.tscn b/tools/chart_parser/ChartParser.tscn index 370e60c..7ad9a63 100644 --- a/tools/chart_parser/ChartParser.tscn +++ b/tools/chart_parser/ChartParser.tscn @@ -4,13 +4,13 @@ [node name="ChartParser" type="Node"] script = ExtResource( 1 ) -json_name = "" -mod_name = "" -inst_name_and_ext = "Inst.ogg" -vocals_name_and_ext = "Voices.ogg" -result_suffixes = [ "_easy", "_normal", "_hard" ] +json_name = "decimate" +mod_name = "bogus" +inst_name_and_ext = "Inst3.ogg" +vocals_name_and_ext = "Voices3.ogg" +result_suffixes = [ "_part3" ] chart_type = 0 -difficulties = PoolIntArray( 0, 1, 2 ) +difficulties = PoolIntArray( 2 ) fnf_chart_naming = false num_lanes = 4 psych_separate_gf_lanes = false diff --git a/tools/pck_packer/PCK_Packer.tscn b/tools/pck_packer/PCK_Packer.tscn index 135f5cb..0dbb546 100644 --- a/tools/pck_packer/PCK_Packer.tscn +++ b/tools/pck_packer/PCK_Packer.tscn @@ -4,4 +4,4 @@ [node name="PCK_Packer" type="Node"] script = ExtResource( 1 ) -package_name = "benjine_test_mod" +package_name = "fnfvr" diff --git a/tools/xml/XML_To_SpriteFrames.tscn b/tools/xml/XML_To_SpriteFrames.tscn index 0d4be23..ecb56bf 100644 --- a/tools/xml/XML_To_SpriteFrames.tscn +++ b/tools/xml/XML_To_SpriteFrames.tscn @@ -12,8 +12,8 @@ animations = [ { [node name="XML_To_SpriteFrames" type="Node2D"] script = ExtResource( 1 ) -load_path = "res://packages/bogus/characters/bogus/BogusDeath" -save_path = "res://packages/bogus/characters/bogus/BogusDeath" +load_path = "res://packages/fnfvr/resources/graphics/game/levels/week_5/upperBop" +save_path = "res://packages/fnfvr/resources/graphics/game/levels/week_5/Upper_Boppers_VR" optimize = true [node name="AnimatedSprite" type="AnimatedSprite" parent="."]