Skip to content

Commit

Permalink
Removed unnecessary files out of scripts folder (Revolutionary-Games#…
Browse files Browse the repository at this point in the history
…1195)

* Moved non-ruby files out of scripts folder

* Fixed scripts folder

* Made changes with current updates

* Removed random stuff

* Updated formatting script to find the new json file location

* Updated readme to be accurate about what is in the scripts folder

Co-authored-by: Henri Hyyryläinen <[email protected]>
  • Loading branch information
icedjuro and hhyyrylainen authored May 6, 2020
1 parent cc4dc8f commit 18a0833
Showing 31 changed files with 35 additions and 34 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -9,7 +9,8 @@ Overview
Repository structure:
- assets: This folder contains all the assets such as models and other binaries. The big files in this folder use [Git LFS](https://git-lfs.github.com/) in order to keep this repository from bloating. You need to have Git LFS installed to get the files. Some better editable versions of the assets are stored in a separate [repository](https://github.com/Revolutionary-Games/Thrive-Raw-Assets).
- doc: Documentation files. Contains style guide, engine overview and other useful documentation.
- scripts: AngelScript scripts that contain part of the codebase. Scripts are used for easier development and code here can then later be transferred to the C++ base for performance.
- simulation_parameters: Contains JSON files as well as C# constants for tweaking the game.
- scripts: Utility scripts for Thrive development
- src: The core of the game written in C# as well as Godot scenes.
- script: Contains the game configuration files for existing Compounds, Organelles, Biomes etc. as well as the main menu GUI files.
- test: Contains tests that will ensure that core parts work correctly. These don't currently exist for the Godot version.
22 changes: 11 additions & 11 deletions Thrive.csproj
Original file line number Diff line number Diff line change
@@ -55,14 +55,14 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="scripts\gui\Cutscene.cs" />
<Compile Include="scripts\gui\Fade.cs" />
<Compile Include="scripts\gui\GUICommon.cs" />
<Compile Include="scripts\gui\ITransition.cs" />
<Compile Include="scripts\gui\MainMenu.cs" />
<Compile Include="scripts\gui\TransitionManager.cs" />
<Compile Include="scripts\gui\VersionNumber.cs" />
<Compile Include="scripts\simulation_parameters\Constants.cs" />
<Compile Include="src\gui_common\Cutscene.cs" />
<Compile Include="src\gui_common\Fade.cs" />
<Compile Include="src\gui_common\GUICommon.cs" />
<Compile Include="src\gui_common\ITransition.cs" />
<Compile Include="src\gui_common\MainMenu.cs" />
<Compile Include="src\gui_common\TransitionManager.cs" />
<Compile Include="src\gui_common\VersionNumber.cs" />
<Compile Include="simulation_parameters\Constants.cs" />
<Compile Include="src\engine\FPSCounter.cs" />
<Compile Include="src\engine\ScreenFilter.cs" />
<Compile Include="src\engine\FilterLoader.cs" />
@@ -89,12 +89,12 @@
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="src\general\MathUtils.cs" />
<Compile Include="src\microbe_stage\MembraneType.cs" />
<Compile Include="scripts\simulation_parameters\SimulationParameters.cs" />
<Compile Include="simulation_parameters\SimulationParameters.cs" />
<Compile Include="src\microbe_stage\Background.cs" />
<Compile Include="src\microbe_stage\Biome.cs" />
<Compile Include="scripts\simulation_parameters\InvalidRegistryData.cs" />
<Compile Include="simulation_parameters\InvalidRegistryData.cs" />
<Compile Include="src\microbe_stage\BioProcess.cs" />
<Compile Include="scripts\simulation_parameters\IRegistryType.cs" />
<Compile Include="simulation_parameters\IRegistryType.cs" />
<Compile Include="src\microbe_stage\Compound.cs" />
<Compile Include="src\microbe_stage\NameGenerator.cs" />
<Compile Include="src\microbe_stage\OrganelleDefinition.cs" />
2 changes: 1 addition & 1 deletion check_formatting.rb
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ def handle_file(path)
handle_gd_file path
elsif path =~ /\.cs$/
handle_cs_file path
elsif path =~ %r{scripts/.*\.json$}
elsif path =~ %r{simulation_parameters/.*\.json$}
handle_json_file path
else
false
6 changes: 3 additions & 3 deletions project.godot
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ config/description="Thrive is an open source evolution simulation game.
Play as a microbe on an alien world trying to survive and adapt to your surroundings in order to thrive.
https://revolutionarygamesstudio.com/"
run/main_scene="res://scripts/gui/MainMenu.tscn"
run/main_scene="res://src/gui_common/MainMenu.tscn"
config/use_custom_user_dir=true
config/custom_user_dir_name="Thrive"
boot_splash/image="res://assets/misc/thrive_logo_big.png"
@@ -30,8 +30,8 @@ config/windows_native_icon="res://assets/misc/icon.ico"

[autoload]

GUICommon="*res://scripts/gui/GUICommon.cs"
TransitionManager="*res://scripts/gui/TransitionManager.cs"
GUICommon="*res://src/gui_common/GUICommon.cs"
TransitionManager="*res://src/gui_common/TransitionManager.cs"
Jukebox="*res://src/general/Jukebox.cs"
ScreenFilter="*res://src/engine/ScreenFilter.tscn"
FilterLoader="*res://src/engine/FilterLoader.cs"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -33,22 +33,22 @@ static SimulationParameters()
private SimulationParameters()
{
membranes = LoadRegistry<MembraneType>(
"res://scripts/simulation_parameters/microbe_stage/membranes.json");
"res://simulation_parameters/microbe_stage/membranes.json");
backgrounds = LoadRegistry<Background>(
"res://scripts/simulation_parameters/microbe_stage/backgrounds.json");
"res://simulation_parameters/microbe_stage/backgrounds.json");
biomes = LoadRegistry<Biome>(
"res://scripts/simulation_parameters/microbe_stage/biomes.json");
"res://simulation_parameters/microbe_stage/biomes.json");
bioProcesses = LoadRegistry<BioProcess>(
"res://scripts/simulation_parameters/microbe_stage/bio_processes.json");
"res://simulation_parameters/microbe_stage/bio_processes.json");
compounds = LoadRegistry<Compound>(
"res://scripts/simulation_parameters/microbe_stage/compounds.json");
"res://simulation_parameters/microbe_stage/compounds.json");
organelles = LoadRegistry<OrganelleDefinition>(
"res://scripts/simulation_parameters/microbe_stage/organelles.json");
"res://simulation_parameters/microbe_stage/organelles.json");

NameGenerator = LoadDirectObject<NameGenerator>(
"res://scripts/simulation_parameters/microbe_stage/species_names.json");
"res://simulation_parameters/microbe_stage/species_names.json");

musicCategories = LoadRegistry<MusicCategory>("res://scripts/simulation_parameters/common/music_tracks.json");
musicCategories = LoadRegistry<MusicCategory>("res://simulation_parameters/common/music_tracks.json");

GD.Print("SimulationParameters loading ended");

File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/gui/Cutscene.tscn → src/gui_common/Cutscene.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://scripts/gui/Cutscene.cs" type="Script" id=1]
[ext_resource path="res://src/gui_common/Cutscene.cs" type="Script" id=1]

[node name="Cutscene" type="CanvasLayer"]
script = ExtResource( 1 )
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/gui/Fade.tscn → src/gui_common/Fade.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://scripts/gui/Fade.cs" type="Script" id=1]
[ext_resource path="res://src/gui_common/Fade.cs" type="Script" id=1]

[node name="Fade" type="CanvasLayer"]
script = ExtResource( 1 )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/gui/MainMenu.tscn → src/gui_common/MainMenu.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=6 format=2]

[ext_resource path="res://scripts/gui/MainMenu.cs" type="Script" id=1]
[ext_resource path="res://src/gui_common/MainMenu.cs" type="Script" id=1]
[ext_resource path="res://assets/textures/gui/menu_theme.tres" type="Theme" id=2]
[ext_resource path="res://assets/textures/gui/logo.png" type="Texture" id=3]
[ext_resource path="res://src/general/OptionsMenu.tscn" type="PackedScene" id=4]
[ext_resource path="res://scripts/gui/VersionNumber.cs" type="Script" id=5]
[ext_resource path="res://src/gui_common/VersionNumber.cs" type="Script" id=5]

[node name="MainMenu" type="Node"]
script = ExtResource( 1 )
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ private TransitionManager()
{
instance = this;

screenFadeScene = GD.Load<PackedScene>("res://scripts/gui/Fade.tscn");
cutsceneScene = GD.Load<PackedScene>("res://scripts/gui/Cutscene.tscn");
screenFadeScene = GD.Load<PackedScene>("res://src/gui_common/Fade.tscn");
cutsceneScene = GD.Load<PackedScene>("res://src/gui_common/Cutscene.tscn");
}

[Signal]
File renamed without changes.
6 changes: 3 additions & 3 deletions src/microbe_stage/MicrobeStage.tscn
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
[ext_resource path="res://assets/textures/gui/bevel/PhosphatesBW.png" type="Texture" id=5]
[ext_resource path="res://assets/sounds/soundeffects/microbe-pickup-organelle.ogg" type="AudioStream" id=6]
[ext_resource path="res://src/microbe_stage/PlayerMicrobeInput.cs" type="Script" id=7]
[ext_resource path="res://scripts/gui/WinBox.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/microbe_stage/gui/WinBox.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/microbe_stage/MicrobeHUD.cs" type="Script" id=9]
[ext_resource path="res://src/microbe_stage/CompoundCloudSystem.cs" type="Script" id=10]
[ext_resource path="res://assets/textures/gui/menu_theme.tres" type="Theme" id=11]
@@ -67,10 +67,10 @@
[ext_resource path="res://assets/textures/gui/bevel/ReproductionBar.png" type="Texture" id=65]
[ext_resource path="res://assets/fonts/Jura-Medium.ttf" type="DynamicFontData" id=66]
[ext_resource path="res://assets/fonts/thrive.ttf" type="DynamicFontData" id=69]
[ext_resource path="res://scripts/gui/ExtinctionBox.tscn" type="PackedScene" id=70]
[ext_resource path="res://src/microbe_stage/gui/ExtinctionBox.tscn" type="PackedScene" id=70]
[ext_resource path="res://assets/textures/gui/bevel/AmmoniaBW.png" type="Texture" id=71]
[ext_resource path="res://src/general/HelpScreen.tscn" type="PackedScene" id=72]
[ext_resource path="res://scripts/gui/HelpBox.tscn" type="PackedScene" id=73]
[ext_resource path="res://src/gui_common/HelpBox.tscn" type="PackedScene" id=73]
[ext_resource path="res://assets/textures/gui/bevel/pauseButtonPausedHover.png" type="Texture" id=78]
[ext_resource path="res://assets/textures/gui/bevel/pauseButtonPaused.png" type="Texture" id=79]

2 changes: 1 addition & 1 deletion src/microbe_stage/editor/MicrobeEditor.tscn
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@
[ext_resource path="res://assets/textures/gui/bevel/4xSymmetry.png" type="Texture" id=76]
[ext_resource path="res://assets/textures/gui/bevel/2xSymmetry.png" type="Texture" id=77]
[ext_resource path="res://assets/textures/gui/bevel/increase.png" type="Texture" id=78]
[ext_resource path="res://scripts/gui/HelpBox.tscn" type="PackedScene" id=79]
[ext_resource path="res://src/gui_common/HelpBox.tscn" type="PackedScene" id=79]
[ext_resource path="res://assets/textures/gui/scrollbar_theme.tres" type="Theme" id=80]
[ext_resource path="res://src/general/HelpScreen.tscn" type="PackedScene" id=81]
[ext_resource path="res://assets/textures/gui/bevel/MediumTwoNormal.png" type="Texture" id=82]
File renamed without changes.
File renamed without changes.

0 comments on commit 18a0833

Please sign in to comment.