Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final Tweaks [Maybe] #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Final Tweaks [Maybe] #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2908002
Final Tweaks [Maybe]
May 20, 2024
7f756bb
NOW
May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Scripts/EndOfLevel.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func _ready() -> void:
win_lose_label.text = "LEVEL CLEAR"
caption_label.text = "Mission cleared. Onwards to the next. We got money to make."
global.EndScreenState.VICTORY:
win_lose_label.text = "YOU WIN"
win_lose_label.text = "YOU WIN!"
caption_label.text = "All the debt owed was paid. Contract passed."
global.EndScreenState.DEFEAT:
win_lose_label.text = "YOU LOSE"
Expand Down
10 changes: 6 additions & 4 deletions global_state.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var level_2 := preload("res://Scenes/Level2.tscn")
@onready var audio_manager := get_node("/root/AudioManager")

const playspace := Vector2(384.0/4, 288.0/2 - 10)
const scrap_value := 1200
const scrap_value := 1100

const money_speed := 60.0
const money_exponent := 1.5
Expand All @@ -29,7 +29,7 @@ var stock_price_high_bound := 30_000.0
var heckler_stock_price := stock_price_high_bound
var last_heckler_stock_price := stock_price_high_bound

var current_level := 1
var current_level := 0

var stock_rng := RandomNumberGenerator.new()
var bullet_rng := RandomNumberGenerator.new()
Expand Down Expand Up @@ -320,10 +320,12 @@ func start_level() -> void:
equip_weapon(current_weapon)

func finish_level() -> void:
if current_level < 3:
if current_level < 2:
end_screen_state = EndScreenState.LEVEL_CLEAR
else:
elif money >= 1_000_000:
end_screen_state = EndScreenState.VICTORY
else:
end_screen_state = EndScreenState.DEFEAT
goto_end_screen()

func goto_end_screen() -> void:
Expand Down