From 5589b4f409c2ce21688d259322a12303e87d6f89 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 21 Feb 2021 19:35:23 +0100 Subject: [PATCH] Update a few class names. --- game/modules/planets/test_planet/1_tdungeon.tres | 4 ++-- game/modules/planets/test_planet/biomes/1_test.tres | 2 +- game/modules/planets/test_planet/biomes/2_tdungb.tres | 4 ++-- game/modules/planets/test_planet/dungeon_rooms/1_test.tres | 2 +- .../planets/test_planet/dungeon_rooms/2_test_start_room.tres | 2 +- game/modules/planets/test_planet/dungeons/1_test.tres | 4 ++-- game/modules/planets/test_planet/dungeons/dungeon.gd | 2 +- .../modules/planets/test_planet/planets/dung_simple_planet.gd | 4 ++-- game/modules/planets/test_planet/planets/simple_planet.gd | 2 +- game/scripts/world_generators/MainPlanetGenerator.gd | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/game/modules/planets/test_planet/1_tdungeon.tres b/game/modules/planets/test_planet/1_tdungeon.tres index 24f1d85..7c2fbe2 100644 --- a/game/modules/planets/test_planet/1_tdungeon.tres +++ b/game/modules/planets/test_planet/1_tdungeon.tres @@ -1,6 +1,6 @@ -[gd_resource type="PlanetData" load_steps=3 format=2] +[gd_resource type="Planet" load_steps=3 format=2] -[ext_resource path="res://modules/planets/test_planet/biomes/2_tdungb.tres" type="BiomeData" id=1] +[ext_resource path="res://modules/planets/test_planet/biomes/2_tdungb.tres" type="Biome" id=1] [ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=2] diff --git a/game/modules/planets/test_planet/biomes/1_test.tres b/game/modules/planets/test_planet/biomes/1_test.tres index fe3671e..a311bdc 100644 --- a/game/modules/planets/test_planet/biomes/1_test.tres +++ b/game/modules/planets/test_planet/biomes/1_test.tres @@ -1,4 +1,4 @@ -[gd_resource type="BiomeData" load_steps=2 format=2] +[gd_resource type="Biome" load_steps=2 format=2] [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=1] diff --git a/game/modules/planets/test_planet/biomes/2_tdungb.tres b/game/modules/planets/test_planet/biomes/2_tdungb.tres index df1078e..9bfe39f 100644 --- a/game/modules/planets/test_planet/biomes/2_tdungb.tres +++ b/game/modules/planets/test_planet/biomes/2_tdungb.tres @@ -1,6 +1,6 @@ -[gd_resource type="BiomeData" load_steps=3 format=2] +[gd_resource type="Biome" load_steps=3 format=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/1_test.tres" type="DungeonData" id=1] +[ext_resource path="res://modules/planets/test_planet/dungeons/1_test.tres" type="Dungeon" id=1] [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=2] diff --git a/game/modules/planets/test_planet/dungeon_rooms/1_test.tres b/game/modules/planets/test_planet/dungeon_rooms/1_test.tres index 816db79..5ab3243 100644 --- a/game/modules/planets/test_planet/dungeon_rooms/1_test.tres +++ b/game/modules/planets/test_planet/dungeon_rooms/1_test.tres @@ -1,3 +1,3 @@ -[gd_resource type="DungeonRoomData" format=2] +[gd_resource type="DungeonRoom" format=2] [resource] diff --git a/game/modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres b/game/modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres index a7730a2..b030469 100644 --- a/game/modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres +++ b/game/modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres @@ -1,4 +1,4 @@ -[gd_resource type="DungeonRoomData" load_steps=2 format=2] +[gd_resource type="DungeonRoom" load_steps=2 format=2] [ext_resource path="res://modules/planets/test_planet/dungeon_start_rooms/start_room.gd" type="Script" id=1] diff --git a/game/modules/planets/test_planet/dungeons/1_test.tres b/game/modules/planets/test_planet/dungeons/1_test.tres index 6a2bcc0..d64c63e 100644 --- a/game/modules/planets/test_planet/dungeons/1_test.tres +++ b/game/modules/planets/test_planet/dungeons/1_test.tres @@ -1,7 +1,7 @@ -[gd_resource type="DungeonData" load_steps=3 format=2] +[gd_resource type="Dungeon" load_steps=3 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] -[ext_resource path="res://modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres" type="DungeonRoomData" id=2] +[ext_resource path="res://modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres" type="DungeonRoom" id=2] [resource] diff --git a/game/modules/planets/test_planet/dungeons/dungeon.gd b/game/modules/planets/test_planet/dungeons/dungeon.gd index 0abf5f1..9138244 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon.gd +++ b/game/modules/planets/test_planet/dungeons/dungeon.gd @@ -25,7 +25,7 @@ func _setup(): if data.get_dungeon_start_room_data_count() == 0: return - var drd : DungeonRoomData = data.get_dungeon_start_room_data(0) + var drd : DungeonRoom = data.get_dungeon_start_room_data(0) var dung : DungeonRoom if drd.target_script != null: diff --git a/game/modules/planets/test_planet/planets/dung_simple_planet.gd b/game/modules/planets/test_planet/planets/dung_simple_planet.gd index f2d9332..161d864 100644 --- a/game/modules/planets/test_planet/planets/dung_simple_planet.gd +++ b/game/modules/planets/test_planet/planets/dung_simple_planet.gd @@ -28,7 +28,7 @@ func _setup(): if data.get_biome_data_count() == 0: return - var bdata : BiomeData = data.get_biome_data(0) + var bdata : Biome = data.get_biome_data(0) var b : Biome @@ -55,7 +55,7 @@ func _setup(): if bdata.get_dungeon_data_count() == 0: return - var dd : DungeonData = bdata.get_dungeon_data(0) + var dd : Dungeon = bdata.get_dungeon_data(0) var dung : Dungeon if dd.target_script != null: diff --git a/game/modules/planets/test_planet/planets/simple_planet.gd b/game/modules/planets/test_planet/planets/simple_planet.gd index 6c10370..fe1383f 100644 --- a/game/modules/planets/test_planet/planets/simple_planet.gd +++ b/game/modules/planets/test_planet/planets/simple_planet.gd @@ -28,7 +28,7 @@ func _setup(): if data.get_biome_data_count() == 0: return - var bdata : BiomeData = data.get_biome_data(0) + var bdata : Biome = data.get_biome_data(0) var b : Biome diff --git a/game/scripts/world_generators/MainPlanetGenerator.gd b/game/scripts/world_generators/MainPlanetGenerator.gd index 958e165..c39e9be 100644 --- a/game/scripts/world_generators/MainPlanetGenerator.gd +++ b/game/scripts/world_generators/MainPlanetGenerator.gd @@ -60,7 +60,7 @@ func create_planet(): else: ind = _force_planet - var planet_data : Planet = ResourceLoader.load(planet_files[ind], "PlanetData") + var planet_data : Planet = ResourceLoader.load(planet_files[ind], "Planet") if planet_data == null: print("planet_data is null!")