Fixed preloading of add on

This commit is contained in:
Eljakim Herrewijnen 2021-04-08 21:43:34 +02:00
parent 0f6876f96f
commit 285ee79e16
5 changed files with 114 additions and 76 deletions

View File

@ -5,12 +5,12 @@
[ext_resource path="res://MiscCodes/loading_ring.gd" type="Script" id=3] [ext_resource path="res://MiscCodes/loading_ring.gd" type="Script" id=3]
[ext_resource path="res://pictures/gui/backgrounds/treesbackground1.png" type="Texture" id=5] [ext_resource path="res://pictures/gui/backgrounds/treesbackground1.png" type="Texture" id=5]
[sub_resource type="DynamicFontData" id=2] [sub_resource type="DynamicFontData" id=1]
font_path = "res://ring_of_races_font.ttf" font_path = "res://ring_of_races_font.ttf"
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=2]
size = 30 size = 30
font_data = SubResource( 2 ) font_data = SubResource( 1 )
[node name="Main Menu" type="Node2D"] [node name="Main Menu" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@ -36,7 +36,7 @@ margin_left = 484.204
margin_top = 100.226 margin_top = 100.226
margin_right = 679.204 margin_right = 679.204
margin_bottom = 153.226 margin_bottom = 153.226
custom_fonts/font = SubResource( 1 ) custom_fonts/font = SubResource( 2 )
text = "Play Game" text = "Play Game"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false

View File

@ -0,0 +1,36 @@
extends VBoxContainer
# Many thanks to Arkeve! https://github.com/arkeve
const SlotClass = preload("res://MiscCodes/Slot.gd")
onready var inventory_slots = $GridContainer
var holding_item = null
func _ready():
for inv_slot in inventory_slots.get_children():
inv_slot.connect("gui_input", self, "slot_gui_input", [inv_slot])
func slot_gui_input(event: InputEvent, slot: SlotClass):
if event is InputEventMouseButton:
if event.button_index == BUTTON_LEFT && event.pressed:
if holding_item != null:
if !slot.item: # Place holding item to slot
slot.putIntoSlot(holding_item)
holding_item = null
else: # Swap holding item with item in slot
var temp_item = slot.item
slot.pickFromSlot()
temp_item.global_position = event.global_position
slot.putIntoSlot(holding_item)
holding_item = temp_item
elif slot.item:
holding_item = slot.item
slot.pickFromSlot()
holding_item.global_position = get_global_mouse_position()
func _input(event):
if holding_item:
holding_item.global_position = get_global_mouse_position()
func _on_TouchScreenButton_pressed():
Global.GoToScene("river_intersection_home_2")

View File

@ -1,13 +1,16 @@
extends Node extends Node
const SQLite = preload("res://addons/godot-sqlite/bin/gdsqlite.gdns")
var path = "user://storage.db" var path = "user://storage.db"
var db_name = "RingOfRaces" var db_name = "RingOfRaces"
var db = null var db = null
var verbose = true var verbose = true
var host = null
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
pass # Replace with function body. host = OS.get_name()
func CreateWorldDatabase(): func CreateWorldDatabase():
print("Creating new database") print("Creating new database")
@ -32,7 +35,8 @@ func CreateWorldDatabase():
items.clear() items.clear()
func OpenConnection(): func OpenConnection():
var SQLite = load("user://gdsqlite.gdns") if(str(OS.get_name()) == "X11"):
path = "res://storage.db"
self.db = SQLite.new() self.db = SQLite.new()
var file = File.new() var file = File.new()
self.db.path = path self.db.path = path

View File

@ -2,8 +2,6 @@
[ext_resource path="res://pictures/tileset_images/TilesetGodotVloer.png" type="Texture" id=1] [ext_resource path="res://pictures/tileset_images/TilesetGodotVloer.png" type="Texture" id=1]
[sub_resource type="ConcavePolygonShape2D" id=1] [sub_resource type="ConcavePolygonShape2D" id=1]
segments = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) segments = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )

BIN
storage.db Normal file

Binary file not shown.