added server connection via password. no functionality connected to it yet. cleaned up the server project (removed useless scene files)

This commit is contained in:
Joa2 2023-12-11 11:16:38 +01:00
parent edc9966a8e
commit dce536ec6c
35 changed files with 47 additions and 1191 deletions

View File

@ -27,11 +27,12 @@ func connect_to_server(givenServerPassword):
func _on_player_disconnected(id): func _on_player_disconnected(id):
PlayerManager.player_disconnected(id) PlayerManager.player_disconnected(id)
func _on_player_connected(connected_player_id): #func _on_player_connected(connected_player_id):
var local_player_id = get_tree().get_network_unique_id() # var local_player_id = get_tree().get_network_unique_id()
rpc_id(1, '_request_player_info', local_player_id, connected_player_id) # rpc_id(1, '_request_player_info', local_player_id, connected_player_id)
remote func _requestClientServerpassword(): remote func _requestClientServerpassword():
print("sending password: ",serverPassword)
rpc_id(1,'_returnClientServerPassword',serverPassword) rpc_id(1,'_returnClientServerPassword',serverPassword)
remote func _passwordReturn(correct): remote func _passwordReturn(correct):

View File

@ -76,7 +76,6 @@ margin_left = 975.0
margin_right = 1475.0 margin_right = 1475.0
margin_bottom = 119.0 margin_bottom = 119.0
rect_min_size = Vector2( 500, 0 ) rect_min_size = Vector2( 500, 0 )
text = "pw"
align = 2 align = 2
max_length = 16 max_length = 16
secret = true secret = true

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Faction/Faction.gd" type="Script" id=1]
[node name="Faction" type="Node"]
script = ExtResource( 1 )

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Worldmap/ArmyWM.gd" type="Script" id=1]
[node name="Army" type="Node"]
script = ExtResource( 1 )
[node name="Units" type="Node" parent="."]
[node name="Leader" type="Node" parent="."]

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Worldmap/WorldGenerator.gd" type="Script" id=1]
[node name="WorldGenerator" type="Node"]
script = ExtResource( 1 )

File diff suppressed because one or more lines are too long

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Worldmap/wmTile.gd" type="Script" id=1]
[node name="wmTile" type="Node"]
script = ExtResource( 1 )

View File

@ -1,82 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://army/inventory.gd" type="Script" id=1]
[ext_resource path="res://army/Stack2x1.tscn" type="PackedScene" id=2]
[sub_resource type="GDScript" id=1]
script/source = "extends Node2D
#army script for tokens on worldmap
export var faction = ''
export var armyname = ''
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
func addLeader(leader):
get_node(\"Leader\").add_child(leader)
applyLeaderBuffs()
func applyLeaderBuffs():
#TO DO: figure out how leader buffs army
return
func endTurn():
for stack in get_node(\"Units\").get_children():
stack.endTurn()
func fetchLeader():
var node = get_node(\"Leader\")
var fetch = node.get_children()
applyLeaderBuffs()
return fetch
func loadJson(name, data):
if(data.has('faction')):
faction = data['faction']
if(data.has('armyname')):
armyname = data['armyname']
#for changing position on worldmap
func goto(x,y):
self.position.x = x
self.position.y = y
pass
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func toText():
var json = {
\"faction\" : faction,
\"armyname\":armyname,
\"x\":position.x,
\"y\":position.y
}
return json
"
[node name="Army" type="Node2D"]
script = SubResource( 1 )
[node name="Leader" type="Node" parent="."]
[node name="Units" type="Node" parent="."]
[node name="Stack" parent="Units" instance=ExtResource( 2 )]
[node name="Stack2" parent="Units" instance=ExtResource( 2 )]
position = Vector2( 0.278293, 61.8525 )
[node name="inventory" type="Node" parent="."]
script = ExtResource( 1 )

View File

@ -1,3 +0,0 @@
[gd_scene format=2]
[node name="Node" type="Node"]

View File

@ -1,8 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://army/Effect.gd" type="Script" id=1]
[node name="Effect" type="Node2D"]
script = ExtResource( 1 )
[node name="Sprite" type="Sprite" parent="."]

View File

@ -1,19 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://army/Stack.gd" type="Script" id=1]
[ext_resource path="res://images/region/dragon.png" type="Texture" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 62.4343, 30.7994 )
[node name="Stack" type="KinematicBody2D"]
position = Vector2( 0.278293, 0.482198 )
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 63.8501, 32 )
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 64.0109, 31.8647 )
texture = ExtResource( 2 )

View File

@ -1,22 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://army/Stack.gd" type="Script" id=1]
[ext_resource path="res://images/warrior.png" type="Texture" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 32, 32 )
[node name="Stack" type="KinematicBody2D"]
position = Vector2( 0.278293, 0.482198 )
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 32, 32 )
shape = SubResource( 1 )
__meta__ = {
"_edit_lock_": true
}
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 32.353, 31.8647 )
texture = ExtResource( 2 )

View File

@ -1,19 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://army/Stack.gd" type="Script" id=1]
[ext_resource path="res://images/region/dragon.png" type="Texture" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 62.4343, 30.7994 )
[node name="Stack" type="KinematicBody2D"]
position = Vector2( 0.278293, 0.482198 )
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 63.8501, 32 )
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 64.0109, 31.8647 )
texture = ExtResource( 2 )

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://army/UnitTemplate.gd" type="Script" id=1]
[node name="Node" type="Node"]
script = ExtResource( 1 )

View File

@ -25,8 +25,7 @@ remote func checkServerPassword(serverPassword):
func createServer(password): func createServer(password):
pw = password pw = password
print("a") print("server started \nunder password: ",pw)
print(pw)
players[1] = self_data players[1] = self_data
var host = NetworkedMultiplayerENet.new() var host = NetworkedMultiplayerENet.new()
host.create_server(DEFAULT_PORT, MAX_PLAYERS) host.create_server(DEFAULT_PORT, MAX_PLAYERS)
@ -57,30 +56,33 @@ func firstStart():
func _on_player_disconnected(id): func _on_player_disconnected(id):
pass pass
# players.erase(id)
# PlayerManager.player_disconnected(id)
func _on_player_connected(connected_player_id): remote func _on_player_connected(connected_player_id):
print(connected_player_id," connected") print(connected_player_id," has connected")
request_player_info(connected_player_id) request_player_password(connected_player_id)
func addPlayer(id, name): func addPlayer(id, name):
print("added player ", id)
pass pass
var awaitingConfirmation = [] var awaitingConfirmation = []
func request_player_info(connected_player_id): func request_player_password(connected_player_id):
print("requesting password")
awaitingConfirmation.append(connected_player_id) awaitingConfirmation.append(connected_player_id)
rpc_id(connected_player_id, '_requestClientServerpassword') rpc_id(connected_player_id, '_requestClientServerpassword')
remote func _returnClientServerPassword(password): remote func _returnClientServerPassword(password):
var clientId=multiplayer.get_remote_sender_id() var clientId = get_tree().get_rpc_sender_id()
print("client: ",clientId," tried to connect with ", password)
print(awaitingConfirmation)
if awaitingConfirmation.has(clientId): if awaitingConfirmation.has(clientId):
if password == pw: if password == pw:
rpc_id(clientId, "_validPassword") rpc_id(clientId, "_passwordReturn", true)
addPlayer(clientId,"replaceMe") addPlayer(clientId,"replaceMe")
awaitingConfirmation.erase(clientId)
else: else:
rpc_id(clientId, "fail") rpc_id(clientId, "_passwordReturn", false)
# A function to be used if needed. The purpose is to request all players in the current session. # A function to be used if needed. The purpose is to request all players in the current session.
remote func _request_players(request_from_id): remote func _request_players(request_from_id):

View File

@ -3,4 +3,5 @@
[ext_resource path="res://font/Anton-Regular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://font/Anton-Regular.ttf" type="DynamicFontData" id=1]
[resource] [resource]
size = 25
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )

View File

@ -1,39 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://items/items.tres" type="Texture" id=1]
[ext_resource path="res://items/Equipment.gd" type="Script" id=2]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 41.2803, 47.2645 )
[node name="Equipment" type="KinematicBody2D"]
input_pickable = true
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 96, 96 )
[node name="Label" type="Label" parent="."]
margin_left = -26.3886
margin_top = 22.5987
margin_right = 27.6114
margin_bottom = 42.5987
custom_fonts/font = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Control" type="Control" parent="."]
margin_left = -48.0
margin_top = -48.0
margin_right = 48.0
margin_bottom = 48.0
rect_min_size = Vector2( 96, 96 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )

View File

@ -1,39 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://items/item.gd" type="Script" id=1]
[ext_resource path="res://items/items.tres" type="Texture" id=2]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 41.2803, 47.2645 )
[node name="Item" type="KinematicBody2D"]
input_pickable = true
script = ExtResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 2 )
region_rect = Rect2( 0, 0, 96, 96 )
[node name="Label" type="Label" parent="."]
margin_left = -26.3886
margin_top = 22.5987
margin_right = 27.6114
margin_bottom = 42.5987
custom_fonts/font = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Control" type="Control" parent="."]
margin_left = -48.0
margin_top = -48.0
margin_right = 48.0
margin_bottom = 48.0
rect_min_size = Vector2( 96, 96 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )

View File

@ -1,23 +0,0 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://images/button/armybuttonpressed.png" type="Texture" id=1]
[ext_resource path="res://images/button/armybuttonhover.png" type="Texture" id=2]
[ext_resource path="res://images/button/armybutton.png" type="Texture" id=3]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=4]
[ext_resource path="res://menues/ArmyButton.gd" type="Script" id=5]
[node name="ArmyButton" type="TextureButton"]
texture_normal = ExtResource( 3 )
texture_pressed = ExtResource( 1 )
texture_hover = ExtResource( 2 )
script = ExtResource( 5 )
[node name="Label" type="Label" parent="."]
modulate = Color( 0.827451, 0.145098, 0.145098, 1 )
margin_left = 6.0
margin_top = 16.0
margin_right = 249.0
margin_bottom = 56.0
custom_fonts/font = ExtResource( 4 )
text = "Armeename"
align = 1

View File

@ -1,164 +0,0 @@
[gd_scene load_steps=9 format=2]
[ext_resource path="res://menues/ArmyDesigner/ArmyDesigner.gd" type="Script" id=1]
[ext_resource path="res://images/warrior.png" type="Texture" id=2]
[ext_resource path="res://menues/smallbtn.tscn" type="PackedScene" id=3]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=4]
[ext_resource path="res://menues/ArmyDesigner/rohstoffWahl.gd" type="Script" id=5]
[ext_resource path="res://menues/ArmyDesigner/ArmyDesigneritems.gd" type="Script" id=6]
[ext_resource path="res://menues/ArmyDesigner/Design.gd" type="Script" id=7]
[ext_resource path="res://menues/ArmyDesigner/designItemSocket.tscn" type="PackedScene" id=8]
[node name="ArmyDesigner" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
__meta__ = {
"_edit_horizontal_guides_": [ 173.361, 934.964 ],
"_edit_use_anchors_": false,
"_edit_vertical_guides_": [ 83.3878, 1043.33 ]
}
[node name="NinePatchRect" type="NinePatchRect" parent="."]
self_modulate = Color( 0.223529, 0.160784, 0.588235, 1 )
margin_left = 2.0
margin_top = 0.180447
margin_right = 1922.0
margin_bottom = 1020.18
texture = ExtResource( 2 )
[node name="WaffenBtn" parent="." instance=ExtResource( 3 )]
margin_left = 308.297
margin_top = 56.7061
margin_right = 394.297
margin_bottom = 120.706
[node name="EinheitenBtn" parent="." instance=ExtResource( 3 )]
margin_left = 469.747
margin_top = 58.2135
margin_right = 555.747
margin_bottom = 122.214
[node name="limitTech" type="CheckBox" parent="."]
modulate = Color( 0.905882, 0.0392157, 0.0392157, 1 )
margin_left = 622.806
margin_top = 67.5994
margin_right = 646.806
margin_bottom = 91.5994
rect_scale = Vector2( 2, 2 )
[node name="Label" type="Label" parent="."]
margin_left = 676.32
margin_top = 79.5919
margin_right = 896.32
margin_bottom = 107.592
custom_fonts/font = ExtResource( 4 )
text = "Forschung nicht berücksichtigen"
[node name="rohstoffWahlLabel" type="Label" parent="."]
margin_left = 1153.0
margin_top = 30.0
margin_right = 1702.0
margin_bottom = 44.0
rect_pivot_offset = Vector2( -1398.49, -538.719 )
text = "Wähle einen Rohstoff aus um die Gegenstände dafür für dein Design auszuwählen"
autowrap = true
[node name="rohstoffWahl" type="ItemList" parent="."]
margin_left = 1122.0
margin_top = 66.0
margin_right = 1712.0
margin_bottom = 312.0
script = ExtResource( 5 )
[node name="itemsLabel" type="Label" parent="."]
margin_left = 1158.0
margin_top = 344.0
margin_right = 1305.0
margin_bottom = 382.0
rect_pivot_offset = Vector2( -1398.49, -538.719 )
text = "Gegenstände:"
autowrap = true
[node name="items" type="ItemList" parent="."]
margin_left = 1132.0
margin_top = 375.0
margin_right = 1706.0
margin_bottom = 698.0
script = ExtResource( 6 )
[node name="races" type="ItemList" parent="."]
margin_left = 1129.0
margin_top = 782.0
margin_right = 1702.0
margin_bottom = 951.0
[node name="Design" type="Control" parent="."]
margin_left = 87.5867
margin_top = 172.24
margin_right = 1039.59
margin_bottom = 933.24
script = ExtResource( 7 )
[node name="Race" parent="Design" instance=ExtResource( 8 )]
margin_left = 558.109
margin_top = 47.7737
margin_right = 688.109
margin_bottom = 209.774
[node name="MainHand" parent="Design" instance=ExtResource( 8 )]
margin_left = 136.185
margin_top = 251.923
margin_right = 266.185
margin_bottom = 413.923
[node name="Title" parent="Design/MainHand" index="0"]
text = "Haupthand"
[node name="OffHand" parent="Design" instance=ExtResource( 8 )]
margin_left = 459.867
margin_top = 252.402
margin_right = 589.867
margin_bottom = 414.402
[node name="Title" parent="Design/OffHand" index="0"]
text = "Zweithand"
[node name="SecondaryWeapon" parent="Design" instance=ExtResource( 8 )]
margin_left = 654.508
margin_top = 249.436
margin_right = 784.508
margin_bottom = 411.436
[node name="Title" parent="Design/SecondaryWeapon" index="0"]
text = "Zweitwaffe"
[node name="armor" parent="Design" instance=ExtResource( 8 )]
margin_left = 288.122
margin_top = 250.186
margin_right = 418.122
margin_bottom = 412.186
[node name="Title" parent="Design/armor" index="0"]
text = "Rüstung"
[node name="Mount" parent="Design" instance=ExtResource( 8 )]
margin_left = 414.437
margin_top = 403.094
margin_right = 544.437
margin_bottom = 565.094
[node name="Title" parent="Design/Mount" index="0"]
text = "Reittier"
[node name="TextureButton" parent="Design" instance=ExtResource( 3 )]
margin_left = 765.651
margin_top = 628.255
margin_right = 849.651
margin_bottom = 692.255
[editable path="Design/MainHand"]
[editable path="Design/OffHand"]
[editable path="Design/SecondaryWeapon"]
[editable path="Design/armor"]
[editable path="Design/Mount"]

View File

@ -1,40 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://images/button/smallerbtn.png" type="Texture" id=1]
[node name="Control" type="Control"]
margin_left = 530.0
margin_top = 1.0
margin_right = 660.0
margin_bottom = 163.0
__meta__ = {
"_edit_horizontal_guides_": [ 160.805 ],
"_edit_vertical_guides_": [ 530.574, 662.53 ]
}
[node name="Title" type="Label" parent="."]
margin_left = 24.9453
margin_top = 14.4509
margin_right = 101.945
margin_bottom = 39.4509
text = "Volk"
align = 1
[node name="itempicture" type="TextureRect" parent="."]
margin_left = 79.0
margin_top = 6.0
margin_right = 156.0
margin_bottom = 60.0
[node name="itemdescription" type="Label" parent="."]
margin_left = 25.6661
margin_top = 118.136
margin_right = 106.666
margin_bottom = 150.136
[node name="TextureRect" type="TextureRect" parent="."]
margin_left = 22.1077
margin_top = 47.9735
margin_right = 106.108
margin_bottom = 111.973
texture = ExtResource( 1 )

View File

@ -1,23 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://items/items.tres" type="Texture" id=1]
[ext_resource path="res://items/item.gd" type="Script" id=2]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=3]
[node name="Item" type="TextureButton"]
texture_normal = ExtResource( 1 )
script = ExtResource( 2 )
[node name="Label" type="Label" parent="."]
margin_left = -26.3886
margin_top = 22.5987
margin_right = 27.6114
margin_bottom = 42.5987
custom_fonts/font = ExtResource( 3 )
[node name="Control" type="Control" parent="."]
margin_left = -48.0
margin_top = -48.0
margin_right = 48.0
margin_bottom = 48.0
rect_min_size = Vector2( 96, 96 )

View File

@ -1,7 +1,8 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=6 format=2]
[ext_resource path="res://menues/Main Menue.gd" type="Script" id=1] [ext_resource path="res://menues/Main Menue.gd" type="Script" id=1]
[ext_resource path="res://font/Anton-Regular.ttf" type="DynamicFontData" id=2] [ext_resource path="res://font/Anton-Regular.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=3]
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=1]
size = 80 size = 80
@ -54,9 +55,8 @@ margin_left = 862.0
margin_right = 1362.0 margin_right = 1362.0
margin_bottom = 119.0 margin_bottom = 119.0
rect_min_size = Vector2( 500, 0 ) rect_min_size = Vector2( 500, 0 )
align = 2 custom_fonts/font = ExtResource( 3 )
max_length = 16 max_length = 16
secret = true
[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 572.0 margin_top = 572.0

View File

@ -1,76 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://menues/RegisterPlayerMenu.gd" type="Script" id=1]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=2]
[node name="RegisterPlayerMenu" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = -1.22778
margin_top = -2.45551
margin_right = 1914.77
margin_bottom = 1014.54
[node name="Player_name_box" type="HBoxContainer" parent="VBoxContainer"]
margin_right = 1916.0
margin_bottom = 25.0
alignment = 1
[node name="Label" type="Label" parent="VBoxContainer/Player_name_box"]
margin_left = 686.0
margin_right = 726.0
margin_bottom = 25.0
custom_fonts/font = ExtResource( 2 )
text = "Name:"
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/Player_name_box"]
margin_left = 730.0
margin_right = 1230.0
margin_bottom = 25.0
rect_min_size = Vector2( 500, 0 )
[node name="Player_name_box2" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 29.0
margin_right = 1916.0
margin_bottom = 54.0
alignment = 1
[node name="Label" type="Label" parent="VBoxContainer/Player_name_box2"]
margin_left = 673.0
margin_right = 739.0
margin_bottom = 25.0
custom_fonts/font = ExtResource( 2 )
text = "Passwort:"
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/Player_name_box2"]
margin_left = 743.0
margin_right = 1243.0
margin_bottom = 25.0
rect_min_size = Vector2( 500, 0 )
[node name="Player_name_box3" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 58.0
margin_right = 1916.0
margin_bottom = 83.0
alignment = 1
[node name="Label" type="Label" parent="VBoxContainer/Player_name_box3"]
margin_left = 630.0
margin_right = 781.0
margin_bottom = 25.0
custom_fonts/font = ExtResource( 2 )
text = "Passwort wiederholen:"
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/Player_name_box3"]
margin_left = 785.0
margin_right = 1285.0
margin_bottom = 25.0
rect_min_size = Vector2( 500, 0 )
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 87.0
margin_right = 1916.0
margin_bottom = 87.0

View File

@ -1,20 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://menues/research.gd" type="Script" id=1]
[ext_resource path="res://images/research/Menu.png" type="Texture" id=2]
[node name="ResearchMenu" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 1
script = ExtResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 959.935, 510.562 )
texture = ExtResource( 2 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 46.0
margin_top = 60.0
margin_right = 897.0
margin_bottom = 957.0

View File

@ -1,22 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://images/button/smallerbtn.png" type="Texture" id=1]
[ext_resource path="res://images/button/smallerbtnPress.png" type="Texture" id=2]
[ext_resource path="res://images/button/smallerbtnhover.png" type="Texture" id=3]
[ext_resource path="res://font/anton.tres" type="DynamicFont" id=4]
[node name="TextureButton" type="TextureButton"]
margin_right = 84.0
margin_bottom = 64.0
texture_normal = ExtResource( 1 )
texture_pressed = ExtResource( 2 )
texture_hover = ExtResource( 3 )
[node name="Label" type="Label" parent="."]
margin_left = 4.0
margin_top = 19.0
margin_right = 79.0
margin_bottom = 47.0
custom_fonts/font = ExtResource( 4 )
text = "Betreten"
align = 1

View File

@ -1,16 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://region/mine small.png" type="Texture" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 138, 81.5 )
[node name="MineSmall" type="Sprite"]
scale = Vector2( 0.427, 0.427 )
texture = ExtResource( 1 )
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
position = Vector2( 0, -7.5 )
shape = SubResource( 1 )

View File

@ -1,35 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://region/Musik/AudioStreamPlayer.gd" type="Script" id=1]
[ext_resource path="res://region/Musik/TIOTestAudioOne.mp3" type="AudioStream" id=2]
[node name="Node2D" type="Node2D"]
script = ExtResource( 1 )
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 2 )
[node name="GridContainer" type="GridContainer" parent="."]
margin_right = 40.0
margin_bottom = 40.0
[node name="Button" type="Button" parent="GridContainer"]
margin_right = 12.0
margin_bottom = 20.0
[node name="Button2" type="Button" parent="GridContainer"]
margin_top = 24.0
margin_right = 12.0
margin_bottom = 44.0
[node name="Button3" type="Button" parent="GridContainer"]
margin_top = 48.0
margin_right = 12.0
margin_bottom = 68.0
[node name="Timer" type="Timer" parent="."]
[connection signal="pressed" from="GridContainer/Button" to="." method="_on_Button_pressed"]
[connection signal="pressed" from="GridContainer/Button2" to="." method="_on_Button2_pressed"]
[connection signal="pressed" from="GridContainer/Button3" to="." method="_on_Button3_pressed"]
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://region/Musik/audioSegent.gd" type="Script" id=1]
[node name="audioSegent" type="Node"]
script = ExtResource( 1 )

View File

@ -1,54 +0,0 @@
[gd_scene load_steps=9 format=2]
[ext_resource path="res://region/Region.gd" type="Script" id=1]
[ext_resource path="res://Camera2D.gd" type="Script" id=7]
[ext_resource path="res://region/RegionUI.tscn" type="PackedScene" id=8]
[ext_resource path="res://menues/smallbtn.tscn" type="PackedScene" id=9]
[ext_resource path="res://region/dayTimer.gd" type="Script" id=10]
[ext_resource path="res://menues/toggleResearch.gd" type="Script" id=11]
[ext_resource path="res://menues/research.tscn" type="PackedScene" id=12]
[ext_resource path="res://items/Item.tscn" type="PackedScene" id=13]
[node name="Region" type="Node2D"]
script = ExtResource( 1 )
[node name="Camera2D" type="Camera2D" parent="."]
current = true
drag_margin_left = 0.0
drag_margin_top = 0.0
drag_margin_right = 0.0
drag_margin_bottom = 0.0
script = ExtResource( 7 )
[node name="RegionUI" parent="." instance=ExtResource( 8 )]
[node name="TextureButton" parent="RegionUI" instance=ExtResource( 9 )]
margin_left = 1427.18
margin_top = 625.418
margin_right = 1511.18
margin_bottom = 689.418
script = ExtResource( 10 )
[node name="TextureButton2" parent="RegionUI" instance=ExtResource( 9 )]
margin_left = 1421.33
margin_top = 113.573
margin_right = 1505.33
margin_bottom = 177.573
script = ExtResource( 11 )
[node name="ResearchMenu" parent="RegionUI/TextureButton2" instance=ExtResource( 12 )]
visible = false
show_behind_parent = true
margin_left = -1523.25
margin_top = -115.948
margin_right = 315.755
margin_bottom = 842.052
mouse_filter = 0
[node name="CanvasModulate" type="CanvasModulate" parent="."]
position = Vector2( 494.969, 425.958 )
scale = Vector2( 600, 600 )
color = Color( 0.258824, 0.227451, 0.243137, 1 )
[node name="Item" parent="." instance=ExtResource( 13 )]
position = Vector2( 250, 530 )

View File

@ -1,28 +1,28 @@
extends Node extends Node
var Region = preload("res://region/Region.tscn") #var Region = preload("res://region/Region.tscn")
#
#
func createRegion(regiontype,sizex:int, sizey:int, mapseed:int = 0): #func createRegion(regiontype,sizex:int, sizey:int, mapseed:int = 0):
var region = Region.instance() # var region = Region.instance()
var x = 0 # var x = 0
var y = 0 # var y = 0
var tile = mapseed # var tile = mapseed
var map = region.get_node("ground") # var map = region.get_node("ground")
if regiontype == 'GRASS': # if regiontype == 'GRASS':
while x<sizex: # while x<sizex:
y = 0 # y = 0
tile += x # tile += x
while y<sizey: # while y<sizey:
tile += y # tile += y
if not x == 0: # if not x == 0:
tile += sizex%x # tile += sizex%x
if not y == 0: # if not y == 0:
tile += sizey%y # tile += sizey%y
tile = tile%6 # tile = tile%6
map.set_cell(x,y,tile) # map.set_cell(x,y,tile)
# print(tile) ## print(tile)
y += 1 # y += 1
x += 1 # x += 1
print(region) # print(region)
return region # return region

View File

@ -1,58 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://images/WorldUIBackground.png" type="Texture" id=1]
[ext_resource path="res://menues/smallbtn.tscn" type="PackedScene" id=2]
[ext_resource path="res://menues/toWorldMap.gd" type="Script" id=3]
[ext_resource path="res://menues/buildMenuButton.gd" type="Script" id=4]
[node name="RegionUI" type="CanvasLayer"]
[node name="Control" type="Control" parent="."]
margin_right = 40.0
margin_bottom = 40.0
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
}
[node name="NinePatchRect" type="NinePatchRect" parent="Control"]
margin_left = 1227.0
margin_right = 1920.0
margin_bottom = 1019.0
texture = ExtResource( 1 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
}
[node name="ContextTabs" type="HBoxContainer" parent="Control/NinePatchRect"]
margin_left = 10.0
margin_top = 409.0
margin_right = 670.0
margin_bottom = 480.0
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
}
[node name="TextureButton" parent="Control/NinePatchRect/ContextTabs" instance=ExtResource( 2 )]
margin_bottom = 71.0
script = ExtResource( 3 )
[node name="ToggleBuildings" parent="Control/NinePatchRect/ContextTabs" instance=ExtResource( 2 )]
margin_left = 88.0
margin_right = 172.0
margin_bottom = 71.0
script = ExtResource( 4 )
[node name="ContextTabs2" type="HBoxContainer" parent="Control/NinePatchRect"]
margin_left = 12.0
margin_top = 487.0
margin_right = 680.0
margin_bottom = 1019.0
__meta__ = {
"_edit_lock_": true
}
[node name="HBoxContainer" type="HBoxContainer" parent="Control/NinePatchRect/ContextTabs2"]
margin_bottom = 532.0

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://region/building/buildingmap.tres" type="Texture" id=1]
[ext_resource path="res://region/building/Building.gd" type="Script" id=2]
[node name="Building" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )

View File

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://region/building/HumanCapitol.gd" type="Script" id=1]
[node name="HumanCapitol" type="Node2D"]
script = ExtResource( 1 )

View File

@ -1,16 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://region/ressourcenodes/RessourceNode.gd" type="Script" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 256, 128 )
[node name="Mountain" type="StaticBody2D"]
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
[node name="Buildings" type="Node" parent="."]