Compare commits

..

7 Commits

2 changed files with 106 additions and 63 deletions

12
main.py
View File

@@ -1,3 +1,5 @@
from datetime import time
import datetime
import discord import discord
import os import os
from discord.ext import tasks from discord.ext import tasks
@@ -42,6 +44,8 @@ async def on_ready():
@tasks.loop(seconds=5) @tasks.loop(seconds=5)
async def task_loop(): async def task_loop():
try:
# print(str(datetime.datetime.now()) + ": Loop running.")
await bot.change_presence( await bot.change_presence(
activity=discord.Activity( activity=discord.Activity(
type=discord.ActivityType.watching, type=discord.ActivityType.watching,
@@ -86,7 +90,11 @@ async def task_loop():
) )
if value == "Eliminated": if value == "Eliminated":
await channel.send( await channel.send(
'Game **"' + game.name + '"**: ' + key + " has been eliminated." 'Game **"'
+ game.name
+ '"**: '
+ key
+ " has been eliminated."
) )
if value == "Turn unfinished": if value == "Turn unfinished":
await channel.send( await channel.send(
@@ -98,3 +106,5 @@ async def task_loop():
) )
game.update_players() game.update_players()
game.to_json() game.to_json()
except Exception as e:
print(e)

View File

@@ -77,9 +77,9 @@ def creator_page():
) )
) )
# client_start = ui.checkbox("Allow clients to start the game")
checkbox_container = ui.row() checkbox_container = ui.row()
with checkbox_container: with checkbox_container:
client_start = ui.checkbox("Allow clients to start the game", value=True)
team_game = ui.checkbox("Disciple Game") team_game = ui.checkbox("Disciple Game")
clustered_start = ui.checkbox("Clustered Spawns (Disciple games only)") clustered_start = ui.checkbox("Clustered Spawns (Disciple games only)")
random_start_research = ui.checkbox("Random Start Research") random_start_research = ui.checkbox("Random Start Research")
@@ -91,16 +91,31 @@ def creator_page():
no_new_ai = ui.checkbox("Disable Becoming AI Controlled") no_new_ai = ui.checkbox("Disable Becoming AI Controlled")
vwrap = ui.checkbox("North South Wrapping") vwrap = ui.checkbox("North South Wrapping")
hwrap = ui.checkbox("East West Wrapping") hwrap = ui.checkbox("East West Wrapping")
description_container = ui.row() with ui.row():
toggle_container = ui.row() ui.label("Event Rarity").classes("w-40")
# TODO: Are these containers still needed? ui.label("Provinces per player").classes("w-36")
with toggle_container: ui.label("Story Events")
with ui.row():
event_rarity = ui.toggle({1: "Common", 2: "Rare"}, value=1) event_rarity = ui.toggle({1: "Common", 2: "Rare"}, value=1)
random_map = ui.toggle([10, 15, 20], value=15) random_map = ui.toggle([10, 15, 20], value=15)
with description_container: story_events = ui.toggle({0: "None", 1: "Some", 2: "All"}, value=2)
ui.label("Event Rarity")
# TODO: Fix Padding ui.label("Victory Condition")
ui.label("Provinces per player:") # I have to do this to pass by reference?? This is absurd.
conq_all = [True]
thrones = [(0, 0, 0)]
required_apoints = [0]
with ui.row():
ui.radio({1: "Conquest", 2: "Thrones Of Ascension"}).props(
"inline"
).on_value_change(
lambda e: handle_thrones(
e, throne_container, conq_all, thrones, required_apoints
)
)
throne_container = ui.row()
with ui.row(): with ui.row():
ui.label("Gold Multiplier:").classes("w-36") ui.label("Gold Multiplier:").classes("w-36")
richness = ui.input( richness = ui.input(
@@ -164,11 +179,29 @@ def creator_page():
resources=int(resources.value), resources=int(resources.value),
richness=int(richness.value), richness=int(richness.value),
supplies=int(supplies.value), supplies=int(supplies.value),
story_events=int(story_events.value),
conq_all=conq_all,
) )
), ),
) )
def handle_thrones(value, throne_container, conq_all, thrones, required_apoints):
if value == 1:
throne_container.clear()
conq_all[0] = False
return
with throne_container:
with ui.row():
thrones = (
ui.input(label="Level 1"),
ui.input(label="Level 2"),
ui.input(label="Level 3"),
)
required_apoints = ui.input(label="Required Ascension Points")
return False, thrones, required_apoints
def create_ai_table(era, table_container, ai_slots): def create_ai_table(era, table_container, ai_slots):
# TODO: move this somewhere else # TODO: move this somewhere else
AI_LEVELS = [ AI_LEVELS = [