diff --git a/levels/mall/mall.tres b/levels/mall/mall.tres index c753390..351c5d7 100644 --- a/levels/mall/mall.tres +++ b/levels/mall/mall.tres @@ -6,4 +6,4 @@ [resource] script = ExtResource("2_wmp72") scene = ExtResource("1_2cp8o") -level_name = "Forbidden Mall" +level_name = "Mall" diff --git a/levels/terrain_test/terrain_test.tres b/levels/terrain_test/terrain_test.tres new file mode 100644 index 0000000..3f70479 --- /dev/null +++ b/levels/terrain_test/terrain_test.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" script_class="Level" load_steps=3 format=3 uid="uid://dexm07r8wvu83"] + +[ext_resource type="PackedScene" uid="uid://cvs546kk7t7aw" path="res://levels/terrain_test/terrain_test.tscn" id="1_iggnc"] +[ext_resource type="Script" path="res://src/world/level/level.gd" id="2_uc833"] + +[resource] +script = ExtResource("2_uc833") +scene = ExtResource("1_iggnc") +level_name = "Terrain Debug" diff --git a/src/game/game.tscn b/src/game/game.tscn index 8bb2df8..6e09999 100644 --- a/src/game/game.tscn +++ b/src/game/game.tscn @@ -119,7 +119,6 @@ _data = { [node name="Game" type="Node" groups=["GameGroup"]] process_mode = 3 script = ExtResource("1_4qa87") -start_scene = "res://src/world/world.tscn" [node name="RootControl" type="Control" parent="."] unique_name_in_owner = true diff --git a/src/player/shot_setup/shot_setup.gd b/src/player/shot_setup/shot_setup.gd index 071fee7..5751af4 100644 --- a/src/player/shot_setup/shot_setup.gd +++ b/src/player/shot_setup/shot_setup.gd @@ -38,7 +38,7 @@ const BIG_POWER_THRESHOLD := 0.7 const WATER_DAMAGE := 10.0 ## Angle of influence that shot curve has, in radians -const CURVE_INFLUENCE := PI / 3 +const CURVE_INFLUENCE := PI / 4 ## Just enough to make things interesting! const SHOT_OFFSET_X_FACTOR := 20.0 diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index 14af001..915be6b 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -329,7 +329,7 @@ _data = { } [sub_resource type="SphereShape3D" id="SphereShape3D_xvvdi"] -radius = 1.5 +radius = 2.0 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4n2rd"] transparency = 1 diff --git a/src/world/level/level_catalog.tscn b/src/world/level/level_catalog.tscn index 0c7d184..ad417e9 100644 --- a/src/world/level/level_catalog.tscn +++ b/src/world/level/level_catalog.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=6 format=3 uid="uid://cdtdvka0bssgy"] +[gd_scene load_steps=7 format=3 uid="uid://cdtdvka0bssgy"] [ext_resource type="Script" path="res://src/world/level/level_catalog.gd" id="1_wjjeu"] [ext_resource type="Resource" uid="uid://chewry1b1a28j" path="res://levels/debug_level/debug_island.tres" id="3_3eqbc"] [ext_resource type="Script" path="res://src/world/level/level.gd" id="3_8lfqu"] [ext_resource type="Resource" uid="uid://cfsy1nlfo4inx" path="res://levels/oneill/oneill.tres" id="4_8547s"] [ext_resource type="Resource" uid="uid://3odongr8qm8e" path="res://levels/mall/mall.tres" id="5_htd21"] +[ext_resource type="Resource" uid="uid://dexm07r8wvu83" path="res://levels/terrain_test/terrain_test.tres" id="6_uwkvl"] [node name="LevelCatalog" type="Node"] script = ExtResource("1_wjjeu") -levels = Array[ExtResource("3_8lfqu")]([ExtResource("3_3eqbc"), ExtResource("4_8547s"), ExtResource("5_htd21")]) +levels = Array[ExtResource("3_8lfqu")]([ExtResource("3_3eqbc"), ExtResource("4_8547s"), ExtResource("5_htd21"), ExtResource("6_uwkvl")])