поправлен цикл

This commit is contained in:
Евгений Храмов 2023-05-17 15:48:24 +03:00
parent 8b3aaa3f6a
commit 5f52b7f364

163
hlna.py

@ -229,59 +229,60 @@ def config_nummap():
def config_maps(i): def config_maps(i):
"""Проверка на выбор карты из списка""" while True:
amount_map = check_int("""Выберите карту из списка указав номер """Проверка на выбор карты из списка"""
1. The Island amount_map = check_int("""Выберите карту из списка указав номер
2. The Center 1. The Island
3. Scorched Earth 2. The Center
4. Ragnarok 3. Scorched Earth
5. Aberration 4. Ragnarok
6. Extinction 5. Aberration
7. Valguero 6. Extinction
8. Genesis: Part 1 7. Valguero
9. Crystal Isles 8. Genesis: Part 1
10. Genesis: Part 2 9. Crystal Isles
11. Lost Island 10. Genesis: Part 2
12. Fjordur 11. Lost Island
: """) 12. Fjordur
if amount_map == 0: # 0 возвращает check_int когда, ничего не было введено : """)
amount_map = i + 1 if amount_map == 0: # 0 возвращает check_int когда, ничего не было введено
if 0 < amount_map <= 12: amount_map = i + 1
# тут должно быть прерывание цикла из config_ark if 0 < amount_map <= 12:
break
if list_config: if list_config:
port_s, query_p, rcon_p = ports_array() port_s, query_p, rcon_p = ports_array()
else: else:
port_s = query_p = rcon_p = [] port_s = query_p = rcon_p = []
if amount_map == 1: if amount_map == 1:
map_s = "TheIsland" map_s = "TheIsland"
elif amount_map == 2: elif amount_map == 2:
map_s = "TheCenter" map_s = "TheCenter"
elif amount_map == 3: elif amount_map == 3:
map_s = "ScorchedEarth_P" map_s = "ScorchedEarth_P"
elif amount_map == 4: elif amount_map == 4:
map_s = "Ragnarok" map_s = "Ragnarok"
elif amount_map == 5: elif amount_map == 5:
map_s = "Aberration_P" map_s = "Aberration_P"
elif amount_map == 6: elif amount_map == 6:
map_s = "Extinction" map_s = "Extinction"
elif amount_map == 7: elif amount_map == 7:
map_s = "Valguero_P" map_s = "Valguero_P"
elif amount_map == 8: elif amount_map == 8:
map_s = "Genesis" map_s = "Genesis"
elif amount_map == 9: elif amount_map == 9:
map_s = "CrystalIsles" map_s = "CrystalIsles"
elif amount_map == 10: elif amount_map == 10:
map_s = "Gen2" map_s = "Gen2"
elif amount_map == 11: elif amount_map == 11:
map_s = "LostIsland" map_s = "LostIsland"
elif amount_map == 12: elif amount_map == 12:
map_s = "Fjordur" map_s = "Fjordur"
else: else:
# Если вдруг каким-то боком проверка не отработает и не будет нужной цифры # Если вдруг каким-то боком проверка не отработает и не будет нужной цифры
map_s = 'TheIsland' map_s = 'TheIsland'
return map_s, port_s, query_p, rcon_p return map_s, port_s, query_p, rcon_p
def config_nameserver(map_s): def config_nameserver(map_s):
@ -324,46 +325,46 @@ def config_ark(list_config=list_config):
count_maps = config_nummap() count_maps = config_nummap()
print_line(count_maps) print_line(count_maps)
for i in range(count_maps): for i in range(count_maps):
while True:
map_s, port_s, query_p, rcon_p = config_maps(i) map_s, port_s, query_p, rcon_p = config_maps(i)
print_line(map_s, port_s, query_p, rcon_p) print_line(map_s, port_s, query_p, rcon_p)
list_config = config_nameserver(map_s) list_config = config_nameserver(map_s)
port = check_int("Укажите порт сервера: ") port = check_int("Укажите порт сервера: ")
port_server = ports(port, port_s, True) port_server = ports(port, port_s, True)
port = check_int("Укажите query порт сервера: ") port = check_int("Укажите query порт сервера: ")
query_port = ports(port, query_p, False) query_port = ports(port, query_p, False)
port = check_int("Укажите порт сервера: ") port = check_int("Укажите порт сервера: ")
rcon_port = ports(port, rcon_p, True) rcon_port = ports(port, rcon_p, True)
rcon_enabled = True rcon_enabled = True
password_server = input("Укажите пароль Сервера: \n") password_server = input("Укажите пароль Сервера: \n")
adminpassword_server = 123 adminpassword_server = 123
max_players = check_int("Укажите максимальное количество игроков: \n") max_players = check_int("Укажите максимальное количество игроков: \n")
if max_players == 0: if max_players == 0:
max_players = 70 max_players = 70
print("Передавать сервер в глобальный список серверов steam?") print("Передавать сервер в глобальный список серверов steam?")
listen_server_amount = check_int("""\n listen_server_amount = check_int("""\n
1. Да 1. Да
2. Нет 2. Нет
:""") :""")
if listen_server_amount == 1: if listen_server_amount == 1:
listen_server = True listen_server = True
elif listen_server_amount == 2: elif listen_server_amount == 2:
listen_server = False listen_server = False
else: else:
listen_server = True listen_server = True
print_line(cluster_server, map_s, list_config[-1], port_server, query_port, print_line(cluster_server, map_s, list_config[-1], port_server, query_port,
rcon_enabled, rcon_port, adminpassword_server, password_server, max_players, rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
cluster_id, cluster_dir_override, listen_server) cluster_id, cluster_dir_override, listen_server)
yaml_create("ARK", "", cluster_server, map_s, list_config[-1], port_server, query_port, yaml_create("ARK", "", cluster_server, map_s, list_config[-1], port_server, query_port,
rcon_enabled, rcon_port, adminpassword_server, password_server, max_players, rcon_enabled, rcon_port, adminpassword_server, password_server, max_players,
cluster_id, cluster_dir_override, listen_server) cluster_id, cluster_dir_override, listen_server)
def config_7daystodie(): def config_7daystodie():