Permalink
Browse files

Merge pull request #6 from mounirlamouri/iwd-chargen

Improve IWD character generation
  • Loading branch information...
2 parents 4d5bba3 + 0e2afa2 commit 998b744682bf262b201c9c9d18082a338005a599 @lynxlynxlynx lynxlynxlynx committed Oct 14, 2013
Showing with 31 additions and 6 deletions.
  1. +11 −6 gemrb/GUIScripts/iwd/CharGen.py
  2. +20 −0 gemrb/unhardcoded/how/pictures.2da
@@ -674,6 +674,7 @@ def PortraitSelect():
Portrait = 0
PortraitPortraitButton = PortraitWindow.GetControl (1)
+ PortraitPortraitButton.SetState (IE_GUI_BUTTON_DISABLED)
PortraitPortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET)
PortraitLeftButton = PortraitWindow.GetControl (2)
@@ -2558,10 +2559,15 @@ def BiographyPress():
CharGenWindow.SetVisible (WINDOW_INVISIBLE)
BiographyWindow = GemRB.LoadWindow (51)
-
BiographyField = BiographyWindow.GetControl (4)
- BiographyField.SetText (19423)
- BiographyField.SetBackground("")
+ BiographyField = BiographyField.ConvertEdit (3)
+ BiographyField.SetStatus (IE_GUI_CONTROL_FOCUSED)
+
+ BIO = GemRB.GetToken("Biography")
+ if BIO:
+ BiographyField.SetText (BIO)
+ else:
+ BiographyField.SetText (19423)
BiographyClearButton = BiographyWindow.GetControl (5)
BiographyClearButton.SetState (IE_GUI_BUTTON_ENABLED)
@@ -2578,7 +2584,6 @@ def BiographyPress():
BiographyDoneButton.SetState (IE_GUI_BUTTON_ENABLED)
BiographyDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, BiographyDonePress)
BiographyDoneButton.SetText (11973)
- BiographyDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
BiographyWindow.SetVisible (WINDOW_VISIBLE)
return
@@ -2731,9 +2736,9 @@ def ImportDonePress():
SkillsButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND)
AppearanceButton.SetState (IE_GUI_BUTTON_ENABLED)
AppearanceButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
- BiographyButton.SetState (IE_GUI_BUTTON_ENABLED)
+ BiographyButton.SetState (IE_GUI_BUTTON_DISABLED)
BiographyButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
- NameButton.SetState (IE_GUI_BUTTON_ENABLED)
+ NameButton.SetState (IE_GUI_BUTTON_DISABLED)
NameButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
CharGenWindow.SetVisible (WINDOW_VISIBLE)
if ImportWindow:
@@ -34,3 +34,23 @@ HeMF_ 1
HeMT_ 1
HeMW_ 1
HFW2_ 2
+HMF3_ 1
+EFW2_ 2
+HFW3_ 2
+EFF_ 2
+HMF4_ 1
+EMC_ 1
+HMW2_ 1
+HMW3_ 1
+HMC2_ 1
+HMC3_ 1
+HMF5_ 1
+HMB2_ 1
+DMF2_ 1
+HFT2_ 2
+HFD_ 2
+HFF2_ 2
+HMC4_ 1
+HMF6_ 1
+HMF7_ 1
+HMW4_ 1

0 comments on commit 998b744

Please sign in to comment.