From 88c06e6ef876220eac81a05d5ea41d77783ba0bd Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Tue, 12 Nov 2019 06:06:38 -0500 Subject: [PATCH 01/10] Cherrypick of TGC Bleed files commit Should bring me up to date. --- GameGen.py | 24 ++++++++++++++++++++++-- TSSSF_CardGen.py | 9 +++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/GameGen.py b/GameGen.py index 9af4075..ec1adc0 100644 --- a/GameGen.py +++ b/GameGen.py @@ -70,7 +70,10 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): module.CropPath = cropped_path vassal_path = CleanDirectory(path=folder + "/" + card_set, mkdir="vassal-images", rmstring="*.*") module.VassalPath = vassal_path - + TGC_path = CleanDirectory(path=folder+"/"+card_set, mkdir="TGC-images",rmstring="*.*") + module.TGCPath = TGC_path + + # Create output directory output_folder = CleanDirectory(path=folder, mkdir=card_set, rmstring="*.pdf") @@ -132,4 +135,21 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): args = parser.parse_args() - main(args.basedir, args.set_file) + #main(args.basedir, args.set_file) + main('TSSSF', 'Multiplicity 0.0.1a/cards.pon') + #main('TSSSF', '1.1.0 Patch/cards.pon') + #main('TSSSF', '2014 Con Exclusives/cards.pon') + #main('TSSSF', 'BABScon 2015/cards.pon') + #main('TSSSF', 'Core 1.0.5/cards.pon') + #main('TSSSF', 'Core 1.0.5 Delta/cards.pon') + #main('TSSSF', 'Core 1.1.0/cards.pon') + #main('TSSSF', 'Core 1.1.0 Test/cards.pon') + #main('TSSSF', 'Custom Card for/cards.pon') + #main('TSSSF', 'Extra Credit 0.10.4/cards.pon') + #main('TSSSF', 'Indiegogo/cards.pon') + #main('TSSSF', 'Patreon Expansion 1/cards.pon') + #main('TSSSF', 'Ponycon Panel 2015/cards.pon') + #main('TSSSF', 'Ponyville University 1.0.1/cards.pon') + #main('TSSSF', 'Ponyville University 0.0.2/cards.pon') + #main('TSSSF', 'Ponyville University 1.0.2/cards.pon') + #main('TSSSF', 'Thank You/cards.pon') diff --git a/TSSSF_CardGen.py b/TSSSF_CardGen.py index 4a1e439..675ebe5 100644 --- a/TSSSF_CardGen.py +++ b/TSSSF_CardGen.py @@ -20,6 +20,7 @@ BleedsPath = DIRECTORY + "/bleed-images/" CropPath = DIRECTORY + "/cropped-images/" VassalPath = DIRECTORY + "/vassal-images/" +TGCPath = DIRECTORY+"/TGC-images/" BleedTemplatesPath = ResourcePath + "/bleed templates/" SymbolsPath = ResourcePath + "/symbols/" @@ -43,7 +44,9 @@ baserect = [(w_marg, h_marg), (base_w - w_marg, base_h - h_marg)] textmaxwidth = 689 -croprect = (50, 63, 788 + 50, 1088 + 63) +TGC_SCALE = (825,1125) + +croprect=(50,63,788+50,1088+63) TextHeightThresholds = [363, 378, 600] TitleWidthThresholds = [50] # This is in #characters, fix later plox @@ -288,7 +291,9 @@ def BuildCard(data): else: filename = FixFileName(card_type + "_" + picture) SaveCard(os.path.join(BleedsPath, filename), im) - im_crop = im.crop(croprect) + im_TGC=PIL_Helper.ResizeImage(im, TGC_SCALE) + SaveCard(os.path.join(TGCPath, filename), im_TGC) + im_crop=im.crop(croprect) SaveCard(os.path.join(CropPath, filename), im_crop) im_vassal = PIL_Helper.ResizeImage(im_crop, VASSAL_SCALE) SaveCard(os.path.join(VassalPath, filename), im_vassal) From 018c3ad9c7fef06a60772d9555b5521d41e7ceb4 Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Tue, 12 Nov 2019 09:47:42 -0500 Subject: [PATCH 02/10] Commenting out missing expansions --- GameGen.py | 3 ++- TSSSF_CardGen.py | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/GameGen.py b/GameGen.py index ec1adc0..c23942c 100644 --- a/GameGen.py +++ b/GameGen.py @@ -136,7 +136,8 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): args = parser.parse_args() #main(args.basedir, args.set_file) - main('TSSSF', 'Multiplicity 0.0.1a/cards.pon') + #main('TSSSF', 'Core-Deck/cards.pon') + main('TSSSF', 'Multiplicity 0.0.1a/cards.json') #main('TSSSF', '1.1.0 Patch/cards.pon') #main('TSSSF', '2014 Con Exclusives/cards.pon') #main('TSSSF', 'BABScon 2015/cards.pon') diff --git a/TSSSF_CardGen.py b/TSSSF_CardGen.py index 675ebe5..20bdaae 100644 --- a/TSSSF_CardGen.py +++ b/TSSSF_CardGen.py @@ -36,7 +36,7 @@ VassalCard = [0] ART_WIDTH = 600 base_w = 889 -base_h = 1215 +base_h = 1214 base_w_center = base_w / 2 base_h_center = base_h / 2 w_marg = 31 @@ -135,30 +135,30 @@ TIMELINE_SYMBOL_LIST = ["Dystopian"] Expansions = { - "Everfree14": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Everfree14.png"), + #"Everfree14": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Everfree14.png"), "Indiegogo": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Indiegogo.png"), - "Birthday": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-birthday.png"), - "Bronycon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Bronycon14.png"), + #"Birthday": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-birthday.png"), + #"Bronycon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Bronycon14.png"), "Summer": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-summer-lovin.png"), - "Apricity": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-apricity.png"), - "BronyCAN": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Bronycan14.png"), + #"Apricity": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-apricity.png"), + #"BronyCAN": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Bronycan14.png"), "Xtra": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-extracredit.png"), - "Xtra-dark": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-extracredit-black.png"), - "NMND": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-nightmarenights.png"), - "Ciderfest": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-ponyvilleciderfest.png"), - "Adventure": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-adventure.png"), - "Custom": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-custom.png"), + #"Xtra-dark": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-extracredit-black.png"), + #"NMND": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-nightmarenights.png"), + #"Ciderfest": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-ponyvilleciderfest.png"), + #"Adventure": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-adventure.png"), + #"Custom": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-custom.png"), "Power": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-power.png"), "Multiplicity": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-multiplicity.png"), "Canon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-canon.png"), - "Dungeon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-dungeon.png"), + #"Dungeon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-dungeon.png"), "50": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-50.png"), - "2014": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-2014.png"), - "Hearthswarming": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-hearthswarming.png"), - "Ponycon 2015": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-ponynyc.png"), - "Patreon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Patreon.png"), - "Gameshow": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-gameshow.png"), - "BABScon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-BABScon.png") + #"2014": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-2014.png"), + #"Hearthswarming": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-hearthswarming.png"), + #"Ponycon 2015": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-ponynyc.png"), + #"Patreon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-Patreon.png"), + #"Gameshow": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-gameshow.png"), + #"BABScon": PIL_Helper.LoadImage(ExpansionIconsPath + "symbol-BABScon.png") } ColorDict = { From f773034d803cea9a393a6a277c447a5d241ef5a7 Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Thu, 2 Dec 2021 11:25:35 -0500 Subject: [PATCH 03/10] test commit --- .gitmodules | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e8cddb4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "Mini Expansions"] + path = TSSSF + url = https://github.com/DieKatzchen/Mini-Expansions.git +[submodule "Core Deck"] + path = TSSSF/Core-Deck + url = https://github.com/secretshipfic/Core-Deck.git +[submodule "Card Art"] + path = TSSSF/Card Art + url = https://github.com/DieKatzchen/Card-Art.git +[submodule "TSSSF Templates"] + path = TSSSF/resources + https://github.com/DieKatzchen/TSSSFTemplates.git \ No newline at end of file From 4cf995c425e599cb65c8fa03edff7317c27257f4 Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Sun, 5 Dec 2021 09:41:19 -0500 Subject: [PATCH 04/10] Port to Python 3 and add submodules Replace all print statements and cast floats to ints for PIL. PDF generation still broken, IM convert doesn't like something about the format. That's next on my list but it runs now so I'll take what I can get. Also added all card repositories as submodules --- .gitmodules | 25 +++++++++++++++++-------- GameGen.py | 26 ++++++++++++++------------ PIL_Helper.py | 12 ++++++------ TSSSF_CardGen.py | 10 +++++----- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index e8cddb4..809c8db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,21 @@ -[submodule "Mini Expansions"] - path = TSSSF - url = https://github.com/DieKatzchen/Mini-Expansions.git -[submodule "Core Deck"] - path = TSSSF/Core-Deck +[submodule "TSSSF/Core Deck"] + path = TSSSF/Core Deck url = https://github.com/secretshipfic/Core-Deck.git -[submodule "Card Art"] +[submodule "TSSSF/Card Art"] path = TSSSF/Card Art url = https://github.com/DieKatzchen/Card-Art.git -[submodule "TSSSF Templates"] +[submodule "TSSSF/Ponyville University"] + path = TSSSF/Ponyville University + url = https://github.com/secretshipfic/PonyvilleUniversity.git +[submodule "TSSSF/Mini Expansions"] + path = TSSSF/Mini Expansions + url = https://github.com/DieKatzchen/Mini-Expansions.git +[submodule "TSSSF/Expansions"] + path = TSSSF/Expansions + url = https://github.com/secretshipfic/Expansions.git +[submodule "TSSSF/Extra Credit"] + path = TSSSF/Extra Credit + url = https://github.com/secretshipfic/ExtraCredit.git +[submodule "TSSSF/resources"] path = TSSSF/resources - https://github.com/DieKatzchen/TSSSFTemplates.git \ No newline at end of file + url = https://github.com/secretshipfic/TSSSFTemplates.git diff --git a/GameGen.py b/GameGen.py index c23942c..06d1a54 100644 --- a/GameGen.py +++ b/GameGen.py @@ -10,7 +10,7 @@ import json -def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): +def main(folder="TSSSF", filepath="Core Deck/cards.json"): ''' @param folder: The base game folder where we'll be working. E.g. TSSSF, BaBOC @@ -33,7 +33,7 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): else: file_type = 'pon' if first_line == "TSSSF_CardGen": - print 'Warning: .pon files are DEPRECATED for TSSSF. Support for this format may be removed soon. Please use the pontojson.py converter to convert this file to JSON format.' + print('Warning: .pon files are DEPRECATED for TSSSF. Support for this format may be removed soon. Please use the pontojson.py converter to convert this file to JSON format.') module_name = first_line # Load Card File and strip out comments cards = [line for line in CardFile if not line[0] in ('#', ';', '/')] @@ -42,7 +42,7 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): try: module = __import__(module_name.strip()) except ValueError: - print "Failed to load module: " + str(ValueError) + print("Failed to load module: " + str(ValueError)) return card_set = os.path.dirname(filepath) if file_type == 'json': @@ -88,7 +88,7 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): # do that now, and set the card list to empty again if len(card_list) >= module.TOTAL_CARDS: page_num += 1 - print "Building Page {}...".format(page_num) + print("Building Page {}...".format(page_num)) BuildPage(card_list, page_num, module.PAGE_WIDTH, module.PAGE_HEIGHT, workspace_path) BuildBack(back_list, page_num, module.PAGE_WIDTH, module.PAGE_HEIGHT, workspace_path) card_list = [] @@ -102,18 +102,20 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): card_list.append(module.BuildCard("BLANK")) back_list.append(module.BuildCard("BLANK")) page_num += 1 - print "Building Page {}...".format(page_num) + print("Building Page {}...".format(page_num)) BuildPage(card_list, page_num, module.PAGE_WIDTH, module.PAGE_HEIGHT, workspace_path) BuildBack(back_list, page_num, module.PAGE_WIDTH, module.PAGE_HEIGHT, workspace_path) # Build Vassal module.CompileVassalModule() - print "\nCreating PDF..." - os.system(r'convert "{}/page_*.png" "{}/{}.pdf"'.format(workspace_path, output_folder, card_set)) - print "\nCreating PDF of backs..." - os.system(r'convert "{}/backs_*.png" "{}/backs_{}.pdf"'.format(workspace_path, output_folder, card_set)) - print "Done!" + print("\nCreating PDF...") + print('"{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, card_set)) + os.system(r'convert "{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, card_set)) + print("\nCreating PDF of backs...") + print('"{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, card_set)) + os.system(r'convert "{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, card_set)) + print("Done!") if __name__ == '__main__': @@ -136,8 +138,8 @@ def main(folder="TSSSF", filepath="Core Deck 1.1.6/cards.json"): args = parser.parse_args() #main(args.basedir, args.set_file) - #main('TSSSF', 'Core-Deck/cards.pon') - main('TSSSF', 'Multiplicity 0.0.1a/cards.json') + #main('TSSSF', 'Core Deck/cards.pon') + #main('TSSSF', 'Mini Expansions\Multiplicity 0.0.1a\cards.json') #main('TSSSF', '1.1.0 Patch/cards.pon') #main('TSSSF', '2014 Con Exclusives/cards.pon') #main('TSSSF', 'BABScon 2015/cards.pon') diff --git a/PIL_Helper.py b/PIL_Helper.py index f9c22e0..98ea20a 100644 --- a/PIL_Helper.py +++ b/PIL_Helper.py @@ -155,7 +155,7 @@ def AddText(image, text, font, fill=(0,0,0), anchor=(0,0), coords_y = anchor_y - height image.paste(ImageOps.colorize(layer, (255,255,255), fill), - (coords_x, coords_y), layer) + (int(coords_x), int(coords_y)), layer) return total_text_size @@ -171,11 +171,11 @@ def BuildPage(card_list, grid_width, grid_height, filename, w,h = card_list[0].size bg = Image.new("RGB", (w*grid_width, h*grid_height)) # Add cards to the grid, top down, left to right - for y in xrange(grid_height): - for x in xrange(grid_width): + for y in range(grid_height): + for x in range(grid_width): card = card_list.pop(0) - coords = (x*(w+cut_line_width), - y*(h+cut_line_width)) + coords = (int(x*(w+cut_line_width)), + int(y*(h+cut_line_width))) bg.paste(card, coords) # If there's a margin defined, add extra whitespace around the page # if h_margin > 0: @@ -195,7 +195,7 @@ def BuildPage(card_list, grid_width, grid_height, filename, w,h = bg.size # TODO Add code that shrinks the bg if it's bigger than any dimension # of the Paper image - paper_image.paste(bg, ((paper_width - w)/2, (paper_height - h)/2)) + paper_image.paste(bg, (int((paper_width - w)/2), int((paper_height - h)/2))) paper_image.save(filename, dpi=(300, 300)) def BlankImage(w, h, color=(255,255,255), image_type="RGBA"): diff --git a/TSSSF_CardGen.py b/TSSSF_CardGen.py index 20bdaae..6af99be 100644 --- a/TSSSF_CardGen.py +++ b/TSSSF_CardGen.py @@ -301,7 +301,7 @@ def BuildCard(data): im_crop = im.crop(croprect) except Exception as e: - print "Warning, Bad Card: {0}".format(data) + print("Warning, Bad Card: {0}".format(data)) traceback.print_exc() im_crop = MakeBlankCard().crop(croprect) return im_crop @@ -388,7 +388,7 @@ def TitleText(image, text, color): if len(text) > TitleWidthThresholds[0]: anchor = Anchors["TitleSmall"] font = fonts["TitleSmall"] - print repr(text) + print(repr(text)) PIL_Helper.AddText( image=image, text=text, @@ -676,7 +676,7 @@ def MakeSpecialCard(card): def MakeSpecialCardJSON(data): - print repr(data['picture']) + print(repr(data['picture'])) image = GetFrame(data['picture']) if data['picture'] in special_cards_with_copyright: CopyrightText(data, image, ColorDict["Copyright"], data.get('artist', ARTIST)) @@ -686,7 +686,7 @@ def MakeSpecialCardJSON(data): def MakeSpecialCardPON(data): - print repr(data[PICTURE]) + print(repr(data[PICTURE])) image = GetFrame(data[PICTURE]) if data[PICTURE] in special_cards_with_copyright: CopyrightText(data, image, ColorDict["Copyright"], ARTIST) @@ -709,4 +709,4 @@ def CompileVassalModule(): if __name__ == "__main__": - print "Not a main module. Run GameGen.py" + print("Not a main module. Run GameGen.py") From 233a544a40d2d23a6e010479968197d8a07271f0 Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Sun, 5 Dec 2021 10:16:39 -0500 Subject: [PATCH 05/10] Fixing PDF creation Fixing this was easier than I though. Once I figured out that it was doubling up the path, was easily able to fix it. Could refactor all uses of card_set to more accurately deal with subfolders but... the PDF creation was the only spot where it matters, so I just kludged in an os.path.basename() and was done with it. --- GameGen.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/GameGen.py b/GameGen.py index 06d1a54..be53ee4 100644 --- a/GameGen.py +++ b/GameGen.py @@ -110,11 +110,9 @@ def main(folder="TSSSF", filepath="Core Deck/cards.json"): module.CompileVassalModule() print("\nCreating PDF...") - print('"{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, card_set)) - os.system(r'convert "{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, card_set)) + os.system(r'magick convert "{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) print("\nCreating PDF of backs...") - print('"{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, card_set)) - os.system(r'convert "{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, card_set)) + os.system(r'magick convert "{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) print("Done!") @@ -139,7 +137,7 @@ def main(folder="TSSSF", filepath="Core Deck/cards.json"): #main(args.basedir, args.set_file) #main('TSSSF', 'Core Deck/cards.pon') - #main('TSSSF', 'Mini Expansions\Multiplicity 0.0.1a\cards.json') + main('TSSSF', 'Mini Expansions/Multiplicity 0.0.1a/cards.json') #main('TSSSF', '1.1.0 Patch/cards.pon') #main('TSSSF', '2014 Con Exclusives/cards.pon') #main('TSSSF', 'BABScon 2015/cards.pon') From d4dad6e113399a9543ef84d14f22484cd657f60e Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Sun, 5 Dec 2021 10:38:13 -0500 Subject: [PATCH 06/10] Fix bleed Changing to Int for PIL caused the bleed for card art to be wrong. Fixed it by adding 2 pixels to the width and shifting it left and up 1 pixel --- TSSSF_CardGen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TSSSF_CardGen.py b/TSSSF_CardGen.py index 6af99be..311d95b 100644 --- a/TSSSF_CardGen.py +++ b/TSSSF_CardGen.py @@ -34,7 +34,7 @@ VASSAL_SCALE = (260, 359) VassalCard = [0] -ART_WIDTH = 600 +ART_WIDTH = 602 base_w = 889 base_h = 1214 base_w_center = base_w / 2 @@ -66,7 +66,7 @@ Anchors = { "Blank": (base_w_center, 300), - "PonyArt": (173, 225), + "PonyArt": (172, 224), "ShipArt": (173, 226), "GoalArt": (174, 224), "Symbol1": (58 + 50, 56 + 63), From 3fa07a176fee0d7bfa11ca32546d794b57333cfd Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Sun, 5 Dec 2021 11:14:46 -0500 Subject: [PATCH 07/10] Point submodules to official sources --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 809c8db..dbe91de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,13 +3,13 @@ url = https://github.com/secretshipfic/Core-Deck.git [submodule "TSSSF/Card Art"] path = TSSSF/Card Art - url = https://github.com/DieKatzchen/Card-Art.git + url = https://github.com/secretshipfic/Card-Art.git [submodule "TSSSF/Ponyville University"] path = TSSSF/Ponyville University url = https://github.com/secretshipfic/PonyvilleUniversity.git [submodule "TSSSF/Mini Expansions"] path = TSSSF/Mini Expansions - url = https://github.com/DieKatzchen/Mini-Expansions.git + url = https://github.com/secretshipfic/Mini-Expansions.git [submodule "TSSSF/Expansions"] path = TSSSF/Expansions url = https://github.com/secretshipfic/Expansions.git From b4622d923f414c11382ee39a1cb455f33404c927 Mon Sep 17 00:00:00 2001 From: DieKatzchen Date: Fri, 17 Dec 2021 08:13:58 -0800 Subject: [PATCH 08/10] Point submodules back at my working repositories --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index dbe91de..21fedae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,13 +3,13 @@ url = https://github.com/secretshipfic/Core-Deck.git [submodule "TSSSF/Card Art"] path = TSSSF/Card Art - url = https://github.com/secretshipfic/Card-Art.git + url = https://github.com/DieKatzchen/Card-Art.git [submodule "TSSSF/Ponyville University"] path = TSSSF/Ponyville University url = https://github.com/secretshipfic/PonyvilleUniversity.git [submodule "TSSSF/Mini Expansions"] path = TSSSF/Mini Expansions - url = https://github.com/secretshipfic/Mini-Expansions.git + url = https://github.com/DieKatzchen/Mini-Expansions.git [submodule "TSSSF/Expansions"] path = TSSSF/Expansions url = https://github.com/secretshipfic/Expansions.git @@ -18,4 +18,4 @@ url = https://github.com/secretshipfic/ExtraCredit.git [submodule "TSSSF/resources"] path = TSSSF/resources - url = https://github.com/secretshipfic/TSSSFTemplates.git + url = https://github.com/DieKatzchen/TSSSFTemplates.git From 22faca131b6f1277beb71334b39b8170ec93a2eb Mon Sep 17 00:00:00 2001 From: Diekatzchen Date: Sun, 27 Oct 2024 07:56:56 -0400 Subject: [PATCH 09/10] Change `\` to `/` This makes it work on both both Windows and Linux, since Windows is slash-agnostic --- GameGen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameGen.py b/GameGen.py index be53ee4..9ce7515 100644 --- a/GameGen.py +++ b/GameGen.py @@ -110,9 +110,9 @@ def main(folder="TSSSF", filepath="Core Deck/cards.json"): module.CompileVassalModule() print("\nCreating PDF...") - os.system(r'magick convert "{}\page_*.png" "{}\{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) + os.system(r'magick convert "{}/page_*.png" "{}/{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) print("\nCreating PDF of backs...") - os.system(r'magick convert "{}\backs_*.png" "{}\backs_{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) + os.system(r'magick convert "{}/backs_*.png" "{}/backs_{}.pdf"'.format(workspace_path, output_folder, os.path.basename(card_set))) print("Done!") From 27205bf0ad46928894e1b5071eee49750f90c5eb Mon Sep 17 00:00:00 2001 From: Diekatzchen Date: Sun, 27 Oct 2024 08:04:50 -0400 Subject: [PATCH 10/10] Change submodule for Card Art to Multiplicity As that is the branch I primarily work with --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 21fedae..6f3b00e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,7 @@ [submodule "TSSSF/Mini Expansions"] path = TSSSF/Mini Expansions url = https://github.com/DieKatzchen/Mini-Expansions.git + branch = Multiplicity [submodule "TSSSF/Expansions"] path = TSSSF/Expansions url = https://github.com/secretshipfic/Expansions.git