OnlyMareGames
/
CupcakeRevolution
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Nightly push

Browse Source 
-added beginnings of UI
main
OnlyMares 2 years ago
parent f259c1a83f
commit f50997b98f
11 changed files with 114 additions and 31 deletions
Show Stats Download Patch File Download Diff File

9
.godot/editor/create_recent.Node
Unescape Escape View File

@ -1,5 +1,12 @@
TextureButton Button
HBoxContainer
Panel
CanvasLayer
VBoxContainer VBoxContainer
ScrollContainer
Control
AnimationPlayer
TextureButton
Node2D Node2D
Sprite2D Sprite2D
CollisionShape2D CollisionShape2D

4
.godot/editor/editor_layout.cfg
Unescape Escape View File

@ -14,11 +14,11 @@ dock_split_1=0
dock_split_4=0 dock_split_4=0
dock_2="FileSystem" dock_2="FileSystem"
dock_3="Scene,Import" dock_3="Scene,Import"
dock_5="Inspector,Node,History,Commit (15)" dock_5="Inspector,Node,History,Commit (11)"
[EditorNode] [EditorNode]
open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/ingame_ui.tscn"] open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn"]
[ScriptEditor] [ScriptEditor]

29
.godot/editor/filesystem_cache8
Unescape Escape View File

@ -1,5 +1,5 @@
2a60927148abd1d33b818b535e306557 2a60927148abd1d33b818b535e306557
::res://::1677895080 ::res://::1677895091
export_presets.cfg::TextFile::-1::1677836748::0::1::::<><>:: export_presets.cfg::TextFile::-1::1677836748::0::1::::<><>::
README.md::TextFile::-1::1677829846::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>::
::res://addons/::1677750379 ::res://addons/::1677750379
@ -18,21 +18,22 @@ Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1
::res://Art/Locations/::1677787260 ::res://Art/Locations/::1677787260
yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>::
::res://Art/Upgrades/::1677787246 ::res://Art/Upgrades/::1677787246
::res://Scenes/::1677894922 ::res://Scenes/::1677919864
game_world.tscn::PackedScene::7981802964863433317::1677894922::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>res://Scripts/PlayArea.gd game_world.tscn::PackedScene::7981802964863433317::1677919864::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>res://Scripts/PlayArea.gd
horse.tscn::PackedScene::8568825373134700876::1677894219::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke horse.tscn::PackedScene::8568825373134700876::1677919864::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke
::res://Scenes/Cupcakes/::1677894219 ::res://Scenes/Cupcakes/::1677919864
cupcake.tscn::PackedScene::8468695979515826288::1677894219::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k cupcake.tscn::PackedScene::8468695979515826288::1677919864::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k
::res://Scenes/Locations/::1677894219 ::res://Scenes/Locations/::1677919864
yard.tscn::PackedScene::7883941411178408831::1677894219::0::1::::<><>::uid://b3j662tj6h5vq yard.tscn::PackedScene::7883941411178408831::1677919864::0::1::::<><>::uid://b3j662tj6h5vq
::res://Scenes/UI/::1677894219 ::res://Scenes/UI/::1678001506
ingame_ui.tscn::PackedScene::6815695514927101566::1677894219::0::1::::<><>:: ingame_ui.tscn::PackedScene::6815695514927101566::1678001506::0::1::::<><>::
::res://Scripts/::1677895080 Upgrades.tscn::PackedScene::5871013436024621816::1678008873::0::1::::<><>::
constVar.gd::GDScript::-1::1677895026::0::1::::<>Node<>:: ::res://Scripts/::1678001506
Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>:: Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>::
game_world.gd::GDScript::-1::1677894219::0::1::::<>Node2D<>:: game_world.gd::GDScript::-1::1678001506::0::1::::<>Node2D<>::
horse.gd::GDScript::-1::1677889419::0::1::::<>CharacterBody2D<>:: horse.gd::GDScript::-1::1677918740::0::1::::<>CharacterBody2D<>::
PlayArea.gd::GDScript::-1::1677893017::0::1::::<>Area2D<>:: PlayArea.gd::GDScript::-1::1677893017::0::1::::<>Area2D<>::
varConst.gd::GDScript::-1::1677895026::0::1::::<>Node<>::
varVar.gd::GDScript::-1::1677895074::0::1::::<>Node<>:: varVar.gd::GDScript::-1::1677895074::0::1::::<>Node<>::
::res://Scripts/Cupcakes/::1677890080 ::res://Scripts/Cupcakes/::1677890080
cupcake.gd::GDScript::-1::1677890080::0::1::::<>RigidBody2D<>:: cupcake.gd::GDScript::-1::1677890080::0::1::::<>RigidBody2D<>::

1
.godot/editor/filesystem_update4
Unescape Escape View File

@ -9,3 +9,4 @@ res://Scenes/Locations/yard.tscn
res://README.md res://README.md
res://Scenes/UI/ingame_ui.tscn res://Scenes/UI/ingame_ui.tscn
res://Scripts/PlayArea.gd res://Scripts/PlayArea.gd
res://Scenes/UI/upgrades.tscn

6
.godot/editor/project_metadata.cfg
Unescape Escape View File

@ -11,17 +11,17 @@ run_reload_scripts=true
[dialog_bounds] [dialog_bounds]
project_settings=Rect2(814, 506, 1120, 920) project_settings=Rect2(814, 506, 1120, 920)
editor_settings=Rect2(830, 460, 900, 700) editor_settings=Rect2(830, 520, 900, 700)
search_help=Rect2(640, 390, 1280, 720) search_help=Rect2(640, 390, 1280, 720)
export=Rect2(830, 430, 900, 700) export=Rect2(830, 430, 900, 700)
[color_picker] [color_picker]
recent_presets=PackedColorArray(0, 0, 0, 1, 0.2, 0.0156863, 0.286275, 0.431373, 0.2, 0.0156863, 0.286275, 1, 0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.0927669, 0.215293, 1, 0.163438, 0.106064, 0.177906, 1, 0.151073, 0.10726, 0.20049, 1, 0.169037, 0.0963807, 0.200651, 1, 0.159178, 0.105531, 0.189929, 1) recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.0927669, 0.215293, 1, 0.163438, 0.106064, 0.177906, 1, 0.151073, 0.10726, 0.20049, 1, 0.169037, 0.0963807, 0.200651, 1, 0.159178, 0.105531, 0.189929, 1, 0.722336, 0.665569, 0.997871, 1, 0.0110876, 0.0110876, 0.0110876, 1, 0.0562916, 0.0562916, 0.0562916, 1)
[recent_files] [recent_files]
scenes=["res://Scenes/UI/ingame_ui.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Locations/y.tscn", "res://Scenes/Locations/Yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/cupcake.tscn"] scenes=["res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Locations/y.tscn", "res://Scenes/Locations/Yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/cupcake.tscn"]
scripts=["res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "Node", "res://Scripts/game_world.gd", "res://Scripts/horse.gd"] scripts=["res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "Node", "res://Scripts/game_world.gd", "res://Scripts/horse.gd"]
[script_setup] [script_setup]

2
.godot/editor/recent_dirs
Unescape Escape View File

@ -1,5 +1,5 @@
res://Scripts
res://Scenes/UI res://Scenes/UI
res://Scripts
/home/shobie/CupcakeRevolution1 /home/shobie/CupcakeRevolution1
res://Scenes/Locations res://Scenes/Locations
res://Art/Locations res://Art/Locations

6
.godot/editor/script_editor_cache.cfg
Unescape Escape View File

@ -6,7 +6,7 @@ state={
"column": 10, "column": 10,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 10, "row": 4,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
@ -17,10 +17,10 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 24, "column": 0,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 16, "row": 48,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"

BIN
.godot/uid_cache.bin
View File

Binary file not shown.

20
Scenes/UI/ingame_ui.tscn
Unescape Escape View File

@ -1,9 +1,25 @@
[gd_scene format=3 uid="uid://c4dtrk2kooa6q"] [gd_scene format=3 uid="uid://c4dtrk2kooa6q"]
[node name="IngameUI" type="Control"] [node name="InGameUI" type="CanvasLayer"]
layout_mode = 3
[node name="Panel" type="Panel" parent="."]
offset_left = 16.0
offset_top = 997.0
offset_right = 1908.0
offset_bottom = 1066.0
[node name="HBoxContainer" type="HBoxContainer" parent="Panel"]
layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="Van" type="Button" parent="Panel/HBoxContainer"]
layout_mode = 2
text = "Vanil"
[node name="Choc" type="Button" parent="Panel/HBoxContainer"]
layout_mode = 2
text = "Choc"

54
Scenes/UI/upgrades.tscn
Unescape Escape View File

@ -0,0 +1,54 @@
[gd_scene format=3 uid="uid://cpv7y67qtmino"]
[node name="Upgrades" type="CanvasLayer"]
[node name="Anim" type="AnimationPlayer" parent="."]
[node name="MainPanel" type="Panel" parent="."]
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -813.5
offset_top = -402.5
offset_right = 813.5
offset_bottom = 402.5
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 4
size_flags_vertical = 4
[node name="Close" type="Button" parent="."]
anchors_preset = -1
anchor_left = 0.927
anchor_top = 0.126
anchor_right = 0.927
anchor_bottom = 0.126
offset_left = -24.8401
offset_top = -20.08
offset_right = 19.1599
offset_bottom = 26.92
text = "X"
[node name="Control" type="Control" parent="."]
layout_mode = 3
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -787.0
offset_top = -380.0
offset_right = 794.0
offset_bottom = 379.0
[node name="ScrollContainer" type="ScrollContainer" parent="Control"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="VBoxContainer" type="VBoxContainer" parent="Control/ScrollContainer"]
layout_mode = 2

12
Scripts/game_world.gd
Unescape Escape View File

@ -1,26 +1,29 @@
extends Node2D extends Node2D
var spawn var inGameUI = preload("res://Scenes/UI/ingame_ui.tscn")
var upgradeUI = preload("res://Scenes/UI/upgrades.tscn")
var location = preload("res://Scenes/Locations/yard.tscn") var location = preload("res://Scenes/Locations/yard.tscn")
var horse_scene = preload("res://Scenes/horse.tscn") var horse_scene = preload("res://Scenes/horse.tscn")
var horse = preload("res://Scripts/horse.gd") var horse = preload("res://Scripts/horse.gd")
var horse_instance var horse_instance
var IGUI
var mouse_position = Vector2.ZERO var mouse_position = Vector2.ZERO
var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn") var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
var ccvan = ccVanilla.instantiate() var ccvan = ccVanilla.instantiate()
var ccChocolate var ccChocolate
var ccchoc var ccchoc
var randX
var randY
var ccSpawnRate = 25 var ccSpawnRate = 25
var ccCount = 0 var ccCount = 0
var ccMaxOnScreen = 2000 var ccMaxOnScreen = 2000
func _ready(): func _ready():
var spawn
horse_instance = horse_scene.instantiate() horse_instance = horse_scene.instantiate()
spawn = location.instantiate() spawn = location.instantiate()
IGUI = inGameUI.instantiate()
$Location.add_child(spawn) $Location.add_child(spawn)
add_child(horse_instance) add_child(horse_instance)
add_child(IGUI)
func _process(delta): func _process(delta):
@ -28,6 +31,8 @@ func _process(delta):
horse_instance.position = mouse_position horse_instance.position = mouse_position
func spawnCupcakes(): func spawnCupcakes():
var randX
var randY
randomize() randomize()
if ccCount <= ccMaxOnScreen: if ccCount <= ccMaxOnScreen:
for i in range(ccSpawnRate): for i in range(ccSpawnRate):
@ -38,7 +43,6 @@ func spawnCupcakes():
ccCount = ccCount + 25 ccCount = ccCount + 25
func collectCupcakes(): func collectCupcakes():
pass pass

Write Preview
Loading…
Cancel
Save