Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

custom RGB out #2

Open
wants to merge 10 commits into
base: python-3
Choose a base branch
from
Open

custom RGB out #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6056553
Use the fonts that are already in our resources folder
pandemoniuhh Sep 18, 2021
416c586
Revert "Use the fonts that are already in our resources folder"
pandemoniuhh Sep 18, 2021
b7cebf9
eye colors now work finally
pandemoniuhh Sep 18, 2021
b1ca532
toonhead fixed for cc models
pandemoniuhh Apr 18, 2022
69f0571
add values for the other clash species
pandemoniuhh Feb 4, 2023
fd93360
unused toon anims
pandemoniuhh Feb 26, 2023
bb702f7
why did i list this twice
pandemoniuhh Jun 2, 2023
2a9b22d
Update ToonDNA.py
pandemoniuhh Jun 2, 2023
f6a19d1
h
pandemoniuhh Jun 2, 2023
e2aa4e9
custom RGB finally out
pandemoniuhh Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 69 additions & 18 deletions otp/otpbase/OTPGlobals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,22 @@ def setDefaultProductPrefix(prefix):
# These scales came from Bruce's line-up. The body scales were globally
# reduced by about 10 percent to get the overall height he wanted
toonBodyScales = {
'mouse': 0.60,
'cat': 0.73,
'duck': 0.66,
'rabbit': 0.74,
'horse': 0.85,
'dog': 0.85,
'monkey': 0.68,
'bear': 0.85,
'pig': 0.77
'mouse': 0.60,
'cat': 0.73,
'duck': 0.66,
'rabbit': 0.74,
'horse': 0.85,
'dog': 0.85,
'monkey': 0.68,
'bear': 0.85,
'pig': 0.77,
'deer': 0.70,
'beaver': 0.65,
'alligator': 0.77,
'fox': 0.73,
'bat': 0.60,
'raccoon': 0.73,
'turkey': 0.66
}

# These are vec3s since they are non uniform
Expand All @@ -351,15 +358,22 @@ def setDefaultProductPrefix(prefix):
# 'rabbit': Point3(1.0000),
# 'horse': Point3(1.0000),
# 'dog': Point3(1.0857),
'mouse': Point3(1.0),
'cat': Point3(1.0),
'duck': Point3(1.0),
'rabbit': Point3(1.0),
'horse': Point3(1.0),
'dog': Point3(1.0),
'monkey': Point3(1.0),
'bear': Point3(1.0),
'pig': Point3(1.0)
'mouse': Point3(1.0),
'cat': Point3(1.0),
'duck': Point3(1.0),
'rabbit': Point3(1.0),
'horse': Point3(1.0),
'dog': Point3(1.0),
'monkey': Point3(1.0),
'bear': Point3(1.0),
'pig': Point3(1.0),
'deer': Point3(1.0),
'beaver': Point3(1.0),
'alligator': Point3(1.0),
'fox': Point3(1.0),
'bat': Point3(1.0),
'raccoon': Point3(1.0),
'turkey': Point3(1.0)
}

legHeightDict = {
Expand Down Expand Up @@ -396,6 +410,8 @@ def setDefaultProductPrefix(prefix):

'mls': 0.75,
'mss': 0.50,
'msl': 0.50,
'mll': 0.75,

'rls': 0.75,
'rss': 0.50,
Expand All @@ -422,6 +438,41 @@ def setDefaultProductPrefix(prefix):
'ssl': 0.50,
'sll': 0.75,

'xls': 0.75,
'xss': 0.50,
'xsl': 0.50,
'xll': 0.75,

'zls': 0.75,
'zss': 0.50,
'zsl': 0.50,
'zll': 0.75,

'als': 0.75,
'ass': 0.50,
'asl': 0.50,
'all': 0.75,

'vls': 0.75,
'vss': 0.50,
'vsl': 0.50,
'vll': 0.75,

'nls': 0.75,
'nss': 0.50,
'nsl': 0.50,
'nll': 0.75,

'tls': 0.75,
'tss': 0.50,
'tsl': 0.50,
'tll': 0.75,

'gls': 0.75,
'gss': 0.50,
'gsl': 0.50,
'gll': 0.75,

}


Expand Down
36 changes: 18 additions & 18 deletions toontown/suit/Suit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ def generateSuit(self):
self.scale = 6.75/cSize
self.handColor = VBase4(0.85, 0.55, 0.55, 1.0)
self.generateBody()
self.headTexture = "corporate-raider.jpg"
self.headTexture = "corporate-raider.png"
self.generateHead("flunky")
self.setHeight(8.23)
elif (dna.name == 'tbc'):
Expand All @@ -729,23 +729,23 @@ def generateSuit(self):
self.scale = 4.0/cSize
self.handColor = SuitDNA.legalPolyColor
self.generateBody()
self.headTexture = "bottom-feeder.jpg"
self.headTexture = "bottom-feeder.png"
self.generateHead("tightwad")
self.setHeight(4.81)
elif (dna.name == 'b'):
# blood sucker
self.scale = 4.375/bSize
self.handColor = VBase4(0.95, 0.95, 1.0, 1.0)
self.generateBody()
self.headTexture = "blood-sucker.jpg"
self.headTexture = "blood-sucker.png"
self.generateHead("movershaker")
self.setHeight(6.17)
elif (dna.name == 'dt'):
# double talker
self.scale = 4.25/aSize
self.handColor = SuitDNA.legalPolyColor
self.generateBody()
self.headTexture = "double-talker.jpg"
self.headTexture = "double-talker.png"
self.generateHead("twoface")
self.setHeight(5.63)
elif (dna.name == 'ac'):
Expand All @@ -767,7 +767,7 @@ def generateSuit(self):
self.scale = 5.65/bSize
self.handColor = VBase4(0.5, 0.8, 0.75, 1.0)
self.generateBody()
self.headTexture = "spin-doctor.jpg"
self.headTexture = "spin-doctor.png"
self.generateHead("telemarketer")
self.setHeight(7.90)
elif (dna.name == 'le'):
Expand Down Expand Up @@ -840,7 +840,7 @@ def generateSuit(self):
self.scale = 7.0/aSize
self.handColor = SuitDNA.moneyPolyColor
self.generateBody()
self.headTexture = "robber-baron.jpg"
self.headTexture = "robber-baron.png"
self.generateHead("yesman")
self.setHeight(8.95)

Expand All @@ -865,7 +865,7 @@ def generateSuit(self):
self.scale = 4.35/aSize
self.handColor = SuitDNA.salesPolyColor
self.generateBody()
self.headTexture = "name-dropper.jpg"
self.headTexture = "name-dropper.png"
self.generateHead("numbercruncher")
self.setHeight(5.98)
elif (dna.name == 'gh'):
Expand Down Expand Up @@ -894,7 +894,7 @@ def generateSuit(self):
self.scale = 5.75/aSize
self.handColor = SuitDNA.salesPolyColor
self.generateBody()
self.headTexture = "mingler.jpg"
self.headTexture = "mingler.png"
self.generateHead("twoface")
self.setHeight(7.61)
elif (dna.name == 'mh'):
Expand Down Expand Up @@ -993,13 +993,13 @@ def setSuitClothes(self, modelRoot=None):
phase = 3.5

# set the clothes textures for the suit dept
torsoTex = loader.loadTexture("phase_%s/maps/%s_blazer.jpg" % (phase, dept))
torsoTex = loader.loadTexture("phase_%s/maps/%s_blazer.png" % (phase, dept))
torsoTex.setMinfilter(Texture.FTLinearMipmapLinear)
torsoTex.setMagfilter(Texture.FTLinear)
legTex = loader.loadTexture("phase_%s/maps/%s_leg.jpg" % (phase, dept))
legTex = loader.loadTexture("phase_%s/maps/%s_leg.png" % (phase, dept))
legTex.setMinfilter(Texture.FTLinearMipmapLinear)
legTex.setMagfilter(Texture.FTLinear)
armTex = loader.loadTexture("phase_%s/maps/%s_sleeve.jpg" % (phase, dept))
armTex = loader.loadTexture("phase_%s/maps/%s_sleeve.png" % (phase, dept))
armTex.setMinfilter(Texture.FTLinearMipmapLinear)
armTex.setMagfilter(Texture.FTLinear)

Expand All @@ -1026,13 +1026,13 @@ def makeWaiter(self, modelRoot=None):

# set the clothes textures for a waiter
self.isWaiter = 1
torsoTex = loader.loadTexture("phase_3.5/maps/waiter_m_blazer.jpg")
torsoTex = loader.loadTexture("phase_3.5/maps/waiter_m_blazer.png")
torsoTex.setMinfilter(Texture.FTLinearMipmapLinear)
torsoTex.setMagfilter(Texture.FTLinear)
legTex = loader.loadTexture("phase_3.5/maps/waiter_m_leg.jpg")
legTex = loader.loadTexture("phase_3.5/maps/waiter_m_leg.png")
legTex.setMinfilter(Texture.FTLinearMipmapLinear)
legTex.setMagfilter(Texture.FTLinear)
armTex = loader.loadTexture("phase_3.5/maps/waiter_m_sleeve.jpg")
armTex = loader.loadTexture("phase_3.5/maps/waiter_m_sleeve.png")
armTex.setMinfilter(Texture.FTLinearMipmapLinear)
armTex.setMagfilter(Texture.FTLinear)

Expand Down Expand Up @@ -1082,13 +1082,13 @@ def generateCorporateTie(self, modelPath=None):
return
#print '### loading %s tie' % (dept)
if dept == 'c':
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_boss.jpg")
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_boss.png")
elif dept == 's':
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_sales.jpg")
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_sales.png")
elif dept == 'l':
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_legal.jpg")
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_legal.png")
elif dept == 'm':
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_money.jpg")
tieTex = loader.loadTexture("phase_5/maps/cog_robot_tie_money.png")
tieTex.setMinfilter(Texture.FTLinearMipmapLinear)
tieTex.setMagfilter(Texture.FTLinear)
tie.setTexture(tieTex, 1)
Expand Down
Loading