From dce536ec6cc77d23af1263076f1b0212c883f057 Mon Sep 17 00:00:00 2001 From: Joa2 Date: Mon, 11 Dec 2023 11:16:38 +0100 Subject: [PATCH] added server connection via password. no functionality connected to it yet. cleaned up the server project (removed useless scene files) --- Client/autoloads/Network.gd | 7 +- Client/menues/Main Menue.tscn | 1 - Server/Faction/Faction.tscn | 6 - Server/Worldmap/ArmyWM.tscn | 10 - Server/Worldmap/WorldGenerator.tscn | 6 - Server/Worldmap/Worldmap.tscn | 313 ------------------ Server/Worldmap/wmTile.tscn | 6 - Server/army/Army.tscn | 82 ----- Server/army/Attack.tscn | 3 - Server/army/Effect.tscn | 8 - Server/army/Stack.tscn | 19 -- Server/army/Stack1x1.tscn | 22 -- Server/army/Stack2x1.tscn | 19 -- Server/army/UnitTemplate.tscn | 6 - Server/autoloads/Network.gd | 24 +- Server/font/anton.tres | 1 + Server/items/Equipment.tscn | 39 --- Server/items/Item.tscn | 39 --- Server/menues/ArmyButton.tscn | 23 -- Server/menues/ArmyDesigner/ArmyDesigner.tscn | 164 --------- .../menues/ArmyDesigner/designItemSocket.tscn | 40 --- Server/menues/Item.tscn | 23 -- Server/menues/Main Menue.tscn | 6 +- Server/menues/RegisterPlayerMenu.tscn | 76 ----- Server/menues/research.tscn | 20 -- Server/menues/smallbtn.tscn | 22 -- Server/region/MineSmall.tscn | 16 - Server/region/Musik/DynamicMusic.tscn | 35 -- Server/region/Musik/audioSegent.tscn | 6 - Server/region/Region.tscn | 54 --- Server/region/RegionCreater.gd | 52 +-- Server/region/RegionUI.tscn | 58 ---- Server/region/building/Building.tscn | 10 - Server/region/building/HumanCapitol.tscn | 6 - Server/region/ressourcenodes/Mountain.tscn | 16 - 35 files changed, 47 insertions(+), 1191 deletions(-) delete mode 100644 Server/Faction/Faction.tscn delete mode 100644 Server/Worldmap/ArmyWM.tscn delete mode 100644 Server/Worldmap/WorldGenerator.tscn delete mode 100644 Server/Worldmap/Worldmap.tscn delete mode 100644 Server/Worldmap/wmTile.tscn delete mode 100644 Server/army/Army.tscn delete mode 100644 Server/army/Attack.tscn delete mode 100644 Server/army/Effect.tscn delete mode 100644 Server/army/Stack.tscn delete mode 100644 Server/army/Stack1x1.tscn delete mode 100644 Server/army/Stack2x1.tscn delete mode 100644 Server/army/UnitTemplate.tscn delete mode 100644 Server/items/Equipment.tscn delete mode 100644 Server/items/Item.tscn delete mode 100644 Server/menues/ArmyButton.tscn delete mode 100644 Server/menues/ArmyDesigner/ArmyDesigner.tscn delete mode 100644 Server/menues/ArmyDesigner/designItemSocket.tscn delete mode 100644 Server/menues/Item.tscn delete mode 100644 Server/menues/RegisterPlayerMenu.tscn delete mode 100644 Server/menues/research.tscn delete mode 100644 Server/menues/smallbtn.tscn delete mode 100644 Server/region/MineSmall.tscn delete mode 100644 Server/region/Musik/DynamicMusic.tscn delete mode 100644 Server/region/Musik/audioSegent.tscn delete mode 100644 Server/region/Region.tscn delete mode 100644 Server/region/RegionUI.tscn delete mode 100644 Server/region/building/Building.tscn delete mode 100644 Server/region/building/HumanCapitol.tscn delete mode 100644 Server/region/ressourcenodes/Mountain.tscn diff --git a/Client/autoloads/Network.gd b/Client/autoloads/Network.gd index f799830..26739d9 100644 --- a/Client/autoloads/Network.gd +++ b/Client/autoloads/Network.gd @@ -27,11 +27,12 @@ func connect_to_server(givenServerPassword): func _on_player_disconnected(id): PlayerManager.player_disconnected(id) -func _on_player_connected(connected_player_id): - var local_player_id = get_tree().get_network_unique_id() - rpc_id(1, '_request_player_info', local_player_id, connected_player_id) +#func _on_player_connected(connected_player_id): +# var local_player_id = get_tree().get_network_unique_id() +# rpc_id(1, '_request_player_info', local_player_id, connected_player_id) remote func _requestClientServerpassword(): + print("sending password: ",serverPassword) rpc_id(1,'_returnClientServerPassword',serverPassword) remote func _passwordReturn(correct): diff --git a/Client/menues/Main Menue.tscn b/Client/menues/Main Menue.tscn index 4e184ca..0fadcf7 100644 --- a/Client/menues/Main Menue.tscn +++ b/Client/menues/Main Menue.tscn @@ -76,7 +76,6 @@ margin_left = 975.0 margin_right = 1475.0 margin_bottom = 119.0 rect_min_size = Vector2( 500, 0 ) -text = "pw" align = 2 max_length = 16 secret = true diff --git a/Server/Faction/Faction.tscn b/Server/Faction/Faction.tscn deleted file mode 100644 index 72585c6..0000000 --- a/Server/Faction/Faction.tscn +++ /dev/null @@ -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 ) diff --git a/Server/Worldmap/ArmyWM.tscn b/Server/Worldmap/ArmyWM.tscn deleted file mode 100644 index 47669ca..0000000 --- a/Server/Worldmap/ArmyWM.tscn +++ /dev/null @@ -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="."] diff --git a/Server/Worldmap/WorldGenerator.tscn b/Server/Worldmap/WorldGenerator.tscn deleted file mode 100644 index d6d09f4..0000000 --- a/Server/Worldmap/WorldGenerator.tscn +++ /dev/null @@ -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 ) diff --git a/Server/Worldmap/Worldmap.tscn b/Server/Worldmap/Worldmap.tscn deleted file mode 100644 index b89a5ec..0000000 --- a/Server/Worldmap/Worldmap.tscn +++ /dev/null @@ -1,313 +0,0 @@ -[gd_scene load_steps=15 format=2] - -[ext_resource path="res://Worldmap/Worldmap.gd" type="Script" id=1] -[ext_resource path="res://Worldmap/worldTiles.tres" type="TileSet" id=2] -[ext_resource path="res://Worldmap/worlTileMap.gd" type="Script" id=3] -[ext_resource path="res://Camera2D.gd" type="Script" id=4] -[ext_resource path="res://menues/WorldmapUI.gd" type="Script" id=5] -[ext_resource path="res://images/WorldUIBackground.png" type="Texture" id=6] -[ext_resource path="res://font/anton.tres" type="DynamicFont" id=7] -[ext_resource path="res://menues/smallbtn.tscn" type="PackedScene" id=8] -[ext_resource path="res://menues/toDesigner.gd" type="Script" id=9] -[ext_resource path="res://menues/openRegion.gd" type="Script" id=10] -[ext_resource path="res://menues/moveOnWorldMap.gd" type="Script" id=11] -[ext_resource path="res://menues/toggleResearch.gd" type="Script" id=12] -[ext_resource path="res://menues/research.tscn" type="PackedScene" id=13] -[ext_resource path="res://menues/smallbtn.gd" type="Script" id=14] - -[node name="Worldmap" type="Node2D"] -script = ExtResource( 1 ) - -[node name="worldMapTiles" type="TileMap" parent="."] -tile_set = ExtResource( 2 ) -cell_size = Vector2( 128, 128 ) -format = 1 -tile_data = PoolIntArray( -196603, 0, 0, -196582, 0, 0, -196576, 4, 0, -131072, 4, 0, -131071, 4, 0, -131070, 4, 0, -131069, 4, 0, -131068, 4, 0, -131067, 4, 0, -131066, 4, 0, -131065, 4, 0, -131064, 4, 0, -131063, 4, 0, -131062, 4, 0, -131061, 4, 0, -131060, 4, 0, -131059, 4, 0, -131058, 4, 0, -131057, 4, 0, -131056, 4, 0, -131055, 4, 0, -131054, 4, 0, -131053, 4, 0, -131052, 4, 0, -131051, 4, 0, -131050, 4, 0, -131049, 4, 0, -131048, 4, 0, -131047, 4, 0, -131046, 4, 0, -131044, 4, 0, -131043, 4, 0, -131041, 4, 0, -131040, 4, 0, -131037, 4, 0, -4, 4, 0, -3, 4, 0, -2, 4, 0, -1, 4, 0, -65536, 2, 0, -65535, 2, 0, -65534, 2, 0, -65533, 2, 0, -65532, 2, 0, -65531, 2, 0, -65530, 2, 0, -65529, 2, 0, -65528, 2, 0, -65527, 2, 0, -65526, 4, 0, -65525, 4, 0, -65524, 4, 0, -65523, 4, 0, -65522, 4, 0, -65521, 4, 0, -65520, 4, 0, -65519, 4, 0, -65518, 4, 0, -65517, 4, 0, -65516, 4, 0, -65515, 4, 0, -65514, 4, 0, -65513, 4, 0, -65512, 4, 0, -65511, 4, 0, -65510, 4, 0, -65509, 4, 0, -65508, 4, 0, -65507, 4, 0, -65505, 4, 0, -65504, 4, 0, -65503, 4, 0, -65502, 4, 0, -65501, 4, 0, 65535, 4, 0, 0, 2, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 2, 0, 7, 0, 0, 8, 2, 0, 9, 2, 0, 10, 4, 0, 11, 4, 0, 12, 4, 0, 13, 4, 0, 14, 4, 0, 15, 4, 0, 16, 4, 0, 17, 4, 0, 18, 4, 0, 19, 4, 0, 20, 4, 0, 21, 4, 0, 22, 4, 0, 23, 4, 0, 24, 4, 0, 25, 4, 0, 26, 4, 0, 27, 4, 0, 28, 4, 0, 29, 4, 0, 30, 4, 0, 31, 4, 0, 32, 4, 0, 33, 4, 0, 34, 4, 0, 35, 4, 0, 131063, 4, 0, 131064, 4, 0, 131065, 4, 0, 131066, 4, 0, 131067, 4, 0, 131068, 4, 0, 131069, 4, 0, 131070, 4, 0, 131071, 4, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 1, 0, 65540, 2, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 2, 0, 65546, 4, 0, 65547, 4, 0, 65548, 4, 0, 65549, 4, 0, 65550, 4, 0, 65551, 4, 0, 65552, 4, 0, 65553, 4, 0, 65554, 4, 0, 65555, 4, 0, 65556, 4, 0, 65557, 4, 0, 65558, 4, 0, 65559, 4, 0, 65560, 4, 0, 65561, 4, 0, 65562, 4, 0, 65563, 4, 0, 65564, 4, 0, 65565, 4, 0, 65566, 4, 0, 65567, 4, 0, 65568, 4, 0, 65569, 4, 0, 65570, 4, 0, 65571, 4, 0, 196607, 4, 0, 131072, 0, 0, 131073, 0, 0, 131074, 2, 0, 131075, 3, 0, 131076, 1, 0, 131077, 1, 0, 131078, 0, 0, 131079, 2, 0, 131080, 0, 0, 131081, 3, 0, 131082, 4, 0, 131083, 4, 0, 131084, 4, 0, 131085, 4, 0, 131086, 4, 0, 131087, 4, 0, 131088, 4, 0, 131089, 4, 0, 131090, 4, 0, 131091, 4, 0, 131092, 4, 0, 131093, 4, 0, 131094, 4, 0, 131095, 4, 0, 131096, 4, 0, 131097, 4, 0, 131098, 4, 0, 131099, 4, 0, 131100, 4, 0, 131101, 4, 0, 131102, 4, 0, 131103, 4, 0, 131104, 4, 0, 131105, 4, 0, 131106, 4, 0, 131107, 4, 0, 262142, 4, 0, 262143, 4, 0, 196608, 0, 0, 196609, 1, 0, 196610, 3, 0, 196611, 1, 0, 196612, 3, 0, 196613, 2, 0, 196614, 2, 0, 196615, 0, 0, 196616, 0, 0, 196617, 1, 0, 196618, 4, 0, 196619, 4, 0, 196620, 4, 0, 196621, 4, 0, 196622, 4, 0, 196623, 4, 0, 196624, 4, 0, 196625, 4, 0, 196626, 4, 0, 196627, 4, 0, 196628, 4, 0, 196629, 4, 0, 196630, 4, 0, 196631, 4, 0, 196632, 4, 0, 196633, 4, 0, 196634, 4, 0, 196635, 4, 0, 196636, 4, 0, 196637, 4, 0, 196638, 4, 0, 196639, 4, 0, 196640, 4, 0, 196641, 4, 0, 196642, 4, 0, 196643, 4, 0, 327672, 0, 0, 327673, 0, 0, 327674, 0, 0, 327675, 0, 0, 327676, 0, 0, 327677, 0, 0, 327678, 0, 0, 327679, 4, 0, 262144, 2, 0, 262145, 2, 0, 262146, 3, 0, 262147, 2, 0, 262148, 2, 0, 262149, 2, 0, 262150, 0, 0, 262151, 0, 0, 262152, 0, 0, 262153, 2, 0, 262154, 4, 0, 262155, 4, 0, 262156, 4, 0, 262157, 4, 0, 262158, 4, 0, 262159, 4, 0, 262160, 4, 0, 262161, 4, 0, 262162, 4, 0, 262163, 4, 0, 262164, 4, 0, 262165, 4, 0, 262166, 4, 0, 262167, 4, 0, 262168, 4, 0, 262169, 4, 0, 262170, 4, 0, 262171, 4, 0, 262172, 4, 0, 262173, 4, 0, 262174, 4, 0, 262175, 4, 0, 262176, 4, 0, 262177, 4, 0, 262178, 4, 0, 262179, 4, 0, 393215, 4, 0, 327680, 2, 0, 327681, 1, 0, 327682, 2, 0, 327683, 2, 0, 327684, 2, 0, 327685, 0, 0, 327686, 2, 0, 327687, 0, 0, 327688, 0, 0, 327689, 2, 0, 327690, 2, 0, 327691, 4, 0, 327692, 4, 0, 327693, 4, 0, 327694, 4, 0, 327695, 4, 0, 327696, 4, 0, 327697, 4, 0, 327698, 4, 0, 327699, 4, 0, 327700, 4, 0, 327701, 4, 0, 327702, 4, 0, 327703, 4, 0, 327704, 4, 0, 327705, 4, 0, 327706, 4, 0, 327707, 4, 0, 327708, 4, 0, 327709, 4, 0, 327710, 4, 0, 327711, 4, 0, 327712, 4, 0, 327713, 4, 0, 327714, 4, 0, 327715, 4, 0, 458751, 4, 0, 393216, 2, 0, 393217, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 2, 0, 393223, 0, 0, 393224, 0, 0, 393225, 0, 0, 393226, 2, 0, 393227, 4, 0, 393228, 4, 0, 393229, 4, 0, 393230, 4, 0, 393231, 4, 0, 393232, 4, 0, 393233, 4, 0, 393234, 4, 0, 393235, 4, 0, 393236, 4, 0, 393237, 4, 0, 393238, 4, 0, 393239, 4, 0, 393240, 4, 0, 393241, 4, 0, 393242, 4, 0, 393243, 4, 0, 393244, 4, 0, 393245, 4, 0, 393246, 4, 0, 393247, 4, 0, 393248, 4, 0, 393249, 4, 0, 393250, 4, 0, 393251, 4, 0, 524286, 4, 0, 524287, 4, 0, 458752, 0, 0, 458753, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458760, 0, 0, 458761, 0, 0, 458762, 4, 0, 458763, 4, 0, 458764, 4, 0, 458765, 4, 0, 458766, 4, 0, 458767, 4, 0, 458768, 4, 0, 458769, 4, 0, 458770, 4, 0, 458771, 4, 0, 458772, 4, 0, 458773, 4, 0, 458774, 4, 0, 458775, 4, 0, 458776, 4, 0, 458777, 4, 0, 458778, 4, 0, 458779, 4, 0, 458780, 4, 0, 458781, 4, 0, 458782, 4, 0, 458783, 4, 0, 458784, 4, 0, 458785, 4, 0, 458786, 4, 0, 458787, 4, 0, 589822, 4, 0, 589823, 4, 0, 524288, 4, 0, 524289, 4, 0, 524290, 4, 0, 524291, 4, 0, 524292, 4, 0, 524293, 4, 0, 524294, 4, 0, 524295, 4, 0, 524296, 4, 0, 524297, 4, 0, 524298, 4, 0, 524299, 4, 0, 524300, 4, 0, 524301, 4, 0, 524302, 4, 0, 524303, 4, 0, 524304, 4, 0, 524305, 4, 0, 524306, 4, 0, 524307, 4, 0, 524308, 4, 0, 524309, 4, 0, 524310, 4, 0, 524311, 4, 0, 524312, 4, 0, 524313, 4, 0, 524314, 4, 0, 524315, 4, 0, 524316, 4, 0, 524317, 4, 0, 524318, 4, 0, 524319, 4, 0, 524320, 4, 0, 524321, 4, 0, 524322, 4, 0, 524323, 4, 0, 655358, 4, 0, 655359, 4, 0, 589824, 4, 0, 589825, 4, 0, 589826, 4, 0, 589827, 4, 0, 589828, 4, 0, 589829, 4, 0, 589830, 4, 0, 589831, 4, 0, 589832, 4, 0, 589833, 4, 0, 589834, 4, 0, 589835, 4, 0, 589836, 4, 0, 589837, 4, 0, 589838, 4, 0, 589839, 4, 0, 589840, 4, 0, 589841, 4, 0, 589842, 4, 0, 589843, 4, 0, 589844, 4, 0, 589845, 4, 0, 589846, 4, 0, 589847, 4, 0, 589848, 4, 0, 589849, 4, 0, 589850, 4, 0, 589851, 4, 0, 589852, 4, 0, 589853, 4, 0, 589854, 4, 0, 589855, 4, 0, 589856, 4, 0, 589857, 4, 0, 589858, 4, 0, 589859, 4, 0, 720892, 4, 0, 720893, 4, 0, 720894, 4, 0, 720895, 4, 0, 655360, 4, 0, 655361, 4, 0, 655362, 4, 0, 655363, 4, 0, 655364, 4, 0, 655365, 4, 0, 655366, 4, 0, 655367, 4, 0, 655368, 4, 0, 655369, 4, 0, 655370, 4, 0, 655371, 4, 0, 655372, 4, 0, 655373, 4, 0, 655374, 4, 0, 655375, 4, 0, 655376, 4, 0, 655377, 4, 0, 655378, 4, 0, 655379, 4, 0, 655380, 4, 0, 655381, 4, 0, 655382, 4, 0, 655383, 4, 0, 655384, 4, 0, 655385, 4, 0, 655386, 4, 0, 655387, 4, 0, 655388, 4, 0, 655389, 4, 0, 655390, 4, 0, 655391, 4, 0, 655392, 4, 0, 655393, 4, 0, 655394, 4, 0, 655395, 4, 0, 786429, 4, 0, 786430, 4, 0, 786431, 4, 0, 720896, 4, 0, 720897, 4, 0, 720898, 4, 0, 720899, 4, 0, 720900, 4, 0, 720901, 4, 0, 720902, 4, 0, 720903, 4, 0, 720904, 4, 0, 720905, 4, 0, 720906, 4, 0, 720907, 4, 0, 720908, 4, 0, 720909, 4, 0, 720910, 4, 0, 720911, 4, 0, 720912, 4, 0, 720913, 4, 0, 720914, 4, 0, 720915, 4, 0, 720916, 4, 0, 720917, 4, 0, 720918, 4, 0, 720919, 4, 0, 720920, 4, 0, 720921, 4, 0, 720922, 4, 0, 720923, 4, 0, 720924, 4, 0, 720925, 4, 0, 720926, 4, 0, 720927, 4, 0, 720928, 4, 0, 720929, 4, 0, 720930, 4, 0, 720931, 4, 0, 720932, 4, 0, 720933, 4, 0, 720934, 4, 0, 720935, 4, 0, 720936, 4, 0, 720937, 4, 0, 851966, 4, 0, 851967, 4, 0, 786432, 4, 0, 786433, 4, 0, 786434, 4, 0, 786435, 4, 0, 786436, 4, 0, 786437, 4, 0, 786438, 4, 0, 786439, 4, 0, 786440, 4, 0, 786441, 4, 0, 786442, 4, 0, 786443, 4, 0, 786444, 4, 0, 786445, 4, 0, 786446, 4, 0, 786447, 4, 0, 786448, 4, 0, 786449, 4, 0, 786450, 4, 0, 786451, 4, 0, 786452, 4, 0, 786453, 4, 0, 786454, 4, 0, 786455, 4, 0, 786456, 4, 0, 786457, 4, 0, 786458, 4, 0, 786459, 4, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 4, 0, 786465, 4, 0, 786466, 4, 0, 786467, 4, 0, 786468, 4, 0, 786469, 4, 0, 786470, 4, 0, 786471, 4, 0, 786472, 4, 0, 786473, 4, 0, 786474, 4, 0, 786475, 4, 0, 917503, 4, 0, 851968, 4, 0, 851969, 4, 0, 851970, 4, 0, 851971, 4, 0, 851972, 4, 0, 851973, 4, 0, 851974, 4, 0, 851975, 4, 0, 851976, 4, 0, 851977, 4, 0, 851978, 4, 0, 851979, 4, 0, 851980, 4, 0, 851981, 4, 0, 851982, 4, 0, 851983, 4, 0, 851984, 4, 0, 851985, 4, 0, 851986, 4, 0, 851987, 4, 0, 851988, 4, 0, 851989, 4, 0, 851990, 4, 0, 851991, 4, 0, 851992, 4, 0, 851993, 4, 0, 851994, 4, 0, 851995, 4, 0, 851996, 4, 0, 851997, 4, 0, 851998, 4, 0, 851999, 4, 0, 852000, 4, 0, 852001, 4, 0, 852002, 4, 0, 852003, 4, 0, 852004, 4, 0, 852005, 4, 0, 852006, 4, 0, 852007, 4, 0, 852008, 4, 0, 852009, 4, 0, 852010, 4, 0, 852011, 4, 0, 983037, 4, 0, 983038, 4, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 4, 0, 917520, 4, 0, 917521, 4, 0, 917522, 4, 0, 917523, 4, 0, 917524, 4, 0, 917525, 4, 0, 917526, 4, 0, 917527, 4, 0, 917528, 4, 0, 917529, 4, 0, 917530, 4, 0, 917531, 4, 0, 917532, 4, 0, 917533, 4, 0, 917534, 4, 0, 917535, 4, 0, 917536, 4, 0, 917537, 4, 0, 917538, 4, 0, 917539, 4, 0, 917540, 4, 0, 917544, 4, 0, 917545, 4, 0, 917546, 4, 0, 917547, 4, 0, 1048570, 4, 0, 1048571, 4, 0, 1048572, 4, 0, 1048573, 4, 0, 1048574, 4, 0, 1048575, 4, 0, 983040, 4, 0, 983041, 4, 0, 983042, 4, 0, 983043, 4, 0, 983044, 4, 0, 983045, 4, 0, 983046, 4, 0, 983047, 4, 0, 983048, 4, 0, 983049, 4, 0, 983050, 4, 0, 983051, 4, 0, 983052, 4, 0, 983053, 4, 0, 983054, 4, 0, 983055, 4, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 4, 0, 983062, 4, 0, 983063, 4, 0, 983064, 4, 0, 983065, 4, 0, 983066, 4, 0, 983067, 4, 0, 983068, 4, 0, 983069, 4, 0, 983070, 4, 0, 983071, 4, 0, 983072, 4, 0, 983073, 4, 0, 983074, 4, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0, 983082, 4, 0, 983083, 4, 0, 1114109, 4, 0, 1114110, 4, 0, 1114111, 4, 0, 1048576, 4, 0, 1048577, 4, 0, 1048578, 4, 0, 1048579, 4, 0, 1048580, 4, 0, 1048581, 4, 0, 1048582, 4, 0, 1048583, 4, 0, 1048584, 4, 0, 1048585, 4, 0, 1048586, 4, 0, 1048587, 4, 0, 1048588, 4, 0, 1048589, 4, 0, 1048590, 4, 0, 1048591, 4, 0, 1048592, 4, 0, 1048593, 4, 0, 1048594, 4, 0, 1048595, 4, 0, 1048596, 4, 0, 1048597, 4, 0, 1048598, 4, 0, 1048599, 4, 0, 1048600, 4, 0, 1048601, 4, 0, 1048602, 4, 0, 1048603, 4, 0, 1048604, 4, 0, 1048605, 4, 0, 1048606, 4, 0, 1048607, 4, 0, 1048608, 4, 0, 1048609, 4, 0, 1048610, 4, 0, 1048611, 4, 0, 1048612, 4, 0, 1048613, 4, 0, 1048614, 4, 0, 1048615, 4, 0, 1048616, 4, 0, 1048617, 4, 0, 1048618, 4, 0, 1048619, 4, 0, 1179647, 4, 0, 1114112, 4, 0, 1114113, 4, 0, 1114114, 4, 0, 1114115, 4, 0, 1114116, 4, 0, 1114117, 4, 0, 1114118, 4, 0, 1114119, 4, 0, 1114120, 4, 0, 1114121, 4, 0, 1114122, 4, 0, 1114123, 4, 0, 1114124, 4, 0, 1114125, 4, 0, 1114126, 4, 0, 1114127, 4, 0, 1114128, 4, 0, 1114129, 4, 0, 1114130, 4, 0, 1114131, 4, 0, 1114132, 4, 0, 1114133, 4, 0, 1114134, 4, 0, 1114135, 4, 0, 1114136, 4, 0, 1114137, 4, 0, 1114138, 4, 0, 1114139, 4, 0, 1114140, 4, 0, 1114141, 4, 0, 1114142, 4, 0, 1114143, 4, 0, 1114144, 4, 0, 1114145, 4, 0, 1114146, 4, 0, 1114147, 4, 0, 1114148, 4, 0, 1114149, 4, 0, 1114150, 4, 0, 1114151, 4, 0, 1114152, 4, 0, 1114153, 4, 0, 1245183, 4, 0, 1179648, 4, 0, 1179649, 4, 0, 1179650, 4, 0, 1179651, 4, 0, 1179652, 4, 0, 1179653, 4, 0, 1179654, 4, 0, 1179655, 4, 0, 1179656, 4, 0, 1179657, 4, 0, 1179658, 4, 0, 1179659, 4, 0, 1179660, 4, 0, 1179661, 4, 0, 1179662, 4, 0, 1179663, 4, 0, 1179664, 4, 0, 1179665, 4, 0, 1179666, 4, 0, 1179667, 4, 0, 1179668, 4, 0, 1179669, 4, 0, 1179670, 4, 0, 1179671, 4, 0, 1179672, 4, 0, 1179673, 4, 0, 1179674, 4, 0, 1179675, 4, 0, 1179676, 4, 0, 1179677, 4, 0, 1179678, 4, 0, 1179679, 4, 0, 1179680, 4, 0, 1179681, 4, 0, 1179682, 4, 0, 1179683, 4, 0, 1179684, 4, 0, 1179685, 4, 0, 1179686, 4, 0, 1179687, 4, 0, 1179688, 4, 0, 1179689, 4, 0, 1179690, 4, 0, 1179691, 4, 0, 1310719, 4, 0, 1245184, 4, 0, 1245185, 4, 0, 1245186, 4, 0, 1245187, 4, 0, 1245188, 4, 0, 1245189, 4, 0, 1245190, 4, 0, 1245191, 4, 0, 1245192, 4, 0, 1245193, 4, 0, 1245194, 4, 0, 1245195, 4, 0, 1245196, 4, 0, 1245197, 4, 0, 1245198, 4, 0, 1245199, 4, 0, 1245200, 4, 0, 1245201, 4, 0, 1245202, 4, 0, 1245203, 4, 0, 1245204, 4, 0, 1245205, 4, 0, 1245206, 4, 0, 1245207, 4, 0, 1245208, 4, 0, 1245209, 4, 0, 1245210, 4, 0, 1245211, 4, 0, 1245212, 4, 0, 1245213, 4, 0, 1245214, 4, 0, 1245215, 4, 0, 1245216, 4, 0, 1245217, 4, 0, 1245218, 4, 0, 1245219, 4, 0, 1245220, 4, 0, 1245221, 4, 0, 1245222, 4, 0, 1245223, 4, 0, 1245224, 4, 0, 1245225, 4, 0, 1245226, 4, 0, 1245227, 4, 0, 1310731, 4, 0, 1310732, 4, 0, 1310733, 4, 0, 1310734, 4, 0, 1310735, 4, 0, 1310736, 4, 0, 1310737, 4, 0, 1310738, 4, 0, 1310739, 4, 0, 1310740, 4, 0, 1310741, 4, 0, 1310742, 4, 0, 1310743, 4, 0, 1310744, 4, 0, 1310745, 4, 0, 1310746, 4, 0, 1310747, 4, 0, 1310748, 4, 0, 1310749, 4, 0, 1310750, 4, 0, 1310751, 4, 0, 1310752, 4, 0, 1310753, 4, 0, 1310754, 4, 0, 1310755, 4, 0, 1310756, 4, 0, 1310757, 4, 0, 1310758, 4, 0, 1310759, 4, 0, 1310760, 4, 0, 1310761, 4, 0, 1310762, 4, 0, 1376273, 4, 0, 1376274, 4, 0, 1376275, 4, 0, 1376276, 4, 0, 1376277, 4, 0, 1376278, 4, 0, 1376279, 4, 0, 1376280, 4, 0, 1376281, 4, 0, 1376282, 4, 0, 1376283, 4, 0, 1376284, 4, 0, 1376285, 4, 0, 1376286, 4, 0, 1376287, 4, 0, 1376288, 4, 0, 1376289, 4, 0, 1376290, 4, 0, 1376291, 4, 0, 1376292, 4, 0, 1376293, 4, 0, 1376294, 4, 0, 1376295, 4, 0, 1376296, 4, 0, 1376297, 4, 0, 1376298, 4, 0, 1376299, 4, 0, 1441820, 4, 0, 1441821, 4, 0, 1441822, 4, 0, 1441823, 4, 0, 1441824, 4, 0, 1441825, 4, 0, 1441826, 4, 0, 1441829, 4, 0, 1441830, 4, 0, 1441831, 4, 0, 1441832, 4, 0, 1507363, 4, 0, 1507364, 4, 0, 1507365, 4, 0, 1507366, 4, 0, 1507367, 4, 0, 1507368, 4, 0, 1507369, 4, 0 ) -script = ExtResource( 3 ) - -[node name="armies" type="Node" parent="worldMapTiles"] - -[node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( 958.512, 510.399 ) -current = true -drag_margin_left = 0.0 -drag_margin_top = 0.0 -drag_margin_right = 0.0 -drag_margin_bottom = 0.0 -script = ExtResource( 4 ) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="WorldmapUI" type="Control" parent="CanvasLayer"] -margin_left = 1264.0 -margin_right = 1964.0 -margin_bottom = 1015.0 -script = ExtResource( 5 ) - -[node name="UIBG" type="NinePatchRect" parent="CanvasLayer/WorldmapUI"] -margin_right = 656.0 -margin_bottom = 1022.0 -texture = ExtResource( 6 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="fixed data" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG"] -margin_left = 22.0 -margin_top = 24.7542 -margin_right = 581.0 -margin_bottom = 189.754 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Spieler" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/fixed data"] -margin_right = 559.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "Spieler" - -[node name="Fraktion" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/fixed data"] -margin_top = 29.0 -margin_right = 559.0 -margin_bottom = 82.0 -custom_fonts/font = ExtResource( 7 ) -text = "Fraktion -" - -[node name="toDesigner" parent="CanvasLayer/WorldmapUI/UIBG/fixed data" instance=ExtResource( 8 )] -margin_top = 86.0 -margin_right = 559.0 -margin_bottom = 150.0 -script = ExtResource( 9 ) - -[node name="varData" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG"] -margin_left = 21.0 -margin_top = 407.05 -margin_right = 343.0 -margin_bottom = 981.05 - -[node name="regionData" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_right = 322.0 -margin_bottom = 60.0 - -[node name="cords_label" type="HBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData"] -margin_right = 322.0 -margin_bottom = 60.0 - -[node name="terrain" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label"] -margin_right = 150.0 -margin_bottom = 60.0 -rect_min_size = Vector2( 150, 60 ) -custom_fonts/font = ExtResource( 7 ) -text = "Terrain: " - -[node name="cords" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label"] -margin_left = 154.0 -margin_right = 179.0 -margin_bottom = 60.0 - -[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords"] -margin_right = 25.0 -margin_bottom = 25.0 - -[node name="n" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords/HBoxContainer"] -margin_right = 16.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "X: " - -[node name="x" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords/HBoxContainer"] -margin_left = 20.0 -margin_right = 25.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "1" - -[node name="HBoxContainer2" type="HBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords"] -margin_top = 29.0 -margin_right = 25.0 -margin_bottom = 54.0 - -[node name="n" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords/HBoxContainer2"] -margin_right = 15.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "Y: " - -[node name="y" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/regionData/cords_label/cords/HBoxContainer2"] -margin_left = 19.0 -margin_right = 24.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "1" - -[node name="Label" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 64.0 -margin_right = 322.0 -margin_bottom = 89.0 -custom_fonts/font = ExtResource( 7 ) -text = "Meine Armeen:" - -[node name="myArmies" type="ScrollContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 93.0 -margin_right = 322.0 -margin_bottom = 103.0 -scroll_vertical_enabled = false - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/myArmies"] -margin_right = 100.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 100, 10 ) - -[node name="Label2" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 107.0 -margin_right = 322.0 -margin_bottom = 132.0 -custom_fonts/font = ExtResource( 7 ) -text = "Verbündete Armeen:" - -[node name="alliedArmies" type="ScrollContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 136.0 -margin_right = 322.0 -margin_bottom = 146.0 -scroll_vertical_enabled = false - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/alliedArmies"] -margin_right = 100.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 100, 10 ) - -[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 150.0 -margin_right = 322.0 -margin_bottom = 189.0 - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer"] -margin_right = 113.0 -margin_bottom = 39.0 - -[node name="neutralArmy" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer/VBoxContainer"] -margin_right = 113.0 -margin_bottom = 25.0 -custom_fonts/font = ExtResource( 7 ) -text = "neutrale Armeen:" - -[node name="neutralArmies" type="ScrollContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer/VBoxContainer"] -margin_top = 29.0 -margin_right = 113.0 -margin_bottom = 39.0 -scroll_vertical_enabled = false - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer/VBoxContainer/neutralArmies"] -margin_right = 100.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 100, 10 ) - -[node name="HBoxContainer2" type="HBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData"] -margin_top = 193.0 -margin_right = 322.0 -margin_bottom = 247.0 - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer2"] -margin_right = 120.0 -margin_bottom = 54.0 - -[node name="enemy" type="Label" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer2/VBoxContainer"] -margin_right = 120.0 -margin_bottom = 40.0 -rect_min_size = Vector2( 120, 40 ) -custom_fonts/font = ExtResource( 7 ) -text = "Feinde :" - -[node name="enemybox" type="ScrollContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer2/VBoxContainer"] -margin_top = 44.0 -margin_right = 120.0 -margin_bottom = 54.0 -scroll_vertical_enabled = false - -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/WorldmapUI/UIBG/varData/HBoxContainer2/VBoxContainer/enemybox"] -margin_right = 100.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 100, 10 ) - -[node name="openRegion" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -margin_left = 340.095 -margin_top = 405.393 -margin_right = 424.095 -margin_bottom = 469.393 -focus_mode = 0 -enabled_focus_mode = 0 -script = ExtResource( 10 ) - -[node name="moveRight" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -margin_left = 442.057 -margin_top = 556.563 -margin_right = 526.057 -margin_bottom = 620.563 -script = ExtResource( 11 ) -moveX = 1 - -[node name="moveDown" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -margin_left = 391.497 -margin_top = 626.081 -margin_right = 475.497 -margin_bottom = 690.081 -script = ExtResource( 11 ) -moveY = 1 - -[node name="moveLeft" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -margin_left = 347.874 -margin_top = 555.455 -margin_right = 431.874 -margin_bottom = 619.455 -script = ExtResource( 11 ) -moveX = -1 - -[node name="moveUp" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -margin_left = 394.17 -margin_top = 484.541 -margin_right = 478.17 -margin_bottom = 548.541 -script = ExtResource( 11 ) -moveY = -1 - -[node name="y2" type="Label" parent="CanvasLayer/WorldmapUI/UIBG"] -margin_left = 277.381 -margin_top = 421.135 -margin_right = 295.381 -margin_bottom = 446.135 -custom_fonts/font = ExtResource( 7 ) -text = "1" - -[node name="Label" type="Label" parent="CanvasLayer/WorldmapUI/UIBG"] -margin_left = 220.449 -margin_top = 411.363 -margin_right = 308.449 -margin_bottom = 467.363 -custom_fonts/font = ExtResource( 7 ) -text = "Runde:" - -[node name="Research" parent="CanvasLayer/WorldmapUI/UIBG" instance=ExtResource( 8 )] -anchor_right = 0.2 -margin_left = 115.486 -margin_top = 195.952 -margin_right = 68.2861 -margin_bottom = 259.952 -script = ExtResource( 12 ) - -[node name="ResearchMenu" parent="CanvasLayer/WorldmapUI/UIBG/Research" instance=ExtResource( 13 )] -visible = false -show_behind_parent = true -margin_left = -1438.62 -margin_top = -152.671 -margin_right = 393.375 -margin_bottom = 782.329 -mouse_filter = 2 - -[node name="debugBtn" parent="." instance=ExtResource( 8 )] -margin_left = 1139.71 -margin_top = 30.8195 -margin_right = 1223.71 -margin_bottom = 94.8195 -script = ExtResource( 14 ) diff --git a/Server/Worldmap/wmTile.tscn b/Server/Worldmap/wmTile.tscn deleted file mode 100644 index 0c792a8..0000000 --- a/Server/Worldmap/wmTile.tscn +++ /dev/null @@ -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 ) diff --git a/Server/army/Army.tscn b/Server/army/Army.tscn deleted file mode 100644 index 5f1ade5..0000000 --- a/Server/army/Army.tscn +++ /dev/null @@ -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 ) diff --git a/Server/army/Attack.tscn b/Server/army/Attack.tscn deleted file mode 100644 index e64809b..0000000 --- a/Server/army/Attack.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=2] - -[node name="Node" type="Node"] diff --git a/Server/army/Effect.tscn b/Server/army/Effect.tscn deleted file mode 100644 index b541d10..0000000 --- a/Server/army/Effect.tscn +++ /dev/null @@ -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="."] diff --git a/Server/army/Stack.tscn b/Server/army/Stack.tscn deleted file mode 100644 index 904bc80..0000000 --- a/Server/army/Stack.tscn +++ /dev/null @@ -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 ) diff --git a/Server/army/Stack1x1.tscn b/Server/army/Stack1x1.tscn deleted file mode 100644 index 1e5ecff..0000000 --- a/Server/army/Stack1x1.tscn +++ /dev/null @@ -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 ) diff --git a/Server/army/Stack2x1.tscn b/Server/army/Stack2x1.tscn deleted file mode 100644 index 904bc80..0000000 --- a/Server/army/Stack2x1.tscn +++ /dev/null @@ -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 ) diff --git a/Server/army/UnitTemplate.tscn b/Server/army/UnitTemplate.tscn deleted file mode 100644 index 712b8a4..0000000 --- a/Server/army/UnitTemplate.tscn +++ /dev/null @@ -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 ) diff --git a/Server/autoloads/Network.gd b/Server/autoloads/Network.gd index 582f889..2e48cd6 100644 --- a/Server/autoloads/Network.gd +++ b/Server/autoloads/Network.gd @@ -25,8 +25,7 @@ remote func checkServerPassword(serverPassword): func createServer(password): pw = password - print("a") - print(pw) + print("server started \nunder password: ",pw) players[1] = self_data var host = NetworkedMultiplayerENet.new() host.create_server(DEFAULT_PORT, MAX_PLAYERS) @@ -57,30 +56,33 @@ func firstStart(): func _on_player_disconnected(id): pass -# players.erase(id) -# PlayerManager.player_disconnected(id) -func _on_player_connected(connected_player_id): - print(connected_player_id," connected") - request_player_info(connected_player_id) +remote func _on_player_connected(connected_player_id): + print(connected_player_id," has connected") + request_player_password(connected_player_id) func addPlayer(id, name): + print("added player ", id) pass var awaitingConfirmation = [] -func request_player_info(connected_player_id): +func request_player_password(connected_player_id): + print("requesting password") awaitingConfirmation.append(connected_player_id) rpc_id(connected_player_id, '_requestClientServerpassword') 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 password == pw: - rpc_id(clientId, "_validPassword") + rpc_id(clientId, "_passwordReturn", true) addPlayer(clientId,"replaceMe") + awaitingConfirmation.erase(clientId) 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. remote func _request_players(request_from_id): diff --git a/Server/font/anton.tres b/Server/font/anton.tres index 3f29579..46cd0e2 100644 --- a/Server/font/anton.tres +++ b/Server/font/anton.tres @@ -3,4 +3,5 @@ [ext_resource path="res://font/Anton-Regular.ttf" type="DynamicFontData" id=1] [resource] +size = 25 font_data = ExtResource( 1 ) diff --git a/Server/items/Equipment.tscn b/Server/items/Equipment.tscn deleted file mode 100644 index 3f22c97..0000000 --- a/Server/items/Equipment.tscn +++ /dev/null @@ -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 ) diff --git a/Server/items/Item.tscn b/Server/items/Item.tscn deleted file mode 100644 index 8ab1017..0000000 --- a/Server/items/Item.tscn +++ /dev/null @@ -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 ) diff --git a/Server/menues/ArmyButton.tscn b/Server/menues/ArmyButton.tscn deleted file mode 100644 index 7f66e99..0000000 --- a/Server/menues/ArmyButton.tscn +++ /dev/null @@ -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 diff --git a/Server/menues/ArmyDesigner/ArmyDesigner.tscn b/Server/menues/ArmyDesigner/ArmyDesigner.tscn deleted file mode 100644 index 8fe4d05..0000000 --- a/Server/menues/ArmyDesigner/ArmyDesigner.tscn +++ /dev/null @@ -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"] diff --git a/Server/menues/ArmyDesigner/designItemSocket.tscn b/Server/menues/ArmyDesigner/designItemSocket.tscn deleted file mode 100644 index 4b6d5fc..0000000 --- a/Server/menues/ArmyDesigner/designItemSocket.tscn +++ /dev/null @@ -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 ) diff --git a/Server/menues/Item.tscn b/Server/menues/Item.tscn deleted file mode 100644 index 1556289..0000000 --- a/Server/menues/Item.tscn +++ /dev/null @@ -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 ) diff --git a/Server/menues/Main Menue.tscn b/Server/menues/Main Menue.tscn index dd0bfa3..4b526b0 100644 --- a/Server/menues/Main Menue.tscn +++ b/Server/menues/Main Menue.tscn @@ -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://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] size = 80 @@ -54,9 +55,8 @@ margin_left = 862.0 margin_right = 1362.0 margin_bottom = 119.0 rect_min_size = Vector2( 500, 0 ) -align = 2 +custom_fonts/font = ExtResource( 3 ) max_length = 16 -secret = true [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] margin_top = 572.0 diff --git a/Server/menues/RegisterPlayerMenu.tscn b/Server/menues/RegisterPlayerMenu.tscn deleted file mode 100644 index 5438e2f..0000000 --- a/Server/menues/RegisterPlayerMenu.tscn +++ /dev/null @@ -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 diff --git a/Server/menues/research.tscn b/Server/menues/research.tscn deleted file mode 100644 index 5fa9d66..0000000 --- a/Server/menues/research.tscn +++ /dev/null @@ -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 diff --git a/Server/menues/smallbtn.tscn b/Server/menues/smallbtn.tscn deleted file mode 100644 index 3c3e07d..0000000 --- a/Server/menues/smallbtn.tscn +++ /dev/null @@ -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 diff --git a/Server/region/MineSmall.tscn b/Server/region/MineSmall.tscn deleted file mode 100644 index a229490..0000000 --- a/Server/region/MineSmall.tscn +++ /dev/null @@ -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 ) diff --git a/Server/region/Musik/DynamicMusic.tscn b/Server/region/Musik/DynamicMusic.tscn deleted file mode 100644 index 6aba1ce..0000000 --- a/Server/region/Musik/DynamicMusic.tscn +++ /dev/null @@ -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"] diff --git a/Server/region/Musik/audioSegent.tscn b/Server/region/Musik/audioSegent.tscn deleted file mode 100644 index 318a593..0000000 --- a/Server/region/Musik/audioSegent.tscn +++ /dev/null @@ -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 ) diff --git a/Server/region/Region.tscn b/Server/region/Region.tscn deleted file mode 100644 index 8cb3da2..0000000 --- a/Server/region/Region.tscn +++ /dev/null @@ -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 ) diff --git a/Server/region/RegionCreater.gd b/Server/region/RegionCreater.gd index cfcf375..0a2f5f7 100644 --- a/Server/region/RegionCreater.gd +++ b/Server/region/RegionCreater.gd @@ -1,28 +1,28 @@ extends Node -var Region = preload("res://region/Region.tscn") - - -func createRegion(regiontype,sizex:int, sizey:int, mapseed:int = 0): - var region = Region.instance() - var x = 0 - var y = 0 - var tile = mapseed - var map = region.get_node("ground") - if regiontype == 'GRASS': - while x