Relintai/world_generator
1
0
Fork 0
mirror of https://github.com/Relintai/world_generator.git synced 2025-02-20 17:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced target script and target class names with proper classes.

Browse Source
This commit is contained in:
Relintai 2020-07-10 02:37:40 +02:00
parent 44add0a26e
commit 9a4f9f9809
8 changed files with 52 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
data/biome_data.cpp
View File

@ -24,18 +24,13 @@ SOFTWARE.
#include "core/version.h"
String BiomeData::get_target_class_name() {
return _target_class_name;
}
void BiomeData::set_target_class_name(String name) {
_target_class_name = name;
}
#include "../main/biome.h"
Ref<Script> BiomeData::get_target_script() {
return _target_script;
Ref<Biome> BiomeData::get_biome() {
return _biome;
}
void BiomeData::set_target_script(Ref<Script> script) {
_target_script = script;
void BiomeData::set_biome(const Ref<Biome> &biome) {
_biome = biome;
}
Vector2 BiomeData::get_level_range() {
@ -303,13 +298,9 @@ BiomeData::~BiomeData() {
}
void BiomeData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_target_class_name"), &BiomeData::get_target_class_name);
ClassDB::bind_method(D_METHOD("set_target_class_name", "value"), &BiomeData::set_target_class_name);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "target_class_name"), "set_target_class_name", "get_target_class_name");
ClassDB::bind_method(D_METHOD("get_target_script"), &BiomeData::get_target_script);
ClassDB::bind_method(D_METHOD("set_target_script", "value"), &BiomeData::set_target_script);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target_script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), "set_target_script", "get_target_script");
ClassDB::bind_method(D_METHOD("get_biome"), &BiomeData::get_biome);
ClassDB::bind_method(D_METHOD("set_biome", "value"), &BiomeData::set_biome);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "biome", PROPERTY_HINT_RESOURCE_TYPE, "Biome"), "set_biome", "get_biome");
ClassDB::bind_method(D_METHOD("get_level_range"), &BiomeData::get_level_range);
ClassDB::bind_method(D_METHOD("set_level_range", "value"), &BiomeData::set_level_range);

12
data/biome_data.h
View File

@ -42,15 +42,14 @@ SOFTWARE.
#include "../../entity_spell_system/entities/data/entity_data.h"
#endif
class Biome;
class BiomeData : public Resource {
GDCLASS(BiomeData, Resource);
public:
String get_target_class_name();
void set_target_class_name(String name);
Ref<Script> get_target_script();
void set_target_script(Ref<Script> script);
Ref<Biome> get_biome();
void set_biome(const Ref<Biome> &biome);
Vector2 get_level_range();
void set_level_range(Vector2 value);
@ -123,8 +122,7 @@ protected:
static void _bind_methods();
private:
String _target_class_name;
Ref<Script> _target_script;
Ref<Biome> _biome;
Vector2 _level_range;

25
data/dungeon_data.cpp
View File

@ -24,18 +24,13 @@ SOFTWARE.
#include "core/version.h"
String DungeonData::get_target_class_name() {
return _target_class_name;
}
void DungeonData::set_target_class_name(String name) {
_target_class_name = name;
}
#include "../main/dungeon.h"
Ref<Script> DungeonData::get_target_script() {
return _target_script;
Ref<Dungeon> DungeonData::get_dungeon() {
return _dungeon;
}
void DungeonData::set_target_script(Ref<Script> script) {
_target_script = script;
void DungeonData::set_dungeon(const Ref<Dungeon> &dungeon) {
_dungeon = dungeon;
}
Vector2 DungeonData::get_level_range() {
@ -446,13 +441,9 @@ DungeonData::~DungeonData() {
}
void DungeonData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_target_class_name"), &DungeonData::get_target_class_name);
ClassDB::bind_method(D_METHOD("set_target_class_name", "value"), &DungeonData::set_target_class_name);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "target_class_name"), "set_target_class_name", "get_target_class_name");
ClassDB::bind_method(D_METHOD("get_target_script"), &DungeonData::get_target_script);
ClassDB::bind_method(D_METHOD("set_target_script", "value"), &DungeonData::set_target_script);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target_script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), "set_target_script", "get_target_script");
ClassDB::bind_method(D_METHOD("get_dungeon"), &DungeonData::get_dungeon);
ClassDB::bind_method(D_METHOD("set_dungeon", "value"), &DungeonData::set_dungeon);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dungeon", PROPERTY_HINT_RESOURCE_TYPE, "Dungeon"), "set_dungeon", "get_dungeon");
ClassDB::bind_method(D_METHOD("get_level_range"), &DungeonData::get_level_range);
ClassDB::bind_method(D_METHOD("set_level_range", "value"), &DungeonData::set_level_range);

11
data/dungeon_data.h
View File

@ -41,15 +41,14 @@ SOFTWARE.
#include "../../entity_spell_system/entities/data/entity_data.h"
#endif
class Dungeon;
class DungeonData : public Resource {
GDCLASS(DungeonData, Resource);
public:
String get_target_class_name();
void set_target_class_name(String name);
Ref<Script> get_target_script();
void set_target_script(Ref<Script> script);
Ref<Dungeon> get_dungeon();
void set_dungeon(const Ref<Dungeon> &dungeon);
Vector2 get_level_range();
void set_level_range(Vector2 value);
@ -166,7 +165,7 @@ protected:
private:
String _target_class_name;
Ref<Script> _target_script;
Ref<Dungeon> _dungeon;
Vector2 _level_range;

25
data/dungeon_room_data.cpp
View File

@ -24,18 +24,11 @@ SOFTWARE.
#include "core/version.h"
String DungeonRoomData::get_target_class_name() {
return _target_class_name;
Ref<DungeonRoom> DungeonRoomData::get_dungeon_room() {
return _dungeon_room;
}
void DungeonRoomData::set_target_class_name(String name) {
_target_class_name = name;
}
Ref<Script> DungeonRoomData::get_target_script() {
return _target_script;
}
void DungeonRoomData::set_target_script(Ref<Script> script) {
_target_script = script;
void DungeonRoomData::set_dungeon_room(const Ref<DungeonRoom> &room) {
_dungeon_room = room;
}
Vector2 DungeonRoomData::get_level_range() {
@ -292,13 +285,9 @@ DungeonRoomData::~DungeonRoomData() {
}
void DungeonRoomData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_target_class_name"), &DungeonRoomData::get_target_class_name);
ClassDB::bind_method(D_METHOD("set_target_class_name", "value"), &DungeonRoomData::set_target_class_name);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "target_class_name"), "set_target_class_name", "get_target_class_name");
ClassDB::bind_method(D_METHOD("get_target_script"), &DungeonRoomData::get_target_script);
ClassDB::bind_method(D_METHOD("set_target_script", "value"), &DungeonRoomData::set_target_script);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target_script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), "set_target_script", "get_target_script");
ClassDB::bind_method(D_METHOD("get_dungeon_room"), &DungeonRoomData::get_dungeon_room);
ClassDB::bind_method(D_METHOD("set_dungeon_room", "value"), &DungeonRoomData::set_dungeon_room);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dungeon_room", PROPERTY_HINT_RESOURCE_TYPE, "DungeonRoom"), "set_dungeon_room", "get_dungeon_room");
ClassDB::bind_method(D_METHOD("get_level_range"), &DungeonRoomData::get_level_range);
ClassDB::bind_method(D_METHOD("set_level_range", "value"), &DungeonRoomData::set_level_range);

11
data/dungeon_room_data.h
View File

@ -39,15 +39,14 @@ SOFTWARE.
#include "../../voxelman/world/environment_data.h"
#endif
class DungeonRoom;
class DungeonRoomData : public Resource {
GDCLASS(DungeonRoomData, Resource);
public:
String get_target_class_name();
void set_target_class_name(String name);
Ref<Script> get_target_script();
void set_target_script(Ref<Script> script);
Ref<DungeonRoom> get_dungeon_room();
void set_dungeon_room(const Ref<DungeonRoom> &room);
Vector2 get_level_range();
void set_level_range(Vector2 value);
@ -129,7 +128,7 @@ protected:
private:
String _target_class_name;
Ref<Script> _target_script;
Ref<DungeonRoom> _dungeon_room;
Vector2 _level_range;

27
data/planet_data.cpp
View File

@ -24,6 +24,8 @@ SOFTWARE.
#include "core/version.h"
#include "../main/planet.h"
int PlanetData::get_id() const {
return _id;
}
@ -31,18 +33,11 @@ void PlanetData::set_id(const int value) {
_id = value;
}
String PlanetData::get_target_class_name() {
return _target_class_name;
Ref<Planet> PlanetData::get_planet() {
return _planet;
}
void PlanetData::set_target_class_name(String name) {
_target_class_name = name;
}
Ref<Script> PlanetData::get_target_script() {
return _target_script;
}
void PlanetData::set_target_script(Ref<Script> script) {
_target_script = script;
void PlanetData::set_planet(const Ref<Planet> &planet) {
_planet = planet;
}
Vector2 PlanetData::get_level_range() {
@ -223,13 +218,9 @@ void PlanetData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_id", "value"), &PlanetData::set_id);
ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
ClassDB::bind_method(D_METHOD("get_target_class_name"), &PlanetData::get_target_class_name);
ClassDB::bind_method(D_METHOD("set_target_class_name", "value"), &PlanetData::set_target_class_name);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "target_class_name"), "set_target_class_name", "get_target_class_name");
ClassDB::bind_method(D_METHOD("get_target_script"), &PlanetData::get_target_script);
ClassDB::bind_method(D_METHOD("set_target_script", "value"), &PlanetData::set_target_script);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target_script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), "set_target_script", "get_target_script");
ClassDB::bind_method(D_METHOD("get_planet"), &PlanetData::get_planet);
ClassDB::bind_method(D_METHOD("set_planet", "value"), &PlanetData::set_planet);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "planet", PROPERTY_HINT_RESOURCE_TYPE, "Planet"), "set_planet", "get_planet");
ClassDB::bind_method(D_METHOD("get_level_range"), &PlanetData::get_level_range);
ClassDB::bind_method(D_METHOD("set_level_range", "value"), &PlanetData::set_level_range);

11
data/planet_data.h
View File

@ -39,6 +39,8 @@ SOFTWARE.
#include "../../voxelman/world/environment_data.h"
#endif
class Planet;
class PlanetData : public Resource {
GDCLASS(PlanetData, Resource);
@ -46,11 +48,8 @@ public:
int get_id() const;
void set_id(const int value);
String get_target_class_name();
void set_target_class_name(String name);
Ref<Script> get_target_script();
void set_target_script(Ref<Script> script);
Ref<Planet> get_planet();
void set_planet(const Ref<Planet> &planet);
Vector2 get_level_range();
void set_level_range(Vector2 value);
@ -106,7 +105,7 @@ private:
int _id;
String _target_class_name;
Ref<Script> _target_script;
Ref<Planet> _planet;
Vector2 _level_range;