Andrew's rename

This commit is contained in:
John 2015-08-01 22:06:44 +03:00
parent 5441e4ce0d
commit 5fb794cf41
2 changed files with 2 additions and 2 deletions

View file

@ -112,7 +112,7 @@ class DistributedCannonGame(DistributedMinigame):
self.jarImage.reparentTo(hidden) self.jarImage.reparentTo(hidden)
self.rewardPanel = DirectLabel(parent=hidden, relief=None, pos=(-0.173, 0.0, -0.55), scale=0.65, text='', text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0, -.13), text_font=ToontownGlobals.getSignFont(), image=self.jarImage) self.rewardPanel = DirectLabel(parent=hidden, relief=None, pos=(-0.173, 0.0, -0.55), scale=0.65, text='', text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0, -.13), text_font=ToontownGlobals.getSignFont(), image=self.jarImage)
self.rewardPanelTitle = DirectLabel(parent=self.rewardPanel, relief=None, pos=(0, 0, 0.06), scale=0.08, text=TTLocalizer.CannonGameReward, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1)) self.rewardPanelTitle = DirectLabel(parent=self.rewardPanel, relief=None, pos=(0, 0, 0.06), scale=0.08, text=TTLocalizer.CannonGameReward, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1))
self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game.ogg') self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game_tug.ogg')
self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg') self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg') self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg') self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg')

View file

@ -24,7 +24,7 @@ from direct.task.Task import Task
from otp.nametag import NametagGlobals from otp.nametag import NametagGlobals
class DistributedTugOfWarGame(DistributedMinigame): class DistributedTugOfWarGame(DistributedMinigame):
bgm = 'phase_4/audio/bgm/MG_tug_o_war.ogg' bgm = 'phase_4/audio/bgm/MG_cannon_game_tug.ogg'
toonAnimNames = ['neutral', toonAnimNames = ['neutral',
'tug-o-war', 'tug-o-war',
'slip-forward', 'slip-forward',