Fix PDF generation for coutier and ninja sheets

- Fix issue with NPC export

Author: OpenNingia

l5r/dialogs/npcexport.py

@@ -59,7 +59,7 @@ def build_ui(self):
         self.a_bt_browse = [QtWidgets.QToolButton(self), QtWidgets.QToolButton(self)]
 
         fnt = QtGui.QFont()
-        fnt.setPointSize(12.0)
+        fnt.setPointSize(12)
 
         for bt in self.a_bt_browse:
             bt.setAutoRaise(True)

l5r/exporters/fdfexporter.py

@@ -600,7 +600,7 @@ def export_body(self, io):
             else:
                 fields['WEAPON.DMG.%d' % j] = weap.base_dmg
             fields['WEAPON.NOTES.%d' % j] = weap.desc
-            
+
         # EXPORT FIELDS
         for k in fields:
             self.export_field(k, fields[k], io)
@@ -624,17 +624,17 @@ def export_body(self, io):
 
         count = min(2, len(schools))
         for i in range(0, count):
-            school = api.data.schools.get(schools[i])
             techs = api.character.schools.get_techs_by_school(schools[i])
-
-            fields['COURTIER_SCHOOL_NM.%d' % i] = school.name
+            school = api.data.schools.get(schools[i])
+            fields['BUSHI_SCHOOL_NM.%d' % i] = school.name
 
             for t in techs:
                 thsc, tech = api.data.schools.get_technique(t)
                 if not tech:
                     break
                 rank = tech.rank - 1 if tech.rank > 0 else 0
-                fields['COURTIER_SCHOOL_RANK.%d.%d' % (i, rank)] = tech.name
+                fields['BUSHI_TECH.%d.%d' % (rank, i)] = tech.name
+                fields['BUSHI_TECH_TEXT.%d.%d' % (rank, i)] = tech.desc
 
         # EXPORT FIELDS
         for k in fields:

l5r/l5rcmcore/__init__.py

@@ -232,23 +232,19 @@ def export_as_pdf(self, export_file):
 
         # SHUGENJA/BUSHI/MONK SHEET
         if is_shugenja:
-            self.write_pdf(
-                'sheet_shugenja.pdf', exporters.FDFExporterShugenja())
-            if kiho_count > 0:
-                self.write_pdf('sheet_monk.pdf', exporters.FDFExporterMonk())
+            self.write_pdf('sheet_shugenja.pdf', exporters.FDFExporterShugenja())
         elif is_bushi:
             self.write_pdf('sheet_bushi.pdf', exporters.FDFExporterBushi())
-        elif is_samurai_monk or is_ninja:
+        elif is_ninja:
+            self.write_pdf('sheet_bushi.pdf', exporters.FDFExporterBushi())            
+        elif is_samurai_monk:
             self.write_pdf('sheet_bushi.pdf', exporters.FDFExporterBushi())
-            if kiho_count > 0:
-                self.write_pdf('sheet_monk.pdf', exporters.FDFExporterMonk())
         elif is_monk:
             self.write_pdf('sheet_monk.pdf', exporters.FDFExporterMonk())
         elif is_courtier:
-            self.write_pdf(
-                'sheet_courtier.pdf', exporters.FDFExporterCourtier())
+            self.write_pdf('sheet_bushi.pdf', exporters.FDFExporterCourtier())
 
-        if kiho_count > 0 and not(is_monk):
+        if kiho_count > 0:
             self.write_pdf('sheet_monk.pdf', exporters.FDFExporterMonk())
 
         # SPELLS

l5r/sinks/sink_1.py

@@ -90,7 +90,7 @@ def export_character_as_pdf(self):
             try:
                 form.export_as_pdf(file_)
                 form.open_pdf_file_as_shell(file_)
-            except:
+            except Exception as e:
                 self.form.advise_error(self.tr("Cannot save pdf sheet."))            
 
     def switch_to_page_1(self):