Some final copyright compliance.

All sounds are accounted for EXCEPT for the drum sounds.
(drumscw1.ogg is OK)

Updated the credits too.
Probably will want a new accept sound, but that's what I could find right away.

CREDITS

@@ -1,44 +1,63 @@
 =======================CREDITS:========================
 =======================================================
+!.8!
 _%intro%_
+!1!
 -------------------------------------------------------
 
 =%coders%=
-`%noOrder%`
-Chris Paiano (Myfingershurt)
-Pascal Giard (evilynux)
+`%accessOrder%`
 Nicholas Hydock (Blazingamer)
-Harris Worthington (Qstick)
 Tom Skinner (akedrou)
 John Stumpo (stump)
-Worldrave
 fuzion
-Weirdpeople
-
-=%pastCoders%=
-`%noOrder%`
-Alarian
-Capo
-Glorandwarf
-ShiekOdaSandz
-QQStarS
-wolferacing
-rchiav
-.liquid.
+Matthew Sitton (Weirdpeople)
 
 =%graphics%=
-`%noOrder%`
-Alarian
-Ds~
-D�vid
-EdisLeado
-Skor
-Worldrave
-Blazingamer (MegaLight)
-kristijan_mkd
+Nicholas Hydock
+Kristijan Ristovki (kristijan_mkd)
+kawaii_kumiko
+Unreal Voodoo
+
+=%3d%=
+Nicholas Hydock
+Unreal Voodoo
+
+=%shaders%=
+volshebnyi
+
+=%hollowmind%=
+Richard Askren
+
+=%themes%=
+Nicholas Hydock (MegaLight v4, MegaLight GH3)
 estemshorn (UberLight)
-Ryoma
-Richard Askren (Hollowmind necks)
+
+=%sounds%=
+Tom Skinner
+hans reimers
+
+
+
+
+=%honorary%=
+`%codeHonor%`
+
+Chris Paiano (myfingershurt), Pascal Giard (evilynux),
+Alarian, Rogue_F, h3r1n6, Ultimate Coffee, Unreal Voodoo
+
+
+
+
+
+
+=%logo%=
+Ds~
+
+=%otherCoding%=
+Capo, Glorandwarf, ShiekOdaSandz, QQStarS
+wolferacing, rchiav, .liquid., maxx.h2
+Harris Worthington (Qstick), Worldrave
 
 =%translators%=
 `%french%`
@@ -60,62 +79,34 @@ Borisdsp
 `%swedish%`
 Anton Tamminen
 
-=%Team Hero%=
-`%careerMode%`
-Lsapg09, Jrdnxxhero, Blackfriday, blessedmain911, ADH,
-razlo7, coolguy5678, arfn24, Qwedgeonline
+=%giveThanks%=
+%community%
 
-=%honorary%=
-Rogue_F, h3r1n6, Ultimate Coffee, Unreal Voodoo
-
-=%donations%=
-`%majorDonor%`
-Slantyr ($50.00)
-OpenChord.org ($50.00)
-fralacos ($42.00)
-Mr. Loeffel ($40.00)
-Matt (KillerQ) ($35.00)
-DaveC ($30.00)
-Nickman ($23.23)
-
-`%otherDonor%`
-ensless ($17.00)
-ThomasMink, MasterPhW ($15.00)
-owensdill ($11.10)
-Bluto ($10.00)
-Anonymous ($8.00)
-SmashD ($7.50)
-Simon Lemaire, Ryan Turcotte, Ethd,
-BorisDSP, ForFretsSake,
-Tynam, Noel Varelas,
-and christcenteredgamer.com ($5.00)
-kirbix ($3.00)
-James Subrecky ($2.50)
-Jacob Bartoszek, Roliwood73 ($2.00)
-death_au ($1.75)
-Roland Willa ($1.00)
-
-=%adonations%=
-`%majorDonor%`
-Lysdestic
 
 =%other%=
 `%noOrder%`
-Aduro, blessedmain911, Chadman, Divra, Evil Ken, FoZZ,
-Kookoz, Inkk, Meteorito, Pudding, Racer 13, Raph666,
-RavenSourcious, Seraph88, TXF, v4vendetta, YMS,
-Figure, anthman852, Happ E Nose, Death Au, jnuz,
-italiansta1ion, lsapg09, rubjonny, slantyr,
-Tpyn, cama, kingleonidas, MoonFlow43, evil-doer,
-D4rksh4d0w, bluzer, MistTribe, faaa, ugo247548 (Biskit),
-jacobo123, mrhoeivo, sherranjjj001, JcFerggy, iamnoob,
-Death Legion, kawaii_kumiko69, gamexprt1, acrox999,
-p_025, treckzy, slash666, mrhoievo, Dillusional,
-SneakHouse, Borisdsp, Don Tonberry, Gugered,
-NewCreature, rock8200, Leixner, Trinidude4, ver,
-evilbobthebob, deufeufeu, Steven Knapman,
-volshebnyi, maxx.h2
+!.5!
+
+Lsapg09, Jrdnxxhero, Blackfriday, blessedmain911, ADH, razlo7, coolguy5678, arfn24, Qwedgeonline,
+Aduro, blessedmain911, Chadman, Divra, Evil Ken, FoZZ, Kookoz, Inkk, Meteorito, Pudding, Racer 13, Raph666,
+RavenSourcious, Seraph88, TXF, v4vendetta, YMS, Figure, anthman852, Happ E Nose, Death Au, jnuz,
+italiansta1ion, lsapg09, rubjonny, slantyr, Tpyn, cama, kingleonidas, MoonFlow43, evil-doer,
+D4rksh4d0w, bluzer, MistTribe, faaa, ugo247548 (Biskit), jacobo123, mrhoeivo, sherranjjj001, JcFerggy, iamnoob,
+Death Legion, gamexprt1, acrox999, p_025, treckzy, slash666, mrhoievo, Dillusional,
+SneakHouse, Borisdsp, Don Tonberry, Gugered, NewCreature, rock8200, Leixner, Trinidude4, ver,
+evilbobthebob, deufeufeu, Steven Knapman, D�vid, EdisLeado, Skor, Ryoma
+
+!.75!
+_%disclaimer%_
+
+_%thanks%_
+
+_%oversight%_
+
+
+
 
+!1!
 _%tutorial%_
 =======================================================
 

src/Credits.py

@@ -119,34 +119,34 @@ def __init__(self, engine, songName = None):
 
     #akedrou - Translatable Strings:
     self.bank = {}
-    self.bank['intro']      = [_("This mod was built on Alarian's mod,"),
+    self.bank['intro']      = [_("Frets on Fire X is a progression of MFH-mod,"),
+                               _("which was built on Alarian's mod,"),
                                _("which was built on UltimateCoffee's Ultimate mod,"),
                                _("which was built on RogueF's RF_mod 4.15,"),
                                _("which was, of course, built on Frets on Fire 1.2.451,"),
                                _("which was created by Unreal Voodoo")]
-    self.bank['noOrder']    = [_("No Particular Order")]
-    self.bank['coders']     = [_("Active Coders:")]
-    self.bank['pastCoders'] = [_("Past Coders:")]
-    self.bank['graphics']   = [_("Main Graphic Contributors:")]
-    self.bank['translators']= [_("Translators:")]
-    self.bank['Team Hero']  = [_("Team Hero:")]
-    self.bank['careerMode'] = [_("Creators of Career Mode")]
-    self.bank['honorary']   = [_("Honorary Credits to:")]
-    self.bank['donations']  = [_("Donations to MFH")]
-    self.bank['adonations'] = [_("Donations to akedrou")]
-    self.bank['majorDonor'] = [_("Major Donations:")]
-    self.bank['otherDonor'] = [_("Other Donations:")]
-    self.bank['other']      = [_("Other Credits:")]
+    self.bank['noOrder']    = [_("No particular order")]
+    self.bank['accessOrder']= [_("In order of project commit access")]
+    self.bank['coders']     = [_("Active Coders")]
+    self.bank['otherCoding']= [_("Programming")]
+    self.bank['graphics']   = [_("Graphic Design")]
+    self.bank['3d']         = [_("3D Textures")]
+    self.bank['logo']       = [_("FoFiX Logo Design")]
+    self.bank['hollowmind'] = [_("Hollowmind Necks")]
+    self.bank['themes']     = [_("Included Themes")]
+    self.bank['shaders']    = [_("Shaders")]
+    self.bank['sounds']     = [_("Sound Design")]
+    self.bank['translators']= [_("Translators")]
+    self.bank['honorary']   = [_("Honorary Credits")]
+    self.bank['codeHonor']  = [_("Without whom this game would not exist")]
+    self.bank['giveThanks'] = [_("Special Thanks to")]
+    self.bank['community']  = [_("nwru and all of the community at fretsonfire.net")]
+    self.bank['other']      = [_("Other Contributors:")]
     self.bank['tutorial']   = [_("Jurgen FoF tutorial inspired by adam02"),
                                _("Drum test song tutorial by Heka"),
-                               _("Bang Bang Mystery Man song tutorial is from the original FoF"),
                                _("Drum Rolls practice tutorial by venom426")]
-    self.bank['disclaimer'] = [_("If you see your work included in this game and you aren't"),
-                               _("in the credits, please leave a polite post stating what you"),
-                               _("did and when, as specific as possible."),
-                               _("If you can, please provide a link to your original posting"),
-                               _("of the work in question."),
-                               _("Then we can properly credit you.")]
+    self.bank['disclaimer'] = [_("If you have contributed to this game and are not credited,"),
+                               _("please let us know what and when you contributed.")]
     self.bank['thanks']     = [_("Thank you for your contribution.")]
     self.bank['oversight']  = [_("Please keep in mind that it is not easy to trace down and"),
                                _("credit every single person who contributed; if your name is"),
@@ -191,25 +191,16 @@ def __init__(self, engine, songName = None):
     space = Text(nf, hs, c1, "center", " ")
     self.credits = [
       Picture(self.engine, "fofix_logo.png", .10), 
-      Text(nf, ns, c1, "center", "%s" % Version.version()) ]
+      Text(nf, ns, c1, "center", "%s" % Version.version()), space]
 
     # evilynux: Main FoFiX credits (taken from CREDITS).
     self.parseText("CREDITS")
+    self.credits.extend([space, space, space])
     # evilynux: Theme credits (taken from data/themes/<theme name>/CREDITS).
     self.parseText(os.path.join('data', 'themes', self.themename, 'CREDITS'))
 
-    self.credits.append(space)
-    for i in self.bank['disclaimer']:
-      self.credits.append( Text(nf, ns, c2, "center", i ) )
-    self.credits.append(space)
-    for i in self.bank['thanks']:
-      self.credits.append( Text(nf, ns, c2, "center", i ) )
-    self.credits.append(space)
-    for i in self.bank['oversight']:
-      self.credits.append( Text(nf, ns, c2, "center", i ) )
-
     self.credits.extend( [
-      space,
+      space, space, 
       Text(nf, ns, c1, "left",   _("Made with:")),
       Text(nf, ns, c2, "right",  "Python " + sys.version.split(' ')[0]),  #stump: the version that's actually in use
       Text(nf, bs, c2, "right",  "http://www.python.org"),
@@ -249,6 +240,7 @@ def parseText(self, filename):
     c1 = (1, 1, .5, 1)
     c2 = (1, .75, 0, 1)
     space = Text(nf, hs, c1, "center", " ")
+    scale = 1
 
     path = filename
     if not hasattr(sys,"frozen"): #MFH - add ".." to path only if running from sources - not if running from EXE
@@ -261,6 +253,12 @@ def parseText(self, filename):
       line = line.strip("\n")
       if line.startswith("=====") or line.startswith("-----"):
         continue
+      try:
+        if line.startswith("!") and line.endswith("!"):
+          scale = float(line.strip("!"))
+          continue
+      except ValueError:
+        Log.warn("CREDITS file does not parse properly")
       if line == "":
         self.credits.append(space)
       elif line.startswith("`") and line.endswith("`"):
@@ -269,43 +267,43 @@ def parseText(self, filename):
           line = line.strip("%")
           try:
             for text in self.bank[line]:
-              self.credits.append( Text(nf, bs, c1, "left", "%s" % text) )
+              self.credits.append( Text(nf, bs*scale, c1, "left", "%s" % text) )
           except KeyError:
-            self.credits.append( Text(nf, bs, c1, "left", "%s" % line) )
+            self.credits.append( Text(nf, bs*scale, c1, "left", "%s" % line) )
         else:
-          self.credits.append( Text(nf, bs, c1, "left", "%s" % line) )
+          self.credits.append( Text(nf, bs*scale, c1, "left", "%s" % line) )
       elif line.startswith("_") and line.endswith("_"):
         line = line.strip("_")
         if line.startswith("%") and line.endswith("%"):
           line = line.strip("%")
           try:
             for text in self.bank[line]:
-              self.credits.append( Text(nf, ns, c2, "center", "%s" % text) )
+              self.credits.append( Text(nf, ns*scale, c2, "center", "%s" % text) )
           except KeyError:
-            self.credits.append( Text(nf, ns, c2, "center", "%s" % line) )
+            self.credits.append( Text(nf, ns*scale, c2, "center", "%s" % line) )
         else:
-          self.credits.append( Text(nf, ns, c2, "center", "%s" % line) )
+          self.credits.append( Text(nf, ns*scale, c2, "center", "%s" % line) )
       elif line.startswith("=") and line.endswith("="):
         line = line.strip("=")
         if line.startswith("%") and line.endswith("%"):
           line = line.strip("%")
           try:
             for text in self.bank[line]:
-              self.credits.append( Text(nf, ns, c1, "left", "%s" % text) )
+              self.credits.append( Text(nf, ns*scale, c1, "left", "%s" % text) )
           except KeyError:
-            self.credits.append( Text(nf, ns, c1, "left", "%s" % line) )
+            self.credits.append( Text(nf, ns*scale, c1, "left", "%s" % line) )
         else:
-          self.credits.append( Text(nf, ns, c1, "left", "%s" % line) )
+          self.credits.append( Text(nf, ns*scale, c1, "left", "%s" % line) )
       else:
         if line.startswith("%") and line.endswith("%"):
           line = line.strip("%")
           try:
             for text in self.bank[line]:
-              self.credits.append( Text(nf, ns, c2, "right", "%s" % text) )
+              self.credits.append( Text(nf, ns*scale, c2, "right", "%s" % text) )
           except KeyError:
-            self.credits.append( Text(nf, ns, c2, "right", "%s" % line) )
+            self.credits.append( Text(nf, ns*scale, c2, "right", "%s" % line) )
         else:
-          self.credits.append( Text(nf, ns, c2, "right", "%s" % line) )
+          self.credits.append( Text(nf, ns*scale, c2, "right", "%s" % line) )
 
   def shown(self):
     self.engine.input.addKeyListener(self)

src/Data.py

@@ -251,10 +251,9 @@ def __init__(self, resource, svg):
       self.loadSoundEffect(self, "crowdSound", os.path.join("sounds","crowdcheers.ogg"), crowd = True)
       self.cheerSoundFound = 1
       Log.warn(themename + "/sounds/crowdcheers.ogg not found -- using data/sounds/crowdcheers.ogg instead.")
-    else: #MFH: Fallback on starpower.ogg
-      self.loadSoundEffect(self, "crowdSound", os.path.join("themes",themename,"sounds","starpower.ogg"))
+    else:
       self.cheerSoundFound = 0
-      Log.warn(themename + "/sounds/crowdcheers.ogg not found -- using starpower.ogg instead.")
+      Log.warn("crowdcheers.ogg not found -- no crowd cheering.")
 
   def loadPartImages(self):
     self.partImages = []

src/GameResultsScene.py

@@ -186,7 +186,7 @@ def __init__(self, engine, libraryName, songName, scores = None, coOpType = Fals
 
     self.fullView = self.engine.view.geometry[2:4]
 
-    self.Congratphrase = self.engine.config.get("game", "congrats")#blazingamer
+    self.congratphrase = self.engine.config.get("game", "congrats")#blazingamer
     self.keepCount     = self.engine.config.get("game", "keep_play_count")
 
     self.showHandicap  = self.engine.config.get("handicap", "detailed_handicap")
@@ -737,7 +737,7 @@ def run(self, ticks):
       accuracyToUse = self.scoring[0].hitAccuracy
 
       #MFH TODO - utilize new functions in self.engine.data to automatically enumerate any number of the following soundfiles automatically, for issue 73
-      if self.Congratphrase:
+      if self.congratphrase:
         globPattern = None
         if scoreToUse == 0:
           globPattern = 'jurgen1.ogg'