From ec5c89a7663bfd81743e951eb4f2def146ed47be Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 15:51:49 -0600 Subject: Move the main window under Clipette's text box --- scenes/main.gd | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index c984f43..1d9c503 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -6,6 +6,8 @@ var net_worth: Big func _ready() -> void: _on_microgame_spawn_timer_timeout() net_worth = Big.new(1000) + + get_window().position = Vector2(450, 360) # Called every frame. 'delta' is the elapsed time since the previous frame. -- cgit v1.2.3 From f3efe1b3c71667c3a2d83b39f97d5d10bf580521 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 15:58:14 -0600 Subject: Resize main window --- scenes/main.gd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 1d9c503..b20524b 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -7,8 +7,9 @@ func _ready() -> void: _on_microgame_spawn_timer_timeout() net_worth = Big.new(1000) - get_window().position = Vector2(450, 360) - + var window = get_window() + window.position = Vector2(450, 360) + window.size = Vector2(500, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: -- cgit v1.2.3 From 24d047838221c5086ee6a0f41a7dbfb0b080e0a7 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 16:19:17 -0600 Subject: Yeah that looks nice enough --- scenes/main.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index b20524b..4f1c67f 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -9,7 +9,7 @@ func _ready() -> void: var window = get_window() window.position = Vector2(450, 360) - window.size = Vector2(500, 300) + window.size = Vector2(1319, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -17,7 +17,7 @@ func _process(delta: float) -> void: if Input.is_action_just_pressed("G"): $Meow.play() - $Score.text = "Net worth: $%s" % net_worth.toString() + $Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: -- cgit v1.2.3 From 7546c31057cbdec92c08e5d2ed3b59b5910a0956 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:37:18 -0600 Subject: Move score window to a separate node, theoretically --- scenes/main.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 4f1c67f..7025386 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -17,7 +17,7 @@ func _process(delta: float) -> void: if Input.is_action_just_pressed("G"): $Meow.play() - $Score.text = "Net worth: \n$%s" % net_worth.toString() + #$Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: -- cgit v1.2.3 From 21609e84f29ca7461d548915dc5b0acef0b82bf1 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:46:13 -0600 Subject: Finish migration I think? I got distracted --- scenes/main.gd | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 7025386..dbfcd65 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -1,23 +1,14 @@ extends Node2D -var net_worth: Big - # Called when the node enters the scene tree for the first time. func _ready() -> void: _on_microgame_spawn_timer_timeout() - net_worth = Big.new(1000) - - var window = get_window() - window.position = Vector2(450, 360) - window.size = Vector2(1319, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: # The most important functionality if Input.is_action_just_pressed("G"): $Meow.play() - - #$Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: @@ -40,11 +31,3 @@ func _on_microgame_spawn_timer_timeout() -> void: func _on_microgame_win(window: MicrogameWindow): print("yay") - - -func _on_stock_ticker_buy(amount: Variant) -> void: - net_worth = net_worth.minus(amount) - - -func _on_stock_ticker_sell(amount: Variant) -> void: - net_worth = net_worth.plus(amount) -- cgit v1.2.3 From 518fa16866161c569f941ea6d25e2ecbf7a41e4c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:26:50 -0600 Subject: Fiiiiiiine I'll just make Clippette visible instead of instantiating her --- scenes/main.gd | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index dbfcd65..7e65562 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -3,6 +3,10 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready() -> void: _on_microgame_spawn_timer_timeout() + + # Spawn Clippette??? + $Clippette.visible = true + # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -17,6 +21,9 @@ func _on_microgame_spawn_timer_timeout() -> void: # Spawn a microgame window var window_scene = preload("res://scenes/microgames/ad/ad_window.tscn") var window_instance = window_scene.instantiate() + + print(type_string(typeof(window_instance))) + add_child(window_instance) # Randomize window position -- cgit v1.2.3 From 977521849bd7efa82152e0f3d3676c300e559bde Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:33:37 -0600 Subject: Make the main window just be a stock ticker --- scenes/main.gd | 3 --- 1 file changed, 3 deletions(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 7e65562..2c9cda5 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -4,9 +4,6 @@ extends Node2D func _ready() -> void: _on_microgame_spawn_timer_timeout() - # Spawn Clippette??? - $Clippette.visible = true - # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: -- cgit v1.2.3 From 271eb69e5052c131519b08f0df22618d4881ef77 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:36:52 -0600 Subject: Disable microgame spawning :( (It gets worse before it gets a lot worse) --- scenes/main.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 2c9cda5..6949a8c 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -2,7 +2,7 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready() -> void: - _on_microgame_spawn_timer_timeout() + pass # Called every frame. 'delta' is the elapsed time since the previous frame. -- cgit v1.2.3 From a472a321179268710722232ee61aa04b369c627c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:38:06 -0600 Subject: Make the fishing minigame transition into stonks --- scenes/main.gd | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 6949a8c..5349cf4 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -35,3 +35,8 @@ func _on_microgame_spawn_timer_timeout() -> void: func _on_microgame_win(window: MicrogameWindow): print("yay") + + +func _on_fishin_win() -> void: + $Fishin.visible = false + $"Stock ticker".start() -- cgit v1.2.3 From 47c6fcc3b0ae7d79c29f1a4bfbfc5f12d44d3254 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:56:44 -0600 Subject: Restart the silliness after winning fishing --- scenes/main.gd | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scenes/main.gd') diff --git a/scenes/main.gd b/scenes/main.gd index 5349cf4..7ab90d5 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -40,3 +40,6 @@ func _on_microgame_win(window: MicrogameWindow): func _on_fishin_win() -> void: $Fishin.visible = false $"Stock ticker".start() + $"Microgame spawn timer".start() + $Clippette.visible = true + $"Score window (real)".visible = true -- cgit v1.2.3