1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
10 changed files with 35 additions and 19 deletions
Showing only changes of commit 9d1d0af70a - Show all commits

View file

@ -177,10 +177,9 @@ add_executable(MassBuilderSaveTool
GameObjects/Mass_Weapons.cpp GameObjects/Mass_Weapons.cpp
GameObjects/Mass_Styles.cpp GameObjects/Mass_Styles.cpp
GameObjects/Mass_DecalsAccessories.cpp GameObjects/Mass_DecalsAccessories.cpp
GameObjects/MassPropertyNames.h GameObjects/PropertyNames.h
GameObjects/Profile.h GameObjects/Profile.h
GameObjects/Profile.cpp GameObjects/Profile.cpp
GameObjects/ProfilePropertyNames.h
GameObjects/Weapon.h GameObjects/Weapon.h
GameObjects/Weapon.cpp GameObjects/Weapon.cpp
GameObjects/WeaponPart.h GameObjects/WeaponPart.h

View file

@ -21,7 +21,7 @@
#include <Corrade/Containers/ScopeGuard.h> #include <Corrade/Containers/ScopeGuard.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"

View file

@ -16,7 +16,7 @@
#include <algorithm> #include <algorithm>
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ByteProperty.h" #include "../Gvas/Types/ByteProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "MassPropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"

View file

@ -19,7 +19,7 @@
#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Pair.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include "ProfilePropertyNames.h" #include "PropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ResourceItemValue.h" #include "../Gvas/Types/ResourceItemValue.h"

View file

@ -1,10 +0,0 @@
#pragma once
#define PROFILE_NAME "CompanyName"
#define PROFILE_ACTIVE_FRAME_SLOT "ActiveFrameSlot"
#define PROFILE_CREDITS "Credit"
#define PROFILE_STORY_PROGRESS "StoryProgress"
#define PROFILE_LAST_MISSION_ID "LastMissionID"
#define PROFILE_MATERIAL "ResourceMaterial"
#define PROFILE_QUARK_DATA "ResourceQuarkData"
#define PROFILE_ACCOUNT "Account"

View file

@ -1,5 +1,32 @@
#pragma once #pragma once
// MassBuilderSaveTool
// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
// Profile stuff
#define PROFILE_NAME "CompanyName"
#define PROFILE_ACTIVE_FRAME_SLOT "ActiveFrameSlot"
#define PROFILE_CREDITS "Credit"
#define PROFILE_STORY_PROGRESS "StoryProgress"
#define PROFILE_LAST_MISSION_ID "LastMissionID"
#define PROFILE_MATERIAL "ResourceMaterial"
#define PROFILE_QUARK_DATA "ResourceQuarkData"
#define PROFILE_ACCOUNT "Account"
// Basic MASS stuff
#define MASS_UNIT_DATA "UnitData" #define MASS_UNIT_DATA "UnitData"
#define MASS_NAME "Name_45_A037C5D54E53456407BDF091344529BB" #define MASS_NAME "Name_45_A037C5D54E53456407BDF091344529BB"
#define MASS_ACCOUNT "Account" #define MASS_ACCOUNT "Account"