Psychomerge

This commit is contained in:
Pal
2025-09-25 17:41:08 -07:00
270 changed files with 839 additions and 686 deletions

View File

@@ -68,7 +68,7 @@ script_export_mode=2
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=2
debug/export_console_wrapper=0
binary_format/embed_pck=true
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false

View File

@@ -186,11 +186,13 @@ Interact={
Next={
"deadzone": 0.2,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
Previous={
"deadzone": 0.2,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
Save={

View File

@@ -1,8 +1,11 @@
using Chickensoft.AutoInject;
using Chickensoft.Collections;
using Chickensoft.GodotNodeInterfaces;
using Chickensoft.Introspection;
using Godot;
using Godot.Collections;
using SimpleInjector.Lifestyles;
using System.Linq;
using Zennysoft.Game.Abstractions;
using Zennysoft.Ma.Adapter;
@@ -17,7 +20,11 @@ public partial class App : Node, IApp
public const string GAME_SCENE_PATH = "res://src/game/Game.tscn";
public IGame Game { get; set; } = default!;
public const string ENEMY_VIEWER_PATH = "res://src/data_viewer/DataViewer.tscn";
[Node] private MainMenu MainMenu { get; set; } = default!;
[Node] private Control Loading { get; set; } = default!;
public IInstantiator Instantiator { get; set; } = default!;
@@ -27,6 +34,12 @@ public partial class App : Node, IApp
public IAppLogic AppLogic { get; set; } = default!;
public AppLogic.IBinding AppBinding { get; set; } = default!;
private Array _progress;
private AutoProp<string> _loadedScene = new(string.Empty);
private bool _loadingGame = false;
private bool _loadingEnemyViewer = false;
public void Initialize()
{
var container = new SimpleInjector.Container();
@@ -34,6 +47,12 @@ public partial class App : Node, IApp
container.RegisterSingleton<IAppRepo, AppRepo>();
container.RegisterSingleton<IAppLogic, AppLogic>();
MainMenu.NewGame += OnNewGame;
MainMenu.LoadGame += OnLoadGame;
MainMenu.EnemyViewer += OnEnemyViewer;
MainMenu.Quit += OnQuit;
_loadedScene.Changed += OnGameLoaded;
Instantiator = new Instantiator(GetTree());
AppRepo = container.GetInstance<IAppRepo>();
@@ -43,9 +62,19 @@ public partial class App : Node, IApp
AppLogic.Set(new AppLogic.Data());
Input.MouseMode = Input.MouseModeEnum.Visible;
_progress = [];
this.Provide();
}
private void OnGameLoaded(string sceneName)
{
Loading.Hide();
var scene = (PackedScene)ResourceLoader.LoadThreadedGet(sceneName);
var node = scene.Instantiate();
AddChild(node);
Instantiator.SceneTree.Paused = false;
}
public void OnReady()
{
AppBinding = AppLogic.Bind();
@@ -59,7 +88,9 @@ public partial class App : Node, IApp
})
.Handle((in AppLogic.Output.SetupGameScene _) =>
{
Instantiator.SceneTree.Paused = false;
ResourceLoader.LoadThreadedRequest(GAME_SCENE_PATH);
_loadingGame = true;
MainMenu.Hide();
})
.Handle((in AppLogic.Output.ShowMainMenu _) =>
{
@@ -69,27 +100,49 @@ public partial class App : Node, IApp
})
.Handle((in AppLogic.Output.StartLoadingSaveFile _) =>
{
Game.SaveFileLoaded += OnSaveFileLoaded;
Game.LoadExistingGame();
})
.Handle((in AppLogic.Output.EnemyViewerOpened _) =>
{
ResourceLoader.LoadThreadedRequest(ENEMY_VIEWER_PATH);
_loadingEnemyViewer = true;
MainMenu.Hide();
})
.Handle((in AppLogic.Output.ExitGame _) =>
{
GetTree().Quit();
});
AppLogic.Start();
MainMenu.Show();
}
public override void _Process(double delta)
{
if (_loadingGame)
{
ResourceLoader.LoadThreadedGetStatus(GAME_SCENE_PATH, _progress);
if ((double)_progress.Single() == 1)
_loadedScene.OnNext(GAME_SCENE_PATH);
}
if (_loadingEnemyViewer)
{
ResourceLoader.LoadThreadedGetStatus(ENEMY_VIEWER_PATH, _progress);
if ((double)_progress.Single() == 1)
_loadedScene.OnNext(ENEMY_VIEWER_PATH);
}
}
public void OnNewGame() => AppLogic.Input(new AppLogic.Input.NewGame());
private void OnEnemyViewer() => AppLogic.Input(new AppLogic.Input.EnemyViewerOpened());
private void OnLoadGame() => AppLogic.Input(new AppLogic.Input.LoadGame());
public void OnQuit() => AppLogic.Input(new AppLogic.Input.QuitGame());
public void OnSaveFileLoaded()
{
Game.SaveFileLoaded -= OnSaveFileLoaded;
AppLogic.Input(new AppLogic.Input.SaveFileLoaded());
}

View File

@@ -1,10 +1,49 @@
[gd_scene load_steps=3 format=3 uid="uid://cagfc5ridmteu"]
[gd_scene load_steps=5 format=3 uid="uid://cagfc5ridmteu"]
[ext_resource type="Script" uid="uid://d1f8blk5ucqvq" path="res://src/app/App.cs" id="1_rt73h"]
[ext_resource type="PackedScene" uid="uid://33ek675mfb5n" path="res://src/game/Game.tscn" id="2_1uiag"]
[ext_resource type="PackedScene" uid="uid://rfvnddfqufho" path="res://src/menu/MainMenu.tscn" id="2_1uiag"]
[ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="2_3st5l"]
[sub_resource type="LabelSettings" id="LabelSettings_v0mgf"]
font = ExtResource("2_3st5l")
font_size = 100
font_color = Color(0.737255, 0.705882, 0.690196, 1)
[node name="App" type="Node"]
process_mode = 3
script = ExtResource("1_rt73h")
[node name="Game" parent="." instance=ExtResource("2_1uiag")]
[node name="Loading" type="Control" parent="."]
unique_name_in_owner = true
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="ColorRect" type="ColorRect" parent="Loading"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0.137255, 0.121569, 0.12549, 1)
[node name="CenterContainer" type="CenterContainer" parent="Loading"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="Label" type="Label" parent="Loading/CenterContainer"]
layout_mode = 2
text = "Loading..."
label_settings = SubResource("LabelSettings_v0mgf")
[node name="MainMenu" parent="." instance=ExtResource("2_1uiag")]
unique_name_in_owner = true
visible = false

View File

@@ -152,11 +152,10 @@ offset_top = -228.0
grow_horizontal = 0
grow_vertical = 0
theme = ExtResource("2_bef6s")
text = "Switch: L1/R1
Primary Attack: X
Secondary Attack: ◻
Activate: △
Press ○ to exit"
text = "Switch: L1/R1 or <- ->
Primary Attack: X (Space)
Secondary Attack: ◻ (RMB)
Activate: △ (E)"
[node name="DataViewerRepository" parent="." instance=ExtResource("3_ejdn0")]
unique_name_in_owner = true

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "2eac29ac83a3513994dee3a00e7200d5"
"md5": "e338159bb24b816e533ad760605453b6"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "0d8f5c44c82788efddd95c2ebca59f89"
"md5": "5ae8776c2c4d3f1a1474d731b8c3c958"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "bca55d4e576c6f96ef2ce44187761309"
"md5": "c887e8428ade4b351942da4003d1076d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "fdf7a11f3a6a7bcb56f1a28e40154087"
"md5": "a736e2bfd0819e969c4fbfc879bc7b02"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "16e1f22dd808b6f6447293d3fa3e8b89"
"md5": "ebbb46c4f552a8b17e6801dc6b95714a"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "fdf7a11f3a6a7bcb56f1a28e40154087"
"md5": "a736e2bfd0819e969c4fbfc879bc7b02"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "16e1f22dd808b6f6447293d3fa3e8b89"
"md5": "ebbb46c4f552a8b17e6801dc6b95714a"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "fdf7a11f3a6a7bcb56f1a28e40154087"
"md5": "a736e2bfd0819e969c4fbfc879bc7b02"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "16e1f22dd808b6f6447293d3fa3e8b89"
"md5": "ebbb46c4f552a8b17e6801dc6b95714a"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "913cb2aec78c9ea846a046882fd28970"
"md5": "585f2a4c17e3fbeb9a34c0c9c519e1e3"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "913cb2aec78c9ea846a046882fd28970"
"md5": "585f2a4c17e3fbeb9a34c0c9c519e1e3"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "b982ed806a4b60688b11f983332207fd"
"md5": "0d4093ab628707833e7cad158b16204c"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "0d6765ccb95e61a866c2850bb4f01d24"
"md5": "f280b1532a0419eb2c045449bd6c39a2"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "913cb2aec78c9ea846a046882fd28970"
"md5": "585f2a4c17e3fbeb9a34c0c9c519e1e3"
}
[deps]

View File

@@ -19,26 +19,20 @@ public partial class Game : Node3D, IGame
IGameRepo IProvide<IGameRepo>.Value() => GameRepo;
IGame IProvide<IGame>.Value() => this;
IPlayer IProvide<IPlayer>.Value() => _player;
IPlayer IProvide<IPlayer>.Value() => Player;
IMap IProvide<IMap>.Value() => Map;
IMap IProvide<IMap>.Value() => _map;
private static SimpleInjector.Container _container;
public IInstantiator Instantiator { get; set; } = default!;
public IGameState GameState { get; set; } = default!;
public IGameRepo GameRepo { get; set; } = default!;
public GameState.IBinding GameBinding { get; set; } = default!;
[Dependency] public IAppRepo AppRepo => this.DependOn<IAppRepo>();
#region Nodes
[Node] private IMap Map { get; set; } = default!;
[Node] private Node PauseContainer { get; set; } = default!;
[Node] private InGameUI InGameUI { get; set; } = default!;
@@ -47,12 +41,6 @@ public partial class Game : Node3D, IGame
[Node] private DeathMenu DeathMenu { get; set; } = default!;
[Node] private IPauseMenu PauseMenu { get; set; } = default!;
[Node] private Timer DoubleEXPTimer { get; set; } = default!;
[Node] private IPlayer Player { get; set; } = default!;
[Node] private MainMenu MainMenu { get; set; } = default!;
#endregion
#region Save
@@ -72,19 +60,28 @@ public partial class Game : Node3D, IGame
private EffectService _effectService;
private IInstantiator _instantiator;
private Player _player;
private Map _map;
public void Setup()
{
_container = new SimpleInjector.Container();
Module.Bootstrap(_container);
_instantiator = new Instantiator(GetTree());
_player = _instantiator.LoadAndInstantiate<Player>("res://src/player/Player.tscn");
PauseContainer.AddChild(_player);
_map = _instantiator.LoadAndInstantiate<Map>("res://src/map/Map.tscn");
PauseContainer.AddChild(_map);
GameRepo = _container.GetInstance<IGameRepo>();
GameState = _container.GetInstance<IGameState>();
GameState.Set(GameRepo);
GameState.Set(AppRepo);
GameState.Set(Player);
GameState.Set(Map);
GameState.Set(_player);
GameState.Set(_map);
GameState.Set(InGameUI);
Instantiator = new Instantiator(GetTree());
RescuedItems = new RescuedItemDatabase();
GameChunk = new SaveChunk<GameData>(
@@ -95,12 +92,12 @@ public partial class Game : Node3D, IGame
PlayerData = new PlayerData()
{
PlayerStats = Player.Stats,
Inventory = Player.Inventory
PlayerStats = _player.Stats,
Inventory = _player.Inventory
},
MapData = new MapData()
{
FloorScenes = Map.FloorScenes
FloorScenes = _map.FloorScenes
},
RescuedItems = new RescuedItemDatabase()
{
@@ -145,13 +142,6 @@ public partial class Game : Node3D, IGame
GameBinding
.Handle((in GameState.Output.InitializeGame _) =>
{
InitializeGame();
Map.LoadMap();
GameRepo.Resume();
InGameUI.Show();
InGameUI.PlayerInfoUI.Activate();
Player.TeleportPlayer(Map.CurrentFloor.GetPlayerSpawnPoint());
Player.Activate();
})
.Handle((in GameState.Output.LoadGameFromFile _) =>
{
@@ -209,24 +199,24 @@ public partial class Game : Node3D, IGame
.Handle((in GameState.Output.LoadNextFloor _) =>
{
FloorClearMenu.FadeOut();
Map.SpawnNextFloor();
if (Player.EquippedWeapon.Value.ItemTag == ItemTag.BreaksOnChange)
_map.SpawnNextFloor();
if (_player.EquippedWeapon.Value.ItemTag == ItemTag.BreaksOnChange)
{
var itemToDestroy = Player.EquippedWeapon.Value;
Player.Unequip(itemToDestroy);
Player.Inventory.Remove(itemToDestroy);
var itemToDestroy = _player.EquippedWeapon.Value;
_player.Unequip(itemToDestroy);
_player.Inventory.Remove(itemToDestroy);
}
if (Player.EquippedArmor.Value.ItemTag == ItemTag.BreaksOnChange)
if (_player.EquippedArmor.Value.ItemTag == ItemTag.BreaksOnChange)
{
var itemToDestroy = Player.EquippedArmor.Value;
Player.Unequip(itemToDestroy);
Player.Inventory.Remove(itemToDestroy);
var itemToDestroy = _player.EquippedArmor.Value;
_player.Unequip(itemToDestroy);
_player.Inventory.Remove(itemToDestroy);
}
if (Player.EquippedAccessory.Value.ItemTag == ItemTag.BreaksOnChange)
if (_player.EquippedAccessory.Value.ItemTag == ItemTag.BreaksOnChange)
{
var itemToDestroy = Player.EquippedAccessory.Value;
Player.Unequip(itemToDestroy);
Player.Inventory.Remove(itemToDestroy);
var itemToDestroy = _player.EquippedAccessory.Value;
_player.Unequip(itemToDestroy);
_player.Inventory.Remove(itemToDestroy);
}
FloorClearMenu.FadeOut();
})
@@ -246,29 +236,31 @@ public partial class Game : Node3D, IGame
GameRepo.RestorativePickedUp += GameEventDepot_RestorativePickedUp;
DoubleEXPTimer.Timeout += DoubleEXPTimer_Timeout;
MainMenu.NewGame += OnNewGame;
MainMenu.LoadGame += OnLoadGame;
MainMenu.Quit += OnQuit;
DeathMenu.NewGame += OnContinueGame;
DeathMenu.QuitGame += OnQuit;
GameRepo.IsPaused.Sync += IsPaused_Sync;
_effectService = new EffectService(this, Player, Map);
_effectService = new EffectService(this, _player, _map);
}
MainMenu.Show();
public void OnReady()
{
InitializeGame();
_map.LoadMap();
GameRepo.Resume();
InGameUI.Show();
InGameUI.PlayerInfoUI.Activate();
_player.TeleportPlayer(_map.CurrentFloor.GetPlayerSpawnPoint());
_player.Activate();
}
private void FloorClearMenu_SaveAndExit()
{
//SaveFile.Save();
Player.Deactivate();
_player.Deactivate();
GameState.Input(new GameState.Input.ReturnToMainMenu());
InGameUI.Hide();
MainMenu.FadeIn();
}
private void FloorClearMenu_GoToNextFloor() => GameState.Input(new GameState.Input.LoadNextFloor());
@@ -276,8 +268,8 @@ public partial class Game : Node3D, IGame
public void InitializeGame()
{
Map.InitializeMapData();
Player.InitializePlayerState();
_map.InitializeMapData();
_player.InitializePlayerState();
}
public void FloorExitReached()
@@ -327,11 +319,11 @@ public partial class Game : Node3D, IGame
thrown.Throw(_effectService);
}
public IDungeonFloor CurrentFloor => Map.CurrentFloor;
public IDungeonFloor CurrentFloor => _map.CurrentFloor;
public void EnemyDefeated(Vector3 defeatedLocation, EnemyStatResource resource)
{
Player.GainExp(resource.ExpFromDefeat * GameRepo.ExpRate);
_player.GainExp(resource.ExpFromDefeat * GameRepo.ExpRate);
DropRestorative(defeatedLocation);
}
@@ -339,10 +331,10 @@ public partial class Game : Node3D, IGame
{
var itemDb = new ItemDatabase();
var currentIndex = Player.Inventory.Items.IndexOf(itemToReroll);
var currentIndex = _player.Inventory.Items.IndexOf(itemToReroll);
if (insertIntoInventory)
Player.Inventory.Remove(itemToReroll);
_player.Inventory.Remove(itemToReroll);
InventoryItem rolledItem = null;
@@ -360,7 +352,7 @@ public partial class Game : Node3D, IGame
rolledItem = itemDb.PickItem(consumableItem);
if (insertIntoInventory)
Player.Inventory.TryInsert(rolledItem, currentIndex);
_player.Inventory.TryInsert(rolledItem, currentIndex);
return rolledItem;
}
@@ -398,25 +390,23 @@ public partial class Game : Node3D, IGame
GameRepo.Resume();
}
private void GameEventDepot_RestorativePickedUp(IHealthPack obj) => Player.Stats.SetCurrentVT(Player.Stats.CurrentVT.Value + (int)obj.RestoreAmount);
private void GameEventDepot_RestorativePickedUp(IHealthPack obj) => _player.Stats.SetCurrentVT(_player.Stats.CurrentVT.Value + (int)obj.RestoreAmount);
private void IsPaused_Sync(bool isPaused) => GetTree().Paused = isPaused;
private void DoubleEXPTimer_Timeout() => GameRepo.EndDoubleExp();
private void FinishedLoadingSaveFile() => EmitSignal(SignalName.SaveFileLoaded);
private void EnactConsumableItemEffects(ConsumableItem consumableItem)
{
if (Player.Stats.CurrentHP == Player.Stats.MaximumHP && consumableItem.RaiseHPAmount > 0)
Player.RaiseHP(consumableItem.RaiseHPAmount);
if (Player.Stats.CurrentVT == Player.Stats.MaximumVT && consumableItem.RaiseVTAmount > 0)
Player.RaiseVT(consumableItem.RaiseVTAmount);
if (_player.Stats.CurrentHP == _player.Stats.MaximumHP && consumableItem.RaiseHPAmount > 0)
_player.RaiseHP(consumableItem.RaiseHPAmount);
if (_player.Stats.CurrentVT == _player.Stats.MaximumVT && consumableItem.RaiseVTAmount > 0)
_player.RaiseVT(consumableItem.RaiseVTAmount);
if (consumableItem.HealHPAmount > 0 && Player.Stats.CurrentHP != Player.Stats.MaximumHP)
Player.HealHP(consumableItem.HealHPAmount);
if (consumableItem.HealVTAmount > 0 && Player.Stats.CurrentVT != Player.Stats.MaximumVT)
Player.HealVT(consumableItem.HealVTAmount);
if (consumableItem.HealHPAmount > 0 && _player.Stats.CurrentHP != _player.Stats.MaximumHP)
_player.HealHP(consumableItem.HealHPAmount);
if (consumableItem.HealVTAmount > 0 && _player.Stats.CurrentVT != _player.Stats.MaximumVT)
_player.HealVT(consumableItem.HealVTAmount);
}
private void EnactEffectItemEffects(EffectItem effectItem)
@@ -475,22 +465,22 @@ public partial class Game : Node3D, IGame
GameRepo.CloseInventory();
break;
case ThrowableItemTag.TeleportToRandomLocation:
_effectService.TeleportToRandomRoom(Player);
_effectService.TeleportToRandomRoom(_player);
GameRepo.CloseInventory();
break;
case ThrowableItemTag.CanChangeAffinity:
_effectService.ChangeAffinity(throwableItem);
break;
case ThrowableItemTag.WarpToExitIfFound:
_effectService.WarpToExit(Player);
_effectService.WarpToExit(_player);
GameRepo.CloseInventory();
break;
}
if (throwableItem.HealHPAmount > 0)
Player.HealHP(throwableItem.HealHPAmount);
_player.HealHP(throwableItem.HealHPAmount);
if (throwableItem.HealVTAmount > 0)
Player.HealVT(throwableItem.HealVTAmount);
_player.HealVT(throwableItem.HealVTAmount);
}
private void RemoveItemOrSubtractFromItemCount(InventoryItem item)
@@ -504,7 +494,6 @@ public partial class Game : Node3D, IGame
private void OnNewGame()
{
GameState.Input(new GameState.Input.NewGame());
MainMenu.Hide();
}
private void OnContinueGame()
@@ -515,11 +504,9 @@ public partial class Game : Node3D, IGame
private void OnLoadGame()
{
GameState.Input(new GameState.Input.LoadGame());
MainMenu.Hide();
}
private void OnQuit()
{
MainMenu.Hide();
}
}

View File

@@ -1,19 +1,12 @@
[gd_scene load_steps=22 format=3 uid="uid://33ek675mfb5n"]
[gd_scene load_steps=9 format=3 uid="uid://33ek675mfb5n"]
[ext_resource type="Script" uid="uid://chftlu4proh3d" path="res://src/game/Game.cs" id="1_ytcii"]
[ext_resource type="Shader" uid="uid://dmjxo4k2rx1an" path="res://src/app/App.gdshader" id="2_6ifxs"]
[ext_resource type="Shader" uid="uid://d0gs1s20khrwv" path="res://src/vfx/shaders/n64_1.gdshader" id="3_2d5qb"]
[ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"]
[ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"]
[ext_resource type="Shader" uid="uid://cqnxipgknqhru" path="res://src/vfx/shaders/n64_2.gdshader" id="4_k6vbj"]
[ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
[ext_resource type="Script" uid="uid://daphxl6vvsbjm" path="res://src/game/DialogueController.cs" id="10_58pbt"]
[ext_resource type="Script" uid="uid://cbal5oeaha4nx" path="res://src/ui/pause_menu/PauseMenu.cs" id="11_5ng8c"]
[ext_resource type="PackedScene" uid="uid://pu6gp8de3ck4" path="res://src/ui/floor_clear/FloorClearMenu.tscn" id="11_rya1n"]
[ext_resource type="PackedScene" uid="uid://dbtfgrtgpr4qg" path="res://src/ui/death_menu/DeathMenu.tscn" id="11_wypid"]
[ext_resource type="PackedScene" uid="uid://rfvnddfqufho" path="res://src/menu/MainMenu.tscn" id="12_ejjr5"]
[ext_resource type="PackedScene" uid="uid://blbqgw3wosc1w" path="res://src/ui/pause_menu/PauseMenu.tscn" id="12_yev8k"]
[ext_resource type="PackedScene" uid="uid://bd0p761qakisw" path="res://src/menu/splash/Splash.tscn" id="13_8i5je"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_e75a2"]
shader = ExtResource("2_6ifxs")
@@ -24,71 +17,6 @@ shader_parameter/scale_resolution = false
shader_parameter/target_resolution_scale = 4
shader_parameter/enable_recolor = false
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ywcj3"]
shader = ExtResource("3_2d5qb")
shader_parameter/dither_mode = 0
shader_parameter/enable_dither = true
shader_parameter/random_dither_animate = true
[sub_resource type="ShaderMaterial" id="ShaderMaterial_t07yl"]
shader = ExtResource("4_k6vbj")
shader_parameter/enable_dither_filter = true
shader_parameter/enable_horizontal_blur = true
[sub_resource type="Animation" id="Animation_3st5l"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("BlankScreenControl/BlankScreen:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(0, 0, 0, 1)]
}
[sub_resource type="Animation" id="Animation_1uiag"]
resource_name = "fade_in"
length = 0.1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("BlankScreenControl/BlankScreen:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_v0mgf"]
resource_name = "fade_out"
length = 0.1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("BlankScreenControl/BlankScreen:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_3st5l"]
_data = {
&"RESET": SubResource("Animation_3st5l"),
&"fade_in": SubResource("Animation_1uiag"),
&"fade_out": SubResource("Animation_v0mgf")
}
[node name="Game" type="Node3D"]
process_mode = 3
script = ExtResource("1_ytcii")
@@ -110,48 +38,14 @@ audio_listener_enable_3d = true
size = Vector2i(1440, 1080)
render_target_update_mode = 4
[node name="BackBufferCopy" type="BackBufferCopy" parent="SubViewportContainer/SubViewport"]
material = SubResource("ShaderMaterial_ywcj3")
position = Vector2(959.5, 540)
scale = Vector2(9.605, 5.35)
copy_mode = 2
[node name="ColorRect" type="ColorRect" parent="SubViewportContainer/SubViewport/BackBufferCopy"]
material = SubResource("ShaderMaterial_t07yl")
offset_left = 99.0
offset_top = 90.0
offset_right = 2016.0
offset_bottom = 1172.0
[node name="PauseContainer" type="Node3D" parent="SubViewportContainer/SubViewport"]
unique_name_in_owner = true
process_mode = 1
[node name="Player" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_kk6ly")]
unique_name_in_owner = true
process_mode = 1
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, -3, 0)
[node name="Map" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_d8awv")]
unique_name_in_owner = true
process_mode = 1
[node name="StatusEffectTimers" type="Node" parent="SubViewportContainer/SubViewport/PauseContainer"]
[node name="DoubleEXPTimer" type="Timer" parent="SubViewportContainer/SubViewport/PauseContainer/StatusEffectTimers"]
unique_name_in_owner = true
wait_time = 30.0
[node name="InGameUI" parent="." instance=ExtResource("5_lxtnp")]
unique_name_in_owner = true
visible = false
custom_minimum_size = Vector2(1280, 720)
[node name="DialogueController" type="Node" parent="."]
unique_name_in_owner = true
process_mode = 3
script = ExtResource("10_58pbt")
[node name="DeathMenu" parent="." instance=ExtResource("11_wypid")]
unique_name_in_owner = true
visible = false
@@ -164,36 +58,3 @@ visible = false
unique_name_in_owner = true
visible = false
script = ExtResource("11_5ng8c")
[node name="MainMenu" parent="." instance=ExtResource("12_ejjr5")]
unique_name_in_owner = true
[node name="Splash" parent="." instance=ExtResource("13_8i5je")]
unique_name_in_owner = true
visible = false
[node name="BlankScreenControl" type="Control" parent="."]
visible = false
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="BlankScreen" type="ColorRect" parent="BlankScreenControl"]
unique_name_in_owner = true
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0, 0, 0, 1)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true
libraries = {
&"": SubResource("AnimationLibrary_3st5l")
}

View File

@@ -8,7 +8,7 @@ using Godot;
using System.Threading.Tasks;
using Zennysoft.Ma.Adapter;
public interface IGame : IProvide<IGameRepo>, IProvide<IGame>, IProvide<IPlayer>, IProvide<IMap>, IProvide<ISaveChunk<GameData>>, INode3D
public interface IGame : IProvide<IGameRepo>, IProvide<IPlayer>, IProvide<IMap>, IProvide<ISaveChunk<GameData>>, INode3D
{
void LoadExistingGame();

View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://ih6xt2wjs22w"
path="res://.godot/imported/BELL ANIMATIONS.glb-e339c195371836b17623d58979ddf791.scn"
path="res://.godot/imported/BELL ANIMATIONS.glb-0bec0c0ee8654ea8cd1a14cae7cf4a4e.scn"
[deps]
source_file="res://src/map/assetts/BELL ANIMATIONS.glb"
dest_files=["res://.godot/imported/BELL ANIMATIONS.glb-e339c195371836b17623d58979ddf791.scn"]
source_file="res://src/map/assets/BELL ANIMATIONS.glb"
dest_files=["res://.godot/imported/BELL ANIMATIONS.glb-0bec0c0ee8654ea8cd1a14cae7cf4a4e.scn"]
[params]

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://d1xdvf8awh4bi"
path="res://.godot/imported/BELL ANIMATIONS_CHAIN_TEX.png-c0293f7e6bd3882002ca4e7b4bb76dc8.ctex"
path="res://.godot/imported/BELL ANIMATIONS_CHAIN_TEX.png-f6d6e12787d4cb393b8bf628f5aacde9.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/BELL ANIMATIONS_CHAIN_TEX.png"
dest_files=["res://.godot/imported/BELL ANIMATIONS_CHAIN_TEX.png-c0293f7e6bd3882002ca4e7b4bb76dc8.ctex"]
source_file="res://src/map/assets/BELL ANIMATIONS_CHAIN_TEX.png"
dest_files=["res://.godot/imported/BELL ANIMATIONS_CHAIN_TEX.png-f6d6e12787d4cb393b8bf628f5aacde9.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dipyrtjclqae1"
path="res://.godot/imported/BELL ANIMATIONS_COLUMN.jpg-01d15a833979f0881ad7174c180ba722.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/assets/BELL ANIMATIONS_COLUMN.jpg"
dest_files=["res://.godot/imported/BELL ANIMATIONS_COLUMN.jpg-01d15a833979f0881ad7174c180ba722.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://clc5f6yyc7sdw"
path="res://.godot/imported/BELL ANIMATIONS_concrete_0003_color_1k.png-16a1b77c0e2f86f254b3d5bcece947d5.ctex"
path="res://.godot/imported/BELL ANIMATIONS_concrete_0003_color_1k.png-d46440123e8f57f4657af15790fe8312.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/BELL ANIMATIONS_concrete_0003_color_1k.png"
dest_files=["res://.godot/imported/BELL ANIMATIONS_concrete_0003_color_1k.png-16a1b77c0e2f86f254b3d5bcece947d5.ctex"]
source_file="res://src/map/assets/BELL ANIMATIONS_concrete_0003_color_1k.png"
dest_files=["res://.godot/imported/BELL ANIMATIONS_concrete_0003_color_1k.png-d46440123e8f57f4657af15790fe8312.ctex"]
[params]

View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://by0ljkdhkhylv"
path="res://.godot/imported/Overworld - Upper Water Higher Subdiv.glb-10a66ede2edfc078ad779378beb24dd4.scn"
path="res://.godot/imported/Overworld - Upper Water Higher Subdiv.glb-519365517bb8bf171cba7230277a7979.scn"
[deps]
source_file="res://src/map/assetts/Overworld - Upper Water Higher Subdiv.glb"
dest_files=["res://.godot/imported/Overworld - Upper Water Higher Subdiv.glb-10a66ede2edfc078ad779378beb24dd4.scn"]
source_file="res://src/map/assets/Overworld - Upper Water Higher Subdiv.glb"
dest_files=["res://.godot/imported/Overworld - Upper Water Higher Subdiv.glb-519365517bb8bf171cba7230277a7979.scn"]
[params]

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bnra3afje8dbs"
path="res://.godot/imported/Overworld - Upper Water Higher Subdiv_OCEAN.png-0f2962925e054556cc5e00c0c807074e.ctex"
path="res://.godot/imported/Overworld - Upper Water Higher Subdiv_OCEAN.png-a010ea67bb936d12ca516018cb07c214.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/Overworld - Upper Water Higher Subdiv_OCEAN.png"
dest_files=["res://.godot/imported/Overworld - Upper Water Higher Subdiv_OCEAN.png-0f2962925e054556cc5e00c0c807074e.ctex"]
source_file="res://src/map/assets/Overworld - Upper Water Higher Subdiv_OCEAN.png"
dest_files=["res://.godot/imported/Overworld - Upper Water Higher Subdiv_OCEAN.png-a010ea67bb936d12ca516018cb07c214.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 520 KiB

After

Width:  |  Height:  |  Size: 520 KiB

View File

@@ -3,15 +3,15 @@
importer="2d_array_texture"
type="CompressedTexture2DArray"
uid="uid://c0kjnbpgaa6bs"
path="res://.godot/imported/caustics.png-8a821557e1a2b2aa602fc4053dd6e85f.ctexarray"
path="res://.godot/imported/caustics.png-dd5a6037044192cbe4a0f6a688baa011.ctexarray"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/assetts/caustics.png"
dest_files=["res://.godot/imported/caustics.png-8a821557e1a2b2aa602fc4053dd6e85f.ctexarray"]
source_file="res://src/map/assets/caustics.png"
dest_files=["res://.godot/imported/caustics.png-dd5a6037044192cbe4a0f6a688baa011.ctexarray"]
[params]

Binary file not shown.

View File

@@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dc5drhhc8xbh8"
path="res://.godot/imported/gossip.glb-49ea8a6b8548ccf350a93ece57d0094c.scn"
[deps]
source_file="res://src/map/assets/gossip.glb"
dest_files=["res://.godot/imported/gossip.glb-49ea8a6b8548ccf350a93ece57d0094c.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

View File

@@ -0,0 +1,44 @@
[remap]
importer="texture"
type="CompressedTexture2D"
<<<<<<<< HEAD:Zennysoft.Game.Ma/src/minimap/textures/Room Maps/corridor Straight.png.import
uid="uid://dddv7r2ab5x36"
path="res://.godot/imported/corridor Straight.png-b01b6970d3ff3d23f97927e8450825e4.ctex"
========
uid="uid://bkxbgimxamjjn"
path="res://.godot/imported/gossip_stele.png-ed5ae96280085586f545cfcd8b22a0ec.ctex"
>>>>>>>> f75cd03744b8596bb9035516cb536abaceacf2ad:Zennysoft.Game.Ma/src/map/assets/gossip_stele.png.import
metadata={
"vram_texture": false
}
[deps]
<<<<<<<< HEAD:Zennysoft.Game.Ma/src/minimap/textures/Room Maps/corridor Straight.png.import
source_file="res://src/minimap/textures/Room Maps/corridor Straight.png"
dest_files=["res://.godot/imported/corridor Straight.png-b01b6970d3ff3d23f97927e8450825e4.ctex"]
========
source_file="res://src/map/assets/gossip_stele.png"
dest_files=["res://.godot/imported/gossip_stele.png-ed5ae96280085586f545cfcd8b22a0ec.ctex"]
>>>>>>>> f75cd03744b8596bb9035516cb536abaceacf2ad:Zennysoft.Game.Ma/src/map/assets/gossip_stele.png.import
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View File

@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dtdjtk7ksssmb"
path="res://.godot/imported/sarapa2.png-2bca4a2593a46f4dfa251001a576d7d6.ctex"
path="res://.godot/imported/sarapa2.png-8aa12551f14e1f70cfeb16e759f13b8a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/assetts/sarapa2.png"
dest_files=["res://.godot/imported/sarapa2.png-2bca4a2593a46f4dfa251001a576d7d6.ctex"]
source_file="res://src/map/assets/sarapa2.png"
dest_files=["res://.godot/imported/sarapa2.png-8aa12551f14e1f70cfeb16e759f13b8a.ctex"]
[params]

View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bfvy34lj7lns"
path="res://.godot/imported/sarco altar.glb-f2fef42d76f149e4f1a0ed0622b3011c.scn"
path="res://.godot/imported/sarco altar.glb-0870a2474fb1139a80bcc1820fb72b06.scn"
[deps]
source_file="res://src/map/assetts/sarco altar.glb"
dest_files=["res://.godot/imported/sarco altar.glb-f2fef42d76f149e4f1a0ed0622b3011c.scn"]
source_file="res://src/map/assets/sarco altar.glb"
dest_files=["res://.godot/imported/sarco altar.glb-0870a2474fb1139a80bcc1820fb72b06.scn"]
[params]

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://iwcftnraw2k0"
path="res://.godot/imported/sarco altar_greeen2.png-bdcddf5bed91a0dc25604f476c96baaa.ctex"
path="res://.godot/imported/sarco altar_greeen2.png-9b2d6a1484644ba85d6196caa94a63de.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco altar_greeen2.png"
dest_files=["res://.godot/imported/sarco altar_greeen2.png-bdcddf5bed91a0dc25604f476c96baaa.ctex"]
source_file="res://src/map/assets/sarco altar_greeen2.png"
dest_files=["res://.godot/imported/sarco altar_greeen2.png-9b2d6a1484644ba85d6196caa94a63de.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dctj24v8kldv5"
path="res://.godot/imported/sarco altar_trim4.png-38b4f7dc3505aef715601092c15d3da5.ctex"
path="res://.godot/imported/sarco altar_trim4.png-d17c69c63225ba7054691fa2fc30c803.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco altar_trim4.png"
dest_files=["res://.godot/imported/sarco altar_trim4.png-38b4f7dc3505aef715601092c15d3da5.ctex"]
source_file="res://src/map/assets/sarco altar_trim4.png"
dest_files=["res://.godot/imported/sarco altar_trim4.png-d17c69c63225ba7054691fa2fc30c803.ctex"]
[params]

View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://d2rje5p3a0xdg"
path="res://.godot/imported/sarco.glb-237afeeeb0448c0d6bc85a2383d2101e.scn"
path="res://.godot/imported/sarco.glb-239d8c1e1d08241802f4cb5833d54814.scn"
[deps]
source_file="res://src/map/assetts/sarco.glb"
dest_files=["res://.godot/imported/sarco.glb-237afeeeb0448c0d6bc85a2383d2101e.scn"]
source_file="res://src/map/assets/sarco.glb"
dest_files=["res://.godot/imported/sarco.glb-239d8c1e1d08241802f4cb5833d54814.scn"]
[params]

View File

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 91 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dsii6umo5k0bt"
path="res://.godot/imported/sarco_coffin_edge.png-d7528f79cb1f20d407d62b9cb04cbd70.ctex"
path="res://.godot/imported/sarco_coffin_edge.png-a94073ed85728e4cb627bb2de5f36c07.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_coffin_edge.png"
dest_files=["res://.godot/imported/sarco_coffin_edge.png-d7528f79cb1f20d407d62b9cb04cbd70.ctex"]
source_file="res://src/map/assets/sarco_coffin_edge.png"
dest_files=["res://.godot/imported/sarco_coffin_edge.png-a94073ed85728e4cb627bb2de5f36c07.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 205 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://chg3loytbjh1e"
path="res://.godot/imported/sarco_coffinrelief.png-61ccdd770f893ce0bc188d6b707cb503.ctex"
path="res://.godot/imported/sarco_coffinrelief.png-cc20b7aae5992cbc4f870767f7ce1f13.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_coffinrelief.png"
dest_files=["res://.godot/imported/sarco_coffinrelief.png-61ccdd770f893ce0bc188d6b707cb503.ctex"]
source_file="res://src/map/assets/sarco_coffinrelief.png"
dest_files=["res://.godot/imported/sarco_coffinrelief.png-cc20b7aae5992cbc4f870767f7ce1f13.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cxm2y2u7pti2u"
path="res://.godot/imported/sarco_eyeblockgrave.png-47b8733fab15e6a8836219429f087d6e.ctex"
path="res://.godot/imported/sarco_eyeblockgrave.png-9ab59d561c8c26b6fe51f60dc8d83870.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_eyeblockgrave.png"
dest_files=["res://.godot/imported/sarco_eyeblockgrave.png-47b8733fab15e6a8836219429f087d6e.ctex"]
source_file="res://src/map/assets/sarco_eyeblockgrave.png"
dest_files=["res://.godot/imported/sarco_eyeblockgrave.png-9ab59d561c8c26b6fe51f60dc8d83870.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b14rnmiwrqt2x"
path="res://.godot/imported/sarco_greeen2.png-5194405a020a902681f479e644caa65f.ctex"
path="res://.godot/imported/sarco_greeen2.png-cc3b666f603ddf787e88ad7983eead6e.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_greeen2.png"
dest_files=["res://.godot/imported/sarco_greeen2.png-5194405a020a902681f479e644caa65f.ctex"]
source_file="res://src/map/assets/sarco_greeen2.png"
dest_files=["res://.godot/imported/sarco_greeen2.png-cc3b666f603ddf787e88ad7983eead6e.ctex"]
[params]

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bnt460wbrqk3s"
path="res://.godot/imported/sarco_green_Worked-Stone-Outside.png-1a7d8766c973694514717db4f2e77cc6.ctex"
path="res://.godot/imported/sarco_green_Worked-Stone-Outside.png-ab98852fa5a79f0eddda252c798b828e.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_green_Worked-Stone-Outside.png"
dest_files=["res://.godot/imported/sarco_green_Worked-Stone-Outside.png-1a7d8766c973694514717db4f2e77cc6.ctex"]
source_file="res://src/map/assets/sarco_green_Worked-Stone-Outside.png"
dest_files=["res://.godot/imported/sarco_green_Worked-Stone-Outside.png-ab98852fa5a79f0eddda252c798b828e.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c3s7hs4btatjt"
path="res://.godot/imported/sarco_greenstatue.png-9230bfe532d420d9e72c92580a77c790.ctex"
path="res://.godot/imported/sarco_greenstatue.png-737b0835d9797fa9fc4a3a2888b386ea.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_greenstatue.png"
dest_files=["res://.godot/imported/sarco_greenstatue.png-9230bfe532d420d9e72c92580a77c790.ctex"]
source_file="res://src/map/assets/sarco_greenstatue.png"
dest_files=["res://.godot/imported/sarco_greenstatue.png-737b0835d9797fa9fc4a3a2888b386ea.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://vpes3rk2p4t7"
path="res://.godot/imported/sarco_inner_rock2.png-15730bc9d545253503736f8a719c9b48.ctex"
path="res://.godot/imported/sarco_inner_rock2.png-23d5e9ccf7d5674b2e45bf74eb6c9326.ctex"
metadata={
"vram_texture": false
}
@@ -13,8 +13,8 @@ generator_parameters={
[deps]
source_file="res://src/map/assetts/sarco_inner_rock2.png"
dest_files=["res://.godot/imported/sarco_inner_rock2.png-15730bc9d545253503736f8a719c9b48.ctex"]
source_file="res://src/map/assets/sarco_inner_rock2.png"
dest_files=["res://.godot/imported/sarco_inner_rock2.png-23d5e9ccf7d5674b2e45bf74eb6c9326.ctex"]
[params]

View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://2bf4hr7abrws"
path="res://.godot/imported/spacestairs.glb-8bcea712473b20e5d337a5e25b12eef7.scn"
path="res://.godot/imported/spacestairs.glb-ff8740808bd68bd7693641231b717f84.scn"
[deps]
source_file="res://src/map/assetts/spacestairs.glb"
dest_files=["res://.godot/imported/spacestairs.glb-8bcea712473b20e5d337a5e25b12eef7.scn"]
source_file="res://src/map/assets/spacestairs.glb"
dest_files=["res://.godot/imported/spacestairs.glb-ff8740808bd68bd7693641231b717f84.scn"]
[params]

View File

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 327 KiB

View File

@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b53gm6277ng4e"
path="res://.godot/imported/waternormal.jpeg-a8bd6eba2dd79a043f9623ef45373053.ctex"
path="res://.godot/imported/waternormal.jpeg-65c4588efc29e46babc60da5ba887e3b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/assetts/waternormal.jpeg"
dest_files=["res://.godot/imported/waternormal.jpeg-a8bd6eba2dd79a043f9623ef45373053.ctex"]
source_file="res://src/map/assets/waternormal.jpeg"
dest_files=["res://.godot/imported/waternormal.jpeg-65c4588efc29e46babc60da5ba887e3b.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cbsdc4uthojov"
path="res://.godot/imported/waternormal2.jpg-e41fb88701a1fa9c0ea7440b8477795e.ctex"
path="res://.godot/imported/waternormal2.jpg-5c20c190b0c190f2fefce4df9f44e0bf.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/assetts/waternormal2.jpg"
dest_files=["res://.godot/imported/waternormal2.jpg-e41fb88701a1fa9c0ea7440b8477795e.ctex"]
source_file="res://src/map/assets/waternormal2.jpg"
dest_files=["res://.godot/imported/waternormal2.jpg-5c20c190b0c190f2fefce4df9f44e0bf.ctex"]
[params]

View File

@@ -1,37 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cn2d3icdlegns"
path="res://.godot/imported/BELL ANIMATIONS_COLUMN.jpg-b8c4c5d2b52189ae0ce00d435fad6812.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "518ea1608e2e69166064a6a6ab06fb8c"
}
[deps]
source_file="res://src/map/assetts/BELL ANIMATIONS_COLUMN.jpg"
dest_files=["res://.godot/imported/BELL ANIMATIONS_COLUMN.jpg-b8c4c5d2b52189ae0ce00d435fad6812.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bkxbgimxamjjn"
path="res://.godot/imported/gossip_stele.png-c802320a159021f24fba4c8648b864a4.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "ff59a608ede4fdbedd3064233dea6cd3"
}
[deps]
source_file="res://src/map/assetts/gossip_stele.png"
dest_files=["res://.godot/imported/gossip_stele.png-c802320a159021f24fba4c8648b864a4.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "518ea1608e2e69166064a6a6ab06fb8c"
"md5": "b534d6c15a62da0430767b1a0f3b687f"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "4789848294a3d273e1d0a4d60603ca4f"
"md5": "809c24d6617d0a8e1dca7e497df918c6"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "f3d93511bb57451d08f6041ff9714409"
"md5": "4a83a4136d01a2625c3a3229636a9cde"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "1914c186663ef7293a3272dbbbf2c9a9"
"md5": "3d6e3a1f727e4ba346b1f8bd49a76e28"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "43a59abea6f9e92960392fa8ce88e381"
"md5": "3f97927b9fe1bfcc3a23e1438895a16f"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "a7ec976005a855d80a6a33be8d83ccee"
"md5": "e23dd1b477467088dbb6f6690c77ad73"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "1914c186663ef7293a3272dbbbf2c9a9"
"md5": "3d6e3a1f727e4ba346b1f8bd49a76e28"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "a7ec976005a855d80a6a33be8d83ccee"
"md5": "e23dd1b477467088dbb6f6690c77ad73"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "790ee8a63314fc7cb2e142cf1f82440a"
"md5": "4e8b06efe4d828bfe7982e6ab43d053a"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "9b43cb65e5ee2fa1143c83aa0ec589cb"
"md5": "f898f2d5d45561b486ec94d473fbefce"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "43a59abea6f9e92960392fa8ce88e381"
"md5": "3f97927b9fe1bfcc3a23e1438895a16f"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "904264dfeee82588f692c5a033291746"
"md5": "103b893019b9db866163e6816f845611"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "9b43cb65e5ee2fa1143c83aa0ec589cb"
"md5": "f898f2d5d45561b486ec94d473fbefce"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "43a59abea6f9e92960392fa8ce88e381"
"md5": "3f97927b9fe1bfcc3a23e1438895a16f"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "a7ec976005a855d80a6a33be8d83ccee"
"md5": "e23dd1b477467088dbb6f6690c77ad73"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "904264dfeee82588f692c5a033291746"
"md5": "103b893019b9db866163e6816f845611"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "9b43cb65e5ee2fa1143c83aa0ec589cb"
"md5": "f898f2d5d45561b486ec94d473fbefce"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "1914c186663ef7293a3272dbbbf2c9a9"
"md5": "3d6e3a1f727e4ba346b1f8bd49a76e28"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "a7ec976005a855d80a6a33be8d83ccee"
"md5": "e23dd1b477467088dbb6f6690c77ad73"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "27d6199d6a16de95ddd2d4506d6a97e4"
"md5": "c591bfa502b4a13cdf376c08035fb58d"
}
[deps]

View File

@@ -8,7 +8,7 @@ metadata={
"vram_texture": false
}
generator_parameters={
"md5": "a7ec976005a855d80a6a33be8d83ccee"
"md5": "e23dd1b477467088dbb6f6690c77ad73"
}
[deps]

Some files were not shown because too many files have changed in this diff Show More