aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--.github/actions/openvic-env/action.yml (renamed from .github/actions/openvic2-env/action.yml)10
-rw-r--r--.github/workflows/builds.yml22
-rw-r--r--.gitignore2
-rw-r--r--.gitmodules12
-rw-r--r--README.md6
-rw-r--r--SConstruct6
-rw-r--r--docs/contribution-quickstart-guide.md8
-rw-r--r--docs/project-file-structure.md12
-rw-r--r--docs/simulation/goods.md4
-rw-r--r--docs/simulation/ideologies.md4
-rw-r--r--docs/simulation/provinces.md4
-rw-r--r--docs/simulation/sim-doc-format.md4
-rw-r--r--docs/styleguide-cpp.md14
m---------extension/deps/OV-compiler0
m---------extension/deps/OV2-compiler0
m---------extension/deps/openvic-simulation0
m---------extension/deps/openvic2-simulation0
-rw-r--r--extension/src/Checksum.hpp2
-rw-r--r--extension/src/GameSingleton.cpp4
-rw-r--r--extension/src/GameSingleton.hpp4
-rw-r--r--extension/src/LoadLocalisation.cpp2
-rw-r--r--extension/src/LoadLocalisation.hpp2
-rw-r--r--extension/src/MapMesh.cpp2
-rw-r--r--extension/src/MapMesh.hpp2
-rw-r--r--extension/src/register_types.cpp12
-rw-r--r--extension/src/register_types.h4
-rw-r--r--game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd (renamed from game/addons/openvic2-plugin/ReleaseExportEditorPlugin.gd)8
-rw-r--r--game/addons/openvic-plugin/openvic-plugin.gd (renamed from game/addons/openvic2-plugin/openvic2-plugin.gd)2
-rw-r--r--game/addons/openvic-plugin/plugin.cfg7
-rw-r--r--game/addons/openvic2-plugin/plugin.cfg7
-rw-r--r--game/bin/openvic.gdextension14
-rw-r--r--game/bin/openvic2.gdextension14
-rw-r--r--game/common/credits.csv2
-rw-r--r--game/export_presets.cfg8
-rw-r--r--game/localisation/en_GB/menus.csv2
-rw-r--r--game/localisation/en_US/menus.csv2
-rw-r--r--game/localisation/fr_FR/menus.csv2
-rw-r--r--game/project.godot6
-rw-r--r--game/src/ArgumentParser.gd4
-rw-r--r--game/src/Autoload/Events/GameDebug.gd4
-rw-r--r--game/src/Autoload/Events/Options.gd2
-rw-r--r--game/src/Autoload/SaveManager.gd2
-rw-r--r--game/src/CreditsMenu/CreditsMenu.gd2
-rw-r--r--game/src/Utility/GIT_INFO.gd2
45 files changed, 117 insertions, 117 deletions
diff --git a/.clang-format b/.clang-format
index 62a949f..bfa989e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -53,7 +53,7 @@ IncludeCategories:
Priority: 2
- Regex: ^<godot_cpp/
Priority: 3
- - Regex: ^"openvic2/
+ - Regex: ^"openvic/
Priority: 4
- Regex: .*
Priority: 5
diff --git a/.github/actions/openvic2-env/action.yml b/.github/actions/openvic-env/action.yml
index 8fea1b3..acb428f 100644
--- a/.github/actions/openvic2-env/action.yml
+++ b/.github/actions/openvic-env/action.yml
@@ -1,5 +1,5 @@
-name: Setup OpenVic2 Environment
-description: Setup OpenVic2 Environment
+name: Setup OpenVic Environment
+description: Setup OpenVic Environment
runs:
using: "composite"
steps:
@@ -7,9 +7,9 @@ runs:
uses: actions/github-script@v6
with:
script: |
- const commit_name = 'OPENVIC2_COMMIT';
- const tag_name = 'OPENVIC2_TAG';
- const release_name = 'OPENVIC2_RELEASE';
+ const commit_name = 'OPENVIC_COMMIT';
+ const tag_name = 'OPENVIC_TAG';
+ const release_name = 'OPENVIC_RELEASE';
var commit_sha = process.env["GITHUB_SHA"];
if(context.eventName === 'pull_request') {
commit_sha = context.payload.pull_request.head.sha;
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 664f8e4..b782ca4 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -61,7 +61,7 @@ jobs:
submodules: recursive
- name: Setup Environment
- uses: ./.github/actions/openvic2-env
+ uses: ./.github/actions/openvic-env
- name: Set up Python
uses: actions/setup-python@v4
@@ -97,28 +97,28 @@ jobs:
- name: Delete compilation files
if: ${{ matrix.platform == 'windows' }}
run: |
- Remove-Item game/bin/openvic2/* -Include *.exp,*.lib,*.pdb -Force
+ Remove-Item game/bin/openvic/* -Include *.exp,*.lib,*.pdb -Force
- name: Upload extension artifact
uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-extension
path: |
- ${{ github.workspace }}/game/bin/openvic2/*
+ ${{ github.workspace }}/game/bin/openvic/*
- name: Archive Release
uses: thedoctor0/zip-release@0.7.1
with:
type: 'zip'
- filename: 'libopenvic2.${{ matrix.platform }}.${{ matrix.arch }}.zip'
- path: '${{ github.workspace }}/game/bin/openvic2/'
+ filename: 'libopenvic.${{ matrix.platform }}.${{ matrix.arch }}.zip'
+ path: '${{ github.workspace }}/game/bin/openvic/'
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
- name: Create and upload asset
uses: ncipollo/release-action@v1
with:
allowUpdates: true
- artifacts: "libopenvic2.${{ matrix.platform }}.${{ matrix.arch }}.zip"
+ artifacts: "libopenvic.${{ matrix.platform }}.${{ matrix.arch }}.zip"
omitNameDuringUpdate: true
omitBodyDuringUpdate: true
token: ${{ secrets.GITHUB_TOKEN }}
@@ -135,13 +135,13 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Setup Environment
- uses: ./.github/actions/openvic2-env
+ uses: ./.github/actions/openvic-env
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: ${{ github.event.repository.name }}-extension
- path: game/bin/openvic2
+ path: game/bin/openvic
- name: Export pack file
id: export_game
@@ -154,7 +154,7 @@ jobs:
export_debug: true
relative_export_path: ./game/export
- - run: mv "./game/export/LinuxX11 x86_64/OpenVic2.x86_64.pck" ./game/export/${{ github.event.repository.name }}.pck
+ - run: mv "./game/export/LinuxX11 x86_64/OpenVic.x86_64.pck" ./game/export/${{ github.event.repository.name }}.pck
- name: Upload pack artifact
uses: actions/upload-artifact@v3
@@ -176,13 +176,13 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Setup Environment
- uses: ./.github/actions/openvic2-env
+ uses: ./.github/actions/openvic-env
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: ${{ github.event.repository.name }}-extension
- path: game/bin/openvic2
+ path: game/bin/openvic
- name: Install WINE
id: wine_install
diff --git a/.gitignore b/.gitignore
index 596bc88..d8b9d7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@
# Godot 4+ specific ignores
.godot/
-game/bin/openvic2/*
+game/bin/openvic/*
.sconsign*.dblite
# Binaries
diff --git a/.gitmodules b/.gitmodules
index f8ea253..a0ac3b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
[submodule "godot-cpp"]
path = godot-cpp
url = https://github.com/godotengine/godot-cpp
-[submodule "extension/deps/OV2-compiler"]
- path = extension/deps/OV2-compiler
- url = https://github.com/OpenVic2Project/OV2-compiler
-[submodule "extension/deps/openvic2-simulation"]
- path = extension/deps/openvic2-simulation
- url = https://github.com/OpenVic2Project/OpenVic2-Simulation
+[submodule "extension/deps/OV-compiler"]
+ path = extension/deps/OV-compiler
+ url = https://github.com/OpenVicProject/OV-compiler
+[submodule "extension/deps/openvic-simulation"]
+ path = extension/deps/openvic-simulation
+ url = https://github.com/OpenVicProject/OpenVic-Simulation
diff --git a/README.md b/README.md
index b012e77..809f6a4 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ For detailed instructions, view the Contributor Quickstart Guide [here](docs/con
## Build/Run Instructions
1. Install [Godot 4.0.2](https://github.com/godotengine/godot/releases/tag/4.0.2-stable) and [scons](https://scons.org/) for your system.
2. Run the command `git submodule update --init --recursive` to retrieve all related submodules.
-3. Run `scons` in the project root, you should see a libopenvic2 file in `game/bin/openvic2`.
+3. Run `scons` in the project root, you should see a libopenvic file in `game/bin/openvic`.
4. Open with Godot 4, click import and navigate to the `game` directory.
5. Press "Import & Edit", wait for the Editor to finish re-importing assets, and then close the Editor ***without saving*** and reopen the project.
6. Once loaded, click the play button at the top right, and you should see and hear the game application open on the main menu.
@@ -27,8 +27,8 @@ For detailed instructions, view the Contributor Quickstart Guide [here](docs/con
* If you built with the default or debug target you must export with `Debug`.
* If you built with the release target you must export `Release`.
6. Files will be found in platform specific directories in `game/export`:
- * On Windows run `game/export/Windows/OpenVic2.exe`.
- * On Linux x86_64 run `game/export/Linux-x86_64/OpenVic2.sh`.
+ * On Windows run `game/export/Windows/OpenVic.exe`.
+ * On Linux x86_64 run `game/export/Linux-x86_64/OpenVic.sh`.
## Extension Debugging
1. If in a clean build, build the extension with `scons`.
diff --git a/SConstruct b/SConstruct
index 599c29e..51a2a24 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,7 +56,7 @@ def GlobRecursive(pattern, nodes=['.']):
# - LINKFLAGS are for linking flags
# tweak this if you want to use different folders, or more folders, to store your source code in.
-paths = ["extension/src/", "extension/deps/openvic2-simulation/src/"]
+paths = ["extension/src/", "extension/deps/openvic-simulation/src/"]
env.Append(CPPPATH=paths)
sources = GlobRecursive("*.cpp", paths)
@@ -83,7 +83,7 @@ if env["intermediate_delete"]:
if env["platform"] == "macos":
library = env.SharedLibrary(
- "game/bin/openvic2/libopenvic2.{}.{}.framework/libopenvic2.{}.{}".format(
+ "game/bin/openvic/libopenvic.{}.{}.framework/libopenvic.{}.{}".format(
env["platform"], env["target"], env["platform"], env["target"]
),
source=sources,
@@ -91,7 +91,7 @@ if env["platform"] == "macos":
else:
suffix = ".{}.{}.{}".format(env["platform"], env["target"], env["arch"])
library = env.SharedLibrary(
- "game/bin/openvic2/libopenvic2{}{}".format(suffix, env["SHLIBSUFFIX"]),
+ "game/bin/openvic/libopenvic{}{}".format(suffix, env["SHLIBSUFFIX"]),
source=sources,
)
diff --git a/docs/contribution-quickstart-guide.md b/docs/contribution-quickstart-guide.md
index ba4c947..48cd11a 100644
--- a/docs/contribution-quickstart-guide.md
+++ b/docs/contribution-quickstart-guide.md
@@ -50,17 +50,17 @@
# Project Setup
-1. [Go to the main repository](https://github.com/OpenVic2Project/OpenVic) page on Github
+1. [Go to the main repository](https://github.com/OpenVicProject/OpenVic) page on Github
2. Get the link to clone the repo
![](images/proj-setup/01-git-clone-link.png)
-3. Using Git, clone the repo: `git clone https://github.com/OpenVicProject/OpenVic.git`
+3. Using Git, clone the repo: `git clone https://github.com/OpenVicProject/OpenVic`
![](images/proj-setup/02-git-clone.png)
-4. Move into the OpenVic2 directory: `cd OpenVic`
+4. Move into the OpenVic directory: `cd OpenVic`
5. Retrieve submodules: `git submodule update --init --recursive`
@@ -114,4 +114,4 @@ Whenever you are ready to commit your changes follow this process:
4. Run `git push` to upload your current commits to your working branch
- If you're warned that your branch has no upstream branch, run `git push --set-upstream origin my-cool-branch`, replacing "`my-cool-branch`" with whatever your branch is named in [Part 6 of Project Setup](#project-setup)
-![](images/contribution/04-push.png) \ No newline at end of file
+![](images/contribution/04-push.png)
diff --git a/docs/project-file-structure.md b/docs/project-file-structure.md
index cf73b35..790ca76 100644
--- a/docs/project-file-structure.md
+++ b/docs/project-file-structure.md
@@ -34,10 +34,10 @@ All godot files are in the OpenVic/game directory
* asset - static file generally used as is within the project - art, music etc.
* data file - static file that holds data or information that needs to be processed to be used - economy good information, province names etc.
-### OpenVic2 File Extensions
+### OpenVic File Extensions
-* ov2d - OpenVic data file
-* ov2b - OpenVic binary file
+* ovd - OpenVic data file
+* ovb - OpenVic binary file
### When to use root/
@@ -180,9 +180,9 @@ root/common/technology/
root/common/pop/
```
-Data files that are plain text should have the ov2d file extension.
+Data files that are plain text should have the ovd file extension.
```
-root/common/pop/soldier.ov2d
+root/common/pop/soldier.ovd
```
Data files that are complex data like a bitmap should make use of the standard file extension for that data
@@ -192,7 +192,7 @@ root/common/map/provinces.bmp
Data files can be further organized by subdirectory.
```
-root/common/economy/goods/Coal.ov2d
+root/common/economy/goods/Coal.ovd
```
#### Naming Convention
diff --git a/docs/simulation/goods.md b/docs/simulation/goods.md
index f8204b0..7866041 100644
--- a/docs/simulation/goods.md
+++ b/docs/simulation/goods.md
@@ -1,8 +1,8 @@
-# OpenVic2 Goods
+# OpenVic Goods
## Victoria 2 Structure
-## OpenVic2 Structure
+## OpenVic Structure
```mermaid
classDiagram
diff --git a/docs/simulation/ideologies.md b/docs/simulation/ideologies.md
index 817bdb3..51e040c 100644
--- a/docs/simulation/ideologies.md
+++ b/docs/simulation/ideologies.md
@@ -1,8 +1,8 @@
-# OpenVic2 Ideologies
+# OpenVic Ideologies
## Victoria 2
-## OpenVic2
+## OpenVic
```mermaid
classDiagram
diff --git a/docs/simulation/provinces.md b/docs/simulation/provinces.md
index 642ff11..8ad0b25 100644
--- a/docs/simulation/provinces.md
+++ b/docs/simulation/provinces.md
@@ -1,6 +1,6 @@
-# OpenVic2 Provinces
+# OpenVic Provinces
-## OpenVic2 Structure
+## OpenVic Structure
```mermaid
classDiagram
diff --git a/docs/simulation/sim-doc-format.md b/docs/simulation/sim-doc-format.md
index 68bd905..f1d7d69 100644
--- a/docs/simulation/sim-doc-format.md
+++ b/docs/simulation/sim-doc-format.md
@@ -1,10 +1,10 @@
-# OpenVic2 <Document Name>
+# OpenVic <Document Name>
## Victoria 2 Structure
```UML DIAGRAM```
-## OpenVic2 Structure
+## OpenVic Structure
```UML DIAGRAM```
diff --git a/docs/styleguide-cpp.md b/docs/styleguide-cpp.md
index c48b5f6..83a2647 100644
--- a/docs/styleguide-cpp.md
+++ b/docs/styleguide-cpp.md
@@ -1,4 +1,4 @@
-# OpenVic2 C++ Style Guidelines
+# OpenVic C++ Style Guidelines
## Table of Contents
1. [Why Style?](styleguide-cpp.md#1-why-style)
@@ -298,22 +298,22 @@ Source code files should adhere to the following:
return true;
}
```
-- The include order should be: C++ standard headers, followed by Godot headers, then OpenVic2 headers
+- The include order should be: C++ standard headers, followed by Godot headers, then OpenVic headers
- C++ standard headers and Godot headers should be enclosed by angle brackets `<>`
- - OpenVic2 headers should be enclosed by double quotes `""`
+ - OpenVic headers should be enclosed by double quotes `""`
```c++
//Correct
#include <vector>
#include <string>
#include <godot_cpp/classes/object.hpp>
#include <godot_cpp/core/class_db.hpp>
- #include "openvic2/src/SampleHeader.hpp"
- #include "openvic2/src/SampleHeader2.hpp"
+ #include "openvic/src/SampleHeader.hpp"
+ #include "openvic/src/SampleHeader2.hpp"
//Incorrect
- #include "openvic2/src/SampleHeader.hpp"
+ #include "openvic/src/SampleHeader.hpp"
#include <godot_cpp/classes/object.hpp>
- #include "openvic2/src/SampleHeader2.hpp"
+ #include "openvic/src/SampleHeader2.hpp"
#include <godot_cpp/core/class_db.hpp>
#include <vector>
#include <string>
diff --git a/extension/deps/OV-compiler b/extension/deps/OV-compiler
new file mode 160000
+Subproject 65443efcc2f4c7d687b2bd9c631f6bb426688bb
diff --git a/extension/deps/OV2-compiler b/extension/deps/OV2-compiler
deleted file mode 160000
-Subproject 267d38aab922fa929c0ce649fad699a6468b6c3
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
new file mode 160000
+Subproject 15e960f93ced8c94a6a45ebb2b44d0705ff7f8f
diff --git a/extension/deps/openvic2-simulation b/extension/deps/openvic2-simulation
deleted file mode 160000
-Subproject 339e0278a2064f7eeb152fe8c5778840b609e9f
diff --git a/extension/src/Checksum.hpp b/extension/src/Checksum.hpp
index a0b1504..dc86d5b 100644
--- a/extension/src/Checksum.hpp
+++ b/extension/src/Checksum.hpp
@@ -2,7 +2,7 @@
#include <godot_cpp/core/class_db.hpp>
-namespace OpenVic2 {
+namespace OpenVic {
class Checksum : public godot::Object {
GDCLASS(Checksum, godot::Object)
diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp
index 882bfcf..e067517 100644
--- a/extension/src/GameSingleton.cpp
+++ b/extension/src/GameSingleton.cpp
@@ -4,10 +4,10 @@
#include <godot_cpp/classes/json.hpp>
#include <godot_cpp/variant/utility_functions.hpp>
-#include "openvic2/Logger.hpp"
+#include "openvic/Logger.hpp"
using namespace godot;
-using namespace OpenVic2;
+using namespace OpenVic;
#define ERR(x) ((x) == SUCCESS ? OK : FAILED)
diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp
index 8321972..99fe7bb 100644
--- a/extension/src/GameSingleton.hpp
+++ b/extension/src/GameSingleton.hpp
@@ -3,9 +3,9 @@
#include <godot_cpp/classes/image_texture.hpp>
#include <godot_cpp/classes/texture2d_array.hpp>
-#include "openvic2/GameManager.hpp"
+#include "openvic/GameManager.hpp"
-namespace OpenVic2 {
+namespace OpenVic {
struct TerrainVariant : HasIdentifier, HasColour {
private:
const godot::Ref<godot::Image> image;
diff --git a/extension/src/LoadLocalisation.cpp b/extension/src/LoadLocalisation.cpp
index 789a476..e80d996 100644
--- a/extension/src/LoadLocalisation.cpp
+++ b/extension/src/LoadLocalisation.cpp
@@ -6,7 +6,7 @@
#include <godot_cpp/variant/utility_functions.hpp>
using namespace godot;
-using namespace OpenVic2;
+using namespace OpenVic;
LoadLocalisation* LoadLocalisation::singleton = nullptr;
diff --git a/extension/src/LoadLocalisation.hpp b/extension/src/LoadLocalisation.hpp
index 49c0313..04ec5c7 100644
--- a/extension/src/LoadLocalisation.hpp
+++ b/extension/src/LoadLocalisation.hpp
@@ -2,7 +2,7 @@
#include <godot_cpp/classes/translation.hpp>
-namespace OpenVic2 {
+namespace OpenVic {
class LoadLocalisation : public godot::Object {
GDCLASS(LoadLocalisation, godot::Object)
diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp
index 84149b9..269360a 100644
--- a/extension/src/MapMesh.cpp
+++ b/extension/src/MapMesh.cpp
@@ -3,7 +3,7 @@
#include <godot_cpp/templates/vector.hpp>
using namespace godot;
-using namespace OpenVic2;
+using namespace OpenVic;
void MapMesh::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_aspect_ratio", "ratio"), &MapMesh::set_aspect_ratio);
diff --git a/extension/src/MapMesh.hpp b/extension/src/MapMesh.hpp
index 89c0147..38b208c 100644
--- a/extension/src/MapMesh.hpp
+++ b/extension/src/MapMesh.hpp
@@ -2,7 +2,7 @@
#include <godot_cpp/classes/primitive_mesh.hpp>
-namespace OpenVic2 {
+namespace OpenVic {
class MapMesh : public godot::PrimitiveMesh {
GDCLASS(MapMesh, godot::PrimitiveMesh)
diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp
index 8ef89ec..3283418 100644
--- a/extension/src/register_types.cpp
+++ b/extension/src/register_types.cpp
@@ -8,13 +8,13 @@
#include "MapMesh.hpp"
using namespace godot;
-using namespace OpenVic2;
+using namespace OpenVic;
static Checksum* _checksum;
static LoadLocalisation* _load_localisation;
static GameSingleton* _map_singleton;
-void initialize_openvic2_types(ModuleInitializationLevel p_level) {
+void initialize_openvic_types(ModuleInitializationLevel p_level) {
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
return;
}
@@ -34,7 +34,7 @@ void initialize_openvic2_types(ModuleInitializationLevel p_level) {
ClassDB::register_class<MapMesh>();
}
-void uninitialize_openvic2_types(ModuleInitializationLevel p_level) {
+void uninitialize_openvic_types(ModuleInitializationLevel p_level) {
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
return;
}
@@ -51,11 +51,11 @@ void uninitialize_openvic2_types(ModuleInitializationLevel p_level) {
extern "C" {
// Initialization.
- GDExtensionBool GDE_EXPORT openvic2_library_init(GDExtensionInterface const* p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) {
+ GDExtensionBool GDE_EXPORT openvic_library_init(GDExtensionInterface const* p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) {
GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
- init_obj.register_initializer(initialize_openvic2_types);
- init_obj.register_terminator(uninitialize_openvic2_types);
+ init_obj.register_initializer(initialize_openvic_types);
+ init_obj.register_terminator(uninitialize_openvic_types);
init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE);
return init_obj.init();
diff --git a/extension/src/register_types.h b/extension/src/register_types.h
index 1bc96f8..cd20e8d 100644
--- a/extension/src/register_types.h
+++ b/extension/src/register_types.h
@@ -2,5 +2,5 @@
#include <godot_cpp/godot.hpp>
-void initialize_openvic2_types(godot::ModuleInitializationLevel);
-void uninitialize_openvic2_types(godot::ModuleInitializationLevel); \ No newline at end of file
+void initialize_openvic_types(godot::ModuleInitializationLevel);
+void uninitialize_openvic_types(godot::ModuleInitializationLevel); \ No newline at end of file
diff --git a/game/addons/openvic2-plugin/ReleaseExportEditorPlugin.gd b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd
index 4e03788..ac6c5bc 100644
--- a/game/addons/openvic2-plugin/ReleaseExportEditorPlugin.gd
+++ b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd
@@ -6,7 +6,7 @@ var _repo_tag : StringName = "<tag missing>"
var _repo_release_name : StringName = "<release name missing>"
func _get_name():
- return "OpenVic2-ReleaseExportEditorPlugin"
+ return "OpenVic-ReleaseExportEditorPlugin"
func _export_file(path: String, type: String, features: PackedStringArray) -> void:
if path != "res://src/Utility/GIT_INFO.gd": return
@@ -29,7 +29,7 @@ var _cached_hash : StringName = &""
func _get_commit_hash() -> StringName:
if not _cached_hash.is_empty(): return _cached_hash
- var git_hash := OS.get_environment("OPENVIC2_COMMIT")
+ var git_hash := OS.get_environment("OPENVIC_COMMIT")
if not git_hash.is_empty():
_cached_hash = git_hash
return git_hash
@@ -69,7 +69,7 @@ func _get_commit_hash() -> StringName:
return git_hash
func _try_get_tag() -> StringName:
- var result : StringName = OS.get_environment("OPENVIC2_TAG")
+ var result : StringName = OS.get_environment("OPENVIC_TAG")
if result.is_empty():
var git_output := []
if OS.execute("git", ["describe", "--tags", "--abbrev=0"], git_output) == -1:
@@ -97,7 +97,7 @@ func _get_tag():
print("Tag: " + _repo_tag)
func _get_release_name():
- var result : StringName = OS.get_environment("OPENVIC2_RELEASE")
+ var result : StringName = OS.get_environment("OPENVIC_RELEASE")
if result.is_empty():
result = _try_get_tag()
if not result.is_empty():
diff --git a/game/addons/openvic2-plugin/openvic2-plugin.gd b/game/addons/openvic-plugin/openvic-plugin.gd
index 8cfa4e8..dec0312 100644
--- a/game/addons/openvic2-plugin/openvic2-plugin.gd
+++ b/game/addons/openvic-plugin/openvic-plugin.gd
@@ -1,7 +1,7 @@
@tool
extends EditorPlugin
-const ReleaseExportEditorPlugin := preload("res://addons/openvic2-plugin/ReleaseExportEditorPlugin.gd")
+const ReleaseExportEditorPlugin := preload("res://addons/openvic-plugin/ReleaseExportEditorPlugin.gd")
var release_export_editor_plugin := ReleaseExportEditorPlugin.new()
func _enter_tree() -> void:
diff --git a/game/addons/openvic-plugin/plugin.cfg b/game/addons/openvic-plugin/plugin.cfg
new file mode 100644
index 0000000..ee8ef07
--- /dev/null
+++ b/game/addons/openvic-plugin/plugin.cfg
@@ -0,0 +1,7 @@
+[plugin]
+
+name="OpenVicPlugin"
+description=""
+author=""
+version=""
+script="openvic-plugin.gd"
diff --git a/game/addons/openvic2-plugin/plugin.cfg b/game/addons/openvic2-plugin/plugin.cfg
deleted file mode 100644
index b3e5611..0000000
--- a/game/addons/openvic2-plugin/plugin.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[plugin]
-
-name="OpenVic2Plugin"
-description=""
-author=""
-version=""
-script="openvic2-plugin.gd"
diff --git a/game/bin/openvic.gdextension b/game/bin/openvic.gdextension
new file mode 100644
index 0000000..574394c
--- /dev/null
+++ b/game/bin/openvic.gdextension
@@ -0,0 +1,14 @@
+[configuration]
+
+entry_symbol = "openvic_library_init"
+
+[libraries]
+
+linux.x86_64.debug = "res://bin/openvic/libopenvic.linux.template_debug.x86_64.so"
+linux.x86_64.release = "res://bin/openvic/libopenvic.linux.template_release.x86_64.so"
+linux.debug.arm64 = "res://bin/openvic/libopenvic.linux.template_debug.arm64.so"
+linux.release.arm64 = "res://bin/openvic/libopenvic.linux.template_release.arm64.so"
+windows.x86_64.debug = "res://bin/openvic/libopenvic.windows.template_debug.x86_64.dll"
+windows.x86_64.release = "res://bin/openvic/libopenvic.windows.template_release.x86_64.dll"
+macos.debug = "res://bin/openvic/libopenvic.macos.template_debug.framework"
+macos.release = "res://bin/openvic/libopenvic.macos.template_release.framework"
diff --git a/game/bin/openvic2.gdextension b/game/bin/openvic2.gdextension
deleted file mode 100644
index 0a12191..0000000
--- a/game/bin/openvic2.gdextension
+++ /dev/null
@@ -1,14 +0,0 @@
-[configuration]
-
-entry_symbol = "openvic2_library_init"
-
-[libraries]
-
-linux.x86_64.debug = "res://bin/openvic2/libopenvic2.linux.template_debug.x86_64.so"
-linux.x86_64.release = "res://bin/openvic2/libopenvic2.linux.template_release.x86_64.so"
-linux.debug.arm64 = "res://bin/openvic2/libopenvic2.linux.template_debug.arm64.so"
-linux.release.arm64 = "res://bin/openvic2/libopenvic2.linux.template_release.arm64.so"
-windows.x86_64.debug = "res://bin/openvic2/libopenvic2.windows.template_debug.x86_64.dll"
-windows.x86_64.release = "res://bin/openvic2/libopenvic2.windows.template_release.x86_64.dll"
-macos.debug = "res://bin/openvic2/libopenvic2.macos.template_debug.framework"
-macos.release = "res://bin/openvic2/libopenvic2.macos.template_release.framework"
diff --git a/game/common/credits.csv b/game/common/credits.csv
index 2500efe..c5cd021 100644
--- a/game/common/credits.csv
+++ b/game/common/credits.csv
@@ -1,4 +1,4 @@
-Title,OpenVic2
+Title,OpenVic
Project Lead,FakeByte
Project Lead,joethepro36
Project Lead,Catylist
diff --git a/game/export_presets.cfg b/game/export_presets.cfg
index 4a031ea..8c90602 100644
--- a/game/export_presets.cfg
+++ b/game/export_presets.cfg
@@ -8,7 +8,7 @@ custom_features=""
export_filter="all_resources"
include_filter="common/*"
exclude_filter=""
-export_path="export/Linux-x86_64/OpenVic2.x86_64"
+export_path="export/Linux-x86_64/OpenVic.x86_64"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@@ -49,7 +49,7 @@ custom_features=""
export_filter="all_resources"
include_filter="common/*"
exclude_filter=""
-export_path="export/Windows/OpenVic2.exe"
+export_path="export/Windows/OpenVic.exe"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@@ -115,7 +115,7 @@ custom_features=""
export_filter="all_resources"
include_filter="common/*"
exclude_filter=""
-export_path="export/MacOS/OpenVic2.app"
+export_path="export/MacOS/OpenVic.app"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
@@ -130,7 +130,7 @@ custom_template/release=""
debug/export_console_script=1
application/icon=""
application/icon_interpolation=4
-application/bundle_identifier="com.openvic2.openvic2"
+application/bundle_identifier="com.openvic.openvic"
application/signature=""
application/app_category="Games"
application/short_version="0.1"
diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv
index fe11e0c..97946de 100644
--- a/game/localisation/en_GB/menus.csv
+++ b/game/localisation/en_GB/menus.csv
@@ -1,6 +1,6 @@
,, Main Menu
-MAINMENU_TITLE,OpenVic2
+MAINMENU_TITLE,OpenVic
MAINMENU_NEW_GAME,New Game
MAINMENU_CONTINUE,Continue
MAINMENU_MULTIPLAYER,Multiplayer
diff --git a/game/localisation/en_US/menus.csv b/game/localisation/en_US/menus.csv
index c69d36b..01047dc 100644
--- a/game/localisation/en_US/menus.csv
+++ b/game/localisation/en_US/menus.csv
@@ -1,6 +1,6 @@
,, Main Menu
-MAINMENU_TITLE,OpenVic2
+MAINMENU_TITLE,OpenVic
MAINMENU_NEW_GAME,New Game
MAINMENU_CONTINUE,Continue
MAINMENU_MULTIPLAYER,Multiplayer
diff --git a/game/localisation/fr_FR/menus.csv b/game/localisation/fr_FR/menus.csv
index 2e395f7..034d843 100644
--- a/game/localisation/fr_FR/menus.csv
+++ b/game/localisation/fr_FR/menus.csv
@@ -1,6 +1,6 @@
,, Main Menu
-MAINMENU_TITLE,OpenVic2
+MAINMENU_TITLE,OpenVic
MAINMENU_NEW_GAME,Nouveau Jeu
MAINMENU_CONTINUE,Continuer
MAINMENU_MULTIPLAYER,Multijouer
diff --git a/game/project.godot b/game/project.godot
index f0b3e36..441001d 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -10,7 +10,7 @@ config_version=5
[application]
-config/name="OpenVic2"
+config/name="OpenVic"
config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines."
run/main_scene="res://src/GameStart.tscn"
config/features=PackedStringArray("4.0", "Forward Plus")
@@ -40,7 +40,7 @@ window/stretch/aspect="ignore"
[editor_plugins]
-enabled=PackedStringArray("res://addons/keychain/plugin.cfg", "res://addons/openvic2-plugin/plugin.cfg")
+enabled=PackedStringArray("res://addons/keychain/plugin.cfg", "res://addons/openvic-plugin/plugin.cfg")
[gui]
@@ -110,7 +110,7 @@ locale/localisation_path="res://localisation"
limits/message_queue/max_size_kb=16384
-[openvic2]
+[openvic]
settings/settings_file_path="user://settings.cfg"
data/saves_directory="user://saves"
diff --git a/game/src/ArgumentParser.gd b/game/src/ArgumentParser.gd
index 3f77919..f1ee371 100644
--- a/game/src/ArgumentParser.gd
+++ b/game/src/ArgumentParser.gd
@@ -1,7 +1,7 @@
@tool
extends Node
-const argument_setting_path := &"openvic2/data/arguments"
+const argument_setting_path := &"openvic/data/arguments"
@export var option_array : Array[ArgumentOption] = [
ArgumentOption.new(
@@ -215,7 +215,7 @@ func _print_help():
var project_name : StringName = ProjectSettings.get_setting_with_override(&"application/config/name")
var project_version : String = _GIT_INFO_.tag
var project_hash : String = _GIT_INFO_.short_hash
- var project_website : String = "https://openvic2.com"
+ var project_website : String = "https://openvic.com"
var project_description : String = ProjectSettings.get_setting_with_override(&"application/config/description")
print_rich(
"""
diff --git a/game/src/Autoload/Events/GameDebug.gd b/game/src/Autoload/Events/GameDebug.gd
index 4e8931f..df7a23a 100644
--- a/game/src/Autoload/Events/GameDebug.gd
+++ b/game/src/Autoload/Events/GameDebug.gd
@@ -14,8 +14,8 @@ func _init():
set_debug_mode(true)
func set_debug_mode(value : bool) -> void:
- ProjectSettings.set_setting("openvic2/debug/enabled", value)
+ ProjectSettings.set_setting("openvic/debug/enabled", value)
print("Set debug mode to: ", value)
func is_debug_mode() -> bool:
- return ProjectSettings.get_setting("openvic2/debug/enabled", false)
+ return ProjectSettings.get_setting("openvic/debug/enabled", false)
diff --git a/game/src/Autoload/Events/Options.gd b/game/src/Autoload/Events/Options.gd
index 6b9e089..fbeccef 100644
--- a/game/src/Autoload/Events/Options.gd
+++ b/game/src/Autoload/Events/Options.gd
@@ -16,7 +16,7 @@ func save_settings_to_file() -> void:
func try_reset_settings() -> void:
reset_settings.emit()
-const settings_file_path_setting : String = "openvic2/settings/settings_file_path"
+const settings_file_path_setting : String = "openvic/settings/settings_file_path"
const settings_file_path_default : String = "user://settings.cfg"
var _settings_file_path : String = ProjectSettings.get_setting(settings_file_path_setting, settings_file_path_default)
diff --git a/game/src/Autoload/SaveManager.gd b/game/src/Autoload/SaveManager.gd
index c653b2c..fb7806b 100644
--- a/game/src/Autoload/SaveManager.gd
+++ b/game/src/Autoload/SaveManager.gd
@@ -2,7 +2,7 @@ extends Node
# Requirements
# * FS-28
-const save_directory_setting := &"openvic2/data/saves_directory"
+const save_directory_setting := &"openvic/data/saves_directory"
var current_save : SaveResource
var current_session_tag : StringName
diff --git a/game/src/CreditsMenu/CreditsMenu.gd b/game/src/CreditsMenu/CreditsMenu.gd
index 0e9df6b..0db4d7d 100644
--- a/game/src/CreditsMenu/CreditsMenu.gd
+++ b/game/src/CreditsMenu/CreditsMenu.gd
@@ -169,7 +169,7 @@ func _add_licenses() -> void:
license_list.add_child(HSeparator.new())
var license_info := {
- "OpenVic2": ["GPLv3", "https://github.com/OpenVic2Project/OpenVic2/blob/main/LICENSE.md"],
+ "OpenVic": ["GPLv3", "https://github.com/OpenVicProject/OpenVic/blob/main/LICENSE.md"],
"Godot": ["MIT", "https://github.com/godotengine/godot/blob/master/LICENSE.txt"],
"FreeType": ["FreeType License", "https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT"],
"ENet": ["MIT", "http://enet.bespin.org/License.html"],
diff --git a/game/src/Utility/GIT_INFO.gd b/game/src/Utility/GIT_INFO.gd
index dc02349..eddb7a1 100644
--- a/game/src/Utility/GIT_INFO.gd
+++ b/game/src/Utility/GIT_INFO.gd
@@ -1,4 +1,4 @@
-### IMPORTANT: IF LOCATION IS CHANGED, PLEASE UPDATE IN addon/openvic2-plugin/ReleaseExportEditorPlugin
+### IMPORTANT: IF LOCATION IS CHANGED, PLEASE UPDATE IN addon/openvic-plugin/ReleaseExportEditorPlugin
class_name _GIT_INFO_
extends RefCounted