diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 231e81a..9ff4a20 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -14,7 +14,7 @@ dock_split_1=0 dock_split_4=0 dock_2="FileSystem" dock_3="Scene,Import" -dock_5="Inspector,Node,History,Commit (16)" +dock_5="Inspector,Node,History,Commit (2)" [EditorNode] diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index ec521a4..04aaf77 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -13,7 +13,7 @@ run_reload_scripts=true project_settings=Rect2(814, 520, 1120, 920) editor_settings=Rect2(830, 610, 900, 700) search_help=Rect2(640, 390, 1280, 720) -export=Rect2(830, 700, 900, 700) +export=Rect2(1083, 488, 900, 700) [color_picker] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 51c8941..20d1d98 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,6 +1,6 @@ /home/shobie/CupcakeRevolution1/Windows -res://Art/Cupcakes /home/shobie/CupcakeRevolution1/Linux +res://Art/Cupcakes res://Scripts/Tools res://Scenes/Tools res://Scenes/Locations diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 4182d9c..4f85f0d 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,16 +17,12 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 22, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 497, -"scroll_position": 209.0, -"selection": true, -"selection_from_column": 0, -"selection_from_line": 497, -"selection_to_column": 14, -"selection_to_line": 517, +"row": 131, +"scroll_position": 93.0, +"selection": false, "syntax_highlighter": "GDScript" } diff --git a/Releases/Linux/v0.1 Pre-Alpha/CupcakeRevolution_PreAlpha_V0.1_Linux.x86_64 b/Releases/Linux/v0.1 Pre-Alpha/CupcakeRevolution_PreAlpha_V0.1_Linux.x86_64 index 721df6c..d7f6343 100755 Binary files a/Releases/Linux/v0.1 Pre-Alpha/CupcakeRevolution_PreAlpha_V0.1_Linux.x86_64 and b/Releases/Linux/v0.1 Pre-Alpha/CupcakeRevolution_PreAlpha_V0.1_Linux.x86_64 differ diff --git a/Releases/Windows/v0.1 Pre Alpha/CupcakeRevolution_PreAlpha_V0.1_Windows.exe b/Releases/Windows/v0.1 Pre Alpha/CupcakeRevolution_PreAlpha_V0.1_Windows.exe index 59e31bb..f7aaea7 100644 Binary files a/Releases/Windows/v0.1 Pre Alpha/CupcakeRevolution_PreAlpha_V0.1_Windows.exe and b/Releases/Windows/v0.1 Pre Alpha/CupcakeRevolution_PreAlpha_V0.1_Windows.exe differ diff --git a/Scripts/game_world.gd b/Scripts/game_world.gd index 2003163..b568f23 100644 --- a/Scripts/game_world.gd +++ b/Scripts/game_world.gd @@ -20,35 +20,35 @@ var ccNightmareValue: int = 1 var ccVanPrice: int = 10 var ccVanPrice2: int = 15 var ccVanPrice3: int = 15 -var ccVanPrice4: int = 250 +var ccVanPrice4: int = 25000 var ccChocPrice: int = 10 var ccChocPrice2: int = 15 var ccChocPrice3: int = 15 -var ccChocPrice4: int = 500 +var ccChocPrice4: int = 50000 var ccChocPrice5: int = 150 var ccChocPrice6: int var ccStrawPrice: int = 10 var ccStrawPrice2: int = 15 var ccStrawPrice3: int = 15 -var ccStrawPrice4: int = 750 +var ccStrawPrice4: int = 75000 var ccStrawPrice5: int = 150 var ccStrawPrice6: int = 200 var ccRVelPrice: int = 10 var ccRVelPrice2: int = 15 var ccRVelPrice3: int = 15 -var ccRVelPrice4: int = 1000 +var ccRVelPrice4: int = 100000 var ccCinPrice: int = 10 var ccCinPrice2: int = 15 var ccCinPrice3: int = 15 -var ccCinPrice4: int = 1250 +var ccCinPrice4: int = 125000 var ccHonPrice: int = 10 var ccHonPrice2: int = 15 var ccHonPrice3: int = 15 -var ccHonPrice4: int = 1500 +var ccHonPrice4: int = 150000 var ccNightPrice: int = 10 var ccNightPrice2: int = 15 var ccNightPrice3: int = 15 -var ccNightPrice4: int = 1750 +var ccNightPrice4: int = 175000 #Upgrade counts var vanUpNum1: int = 0 @@ -125,11 +125,11 @@ var ccDiaLocked = true var ccChaLocked = true #Spawnrates -var ccVanSpawnRate = 30 -var ccChocSpawnRate = 30 -var ccStrawSpawnRate = 30 -var ccRVelSpawnRate = 30 -var ccCinSpawnRate = 30 +var ccVanSpawnRate = 3 +var ccChocSpawnRate = 3 +var ccStrawSpawnRate = 3 +var ccRVelSpawnRate = 3 +var ccCinSpawnRate = 3 var ccHonSpawnRate = 3 var ccNightSpawnRate = 3 var ccRocSpawnRate = 3