Compare commits

..

2 Commits

2 changed files with 45 additions and 8 deletions

View File

@ -4,25 +4,59 @@
"time_end": 60, "time_end": 60,
"elite_enemy": "res://scenes/slime.tscn", "elite_enemy": "res://scenes/slime.tscn",
"entries": [ "entries": [
{ "enemy": "res://scenes/slime.tscn", "count_at_start": 0, "count_at_end": 15, "min_interval": 0.5 } { "enemy": "res://scenes/slime.tscn", "count_at_start": 3, "count_at_end": 8, "min_interval": 1.2 }
] ]
}, },
{ {
"time_start": 60, "time_start": 60,
"time_end": 90,
"elite_enemy": "res://scenes/blue_slime.tscn",
"entries": [
{ "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 4, "count_at_end": 7, "min_interval": 1.2 }
]
},
{
"time_start": 90,
"time_end": 180, "time_end": 180,
"elite_enemy": "res://scenes/blue_slime.tscn", "elite_enemy": "res://scenes/blue_slime.tscn",
"entries": [ "entries": [
{ "enemy": "res://scenes/slime.tscn", "count_at_start": 15, "count_at_end": 40, "min_interval": 0.3 }, { "enemy": "res://scenes/slime.tscn", "count_at_start": 8, "count_at_end": 15, "min_interval": 0.8 },
{ "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 0, "count_at_end": 10, "min_interval": 0.8 } { "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 4, "count_at_end": 10, "min_interval": 1.0 }
] ]
}, },
{ {
"time_start": 180, "time_start": 180,
"time_end": 210,
"elite_enemy": "res://scenes/fire_slime.tscn",
"entries": [
{ "enemy": "res://scenes/fire_slime.tscn", "count_at_start": 3, "count_at_end": 5, "min_interval": 1.5 }
]
},
{
"time_start": 210,
"time_end": 300,
"elite_enemy": "res://scenes/fire_slime.tscn",
"entries": [
{ "enemy": "res://scenes/slime.tscn", "count_at_start": 12, "count_at_end": 20, "min_interval": 0.6 },
{ "enemy": "res://scenes/fire_slime.tscn", "count_at_start": 4, "count_at_end": 10, "min_interval": 1.0 }
]
},
{
"time_start": 300,
"time_end": 390,
"elite_enemy": "res://scenes/fire_slime.tscn",
"entries": [
{ "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 10, "count_at_end": 18, "min_interval": 0.7 },
{ "enemy": "res://scenes/fire_slime.tscn", "count_at_start": 8, "count_at_end": 14, "min_interval": 0.9 }
]
},
{
"time_start": 390,
"time_end": -1, "time_end": -1,
"entries": [ "entries": [
{ "enemy": "res://scenes/slime.tscn", "count_at_start": 40, "count_at_end": 100, "min_interval": 0.2 }, { "enemy": "res://scenes/slime.tscn", "count_at_start": 15, "count_at_end": 30, "min_interval": 0.4 },
{ "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 10, "count_at_end": 60, "min_interval": 0.5 }, { "enemy": "res://scenes/blue_slime.tscn", "count_at_start": 10, "count_at_end": 25, "min_interval": 0.6 },
{ "enemy": "res://scenes/fire_slime.tscn", "count_at_start": 0, "count_at_end": 40, "min_interval": 0.6 } { "enemy": "res://scenes/fire_slime.tscn", "count_at_start": 8, "count_at_end": 20, "min_interval": 0.7 }
] ]
} }
] ]

View File

@ -12,9 +12,12 @@ var _sfx_player: AudioStreamPlayer
func _ready() -> void: func _ready() -> void:
body_entered.connect(_on_body_entered) body_entered.connect(_on_body_entered)
witch = get_node("/root/Game/Witch") witch = get_node_or_null("/root/Game/Witch")
player = get_node_or_null("/root/Game/Player")
if witch == null or player == null:
queue_free()
return
collected.connect(witch._on_collect) collected.connect(witch._on_collect)
player = get_node("/root/Game/Player")
_sfx_player = AudioStreamPlayer.new() _sfx_player = AudioStreamPlayer.new()
_sfx_player.stream = _collect_sfx _sfx_player.stream = _collect_sfx
_sfx_player.volume_db = -18 _sfx_player.volume_db = -18