Browse Source

day 0 bugfixes

nyairobi 2 years ago
parent
commit
0c0a74ea79

+ 3 - 3
default_bus_layout.tres

@@ -20,18 +20,18 @@ pan_pullout = 1.24
 surround = 0.34
 
 [resource]
-bus/0/volume_db = -5.04224
+bus/0/volume_db = -5.04538
 bus/1/name = &"SFX"
 bus/1/solo = false
 bus/1/mute = false
 bus/1/bypass_fx = false
-bus/1/volume_db = -0.912641
+bus/1/volume_db = -5.04224
 bus/1/send = &"Master"
 bus/2/name = &"Music"
 bus/2/solo = false
 bus/2/mute = false
 bus/2/bypass_fx = false
-bus/2/volume_db = -0.708218
+bus/2/volume_db = -5.04224
 bus/2/send = &"Master"
 bus/3/name = &"Voice"
 bus/3/solo = false

+ 52 - 2
export_presets.cfg

@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="export/html/ld52.html"
+export_path="export/html/index.html"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
@@ -59,10 +59,60 @@ script_encryption_key=""
 custom_template/debug=""
 custom_template/release=""
 debug/export_console_script=0
-binary_format/embed_pck=false
+binary_format/embed_pck=true
 texture_format/bptc=false
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
 texture_format/no_bptc_fallbacks=true
 binary_format/architecture="x86_64"
+
+[preset.2]
+
+name="Windows Desktop"
+platform="Windows Desktop"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="export/ln/ld52.exe"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=1
+script_encryption_key=""
+
+[preset.2.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_script=1
+binary_format/embed_pck=true
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/identity_type=0
+codesign/identity=""
+codesign/password=""
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon="res://res/shallot.png"
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""

+ 8 - 0
project.godot

@@ -73,6 +73,10 @@ run/main_scene="res://scene/core/root.tscn"
 config/features=PackedStringArray("4.0", "GL Compatibility")
 config/icon="res://icon.svg"
 
+[audio]
+
+driver/output_latency=30
+
 [debug]
 
 gdscript/warnings/unused_parameter=0
@@ -199,6 +203,10 @@ hk5={
 "events": []
 }
 
+[physics]
+
+common/physics_ticks_per_second=120
+
 [rendering]
 
 renderer/rendering_method="gl_compatibility"

BIN
res/cover.png


+ 1 - 1
scene/core/main.gd

@@ -20,7 +20,7 @@ func victory_check():
         set_process(false)
         $"../../UILayer/UI/DefeatScreen".show()
         $"../../UILayer/UI/SpeedrunTimer".stop()
-    if ($Waves.is_done() and $UFOs.get_children().size() == 0) or are_slots_done():
+    if ($Waves.is_done() and $UFOs.get_children().size() == 0):# or are_slots_done():
         set_process(false)
         $"../../UILayer/UI/VictoryScreen".show()
         $"../../UILayer/UI/SpeedrunTimer".stop()

+ 29 - 22
scene/core/main.tscn

@@ -54,24 +54,25 @@ fork = 1
 boss = 0
 ast = 0
 
-[node name="Wave3" parent="Waves" instance=ExtResource("5_hqjbo")]
+[node name="Wave2" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "Dozenth encounter"
 witchUFO = 0
 fork = 12
 
-[node name="Wave2" parent="Waves" instance=ExtResource("5_hqjbo")]
+[node name="Wave3" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "Magical reinforcements"
+power_level = 0.9
 witchUFO = 5
 
 [node name="Wave4" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "Cooperation"
-power_level = 0.8
+power_level = 0.9
 witchUFO = 3
 fork = 22
 
 [node name="Wave5" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "Forked"
-power_level = 1.3
+power_level = 1.35
 witchUFO = 0
 fork = 0
 forkB = 8
@@ -90,20 +91,21 @@ forkB = 0
 star = 0
 
 [node name="Wave8" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 1.4
+power_level = 1.5
 witchUFO = 12
 fork = 10
 forkB = 3
 star = 0
 
 [node name="Wave9" parent="Waves" instance=ExtResource("5_hqjbo")]
+power_level = 1.65
 witchUFO = 10
 fork = 20
 forkB = 8
 star = 0
 
 [node name="Wave10" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 2.0
+power_level = 2.1
 witchUFO = 0
 fork = 30
 forkB = 0
@@ -117,14 +119,14 @@ forkB = 0
 star = 10
 
 [node name="Wave12" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 2.0
+power_level = 2.2
 witchUFO = 5
 fork = 10
 forkB = 10
 star = 10
 
 [node name="Wave13" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 2.2
+power_level = 2.4
 witchUFO = 16
 fork = 5
 forkB = 0
@@ -132,7 +134,7 @@ star = 2
 
 [node name="Wave14" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "Death stars"
-power_level = 10.0
+power_level = 12.0
 witchUFO = 0
 fork = 0
 forkB = 0
@@ -155,21 +157,25 @@ forkB = 0
 star = 0
 
 [node name="Wave17" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 4.0
+duration = 30.0
+power_level = 3.9
 witchUFO = 0
-fork = 30
+fork = 25
 forkB = 10
 star = 0
 
 [node name="Wave18" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 4.0
-witchUFO = 20
-fork = 30
+duration = 30.0
+power_level = 3.8
+witchUFO = 11
+fork = 15
 forkB = 0
-star = 0
+star = 2
+ast = 2
 
 [node name="Wave19" parent="Waves" instance=ExtResource("5_hqjbo")]
-power_level = 3.0
+duration = 40.0
+power_level = 1.5
 witchUFO = 40
 fork = 40
 forkB = 40
@@ -177,7 +183,7 @@ star = 0
 
 [node name="Wave20" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "What is that??"
-duration = 10.0
+duration = 60.0
 witchUFO = 0
 fork = 0
 boss = 1
@@ -185,7 +191,7 @@ ast = 0
 
 [node name="Wave21" parent="Waves" instance=ExtResource("5_hqjbo")]
 title = "What is that??"
-duration = 10.0
+duration = 1000.0
 power_level = 3.0
 witchUFO = 20
 fork = 30
@@ -257,21 +263,22 @@ separation = 150
 particles = ExtResource("7_nq8x0")
 
 [node name="SlotArray2" type="Node2D" parent="SlotArrays"]
-position = Vector2(1525, 426)
+position = Vector2(1569, 419)
 script = ExtResource("8_cnoq7")
 count = 5
 separation = 150
 particles = ExtResource("7_nq8x0")
 
 [node name="SlotArray4" type="Node2D" parent="SlotArrays"]
-position = Vector2(3318, -715)
+position = Vector2(3328, -732)
+rotation = 0.0328055
 script = ExtResource("8_cnoq7")
 count = 10
 separation = 150
 particles = ExtResource("7_nq8x0")
 
 [node name="SlotArray5" type="Node2D" parent="SlotArrays"]
-position = Vector2(5111, -2626)
+position = Vector2(5077, -2633)
 rotation = -0.769092
 script = ExtResource("8_cnoq7")
 count = 10
@@ -279,7 +286,7 @@ separation = 150
 particles = ExtResource("7_nq8x0")
 
 [node name="SlotArray3" type="Node2D" parent="SlotArrays"]
-position = Vector2(-533, 100)
+position = Vector2(-521, 91)
 rotation = 0.0881925
 script = ExtResource("8_cnoq7")
 count = 5

+ 2 - 2
scene/core/wave_manager.gd

@@ -34,9 +34,9 @@ func next_wave():
         timer.set_wait_time(wave.duration)
         timer.start()
         if wave.title:
-            log.append_text("[color=#ffcccc]Wave" + str(current_wave + 1) + ":[/color] " + wave.title + "\n")
+            log.append_text("[color=#ffcccc]Wave " + str(current_wave + 1) + ":[/color] " + wave.title + "\n")
         else:
-            log.append_text("[color=#ffcccc]Wave" + str(current_wave + 1) + "[/color] " + "\n")
+            log.append_text("[color=#ffcccc]Wave " + str(current_wave + 1) + "[/color] " + "\n")
         log.append_text(wave.get_log_data())
     else:
         done = true

+ 5 - 4
scene/entity/aoe.tscn

@@ -13,13 +13,14 @@ size = Vector2(106.5, 108)
 collision_layer = 2
 collision_mask = 0
 script = ExtResource("1_4vafg")
-y_offset = -50.0
+y_offset = -70.0
+height = 50.0
 grow_time = 3.0
-max_hp = 30.0
-cost = 50
+max_hp = 65.0
+cost = 65
 attack_rate = 3.0
 attack_range = 2000.0
-attack_damage = 12.0
+attack_damage = 27.0
 
 [node name="Body" type="Sprite2D" parent="."]
 texture = ExtResource("2_wk27u")

+ 12 - 1
scene/entity/base_plant.gd

@@ -19,6 +19,8 @@ var target_attacker: UFO = null # Used when the plant is dying
 @export var bullet_color: Color = Color(1, 1, 1, 1)
 @export var bullet_base_speed_u: int = 2000
 @export var bullet_base_speed_l: int = 1000
+@export var constant_sound: bool = false
+@onready var body = $Body
 
 enum TargetMode {
     NEAREST, HIGHEST, LOWEST
@@ -47,6 +49,10 @@ func _ready():
     add_child(ufo_search_timer)
     add_child(attack_timer)
     attack_timer.start()
+    # Workaround crash run out of packets
+    if constant_sound:
+        $Coin.set_volume_db(-100)
+        $Coin.play()
 
 func get_class():
     return "Plant"
@@ -58,7 +64,8 @@ func _on_attack():
     else:
         emit_signal("shoot", victim)
         attack_timer.start()
-        $Coin.play()
+        if !constant_sound:
+            $Coin.play()
 
 func find_ufo():
     victim = null
@@ -115,6 +122,10 @@ func _process(delta):
     else:
         if target_attacker == null or target_attacker.dead:
             alter_hp(delta * max_hp / 10.0)
+            if constant_sound:
+                $Coin.set_volume_db(-100)
+        if victim != null and not victim.dead and constant_sound:
+            $Coin.set_volume_db(-12)
 
 func select_attacker():
     for attacker in attackers:

+ 1 - 0
scene/entity/big_tree.tscn

@@ -9,5 +9,6 @@ script = ExtResource("1_7joln")
 rate = 0.1
 
 [node name="Tree" type="Sprite2D" parent="."]
+z_index = -5
 texture = ExtResource("2_wmtht")
 metadata/_edit_lock_ = true

+ 2 - 2
scene/entity/bullet.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Texture2D" uid="uid://mm6ylqwudexe" path="res://res/bullet.png" id="1_dkvbc"]
 [ext_resource type="Script" path="res://scene/entity/bullet.gd" id="1_vrlfp"]
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_qndjr"]
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_nmstc"]
 size = Vector2(150, 106)
 
 [node name="Bullet" type="CharacterBody2D"]
@@ -16,4 +16,4 @@ texture = ExtResource("1_dkvbc")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(-1, 1)
-shape = SubResource("RectangleShape2D_qndjr")
+shape = SubResource("RectangleShape2D_nmstc")

+ 2 - 1
scene/entity/carrot.tscn

@@ -9,7 +9,7 @@
 [ext_resource type="Script" path="res://scene/entity/pc.gd" id="7_5wvmf"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_kuiqv"]
-size = Vector2(200, 1000)
+size = Vector2(573.333, 1040)
 
 [node name="Carrot" type="CharacterBody2D"]
 scale = Vector2(0.3, 0.3)
@@ -36,6 +36,7 @@ script = ExtResource("3_4132d")
 texture = ExtResource("2_ptjqr")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(-3.33335, -20)
 shape = SubResource("RectangleShape2D_kuiqv")
 
 [node name="RI" parent="." instance=ExtResource("5_f2co1")]

+ 4 - 3
scene/entity/carrot2.tscn

@@ -9,7 +9,7 @@
 [ext_resource type="Script" path="res://scene/entity/pc.gd" id="7_qhdbr"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_8s8kg"]
-size = Vector2(200, 1000)
+size = Vector2(463.333, 1000)
 
 [node name="Carrot" type="CharacterBody2D"]
 scale = Vector2(0.3, 0.3)
@@ -20,12 +20,12 @@ y_offset = 75.0
 height = 300.0
 grow_time = 2.0
 base_scale = 0.4
-max_hp = 90.0
+max_hp = 200.0
 cost = 20
 bullet_color = Color(0.917647, 0.917647, 0.917647, 1)
 attack_rate = 0.25
 attack_range = 2500.0
-attack_damage = 8.0
+attack_damage = 4.0
 
 [node name="Gun" type="Sprite2D" parent="."]
 position = Vector2(0, -430)
@@ -38,6 +38,7 @@ script = ExtResource("3_bcjtw")
 texture = ExtResource("4_18hj0")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(-5.00001, 0)
 shape = SubResource("RectangleShape2D_8s8kg")
 
 [node name="RI" parent="." instance=ExtResource("5_fijcn")]

+ 3 - 2
scene/entity/carrot3.tscn

@@ -15,13 +15,14 @@ scale = Vector2(1.2, 1.2)
 collision_layer = 2
 collision_mask = 0
 script = ExtResource("1_uqaq7")
-y_offset = -30.0
+y_offset = -40.0
+max_hp = 120.0
 cost = 20
 bullet_base_speed_u = 4000
 bullet_base_speed_l = 3000
 attack_rate = 1.0
 attack_range = 4000.0
-attack_damage = 30.0
+attack_damage = 25.0
 
 [node name="Gun" type="Sprite2D" parent="."]
 position = Vector2(23.3333, -72.5)

+ 8 - 4
scene/entity/carrot4.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="Script" path="res://scene/entity/carrot_gun.gd" id="3_tixck"]
 [ext_resource type="Texture2D" uid="uid://cx5md40xbjcwp" path="res://res/dragonfruit.png" id="4_sfyf4"]
 [ext_resource type="PackedScene" uid="uid://cbpm6nmfyr861" path="res://scene/entity/ri.tscn" id="5_5dxu3"]
-[ext_resource type="AudioStream" uid="uid://cpyaqxuec8i5k" path="res://snd/sfx/laserShoot(1).wav" id="6_6s2xr"]
+[ext_resource type="AudioStream" uid="uid://cngtrds12ovt8" path="res://snd/sfx/laserShootLong.wav" id="6_akcrm"]
 [ext_resource type="Script" path="res://scene/entity/pc.gd" id="7_b6qiy"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_8s8kg"]
@@ -16,12 +16,16 @@ collision_layer = 2
 collision_mask = 0
 script = ExtResource("1_b2xkh")
 y_offset = -60.0
-cost = 30
+height = 50.0
+grow_time = 2.0
+max_hp = 70.0
+cost = 35
 bullet_color = Color(0.490196, 0.0901961, 0.270588, 1)
 bullet_base_speed_u = 8000
 bullet_base_speed_l = 4000
+constant_sound = true
 attack_range = 1100.0
-attack_damage = 7.0
+attack_damage = 6.0
 
 [node name="Gun" type="Sprite2D" parent="."]
 position = Vector2(-2, -49)
@@ -39,7 +43,7 @@ shape = SubResource("RectangleShape2D_8s8kg")
 [node name="RI" parent="." instance=ExtResource("5_5dxu3")]
 
 [node name="Coin" type="AudioStreamPlayer2D" parent="."]
-stream = ExtResource("6_6s2xr")
+stream = ExtResource("6_akcrm")
 volume_db = -6.0
 bus = &"SFX"
 script = ExtResource("7_b6qiy")

+ 4 - 2
scene/entity/missdemandrake.tscn

@@ -13,9 +13,11 @@ size = Vector2(143.333, 163.333)
 
 [node name="Missdemandrake" type="CharacterBody2D"]
 scale = Vector2(0.8, 0.8)
+collision_mask = 0
 script = ExtResource("1_dk8rq")
 y_offset = -70.0
-cost = 100
+height = 70.0
+cost = 150
 target_mode = 1
 attack_rate = 10.0
 attack_range = 10000.0
@@ -24,7 +26,7 @@ attack_damage = 10000.0
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_q4evg")
 
-[node name="Head" type="Sprite2D" parent="."]
+[node name="Body" type="Sprite2D" parent="."]
 z_index = -4
 texture = ExtResource("1_173wg")
 

+ 10 - 4
scene/entity/ufo.gd

@@ -23,12 +23,16 @@ var attack_range = 1000.0
 var second_player = find_child("AudioStreamPlayer2D2")
 @onready var power_level: float = $"../../Waves".power_level
 
+func fuck():
+    return false
+
 func _ready():
+    # Workaround bug body->get_space()
     call_deferred("actor_setup")
     navigation_agent.connect("velocity_computed", move)
     
     max_hp *= power_level
-    dps *= power_level * sqrt(power_level)
+    dps *= power_level * pow(power_level, 0.7)
     
     $RerollTimer.connect("timeout", roll_movement_target)
     $DamageTimer.connect("timeout", damage_target)
@@ -90,6 +94,8 @@ func _process_dead(delta: float):
         queue_free() 
 
 func _physics_process(delta):
+    if fuck():
+        return
     if navigation_agent.is_target_reached():
         var new_speed = velocity.length() - delta * movement_speed * 2.0
         velocity = velocity.normalized() * new_speed
@@ -170,7 +176,7 @@ func deal_damage(damage):
         call_deferred("spawn_wheat")
 
 func spawn_wheat():
-    for i in range(0, wheat_out):
+    for i in range(0, ceil(wheat_out * sqrt(power_level))):
         var wheat = Wheat.instantiate()
         wheat.rotate(randf_range(-PI, PI))
         wheat.set_position(get_global_position())
@@ -180,8 +186,8 @@ func enable_ray(ray, target: Node2D):
     if ray != null:
         var diff = target.get_global_position() - get_global_position()
         var poly = ray.get_polygon()
-        poly[1] = diff + Vector2(-80.0, target.height / 1.5 + target.y_offset)
-        poly[2] = diff + Vector2(80.0, target.height / 1.5 + target.y_offset)
+        poly[1] = diff + Vector2(-80.0, target.body.texture.get_size().y / 2 + 30.0)
+        poly[2] = diff + Vector2(80.0, target.body.texture.get_size().y / 2 + 30.0)
         ray.set_polygon(poly)
         ray.show()
 

+ 1 - 1
scene/entity/ufo_1.tscn

@@ -18,7 +18,7 @@ radius = 223.258
 collision_mask = 0
 motion_mode = 1
 script = ExtResource("1_3oxp2")
-wheat_out = 4
+wheat_out = 5
 should_rotate = false
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

+ 1 - 1
scene/entity/ufo_2_big.tscn

@@ -21,7 +21,7 @@ movement_speed = 1400.0
 radius = 30.0
 dps = 4.0
 max_hp = 70.0
-wheat_out = 1
+wheat_out = 4
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(-2, -1)

+ 3 - 3
scene/entity/ufo_3.tscn

@@ -16,9 +16,9 @@ radius = 127.063
 collision_mask = 0
 motion_mode = 1
 script = ExtResource("1_cms35")
-dps = 30.0
-max_hp = 10.0
-wheat_out = 10
+dps = 26.0
+max_hp = 12.0
+wheat_out = 8
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(-2, -1)

+ 14 - 2
scene/entity/ufo_ast.gd

@@ -5,6 +5,9 @@ var damage = 0
 var timeout: Timer = Timer.new()
 var last_vector: Vector2 = Vector2(0, 0)
 
+func fuck():
+    return true
+
 func _ready():
     super()
     $NavigationAgent2D.set_target_desired_distance(0)
@@ -15,22 +18,31 @@ func _ready():
     timeout.connect("timeout", _on_timeout)
    
 func _physics_process(delta: float):
+    super(delta)
     if target != null:
         var dist = target.get_global_position() - get_global_position()
         if dist.length() < 60.0:
             target.deal_damage(dps, null)
             get_parent().remove_child(self)
             queue_free()
+        if dist.length() > 2500:
+            speed = 2000.0
+        else:
+            speed = 200.0
         last_vector = dist.normalized()
         velocity = last_vector * speed
     else:
-        get_parent().remove_child(self)
-        queue_free()
+        call_deferred("die")
+
     $Plx/Top.rotate(delta)
     move_and_slide()
 
 func _on_timeout():
     get_parent().remove_child(self)
     queue_free()
+    
+func die():
+    get_parent().remove_child(self)
+    queue_free()
 
 

+ 2 - 2
scene/entity/wheat.tscn

@@ -9,7 +9,7 @@
 size = Vector2(9, 152)
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_0qtwq"]
-size = Vector2(316.5, 289)
+size = Vector2(693, 693)
 
 [node name="Wheat" type="RigidBody2D"]
 collision_layer = 0
@@ -27,7 +27,7 @@ shape = SubResource("RectangleShape2D_tt0m1")
 [node name="CaptureArea" type="Area2D" parent="."]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="CaptureArea"]
-position = Vector2(1, -1)
+position = Vector2(-1.5, 7.5)
 shape = SubResource("RectangleShape2D_0qtwq")
 
 [node name="Coin" type="AudioStreamPlayer2D" parent="."]

+ 1 - 1
scene/pause_menu/pause_menu.gd

@@ -4,7 +4,7 @@ extends Control
 var queue_unpause = false
 
 func _input(input: InputEvent):
-    if input.is_action_pressed("pause"):
+    if input.is_action_pressed("pause") or input.is_action_pressed("rmb"):
         queue_unpause = true
 
 func _process(_delta: float):

File diff suppressed because it is too large
+ 49 - 49
scene/pause_menu/pause_menu.tscn


+ 3 - 5
scene/pause_menu/vol.gd

@@ -8,8 +8,6 @@ func _ready():
 
 func pls(val: float):
     if val < 50:
-        AudioServer.set_bus_volume_db(bus, -5 + (100 - val) / 2 * -1)
-    if val > 50:
-        AudioServer.set_bus_volume_db(bus, -5 + (100 - val) / 10)
-    #print(AudioServer.get_bus_volume_db(bus))
-    #print(val, " ", 100 - val)
+        AudioServer.set_bus_volume_db(bus, -5 - pow(50 - val, 0.9))
+    if val >= 50:
+        AudioServer.set_bus_volume_db(bus, 5 -(100 - val) / 5)

+ 4 - 4
scene/pause_menu/window_mode.gd

@@ -16,7 +16,7 @@ func _on_item_selected(index: int):
 
 func update_window():
     DisplayServer.window_set_mode(window_mode)
-    if window_mode != 0:
-        $"../../../Rez".hide()
-    else:
-        $"../../../Rez".show()
+#    if window_mode != 0:
+#        $"../../../Rez".hide()
+#    else:
+#        $"../../../Rez".show()

+ 7 - 10
scene/ui/plant_button.tscn

@@ -11,6 +11,7 @@ anchors_preset = 0
 script = ExtResource("1_hg7q7")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
@@ -29,10 +30,7 @@ theme_override_constants/margin_bottom = 4
 
 [node name="Button" type="Button" parent="MarginContainer"]
 custom_minimum_size = Vector2(64, 64)
-offset_left = 8.0
-offset_top = 4.0
-offset_right = 72.0
-offset_bottom = 68.0
+layout_mode = 2
 focus_mode = 0
 icon = ExtResource("1_f73da")
 expand_icon = true
@@ -40,6 +38,7 @@ script = ExtResource("1_g4acw")
 
 [node name="Tooltip" type="MarginContainer" parent="."]
 visible = false
+layout_mode = 1
 anchors_preset = -1
 anchor_top = 0.5
 anchor_bottom = 0.5
@@ -48,22 +47,20 @@ grow_vertical = 2
 theme_override_constants/margin_right = 32
 
 [node name="Tooltip2" type="PanelContainer" parent="Tooltip"]
-offset_right = 266.0
-offset_bottom = 16.0
+layout_mode = 2
 
 [node name="Tooltip3" type="MarginContainer" parent="Tooltip/Tooltip2"]
+layout_mode = 2
 theme_override_constants/margin_left = 8
 theme_override_constants/margin_top = 8
 theme_override_constants/margin_right = 8
 theme_override_constants/margin_bottom = 8
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Tooltip/Tooltip2/Tooltip3"]
-offset_left = 8.0
-offset_top = 8.0
-offset_right = 258.0
-offset_bottom = 8.0
+layout_mode = 2
 
 [node name="Label" type="RichTextLabel" parent="Tooltip/Tooltip2/Tooltip3/VBoxContainer"]
 custom_minimum_size = Vector2(250, 0)
+layout_mode = 2
 bbcode_enabled = true
 fit_content_height = true

BIN
snd/sfx/laserShootLong.wav