tweaks to playlist loader, working on preventing reentry to levels in round
This commit is contained in:
@@ -21,7 +21,7 @@ stamina_regen = true
|
|||||||
max_stamina = 100.0
|
max_stamina = 100.0
|
||||||
stamina_drain = 20.0
|
stamina_drain = 20.0
|
||||||
air_dash_max = 1
|
air_dash_max = 1
|
||||||
load_save = true
|
load_save = false
|
||||||
money_multiplier = 3.0
|
money_multiplier = 3.0
|
||||||
start_health = 3
|
start_health = 3
|
||||||
drop_chance_minimum = 0.1
|
drop_chance_minimum = 0.1
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ stamina_regen = true
|
|||||||
max_stamina = 100.0
|
max_stamina = 100.0
|
||||||
stamina_drain = 20.0
|
stamina_drain = 20.0
|
||||||
air_dash_max = 1
|
air_dash_max = 1
|
||||||
load_save = true
|
load_save = false
|
||||||
money_multiplier = 1.0
|
money_multiplier = 1.0
|
||||||
start_health = 1
|
start_health = 1
|
||||||
drop_chance_minimum = 0.1
|
drop_chance_minimum = 0.1
|
||||||
|
|||||||
@@ -7,12 +7,18 @@
|
|||||||
script = ExtResource("1_vvlkm")
|
script = ExtResource("1_vvlkm")
|
||||||
|
|
||||||
[node name="Level Name" type="Label3D" parent="."]
|
[node name="Level Name" type="Label3D" parent="."]
|
||||||
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 0.875884, 0)
|
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 1.42465, 0)
|
||||||
text = "Test"
|
text = "Test"
|
||||||
font = ExtResource("1_uwkow")
|
font = ExtResource("1_uwkow")
|
||||||
font_size = 100
|
font_size = 100
|
||||||
|
|
||||||
[node name="Gamemode" type="Label3D" parent="."]
|
[node name="Gamemode" type="Label3D" parent="."]
|
||||||
|
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 0.749143, 0)
|
||||||
|
text = "Test"
|
||||||
|
font = ExtResource("1_uwkow")
|
||||||
|
font_size = 100
|
||||||
|
|
||||||
|
[node name="Active" type="Label3D" parent="."]
|
||||||
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 0.200374, 0)
|
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 0.200374, 0)
|
||||||
text = "Test"
|
text = "Test"
|
||||||
font = ExtResource("1_uwkow")
|
font = ExtResource("1_uwkow")
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ gamemode = ExtResource("2_62iy8")
|
|||||||
[node name="LEVEL UTILS" type="Node" parent="."]
|
[node name="LEVEL UTILS" type="Node" parent="."]
|
||||||
|
|
||||||
[node name="Playlist Generator" parent="LEVEL UTILS" instance=ExtResource("3_udqcb")]
|
[node name="Playlist Generator" parent="LEVEL UTILS" instance=ExtResource("3_udqcb")]
|
||||||
rounds_per_match = 3
|
|
||||||
matches_per_year = 52
|
|
||||||
|
|
||||||
[node name="PlaylistLoader" type="Node" parent="LEVEL UTILS"]
|
[node name="PlaylistLoader" type="Node" parent="LEVEL UTILS"]
|
||||||
script = ExtResource("3_2u2e7")
|
script = ExtResource("3_2u2e7")
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ var last_leaderboard_id = 0
|
|||||||
var user_names = ["Profile 1","Profile 2","Profile 3","Profile 4","Profile 5"]
|
var user_names = ["Profile 1","Profile 2","Profile 3","Profile 4","Profile 5"]
|
||||||
var all_user_leaderboards = [["Global"]]
|
var all_user_leaderboards = [["Global"]]
|
||||||
var current_leaderboard_name = all_user_leaderboards[user_id][last_leaderboard_id]
|
var current_leaderboard_name = all_user_leaderboards[user_id][last_leaderboard_id]
|
||||||
|
var no_reentry_portals = []
|
||||||
|
|
||||||
var playlist_test
|
var playlist_test
|
||||||
var current_match
|
var current_match
|
||||||
|
|||||||
@@ -4,10 +4,12 @@ extends Node3D
|
|||||||
|
|
||||||
@onready var level_name: Label3D = $"Level Name"
|
@onready var level_name: Label3D = $"Level Name"
|
||||||
@onready var gamemode_label: Label3D = $Gamemode
|
@onready var gamemode_label: Label3D = $Gamemode
|
||||||
|
@onready var active: Label3D = $Active
|
||||||
|
|
||||||
func _process(delta: float) -> void:
|
func _process(delta: float) -> void:
|
||||||
level_name.text = portal_node.scene_name
|
level_name.text = portal_node.scene_name
|
||||||
gamemode_label.text = portal_node.level_gamemode.gamemode_name
|
gamemode_label.text = portal_node.level_gamemode.gamemode_name
|
||||||
|
active.text = str("ACTIVE: ",portal_node.active)
|
||||||
|
|
||||||
func update_sign_names():
|
func update_sign_names():
|
||||||
level_name.text = portal_node.scene_name
|
level_name.text = portal_node.scene_name
|
||||||
|
|||||||
@@ -13,9 +13,13 @@ func _ready() -> void:
|
|||||||
if i.is_in_group("portal"):
|
if i.is_in_group("portal"):
|
||||||
portals.append(i)
|
portals.append(i)
|
||||||
|
|
||||||
|
print("NO REENTRY PORTALS : ",GameGlobals.no_reentry_portals)
|
||||||
|
|
||||||
var id = 0
|
var id = 0
|
||||||
for i in portals:
|
for i in portals:
|
||||||
i.scene_path = str(GameGlobals.current_match[round_id][id]["level_path"])
|
if !GameGlobals.no_reentry_portals.has(Vector2(round_id,id)):
|
||||||
i.scene_name = str(GameGlobals.current_match[round_id][id]["level_name"])
|
i.round_id = Vector2(round_id,id)
|
||||||
i.level_gamemode = load(GameGlobals.current_match[round_id][id]["gamemode_path"])
|
i.scene_path = str(GameGlobals.current_match[round_id][id]["level_path"])
|
||||||
|
i.scene_name = str(GameGlobals.current_match[round_id][id]["level_name"])
|
||||||
|
i.level_gamemode = load(GameGlobals.current_match[round_id][id]["gamemode_path"])
|
||||||
id += 1
|
id += 1
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ func save_user_data():
|
|||||||
file.store_var(GameGlobals.last_hit_path)
|
file.store_var(GameGlobals.last_hit_path)
|
||||||
file.store_var(leaderboard_name)
|
file.store_var(leaderboard_name)
|
||||||
file.store_var(GameGlobals.current_level)
|
file.store_var(GameGlobals.current_level)
|
||||||
|
file.store_var(GameGlobals.no_reentry_portals)
|
||||||
file.store_var(money)
|
file.store_var(money)
|
||||||
file.store_var(deposited_money)
|
file.store_var(deposited_money)
|
||||||
file.store_var(health)
|
file.store_var(health)
|
||||||
@@ -94,6 +95,7 @@ func load_user_data():
|
|||||||
GameGlobals.last_hit_path = file.get_var()
|
GameGlobals.last_hit_path = file.get_var()
|
||||||
var file_leaderboard_name = file.get_var()
|
var file_leaderboard_name = file.get_var()
|
||||||
GameGlobals.current_level = str(file.get_var())
|
GameGlobals.current_level = str(file.get_var())
|
||||||
|
GameGlobals.no_reentry_portals = file.get_var()
|
||||||
var money = set_nulls_zero(file.get_var())
|
var money = set_nulls_zero(file.get_var())
|
||||||
var deposited_money = set_nulls_zero(file.get_var())
|
var deposited_money = set_nulls_zero(file.get_var())
|
||||||
var health = file.get_var()
|
var health = file.get_var()
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ class_name Portal
|
|||||||
@export var scene_thumbnail : Texture2D
|
@export var scene_thumbnail : Texture2D
|
||||||
|
|
||||||
var active = false
|
var active = false
|
||||||
|
var round_id : Vector2
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
@@ -20,6 +21,7 @@ func _process(delta: float) -> void:
|
|||||||
|
|
||||||
func _on_body_entered(body: Node3D) -> void:
|
func _on_body_entered(body: Node3D) -> void:
|
||||||
if active:
|
if active:
|
||||||
|
GameGlobals.no_reentry_portals.append(round_id)
|
||||||
#Let the Bounds detector know player is exiting
|
#Let the Bounds detector know player is exiting
|
||||||
SignalBus.emit_signal("player_exiting_tree")
|
SignalBus.emit_signal("player_exiting_tree")
|
||||||
#Set incoming gamemode
|
#Set incoming gamemode
|
||||||
|
|||||||
Reference in New Issue
Block a user