From 20f6957e66647b3bb1e24bb8f71c5bb779f4101b Mon Sep 17 00:00:00 2001 From: Adam <54454429+AdamJD01@users.noreply.github.com> Date: Fri, 10 Dec 2021 01:21:43 +0000 Subject: [PATCH] HGame decomp bug fixes There are A LOT (wrong nested ifs, missing parenthesis, stuff UTPT missed, consts as the values, mips on menu textures etc.) --- HGame/Classes/BaseCam.uc | 199 ++---- HGame/Classes/BaseCamTarget.uc | 9 - HGame/Classes/Bosses/Aragog.uc | 37 +- HGame/Classes/Bosses/Basilisk.uc | 139 ++-- HGame/Classes/Bosses/BossRailMove.uc | 17 +- HGame/Classes/Bosses/Peeves.uc | 11 +- HGame/Classes/Characters/Characters.uc | 6 +- HGame/Classes/Characters/Duellist.uc | 11 +- HGame/Classes/Characters/Snape.uc | 4 + HGame/Classes/Cutscene/CutCameraPos.uc | 5 +- HGame/Classes/Cutscene/CutMark.uc | 5 +- HGame/Classes/Cutscene/CutScene.uc | 8 +- HGame/Classes/Cutscene/CutSceneManager.uc | 6 +- HGame/Classes/Enemies/Bowtruckle.uc | 20 +- HGame/Classes/Enemies/GNOME.uc | 4 +- HGame/Classes/Enemies/Spider.uc | 35 +- HGame/Classes/Enemies/SpiderLarge.uc | 24 +- HGame/Classes/Enemies/SpiderSmall.uc | 2 + HGame/Classes/Enemies/Tentacula.uc | 16 +- HGame/Classes/Enemies/firecrab.uc | 11 +- HGame/Classes/Enemies/firecrabSmall.uc | 4 +- HGame/Classes/Enemies/orangesnail.uc | 6 +- HGame/Classes/HChar.uc | 122 ++-- HGame/Classes/HPath_A.uc | 2 +- HGame/Classes/HPath_B.uc | 2 +- HGame/Classes/HPath_C.uc | 2 +- HGame/Classes/HPath_D.uc | 2 +- HGame/Classes/HPath_E.uc | 2 +- HGame/Classes/HPath_F.uc | 2 +- HGame/Classes/HPath_G.uc | 2 +- HGame/Classes/HPath_H.uc | 2 +- HGame/Classes/HUD/BaseHud.uc | 4 +- HGame/Classes/HUD/BeanRoomTimerManager.uc | 2 - HGame/Classes/HUD/ChallengeScoreManager.uc | 48 +- HGame/Classes/HUD/CountdownTimerManager.uc | 10 +- HGame/Classes/HUD/EnemyHealthManager.uc | 28 +- HGame/Classes/HUD/GoldCardTimerManager.uc | 4 +- HGame/Classes/HUD/HPHud.uc | 11 +- HGame/Classes/HUD/HudItemManager.uc | 2 +- HGame/Classes/HUD/QuidScoreManager.uc | 22 +- HGame/Classes/HUD/QuidditchBar.uc | 16 +- HGame/Classes/HUD/SpellSelector.uc | 30 +- HGame/Classes/HUD/VendorManager.uc | 84 +-- HGame/Classes/HiddenHPawn/HiddenHPawn.uc | 2 +- HGame/Classes/HiddenHPawn/MovingClouds.uc | 2 +- HGame/Classes/HiddenHPawn/PoisonCloud.uc | 17 +- HGame/Classes/HiddenHPawn/SecretAreaMarker.uc | 2 +- HGame/Classes/HiddenHPawn/SpiderSpawner.uc | 9 +- HGame/Classes/Internal/HPConsole.uc | 361 ++-------- HGame/Classes/Internal/ShortCutBrowser.uc | 4 +- HGame/Classes/Internal/ShortCutButton.uc | 4 +- HGame/Classes/Internal/baseConsole.uc | 113 +-- HGame/Classes/Menu/BaseFEPage.uc | 20 +- HGame/Classes/Menu/FEBook.uc | 31 +- HGame/Classes/Menu/FEChallengesPage.uc | 27 +- HGame/Classes/Menu/FEDuelPage.uc | 6 +- HGame/Classes/Menu/FEFolioPage.uc | 173 ++--- HGame/Classes/Menu/FEInGamePage.uc | 158 ++--- HGame/Classes/Menu/FEInputPage.uc | 558 +++++---------- HGame/Classes/Menu/FELangGrid.uc | 8 +- HGame/Classes/Menu/FEMainPage.uc | 16 +- HGame/Classes/Menu/FEMapPage.uc | 88 +-- HGame/Classes/Menu/FEOptionsPage.uc | 7 +- HGame/Classes/Menu/FEQuidPage.uc | 335 +-------- HGame/Classes/Menu/FESoundBrowser.uc | 2 +- HGame/Classes/Menu/FESoundVideoPage.uc | 66 +- HGame/Classes/Menu/HPMenuOptionCheckBox.uc | 8 +- HGame/Classes/Menu/HPMenuOptionCombo.uc | 8 +- HGame/Classes/Menu/HPMenuOptionComboList.uc | 14 +- HGame/Classes/Menu/HPMenuOptionEditBox.uc | 15 +- HGame/Classes/Menu/HPMenuOptionHSlider.uc | 10 +- HGame/Classes/Menu/baseSpellPage.uc | 4 +- HGame/Classes/Misc/Adv1TutManager.uc | 8 +- HGame/Classes/Misc/AragogStickyWeb.uc | 6 +- HGame/Classes/Misc/Basilisk2.uc | 2 +- HGame/Classes/Misc/BasiliskSpell.uc | 4 +- HGame/Classes/Misc/CauldronMixing.uc | 10 +- HGame/Classes/Misc/CreatureGenerator.uc | 5 +- HGame/Classes/Misc/Debris.uc | 4 +- HGame/Classes/Misc/DebrisGenerator.uc | 8 +- HGame/Classes/Misc/FOVController.uc | 4 +- HGame/Classes/Misc/FadeActorController.uc | 2 +- HGame/Classes/Misc/FlyingCarHarry.uc | 10 +- HGame/Classes/Misc/GenericSpawner.uc | 25 +- HGame/Classes/Misc/LumosLight.uc | 4 +- HGame/Classes/Misc/MagicStrengthManager.uc | 28 +- HGame/Classes/Misc/MuggleMeterManager.uc | 34 +- HGame/Classes/Misc/PixieMarker.uc | 2 +- HGame/Classes/Misc/SnakeVenomPool.uc | 16 +- .../Misc/SpellLessonInterpolationPoint.uc | 30 +- HGame/Classes/Misc/SpiderAttendent.uc | 26 +- HGame/Classes/Misc/SpiderDead.uc | 2 +- HGame/Classes/Misc/SpiderMarker.uc | 2 +- HGame/Classes/Misc/SpikyPlantHeadSpikes.uc | 9 +- HGame/Classes/Props/Boeing747.uc | 1 + HGame/Classes/Props/BoulderChase.uc | 2 +- HGame/Classes/Props/BronzeCauldron.uc | 35 +- HGame/Classes/Props/ChocolateFrog.uc | 8 +- .../Classes/Props/FlipendoVaseBronzeShard.uc | 1 + HGame/Classes/Props/HProp.uc | 8 +- HGame/Classes/Props/HorklumpsHead.uc | 5 + HGame/Classes/Props/JarBeans.uc | 8 +- HGame/Classes/Props/SnailTrail.uc | 2 +- HGame/Classes/Props/SpongifyPad.uc | 4 +- HGame/Classes/Props/SpongifyTarget.uc | 2 +- HGame/Classes/Props/WiggenWell.uc | 3 +- HGame/Classes/Props/chestbronze.uc | 21 +- HGame/Classes/Quidditch/BEATER.uc | 2 +- HGame/Classes/Quidditch/Bludger.uc | 4 +- HGame/Classes/Quidditch/BroomHarry.uc | 79 +-- HGame/Classes/Quidditch/BroomHoop.uc | 6 +- HGame/Classes/Quidditch/BroomHoopTrail.uc | 24 +- HGame/Classes/Quidditch/Chaser.uc | 2 +- HGame/Classes/Quidditch/Keeper.uc | 2 +- .../Classes/Quidditch/OliverWoodCommentMgr.uc | 19 +- .../Classes/Quidditch/QuidditchCommentator.uc | 10 +- HGame/Classes/Quidditch/QuidditchCrowd.uc | 13 +- .../Quidditch/QuidditchCrowdDialogMgr.uc | 10 +- HGame/Classes/Quidditch/QuidditchDirector.uc | 34 +- .../Quidditch/QuidditchLessonDirector.uc | 10 +- HGame/Classes/Quidditch/QuidditchPawn.uc | 23 +- HGame/Classes/Quidditch/QuidditchPlayer.uc | 70 +- .../Quidditch/QuidditchPlayerDialogMgr.uc | 8 +- HGame/Classes/Quidditch/QuidditchTauntMgr.uc | 13 +- HGame/Classes/Quidditch/Seeker.uc | 8 +- HGame/Classes/Quidditch/Snitch.uc | 14 +- HGame/Classes/SpellCursor.uc | 29 +- HGame/Classes/Spells/AragogSpellAttack.uc | 1 + HGame/Classes/Spells/spellFire.uc | 3 +- HGame/Classes/Spells/spellFireLarge.uc | 13 +- HGame/Classes/Spells/spellFireSmall.uc | 6 +- HGame/Classes/Spells/spellRictusempra.uc | 2 +- HGame/Classes/Spells/spellSwordFire.uc | 1 - HGame/Classes/Spells/spellWeb.uc | 11 +- HGame/Classes/StatusGroups/StatusGroup.uc | 10 +- .../StatusGroups/StatusGroupHousePoints.uc | 6 +- .../StatusGroups/StatusGroupJellyBeans.uc | 5 +- .../Classes/StatusGroups/StatusGroupLocks.uc | 2 +- .../StatusGroups/StatusGroupPolyIngr.uc | 4 +- .../StatusGroups/StatusGroupPotionIngr.uc | 6 +- .../StatusGroups/StatusGroupPotions.uc | 8 +- .../Classes/StatusGroups/StatusGroupQGear.uc | 2 +- .../Classes/StatusGroups/StatusGroupStars.uc | 6 +- .../StatusGroups/StatusGroupWizardCards.uc | 63 +- HGame/Classes/StatusItems/StatusItem.uc | 62 +- .../StatusItems/StatusItemFlobberMucus.uc | 2 - .../StatusItems/StatusItemGryffindorPts.uc | 3 - HGame/Classes/StatusItems/StatusItemHealth.uc | 54 +- .../StatusItems/StatusItemHufflePuffPts.uc | 3 - .../StatusItems/StatusItemJellybeans.uc | 7 +- .../StatusItems/StatusItemRavenclawPts.uc | 3 - .../StatusItems/StatusItemSilverCards.uc | 4 +- .../StatusItems/StatusItemSlytherinPts.uc | 3 - HGame/Classes/StatusItems/StatusItemStars.uc | 3 - .../StatusItems/StatusItemWiggenBark.uc | 2 - .../StatusItems/StatusItemWiggenWell.uc | 2 - .../StatusItems/StatusItemWizardCards.uc | 92 ++- .../Classes/Triggers/BossEncounterTrigger.uc | 2 +- HGame/Classes/Triggers/FadeViewTrigger.uc | 4 +- HGame/Classes/Triggers/JumpLineTrigger.uc | 21 +- HGame/Classes/Triggers/LumosSparkles.uc | 56 +- HGame/Classes/Triggers/LumosTrigger.uc | 4 - HGame/Classes/Triggers/SpawnThingy.uc | 2 +- HGame/Classes/Triggers/SpellLessonTrigger.uc | 85 ++- .../Triggers/TriggerSpwnBsChrOnPPnt.uc | 4 +- HGame/Classes/Triggers/hideTrigger.uc | 10 +- HGame/Classes/Triggers/spellTrigger.uc | 6 +- .../WhompingWillow/WhompWRController.uc | 140 +--- HGame/Classes/WizardCards/WCAgrippa.uc | 2 +- HGame/Classes/WizardCards/WCAlderton.uc | 2 +- HGame/Classes/WizardCards/WCAndros.uc | 2 +- HGame/Classes/WizardCards/WCBarbary.uc | 2 +- HGame/Classes/WizardCards/WCBarkwith.uc | 2 +- HGame/Classes/WizardCards/WCBeamish.uc | 2 +- HGame/Classes/WizardCards/WCBelby.uc | 2 +- HGame/Classes/WizardCards/WCBlane.uc | 2 +- HGame/Classes/WizardCards/WCBloxam.uc | 2 +- HGame/Classes/WizardCards/WCBonham.uc | 2 +- HGame/Classes/WizardCards/WCBott.uc | 8 +- HGame/Classes/WizardCards/WCCatchlove.uc | 2 +- HGame/Classes/WizardCards/WCChittock.uc | 2 +- HGame/Classes/WizardCards/WCCirce.uc | 2 +- HGame/Classes/WizardCards/WCClagg.uc | 2 +- HGame/Classes/WizardCards/WCCliodne.uc | 2 +- HGame/Classes/WizardCards/WCCronk.uc | 2 +- HGame/Classes/WizardCards/WCCrumb.uc | 2 +- HGame/Classes/WizardCards/WCDodderidge.uc | 2 +- HGame/Classes/WizardCards/WCDuke.uc | 2 +- HGame/Classes/WizardCards/WCDumbledore.uc | 8 +- HGame/Classes/WizardCards/WCElphick.uc | 2 +- HGame/Classes/WizardCards/WCEthelred.uc | 2 +- HGame/Classes/WizardCards/WCFancourt.uc | 2 +- HGame/Classes/WizardCards/WCFay.uc | 2 +- HGame/Classes/WizardCards/WCFulbert.uc | 2 +- HGame/Classes/WizardCards/WCFurmage.uc | 2 +- HGame/Classes/WizardCards/WCGoshawk.uc | 2 +- HGame/Classes/WizardCards/WCGraves.uc | 2 +- HGame/Classes/WizardCards/WCGregory.uc | 2 +- HGame/Classes/WizardCards/WCGriffindor.uc | 2 +- HGame/Classes/WizardCards/WCGrunnion.uc | 2 +- HGame/Classes/WizardCards/WCGunhilda.uc | 2 +- HGame/Classes/WizardCards/WCHerpo.uc | 8 +- HGame/Classes/WizardCards/WCHipworth.uc | 2 +- HGame/Classes/WizardCards/WCHufflepuff.uc | 8 +- HGame/Classes/WizardCards/WCJones.uc | 2 +- HGame/Classes/WizardCards/WCKegg.uc | 2 +- HGame/Classes/WizardCards/WCKetteridge.uc | 2 +- HGame/Classes/WizardCards/WCKnightley.uc | 8 +- HGame/Classes/WizardCards/WCLufkin.uc | 2 +- HGame/Classes/WizardCards/WCMaeve.uc | 2 +- HGame/Classes/WizardCards/WCMarjoribanks.uc | 2 +- HGame/Classes/WizardCards/WCMerlin.uc | 2 +- HGame/Classes/WizardCards/WCMerwyn.uc | 2 +- HGame/Classes/WizardCards/WCMontmorency.uc | 2 +- HGame/Classes/WizardCards/WCMopsus.uc | 2 +- HGame/Classes/WizardCards/WCMuldoon.uc | 2 +- HGame/Classes/WizardCards/WCNutcombe.uc | 2 +- HGame/Classes/WizardCards/WCOglethorpe.uc | 2 +- HGame/Classes/WizardCards/WCOldridge.uc | 2 +- HGame/Classes/WizardCards/WCOliphant.uc | 2 +- HGame/Classes/WizardCards/WCOllerton.uc | 2 +- HGame/Classes/WizardCards/WCParacelsus.uc | 2 +- HGame/Classes/WizardCards/WCPeakes.uc | 2 +- HGame/Classes/WizardCards/WCPilliwickle.uc | 2 +- HGame/Classes/WizardCards/WCPinkstone.uc | 10 +- HGame/Classes/WizardCards/WCPlatt.uc | 2 +- HGame/Classes/WizardCards/WCPlumpton.uc | 2 +- HGame/Classes/WizardCards/WCPlunkett.uc | 2 +- HGame/Classes/WizardCards/WCPo.uc | 2 +- HGame/Classes/WizardCards/WCPokeby.uc | 2 +- HGame/Classes/WizardCards/WCPotter.uc | 8 +- HGame/Classes/WizardCards/WCRastrick.uc | 2 +- HGame/Classes/WizardCards/WCRavenclaw.uc | 8 +- HGame/Classes/WizardCards/WCSawbridge.uc | 2 +- HGame/Classes/WizardCards/WCScamander.uc | 2 +- HGame/Classes/WizardCards/WCShimpling.uc | 2 +- HGame/Classes/WizardCards/WCShingleton.uc | 2 +- HGame/Classes/WizardCards/WCSlytherin.uc | 2 +- HGame/Classes/WizardCards/WCSmethwyck.uc | 2 +- HGame/Classes/WizardCards/WCStalk.uc | 2 +- HGame/Classes/WizardCards/WCStarkey.uc | 2 +- HGame/Classes/WizardCards/WCStroulger.uc | 2 +- HGame/Classes/WizardCards/WCStump.uc | 2 +- HGame/Classes/WizardCards/WCSummerbee.uc | 2 +- HGame/Classes/WizardCards/WCSweeting.uc | 2 +- HGame/Classes/WizardCards/WCSykes.uc | 2 +- HGame/Classes/WizardCards/WCThruston.uc | 2 +- HGame/Classes/WizardCards/WCThurkell.uc | 2 +- HGame/Classes/WizardCards/WCToke.uc | 2 +- HGame/Classes/WizardCards/WCToothill.uc | 2 +- HGame/Classes/WizardCards/WCTremlett.uc | 2 +- HGame/Classes/WizardCards/WCTugwood.uc | 2 +- HGame/Classes/WizardCards/WCTwonk.uc | 2 +- HGame/Classes/WizardCards/WCUlric.uc | 2 +- HGame/Classes/WizardCards/WCVablatsky.uc | 2 +- HGame/Classes/WizardCards/WCWadcock.uc | 2 +- HGame/Classes/WizardCards/WCWaffling.uc | 2 +- HGame/Classes/WizardCards/WCWagtail.uc | 2 +- HGame/Classes/WizardCards/WCWarbeck.uc | 2 +- HGame/Classes/WizardCards/WCWellbeloved.uc | 2 +- HGame/Classes/WizardCards/WCWendelin.uc | 2 +- HGame/Classes/WizardCards/WCWenlock.uc | 2 +- HGame/Classes/WizardCards/WCWhitehorn.uc | 2 +- HGame/Classes/WizardCards/WCWildsmith.uc | 2 +- HGame/Classes/WizardCards/WCWintringham.uc | 2 +- HGame/Classes/WizardCards/WCWithers.uc | 2 +- HGame/Classes/WizardCards/WCWoodcroft.uc | 2 +- HGame/Classes/WizardCards/WCWright.uc | 2 +- HGame/Classes/WizardCards/WCYoudle.uc | 2 +- HGame/Classes/WizardCards/WizardCardIcon.uc | 17 +- HGame/Classes/baseSpell.uc | 4 +- HGame/Classes/baseWand.uc | 16 +- HGame/Classes/baseWarning.uc | 2 +- HGame/Classes/cAnimChannel.uc | 14 +- HGame/Classes/cHarryAnimChannel.uc | 12 +- HGame/Classes/harry.uc | 667 +++++------------- 276 files changed, 2037 insertions(+), 3437 deletions(-) diff --git a/HGame/Classes/BaseCam.uc b/HGame/Classes/BaseCam.uc index 5ea9a6d9..345bcef1 100644 --- a/HGame/Classes/BaseCam.uc +++ b/HGame/Classes/BaseCam.uc @@ -377,36 +377,36 @@ function TransitionToCameraMode (ECamMode eMode) GotoState('StateTransition'); } -/* function ShowSettings() { - PlayerHarry.ClientMessage("The current camera settings are:"); - PlayerHarry.ClientMessage("-------------------------------------------"); - PlayerHarry.ClientMessage("LookAtOffset: " $ string(CurrentSet.vLookAtOffset)); - PlayerHarry.ClientMessage("LookAtDistance: " $ string(CurrentSet.fLookAtDistance)); - PlayerHarry.ClientMessage("RotTightness: " $ string(CurrentSet.fRotTightness)); - PlayerHarry.ClientMessage("RotSpeed: " $ string(CurrentSet.fRotSpeed)); - PlayerHarry.ClientMessage("MoveTightness: " $ string(CurrentSet.fMoveTightness)); - PlayerHarry.ClientMessage("MoveSpeed: " $ string(CurrentSet.fMoveSpeed)); - PlayerHarry.ClientMessage("-------------------------------------------"); - PlayerHarry.ClientMessage("Current mode: " $ string(CameraMode)); - PlayerHarry.ClientMessage("Current pos: " $ string(vCurrPosition)); - PlayerHarry.ClientMessage("Destination pos: " $ string(vDestPosition)); - PlayerHarry.ClientMessage("Current rot: " $ string(rCurrRotation.Yaw) $ " , " $ string(rCurrRotation.Pitch) $ " , " $ string(rCurrRotation.Roll) $ " "); - PlayerHarry.ClientMessage("Destination rot: " $ string(rDestRotation.Yaw) $ " , " $ string(rDestRotation.Pitch) $ " , " $ string(rDestRotation.Roll) $ " "); - PlayerHarry.ClientMessage("fCurrLookAtDistance: " $ string(fCurrLookAtDistance)); - PlayerHarry.ClientMessage("fDestLookAtDistance: " $ string(fDestLookAtDistance)); - PlayerHarry.ClientMessage("SyncRotationWithTarget: " $ string(bSyncRotationWithTarget)); - PlayerHarry.ClientMessage("SyncPositionWithTarget: " $ string(bSyncPositionWithTarget)); - PlayerHarry.ClientMessage("-------------------------------------------"); - PlayerHarry.ClientMessage("CamTarget loc: " $ string(CamTarget.Location)); - PlayerHarry.ClientMessage("CamTarget rot: " $ string(CamTarget.Rotation)); - PlayerHarry.ClientMessage("CamTarget AttachedTo: " $ string(CamTarget.aAttachedTo)); - PlayerHarry.ClientMessage("CamTarget Attached loc: " $ string(CamTarget.aAttachedTo.Location)); - PlayerHarry.ClientMessage("CamTarget attached offset: " $ string(CamTarget.vOffset)); - PlayerHarry.ClientMessage("CamTarget relative: " $ string(CamTarget.bRelative)); + PlayerHarry.ClientMessage("The current camera settings are:"); + PlayerHarry.ClientMessage("-------------------------------------------"); + PlayerHarry.ClientMessage("LookAtOffset: " $ string(CurrentSet.vLookAtOffset)); + PlayerHarry.ClientMessage("LookAtDistance: " $ string(CurrentSet.fLookAtDistance)); + PlayerHarry.ClientMessage("RotTightness: " $ string(CurrentSet.fRotTightness)); + PlayerHarry.ClientMessage("RotSpeed: " $ string(CurrentSet.fRotSpeed)); + PlayerHarry.ClientMessage("MoveTightness: " $ string(CurrentSet.fMoveTightness)); + PlayerHarry.ClientMessage("MoveSpeed: " $ string(CurrentSet.fMoveSpeed)); + PlayerHarry.ClientMessage("-------------------------------------------"); + PlayerHarry.ClientMessage("Current mode: " $ string(CameraMode)); + PlayerHarry.ClientMessage("Current pos: " $ string(vCurrPosition)); + PlayerHarry.ClientMessage("Destination pos: " $ string(vDestPosition)); + PlayerHarry.ClientMessage("Current rot: " $ string(rCurrRotation.Yaw) $ " , " $ string(rCurrRotation.Pitch) $ " , " $ string(rCurrRotation.Roll) $ " "); + PlayerHarry.ClientMessage("Destination rot: " $ string(rDestRotation.Yaw) $ " , " $ string(rDestRotation.Pitch) $ " , " $ string(rDestRotation.Roll) $ " "); + PlayerHarry.ClientMessage("fCurrLookAtDistance: " $ string(fCurrLookAtDistance)); + PlayerHarry.ClientMessage("fDestLookAtDistance: " $ string(fDestLookAtDistance)); + PlayerHarry.ClientMessage("SyncRotationWithTarget: " $ string(bSyncRotationWithTarget)); + PlayerHarry.ClientMessage("SyncPositionWithTarget: " $ string(bSyncPositionWithTarget)); + PlayerHarry.ClientMessage("-------------------------------------------"); + PlayerHarry.ClientMessage("CamTarget loc: " $ string(CamTarget.Location)); + PlayerHarry.ClientMessage("CamTarget rot: " $ string(CamTarget.Rotation)); + PlayerHarry.ClientMessage("CamTarget AttachedTo: " $ string(CamTarget.aAttachedTo)); + PlayerHarry.ClientMessage("CamTarget Attached loc: " $ string(CamTarget.aAttachedTo.Location)); + PlayerHarry.ClientMessage("CamTarget attached offset: " $ string(CamTarget.vOffset)); + PlayerHarry.ClientMessage("CamTarget relative: " $ string(CamTarget.bRelative)); } +/* function LoadUserSettings (int I) { if ( I > 4 - 1 ) @@ -442,42 +442,6 @@ function SaveUserSettings (int I) } */ -// console command helper function that shows the camera's current settings -function ShowSettings() -{ - playerHarry.ClientMessage("The current camera settings are:"); - playerHarry.ClientMessage("-------------------------------------------"); - playerHarry.ClientMessage("LookAtOffset: " $CurrentSet.vLookAtOffset ); - playerHarry.ClientMessage("LookAtDistance: " $CurrentSet.fLookAtDistance ); - playerHarry.ClientMessage("RotTightness: " $CurrentSet.fRotTightness ); - playerHarry.ClientMessage("RotSpeed: " $CurrentSet.fRotSpeed ); - playerHarry.ClientMessage("MoveTightness: " $CurrentSet.fMoveTightness ); - playerHarry.ClientMessage("MoveSpeed: " $CurrentSet.fMoveSpeed ); - playerHarry.ClientMessage("-------------------------------------------"); - playerHarry.ClientMessage("Current mode: " $CameraMode ); - playerHarry.ClientMessage("Current pos: " $vCurrPosition ); - playerHarry.ClientMessage("Destination pos: " $vDestPosition ); - playerHarry.ClientMessage("Current rot: " - $(rCurrRotation.Yaw) $" , " - $(rCurrRotation.Pitch) $" , " - $(rCurrRotation.Roll) $" "); - playerHarry.ClientMessage("Destination rot: " - $(rDestRotation.Yaw) $" , " - $(rDestRotation.Pitch) $" , " - $(rDestRotation.Roll) $" "); - - playerHarry.ClientMessage("SyncRotationWithTarget: " $bSyncRotationWithTarget ); - playerHarry.ClientMessage("SyncPositionWithTarget: " $bSyncPositionWithTarget ); - - playerHarry.ClientMessage("-------------------------------------------"); - playerHarry.ClientMessage("CamTarget loc: " $CamTarget.location ); - playerHarry.ClientMessage("CamTarget rot: " $CamTarget.rotation ); - playerHarry.ClientMessage("CamTarget AttachedTo: " $CamTarget.aAttachedTo ); - playerHarry.ClientMessage("CamTarget Attached loc: " $CamTarget.aAttachedTo.location ); - playerHarry.ClientMessage("CamTarget attached offset: " $CamTarget.vOffset ); - playerHarry.ClientMessage("CamTarget relative: " $CamTarget.bRelative ); -} - function LoadUserSettings( int i ) { if( i > NUM_USER_SETTINGS-1 ) @@ -538,11 +502,10 @@ function PostBeginPlay() function InitRotation (Rotator Rot) { - rDestRotation.Yaw = Rot.Yaw; //& 65535; - rDestRotation.Pitch = Rot.Pitch;// & 65535; - rDestRotation.Roll = Rot.Roll;// & 65535; - // vForward = Normal(DesiredRotation); - vForward = normal(vector(DesiredRotation)); + rDestRotation.Yaw = Rot.Yaw & 65535; + rDestRotation.Pitch = Rot.Pitch & 65535; + rDestRotation.Roll = Rot.Roll & 65535; + vForward = Normal(Vector(DesiredRotation)); rCurrRotation = rDestRotation; DesiredRotation = rDestRotation; SetRotation(DesiredRotation); @@ -593,12 +556,8 @@ function InitPositionAndRotation (bool bSnapToNewPosAndRot) function UpdateDistance (float fTimeDelta) { - /*if ( byte(rCurrRotation.Pitch) > fPitchMovingInThreshold ) - { - fDistanceScalar = 1.0 - byte(rCurrRotation.Pitch) / fPitchMovingInSpread;*/ if( rCurrRotation.Pitch > fPitchMovingInThreshold ) { - // Calculate our DistanceScalar fDistanceScalar = 1.0 - ( rCurrRotation.Pitch / fPitchMovingInSpread ); if ( fDistanceScalar < fDistanceScalarMin ) { @@ -622,8 +581,7 @@ function UpdateRotationUsingVectors (float fTimeDelta) local Vector vDestRotation; local Vector vCurrRotation; - // vDestRotation = Normal(rDestRotation); - vDestRotation = normal(vector(rDestRotation)); + vDestRotation = Normal(vector(rDestRotation)); vCurrRotation = vForward; if ( bSyncRotationWithTarget ) { @@ -663,7 +621,6 @@ function ApplyMouseXToDestYaw (float fTimeDelta, optional bool bApplyToBossOffse if ( !bApplyToBossOffset ) { rDestRotation.Yaw += fMouseDeltaX * CurrentSet.fRotSpeed; - //rDestRotation.Yaw = rDestRotation.Yaw & 65535; } else { @@ -695,20 +652,20 @@ function ApplyMouseYToDestPitch (float fTimeDelta, optional bool bApplyToBossOff fMouseDeltaY = MIN_MOUSE_DELTA_Y; } - /* - if ( !bApplyToBossOffset ) - { - rDestRotation.Pitch += fMouseDeltaY * CurrentSet.fRotSpeed = ); + /* + if ( !bApplyToBossOffset ) { - rDestRotation.Pitch = fCurrentMaxPitch = } else {; - if ( byte(rDestRotation.Pitch) < fCurrentMinPitch ) + rDestRotation.Pitch += fMouseDeltaY * CurrentSet.fRotSpeed = ); { - rDestRotation.Pitch = fCurrentMinPitch = goto JL0159; - // There are 2 jump destination(s) inside the last statement! + rDestRotation.Pitch = fCurrentMaxPitch = } else {; + if ( byte(rDestRotation.Pitch) < fCurrentMinPitch ) + { + rDestRotation.Pitch = fCurrentMinPitch = goto JL0159; + // There are 2 jump destination(s) inside the last statement! + } } } - } - */ + */ //all this is added by me because the original commented out decompiled code above is broken -AdamJD if ( !bApplyToBossOffset ) @@ -749,16 +706,7 @@ function UpdateRotation (float fTimeDelta) local float fTravelScalar; rDestRotation += rRotationStep * fTimeDelta; - - // Metallicafan212: Force to USHORT bounds - //rDestRotation.Yaw = ClampRotVal(rDestRotation.Yaw); - //rDestRotation.Pitch = ClampRotVal(rDestRotation.Pitch); - //rDestRotation.Roll = ClampRotVal(rDestRotation.Roll); - - //rCurrRotation.Yaw = ClampRotVal(rCurrRotation.Yaw); - //rCurrRotation.Pitch = ClampRotVal(rCurrRotation.Pitch); - //rCurrRotation.Roll = ClampRotVal(rCurrRotation.Roll); - + if ( bSyncRotationWithTarget ) { rCurrRotation = rotator(CamTarget.Location - Location); @@ -775,21 +723,14 @@ function UpdateRotation (float fTimeDelta) } rCurrRotation += (rDestRotation - rCurrRotation) * fTravelScalar; } - // vForward = Normal(rCurrRotation); - vForward = normal(vector(rCurrRotation)); + vForward = Normal(vector(rCurrRotation)); SetFinalRotation(rCurrRotation); } function SetFinalRotation (Rotator R) { R += rExtraRotation; - rExtraRotation = rot(0,0,0); - - // Metallicafan212: Test? - R.Pitch = R.Pitch & 65535; - R.Roll = R.Roll & 65535; - R.Yaw = R.Yaw & 65535; - + rExtraRotation = rot(0,0,0); DesiredRotation = R; SetRotation(R); } @@ -883,7 +824,7 @@ state StateTransition { CamTarget.SetAttachedTo(None); // CamTarget.DoFlyTo(PlayerHarry.Location + CamSetStandard.vLookAtOffset,3,1.0); - CamTarget.DoFlyTo( playerHarry.location + CamSetStandard.vLookAtOffset, MOVE_TYPE_EASE_TO, 1.0); + CamTarget.DoFlyTo( PlayerHarry.location + CamSetStandard.vLookAtOffset, MOVE_TYPE_EASE_TO, 1.0); InitSettings(CamSetStandard,False,True); InitRotation(PlayerHarry.Rotation); CurrentSet.fMoveTightness = 0.1; @@ -920,7 +861,7 @@ state StateStandardCam function BeginState() { - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> StandardCam"); } @@ -948,7 +889,7 @@ state StateQuidditchCam { function BeginState() { - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> QuidditchCam"); } @@ -971,21 +912,13 @@ state StateQuidditchCam rDestRotation = rotator(lookDir); UpdateRotationUsingVectors(fTimeDelta); } - - //force camera to focus on Harry before going to the cutscene cam -AdamJD - function EndState() - { - //Log("AdamJD: Ended quidditch cam"); - InitTarget(PlayerHarry); - InitPositionAndRotation(True); - } } state StateFlyingCarCam { function BeginState() { - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> FlyingCarCam"); } @@ -1015,7 +948,7 @@ state StateDuelingCam { local Rotator Rot; - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> StandardCam"); } @@ -1036,7 +969,7 @@ state StateCutSceneCam { function BeginState() { - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> StateCutSceneCam"); } @@ -1067,7 +1000,7 @@ state StateBossCam { function BeginState() { - if ( /*True*/USE_DEBUG_MODE ) + if ( USE_DEBUG_MODE ) { PlayerHarry.ClientMessage("Camera: BeginState -> BossCam"); } @@ -1132,8 +1065,7 @@ state StateFreeCam { fMouseDeltaY = MAX_MOUSE_DELTA_Y; } - else - if ( fMouseDeltaY < MIN_MOUSE_DELTA_Y ) + else if ( fMouseDeltaY < MIN_MOUSE_DELTA_Y ) { fMouseDeltaY = MIN_MOUSE_DELTA_Y; } @@ -1458,8 +1390,7 @@ function DoSimpleFade (bool bFadeIn) { local FadeViewController FadeController; - //IDK how I didn't notice this... -AdamJD - // return; + return; FadeController = Spawn(Class'FadeViewController'); if ( bFadeIn ) { @@ -1568,19 +1499,19 @@ function bool CutCommand_ProcessLocked (string Command, optional string cue, opt else if ( Left(sString,8) ~= "yawStep=" ) { // rRotationStep.Yaw = ConvertDegToRot(float(Mid(sString,8))) = bSyncRotationWithTarget = False; - rRotationStep.yaw = ConvertDegToRot( float(Mid(sString,8))); + rRotationStep.Yaw = ConvertDegToRot( float(Mid(sString,8))); bSyncRotationWithTarget = false; } else if ( Left(sString,10) ~= "pitchStep=" ) { // rRotationStep.Pitch = ConvertDegToRot(float(Mid(sString,10))) = bSyncRotationWithTarget = False; - rRotationStep.pitch = ConvertDegToRot( float(Mid(sString,10))); + rRotationStep.Pitch = ConvertDegToRot( float(Mid(sString,10))); bSyncRotationWithTarget = false; } else if ( Left(sString,9) ~= "rollStep=" ) { // rRotationStep.Roll = ConvertDegToRot(float(Mid(sString,9))) = bSyncRotationWithTarget = False; - rRotationStep.roll = ConvertDegToRot( float(Mid(sString,9))); + rRotationStep.Roll = ConvertDegToRot( float(Mid(sString,9))); bSyncRotationWithTarget = false; } else if ( Left(sString,13) ~= "rotTightness=" ) @@ -1697,25 +1628,9 @@ function GlobalCutBypass() CamTarget.GlobalCutBypass(); } -/* -function bool CameraCanSeeYou (Vector Pos) -{ - local Vector Normal; - local float dotpr; - - Normal = Rotation; - dotpr = Normal.X * (Pos.X - Location.X) + Normal.Y * (Pos.Y - Location.Y) + Normal.Z * (Pos.Z - Location.Z); - if ( dotpr > byte(0) ) - { - return True; - } - return False; -} -*/ - function bool CameraCanSeeYou(Vector Pos) { - //local vector normal; + //local vector Normal; local Vector vNormal; local Float dotpr; diff --git a/HGame/Classes/BaseCamTarget.uc b/HGame/Classes/BaseCamTarget.uc index ad535cb3..68d006bb 100644 --- a/HGame/Classes/BaseCamTarget.uc +++ b/HGame/Classes/BaseCamTarget.uc @@ -107,20 +107,11 @@ function bool SetAttachedToByCutName (string sCutName) function SetNewRotation (Rotator Rot) { - /* DesiredRotation = Rot; DesiredRotation.Yaw = DesiredRotation.Yaw & 65535; DesiredRotation.Pitch = DesiredRotation.Pitch & 65535; DesiredRotation.Roll = DesiredRotation.Roll & 65535; SetRotation(DesiredRotation); - */ - - Rot.Yaw = Rot.Yaw & 65535; - Rot.Pitch = Rot.Pitch & 65535; - Rot.Roll = Rot.Roll& 65535; - DesiredRotation = Rot; - SetRotation(Rot); - } event Tick (float fTimeDelta) diff --git a/HGame/Classes/Bosses/Aragog.uc b/HGame/Classes/Bosses/Aragog.uc index 99f9e88d..25f077b7 100644 --- a/HGame/Classes/Bosses/Aragog.uc +++ b/HGame/Classes/Bosses/Aragog.uc @@ -113,7 +113,7 @@ function PostBeginPlay() PlayerHarry.bVeryAfraid = True; Super.PostBeginPlay(); - changeRotation = 5.0; + changeRotation = CHECK_ROTATION; numAnchorsAttached = numAnchors; randDialog = randDialogInterval; vHome = Location; @@ -184,12 +184,12 @@ function bool HandleSpellRictusempra (optional baseSpell spell, optional Vector if ( Health <= HealthAddSpellThree ) { numberOfSpells = 3; - } else { + } else //{ if ( Health <= HealthAddSpellTwo ) { numberOfSpells = 2; } - } + //} if ( tempDamage == damageVulnerable ) { GotoState('stateHitByRictusempra'); @@ -403,7 +403,7 @@ function PlayerCutRelease() if ( cutSceneCounter == 1 ) { GotoState('PhaseOne'); - } else { + } else //{ if ( cutSceneCounter == 2 ) { bPhaseOneOver = True; @@ -415,7 +415,7 @@ function PlayerCutRelease() PlayerHarry.GroundSpeed = PlayerHarry.GroundRunSpeed; GotoState('stateHarryHunting'); } - } + //} } function bool IsAttacking() @@ -582,7 +582,7 @@ function AnchorHitBySpell (int iLocation) if ( numAnchorsAttached <= 0 ) { GotoState('stateFalling'); - } else { + } else //{ if (numAnchorsAttached % spiderAnchorRatio == 0 ) { TriggerEvent('WebAnchorHit',self,None); @@ -599,7 +599,7 @@ function AnchorHitBySpell (int iLocation) } else { TriggerEvent('WebAnchorHit',self,None); } - } + //} foreach AllActors(Class'SpiderAttendent',at) { totalAttendentsInLevel++; @@ -704,16 +704,17 @@ state CutIdle if ( cutSceneCounter == 1 ) { // goto JL0035; - return; + //KW left this empty? -AdamJD } else if ( cutSceneCounter == 2 ) { MoveAwayFromThePit(); destroyAllSpiders(); - } else { - if ( cutSceneCounter == 2 ) + } + else if ( cutSceneCounter == 2 ) + { // goto JL0035; - return; + //KW left this empty? -AdamJD } } @@ -804,8 +805,8 @@ state stateMovetoAttack } LoopAnim('rotate',1.5,0.2); TurnToward(PlayerHarry); - vLocation = PlayerHarry.Location + Normal(Location - PlayerHarry.Location) * distanceFromHarry; - vDir = Normal((PlayerHarry.Location + Normal(Location - PlayerHarry.Location) * distanceFromHarry - Location) * Vec(1.0,1.0,0.0)); + vLocation = PlayerHarry.Location + (Normal(Location - PlayerHarry.Location) * distanceFromHarry); + vDir = Normal((PlayerHarry.Location + (Normal(Location - PlayerHarry.Location) * distanceFromHarry) - Location) * Vec(1.0,1.0,0.0)); LoopAnim('run',1.0,0.2); bMove = True; } @@ -933,7 +934,7 @@ function DoStomp (bool bBigStomp, optional bool bDeepStomp) PlayerHarry.ShakeView(1.75,200.0,200.0); PlaySound(Sound'big_block_fall',Slot_None,,,1000000.0,RandRange(0.31,0.5)); PlaySound(Sound'Big_whomp4',Slot_None,,,1000000.0,RandRange(0.31,0.5)); - } else { + } else //{ if ( bBigStomp ) { PlayerHarry.ShakeView(0.69999999,200.0,200.0); @@ -947,7 +948,7 @@ function DoStomp (bool bBigStomp, optional bool bDeepStomp) PlayerHarry.ShakeView(0.41,100.0,100.0); PlaySound(Sound'lil_whomper_hit1',Slot_None,0.333,,1000000.0,RandRange(0.5,0.81)); } - } + //} } state stateShootSpell @@ -997,7 +998,7 @@ state stateShootSpell // Counter++; // goto JL015C; } - break; + break; // case 2: case SPELL_LINE: // Counter = 0; @@ -1011,7 +1012,6 @@ state stateShootSpell TempCount2 = 1; } // TempCount2 = TempCount2; - //this looks wrong but it is right -AdamJD for ( TempCount2 = TempCount2; TempCount2 > 0; TempCount2-- ) { DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw; @@ -1163,12 +1163,11 @@ begin: state NipHarry { -//begin, begin, begin... -AdamJD begin: bBigBite = True; PlayAnim('KnockBack',1.0,0.2); Sleep(0.31); - nipLocation = Location + Normal(PlayerHarry.Location - Location) * 100; + nipLocation = Location + (Normal(PlayerHarry.Location - Location) * 100); SetLocation(nipLocation); GotoState('stateMovetoAttack'); } diff --git a/HGame/Classes/Bosses/Basilisk.uc b/HGame/Classes/Bosses/Basilisk.uc index b2cc5116..7aecda4d 100644 --- a/HGame/Classes/Bosses/Basilisk.uc +++ b/HGame/Classes/Bosses/Basilisk.uc @@ -156,6 +156,7 @@ function PostBeginPlay() if ( VSize2D(A.Location - Location) < 70 ) { BasilStartPoint = A; + break; } } AttackTimer = b1_TimeBetweenAttackStart; @@ -402,25 +403,25 @@ function RotateTo (float Yaw, optional float Time, optional float Rate) if ( DesiredYaw < -MaxHeadYaw ) { DesiredYaw = -MaxHeadYaw; - } else { + } else //{ if ( DesiredYaw > MaxHeadYaw ) { DesiredYaw = MaxHeadYaw; } - } + //} startYaw = ActualYaw; YawTime = 0.0; if ( Time != 0 ) { YawTimeDest = Time; - } else { + } else //{ if ( Rate != 0 ) { YawTimeDest = Abs(DesiredYaw - startYaw) / Rate; } else { YawTimeDest = Abs(DesiredYaw - startYaw) / HeadYawRate; } - } + //} } function RotateToHarry (optional float Time, optional float Rate) @@ -504,7 +505,7 @@ function Tick (float dtime) if ( D < 350 ) { theta = Atan(SpellToHeadProximity / D); - v2 = Normal(baseWand(PlayerHarry.Weapon).LastCastedSpell.Velocity) Cross V / D; + v2 = Normal(baseWand(PlayerHarry.Weapon).LastCastedSpell.Velocity) Cross (V / D); if ( VSize(v2) < Sin(theta) ) { LastDodgedSpell = A; @@ -570,7 +571,7 @@ state stateWait1 SetTimer(0.0,False); } - //UTPT didn't add this -AdamJD + //UTPT didn't add this... -AdamJD function BasilHitBySpell( baseSpell spell, vector HitLocation ) { Global.BasilHitBySpell( spell, HitLocation ); @@ -974,9 +975,9 @@ state stateAttack_2_ DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw; } else { DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw - DegRotAwayFromHarry() * 65536.0 / 360.0; - bGotHitDuringWarmUp = False; } } + bGotHitDuringWarmUp = False; PlayLungeAnim_2_(); PlayerHarry.ShakeView(0.5,100.0,100.0); PlayLungeSound(); @@ -993,7 +994,7 @@ function PlayLungeAnim_2_() local int I; local int W; - W = (HeadAttackFarthest_2 - HeadAttackNearest_2) /*UTPT didn't add this bit... -AdamJD*/ / (HeadAttackCount_2 - 1); + W = (HeadAttackFarthest_2 - HeadAttackNearest_2) / (HeadAttackCount_2 - 1); //UTPT didn't add the divide bit... -AdamJD I = ( VSize2D(playerHarry.Location - Location) - HeadAttackNearest_2 + w/2 + w/4) / w; //UTPT didn't add this... -AdamJD I = Clamp( I, 0, HeadAttackCount_2 - 1 ); //UTPT didn't add this... -AdamJD PlayAnim(name("snap" $ string(I + 1)),HeadAttackAnimRate,0.2); @@ -1076,20 +1077,20 @@ function CastSpitSpell (bool bAimAtHarry, optional bool bUseHeadYaw) if ( PlayerHarry.Difficulty == DifficultyMedium ) { fTimeToHit = 0.5; - } else { + } else //{ if ( PlayerHarry.Difficulty == DifficultyHard ) { fTimeToHit = 0.181; } - } + //} V = ComputeTrajectoryByTime(_BasiliskHeadColObj.Location,PlayerHarry.Location,fTimeToHit,-200.0); R = rotator(V); - A = Spawn(Class'spellAcidSpit',,,_BasiliskHeadColObj.Location,R); + A = Spawn(Class'spellAcidSpit',,,[SpawnLocation]_BasiliskHeadColObj.Location,R); V.Z += 40 * Cos(8.0 * Level.TimeSeconds); A.Velocity = V; } else { R = _BasiliskHeadColObj.Rotation; - A = Spawn(Class'spellAcidSpit',,,_BasiliskHeadColObj.Location,R); + A = Spawn(Class'spellAcidSpit',,,[SpawnLocation]_BasiliskHeadColObj.Location,R); } Log("*********** spawned spit:" $ string(A.Name) $ " v:" $ string(V) $ " grav:" $ string(Region.Zone.ZoneGravity.Z)); A.FloorZ = FloorZ; @@ -1413,20 +1414,17 @@ state stateEyeSpell default: } AttackTimer = TempFloat / 2; - RotateTo(DegreeRotToActor(aEyeTarget),,40.0); - // Sleep(0.01); //do and until -AdamJD do { - Sleep(0.01); - } - until (ActualYaw == DesiredYaw); - - //do and until -AdamJD - do - { - Sleep(0.01); + RotateTo(DegreeRotToActor(aEyeTarget),,40.0); + //do and until -AdamJD + do + { + Sleep(0.01); + } + until (ActualYaw == DesiredYaw); } until (AttackTimer <= 0); @@ -1548,19 +1546,12 @@ state stateEyeSpellFire } EyeBeam1.DrawScale = 2.0 * BeamGrowTime / BeamGrowTimeSpan; - EyeBeam1.Wideness = FMin( 255.0, 128.0/EyeBeam1.DrawScale ); EyeBeam2.DrawScale = EyeBeam1.DrawScale; - EyeBeam2.Wideness = EyeBeam1.Wideness; } EyeBeam1.SetLocation( BonePos( 'Bone144' ) ); EyeBeam2.SetLocation( BonePos( 'Bone118' ) ); - - r.Yaw = ActualYaw * 65536.0 / 360.0 + Rotation.Yaw; - v = Location + vector(r) * TempHarryDist; - v.Z = playerHarry.Location.Z; - r.Pitch = rotator(v - EyeBeam1.Location).Pitch; - + r = rotator( aEyeTarget.Location - EyeBeam1.Location ); EyeBeam1.SetRotation( r ); @@ -1615,9 +1606,9 @@ state stateEyeSpellFire begin: RotateTo(DegreeRotToActor(aEyeTarget),,40.0); - EyeBeam1 = Spawn(Class'SnakeBeam',self,,BonePos('Bone144')); + EyeBeam1 = Spawn(Class'SnakeBeam',self,,[SpawnLocation]BonePos('Bone144')); EyeBeam1.DrawScale = 0.0; - EyeBeam2 = Spawn(Class'SnakeBeam',self,,BonePos('Bone118')); + EyeBeam2 = Spawn(Class'SnakeBeam',self,,[SpawnLocation]BonePos('Bone118')); EyeBeam2.DrawScale = 0.0; BeamGrowTime = 0.01; BeamGrowTimeSpan = 0.5; @@ -1647,8 +1638,9 @@ JL00D9: { Sleep(0.01); } - until (AttackTimer <= 0); + until( ActualYaw == DesiredYaw ); } + until (AttackTimer <= 0); if ( VSize2D(PlayerHarry.Location - Location) < HeadAttackFarthest + 20 ) { @@ -1660,39 +1652,6 @@ JL00D9: } } until (False); - - //UTPT didn't add these... -AdamJD - //------------------------------------------------------------------------------------------------ - TempFloat = 0.25; - - TempFloat2 = DegreeRotToHarry(); - TempBool = TempFloat2 < 0; - TempHarryDist = VSize2d( playerHarry.Location - Location ); - - if( TempBool ) - { - RotateTo( TempFloat2 + BeamYawStartOffset_Degrees * 0.5, TempFloat, 0 ); - } - else - { - RotateTo( TempFloat2 - BeamYawStartOffset_Degrees * 0.5, TempFloat, 0 ); - } - - Sleep( TempFloat ); - - if( TempBool ) - { - RotateTo( TempFloat2 - BeamYawStartOffset_Degrees*1.5, 0, BeamYawRate_DegreesPerSec ); - } - else - { - RotateTo( TempFloat2 + BeamYawStartOffset_Degrees*1.5, 0, BeamYawRate_DegreesPerSec ); - } - - Sleep( BeamLifeSpan ); - - GotoState('stateEyeSpellFire'); - //------------------------------------------------------------------------------------------------ SetAttackTimer(); GotoState(WaitingState); @@ -1849,30 +1808,31 @@ function PlayRoarSound() function PlayLungeSound() { //local Sound tempSound; + local Sound tempLungeSound; switch (Rand(6)) { case 0: - tempSound = Sound'Basilisk_attack1'; + tempLungeSound = Sound'Basilisk_attack1'; break; case 1: - tempSound = Sound'Basilisk_attack2'; + tempLungeSound = Sound'Basilisk_attack2'; break; case 2: - tempSound = Sound'Basilisk_attack3'; + tempLungeSound = Sound'Basilisk_attack3'; break; case 3: - tempSound = Sound'Basilisk_attack4'; + tempLungeSound = Sound'Basilisk_attack4'; break; case 4: - tempSound = Sound'Basilisk_attack5'; + tempLungeSound = Sound'Basilisk_attack5'; break; case 5: - tempSound = Sound'Basilisk_attack6'; + tempLungeSound = Sound'Basilisk_attack6'; break; default: } - _BasiliskHeadColObj.PlaySound(tempSound,Slot_None,BasilSoundVolume,,BasilSoundRadius,RandRange(0.81,1.25)); + _BasiliskHeadColObj.PlaySound(tempLungeSound,Slot_None,BasilSoundVolume,,BasilSoundRadius,RandRange(0.81,1.25)); } function PlayLungeAnim() @@ -1881,7 +1841,7 @@ function PlayLungeAnim() local int W; local name N; - W = (HeadAttackFarthest - HeadAttackNearest) /*UTPT didn't add this bit... -AdamJD*/ / (HeadAttackCount - 1); + W = (HeadAttackFarthest - HeadAttackNearest) / (HeadAttackCount - 1); //UTPT didn't add the divide bit... -AdamJD I = ( VSize2D(playerHarry.Location - Location) - HeadAttackNearest + w/2 + w* 0.3) / w; //UTPT didn't add this... -AdamJD I = Clamp( I, 0, HeadAttackCount - 1 ); //UTPT didn't add this... -AdamJD N = name("lunge_" $ string(I + 1)); @@ -1895,7 +1855,9 @@ function PlayLungeFromHoleAnim (int part) local int W; local string S; - W = (HeadAttackFarthest - HeadAttackNearest); + W = (HeadAttackFarthest - HeadAttackNearest) / (HeadAttackCount - 1); //UTPT didn't add the divide bit... -AdamJD + I = ( VSize2D(playerHarry.Location - Location) - HeadAttackNearest + w/2 + w/4) / w; //UTPT didn't add this... -AdamJD + I = Clamp( I, 0, HeadAttackCount - 1 ); //UTPT didn't add this... -AdamJD if ( part < 4 ) { S = "snap_" $ string(I + 1) $ "_" $ string(part); @@ -2002,7 +1964,7 @@ state stateHit_2_ //UTPT didn't add this... -AdamJD function Tick(float dtime) { - global.tick( dtime ); + Global.Tick( dtime ); if( Rand(12)==0 ) { @@ -2074,7 +2036,15 @@ function CastEyeSpell (bool bMissHarry) } D = VSize(PlayerHarry.Location - _BasiliskHeadColObj.Location); V = Normal(PlayerHarry.Location + Vec(0.0,0.0,PlayerHarry.BaseEyeHeight / 3) - BonePos('Bone144')); - spell = Spawn(Class'BasiliskSpell',,,BonePos('Bone144')); + spell = Spawn(Class'BasiliskSpell',,,[SpawnLocation]BonePos('Bone144')); + //UTPT didn't add this... -AdamJD + spell.Init(V,SpellDamageAmount,SpellInitialDrawScale,SpellEndDrawScale,D + 200,SpellStartSpeed,SpellEndSpeed,angleOffset * 65536 / 360); + spell.bActive = True; + v = Normal(playerHarry.Location + vec(0,0,playerHarry.BaseEyeHeight / 3) - BonePos('Bone118')); + spell = Spawn(Class'BasiliskSpell', [SpawnLocation]BonePos('Bone118') ); + spell.Init(V,SpellDamageAmount,SpellInitialDrawScale,SpellEndDrawScale,D + 200,SpellStartSpeed,SpellEndSpeed,(angleOffset + angleSpread) * 65536 / 360); + spell.bActive = True; + spell.PlaySound(Sound'Basilisk_eyes_shoot',SLOT_None,[Radius]BasilSoundRadius); } state stateRetreat @@ -2144,12 +2114,12 @@ function BasilHitBySpell (baseSpell spell, Vector HitLocation) if ( PlayerHarry.Difficulty == DifficultyMedium ) { DamageAmount *= 0.75; - } else { + } else //{ if ( PlayerHarry.Difficulty == DifficultyHard ) { DamageAmount *= 0.5; } - } + //} Health -= DamageAmount; if ( Health <= 0 ) { @@ -2314,6 +2284,7 @@ function MoveToRandomVisibleHole() { local int NumVisibleHoles; //local int NumHoles; + local int iNumHoles; local Actor Holes[20]; local Actor VisibleHoles[20]; local Vector vDir; @@ -2325,21 +2296,21 @@ function MoveToRandomVisibleHole() vDir = Normal(vector(PlayerHarry.Rotation) * vect(1.00,1.00,0.00)); foreach AllActors(Class'Actor',A,HoleMarkerCommonTag) { - if ( vDir Dot Normal((A.Location - PlayerHarry.Location) * vect(1.00,1.00,0.00)) > 0.5 ) + if ( (vDir Dot Normal((A.Location - PlayerHarry.Location) * vect(1.00,1.00,0.00))) > 0.5 ) { VisibleHoles[NumVisibleHoles++ ] = A; } else { if ( VSize2D(A.Location - PlayerHarry.Location) < ClosestNonVisibleHoleDist ) { ClosestNonVisibleHoleDist = VSize2D(A.Location - PlayerHarry.Location); - ClosestNonVisibleHoleIdx = NumHoles; + ClosestNonVisibleHoleIdx = iNumHoles; } } - Holes[NumHoles++ ] = A; + Holes[iNumHoles++ ] = A; } if ( FRand() < 0.2 ) { - A = Holes[Rand(NumHoles)]; + A = Holes[Rand(iNumHoles)]; } else //{ if ( (NumVisibleHoles == 0) || (NumVisibleHoles == 1) && (FRand() < 0.5) ) { @@ -2484,7 +2455,7 @@ defaultproperties MinDamageToBotherBasil=3.00 - CentreOffset=(X=30.00,Y=0.00,Z=130.00), + CentreOffset=(X=30.00,Y=0.00,Z=130.00) bGestureFaceHorizOnly=True diff --git a/HGame/Classes/Bosses/BossRailMove.uc b/HGame/Classes/Bosses/BossRailMove.uc index 2ff6e035..dd159bc6 100644 --- a/HGame/Classes/Bosses/BossRailMove.uc +++ b/HGame/Classes/Bosses/BossRailMove.uc @@ -232,7 +232,7 @@ function FindNewMoveToLoc() // goto JL00C0; } } - if ( (RailEnd2.Location - RailEnd1.Location) Dot (vMoveTo - Location) < 0 ) + if ( ((RailEnd2.Location - RailEnd1.Location) Dot (vMoveTo - Location)) < 0 ) { bMovingLeft = True; } else { @@ -264,7 +264,7 @@ state PatrolForHarry { if ( harry(Other) != None ) { - harry(Other).vAdditionalAccel = (RailEnd2.Location - RailEnd1.Location) Cross vect(0.00,0.00,1.00) * 400; + harry(Other).vAdditionalAccel = ((RailEnd2.Location - RailEnd1.Location) Cross vect(0.00,0.00,1.00)) * 400; } } @@ -356,6 +356,7 @@ begin: bHaveThrownYet = True; TriggerEvent(TriggerToSendOnFirstThrow,self,self); } +wait: DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw; FinishAnim(); DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw; @@ -421,10 +422,12 @@ state stateTaunt1 function OnEvent (name EventName) { - if ( EventName == 'ActionDone' ) //goto JL000F; + if ( EventName == 'ActionDone' ) { - GotoState('stateTaunt2'); + // goto JL000F; + //KW left this empty? -AdamJD } + GotoState('stateTaunt2'); } } @@ -567,12 +570,12 @@ state stateHit3 if ( PlayerHarry.Difficulty == DifficultyMedium ) { MoveSpeed *= 1.29999995; - } else { + } else //{ if ( PlayerHarry.Difficulty == DifficultyHard ) { MoveSpeed *= 1.79999995; } - } + //} PlayRunAnim(); GotoState('PatrolForHarry'); } @@ -742,6 +745,4 @@ defaultproperties bProjTarget=True RotationRate=(Pitch=80000,Yaw=80000,Roll=80000) - - eVulnerableToSpell=SPELL_Skurge //UTPT forgot to add this which caused the Peeves cutscene to softlock... -AdamJD } diff --git a/HGame/Classes/Bosses/Peeves.uc b/HGame/Classes/Bosses/Peeves.uc index cbd8b767..7268d613 100644 --- a/HGame/Classes/Bosses/Peeves.uc +++ b/HGame/Classes/Bosses/Peeves.uc @@ -170,10 +170,13 @@ function Trigger (Actor Other, Pawn EventInstigator) if ( Type == Annoyance ) { // goto JL0025; - return; + //KW left this empty? -AdamJD + } + else + { + TriggerEvent('BossPeevesTrigger',self,None); + GotoState('MoveToPoint'); } - TriggerEvent('BossPeevesTrigger',self,None); - GotoState('MoveToPoint'); } function GotoFirstPoint() @@ -243,7 +246,7 @@ function PlayerCutRelease() { if ( Type != Annoyance ) { - if (!bGameOver) + if ( !bGameOver ) { GotoState('stateWaitForTrigger'); } diff --git a/HGame/Classes/Characters/Characters.uc b/HGame/Classes/Characters/Characters.uc index 18a593e8..dc2eb1d0 100644 --- a/HGame/Classes/Characters/Characters.uc +++ b/HGame/Classes/Characters/Characters.uc @@ -2,7 +2,7 @@ // Characters. //================================================================================ -class Characters extends HChar; +class Characters extends HChar; const strCUE_OUT_OF_STOCK_DONE= "_OutOfStockDone"; const strCUE_LURING_DONE= "_LuringDone"; @@ -780,7 +780,7 @@ keep_facing_harry: if ( !IsAnimating() ) { CurrIdleAnimName = GetCurrIdleAnimName(); - LoopAnim(CurrIdleAnimName,,0.41); + LoopAnim(CurrIdleAnimName,,[TweenTime]0.41); } TurnToward(Level.PlayerHarryActor); if ( WeasleyTwin != None ) @@ -829,7 +829,7 @@ keep_facing_harry: if ( !IsAnimating() ) { CurrIdleAnimName = GetCurrIdleAnimName(); - LoopAnim(CurrIdleAnimName,,0.41); + LoopAnim(CurrIdleAnimName,,[TweenTime]0.41); } TurnToward(Level.PlayerHarryActor); if ( WeasleyTwin != None ) diff --git a/HGame/Classes/Characters/Duellist.uc b/HGame/Classes/Characters/Duellist.uc index 1e021056..6c559043 100644 --- a/HGame/Classes/Characters/Duellist.uc +++ b/HGame/Classes/Characters/Duellist.uc @@ -91,7 +91,7 @@ function bool HarrySpellAboutToHitMe() { return False; } - for(i = 0; i < baseWand(PlayerHarry.Weapon).NumCastedSpells; i++) + for(I = 0; I < baseWand(PlayerHarry.Weapon).NumCastedSpells; I++) { CurrCastedSpell = baseWand(PlayerHarry.Weapon).CastedSpellList[I]; if ( VSize(CurrCastedSpell.Location - Location) < CollisionRadius * (2 + 3 * Intellect) ) @@ -120,7 +120,7 @@ function bool HarrySpellGoesInMyDirection() return False; } - for(i = 0; i < baseWand(PlayerHarry.Weapon).NumCastedSpells; i++) + for(I = 0; I < baseWand(PlayerHarry.Weapon).NumCastedSpells; I++) { CurrCastedSpell = baseWand(PlayerHarry.Weapon).CastedSpellList[I]; Loc = CurrCastedSpell.Location; @@ -494,7 +494,7 @@ function float GetHealth() function PlayIdle() { - LoopAnim('duel_idle',0.81,0.25,,DuellistAnimType); + LoopAnim('duel_idle',0.81,[TweenTime]0.25,,DuellistAnimType); } function bool HandleSpellDuelExpelliarmus (optional baseSpell spell, optional Vector vHitLocation) @@ -708,7 +708,7 @@ state stateShot // Metallicafan212: Again with UTPT not decomping function Tick(float dtime) { - super.Tick(dtime); + Global.Tick(dtime); //log(DuellistAnimChannel.bCasting); if(DuellistAnimChannel.bCasting) return; @@ -729,7 +729,6 @@ state stateShot LoopAnim('duel_idle'); } DuellistAnimChannel.DoCast(); - //goto('begin'); } state stateDefence @@ -743,7 +742,7 @@ state stateDefence // Metallicafan212: AAAAAAA function Tick(float dtime) { - super.Tick(dtime); + Global.Tick(dtime); if(DuellistAnimChannel.bCasting) return; diff --git a/HGame/Classes/Characters/Snape.uc b/HGame/Classes/Characters/Snape.uc index 5ba2e7a3..a4282cd6 100644 --- a/HGame/Classes/Characters/Snape.uc +++ b/HGame/Classes/Characters/Snape.uc @@ -109,6 +109,10 @@ function Tick (float DeltaTime) vLastLocation = Location; GotoState('stateGotoHarry'); } + else + { + //KW left this empty? -AdamJD + } } } diff --git a/HGame/Classes/Cutscene/CutCameraPos.uc b/HGame/Classes/Cutscene/CutCameraPos.uc index 136cb64a..65a62844 100644 --- a/HGame/Classes/Cutscene/CutCameraPos.uc +++ b/HGame/Classes/Cutscene/CutCameraPos.uc @@ -2,10 +2,11 @@ // CutCameraPos. //================================================================================ -class CutCameraPos extends NavigationPoint; +//class CutCameraPos extends NavigationPoint; +class CutCameraPos extends Keypoint; //extends from Keypoint to keep it compatible with the new engine -AdamJD //texture import -AdamJD -#exec Texture Import File=Textures\Icons\CutCamIcon.PNG GROUP=Icons Name=CutCamIcon COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\CutCamIcon.PNG GROUP=Icons Name=CutCamIcon COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 defaultproperties { diff --git a/HGame/Classes/Cutscene/CutMark.uc b/HGame/Classes/Cutscene/CutMark.uc index 357d810d..1cc512d1 100644 --- a/HGame/Classes/Cutscene/CutMark.uc +++ b/HGame/Classes/Cutscene/CutMark.uc @@ -2,10 +2,11 @@ // CutMark. //================================================================================ -class CutMark extends NavigationPoint; +//class CutMark extends NavigationPoint; +class CutMark extends Keypoint; //extends from Keypoint to keep it compatible with the new engine -AdamJD //texture import -AdamJD -#exec Texture Import File=Textures\Icons\CutMarkIcon.PNG GROUP=Icons Name=CutMarkIcon COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\CutMarkIcon.PNG GROUP=Icons Name=CutMarkIcon COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 defaultproperties { diff --git a/HGame/Classes/Cutscene/CutScene.uc b/HGame/Classes/Cutscene/CutScene.uc index 519f8309..7eff2a55 100644 --- a/HGame/Classes/Cutscene/CutScene.uc +++ b/HGame/Classes/Cutscene/CutScene.uc @@ -41,7 +41,7 @@ function CutCue (string cue) { local int I; - for(I = 0; I < MAX_THREADS; I++) + for(I = 0; I < ArrayCount(aThreads); I++) { if ( aThreads[I] != None ) { @@ -87,7 +87,7 @@ function CreateThreads() if ( FileName != "" ) { - for(t = 0; t < MAX_THREADS; t++) + for(t = 0; t < ArrayCount(aThreads); t++) { Line = Localize("thread_"$t,"line_0","Cutscenes\\" $FileName); if ( InStr(Line," 0 ) { @@ -118,7 +118,7 @@ function DeleteThreads() { local int I; - for(I = 0; I < MAX_THREADS; I++) + for(I = 0; I < ArrayCount(aThreads); I++) { if ( aThreads[I] != None ) { diff --git a/HGame/Classes/Cutscene/CutSceneManager.uc b/HGame/Classes/Cutscene/CutSceneManager.uc index 861de544..49fc869b 100644 --- a/HGame/Classes/Cutscene/CutSceneManager.uc +++ b/HGame/Classes/Cutscene/CutSceneManager.uc @@ -5,7 +5,7 @@ class CutSceneManager extends HudItemManager; //texture import -AdamJD -#exec Texture Import File=Textures\Icons\leftPanel.PNG GROUP=Icons Name=leftPanel COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\Icons\leftPanel.PNG GROUP=Icons Name=leftPanel COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 const SLIDE_DIVISOR= 15; var Texture textureBorder; @@ -143,7 +143,7 @@ state SlideIn fMaxBorderHeight = GetMaxBorderHeight(Canvas); if ( fCurrBorderHeight < fMaxBorderHeight ) { - fCurrBorderHeight += fMaxBorderHeight / 15; + fCurrBorderHeight += fMaxBorderHeight / SLIDE_DIVISOR; } if ( fCurrBorderHeight > fMaxBorderHeight ) { @@ -197,7 +197,7 @@ state SlideOut { if ( fCurrBorderHeight > 0 ) { - fCurrBorderHeight -= GetMaxBorderHeight(Canvas) / 15; + fCurrBorderHeight -= GetMaxBorderHeight(Canvas) / SLIDE_DIVISOR; } if ( fCurrBorderHeight < 0 ) { diff --git a/HGame/Classes/Enemies/Bowtruckle.uc b/HGame/Classes/Enemies/Bowtruckle.uc index 7f571fa5..8c037884 100644 --- a/HGame/Classes/Enemies/Bowtruckle.uc +++ b/HGame/Classes/Enemies/Bowtruckle.uc @@ -133,31 +133,15 @@ function Vector RandomPosition (Vector NewPos, float Accuracy) local Vector rv; local float spread; - //spread = (1.0 - Accuracy) * 8192; //the bark used to get thrown way too wide -AdamJD - - //turned this down more because the bark was still getting thrown a bit too wide -AdamJD - spread = (1.0 - Accuracy) * 1024; //2048; - - //UTPT original code, this made the Bowtruckle throw bark up in the air instead of at Harry -AdamJD - /* + spread = (1.0 - Accuracy) * 8192; D.X = NewPos.X; D.Y = NewPos.Y; D.Z = 0.0; R = rotator(D); R.Yaw += RandRange(-spread,spread); + V = vector(R); //this makes the Bowtruckle actually throw bark at Harry (UTPT didn't add this) -AdamJD rv = V * VSize(D); rv.Z = NewPos.Z; - */ - - //this makes the Bowtruckle actually throw bark at Harry -AdamJD - D.X = NewPos.X - Location.X; - D.Y = NewPos.Y - Location.Y; - D.Z = 0.0; - R = rotator(D); - R.Yaw += RandRange(-spread, spread); - V = vector(R); - rv = Location + V * VSize(D); - rv.Z = NewPos.Z; return rv; } diff --git a/HGame/Classes/Enemies/GNOME.uc b/HGame/Classes/Enemies/GNOME.uc index b5d523c5..da73a200 100644 --- a/HGame/Classes/Enemies/GNOME.uc +++ b/HGame/Classes/Enemies/GNOME.uc @@ -596,8 +596,8 @@ function PreBeginPlay() // set our home location to be were we started vHome = location; - //playerHarry.addJellyBeansPoints(HarryBeans); // just for testing - //playerHarry.addPotionsPoints(HarryPotions); // just for testing + playerHarry.addJellyBeansPoints(HarryBeans); // just for testing + playerHarry.addPotionsPoints(HarryPotions); // just for testing // save collision information savedCollisionRadius = CollisionRadius; diff --git a/HGame/Classes/Enemies/Spider.uc b/HGame/Classes/Enemies/Spider.uc index d8a1f8ba..88ddbe81 100644 --- a/HGame/Classes/Enemies/Spider.uc +++ b/HGame/Classes/Enemies/Spider.uc @@ -197,6 +197,7 @@ function InitSpider() if ( (Marker.bCenter == True) && (Marker.GroupName == GroupName) ) { currentMarker = Marker; + break; } } if ( currentMarker == None ) @@ -298,13 +299,13 @@ state moveToMarker if ( AttackHarryCheck() == true && forward == 0 && !IsInState('CutIdle') ) { - gotoState('preAttackCheck'); + GotoState('preAttackCheck'); } if ( Velocity == vec(0,0,0) ) { - loopAnim('idle'); - gotoState('Wander'); + LoopAnim('idle'); + GotoState('Wander'); } } @@ -339,9 +340,9 @@ state moveToMarker vDirectionVector = currentMarker.Location - Location; if ( Rand(2) == 0 ) { - vDir = Location + (vDirectionVector * (vDirectionVector Cross Vec(0.0,0.0,1.0) * FRand() * 205)); + vDir = Location + (vDirectionVector * (vDirectionVector Cross Vec(0.0,0.0,1.0) * (FRand() * 205))); } else { - vDir = Location - (vDirectionVector * (vDirectionVector Cross Vec(0.0,0.0,1.0) * FRand() * 205)); + vDir = Location - (vDirectionVector * (vDirectionVector Cross Vec(0.0,0.0,1.0) * (FRand() * 205))); } MoveTo(vDir); } @@ -360,12 +361,12 @@ state WalkForward { Global.Tick(DeltaTime); - forward -= vSize(velocity) * DeltaTime; + forward -= VSize(Velocity) * DeltaTime; if ( forward <= 0 ) { forward = 0; - gotoState('moveToMarker'); + GotoState('moveToMarker'); } } @@ -395,13 +396,13 @@ state Wander if ( AttackHarryCheck() == true && !IsInState('CutIdle') ) { - gotoState('preAttackCheck'); + GotoState('preAttackCheck'); } - if ( vSize(velocity) < groundSpeed / 3 ) + else if ( VSize(Velocity) < GroundSpeed / 3 ) { SetLocation(OldLocation); - gotoState('ImLost'); + GotoState('ImLost'); } } @@ -420,9 +421,13 @@ state Wander { Global.Touch(other); - if ( !Other.IsA('SpiderSmall') || !Other.IsA('SpiderLarge') ) + if ( other.IsA('SpiderSmall') || other.IsA('SpiderLarge') ) { - gotoState('wander'); + //KW left this empty? -AdamJD + } + else + { + GotoState('wander'); } } @@ -497,7 +502,7 @@ state Wait if ( AttackHarryCheck() == true && !IsInState('CutIdle') ) { - gotoState('preAttackCheck'); + GotoState('preAttackCheck'); } } @@ -518,8 +523,8 @@ state jumpOffWall if ( jumpDistance > 0 ) { - SetLocation(location + (vDirectionVector*(200 * deltaTime))); - jumpDistance -= (200 * deltaTime); + SetLocation(Location + (vDirectionVector*(200 * deltaTime))); + jumpDistance -= (200 * DeltaTime); } else { diff --git a/HGame/Classes/Enemies/SpiderLarge.uc b/HGame/Classes/Enemies/SpiderLarge.uc index 4b4e85db..e41cea24 100644 --- a/HGame/Classes/Enemies/SpiderLarge.uc +++ b/HGame/Classes/Enemies/SpiderLarge.uc @@ -183,7 +183,14 @@ state AttackHarry if ( ReadyPosition() == true && (baseHud(playerharry.myHud).bCutSceneMode == false) ) { - gotoState('stateBiteHarry'); + GotoState('stateBiteHarry'); + } + + randomAttackSfx -= DeltaTime; + if ( randomAttackSfx <= 0 ) + { + randomAttackSfx = FRand() * 5 + 1; + playAttackSound(); } } @@ -228,7 +235,7 @@ state stateBiteHarry PlayerHarry.TakeDamage(fDamageAmount,Instigator,vect(0.00,0.00,0.00),vect(0.00,0.00,0.00),'largeSpider'); } Velocity = Normal(Location - PlayerHarry.Location) * GroundSpeed; - Acceleration = Normal((Location - PlayerHarry.Location) * GroundSpeed) * 2; + Acceleration = Normal(Location - PlayerHarry.Location) * GroundSpeed * 2; PlayAnim('lungeAttackend',1.29999995); FinishAnim(); Sleep(0.151); @@ -257,14 +264,13 @@ state HitBySpell { Global.Tick(DeltaTime); - fStunned += DeltaTime; - - if(numSpells > 0) - { - if(fStunned > 5) + if( bStunned ) + { + fStunned -= DeltaTime; + if( fStunned <= 0 ) { - GoToState('preAttackCheck'); - } + GotoState('Wander'); + } } } diff --git a/HGame/Classes/Enemies/SpiderSmall.uc b/HGame/Classes/Enemies/SpiderSmall.uc index 6398d3b9..979d6d28 100644 --- a/HGame/Classes/Enemies/SpiderSmall.uc +++ b/HGame/Classes/Enemies/SpiderSmall.uc @@ -192,6 +192,8 @@ state AttachToHarry state DeadSpider { + ignores Touch; //UTPT didn't add this for some reason -AdamJD + begin: Velocity = vect(0.00,0.00,0.00); Acceleration = vect(0.00,0.00,0.00); diff --git a/HGame/Classes/Enemies/Tentacula.uc b/HGame/Classes/Enemies/Tentacula.uc index e3830b3d..dea83612 100644 --- a/HGame/Classes/Enemies/Tentacula.uc +++ b/HGame/Classes/Enemies/Tentacula.uc @@ -169,22 +169,22 @@ function PostBeginPlay() break; case 2: bName[1] = GetBoneName(4); - rYaw[1] = 8192.0 * 4; + rYaw[1] = FORTY_FIVE_DEGREES * 4; break; case 3: bName[1] = GetBoneName(3); bName[2] = GetBoneName(5); - rYaw[1] = 8192.0 * 5; - rYaw[2] = 8192.0 * 3; + rYaw[1] = FORTY_FIVE_DEGREES * 5; + rYaw[2] = FORTY_FIVE_DEGREES * 3; break; case 4: default: bName[1] = GetBoneName(2); bName[2] = GetBoneName(4); bName[3] = GetBoneName(6); - rYaw[1] = 8192.0 * 6; - rYaw[2] = 8192.0 * 4; - rYaw[3] = 8192.0 * 2; + rYaw[1] = FORTY_FIVE_DEGREES * 6; + rYaw[2] = FORTY_FIVE_DEGREES * 4; + rYaw[3] = FORTY_FIVE_DEGREES * 2; break; } @@ -248,7 +248,7 @@ function int ClosestLimb() R.Roll = 0; R.Pitch = 0; V = vector(R); - fCos = V Dot v1 / VSize(v1); + fCos = (V Dot v1) / VSize(v1); if ( fCos > maxcos ) { maxcos = fCos; @@ -401,7 +401,7 @@ begin: DesiredRotation.Yaw = rNewRot.Yaw - limbs[firstLimb].relYaw; //GotoState('stateIdle'); } - GotoState('stateIdle'); //this should be here -AdamJD + GotoState('stateIdle'); //this should be here, UTPT added it in the wrong place -AdamJD } else //{ if ( VSize(vTargetDir) < SightRadius ) { diff --git a/HGame/Classes/Enemies/firecrab.uc b/HGame/Classes/Enemies/firecrab.uc index 3d91db11..d5673651 100644 --- a/HGame/Classes/Enemies/firecrab.uc +++ b/HGame/Classes/Enemies/firecrab.uc @@ -163,13 +163,10 @@ function Vector pushDirection() // Count++; // goto JL0023; } - // Count = 0; - // if ( Count < rotationCount ) - // { - // Count++; - // goto JL00AA; - // } - + for (Count = 0; Count < rotationCount; Count++) + { + //KW left this empty? -AdamJD + } if ( rotationCount <= 2 ) { return Vec(0.0,0.0,-1.0); diff --git a/HGame/Classes/Enemies/firecrabSmall.uc b/HGame/Classes/Enemies/firecrabSmall.uc index 9f7b6199..bd2d1675 100644 --- a/HGame/Classes/Enemies/firecrabSmall.uc +++ b/HGame/Classes/Enemies/firecrabSmall.uc @@ -306,7 +306,7 @@ state throwing if ( vTemp2.Z > 0 ) { LoopAnim('StrafeLeft'); - vTemp2 = -vTemp Cross Vec(0.0,0.0,1.0); + vTemp2 = -(vTemp Cross Vec(0.0,0.0,1.0)); if ( BOOL_DEBUG_AI ) { PlayerHarry.ClientMessage("strafing left"); @@ -380,7 +380,7 @@ state strafeAround PlayerHarry.ClientMessage("strafing left"); } StrafeLeft = False; - vTemp2 = -vTemp Cross Vec(0.0,0.0,1.0); + vTemp2 = -(vTemp Cross Vec(0.0,0.0,1.0)); rotationChange = rotator(vTemp2); rotationChange.Yaw -= 4000; vTemp2 = vector(rotationChange); diff --git a/HGame/Classes/Enemies/orangesnail.uc b/HGame/Classes/Enemies/orangesnail.uc index 503aee41..d5b71c35 100644 --- a/HGame/Classes/Enemies/orangesnail.uc +++ b/HGame/Classes/Enemies/orangesnail.uc @@ -39,11 +39,11 @@ var(Snail) float fStunDuration; function PostBeginPlay() { - if ( nMaxTrailSegments > 50 ) + if ( nMaxTrailSegments > TRAIL_ARRAY_SIZE ) { PlayerHarry.ClientMessage("Warning: Need to increase TRAIL_ARRAY_SIZE"); Log("Warning: Need to increase TRAIL_ARRAY_SIZE"); - nMaxTrailSegments = 50; + nMaxTrailSegments = TRAIL_ARRAY_SIZE; } } @@ -253,7 +253,7 @@ function PlayerCutCapture() function PlayerCutRelease() { - fCountdownAfterCut = 3.0; + fCountdownAfterCut = fDONT_ATTACK_AFTER_CUT_TIME; } event Bump (Actor Other) diff --git a/HGame/Classes/HChar.uc b/HGame/Classes/HChar.uc index 6993ab92..4eae4006 100644 --- a/HGame/Classes/HChar.uc +++ b/HGame/Classes/HChar.uc @@ -2,7 +2,7 @@ // HChar. //================================================================================ -class HChar extends HPawn; +class HChar extends HPawn; const WATCH_FOR_HARRY_ARRAY_SIZE= 3; enum EEnemyBar @@ -64,7 +64,6 @@ var(WatchForHarry) float fNotifyOthersHearDistance; var(WatchForHarry) name EventName; var Actor aListenToMe; var bool bCapturedFromStateIdle; -var float fDistanceToHarry; //added by me to find the distance between Slytherin students and Harry -AdamJD function bool ShouldStartLookingForHarry() @@ -240,23 +239,10 @@ state followHarry GroundSpeed = GroundRunSpeed + 175; LoopAnim(RunAnimName,,0.75); vTemp = PlayerHarry.Location - Location; - - fDistanceToHarry = VSize(vTemp); //get Harrys current location from Slytherin students -AdamJD - - //chase after Harry if close enough! -AdamJD - if(fDistanceToHarry <= 250) - { - vTemp = Location + 30 * vTemp / VSize(vTemp); - } - //otherwise randomly look for Harry if too far away -AdamJD - else - { - vTemp = Location + 2 * vTemp / VSize(vTemp); - } - + vTemp = Location + 2 * vTemp / VSize(vTemp); MoveTo(vTemp); DesiredRotation.Yaw = rotator(PlayerHarry.Location - Location).Yaw; - if ( CanSeeHarry(True,True) ) + if ( !CanSeeHarry(True,True) ) { iCanSeeHarryCounter++; if ( iCanSeeHarryCounter > 2 ) @@ -264,10 +250,8 @@ state followHarry GotoState('RandomLookForHarry'); } } - else - { - GotoState('followHarry'); - } + + GotoState('followHarry'); } state RandomLookForHarry @@ -298,33 +282,30 @@ state RandomLookForHarry //UTPT didn't add this for some reason -AdamJD function Tick (float dtime) { + Global.Tick(dtime); if ( (Rand(6) == 0) && !bTempDontLookForHarry && CanSeeHarry(True,True) ) { - if ( bDoStuckChecking ) - { + GotoState('followHarry'); + } + if ( bDoStuckChecking ) + { if ( VSize2D(Location - vLastPosition) < 1 ) { - iStuckCounter++; - if ( iStuckCounter > 4 ) - { - vLastPosition = vect(0.00,0.00,0.00); - iStuckCounter = 0; - FindNewVTempBasedOnNormal(PlayerHarry.Location - Location); - GotoState('RandomLookForHarry'); - } + iStuckCounter++; + if ( iStuckCounter > 4 ) + { + vLastPosition = vect(0.00,0.00,0.00); + iStuckCounter = 0; + FindNewVTempBasedOnNormal(PlayerHarry.Location - Location); + GotoState('RandomLookForHarry'); + } + } + else + { + iStuckCounter = 0; } - vLastPosition = Location; - } - } - - fDistanceToHarry = VSize(PlayerHarry.Location - Location); //get Harrys current location from Slytherin students -AdamJD - - //go to the followHarry state if current distance is 250 or less (fWatchForHarryDist is 512) -AdamJD - if(fDistanceToHarry <= 250) - { - //Log("Close to Harry!"); - GotoState('followHarry'); } + vLastPosition = Location; } function EndState() @@ -343,11 +324,9 @@ state RandomLookForHarry local Rotator R; R.Yaw = rotator(HitNormal).Yaw; - R.Yaw = (R.Yaw + RandRange(-15000.0,15000.0)) & 65535; + R.Yaw = R.Yaw + RandRange(-15000.0,15000.0) & 65535; - //Figured this bit out for the students to move towards Harry when they see him like in the retail game because it wasn't here -AdamJD - vTemp = Location + Normal(vector(R) * 75) * 80; - DesiredRotation.Yaw = R.Yaw + rotator(vTemp).Yaw & 65535; + vTemp = Location + Normal(vector(R)) * 75; //figured this bit out for the students to move towards Harry when they see him like in the retail game because UTPT couldn't decompile it -AdamJD } begin: @@ -369,8 +348,7 @@ state RandomLookForHarry Velocity = vect(0.00,0.00,0.00); Acceleration = vect(0.00,0.00,0.00); LoopAnim(IdleAnimName,RandRange(0.81,1.25),0.25); - // this seems to cause the most problems so I'm commenting it out -AdamJD - //Sleep(RandRange(0.75,1.5)); + Sleep(RandRange(0.75,1.5)); FindNewVTempBasedOnNormal((PlayerHarry.Location - Location) * vect(1.00,1.00,0.00)); TurnTo(vTemp); bDoStuckChecking = True; @@ -474,8 +452,7 @@ state SaySomethingFirstTime function Tick(float DeltaTime) { Global.Tick(DeltaTime); - DesiredRotation.Yaw = rotator(playerHarry.Location - Location).yaw; - //CM(name$" Tick 1"); + DesiredRotation.Yaw = rotator(playerHarry.Location - Location).Yaw; } begin: @@ -541,20 +518,21 @@ function PreBeginPlay() local name nm; Super.PreBeginPlay(); + FidgetNums = 0; - for(i = 0; i <= 16; i++) + for(I = 1; I <= 16; I++) { AnimName = "fidget_" $I; nm = StringToAnimName(AnimName); - if ( nm == '' ) + if ( nm == 'None' ) { FidgetNums = I - 1; break; } } - IdleNums = 0; - for(i = 0; i <= 16; i++) + IdleNums = 0; + for(I = 1; I <= 16; I++) { AnimName = "idle_" $I; nm = StringToAnimName(AnimName); @@ -564,16 +542,18 @@ function PreBeginPlay() break; } } + HowManyBaseAnims = 0; HowManyBaseSounds = 0; HowManyAlarmAnims = 0; HowManyAlarmSounds = 0; + if ( !bCouldWatchForHarry ) { return; } - for(i = 0; i < WATCH_FOR_HARRY_ARRAY_SIZE; i++) + for(I = 0; I < WATCH_FOR_HARRY_ARRAY_SIZE; I++) { if ( BaseWatchAnim[I] == 'None' ) { @@ -582,7 +562,7 @@ function PreBeginPlay() } HowManyBaseAnims = I; - for(i = 0; i < WATCH_FOR_HARRY_ARRAY_SIZE; i++) + for(I = 0; I < WATCH_FOR_HARRY_ARRAY_SIZE; I++) { if ( BaseWatchSound[I] == "" ) { @@ -591,7 +571,7 @@ function PreBeginPlay() } HowManyBaseSounds = I; - for(i = 0; i < WATCH_FOR_HARRY_ARRAY_SIZE; i++) + for(I = 0; I < WATCH_FOR_HARRY_ARRAY_SIZE; I++) { if ( BaseAlarmAnim[I] == 'None' ) { @@ -600,7 +580,7 @@ function PreBeginPlay() } HowManyAlarmAnims = I; - for(i = 0; i < WATCH_FOR_HARRY_ARRAY_SIZE; i++) + for(I = 0; I < WATCH_FOR_HARRY_ARRAY_SIZE; I++) { if ( BaseAlarmSound[I] == "" ) { @@ -608,6 +588,7 @@ function PreBeginPlay() } } HowManyAlarmSounds = I; + if ( PlayerHarry.Difficulty == DifficultyMedium ) { GroundRunSpeed = 240.0; @@ -1006,26 +987,17 @@ state stateIdle CurrIdleAnimName = GetCurrIdleAnimName(); if ( FidgetNums != 0 ) { - //only play the current idle anim if an actor has one otherwise you get T/A posing and things breaking -AdamJD - if( HasAnim(CurrIdleAnimName) ) - { - LoopAnim(CurrIdleAnimName,RandRange(0.81,1.25),0.5); - Sleep(RandRange(iMinIdleSeconds,iMaxIdleSeconds)); - FinishAnim(); - } - - //only play the current fidget anim if an actor has one otherwise you get T/A posing and things breaking -AdamJD - if( HasAnim(CurrFidgetAnimName) ) - { - PlayAnim(CurrFidgetAnimName,RandRange(0.81,1.25),0.2); - FinishAnim(); - } + LoopAnim(CurrIdleAnimName,RandRange(0.81,1.25),[TweenTime]0.5); + Sleep(RandRange(iMinIdleSeconds,iMaxIdleSeconds)); + FinishAnim(); + PlayAnim(CurrFidgetAnimName,RandRange(0.81,1.25),[TweenTime]0.2); + FinishAnim(); } - else + else { if ( HasAnim(CurrIdleAnimName) ) { - PlayAnim(CurrIdleAnimName,RandRange(0.81,1.25),0.2); + PlayAnim(CurrIdleAnimName,RandRange(0.81,1.25),[TweenTime]0.2); FinishAnim(); Sleep(0.01); } @@ -1146,7 +1118,7 @@ function Sound GetRandomFallSound() { local int nActualSounds; - for(nActualSounds = 0; nActualSounds < 10; nActualSounds++) + for(nActualSounds = 0; nActualSounds < ArrayCount(soundFalling); nActualSounds++) { if ( soundFalling[nActualSounds] == None ) { diff --git a/HGame/Classes/HPath_A.uc b/HGame/Classes/HPath_A.uc index 08cf9629..2b31f4d3 100644 --- a/HGame/Classes/HPath_A.uc +++ b/HGame/Classes/HPath_A.uc @@ -5,7 +5,7 @@ class HPath_A extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\ica.PNG Name=ica COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\ica.PNG Name=ica COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_B.uc b/HGame/Classes/HPath_B.uc index 0acce45f..6e993e15 100644 --- a/HGame/Classes/HPath_B.uc +++ b/HGame/Classes/HPath_B.uc @@ -5,7 +5,7 @@ class HPath_B extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\icb.PNG Name=icb COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\icb.PNG Name=icb COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_C.uc b/HGame/Classes/HPath_C.uc index 47c79c8e..22b7eb4a 100644 --- a/HGame/Classes/HPath_C.uc +++ b/HGame/Classes/HPath_C.uc @@ -5,7 +5,7 @@ class HPath_C extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\icc.PNG Name=icc COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\icc.PNG Name=icc COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_D.uc b/HGame/Classes/HPath_D.uc index b52a9a2b..95c4f212 100644 --- a/HGame/Classes/HPath_D.uc +++ b/HGame/Classes/HPath_D.uc @@ -5,7 +5,7 @@ class HPath_D extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\icd.PNG Name=icd COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\icd.PNG Name=icd COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_E.uc b/HGame/Classes/HPath_E.uc index c527cc1f..72ba068c 100644 --- a/HGame/Classes/HPath_E.uc +++ b/HGame/Classes/HPath_E.uc @@ -5,7 +5,7 @@ class HPath_E extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\ice.PNG Name=ice COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\ice.PNG Name=ice COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_F.uc b/HGame/Classes/HPath_F.uc index f539e876..0f85d5b0 100644 --- a/HGame/Classes/HPath_F.uc +++ b/HGame/Classes/HPath_F.uc @@ -5,7 +5,7 @@ class HPath_F extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\icf.PNG Name=icf COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\icf.PNG Name=icf COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_G.uc b/HGame/Classes/HPath_G.uc index 10cc3801..a84a2c40 100644 --- a/HGame/Classes/HPath_G.uc +++ b/HGame/Classes/HPath_G.uc @@ -5,7 +5,7 @@ class HPath_G extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\icg.PNG Name=icg COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\icg.PNG Name=icg COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HPath_H.uc b/HGame/Classes/HPath_H.uc index 07eac544..92c311c7 100644 --- a/HGame/Classes/HPath_H.uc +++ b/HGame/Classes/HPath_H.uc @@ -5,7 +5,7 @@ class HPath_H extends basePath; //texture import -AdamJD -#exec Texture Import File=Textures\ich.PNG Name=ich COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\ich.PNG Name=ich COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 defaultproperties { diff --git a/HGame/Classes/HUD/BaseHud.uc b/HGame/Classes/HUD/BaseHud.uc index 0297684d..587213a9 100644 --- a/HGame/Classes/HUD/BaseHud.uc +++ b/HGame/Classes/HUD/BaseHud.uc @@ -3,7 +3,7 @@ //================================================================================ class baseHUD extends HUD - Config(User); + Config(User); // Metallicafan212: Add in the font imports #exec new TrueTypeFontFactory Name=HugeInkFont FontName="Times New Roman" Xpad=2 Height=24 AntiAlias=0 CharactersPerPage=32 @@ -75,7 +75,7 @@ event Tick (float fDeltaTime) curIconMessage.duration -= fDeltaTime; if ( curIconMessage.duration < 0 ) { - curIconMessage.valid = False; + curIconMessage.valid = False; } } } diff --git a/HGame/Classes/HUD/BeanRoomTimerManager.uc b/HGame/Classes/HUD/BeanRoomTimerManager.uc index 2b4f5658..584a9e42 100644 --- a/HGame/Classes/HUD/BeanRoomTimerManager.uc +++ b/HGame/Classes/HUD/BeanRoomTimerManager.uc @@ -155,8 +155,6 @@ function float GetTimerDuration() } else { fDuration = 10.0; } - - //WTF UTPT... -AdamJD // } // } // } diff --git a/HGame/Classes/HUD/ChallengeScoreManager.uc b/HGame/Classes/HUD/ChallengeScoreManager.uc index e850e02d..12dd6ad8 100644 --- a/HGame/Classes/HUD/ChallengeScoreManager.uc +++ b/HGame/Classes/HUD/ChallengeScoreManager.uc @@ -56,8 +56,8 @@ var(ChallengeManager) int nWarnTimeAlmostUp; event PostBeginPlay() { Super.PostBeginPlay(); - textureScoreIcon = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2ChallengeScore",Class'Texture')); - textureTallyScoreIcon = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2BigChallengeScore",Class'Texture')); + textureScoreIcon = Texture(DynamicLoadObject(strSCORE_ICON,Class'Texture')); + textureTallyScoreIcon = Texture(DynamicLoadObject(strTALLY_SCORE_ICON,Class'Texture')); bSentWarnTimeEvent = False; } @@ -243,9 +243,8 @@ function GetInProgressScorePosition (Canvas Canvas, out int nIconX, out int nIco local float fScaleFactor; fScaleFactor = GetScaleFactor(Canvas); - nIconX = Canvas.SizeX / 2 - (128 / 2 * fScaleFactor); + nIconX = Canvas.SizeX / 2 - ((nSCORE_WIDTH / 2) * fScaleFactor); nIconY = 4 * fScaleFactor; - return; } function GetTallyScorePosition (Canvas Canvas, out int nIconX, out int nIconY) @@ -253,9 +252,8 @@ function GetTallyScorePosition (Canvas Canvas, out int nIconX, out int nIconY) local float fScaleFactor; fScaleFactor = GetScaleFactor(Canvas); - nIconX = Canvas.SizeX / 2 - (128 / 2 * fScaleFactor); - nIconY = 2 * fScaleFactor; - return; + nIconX = Canvas.SizeX / 2 - ((nTALLY_SCORE_WIDTH / 2) * fScaleFactor); + nIconY = nTALLY_ICONS_Y * fScaleFactor; } function GetCurrScoreTextXY (out int nMidX, out int nMidY) @@ -352,11 +350,11 @@ function int GetHousePointsFromScore (int nScore) } else //{ if ( nScore < 2 * A / 3 ) { - return (B * nScore / A) - (B / 6); + return ((B * nScore) / A) - (B / 6); } else //{ if ( nScore < A ) { - return (3 * B * nScore) / (2 * A) - (B / 2); + return ((3 * B * nScore) / (2 * A)) - (B / 2); } else { return B; } @@ -375,7 +373,7 @@ state ChallengeInProgress { if ( (nCurrScore > 0) && (baseHUD(PlayerHarry.myHUD).bCutSceneMode == False) && !PlayerHarry.IsInState('CelebrateCardSet') ) { - nCurrScore -= 1; + nCurrScore -= DECREMENT_VALUE; } if ( nCurrScore <= 0 ) { @@ -418,14 +416,14 @@ state ChallengeInProgress function GetCurrScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 32; - nMidY = 65; + nMidX = nCURR_SCORE_MIDX; + nMidY = nCURR_SCORE_MIDY; } function GetHighScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 93; - nMidY = 65; + nMidX = nHIGH_SCORE_MIDX; + nMidY = nHIGH_SCORE_MIDY; } function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, bool bHalfCutMode) @@ -439,7 +437,7 @@ state ChallengeInProgress function BeginState() { nCurrScore = nStartScore; - SetTimer(1.0,True); + SetTimer(DECREMENT_SECONDS,True); } } @@ -493,14 +491,14 @@ state Tally function GetCurrScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 30; - nMidY = 115; + nMidX = nTALLY_CURR_SCORE_MIDX; + nMidY = nTALLY_CURR_SCORE_MIDY; } function GetHighScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 93; - nMidY = 115; + nMidX = nTALLY_HIGH_SCORE_MIDX; + nMidY = nTALLY_HIGH_SCORE_MIDY; } function BeginState() @@ -518,7 +516,7 @@ state Tally nAwardGryffPoints -= GetHousePointsFromScore(nHighScore); if ( !bMastered && (nCurrScore >= nMaxScore) ) { - nAwardGryffPoints += 50; + nAwardGryffPoints += nMASTER_BONUS_HPOINTS; } } if ( bFastForwardTally == True ) @@ -549,7 +547,7 @@ state Tally // goto JL0000; } fTicksPerSec = 1.0 / fTickDelta; - nTallyPointsPerTick = (nCurrScore - nHighScore) / 3.0 * fTicksPerSec; + nTallyPointsPerTick = (nCurrScore - nHighScore) / (3.0 * fTicksPerSec); if ( nTallyPointsPerTick < 1 ) { nTallyPointsPerTick = 1; @@ -593,14 +591,14 @@ state PostTallyHold function GetCurrScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 30; - nMidY = 115; + nMidX = nTALLY_CURR_SCORE_MIDX; + nMidY = nTALLY_CURR_SCORE_MIDY; } function GetHighScoreTextXY (out int nMidX, out int nMidY) { - nMidX = 93; - nMidY = 115; + nMidX = nTALLY_HIGH_SCORE_MIDX; + nMidY = nTALLY_HIGH_SCORE_MIDY; } function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, bool bHalfCutMode) diff --git a/HGame/Classes/HUD/CountdownTimerManager.uc b/HGame/Classes/HUD/CountdownTimerManager.uc index 1692c701..e21018c3 100644 --- a/HGame/Classes/HUD/CountdownTimerManager.uc +++ b/HGame/Classes/HUD/CountdownTimerManager.uc @@ -33,8 +33,8 @@ function LoadTimerBarGraphics() { fFULL_OFFSET_X = 51.0; fFULL_OFFSET_Y = 26.0; - textureTimerEmpty = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2Timer",Class'Texture')); - textureFullBar = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EmptyBar",Class'Texture')); + textureTimerEmpty = Texture(DynamicLoadObject(strTIMER_BAR_FULL,Class'Texture')); + textureFullBar = Texture(DynamicLoadObject(strTIMER_BAR_EMPTY,Class'Texture')); } function DrawCountdown (Canvas Canvas) @@ -46,12 +46,12 @@ function DrawCountdown (Canvas Canvas) local float fSegmentWidth; fScaleFactor = Canvas.GetHudScaleFactor(); - Ox = Canvas.SizeX - 8 * fScaleFactor - 205.0 * fScaleFactor; - Oy = Canvas.SizeY - 8 * fScaleFactor - 58.0 * fScaleFactor; + Ox = Canvas.SizeX - 8 * fScaleFactor - (fTIMER_EMPTY_W * fScaleFactor); + Oy = Canvas.SizeY - 8 * fScaleFactor - (fTIMER_EMPTY_H * fScaleFactor); Canvas.SetPos(Ox,Oy); Canvas.DrawIcon(textureTimerEmpty,fScaleFactor); fFullRatio = fCountdownTime / GetTimerDuration(); - fSegmentWidth = fFullRatio * 118.0; + fSegmentWidth = fFullRatio * fFULL_BAR_W; Canvas.SetPos(Ox + fFULL_OFFSET_X * fScaleFactor,Oy + fFULL_OFFSET_Y * fScaleFactor); Canvas.DrawTile(textureFullBar,fSegmentWidth * fScaleFactor,textureFullBar.VSize * fScaleFactor,0.0,0.0,fSegmentWidth,textureFullBar.VSize); DrawTuningModeData(Canvas); diff --git a/HGame/Classes/HUD/EnemyHealthManager.uc b/HGame/Classes/HUD/EnemyHealthManager.uc index 9f0c0e6c..d22aa595 100644 --- a/HGame/Classes/HUD/EnemyHealthManager.uc +++ b/HGame/Classes/HUD/EnemyHealthManager.uc @@ -28,7 +28,7 @@ var bool bRegisteredWithHud; event PostBeginPlay() { Super.PostBeginPlay(); - textureBarEmpty = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthEmpty",Class'Texture')); + textureBarEmpty = Texture(DynamicLoadObject(strBAR_EMPTY,Class'Texture')); } function Start (HChar EnemyIn) @@ -40,19 +40,19 @@ function Start (HChar EnemyIn) { // case EnemyIn.0: case EnemyIn.EEnemyBar.EnemyBar_Aragog: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthAragog",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_ARAGOG,Class'Texture')); break; // case EnemyIn.1: case EnemyIn.EEnemyBar.EnemyBar_Basilisk: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthBasilisk",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_BASILISK,Class'Texture')); break; // case EnemyIn.2: case EnemyIn.EEnemyBar.EnemyBar_Duellist: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthWizard",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_DUELLIST,Class'Texture')); break; // case EnemyIn.3: case EnemyIn.EEnemyBar.EnemyBar_Peeves: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthPeeves",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_PEEVES,Class'Texture')); break; // case EnemyIn.4: case EnemyIn.EEnemyBar.EnemyBar_Seeker: @@ -60,26 +60,26 @@ function Start (HChar EnemyIn) { // case 0: case Seeker(EnemyIn).HouseAffiliation.HA_Gryffindor: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2_QuidBarGryf",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_SEEKER_GRY,Class'Texture')); break; // case 1: case Seeker(EnemyIn).HouseAffiliation.HA_Ravenclaw: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2_QuidBarRave",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_SEEKER_RAV,Class'Texture')); break; // case 2: case Seeker(EnemyIn).HouseAffiliation.HA_Hufflepuff: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2_QuidBarHuff",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_SEEKER_HUF,Class'Texture')); break; // case 3: case Seeker(EnemyIn).HouseAffiliation.HA_Slytherin: - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2_QuidBarSlyth",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_SEEKER_SLY,Class'Texture')); break; default: } break; default: Log("ERROR: Missing enemy health enum"); - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2EnemyHealthWizard",Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_DUELLIST,Class'Texture')); break; } GotoState('DisplayEnemyHealth'); @@ -123,15 +123,15 @@ state DisplayEnemyHealth local float fSegmentStartAt; fScaleFactor = GetScaleFactor(Canvas); - fIconX = 4.0 * fScaleFactor; - fIconY = Canvas.SizeY - fScaleFactor * 110.0; + fIconX = fSCREEN_X * fScaleFactor; + fIconY = Canvas.SizeY - (fScaleFactor * fSCREEN_UP_FROM_BOTTOM_Y); Canvas.SetPos(fIconX,fIconY); Canvas.DrawIcon(textureBarFull,fScaleFactor); fEnemyHealth = Enemy.GetHealth(); fEnemyHealth = FClamp(fEnemyHealth,0.0,1.0); fEmptyHealth = 1.0 - fEnemyHealth; - fSegmentWidth = fEnemyHealth * 116.0; - Canvas.SetPos(fIconX + 5 * fScaleFactor,fIconY + 83 * fScaleFactor); + fSegmentWidth = fEnemyHealth * fBAR_W; + Canvas.SetPos(fIconX + (fBAR_START_X * fScaleFactor),fIconY + (fBAR_START_Y * fScaleFactor)); Canvas.DrawTile(textureBarEmpty,fSegmentWidth * fScaleFactor,textureBarEmpty.VSize * fScaleFactor,0.0,0.0,fSegmentWidth,textureBarEmpty.VSize); if ( fEnemyHealth <= 0.0 ) { diff --git a/HGame/Classes/HUD/GoldCardTimerManager.uc b/HGame/Classes/HUD/GoldCardTimerManager.uc index 8133bedf..a765234c 100644 --- a/HGame/Classes/HUD/GoldCardTimerManager.uc +++ b/HGame/Classes/HUD/GoldCardTimerManager.uc @@ -11,8 +11,8 @@ function LoadTimerBarGraphics() { fFULL_OFFSET_X = 55.0; fFULL_OFFSET_Y = 22.0; - textureTimerEmpty = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2GoldCardTimerEmpty",Class'Texture')); - textureFullBar = Texture(DynamicLoadObject("HP2_Menu.Icon.HP2GoldCardTimerFull",Class'Texture')); + textureTimerEmpty = Texture(DynamicLoadObject(strTIMER_EMPTY,Class'Texture')); + textureFullBar = Texture(DynamicLoadObject(strFULL_BAR,Class'Texture')); } defaultproperties diff --git a/HGame/Classes/HUD/HPHud.uc b/HGame/Classes/HUD/HPHud.uc index 9b1d655a..0fe82ecb 100644 --- a/HGame/Classes/HUD/HPHud.uc +++ b/HGame/Classes/HUD/HPHud.uc @@ -104,7 +104,7 @@ function RegisterPickupProp (HProp Prop) bFoundSlot = False; - for(I = 0; I < 20; I++) + for(I = 0; I < ArrayCount(propArray); I++) { if ( propArray[I] == None ) { @@ -125,12 +125,12 @@ function UnregisterPickupProp (HProp Prop) local int I; local int J; - for(I = 0; I < 20; I++) + for(I = 0; I < ArrayCount(propArray); I++) { if ( propArray[I] == Prop ) { propArray[I] = None; - for(J = I + 1; J < 20; J++) + for(J = I + 1; J < ArrayCount(propArray); J++) { propArray[J - 1] = propArray[J]; propArray[J] = None; @@ -197,10 +197,9 @@ simulated function PreBeginPlay() managerCutScene = Spawn(Class'CutSceneManager'); } - for(I = 0; I < 20; I++) + for(I = 0; I < ArrayCount(propArray); I++) { propArray[I] = None; - break; } } @@ -284,7 +283,7 @@ simulated function PostRender (Canvas Canvas) harry(Owner).managerStatus.RenderHudItemManager(Canvas,bInGameMenuUp,bFullCutMode,bHalfCutMode); } - for(I = 0; I < 20; I++) + for(I = 0; I < ArrayCount(propArray); I++) { if ( propArray[I] == None ) { diff --git a/HGame/Classes/HUD/HudItemManager.uc b/HGame/Classes/HUD/HudItemManager.uc index cb5259df..a35e9ae7 100644 --- a/HGame/Classes/HUD/HudItemManager.uc +++ b/HGame/Classes/HUD/HudItemManager.uc @@ -12,7 +12,7 @@ function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, function float GetScaleFactor (Canvas Canvas) { - return Canvas.SizeX / 640.0; + return Canvas.SizeX / BASE_RESOLUTION_X; } defaultproperties diff --git a/HGame/Classes/HUD/QuidScoreManager.uc b/HGame/Classes/HUD/QuidScoreManager.uc index c1cab2bc..79a6a4cc 100644 --- a/HGame/Classes/HUD/QuidScoreManager.uc +++ b/HGame/Classes/HUD/QuidScoreManager.uc @@ -50,7 +50,7 @@ event PostBeginPlay() textureRaven = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2RavenclawCrestSm",Class'Texture')); textureSlyth = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SlytherinCrestSm",Class'Texture')); textureGryff = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2GriffindorCrestSm",Class'Texture')); - textureTallyPointsIcon = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2BigChallengeScore",Class'Texture')); + textureTallyPointsIcon = Texture(DynamicLoadObject(strTALLY_POINTS_ICON,Class'Texture')); textureOpponent = textureHuff; } @@ -199,11 +199,11 @@ function DrawQuidScore (Canvas Canvas) fontSave = Canvas.Font; fScaleFactor = GetScaleFactor(Canvas); - nGryffIconX = 520 * fScaleFactor; - nGryffIconY = 4 * fScaleFactor; + nGryffIconX = fGRYFF_X * fScaleFactor; + nGryffIconY = fGRYFF_Y * fScaleFactor; Canvas.SetPos(nGryffIconX,nGryffIconY); Canvas.DrawIcon(textureGryff,fScaleFactor); - nOpponIconX = 578 * fScaleFactor; + nOpponIconX = fOPPONENT_X * fScaleFactor; nOpponIconY = 4 * fScaleFactor; Canvas.SetPos(nOpponIconX,nOpponIconY); Canvas.DrawIcon(textureOpponent,fScaleFactor); @@ -220,19 +220,19 @@ function DrawQuidScore (Canvas Canvas) if ( Canvas.SizeX <= 512 ) { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalSmallFont; - } else { + } else //{ if ( Canvas.SizeX <= 640 ) { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalMedFont; } else { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalBigFont; } - } + //} Canvas.TextSize(strGryffScore,nXTextLen,nYTextLen); - Canvas.SetPos(nGryffIconX + (45 * fScaleFactor) - nXTextLen / 2,nGryffIconY + (50 * fScaleFactor) - nYTextLen / 2); + Canvas.SetPos(nGryffIconX + (nCREST_MIDX * fScaleFactor) - nXTextLen / 2,nGryffIconY + (nCREST_MIDY * fScaleFactor) - nYTextLen / 2); Canvas.DrawShadowText(strGryffScore,colorOffWhite,colorBlack); Canvas.TextSize(strOpponentScore,nXTextLen,nYTextLen); - Canvas.SetPos(nOpponIconX + (45 * fScaleFactor) - nXTextLen / 2,nOpponIconY + (50 * fScaleFactor) - nYTextLen / 2); + Canvas.SetPos(nOpponIconX + (nCREST_MIDX * fScaleFactor) - nXTextLen / 2,nOpponIconY + (nCREST_MIDY * fScaleFactor) - nYTextLen / 2); Canvas.DrawText(strOpponentScore,False); Canvas.Font = fontSave; } @@ -251,8 +251,8 @@ function DrawTallyHousepoints (Canvas Canvas) colorSave = Canvas.DrawColor; fontSave = Canvas.Font; fScaleFactor = GetScaleFactor(Canvas); - nPointsIconX = Canvas.SizeX / 2 - (128 / 2) * fScaleFactor; - nPointsIconY = 20 * fScaleFactor; + nPointsIconX = Canvas.SizeX / 2 - ((nTALLY_POINTS_WIDTH / 2) * fScaleFactor); + nPointsIconY = nTALLY_DISPLAY_Y * fScaleFactor; Canvas.SetPos(nPointsIconX,nPointsIconY); Canvas.DrawIcon(textureTallyPointsIcon,fScaleFactor); nXTextLen = 0.0; @@ -262,7 +262,7 @@ function DrawTallyHousepoints (Canvas Canvas) Canvas.DrawColor.G = 0; Canvas.DrawColor.B = 0; Canvas.TextSize(strPoints,nXTextLen,nYTextLen); - Canvas.SetPos(nPointsIconX + 65 * fScaleFactor - (nXTextLen / 2),nPointsIconY + 87 * fScaleFactor - (nYTextLen / 2)); + Canvas.SetPos(nPointsIconX + (nTALLY_POINTS_MIDX * fScaleFactor) - nXTextLen / 2,nPointsIconY + (nTALLY_POINTS_MIDY * fScaleFactor) - nYTextLen / 2); Canvas.DrawText(strPoints,False); Canvas.DrawColor = colorSave; Canvas.Font = fontSave; diff --git a/HGame/Classes/HUD/QuidditchBar.uc b/HGame/Classes/HUD/QuidditchBar.uc index a4338f71..34bce90e 100644 --- a/HGame/Classes/HUD/QuidditchBar.uc +++ b/HGame/Classes/HUD/QuidditchBar.uc @@ -31,10 +31,10 @@ var float fFlashCurrSeconds; event PostBeginPlay() { Super.PostBeginPlay(); - textureBarEmpty = Texture(DynamicLoadObject("HP2_Menu.Hud.HP2_QuidBarEmpty", class'Texture')); - textureBarFull = Texture(DynamicLoadObject("HP2_Menu.Hud.HP2_QuidBarFull", class'Texture')); - textureBarGold = Texture(DynamicLoadObject("HP2_Menu.Hud.HP2QuidditchBarGold", class'Texture')); - textureBarWhite = Texture(DynamicLoadObject("HP2_Menu.Hud.HP2QuidditchBarWhite", class'Texture')); + textureBarEmpty = Texture(DynamicLoadObject(strBAR_EMPTY, class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_FULL, class'Texture')); + textureBarGold = Texture(DynamicLoadObject(strBAR_GOLD, class'Texture')); + textureBarWhite = Texture(DynamicLoadObject(strBAR_WHITE, class'Texture')); } function Show(bool bShow) @@ -140,8 +140,8 @@ state DisplayQBar colorSave = Canvas.DrawColor; fScaleFactor = GetScaleFactor(Canvas); - fIconX = Canvas.SizeX - (fScaleFactor * 132.0); - fIconY = Canvas.SizeY - (fScaleFactor * 80.0); + fIconX = Canvas.SizeX - (fScaleFactor * fSCREEN_OVER_FROM_RIGHT_X); + fIconY = Canvas.SizeY - (fScaleFactor * fSCREEN_UP_FROM_BOTTOM_Y); Canvas.SetPos(fIconX, fIconY); empty = !bFlashing || (fFlashCurrSeconds > fFlashTotalSeconds / 2); @@ -156,8 +156,8 @@ state DisplayQBar fFullRatio = float(nPercentFull) / 100.0; fFullRatio = FClamp(fFullRatio, 0.0, 1.0); Canvas.DrawColor = GetBarDrawColor(); - fSegmentWidth = fFullRatio * 117.0; - Canvas.SetPos(fIconX + (4.0 * fScaleFactor), fIconY + (52.0 * fScaleFactor)); + fSegmentWidth = fFullRatio * fBAR_W; + Canvas.SetPos(fIconX + (fBAR_START_X * fScaleFactor), fIconY + (fBAR_START_Y * fScaleFactor)); if(empty) { Canvas.DrawTile(textureBarWhite, fSegmentWidth * fScaleFactor, textureBarWhite.VSize * fScaleFactor, 0.0, 0.0, fSegmentWidth, textureBarWhite.VSize); diff --git a/HGame/Classes/HUD/SpellSelector.uc b/HGame/Classes/HUD/SpellSelector.uc index 1f9f8645..a0790c50 100644 --- a/HGame/Classes/HUD/SpellSelector.uc +++ b/HGame/Classes/HUD/SpellSelector.uc @@ -37,12 +37,12 @@ var ESpellSelection CurrSelection; event PostBeginPlay() { Super.PostBeginPlay(); - textureSpellRictusempra = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellRictusempra",Class'Texture')); - textureSpellRictusempraSel = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellRictusempraSelect",Class'Texture')); - textureSpellMimblewimble = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellMimblewimble",Class'Texture')); - textureSpellMimblewimbleSel = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellMimblewimbleSelect",Class'Texture')); - textureSpellExpelliarmus = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellExpelliarmus",Class'Texture')); - textureSpellExpelliarmusSel = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2SpellExpelliarmusSelect",Class'Texture')); + textureSpellRictusempra = Texture(DynamicLoadObject(strSPELL_RICTUSEMPRA,Class'Texture')); + textureSpellRictusempraSel = Texture(DynamicLoadObject(strSPELL_RICTUSEMPRA_SEL,Class'Texture')); + textureSpellMimblewimble = Texture(DynamicLoadObject(strSPELL_MIMBLEWIMBLE,Class'Texture')); + textureSpellMimblewimbleSel = Texture(DynamicLoadObject(strSPELL_MIMBLEWIMBLE_SEL,Class'Texture')); + textureSpellExpelliarmus = Texture(DynamicLoadObject(strSPELL_EXPELLIARMUS,Class'Texture')); + textureSpellExpelliarmusSel = Texture(DynamicLoadObject(strSPELL_EXPELLIARMUS_SEL,Class'Texture')); SetTimer(0.2,True); } @@ -75,8 +75,8 @@ function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, local Texture textureSpellIcon; fScaleFactor = GetScaleFactor(Canvas); - nIconX = 2 * fScaleFactor; - nIconY = 175 * fScaleFactor; + nIconX = nSTART_X * fScaleFactor; + nIconY = nSTART_Y * fScaleFactor; if ( CurrSelection == SSelection_Rictusempra ) { @@ -84,8 +84,8 @@ function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, } else { textureSpellIcon = textureSpellRictusempra; } - DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,"1"); - nIconY += (textureSpellRictusempra.VSize + 4) * fScaleFactor; + DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,strRICTUSEMPRA_HOTKEY); + nIconY += (textureSpellRictusempra.VSize + nSPACE_BETWEEN_ICONS) * fScaleFactor; if ( CurrSelection == SSelection_Mimblewimble ) { @@ -93,8 +93,8 @@ function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, } else { textureSpellIcon = textureSpellMimblewimble; } - DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,"2"); - nIconY += (textureSpellMimblewimble.VSize + 4) * fScaleFactor; + DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,strMIMBLEWIMBLE_HOTKEY); + nIconY += (textureSpellMimblewimble.VSize + nSPACE_BETWEEN_ICONS) * fScaleFactor; if ( CurrSelection == SSelection_Expelliarmus ) { @@ -102,7 +102,7 @@ function RenderHudItemManager (Canvas Canvas, bool bMenuMode, bool bFullCutMode, } else { textureSpellIcon = textureSpellExpelliarmus; } - DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,"3"); + DrawSpellIcon(Canvas,fScaleFactor,textureSpellIcon,nIconX,nIconY,strEXPELLIARMUS_HOTKEY); } function DrawSpellIcon (Canvas Canvas, float fScaleFactor, Texture textureSpellIcon, int nIconX, int nIconY, string strHotKey) @@ -140,8 +140,8 @@ function DrawHotKeyText (Canvas Canvas, int nIconX, int nIconY, string strHotKey } //} Canvas.TextSize(strHotKey,fXTextLen,fYTextLen); - nXOffset = (20 * fScaleFactor) - fXTextLen / 2; - nYOffset = (50 * fScaleFactor) - fXTextLen / 2; + nXOffset = (nTEXT_OFFSET_X * fScaleFactor) - fXTextLen / 2; + nYOffset = (nTEXT_OFFSET_Y * fScaleFactor) - fXTextLen / 2; Canvas.SetPos(nIconX + nXOffset, nIconY + nYOffset); Canvas.DrawText(strHotKey, false); Canvas.DrawColor = colorSave; diff --git a/HGame/Classes/HUD/VendorManager.uc b/HGame/Classes/HUD/VendorManager.uc index ccacb249..1b056287 100644 --- a/HGame/Classes/HUD/VendorManager.uc +++ b/HGame/Classes/HUD/VendorManager.uc @@ -2,7 +2,7 @@ // VendorManager. //================================================================================ -class VendorManager extends Actor; +class VendorManager extends Actor; const strVENDORBAR_LEFT= "HP2_Menu.Icons.HP2VendorBarLeft"; const strVENDORBAR_RIGHT= "HP2_Menu.Icons.HP2VendorBarRight"; @@ -64,7 +64,7 @@ var Texture textureVendorButtonOver; var Texture textureItemToSell; var Characters Vendor; -// Metallicafan212: Prevent a stutter by caching the Weasly twin +// Metallicafan212: Prevent a stutter by caching the Weasley twin (to be compatible with the new engine) var Characters WeasTwin; var name nameVendorSavedState; @@ -87,7 +87,7 @@ var string strNo; function SetVendor (Characters V) { Vendor = V; - // Metallicafan212: Added to prevent against stutter with Fred and George + // Metallicafan212: Added to prevent against stutter with Fred and George (to be compatible with the new engine) WeasTwin = Vendor.GetWeasleyTwin(); } @@ -164,7 +164,6 @@ function DoEngageVendor (name nameSaveState) nItemsBoughtInCurrTransaction = 0; nCurrPrice = Vendor.GetSellingPrice(); - //log(textureVendorBarRight.name); GotoState('EngageVendor'); } @@ -199,28 +198,31 @@ function DoCutTalk (Actor actorTalk, string strDialogID, string strTalkAnimName, { CutCue(strCue); } - else if ( !Vendor.IsDuelVendor() ) - { - actorTalk.CutCommand(strTALK_COMMAND $strDialogID $strTalkAnimName $strLoopAnimName $strIndefiniteParam,strCue); - } else - { - strDialog = (Localize("All",strDialogID,"HPMenu")); - fSoundLen = (Len(strDialog) * 0.01) + 3.0; - if ( strIndefiniteParam == "" ) + { + if ( !Vendor.IsDuelVendor() ) { - tcue = Spawn(Class'TimedCue'); - tcue.CutNotifyActor = self; - tcue.SetupTimer(fSoundLen + 0.5,strCue); - harry(Level.PlayerHarryActor).ClientMessage("Indefinite"); - harry(Level.PlayerHarryActor).myHUD.SetSubtitleText(strDialog,fSoundLen); - } + actorTalk.CutCommand(strTALK_COMMAND $strDialogID $strTalkAnimName $strLoopAnimName $strIndefiniteParam,strCue); + } else { - harry(Level.PlayerHarryActor).myHUD.SetSubtitleText(strDialog,0.0); - CutCue(strCue); + strDialog = (Localize("All",strDialogID,"HPMenu")); + fSoundLen = (Len(strDialog) * 0.01) + 3.0; + if ( strIndefiniteParam == "" ) + { + tcue = Spawn(Class'TimedCue'); + tcue.CutNotifyActor = self; + tcue.SetupTimer(fSoundLen + 0.5,strCue); + harry(Level.PlayerHarryActor).ClientMessage("Indefinite"); + harry(Level.PlayerHarryActor).myHUD.SetSubtitleText(strDialog,fSoundLen); + } + else + { + harry(Level.PlayerHarryActor).myHUD.SetSubtitleText(strDialog,0.0); + CutCue(strCue); + } } - } + } } function DoNarratorInstructions() @@ -229,14 +231,17 @@ function DoNarratorInstructions() { CutCue(strCUE_INSTRUCTIONS); } - else if ( Vendor.IsDuelVendor() ) - { - DoCutTalk(Level.PlayerHarryActor,Vendor.GetVendorInstructionId(),"","",strINDEFINITE_TEXT_PARAM,strCUE_INSTRUCTIONS); - } else - { - CutCommand(strSAY_COMMAND $Vendor.GetVendorInstructionId() $strINDEFINITE_TEXT_PARAM,strCUE_INSTRUCTIONS); - } + { + if ( Vendor.IsDuelVendor() ) + { + DoCutTalk(Level.PlayerHarryActor,Vendor.GetVendorInstructionId(),"","",strINDEFINITE_TEXT_PARAM,strCUE_INSTRUCTIONS); + } + else + { + CutCommand(strSAY_COMMAND $Vendor.GetVendorInstructionId() $strINDEFINITE_TEXT_PARAM,strCUE_INSTRUCTIONS); + } + } } function bool WantInstructions() @@ -259,7 +264,8 @@ state EngageVendor { harry(Level.PlayerHarryActor).Cam.CutCommand(strFLYTO_COMMAND $Vendor.CutName $" x=80 y=80"); harry(Level.PlayerHarryActor).Cam.CutCommand(strTARGET_FLYTO_COMMAND $Vendor.CutName $" x=10 z=10",strCUE_CAMERA_IN_POSITION); - WeasleyTwin = WeasTwin;//Vendor.GetWeasleyTwin(); + //Vendor.GetWeasleyTwin(); + WeasleyTwin = WeasTwin; // Metallicafan212: To be compatible with the new engine if ( WeasleyTwin != None ) { WeasleyTwin.GotoState('stateIdle'); @@ -315,7 +321,7 @@ state EngageVendor harry(Level.PlayerHarryActor).TurnTo(Level.PlayerHarryActor.Location + (Vendor.Location - Level.PlayerHarryActor.Location) * vect(1.00,1.00,0.00)); Vendor.CutCommand(strFACE_HARRY_COMMAND,strCUE_VENDOR_TURN_DONE); //WeasleyTwin = Vendor.GetWeasleyTwin(); - WeasleyTwin = WeasTwin; + WeasleyTwin = WeasTwin; // Metallicafan212: To be compatible with the new engine if ( WeasleyTwin != None ) { WeasleyTwin.GotoState('stateIdle'); @@ -338,7 +344,7 @@ state VendorTransaction { if ( cue ~= strCUE_TRANSACTION_DONE || cue ~= strCUE_DECLINE_SALE || cue ~= strCUE_OUT_OF_STOCK ) { - DoDisengageVendor(); + DoDisengageVendor(); } } @@ -525,6 +531,7 @@ function DoDisengageVendor() { local StatusGroup sgJellyBeans; //local Characters WeasleyTwin; + local Characters WeasleyTwinFredOrGeorge; harry(Level.PlayerHarryActor).Cam.CutCommand(strRELEASE_COMMAND); harry(Level.PlayerHarryActor).Cam.CutNotifyActor = None; @@ -539,11 +546,12 @@ function DoDisengageVendor() Vendor.DesiredRotation = Vendor.rSave; Vendor.GotoState('VendorIdle'); Vendor.CutName = strVendorSavedCutName; - WeasleyTwin = WeasTwin;//Vendor.GetWeasleyTwin(); - if ( WeasleyTwin != None ) + //Vendor.GetWeasleyTwin(); + WeasleyTwinFredOrGeorge = WeasTwin; // Metallicafan212: To be compatible with the new engine + if ( WeasleyTwinFredOrGeorge != None ) { - WeasleyTwin.DesiredRotation = WeasleyTwin.rSave; - WeasleyTwin.GotoState('VendorIdle'); + WeasleyTwinFredOrGeorge.DesiredRotation = WeasleyTwinFredOrGeorge.rSave; + WeasleyTwinFredOrGeorge.GotoState('VendorIdle'); } GotoState('Idle'); } @@ -598,12 +606,6 @@ function DrawVendorBar (Canvas canvas) fBarX = GetVendorBarX(Canvas); fBarY = GetVendorBarY(Canvas); canvas.SetPos(fBarX,fBarY); - - //if(textureVendorBarRight != none) - //{ - // log(textureVendorBarRight.name); - //} - canvas.DrawIcon(textureVendorBarLeft,fScaleFactor); canvas.SetPos(fBarX + (256 * fScaleFactor),fBarY); canvas.DrawIcon(textureVendorBarRight,fScaleFactor); diff --git a/HGame/Classes/HiddenHPawn/HiddenHPawn.uc b/HGame/Classes/HiddenHPawn/HiddenHPawn.uc index 990f99a7..cdaac88c 100644 --- a/HGame/Classes/HiddenHPawn/HiddenHPawn.uc +++ b/HGame/Classes/HiddenHPawn/HiddenHPawn.uc @@ -5,7 +5,7 @@ class HiddenHPawn extends HPawn; //texture import -AdamJD -#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var bool bShowHiddenPawns; diff --git a/HGame/Classes/HiddenHPawn/MovingClouds.uc b/HGame/Classes/HiddenHPawn/MovingClouds.uc index b5d039f6..6ba2c314 100644 --- a/HGame/Classes/HiddenHPawn/MovingClouds.uc +++ b/HGame/Classes/HiddenHPawn/MovingClouds.uc @@ -49,7 +49,7 @@ function bool PassedClouds() local Vector vStraightDir; local Vector vCarDir; - vStraightDir = -Vector(Rotation); + vStraightDir = -(Vector(Rotation)); vCarDir = Vector(PlayerHarry.Rotation); if ( vStraightDir Dot vCarDir < 0 ) { diff --git a/HGame/Classes/HiddenHPawn/PoisonCloud.uc b/HGame/Classes/HiddenHPawn/PoisonCloud.uc index 1240f880..3140452b 100644 --- a/HGame/Classes/HiddenHPawn/PoisonCloud.uc +++ b/HGame/Classes/HiddenHPawn/PoisonCloud.uc @@ -55,18 +55,21 @@ function Touch (Actor Other) if ( (Other == PlayerHarry) && (bCanBeTouched) ) { - return; + //KW left this empty? -AdamJD } - if ( Other.IsA('HPawn') && !Other.IsA('PoisonCloud') && !Other.IsA('ThrownPoisonCloud') && !Other.IsA('HorklumpsHead') && !Other.IsA('HorklumpsStem') && (bCanBeThrown) ) + else { - if ( !baseHUD(PlayerHarry.myHUD).bCutSceneMode ) + if ( Other.IsA('HPawn') && !Other.IsA('PoisonCloud') && !Other.IsA('ThrownPoisonCloud') && !Other.IsA('HorklumpsHead') && !Other.IsA('HorklumpsStem') && (bCanBeThrown) ) { - HPawnHit = HPawn(Other); - if ( BOOL_DEBUG_AI ) + if ( !baseHUD(PlayerHarry.myHUD).bCutSceneMode ) { - PlayerHarry.ClientMessage(string(self) $ " Hit something : " $ string(HPawnHit)); + HPawnHit = HPawn(Other); + if ( BOOL_DEBUG_AI ) + { + PlayerHarry.ClientMessage(string(self) $ " Hit something : " $ string(HPawnHit)); + } + HPawnHit.HitByThrownObject(1,HPawnHit,Location,Velocity * 1,'PoisonCloud'); } - HPawnHit.HitByThrownObject(1,HPawnHit,Location,Velocity * 1,'PoisonCloud'); } } PlaySound(Sound'spell_hit',SLOT_Interact,1.0,False,2000.0,1.0); diff --git a/HGame/Classes/HiddenHPawn/SecretAreaMarker.uc b/HGame/Classes/HiddenHPawn/SecretAreaMarker.uc index ef6eb4f1..7ab3c1c9 100644 --- a/HGame/Classes/HiddenHPawn/SecretAreaMarker.uc +++ b/HGame/Classes/HiddenHPawn/SecretAreaMarker.uc @@ -5,7 +5,7 @@ class SecretAreaMarker extends HiddenHPawn; //texture import -AdamJD -#exec Texture Import File=Textures\SecretTexture.PNG Name=SecretTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\SecretTexture.PNG Name=SecretTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var() bool bUseCollision; var bool bFound; diff --git a/HGame/Classes/HiddenHPawn/SpiderSpawner.uc b/HGame/Classes/HiddenHPawn/SpiderSpawner.uc index a562dffd..40029763 100644 --- a/HGame/Classes/HiddenHPawn/SpiderSpawner.uc +++ b/HGame/Classes/HiddenHPawn/SpiderSpawner.uc @@ -67,6 +67,7 @@ function SpawnRandomSpiders (int ns) spiderRotation = Rotation; spiderYaw = theSpiders[randNum].iRotation * (16384 / 90.0); spiderRotation.Yaw += spiderYaw; + spiderRotation.Yaw = spiderRotation.Yaw & 65535; smSpider = Spawn(Class'SpiderSmall',self,,Location,spiderRotation); smSpider.NormalSpeed = theSpiders[randNum].NormalSpeed; @@ -87,6 +88,7 @@ function SpawnRandomSpiders (int ns) spiderRotation = Rotation; spiderYaw = theSpiders[randNum].iRotation * (16384 / 90.0); spiderRotation.Yaw += spiderYaw; + spiderRotation.Yaw = spiderRotation.Yaw & 65535; lgSpider = Spawn(Class'SpiderLarge',self,,Location,spiderRotation); lgSpider.NormalSpeed = theSpiders[randNum].NormalSpeed; @@ -124,13 +126,16 @@ auto state spiderSpawnerWait state SpawnSomeSpiders { begin: - for(Counter = 0; Counter < numSpiders; Counter++ ) + + Counter = 0; + while( Counter < numSpiders ) { if ( bSmallSpiders == True ) { spiderRotation = Rotation; spiderYaw = theSpiders[Counter].iRotation * (16384 / 90.0); spiderRotation.Yaw += spiderYaw; + spiderRotation.Yaw = spiderRotation.Yaw & 65535; smallSpider = Spawn(Class'SpiderSmall',self,,Location,spiderRotation); smallSpider.NormalSpeed = theSpiders[Counter].NormalSpeed; @@ -150,6 +155,7 @@ state SpawnSomeSpiders spiderRotation = Rotation; spiderYaw = theSpiders[Counter].iRotation * (16384 / 90.0); spiderRotation.Yaw += spiderYaw; + spiderRotation.Yaw = spiderRotation.Yaw & 65535; largeSpider = Spawn(Class'SpiderLarge',self,,Location,spiderRotation); largeSpider.NormalSpeed = theSpiders[Counter].NormalSpeed; @@ -164,6 +170,7 @@ state SpawnSomeSpiders largeSpider.numSpellsDefault = theSpiders[Counter].numSpellsLargeSpider; largeSpider.leaveDeadSpider = theSpiders[Counter].leaveSmallDeadSpider; } + Counter++; Sleep(theSpiders[Counter].nextSpiderDelay); } GotoState('spiderSpawnerWait'); diff --git a/HGame/Classes/Internal/HPConsole.uc b/HGame/Classes/Internal/HPConsole.uc index 9272735a..3feb4d2f 100644 --- a/HGame/Classes/Internal/HPConsole.uc +++ b/HGame/Classes/Internal/HPConsole.uc @@ -2,7 +2,7 @@ // HPConsole. //================================================================================ -class HPConsole extends baseConsole; +class HPConsole extends baseConsole; const BUTTONS_Y=193; const BUTTONS_X=185; @@ -49,8 +49,6 @@ exec function ShortCut() { SCWindow = ShortCutWindow(Root.CreateWindow(Class'ShortCutWindow',64.0,64.0,320.0,320.0)); } - //else - //{ else if ( SCWindow.bUWindowActive ) { SCWindow.Close(); @@ -59,7 +57,6 @@ exec function ShortCut() { SCWindow.ActivateWindow(0,False); } - //} } function CutConsoleLog (string Msg) @@ -516,92 +513,6 @@ exec function DuelingMode() } } -//KW implemented this in baseConsole -AdamJD -/* -function ScaleAndDraw (Canvas C, float X, float Y, Texture Tex) -{ - local float FX; - local float fy; - local float Ratio; - local float CRTScale; - local float XOffset; - local float YOffset; - local float ResX; - local float ResY; - - if ( Tex == None ) - { - return; - } - - //FX = C.SizeX / 640.0; - //fy = C.SizeY / 480.0; - //FX = C.SizeX / 640.0; - //fy = C.SizeY / 480.0; - //FX = 1.0; - //fy = 1.0; - - FX = 1.0; - FY = 1.0; - - // Metallicafan212: Scale it to 4/3 - //Ratio = C.SizeX / C.SizeY; - - //FX = Ratio; /// 1.3333; - - // Metallicafan212: Center the loading screen and draw black behind it - // TODO! - - // Metallicafan212: Rewrite this whole fucking system - // We want a perfect middle square - Ratio = (1.3333333) / (C.Size.X / C.SizeY); - // Figure out a resolution in the middle of the screen - //if(C.SizeX > C.SizeY) - //{ - // Ratio = (1.3333333) / (C.Size.X / C.SizeY); - // Metallicafan212: Use the height as the basis of the square - // ResY = C.SizeY; - // ResX = C.SizeX * Ratio; - //} - //else - //{ - // Ratio = (C.Size.X / C.SizeY) / 1.3333333; - // ResX = C.SizeX; - // ResY = C.SizeY * Ratio; - //} - - // Metallicafan212: Now draw it in the correct place - // We're considering the canvas a perfect 512x512 grid - //X = - - - //FX = (C.SizeX / C.SizeY) / 1.33333; - - //log("X " $ C.SizeX $ " Y " $ C.SizeY); - - // Metallicafan212: Check for thinner resolutions - // On these we need to stretch outwards - - //if(FX < 1.0) - //{ - // FX = 1.0; - // FY = (C.SizeX / C.SizeY); - // log("FY is " $ FY); - //} - //else - //{ - // FY = 1.0; - // log("FX is " $ FX); - //} - - //FY = FX; - - //C.DrawTileClipped(Tex, - - Root.DrawStretchedTexture(C, (X * FX), (Y * FY), Tex.USize * FX, Tex.VSize * FY, Tex); -} -*/ - function ToggleDebugMode() { if ( !Class'Version'.Default.bDebugEnabled ) @@ -645,92 +556,11 @@ function HideConsole() } } -//KW implemented this in baseConsole -AdamJD -/* -function DrawLevelAction (Canvas C) -{ - local string BigMessage; - local float fTextWidth; - local float fTextHeight; - - if ( (Viewport.Actor.Level.Pauser != "") && Viewport.Actor.Level.LevelAction == LEVACT_None) - { - C.Font = C.MedFont; - BigMessage = PausedMessage; - PrintActionMessage(C,BigMessage); - return; - } - if ( Viewport.Actor.Level.LevelAction == LEVACT_None ) - { - BigMessage = ""; - return; - } - else if ( Viewport.Actor.Level.LevelAction == LEVACT_Loading || Viewport.Actor.bShowLoadingScreen ) - { - BigMessage = Localize("all","Options_0058","HPMenu"); - Viewport.Actor.bShowLoadingScreen = True; - C.Style = 1; - C.TextSize(BigMessage,fTextWidth,fTextHeight); - if ( fTextWidth > C.SizeX - 32 ) - { - C.Font = LocalMedFont; - } - else - { - C.Font = LocalBigFont; - } - - ScaleAndDraw(C,0.0,0.0,LoadingBackground.p1); - ScaleAndDraw(C,256.0,0.0,LoadingBackground.p2); - ScaleAndDraw(C,512.0,0.0,LoadingBackground.p3); - ScaleAndDraw(C,0.0,256.0,LoadingBackground.p4); - ScaleAndDraw(C,256.0,256.0,LoadingBackground.p5); - ScaleAndDraw(C,512.0,256.0,LoadingBackground.p6); - PrintActionMessageInUpperLeft(C,BigMessage); - return; - } - else - { - if ( Viewport.Actor.Level.LevelAction == LEVACT_Saving ) - { - BigMessage = Localize("all","Options_0057","HPMenu"); - } - else if ( Viewport.Actor.Level.LevelAction == LEVACT_Connecting ) - { - BigMessage = ConnectingMessage; - } - else if ( Viewport.Actor.Level.LevelAction == LEVACT_Precaching ) - { - BigMessage = PrecachingMessage; - } - } - if ( BigMessage != "" ) - { - C.Style = 1; - C.TextSize(BigMessage,fTextWidth,fTextHeight); - if ( fTextWidth > C.SizeX - 32 ) - { - C.Font = LocalMedFont; - } - else - { - C.Font = LocalBigFont; - } - PrintActionMessage(C,BigMessage); - } -} -*/ - function ChangeLevel (string lev, bool flag) { Log("Changing level to:" $ lev $ "," $ string(flag)); Viewport.Actor.Level.ServerTravel(lev,flag); bLoadNewLevel = True; - - // Metallicafan212: Fix the loading screen not showing up - //Harry(Viewport.Actor).bShowLoadingScreen = true; - //Viewport.Actor.bShowLoadingScreen = true; - //Viewport.Actor.Level.LevelAction = LEVACT_Loading; } function LaunchUWindow (optional bool bPause) @@ -769,7 +599,8 @@ function StartFastForward() Log("*****STARING FASTFORWARD****************************"); foreach Viewport.Actor.AllActors(Class'CutScene',cut) { - if ( cut.bPlaying && cut.bSkipAllowed) + if ( cut.bPlaying + && cut.bSkipAllowed ) //stop the game lagging when trying to skip unskippable cutscenes (to be compatible with the new engine) -AdamJD { cut.FastForward(); bFastForwarding = True; @@ -964,52 +795,16 @@ function WarpHarryToCameraLocation() event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) { - local EInputKey k; - //local EInputKey LocalConsoleKey; - - // Metallicafan212: Force it to be typed - //LocalConsoleKey = enum(ConsoleKey); - - //log("Key event! " $ Key $ " " $ Action); - - //if(Key == IK_Numpad4) - //{ - // log(bLeftKeyDown); - //} + local byte k; - - if(Action == IST_Press && int(key) == ConsoleKey) - { - if ( bLocked ) - { - return True; - } - Root.bAllowConsole = Class'Version'.Default.bDebugEnabled; - if ( !bDebugMode ) - { - return True; - } - if ( bShiftDown ) - { - ShowCutConsole( !bShowCutConsole); - return True; - } - bQuickKeyEnable = True; - LaunchUWindow(); - if ( !bShowConsole ) - { - ShowConsole(); - } - return True; - } - k = Key; + switch (Action) { case IST_Release: switch (k) { - case IK_Delete: + case EInputKey.IK_Delete: if ( bDebugMode ) { if ( harry(Viewport.Actor).Cam.CameraMode != harry(Viewport.Actor).Cam.ECamMode.CM_Free ) @@ -1023,21 +818,21 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) } } break; - case IK_LeftMouse: + case EInputKey.IK_LeftMouse: bSpaceReleased = True; break; - case IK_Space: + case EInputKey.IK_Space: bSpacePressed = False; bBoostKeyPressed = False; break; - case IK_Pause: - case IK_Cancel: + case EInputKey.IK_Pause: + case EInputKey.IK_Cancel: if ( bDebugMode ) { harry(Viewport.Actor).ConsoleCommand("pause"); } break; - case IK_PageUp: + case EInputKey.IK_PageUp: if ( bDebugMode ) { if ( fSlomoSpeed >= 1.0 ) @@ -1055,7 +850,7 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) harry(Viewport.Actor).ClientMessage(" ^^^ Setting GameSpeed to: X" $ string(fSlomoSpeed)); } break; - case IK_PageDown: + case EInputKey.IK_PageDown: if ( bDebugMode ) { if ( fSlomoSpeed <= 1.0 ) @@ -1070,53 +865,41 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) harry(Viewport.Actor).ClientMessage(" ^^^ Setting GameSpeed to: X" $ string(fSlomoSpeed)); } break; - case IK_Left: - //stop free cam zooming off when using arrow keys -AdamJD - bLeftKeyDown = False; - break; - case IK_Numpad4: + case EInputKey.IK_Left: //stop free cam zooming off when using arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad4: bLeftKeyDown = False; break; - case IK_Down: - //stop free cam zooming off when using arrow keys -AdamJD - bBackKeyDown = False; - break; - case IK_Numpad6: + case EInputKey.IK_Right: //stop free cam zooming off when using arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad6: bRightKeyDown = False; break; - case IK_Up: - //stop free cam zooming off when using arrow keys -AdamJD + case EInputKey.IK_Up: //stop free cam zooming off when using arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_NumPad8: bForwardKeyDown = False; break; - case IK_NumPad8: - bForwardKeyDown = False; - break; - case IK_Right: - //stop free cam zooming off when using arrow keys -AdamJD - bRightKeyDown = False; - break; - case IK_Numpad2: + case EInputKey.IK_Down: //stop free cam zooming off when using arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad2: bBackKeyDown = False; break; - case IK_Numpad1: + case EInputKey.IK_Numpad1: bRotateLeftKeyDown = False; break; - case IK_Numpad3: + case EInputKey.IK_Numpad3: bRotateRightKeyDown = False; break; - case IK_Numpad0: + case EInputKey.IK_Numpad0: bRotateUpKeyDown = False; break; - case IK_NumPadPeriod: + case EInputKey.IK_NumPadPeriod: bRotateDownKeyDown = False; break; - case IK_Numpad7: + case EInputKey.IK_Numpad7: bUpKeyDown = False; break; - case IK_Numpad9: + case EInputKey.IK_Numpad9: bDownKeyDown = False; break; - case IK_Shift: + case EInputKey.IK_Shift: bShiftDown = False; break; } @@ -1127,10 +910,10 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) switch (Key) { case IK_MouseX: - MouseX = MouseX + MouseScale * Delta; + MouseX = MouseX + (MouseScale * Delta); break; case IK_MouseY: - MouseY = MouseY - MouseScale * Delta; + MouseY = MouseY - (MouseScale * Delta); break; } } @@ -1142,77 +925,64 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) } switch (k) { - case IK_Shift: + case EInputKey.IK_Shift: bShiftDown = True; break; - case IK_Backspace: + case EInputKey.IK_Backspace: if ( bDebugMode ) { LangBrowser(); return True; } break; - case IK_Tab: - break; - case IK_Left: - //stop free cam zooming off when using arrow keys -AdamJD - bLeftKeyDown = True; + case EInputKey.IK_Tab: break; - case IK_Numpad4: + case EInputKey.IK_Left: //move free cam when pressing arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad4: bLeftKeyDown = True; break; - case IK_Right: - //stop free cam zooming off when using arrow keys -AdamJD + case EInputKey.IK_Right: //move free cam when pressing arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad6: bRightKeyDown = True; break; - case IK_Numpad6: - bRightKeyDown = True; - break; - case IK_Up: - //stop free cam zooming off when using arrow keys -AdamJD + case EInputKey.IK_Up: //move free cam when pressing arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad8: bForwardKeyDown = True; break; - case IK_Numpad8: - bForwardKeyDown = True; - break; - case IK_Down: - //stop free cam zooming off when using arrow keys -AdamJD - bBackKeyDown = True; - break; - case IK_Numpad2: + case EInputKey.IK_Down: //move free cam when pressing arrow keys (UTPT didn't add this) -AdamJD + case EInputKey.IK_Numpad2: bBackKeyDown = True; break; - case IK_Numpad1: + case EInputKey.IK_Numpad1: bRotateLeftKeyDown = True; break; - case IK_Numpad3: + case EInputKey.IK_Numpad3: bRotateRightKeyDown = True; break; - case IK_Numpad0: + case EInputKey.IK_Numpad0: bRotateUpKeyDown = True; break; - case IK_NumPadPeriod: + case EInputKey.IK_NumPadPeriod: bRotateDownKeyDown = True; break; - case IK_NumPad7: + case EInputKey.IK_NumPad7: bUpKeyDown = True; break; - case IK_Numpad9: + case EInputKey.IK_Numpad9: bDownKeyDown = True; break; - case IK_Insert: + case EInputKey.IK_Insert: if ( bDebugMode ) { Viewport.Actor.SShot(); } break; - case IK_RightMouse: + case EInputKey.IK_RightMouse: break; - case IK_Escape: + case EInputKey.IK_Escape: menuBook.EscFromConsole(); return True; - /* - case LocalConsoleKey: + case ConsoleKey: if ( bLocked ) { return True; @@ -1234,41 +1004,40 @@ event bool KeyEvent (EInputKey Key, EInputAction Action, float Delta) ShowConsole(); } return True; - */ - case IK_LeftMouse: + case EInputKey.IK_LeftMouse: bSpaceReleased = False; break; - case IK_Space: + case EInputKey.IK_Space: bSpacePressed = True; bBoostKeyPressed = True; break; - case IK_F4: + case EInputKey.IK_F4: if ( bDebugMode ) { LaunchUWindow(); ShortCut(); } break; - case IK_F6: + case EInputKey.IK_F6: if ( bDebugMode ) { harry(Viewport.Actor).GetHealthStatusItem().SetCountToMaxPotential(); } break; - case IK_F7: + case EInputKey.IK_F7: ToggleDebugMode(); break; - case IK_F8: + case EInputKey.IK_F8: break; - case IK_F9: + case EInputKey.IK_F9: if ( bDebugMode ) { harry(Viewport.Actor).AddAllSpellsToSpellBook(); } break; - case IK_F10: + case EInputKey.IK_F10: break; - case IK_F12: + case EInputKey.IK_F12: break; } break; @@ -1363,7 +1132,7 @@ function SetupLanguage() SaveConfig(); } -function PostRender (Canvas Canvas) +event PostRender (Canvas Canvas) { local LevelInfo lev; @@ -1415,7 +1184,7 @@ function RenderUWindow (Canvas Canvas) Root.NormalCursor.Tex2YOffset = -32; Root.Cursor = Root.NormalCursor; SetupLanguage(); - menuBook = FEBook(Root.CreateWindow(Class'FEBook',0.0 * (Root.WinWidth / 2 - 320),0.0 * (Root.WinHeight / 2 - 240),640.0,480.0,Root)); + menuBook = FEBook(Root.CreateWindow(Class'FEBook',0.0 * ((Root.WinWidth / 2) - 320),0.0 * ((Root.WinHeight / 2) - 240),640.0,480.0,Root)); menuBook.bGamePlaying = True; menuBook.CloseBook(); HideConsole(); @@ -1554,12 +1323,4 @@ defaultproperties PausedMessage="PRESS ESC TO EXIT" PrecachingMessage="ENTERING" - - //is in baseConsole -AdamJD - //bUseSystemFonts=True - - // Metallicafan212: Fix this, as baseconsole just doesn't want to be compiled for some strange reason - // - //fixed the one in baseConsole -AdamJD - //LoadingBackground=(p1=Texture'HGame.Icons.FELoadingBackground1',p2=Texture'HGame.Icons.FELoadingBackground2',p3=Texture'HGame.Icons.FELoadingBackground3',p4=Texture'HGame.Icons.FELoadingBackground4',p5=Texture'HGame.Icons.FELoadingBackground5',p6=Texture'HGame.Icons.FELoadingBackground6',durration=999999.00) } \ No newline at end of file diff --git a/HGame/Classes/Internal/ShortCutBrowser.uc b/HGame/Classes/Internal/ShortCutBrowser.uc index 29c739b2..a16379c6 100644 --- a/HGame/Classes/Internal/ShortCutBrowser.uc +++ b/HGame/Classes/Internal/ShortCutBrowser.uc @@ -28,12 +28,12 @@ function Created() Super.Created(); bTransient = False; ComboBoxListTypes = UWindowComboControl(CreateControl(Class'UWindowComboControl',0.0,0.0,128.0,16.0)); - ComboBoxListTypes.SetFont(0); + ComboBoxListTypes.SetFont(F_Normal); ComboBoxListTypes.SetEditable(False); ComboBoxListTypes.SetButtons(False); ComboBoxListTypes.SetHelpText("ComboBoxListTypes help text"); ComboBoxGameStates = UWindowComboControl(CreateControl(Class'UWindowComboControl',128.0,0.0,94.0,16.0)); - ComboBoxGameStates.SetFont(0); + ComboBoxGameStates.SetFont(F_Normal); ComboBoxGameStates.SetEditable(False); ComboBoxGameStates.SetButtons(False); ComboBoxGameStates.SetHelpText("ComboBoxGameStates help text"); diff --git a/HGame/Classes/Internal/ShortCutButton.uc b/HGame/Classes/Internal/ShortCutButton.uc index dfeecba2..0d12d064 100644 --- a/HGame/Classes/Internal/ShortCutButton.uc +++ b/HGame/Classes/Internal/ShortCutButton.uc @@ -5,8 +5,8 @@ class ShortCutButton extends UWindowButton; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\ButtonUpTexture.PNG GROUP=Icons Name=ButtonUpTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\ButtonDownTexture.PNG GROUP=Icons Name=ButtonDownTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\ButtonUpTexture.PNG GROUP=Icons Name=ButtonUpTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\ButtonDownTexture.PNG GROUP=Icons Name=ButtonDownTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var string strText; diff --git a/HGame/Classes/Internal/baseConsole.uc b/HGame/Classes/Internal/baseConsole.uc index e779f75a..18b198fd 100644 --- a/HGame/Classes/Internal/baseConsole.uc +++ b/HGame/Classes/Internal/baseConsole.uc @@ -2,15 +2,15 @@ // baseConsole. //================================================================================ -class baseConsole extends WindowConsole; +class baseConsole extends WindowConsole; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FELoadingBackground1.PNG GROUP=Icons Name=FELoadingBackground1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FELoadingBackground2.PNG GROUP=Icons Name=FELoadingBackground2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FELoadingBackground3.PNG GROUP=Icons Name=FELoadingBackground3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FELoadingBackground4.PNG GROUP=Icons Name=FELoadingBackground4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FELoadingBackground5.PNG GROUP=Icons Name=FELoadingBackground5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FELoadingBackground6.PNG GROUP=Icons Name=FELoadingBackground6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground1.PNG GROUP=Icons Name=FELoadingBackground1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground2.PNG GROUP=Icons Name=FELoadingBackground2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground3.PNG GROUP=Icons Name=FELoadingBackground3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground4.PNG GROUP=Icons Name=FELoadingBackground4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground5.PNG GROUP=Icons Name=FELoadingBackground5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FELoadingBackground6.PNG GROUP=Icons Name=FELoadingBackground6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 struct BackgroundBitmap { @@ -68,8 +68,6 @@ function ChangeLevel (string lev, bool flag) function ScaleAndDraw (Canvas C, float X, float Y, Texture Tex) { -//orginal code -AdamJD -/* local float FX; local float fy; @@ -84,96 +82,6 @@ function ScaleAndDraw (Canvas C, float X, float Y, Texture Tex) FX = 1.0; fy = 1.0; Root.DrawStretchedTexture(C, X * FX, Y * fy, Tex.USize * FX, Tex.VSize * fy, Tex); -*/ - - //Metallicafan212s code -AdamJD - // - local float FX; - local float fy; - local float Ratio; - local float CRTScale; - local float XOffset; - local float YOffset; - local float ResX; - local float ResY; - - if ( Tex == None ) - { - return; - } - - /* - FX = C.SizeX / 640.0; - fy = C.SizeY / 480.0; - FX = C.SizeX / 640.0; - fy = C.SizeY / 480.0; - FX = 1.0; - fy = 1.0; - */ - - FX = 1.0; - FY = 1.0; - - /* - // Metallicafan212: Scale it to 4/3 - //Ratio = C.SizeX / C.SizeY; - - //FX = Ratio; /// 1.3333; - - // Metallicafan212: Center the loading screen and draw black behind it - // TODO! - - // Metallicafan212: Rewrite this whole fucking system - // We want a perfect middle square - Ratio = (1.3333333) / (C.Size.X / C.SizeY); - // Figure out a resolution in the middle of the screen - if(C.SizeX > C.SizeY) - { - Ratio = (1.3333333) / (C.Size.X / C.SizeY); - // Metallicafan212: Use the height as the basis of the square - ResY = C.SizeY; - ResX = C.SizeX * Ratio; - } - else - { - Ratio = (C.Size.X / C.SizeY) / 1.3333333; - ResX = C.SizeX; - ResY = C.SizeY * Ratio; - } - */ - - // Metallicafan212: Now draw it in the correct place - // We're considering the canvas a perfect 512x512 grid - //X = - - - //FX = (C.SizeX / C.SizeY) / 1.33333; - - //log("X " $ C.SizeX $ " Y " $ C.SizeY); - - // Metallicafan212: Check for thinner resolutions - // On these we need to stretch outwards - - /* - if(FX < 1.0) - { - FX = 1.0; - FY = (C.SizeX / C.SizeY); - log("FY is " $ FY); - } - else - { - FY = 1.0; - log("FX is " $ FX); - } - - - //FY = FX; - */ - - //C.DrawTileClipped(Tex, - - Root.DrawStretchedTexture(C, (X * FX), (Y * FY), Tex.USize * FX, Tex.VSize * FY, Tex); } function PrintActionMessageInUpperLeft (Canvas C, string BigMessage) @@ -183,7 +91,7 @@ function PrintActionMessageInUpperLeft (Canvas C, string BigMessage) C.bCenter = False; C.StrLen(BigMessage,XL,YL); - C.SetPos(FrameX / 4 - XL / 2, FrameY / 4.5 - YL / 2); + C.SetPos(FrameX / 4 - (XL / 2), FrameY / 4.5 - (YL / 2)); C.DrawText(BigMessage,False); } @@ -194,7 +102,7 @@ function PrintActionMessageInLowerLeft (Canvas C, string BigMessage) C.bCenter = False; C.StrLen(BigMessage,XL,YL); - C.SetPos(FrameX / 10,FrameY - FrameY / 4 - YL / 2); + C.SetPos(FrameX / 10,FrameY - (FrameY / 4 - (YL / 2))); C.DrawText(BigMessage,False); } @@ -239,8 +147,6 @@ function DrawLevelAction (Canvas C) PrintActionMessageInUpperLeft(C,BigMessage); return; } - //else - //{ else if ( Viewport.Actor.Level.LevelAction == LEVACT_Saving ) { BigMessage = Localize("all","Options_0057","HPMenu"); @@ -253,7 +159,6 @@ function DrawLevelAction (Canvas C) { BigMessage = PrecachingMessage; } - //} if ( BigMessage != "" ) { C.Style = 1; diff --git a/HGame/Classes/Menu/BaseFEPage.uc b/HGame/Classes/Menu/BaseFEPage.uc index bb1b922f..33d53a9f 100644 --- a/HGame/Classes/Menu/BaseFEPage.uc +++ b/HGame/Classes/Menu/BaseFEPage.uc @@ -71,7 +71,7 @@ function CreateBackPageButton (optional int nX, optional int nY) } // Metallicafan212: Don't think this is used, so I'm not going to fix the jump shit -// This is used lol -AdamJD +//this is used lol -AdamJD function CreateTitleButton (string strTitle, optional int nXPos, optional int nYPos) { if ( nXPos == 0 ) @@ -86,10 +86,13 @@ function CreateTitleButton (string strTitle, optional int nXPos, optional int nY //align title to the centre of the page -AdamJD nXPos = (WinWidth / 2) - 200; - nYPos = 40; + } + if( nYPos == 0 ) + { + nYPos = 40; //align title to the centre of the page -AdamJD } TitleButton = UWindowLabelControl(CreateControl(Class'UWindowLabelControl', nXPos, nYPos,400.0,30.0)); - TitleButton.SetFont(4); + TitleButton.SetFont(F_HPMenuLarge); TitleButton.TextColor.R = 215; TitleButton.TextColor.G = 0; TitleButton.TextColor.B = 215; @@ -127,14 +130,11 @@ function Notify (UWindowDialogControl C, byte E) SetRollover(BackPageButton,textureReturnRO,Sound'GUI_Esc_Rollover4',True); } } - else + else if ( E == DE_MouseLeave ) { - if ( E == DE_MouseLeave ) + if ( C == BackPageButton ) { - if ( C == BackPageButton ) - { - ClearRollover(); - } + ClearRollover(); } } Super.Notify(C,E); @@ -198,7 +198,7 @@ function HPMessageBox doHPMessageBox (string Msg, string textButton1, optional s function WindowEvent (WinMessage Msg, Canvas C, float X, float Y, int Key) { - if ( (Msg == 9) || !Root.WaitModal() ) + if ( (Msg == WM_Paint) || !Root.WaitModal() ) { Super.WindowEvent(Msg,C,X,Y,Key); } diff --git a/HGame/Classes/Menu/FEBook.uc b/HGame/Classes/Menu/FEBook.uc index 9f9b27a4..3882347a 100644 --- a/HGame/Classes/Menu/FEBook.uc +++ b/HGame/Classes/Menu/FEBook.uc @@ -5,18 +5,18 @@ class FEBook extends baseFEBook; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FEInGameBackTexture1.PNG GROUP=Icons Name=FEInGameBackTexture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEInGameBackTexture2.PNG GROUP=Icons Name=FEInGameBackTexture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEInGameBackTexture3.PNG GROUP=Icons Name=FEInGameBackTexture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEInGameBackTexture4.PNG GROUP=Icons Name=FEInGameBackTexture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEInGameBackTexture5.PNG GROUP=Icons Name=FEInGameBackTexture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEInGameBackTexture6.PNG GROUP=Icons Name=FEInGameBackTexture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture1.PNG GROUP=Icons Name=FEBack1Texture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture2.PNG GROUP=Icons Name=FEBack1Texture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture3.PNG GROUP=Icons Name=FEBack1Texture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture4.PNG GROUP=Icons Name=FEBack1Texture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture5.PNG GROUP=Icons Name=FEBack1Texture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\FEBack1Texture6.PNG GROUP=Icons Name=FEBack1Texture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture1.PNG GROUP=Icons Name=FEInGameBackTexture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture2.PNG GROUP=Icons Name=FEInGameBackTexture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture3.PNG GROUP=Icons Name=FEInGameBackTexture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture4.PNG GROUP=Icons Name=FEInGameBackTexture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture5.PNG GROUP=Icons Name=FEInGameBackTexture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEInGameBackTexture6.PNG GROUP=Icons Name=FEInGameBackTexture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture1.PNG GROUP=Icons Name=FEBack1Texture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture2.PNG GROUP=Icons Name=FEBack1Texture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture3.PNG GROUP=Icons Name=FEBack1Texture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture4.PNG GROUP=Icons Name=FEBack1Texture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture5.PNG GROUP=Icons Name=FEBack1Texture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\FEBack1Texture6.PNG GROUP=Icons Name=FEBack1Texture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 struct Background { @@ -273,11 +273,11 @@ function Created() Super.Created(); bNewGame = False; DismissButton = UWindowSmallButton(CreateControl(Class'UWindowSmallButton',WinWidth - 10,0.0,10.0,10.0)); - DismissButton.SetFont(4); + DismissButton.SetFont(F_HPMenuLarge); StatusBarTextWindow = UWindowWrappedTextArea(CreateControl(Class'UWindowWrappedTextArea',0.0,WinHeight - 26,500.0,26.0)); StatusBarTextWindow.Clear(); StatusBarTextWindow.AddText(""); - StatusBarTextWindow.Font = 4; + StatusBarTextWindow.Font = F_HPMenuLarge; bShowBackground = True; InGamePage = FEInGamePage(CreateWindow(Class'FEInGamePage',0.0,0.0,640.0,480.0)); InGamePage.book = self; @@ -645,8 +645,6 @@ function bool DoEscapeFromPage() CloseBook(); return True; } - //else - //{ else if ( curPage != MainPage ) { if ( prevPage == None ) @@ -664,7 +662,6 @@ function bool DoEscapeFromPage() { return True; } - //} } function RunURL (string levURL, bool bTravelItems) diff --git a/HGame/Classes/Menu/FEChallengesPage.uc b/HGame/Classes/Menu/FEChallengesPage.uc index 9f9a3c54..f138e6d4 100644 --- a/HGame/Classes/Menu/FEChallengesPage.uc +++ b/HGame/Classes/Menu/FEChallengesPage.uc @@ -20,8 +20,8 @@ function Created() CreateBackPageButton(); CreateTitleButton(GetLocalFEString("Report_Card_0008")); - NoneWonLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',WinWidth / 2 - 200,100.0,400.0,30.0)); - NoneWonLabel.SetFont(4); + NoneWonLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',(WinWidth / 2) - 200,100.0,400.0,30.0)); + NoneWonLabel.SetFont(F_HPMenuLarge); NoneWonLabel.TextColor.R = 255; NoneWonLabel.TextColor.G = 255; NoneWonLabel.TextColor.B = 255; @@ -31,18 +31,18 @@ function Created() NoneWonLabel.SetText(GetLocalFEString("Main_Menu_0011")); nStartY = 100; - for(I = 0; I < 4; I++) + for(I = 0; I < ArrayCount(harry(Root.Console.Viewport.Actor).ChallengeScores); I++) { - NameButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',100.0,nStartY + I * 26,200.0,20.0)); - NameButtons[I].SetFont(4); + NameButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',100.0,nStartY + (I * 26),200.0,20.0)); + NameButtons[I].SetFont(F_HPMenuLarge); NameButtons[I].TextColor.R = 255; NameButtons[I].TextColor.G = 255; NameButtons[I].TextColor.B = 255; // NameButtons[I].Align = 0; NameButtons[I].Align = TA_Left; //from UWindowBase.uc in the proto -AdamJD NameButtons[I].bShadowText = True; - ScoreButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',440.0,nStartY + I * 26,200.0,20.0)); - ScoreButtons[I].SetFont(4); + ScoreButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',440.0,nStartY + (I * 26),200.0,20.0)); + ScoreButtons[I].SetFont(F_HPMenuLarge); ScoreButtons[I].TextColor.R = 255; ScoreButtons[I].TextColor.G = 255; ScoreButtons[I].TextColor.B = 255; @@ -79,30 +79,35 @@ function PreSwitchPage() local bool bWonAtLeastOne; PlayerHarry = harry(Root.Console.Viewport.Actor); + PlayerHarry.GetRictusempraChallengeScore(nHighScore,nMaxScore); if ( nHighScore > 0 ) { bWonAtLeastOne = True; } - UpdateButtonProps(0,nHighScore,nMaxScore); + UpdateButtonProps(nRICTUSEMPRA_CHALLENGE,nHighScore,nMaxScore); + PlayerHarry.GetSkurgeChallengeScore(nHighScore,nMaxScore); if ( nHighScore > 0 ) { bWonAtLeastOne = True; } - UpdateButtonProps(1,nHighScore,nMaxScore); + UpdateButtonProps(nSKURGE_CHALLENGE,nHighScore,nMaxScore); + PlayerHarry.GetDiffindoChallengeScore(nHighScore,nMaxScore); if ( nHighScore > 0 ) { bWonAtLeastOne = True; } - UpdateButtonProps(2,nHighScore,nMaxScore); + UpdateButtonProps(nDIFFINDO_CHALLENGE,nHighScore,nMaxScore); + PlayerHarry.GetSpongifyChallengeScore(nHighScore,nMaxScore); if ( nHighScore > 0 ) { bWonAtLeastOne = True; } - UpdateButtonProps(3,nHighScore,nMaxScore); + UpdateButtonProps(nSPONGIFY_CHALLENGE,nHighScore,nMaxScore); + if ( bWonAtLeastOne ) { NoneWonLabel.HideWindow(); diff --git a/HGame/Classes/Menu/FEDuelPage.uc b/HGame/Classes/Menu/FEDuelPage.uc index 4cd977ad..b33dec03 100644 --- a/HGame/Classes/Menu/FEDuelPage.uc +++ b/HGame/Classes/Menu/FEDuelPage.uc @@ -5,7 +5,7 @@ class FEDuelPage extends baseFEPage; //texture import -AdamJD -#exec Texture Import File=Textures\Icons\FEComboIdleTexture.PNG GROUP=Icons Name=FEComboIdleTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboIdleTexture.PNG GROUP=Icons Name=FEComboIdleTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var HPMessageBox ConfirmReplay; var harry PlayerHarry; @@ -35,8 +35,8 @@ function Created() for(I = 0; I < 10; I++) { - rankingButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',WinWidth / 2 - 180 / 2,StartY + I * 28,180.0,26.0)); - rankingButtons[I].SetFont(4); + rankingButtons[I] = UWindowButton(CreateControl(Class'UWindowButton',(WinWidth / 2) - (180 / 2),StartY + (I * 28),180.0,26.0)); + rankingButtons[I].SetFont(F_HPMenuLarge); rankingButtons[I].TextColor.R = 255; rankingButtons[I].TextColor.G = 255; rankingButtons[I].TextColor.B = 255; diff --git a/HGame/Classes/Menu/FEFolioPage.uc b/HGame/Classes/Menu/FEFolioPage.uc index 17b79072..34f236a2 100644 --- a/HGame/Classes/Menu/FEFolioPage.uc +++ b/HGame/Classes/Menu/FEFolioPage.uc @@ -5,12 +5,12 @@ class FEFolioPage extends baseFEPage; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\CardGlowBronze.PNG GROUP=Icons Name=CardGlowBronze COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\CardGlowGold.PNG GROUP=Icons Name=CardGlowGold COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\CardGlowGoldBig.PNG GROUP=Icons Name=CardGlowGoldBig COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\CardGlowSilver.PNG GROUP=Icons Name=CardGlowSilver COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardMissingBigTexture.PNG GROUP=Icons Name=WizCardMissingBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardMissingSmallTexture.PNG GROUP=Icons Name=WizCardMissingSmallTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\CardGlowBronze.PNG GROUP=Icons Name=CardGlowBronze COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\CardGlowGold.PNG GROUP=Icons Name=CardGlowGold COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\CardGlowGoldBig.PNG GROUP=Icons Name=CardGlowGoldBig COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\CardGlowSilver.PNG GROUP=Icons Name=CardGlowSilver COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMissingBigTexture.PNG GROUP=Icons Name=WizCardMissingBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMissingSmallTexture.PNG GROUP=Icons Name=WizCardMissingSmallTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 const nCARDGLOW_BIG_OFFSET_Y= -64; const nCARDGLOW_BIG_OFFSET_X= -64; @@ -137,7 +137,7 @@ function Created() SmallCardBmp[8] = UWindowButton(CreateWindow(Class'UWindowButton',509.0,254.0,60.0,60.0)); SmallCardBmp[9] = UWindowButton(CreateWindow(Class'UWindowButton',572.0,254.0,60.0,60.0)); - for(I = 0; I !=10; ++I) + for(I = 0; I != ArrayCount(SmallCardBmp); ++I) { SmallCardBmp[I].Register(self); SmallCardBmp[I].bStretched = True; @@ -176,7 +176,7 @@ function Created() BackButton.OverTexture = textureLeftUp; BackButton.ToolTipString = GetLocalFEString("Folio_Menu_0002"); NextPageLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',605.0 - 100 - 5,316.0 + 5,100.0,28.0)); - NextPageLabel.SetFont(4); + NextPageLabel.SetFont(F_HPMenuLarge); NextPageLabel.TextColor.R = 255; NextPageLabel.TextColor.G = 255; NextPageLabel.TextColor.B = 255; @@ -184,7 +184,7 @@ function Created() NextPageLabel.Align = TA_Right; //from UWindowBase.uc in the proto -AdamJD NextPageLabel.bShadowText = True; PreviousPageLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',5.0 + 32 + 5,316.0 + 5,100.0,28.0)); - PreviousPageLabel.SetFont(4); + PreviousPageLabel.SetFont(F_HPMenuLarge); PreviousPageLabel.TextColor.R = 255; PreviousPageLabel.TextColor.G = 255; PreviousPageLabel.TextColor.B = 255; @@ -199,11 +199,11 @@ function SetCardCountData() { local UWindowLabelControl LabelControl; - strCardCountBronze = string(nHarrysBronzeCount) $ "/" $ string(50); - nBronzeHealthBars = nHarrysBronzeCount / 10; - strCardCountSilver = string(nHarrysSilverCount) $ "/" $ string(40); - nSilverKeys = nHarrysSilverCount / 10; - strCardCountGold = string(nHarrysGoldCount) $ "/" $ string(11); + strCardCountBronze = string(nHarrysBronzeCount) $ "/" $ string(ArrayCount(HarrysBronze)); + nBronzeHealthBars = nHarrysBronzeCount / nCARDS_PER_SET; + strCardCountSilver = string(nHarrysSilverCount) $ "/" $ string(ArrayCount(HarrysSilver)); + nSilverKeys = nHarrysSilverCount / nCARDS_PER_SET; + strCardCountGold = string(nHarrysGoldCount) $ "/" $ string(ArrayCount(HarrysGold)); } function ShowWindow() @@ -246,7 +246,7 @@ function UpdatePreviousNextButtons() { ForwardButton.bDisabled = True; } else { - ForwardButton.bDisabled = nCurrPage == nCurrNumPages - 1; + ForwardButton.bDisabled = nCurrPage == (nCurrNumPages - 1); } if ( BackButton.bDisabled == True ) { @@ -268,38 +268,38 @@ function UpdatePreviousNextButtons() { NextPageLabel.SetText(""); } else { - NextPageLabel.SetText("11 - 20"); + NextPageLabel.SetText(strPAGE1); } break; case 1: - PreviousPageLabel.SetText("1 - 10"); + PreviousPageLabel.SetText(strPAGE0); if ( CurrCardGroup == CardGroup_Gold ) { NextPageLabel.SetText(""); } else { - NextPageLabel.SetText("21 - 30"); + NextPageLabel.SetText(strPAGE2); } break; case 2: - PreviousPageLabel.SetText("11 - 20"); + PreviousPageLabel.SetText(strPAGE1); if ( CurrCardGroup == CardGroup_Gold ) { NextPageLabel.SetText(""); } else { - NextPageLabel.SetText("31 - 40"); + NextPageLabel.SetText(strPAGE3); } break; case 3: - PreviousPageLabel.SetText("21 - 30"); + PreviousPageLabel.SetText(strPAGE2); if ( CurrCardGroup == CardGroup_Bronze ) { - NextPageLabel.SetText("41 - 50"); + NextPageLabel.SetText(strPAGE4); } else { NextPageLabel.SetText(""); } break; case 4: - PreviousPageLabel.SetText("31 - 40"); + PreviousPageLabel.SetText(strPAGE3); NextPageLabel.SetText(""); break; default: @@ -338,20 +338,20 @@ function UpdatePageCards() classCurWC = None; strCurrDesc = ""; - for(I = 0; I < 10; I++) + for(I = 0; I < ArrayCount(SmallCardBmp); I++) { - nCardIdx = I + nCurrPage * 10; + nCardIdx = I + (nCurrPage * ArrayCount(SmallCardBmp)); if ( CurrCardGroup == CardGroup_Bronze ) { nCardId = HarrysBronze[nCardIdx]; - } else { + } else //{ if ( CurrCardGroup == CardGroup_Silver ) { nCardId = HarrysSilver[nCardIdx]; } else { nCardId = HarrysGold[nCardIdx]; } - } + //} if ( nCardId != 0 ) { classWC = siCards.GetCardClassFromId(nCardId); @@ -381,7 +381,7 @@ function UpdatePageCards() HarryCardBmp.UpTexture = Class(classWC).Default.textureBig; HarryCardBmp.DownTexture = HarryCardBmp.UpTexture; HarryCardBmp.OverTexture = HarryCardBmp.UpTexture; - if ( nCurrItemOnPage == 10 ) + if ( nCurrItemOnPage == ArrayCount(SmallCardBmp) ) { SetLargeCardProps(Class(classWC)); } @@ -466,7 +466,7 @@ function Notify (UWindowDialogControl C, byte E) CurrCardGroup = CardGroup_Bronze; nCurrPage = 0; nCurrItemOnPage = 0; - nCurrNumPages = 5; + nCurrNumPages = nNUM_PAGES_BRONZE; UpdateDisplayDetails(); } break; @@ -476,7 +476,7 @@ function Notify (UWindowDialogControl C, byte E) CurrCardGroup = CardGroup_Silver; nCurrPage = 0; nCurrItemOnPage = 0; - nCurrNumPages = 4; + nCurrNumPages = nNUM_PAGES_SILVER; UpdateDisplayDetails(); } break; @@ -486,29 +486,30 @@ function Notify (UWindowDialogControl C, byte E) CurrCardGroup = CardGroup_Gold; nCurrPage = 0; nCurrItemOnPage = 0; - nCurrNumPages = 1; + nCurrNumPages = nNUM_PAGES_GOLD; UpdateDisplayDetails(); } break; case HarryCardBmp: - nCurrItemOnPage = 10; + nCurrItemOnPage = ArrayCount(SmallCardBmp); UpdateDisplayDetails(); break; case BackPageButton: FEBook(book).DoEscapeFromPage(); break; - default: - for(I = 0; I != 10; ++I) + default: + for(I = 0; I != ArrayCount(SmallCardBmp); ++I) { if ( SmallCardBmp[I] == C ) { nCurrItemOnPage = I; UpdateDisplayDetails(); + break; } } - break; + break; } - } else { + } else //{ if ( E == DE_MouseEnter ) { switch (C) @@ -530,7 +531,7 @@ function Notify (UWindowDialogControl C, byte E) break; default: } - } else { + } else //{ if ( E == DE_MouseLeave ) { switch (C) @@ -545,17 +546,17 @@ function Notify (UWindowDialogControl C, byte E) default: } } - } - } + //} + //} Super.Notify(C,E); } function HiliteCurrCard() { - if ( nCurrItemOnPage < 10 ) + if ( nCurrItemOnPage < ArrayCount(SmallCardBmp) ) { - nCardGlowLeft = SmallCardBmp[nCurrItemOnPage].WinLeft + -34; - nCardGlowTop = SmallCardBmp[nCurrItemOnPage].WinTop + -34; + nCardGlowLeft = SmallCardBmp[nCurrItemOnPage].WinLeft + nCARDGLOW_OFFSET_X; + nCardGlowTop = SmallCardBmp[nCurrItemOnPage].WinTop + nCARDGLOW_OFFSET_Y; switch (CurrCardGroup) { case CardGroup_Bronze: @@ -572,16 +573,16 @@ function HiliteCurrCard() HilitedCard = SmallCardBmp[nCurrItemOnPage]; if ( SmallCardBmp[nCurrItemOnPage].UpTexture == textureSmallEmptyCard ) //Texture'WizCardMissingSmallTexture' ) { - fHilitedCardScale = -0.53125; + fHilitedCardScale = fVACANT_SMALL_CARD_SCALE; } else { - fHilitedCardScale = -0.765625; + fHilitedCardScale = fSMALL_CARD_SCALE; } } else { - nCardGlowLeft = HarryCardBmp.WinLeft + -64; - nCardGlowTop = HarryCardBmp.WinTop + -64; + nCardGlowLeft = HarryCardBmp.WinLeft + nCARDGLOW_BIG_OFFSET_X; + nCardGlowTop = HarryCardBmp.WinTop + nCARDGLOW_BIG_OFFSET_Y; textureCurrGlow = textureGoldBigGlow; //Texture'CardGlowGoldBig'; HilitedCard = HarryCardBmp; - fHilitedCardScale = -0.5; + fHilitedCardScale = fHARRY_CARD_SCALE; } } @@ -622,7 +623,7 @@ function HiliteSelectedCard (Canvas Canvas) nSaveStyle = Canvas.Style; Canvas.Style = 3; Canvas.SetPos(HilitedCard.WinLeft * fScaleFactor,HilitedCard.WinTop * fScaleFactor); - Canvas.DrawIcon(HilitedCard.OverTexture,fScaleFactor + fHilitedCardScale * fScaleFactor); + Canvas.DrawIcon(HilitedCard.OverTexture,fScaleFactor + (fHilitedCardScale * fScaleFactor)); Canvas.Style = nSaveStyle; } } @@ -639,22 +640,22 @@ function PaintLargeCard (Canvas Canvas, float fScaleFactor) if ( Canvas.SizeX > WinWidth ) { nLargeCardX = Canvas.SizeX / 2 - textureCurrLargeCard.USize / 2; - nLargeCardY = 4 + (textureCurrLargeCard.VSize * fScaleFactor - textureCurrLargeCard.VSize) / 2; + nLargeCardY = nLARGE_CARD_Y + (((textureCurrLargeCard.VSize * fScaleFactor) - textureCurrLargeCard.VSize) / 2); if ( (classCurWC != None) && classCurWC.Default.bIsLayered ) { GetMouseXY(MouseX,MouseY); - offX = (MouseX - Canvas.SizeX / 2) / Canvas.SizeX / 2; - offY = (MouseY - Canvas.SizeY / 2) / Canvas.SizeY / 2; + offX = (MouseX - (Canvas.SizeX / 2)) / (Canvas.SizeX / 2); + offY = (MouseY - (Canvas.SizeY / 2)) / (Canvas.SizeY / 2); offX *= 6; offY *= 6; if ( classCurWC.Default.bLastLayerIsFire ) { Canvas.SetPos(nLargeCardX,nLargeCardY); } else { - Canvas.SetPos(nLargeCardX + offX * 2,nLargeCardY + offY * 2); + Canvas.SetPos(nLargeCardX + (offX * 2),nLargeCardY + (offY * 2)); } Canvas.DrawIcon(classCurWC.Default.textureLayers[2],1.0); - Canvas.SetPos(nLargeCardX + offX * 1,nLargeCardY + offY * 1); + Canvas.SetPos(nLargeCardX + (offX * 1),nLargeCardY + (offY * 1)); Canvas.DrawIcon(classCurWC.Default.textureLayers[1],1.0); Canvas.SetPos(nLargeCardX,nLargeCardY); Canvas.DrawIcon(classCurWC.Default.textureLayers[0],1.0); @@ -663,7 +664,7 @@ function PaintLargeCard (Canvas Canvas, float fScaleFactor) Canvas.DrawIcon(textureCurrLargeCard,1.0); } } else { - Canvas.SetPos(192.0 * fScaleFactor,4.0 * fScaleFactor); + Canvas.SetPos(nLARGE_CARD_X * fScaleFactor,nLARGE_CARD_Y * fScaleFactor); Canvas.DrawIcon(textureCurrLargeCard,fScaleFactor); } } @@ -687,7 +688,7 @@ function PaintWizardText (Canvas Canvas, float fScaleFactor) default: break; } - Canvas.SetPos(0.0,400.0 * fScaleFactor); + Canvas.SetPos(nWIZARD_TEXT_X,nWIZARD_TEXT_Y * fScaleFactor); Canvas.DrawTile(textureDescBkgrd,Canvas.SizeX,80.0 * fScaleFactor,0.0,0.0,1.0,1.0); if ( Canvas.SizeX <= 512 ) { @@ -695,7 +696,7 @@ function PaintWizardText (Canvas Canvas, float fScaleFactor) } else { fontText = baseConsole(PlayerHarry.Player.Console).LocalMedFont; } - HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strCurrDesc,0,400 * fScaleFactor, 80 * fScaleFactor, colorText,fontText); + HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strCurrDesc,0,nWIZARD_TEXT_Y * fScaleFactor, nWIZARD_TEXT_H * fScaleFactor, colorText,fontText); } function PaintCardStatData (Canvas Canvas, float fCanvasScaleFactor) @@ -721,31 +722,31 @@ function PaintCardStatData (Canvas Canvas, float fCanvasScaleFactor) if ( Canvas.SizeX <= 512 ) { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalSmallFont; - } else { + } else //{ if ( Canvas.SizeX <= 640 ) { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalMedFont; } else { Canvas.Font = baseConsole(PlayerHarry.Player.Console).LocalBigFont; } - } + //} Canvas.TextSize(strCardCountGold,fXTextLen,fYTextLen); - Canvas.SetPos(GoldButton.WinLeft * fWindowScaleFactor + 40 * fWindowScaleFactor - fXTextLen / 2,GoldButton.WinTop * fWindowScaleFactor + 40 * fWindowScaleFactor - fYTextLen / 2); + Canvas.SetPos((GoldButton.WinLeft * fWindowScaleFactor) + (40 * fWindowScaleFactor) - fXTextLen / 2,(GoldButton.WinTop * fWindowScaleFactor) + (40 * fWindowScaleFactor) - fYTextLen / 2); Canvas.DrawShadowText(strCardCountGold,colorOffWhite,colorBlack); Canvas.TextSize(strCardCountSilver,fXTextLen,fYTextLen); - Canvas.SetPos(SilverButton.WinLeft * fWindowScaleFactor + 40 * fWindowScaleFactor - fXTextLen / 2,SilverButton.WinTop * fWindowScaleFactor + 40 * fWindowScaleFactor - fYTextLen / 2); + Canvas.SetPos((SilverButton.WinLeft * fWindowScaleFactor) + (40 * fWindowScaleFactor) - fXTextLen / 2,(SilverButton.WinTop * fWindowScaleFactor) + (40 * fWindowScaleFactor) - fYTextLen / 2); Canvas.DrawShadowText(strCardCountSilver,colorOffWhite,colorBlack); Canvas.TextSize(strCardCountBronze,fXTextLen,fYTextLen); - Canvas.SetPos(BronzeButton.WinLeft * fWindowScaleFactor + 38 * fWindowScaleFactor - fXTextLen / 2,BronzeButton.WinTop * fWindowScaleFactor + 38 * fWindowScaleFactor - fYTextLen / 2); + Canvas.SetPos((BronzeButton.WinLeft * fWindowScaleFactor) + (38 * fWindowScaleFactor) - fXTextLen / 2,(BronzeButton.WinTop * fWindowScaleFactor) + (38 * fWindowScaleFactor) - fYTextLen / 2); Canvas.DrawShadowText(strCardCountBronze,colorOffWhite,colorBlack); nXPos = (BronzeButton.WinLeft + BronzeButton.WinWidth + 24) * fWindowScaleFactor; nYPos = BronzeButton.WinTop * fWindowScaleFactor; - for(I = 0; I < nBronzeHealthBars; i++) + for(I = 0; I < nBronzeHealthBars; I++) { Canvas.SetPos(nXPos,nYPos); Canvas.DrawIcon(textureBronzeHealth,fWindowScaleFactor); - nXPos += 14 * fWindowScaleFactor; + nXPos += (14 * fWindowScaleFactor); } nXPos = (SilverButton.WinLeft + SilverButton.WinWidth + 24) * fWindowScaleFactor; nYPos = SilverButton.WinTop * fWindowScaleFactor; @@ -754,7 +755,7 @@ function PaintCardStatData (Canvas Canvas, float fCanvasScaleFactor) { Canvas.SetPos(nXPos,nYPos); Canvas.DrawIcon(textureSilverKey,fWindowScaleFactor - 0.31); - nXPos += 28 * (fWindowScaleFactor - 0.31); + nXPos += (28 * (fWindowScaleFactor - 0.31)); } Canvas.Font = fontSave; } @@ -783,11 +784,11 @@ function InitHarryOwnedCards() local StatusItemWizardCards siCards; sgCards = StatusGroupWizardCards(PlayerHarry.managerStatus.GetStatusGroup(Class'StatusGroupWizardCards')); + siCards = StatusItemWizardCards(sgCards.GetStatusItem(Class'StatusItemGoldCards')); StatusItemGoldCards(siCards).MoveHarryCardToEnd(); nHarrysGoldCount = 0; - - for(I = 0; I < 11; I++) + for(I = 0; I < ArrayCount(HarrysGold); I++) { nCardId = siCards.GetCardId(I); if ( nCardId > 0 ) @@ -799,15 +800,14 @@ function InitHarryOwnedCards() } } } - - for(I = nHarrysGoldCount; I < 11; I++) + for(I = nHarrysGoldCount; I < ArrayCount(HarrysGold); I++) { HarrysGold[I] = 0; } + siCards = StatusItemWizardCards(sgCards.GetStatusItem(Class'StatusItemSilverCards')); nHarrysSilverCount = 0; - - for(I = 0; I < 40; I++) + for(I = 0; I < ArrayCount(HarrysSilver); I++) { nCardId = siCards.GetCardId(I); if ( nCardId > 0 ) @@ -819,15 +819,14 @@ function InitHarryOwnedCards() } } } - - for(I = nHarrysSilverCount; I < 40; I++) + for(I = nHarrysSilverCount; I < ArrayCount(HarrysSilver); I++) { HarrysSilver[I] = 0; } + siCards = StatusItemWizardCards(sgCards.GetStatusItem(Class'StatusItemBronzeCards')); nHarrysBronzeCount = 0; - - for(I = 0; I < 50; I++) + for(I = 0; I < ArrayCount(HarrysBronze); I++) { nCardId = siCards.GetCardId(I); if ( nCardId > 0 ) @@ -838,9 +837,12 @@ function InitHarryOwnedCards() nHarrysBronzeCount++; } } + else + { + I++; + } } - - for(I = nHarrysBronzeCount; I < 50; I++) + for(I = nHarrysBronzeCount; I < ArrayCount(HarrysBronze); I++) { HarrysBronze[I] = 0; } @@ -878,28 +880,28 @@ function SetInitialSelection() break; default: } - nNumSmallPerPage = 10; + nNumSmallPerPage = ArrayCount(SmallCardBmp); if ( CurrCardGroup == CardGroup_Gold ) { nCurrPage = 0; - } else //{ - if ( nCardCount <= 1 * 10 ) + } else { + if ( nCardCount <= 1 * nCARDS_PER_SET ) { nCurrPage = 0; } else //{ - if ( nCardCount <= 2 * 10 ) + if ( nCardCount <= 2 * nCARDS_PER_SET ) { nCurrPage = 1; } else //{ - if ( nCardCount <= 3 * 10 ) + if ( nCardCount <= 3 * nCARDS_PER_SET ) { nCurrPage = 2; } else //{ - if ( nCardCount <= 4 * 10 ) + if ( nCardCount <= 4 * nCARDS_PER_SET ) { nCurrPage = 3; } else //{ - if ( nCardCount <= 5 * 10 ) + if ( nCardCount <= 5 * nCARDS_PER_SET ) { nCurrPage = 4; } @@ -907,7 +909,7 @@ function SetInitialSelection() // } // } // } - // } + } if ( nCardCount == 0 ) { nCurrItemOnPage = 0; @@ -917,7 +919,7 @@ function SetInitialSelection() siCards = StatusItemWizardCards(sgCards.GetStatusItem(Class'StatusItemGoldCards')); if ( StatusItemGoldCards(siCards).HaveHarryCard() ) { - nCurrItemOnPage = 10 + 1; + nCurrItemOnPage = ArrayCount(SmallCardBmp) + 1; } else { nCurrItemOnPage = nCardCount - 1; } @@ -927,7 +929,6 @@ function SetInitialSelection() nCurrItemOnPage = nNumSmallPerPage - 1; } else { nCurrItemOnPage = nCardCount % nNumSmallPerPage - 1; - return; } } } diff --git a/HGame/Classes/Menu/FEInGamePage.uc b/HGame/Classes/Menu/FEInGamePage.uc index 46846a3f..5af7a61b 100644 --- a/HGame/Classes/Menu/FEInGamePage.uc +++ b/HGame/Classes/Menu/FEInGamePage.uc @@ -98,21 +98,18 @@ function PaintToolTipText (Canvas Canvas, float fScaleFactor) { fontText = baseConsole(PlayerHarry.Player.Console).LocalSmallFont; } + else if ( Canvas.SizeX <= 800 ) + { + fontText = baseConsole(PlayerHarry.Player.Console).LocalMedFont; + } else { - if ( Canvas.SizeX <= 800 ) - { - fontText = baseConsole(PlayerHarry.Player.Console).LocalMedFont; - } - else - { - fontText = baseConsole(PlayerHarry.Player.Console).LocalBigFont; - } + fontText = baseConsole(PlayerHarry.Player.Console).LocalBigFont; } colorText.R = 255; colorText.G = 255; colorText.B = 255; - HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strCurrToolTip, 6 * fScaleFactor, 424 * fScaleFactor, 46 * fScaleFactor, colorText,fontText); + HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strCurrToolTip, nTOOLTIP_TEXT_X * fScaleFactor, nTOOLTIP_TEXT_Y * fScaleFactor, nTOOLTIP_TEXT_H * fScaleFactor, colorText,fontText); } function PaintObjectiveText (Canvas Canvas, float fScaleFactor) @@ -141,8 +138,8 @@ function PaintObjectiveText (Canvas Canvas, float fScaleFactor) colorText.G = 255; colorText.B = 255; - HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,GetLocalFEString("InGameMenu_0027"), 14 * fScaleFactor, 400 * fScaleFactor, 16 * fScaleFactor, colorText,fontText); - HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strObjective, 14 * fScaleFactor, 416 * fScaleFactor, 58 * fScaleFactor, colorText, fontText, 626.0 * fScaleFactor); + HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,GetLocalFEString("InGameMenu_0027"), nOBJECTIVE_TEXT_X * fScaleFactor, nOBJECTIVE_LABEL_Y * fScaleFactor, nOBJECTIVE_LABEL_H * fScaleFactor, colorText,fontText); + HPHud(PlayerHarry.myHUD).DrawCutStyleText(Canvas,strObjective, nOBJECTIVE_TEXT_X * fScaleFactor, nOBJECTIVE_TEXT_Y * fScaleFactor, nOBJECTIVE_TEXT_H * fScaleFactor, colorText, fontText, nOBJECTIVE_CLIP_X * fScaleFactor); } } @@ -179,7 +176,7 @@ function DrawCount (Canvas Canvas, float fScaleFactor, int nButtonLeft, int nBut Canvas.DrawColor = si.GetCountColor(); Canvas.Font = si.GetCountFont(Canvas); Canvas.TextSize(strCount,fXTextLen,fYTextLen); - Canvas.SetPos((nButtonLeft + 50) * fScaleFactor - fXTextLen / 2, (nButtonTop + 58) * fScaleFactor - fYTextLen / 2); + Canvas.SetPos((nButtonLeft + nCOUNT_MID_X) * fScaleFactor - (fXTextLen / 2), (nButtonTop + nCOUNT_MID_Y) * fScaleFactor - (fYTextLen / 2)); Canvas.DrawShadowText(strCount,si.GetCountColor(),si.GetCountColor(True)); Canvas.Font = fontSave; } @@ -190,7 +187,7 @@ function int GetObjectiveAreaTop (int nCanvasSizeX, int nCanvasSizeY) fScaleFactor = nCanvasSizeX / WinWidth; //return nCanvasSizeY - 88 * fScaleFactor = return; - return (nCanvasSizeY - 88 * fScaleFactor); + return (nCanvasSizeY - nBAR_H * fScaleFactor); } function Created() @@ -300,7 +297,7 @@ function Created() SoundVideoButton.DownSound = soundBottomClick; } VersionButton = UWindowSmallButton(CreateControl(Class'UWindowSmallButton',550.0,462.0,84.0,25.0)); - VersionButton.SetFont(0); + VersionButton.SetFont(F_Normal); VersionButton.TextColor.R = 250; VersionButton.TextColor.G = 250; VersionButton.TextColor.B = 250; @@ -335,104 +332,97 @@ function Notify (UWindowDialogControl C, byte E) switch (C) { case InputButton: - FEBook(book).ChangePageNamed("INPUT"); - break; + FEBook(book).ChangePageNamed("INPUT"); + break; case SoundVideoButton: - FEBook(book).ChangePageNamed("SOUNDVIDEO"); - break; + FEBook(book).ChangePageNamed("SOUNDVIDEO"); + break; case QuitButton: - ConfirmQuit = doHPMessageBox(GetLocalFEString("InGameMenu_0026"),GetLocalFEString("Shared_Menu_0003"),GetLocalFEString("Shared_Menu_0004")); - break; + ConfirmQuit = doHPMessageBox(GetLocalFEString("InGameMenu_0026"),GetLocalFEString("Shared_Menu_0003"),GetLocalFEString("Shared_Menu_0004")); + break; case BackPageButton: - FEBook(book).CloseBook(); - break; + FEBook(book).CloseBook(); + break; case FolioButton: - FEBook(book).ChangePageNamed("FOLIO"); - break; + FEBook(book).ChangePageNamed("FOLIO"); + break; case QuidditchButton: - FEBook(book).ChangePageNamed("QUIDDITCH"); - break; + FEBook(book).ChangePageNamed("QUIDDITCH"); + break; case DuelButton: - FEBook(book).ChangePageNamed("DUEL"); - break; + FEBook(book).ChangePageNamed("DUEL"); + break; case ChallengesButton: - FEBook(book).ChangePageNamed("CHALLENGES"); - break; + FEBook(book).ChangePageNamed("CHALLENGES"); + break; case MapButton: - FEBook(book).ChangePageNamed("MAP"); - break; + FEBook(book).ChangePageNamed("MAP"); + break; case CreditsButton: - FEBook(book).ChangePageNamed("CREDITSPAGE"); - break; + FEBook(book).ChangePageNamed("CREDITSPAGE"); + break; case HousepointsButton: - FEBook(book).ChangePageNamed("HPOINTS"); - break; - break; + FEBook(book).ChangePageNamed("HPOINTS"); + break; default: - break; + break; } } - else + else if ( E == DE_MouseEnter ) { - if ( E == DE_MouseEnter ) - { switch (C) { case DuelButton: - SetRollover(DuelButton,textureDuelRO,soundMiddleRO,True); - break; + SetRollover(DuelButton,textureDuelRO,soundMiddleRO,True); + break; case ChallengesButton: - SetRollover(ChallengesButton,textureChallengesRO,soundMiddleRO,True); - break; + SetRollover(ChallengesButton,textureChallengesRO,soundMiddleRO,True); + break; case MapButton: - SetRollover(MapButton,textureMapRO,soundMiddleRO,True); - break; + SetRollover(MapButton,textureMapRO,soundMiddleRO,True); + break; case QuidditchButton: - SetRollover(QuidditchButton,textureQuidRO,soundMiddleRO,True); - break; + SetRollover(QuidditchButton,textureQuidRO,soundMiddleRO,True); + break; case QuitButton: - SetRollover(QuitButton,textureQuitRO,soundBottomRO,True); - break; + SetRollover(QuitButton,textureQuitRO,soundBottomRO,True); + break; case InputButton: - SetRollover(InputButton,textureInputRO,soundBottomRO,True); - break; + SetRollover(InputButton,textureInputRO,soundBottomRO,True); + break; case SoundVideoButton: - SetRollover(SoundVideoButton,textureSoundRO,soundBottomRO,True); - break; + SetRollover(SoundVideoButton,textureSoundRO,soundBottomRO,True); + break; case FolioButton: - SetRollover(FolioButton,textureFolioRO,soundFolioRO,False); - break; + SetRollover(FolioButton,textureFolioRO,soundFolioRO,False); + break; case CreditsButton: - SetRollover(CreditsButton,textureCreditsRO,soundBottomRO,True); - break; + SetRollover(CreditsButton,textureCreditsRO,soundBottomRO,True); + break; case HousepointsButton: - SetRollover(HousepointsButton,textureGryffRO,soundTopRO,True); - break; + SetRollover(HousepointsButton,textureGryffRO,soundTopRO,True); + break; default: } - } - else - { - if ( E == DE_MouseLeave ) - { - switch (C) - { - case DuelButton: - case ChallengesButton: - case MapButton: - case QuidditchButton: - case QuitButton: - case InputButton: - case SoundVideoButton: - case FolioButton: - case CreditsButton: - case HousepointsButton: - ClearRollover(); - break; - default: - } - } - } + } + else if ( E == DE_MouseLeave ) + { + switch (C) + { + case DuelButton: + case ChallengesButton: + case MapButton: + case QuidditchButton: + case QuitButton: + case InputButton: + case SoundVideoButton: + case FolioButton: + case CreditsButton: + case HousepointsButton: + ClearRollover(); + break; + default: + } } Super.Notify(C,E); } diff --git a/HGame/Classes/Menu/FEInputPage.uc b/HGame/Classes/Menu/FEInputPage.uc index a220fe1c..96683e97 100644 --- a/HGame/Classes/Menu/FEInputPage.uc +++ b/HGame/Classes/Menu/FEInputPage.uc @@ -5,9 +5,9 @@ class FEInputPage extends baseFEPage; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FEOverOption5Texture.PNG GROUP=Icons Name=FEOverOption5Texture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOverOptionTexture.PNG GROUP=Icons Name=FEOverOptionTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOverOption3Texture.PNG GROUP=Icons Name=FEOverOption3Texture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FEOverOption5Texture.PNG GROUP=Icons Name=FEOverOption5Texture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOverOptionTexture.PNG GROUP=Icons Name=FEOverOptionTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOverOption3Texture.PNG GROUP=Icons Name=FEOverOption3Texture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 const InWizardDuel_LastBoundKeyIndex= 13; const InWizardDuel_FirstBoundKeyIndex= 12; @@ -194,13 +194,13 @@ function Created() textOffsetY = (buttonHeight - textHeight) / 2; MiscLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',labelX,ctlY,ctlW,1.0)); MiscLabel.SetText(MiscText); - MiscLabel.SetFont(1); + MiscLabel.SetFont(F_Bold); MiscLabel.TextColor = GoupLabelTextColor; ctlY += 25; I = 0; MouseSensitivityLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',labelX,ctlY + textOffsetY,ctlW,1.0)); MouseSensitivityLabel.SetText(MouseSensitivityText); - MouseSensitivityLabel.SetFont(1); + MouseSensitivityLabel.SetFont(F_Bold); MouseSensitivityLabel.TextColor = LabelTextColor; SensitivitySlider = HPMenuOptionHSlider(CreateControl(Class'HPMenuOptionHSlider',ctlX,ctlY,SliderWidth,1.0)); SensitivitySlider.bNoSlidingNotify = True; @@ -208,47 +208,47 @@ function Created() SensitivitySlider.SliderWidth = SliderWidth; ctlY += 28; - //UTPT didn't decompile this(added from UEExplorer) -AdamJD + //UTPT didn't decompile the rest of this function (all this is added from UEExplorer) -AdamJD MouseHiLabel = UWindowLabelControl(CreateControl(class'UWindowLabelControl', (ctlX + SliderWidth) - 21, ctlY, ctlW, 1.0)); MouseHiLabel.SetText(MouseHiText); - MouseHiLabel.SetFont(0); + MouseHiLabel.SetFont(F_Normal); MouseHiLabel.TextColor = ButtonTextColor; MouseLoLabel = UWindowLabelControl(CreateControl(class'UWindowLabelControl', ctlX, ctlY, ctlW, 1.0)); MouseLoLabel.SetText(MouseLoText); - MouseLoLabel.SetFont(0); + MouseLoLabel.SetFont(F_Normal); MouseLoLabel.TextColor = ButtonTextColor; ctlY += 24; MouseInvertCheck = HPMenuOptionCheckBox(CreateControl(class'HPMenuOptionCheckBox', ctlX, ctlY, 160.0, 1.0)); MouseInvertCheck.bChecked = harry(GetPlayerOwner()).bInvertMouse; MouseInvertCheck.SetText(MouseInvertText); - MouseInvertCheck.SetFont(0); + MouseInvertCheck.SetFont(F_Normal); MouseInvertCheck.TextColor = LabelTextColor; ctlY += 24; Log("ini:Engine.PlayerPawn bInvertMouse -> " $ string(MouseInvertCheck.bChecked)); AutoCenterCamCheck = HPMenuOptionCheckBox(CreateControl(class'HPMenuOptionCheckBox', ctlX, ctlY, 160.0, 1.0)); AutoCenterCamCheck.bChecked = harry(GetPlayerOwner()).bAutoCenterCamera; AutoCenterCamCheck.SetText(AutoCenterCamText); - AutoCenterCamCheck.SetFont(0); + AutoCenterCamCheck.SetFont(F_Normal); AutoCenterCamCheck.TextColor = LabelTextColor; ctlY += 24; - Log("get ini:HGame.Harry bAutoCenterCamera -> " $ string(AutoCenterCamCheck.bChecked)); + Log("get ini:HGame.harry bAutoCenterCamera -> " $ string(AutoCenterCamCheck.bChecked)); AutoJumpCheck = HPMenuOptionCheckBox(CreateControl(class'HPMenuOptionCheckBox', ctlX, ctlY, 160.0, 1.0)); AutoJumpCheck.bChecked = harry(GetPlayerOwner()).bAutoJump; AutoJumpCheck.SetText(AutoJumpText); - AutoJumpCheck.SetFont(0); + AutoJumpCheck.SetFont(F_Normal); AutoJumpCheck.TextColor = LabelTextColor; ctlY += 24; Log("AutoJumpCheck -> " $ string(AutoJumpCheck.bChecked)); AutoDrinkPotionCheck = HPMenuOptionCheckBox(CreateControl(class'HPMenuOptionCheckBox', ctlX, ctlY, 160.0, 1.0)); AutoDrinkPotionCheck.bChecked = harry(GetPlayerOwner()).bAutoQuaff; AutoDrinkPotionCheck.SetText(AutoDrinkPotionText); - AutoDrinkPotionCheck.SetFont(0); + AutoDrinkPotionCheck.SetFont(F_Normal); AutoDrinkPotionCheck.TextColor = LabelTextColor; ctlY += 25; - Log("get ini:HGame.Harry bAutoQuaff -> " $ string(AutoDrinkPotionCheck.bChecked)); + Log("get ini:HGame.harry bAutoQuaff -> " $ string(AutoDrinkPotionCheck.bChecked)); DifficultyLabel = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY + textOffsetY, ctlW, 1.0)); DifficultyLabel.SetText(DifficultyText); - DifficultyLabel.SetFont(1); + DifficultyLabel.SetFont(F_Bold); DifficultyLabel.TextColor = LabelTextColor; DifficultyCombo = HPMenuOptionCombo(CreateControl(class'HPMenuOptionCombo', ctlX, ctlY, buttonWidth, buttonHeight)); DifficultyCombo.SetEditable(false); @@ -261,13 +261,13 @@ function Created() ctlY += 35; InQuidditch_Label = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY, ctlW, 1.0)); InQuidditch_Label.SetText(InQuidditch_Text); - InQuidditch_Label.SetFont(1); + InQuidditch_Label.SetFont(F_Bold); InQuidditch_Label.TextColor = GoupLabelTextColor; ctlY += 20; InvertBroomCheck = HPMenuOptionCheckBox(CreateControl(class'HPMenuOptionCheckBox', ctlX, ctlY, 160.0, 1.0)); InvertBroomCheck.bChecked = IsFlyingControlInverted(); InvertBroomCheck.SetText(InvertBroomText); - InvertBroomCheck.SetFont(0); + InvertBroomCheck.SetFont(F_Normal); InvertBroomCheck.TextColor = LabelTextColor; ctlY += InQuidditch_VertSpacing[0]; @@ -275,14 +275,14 @@ function Created() { InQuidditch_KeyNames[I] = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY + textOffsetY, labelWidth + 200, 1.0)); InQuidditch_KeyNames[I].SetText(InQuidditch_LabelList[I]); - InQuidditch_KeyNames[I].SetFont(1); + InQuidditch_KeyNames[I].SetFont(F_Bold); InQuidditch_KeyNames[I].TextColor = LabelTextColor; InQuidditch_KeyButtons[I] = HPMenuRaisedButton(CreateControl(class'HPMenuRaisedButton', ctlX, ctlY, buttonWidth, ctlH)); InQuidditch_KeyButtons[I].UpTexture = HoverImage5; //texture'FEOverOption5Texture'; InQuidditch_KeyButtons[I].DownTexture = HoverImage; //texture'FEOverOptionTexture'; InQuidditch_KeyButtons[I].DisabledTexture = HoverImage; //texture'FEOverOptionTexture'; InQuidditch_KeyButtons[I].OverTexture = HoverImage3; //texture'FEOverOption3Texture'; - InQuidditch_KeyButtons[I].SetFont(0); + InQuidditch_KeyButtons[I].SetFont(F_Normal); InQuidditch_KeyButtons[I].bAcceptsFocus = false; InQuidditch_KeyButtons[I].bIgnoreLDoubleClick = true; InQuidditch_KeyButtons[I].bIgnoreMDoubleClick = true; @@ -293,7 +293,7 @@ function Created() ctlY += 13; InWizardDuel_Label = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY, ctlW, 1.0)); InWizardDuel_Label.SetText(InWizardDuel_Text); - InWizardDuel_Label.SetFont(1); + InWizardDuel_Label.SetFont(F_Bold); InWizardDuel_Label.TextColor = GoupLabelTextColor; ctlY += 25; @@ -301,14 +301,14 @@ function Created() { InWizardDuel_KeyNames[I] = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY + textOffsetY, labelWidth, 1.0)); InWizardDuel_KeyNames[I].SetText(InWizardDuel_LabelList[I]); - InWizardDuel_KeyNames[I].SetFont(1); + InWizardDuel_KeyNames[I].SetFont(F_Bold); InWizardDuel_KeyNames[I].TextColor = LabelTextColor; InWizardDuel_KeyButtons[I] = HPMenuRaisedButton(CreateControl(class'HPMenuRaisedButton', ctlX, ctlY, buttonWidth, ctlH)); InWizardDuel_KeyButtons[I].UpTexture = HoverImage5; //texture'FEOverOption5Texture'; InWizardDuel_KeyButtons[I].DownTexture = HoverImage; //texture'FEOverOptionTexture'; InWizardDuel_KeyButtons[I].DisabledTexture = HoverImage; //texture'FEOverOptionTexture'; InWizardDuel_KeyButtons[I].OverTexture = HoverImage3; //texture'FEOverOption3Texture'; - InWizardDuel_KeyButtons[I].SetFont(0); + InWizardDuel_KeyButtons[I].SetFont(F_Normal); InWizardDuel_KeyButtons[I].bAcceptsFocus = false; InWizardDuel_KeyButtons[I].bIgnoreLDoubleClick = true; InWizardDuel_KeyButtons[I].bIgnoreMDoubleClick = true; @@ -321,22 +321,22 @@ function Created() labelX = 330 - offsetX; InGame_Label = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY, ctlW, 1.0)); InGame_Label.SetText(InGame_Text); - InGame_Label.SetFont(1); + InGame_Label.SetFont(F_Bold); InGame_Label.TextColor = GoupLabelTextColor; ctlY += 25; - for(I = 0; I < 11; I++) + for(I = 0; I < ArrayCount(InGame_LabelList); I++) { InGame_KeyNames[I] = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY + textOffsetY, labelWidth, 1.0)); InGame_KeyNames[I].SetText(InGame_LabelList[I]); - InGame_KeyNames[I].SetFont(1); + InGame_KeyNames[I].SetFont(F_Bold); InGame_KeyNames[I].TextColor = LabelTextColor; InGame_KeyButtons[I] = HPMenuRaisedButton(CreateControl(class'HPMenuRaisedButton', ctlX, ctlY, buttonWidth, ctlH)); InGame_KeyButtons[I].UpTexture = HoverImage5; //texture'FEOverOption5Texture'; InGame_KeyButtons[I].DownTexture = HoverImage; //texture'FEOverOptionTexture'; InGame_KeyButtons[I].DisabledTexture = HoverImage; //texture'FEOverOptionTexture'; InGame_KeyButtons[I].OverTexture = HoverImage3; //texture'FEOverOption3Texture'; - InGame_KeyButtons[I].SetFont(0); + InGame_KeyButtons[I].SetFont(F_Normal); InGame_KeyButtons[I].bAcceptsFocus = false; InGame_KeyButtons[I].bIgnoreLDoubleClick = true; InGame_KeyButtons[I].bIgnoreMDoubleClick = true; @@ -347,7 +347,6 @@ function Created() LoadAvailableSettings(); CreateBackPageButton(); - return; } function ShowWindow() @@ -383,7 +382,7 @@ function BeforePaint (Canvas C, float X, float Y) local int I; local int J; - for(I = 0; I < 11; I++) + for(I = 0; I < ArrayCount(InGame_KeyButtons); I++) { if ( BoundKey1[I] == 0 ) { @@ -398,9 +397,9 @@ function BeforePaint (Canvas C, float X, float Y) //} } - for(I = 0; I < 2; I++) + for(I = 0; I < ArrayCount(InQuidditch_KeyButtons); I++) { - J = 11 + I; + J = InQuidditch_FirstBoundKeyIndex + I; if ( BoundKey1[J] == 0 ) { InQuidditch_KeyButtons[I].SetText(""); @@ -415,7 +414,7 @@ function BeforePaint (Canvas C, float X, float Y) } for(I = 0; I < 1; I++) { - J = 12 + I; + J = InWizardDuel_FirstBoundKeyIndex + I; if ( BoundKey1[J] == 0 ) { InWizardDuel_KeyButtons[I].SetText(""); @@ -478,9 +477,8 @@ function LoadExistingKeys() } // I = 0; // if ( I < 13 ) - for(I = 0; I < 13; I++) + for(I = 0; I < ArrayCount(BoundKey1); I++) { -// JL006F: BoundKey1[I] = 0; BoundKey2[I] = 0; // I++; @@ -561,21 +559,21 @@ function MouseInvertChanged() function AutoCenterCamChanged() { harry(GetPlayerOwner()).bAutoCenterCamera = AutoCenterCamCheck.bChecked; - GetPlayerOwner().ConsoleCommand("set ini:HGame.Harry bAutoCenterCamera " $ AutoCenterCamCheck.bChecked); + GetPlayerOwner().ConsoleCommand("set ini:HGame.harry bAutoCenterCamera " $ AutoCenterCamCheck.bChecked); Log("AutoCenterCam changed to " $ string(AutoCenterCamCheck.bChecked)); } function AutoDrinkPotionChanged() { harry(GetPlayerOwner()).bAutoQuaff = AutoDrinkPotionCheck.bChecked; - GetPlayerOwner().ConsoleCommand("set ini:HGame.Harry bAutoQuaff " $ AutoDrinkPotionCheck.bChecked); + GetPlayerOwner().ConsoleCommand("set ini:HGame.harry bAutoQuaff " $ AutoDrinkPotionCheck.bChecked); Log("bAutoQuaff changed to " $ string(AutoDrinkPotionCheck.bChecked)); } function MoveWhileCastingChanged() { harry(GetPlayerOwner()).bMoveWhileCasting = MoveWhileCastingCheck.bChecked; - GetPlayerOwner().ConsoleCommand("set ini:HGame.Harry bMoveWhileCasting " $ MoveWhileCastingCheck.bChecked); + GetPlayerOwner().ConsoleCommand("set ini:HGame.harry bMoveWhileCasting " $ MoveWhileCastingCheck.bChecked); Log("MoveWhileCasting changed to " $ string(MoveWhileCastingCheck.bChecked)); } @@ -613,254 +611,15 @@ function DifficultyChanged() Str = "DifficultyMedium"; break; } - GetPlayerOwner().ConsoleCommand("set ini:HGame.Harry Difficulty " $ Str); + GetPlayerOwner().ConsoleCommand("set ini:HGame.harry Difficulty " $ Str); Log("Difficulty changed to " $ string(GetPlayerOwner().Difficulty)); } -/* -function RemoveExistingKey (int KeyNo, string KeyName) -{ - local int I; - - // I = RemoveExistingBoundKeyMinIndex; - // if ( (I < 13) && (I < RemoveExistingBoundKeyMaxIndex) ) - for(I = RemoveExistingBoundKeyMinIndex; I < ArrayCount(Boundkey1) && I < RemoveExistingBoundKeyMaxIndex; I++) - { - if ( I != Selection ) - { - if ( BoundKey2[I] == KeyNo ) - { - BoundKey2[I] = 0; - Log(" Removing Key -" $ RealKeyName[KeyNo] $ "- with AliasNames1[I] -" $ AliasNames1[I] $ " 2 -" $ AliasNames2[I] $ " 3 -" $ AliasNames3[I]); - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames1[I])); - if ( AliasNames2[I] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames2[I])); - } - if ( AliasNames3[I] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames3[I])); - } - } - if ( BoundKey1[I] == KeyNo ) - { - BoundKey1[I] = BoundKey2[I]; - BoundKey2[I] = 0; - Log(" Removing Key -" $ RealKeyName[KeyNo] $ "- with AliasNames1[I] -" $ AliasNames1[I] $ " 2 -" $ AliasNames2[I] $ " 3 -" $ AliasNames3[I]); - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames1[I])); - if ( AliasNames2[I] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames2[I])); - } - if ( AliasNames3[I] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RealKeyName[KeyNo]@RemoveActionFromKey(RealKeyName[KeyNo],AliasNames3[I])); - } - } - } - // I++; - // goto JL000B; - } -} - -function string AddTokenToString (string InString, string InToken) -{ - local int J; - - InString = Caps(InString); - InToken = Caps(InToken); - if ( InToken == "" ) - { - return InString; - } - if ( InStr(InString,InToken) != -1 ) - { - return InString; - } - J = Len(InString); - if ( J > 0 ) - { - J--; - // if ( (J > 0) && ((Mid(InString,J,1) == "|") || (Mid(InString,J,1) == " ")) ) - while ( J > 0 && (Mid(InString,J,1) == "|" || Mid(InString,J,1) == " ") ) - { - if ( Mid(InString,J,1) == "=" ) - { - Log(" InString[" $ string(J) $ "] == '=' so we will return -" $ InString @ InToken); - return InString @ InToken; - } - J--; - // goto JL0067; - } - Log(" InString[" $ string(J) $ "] != '=' so we will return -" $ InString @ "|" @ InToken); - return InString @ "|" @ InToken; - } else { - return InToken; - } -} - -function string RemoveTokenFromString (string InString, string InToken) -{ - local string L; - local string R; - local int I; - local int J; - - if ( (InString == "") || (InToken == "") ) - { - return InString; - } - InString = Caps(InString); - InToken = Caps(InToken); - I = InStr(InString,InToken); - if ( I != -1 ) - { - Log("Removing Token:" $ InToken $ " from string:" $ InString $ "!"); - L = Left(InString,I); - R = Right(InString,Len(InString) - (I + Len(InToken))); - Log("InStr returned:" $ string(I) $ " Len(leftPart):" $ string(Len(L)) $ " Len(InToken):" $ string(Len(InToken))); - J = Len(L); - J--; - // if ( (J > 0) && ((Mid(L,J,1) == "|") || (Mid(L,J,1) == " ")) ) - while ( J > 0 && (Mid(L,J,1) == "|" || Mid(L,J,1) == " ") ) - { - Log("j=" $ string(J) $ "! Mid(l, j, 1)=" $ Mid(L,J,1) $ "!l=" $ L $ "!"); - L = Left(L,J-- ); - // goto JL0130; - } - Log("After cleanup left:" $ L); - Log("right:" $ R); - Log("final:" $ L $ R); - L = L $ R; - // if ( (Len(L) > 0) && ((Mid(L,0,1) == "|") || (Mid(L,0,1) == " ")) ) - while ( Len(L) > 0 && (Mid(L,0,1) == "|" || Mid(L,0,1) == " ") ) - { - Log("j=" $ string(J) $ "! Mid(l, 0, 1)=" $ Mid(L,0,1) $ "!l=" $ L $ "!"); - L = Right(L,Len(L) - 1); - // goto JL021C; - } - Log("After cleanup final:" $ L); - return L; - } - return InString; -} - -function string RemoveActionFromKey (string KeyName, string ActionName) -{ - local string keybinding; - - keybinding = GetPlayerOwner().ConsoleCommand("KEYBINDING " $KeyName); - Log("Calling RemoveActionFromKey(" $ keybinding $ "," $ ActionName $ ");"); - return RemoveTokenFromString(keybinding,ActionName); -} - -function string AddActionToKey (string KeyName, string ActionName) -{ - local string keybinding; - - keybinding = GetPlayerOwner().ConsoleCommand("KEYBINDING " $KeyName); - Log("Calling AddActionToKey(" $ keybinding $ "," $ ActionName $ ");"); - return AddTokenToString(keybinding,ActionName); -} - -function SetKey (int KeyNo, string KeyName) -{ - local string RemoveKeyName; - - Log("options Setkey" @ KeyName $ " KeyNo" @ string(KeyNo)); - if ( BoundKey1[Selection] != 0 ) - { - if ( KeyNo == BoundKey1[Selection] ) - { - if ( BoundKey2[Selection] != 0 ) - { - RemoveKeyName = RealKeyName[BoundKey2[Selection]]; - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames1[Selection])); - if ( AliasNames2[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames2[Selection])); - } - if ( AliasNames3[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames3[Selection])); - } - BoundKey2[Selection] = 0; - } - } else //{ - if ( KeyNo == BoundKey2[Selection] ) - { - RemoveKeyName = RealKeyName[BoundKey1[Selection]]; - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames1[Selection])); - if ( AliasNames2[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames2[Selection])); - } - if ( AliasNames3[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames3[Selection])); - } - BoundKey1[Selection] = BoundKey2[Selection]; - BoundKey2[Selection] = 0; - } else { - if ( BoundKey2[Selection] != 0 ) - { - RemoveKeyName = RealKeyName[BoundKey2[Selection]]; - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames1[Selection])); - if ( AliasNames2[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames2[Selection])); - } - if ( AliasNames3[Selection] != "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input "@RemoveKeyName@RemoveActionFromKey(RemoveKeyName,AliasNames3[Selection])); - } - BoundKey2[Selection] = 0; - } - BoundKey2[Selection] = BoundKey1[Selection]; - BoundKey1[Selection] = KeyNo; - if ( AliasNames2[Selection] == "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - } else { - if ( AliasNames3[Selection] == "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames2[Selection])); - } else { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames2[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames3[Selection])); - } - } - } - //} - } else { - BoundKey1[Selection] = KeyNo; - if ( AliasNames2[Selection] == "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - } else { - if ( AliasNames3[Selection] == "" ) - { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames2[Selection])); - } else { - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames1[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames2[Selection])); - GetPlayerOwner().ConsoleCommand("SET Input" @KeyName@AddActionToKey(KeyName,AliasNames3[Selection])); - } - } - } -} -*/ - -//all these functions are rewritten by me because the originals are broken -AdamJD -// start ------------------------------------------------------------------------------------------------------------------------------------------------------------------ function RemoveExistingKey(int KeyNo, string KeyName) { local int I; - for(I=RemoveExistingBoundKeyMinIndex; I 0 && (Mid(l, j, 1) == "|" || Mid(l, j, 1) == " ") ) { - log( "j=" $j $"! Mid(l, j, 1)=" $Mid(l, j, 1) $"!l=" $l $"!" ); + Log( "j=" $j $"! Mid(l, j, 1)=" $Mid(l, j, 1) $"!l=" $l $"!" ); l = Left( l, j--); } - log("After cleanup left:" $l ); - log("right:" $r ); - log("final:" $l$r ); + Log("After cleanup left:" $l ); + Log("right:" $r ); + Log("final:" $l$r ); l = l$r; @@ -992,7 +751,7 @@ function string RemoveTokenFromString(string InString, string InToken) l = Right( l, Len( l )-1); } - log("After cleanup final:" $l ); + Log("After cleanup final:" $l ); return (l); } @@ -1021,7 +780,7 @@ function SetKey(int KeyNo, string KeyName) { local string RemoveKeyName; - log( "options Setkey"@KeyName $" KeyNo"@KeyNo ); + Log( "options Setkey"@KeyName $" KeyNo"@KeyNo ); if ( BoundKey1[Selection] != 0 ) { @@ -1128,7 +887,6 @@ function SetKey(int KeyNo, string KeyName) } } } -// end ------------------------------------------------------------------------------------------------------------------------------------------------------------------ function ProcessKey (int KeyNo) { @@ -1137,7 +895,7 @@ function ProcessKey (int KeyNo) KeyName = RealKeyName[KeyNo]; Log("InputPage selection:" $ string(Selection) $ " has AliasNames1:'" $ AliasNames1[Selection] $ "' attempt to set as " $ string(KeyNo) $ ":" $ KeyName); PlayClick(); - if ( (KeyName == "") || (KeyName == "Escape") || (KeyNo >= 112) && (KeyNo <= 121) || (KeyNo >= 48) && (KeyNo <= 57) || (KeyNo == 91) || (KeyNo == 92) || (KeyNo == 93) || (KeyNo == 236) || (KeyNo == 237) ) + if ( (KeyName == "") || (KeyName == "Escape") || ((KeyNo >= 112) && (KeyNo <= 121)) || ((KeyNo >= 48) && (KeyNo <= 57)) || (KeyNo == 91) || (KeyNo == 92) || (KeyNo == 93) || (KeyNo == 236) || (KeyNo == 237) ) { return; } @@ -1172,131 +930,131 @@ function Notify (UWindowDialogControl C, byte E) switch (C) { case DifficultyCombo: - DifficultyChanged(); - break; + DifficultyChanged(); + break; case SensitivitySlider: - SensitivityChanged(); - break; + SensitivityChanged(); + break; case MouseSmoothCheck: - MouseSmoothChanged(); - break; + MouseSmoothChanged(); + break; case InvertBroomCheck: - InvertBroomChanged(); - break; + InvertBroomChanged(); + break; case AutoJumpCheck: - AutoJumpChanged(); - break; + AutoJumpChanged(); + break; case MouseInvertCheck: - MouseInvertChanged(); - break; + MouseInvertChanged(); + break; case AutoCenterCamCheck: - AutoCenterCamChanged(); - break; + AutoCenterCamChanged(); + break; case AutoDrinkPotionCheck: - AutoDrinkPotionChanged(); - break; + AutoDrinkPotionChanged(); + break; case MoveWhileCastingCheck: - MoveWhileCastingChanged(); - break; + MoveWhileCastingChanged(); + break; default: } case DE_Click: - if ( bPolling ) - { - bPolling = False; - SelectedButton.bDisabled = False; - if ( C == SelectedButton ) - { - ProcessKey(1); - return; - } - } - if ( UWindowButton(C) != None ) - { - PlayClick(); + if ( bPolling ) + { + bPolling = False; + SelectedButton.bDisabled = False; + if ( C == SelectedButton ) + { + ProcessKey(1); + return; + } + } + if ( UWindowButton(C) != None ) + { + PlayClick(); - for(I = 0; I < 11; I++) - { - if ( InGame_KeyButtons[I] == C ) - { - RemoveExistingBoundKeyMinIndex = 0; - RemoveExistingBoundKeyMaxIndex = 11; - SetKeyType = KT_Game; - SelectedButton = UWindowButton(C); - Selection = I; - Log("InputPage InGame_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); - bPolling = True; - Log("Polling set to true"); - SelectedButton.bDisabled = True; - return; - } - } + for(I = 0; I < ArrayCount(InGame_KeyButtons); I++) + { + if ( InGame_KeyButtons[I] == C ) + { + RemoveExistingBoundKeyMinIndex = 0; + RemoveExistingBoundKeyMaxIndex = InGame_LastBoundKeyIndex; + SetKeyType = KT_Game; + SelectedButton = UWindowButton(C); + Selection = I; + Log("InputPage InGame_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); + bPolling = True; + Log("Polling set to true"); + SelectedButton.bDisabled = True; + return; + } + } - for(I = 0; I < 2; I++) - { - if ( InQuidditch_KeyButtons[I] == C ) - { - RemoveExistingBoundKeyMinIndex = 11; - RemoveExistingBoundKeyMaxIndex = 12; - SetKeyType = KT_Quidditch; - SelectedButton = UWindowButton(C); - Selection = 11 + I; - Log("InputPage InQuidditch_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); - bPolling = True; - Log("Polling set to true"); - SelectedButton.bDisabled = True; - return; - } - } + for(I = 0; I < ArrayCount(InQuidditch_KeyButtons); I++) + { + if ( InQuidditch_KeyButtons[I] == C ) + { + RemoveExistingBoundKeyMinIndex = InQuidditch_FirstBoundKeyIndex; + RemoveExistingBoundKeyMaxIndex = InQuidditch_LastBoundKeyIndex; + SetKeyType = KT_Quidditch; + SelectedButton = UWindowButton(C); + Selection = InQuidditch_FirstBoundKeyIndex + I; + Log("InputPage InQuidditch_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); + bPolling = True; + Log("Polling set to true"); + SelectedButton.bDisabled = True; + return; + } + } - for(I = 0; I < 1; I++) - { - if ( InWizardDuel_KeyButtons[I] == C ) - { - RemoveExistingBoundKeyMinIndex = 12; - RemoveExistingBoundKeyMaxIndex = 13; - SetKeyType = KT_WizardDuel; - SelectedButton = UWindowButton(C); - Selection = 12 + I; - Log("InputPage InWizardDuel_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); - bPolling = True; - Log("Polling set to true"); - SelectedButton.bDisabled = True; - return; - } - } - } - switch (C) - { - case BackPageButton: - FEBook(book).DoEscapeFromPage(); - return; - } - break; + for(I = 0; I < 1; I++) + { + if ( InWizardDuel_KeyButtons[I] == C ) + { + RemoveExistingBoundKeyMinIndex = InWizardDuel_FirstBoundKeyIndex; + RemoveExistingBoundKeyMaxIndex = InWizardDuel_LastBoundKeyIndex; + SetKeyType = KT_WizardDuel; + SelectedButton = UWindowButton(C); + Selection = InWizardDuel_FirstBoundKeyIndex + I; + Log("InputPage InWizardDuel_KeyButtons Selection" $ string(Selection) $ " is:" $ AliasNames1[Selection] $ "' clicked ..."); + bPolling = True; + Log("Polling set to true"); + SelectedButton.bDisabled = True; + return; + } + } + } + switch (C) + { + case BackPageButton: + FEBook(book).DoEscapeFromPage(); + return; + } + break; case DE_RClick: - if ( bPolling ) - { - bPolling = False; - SelectedButton.bDisabled = False; - if ( C == SelectedButton ) - { - ProcessKey(2); - return; - } - } - break; + if ( bPolling ) + { + bPolling = False; + SelectedButton.bDisabled = False; + if ( C == SelectedButton ) + { + ProcessKey(2); + return; + } + } + break; case DE_MClick: - if ( bPolling ) - { - bPolling = False; - SelectedButton.bDisabled = False; - if ( C == SelectedButton ) - { - ProcessKey(4); - return; - } - } - break; + if ( bPolling ) + { + bPolling = False; + SelectedButton.bDisabled = False; + if ( C == SelectedButton ) + { + ProcessKey(4); + return; + } + } + break; default: } } diff --git a/HGame/Classes/Menu/FELangGrid.uc b/HGame/Classes/Menu/FELangGrid.uc index d5992b1d..20e6b764 100644 --- a/HGame/Classes/Menu/FELangGrid.uc +++ b/HGame/Classes/Menu/FELangGrid.uc @@ -35,11 +35,11 @@ function PaintColumn (Canvas C, UWindowGridColumn Column, float MouseX, float Mo BottomMargin = LookAndFeel.Size_ScrollbarWidth = } else {; BottomMargin = 0; } - */ +*/ if ( bShowHorizSB ) { - BottomMargin = LookAndFeel.Size_ScrollbarWidth; + BottomMargin = LookAndFeel.Size_ScrollbarWidth; } else { @@ -48,8 +48,8 @@ function PaintColumn (Canvas C, UWindowGridColumn Column, float MouseX, float Mo TopMargin = LookAndFeel.ColumnHeadingHeight; Count = browser.MasterCount; - C.Font = Root.Fonts[0]; - Visible = (WinHeight - TopMargin + BottomMargin) / RowHeight; + C.Font = Root.Fonts[F_Normal]; + Visible = int((WinHeight - (TopMargin + BottomMargin)) / RowHeight); VertSB.SetRange(0.0,Count + 1,Visible); TopRow = VertSB.Pos; Skipped = 0; diff --git a/HGame/Classes/Menu/FEMainPage.uc b/HGame/Classes/Menu/FEMainPage.uc index 91bc2382..afc71db6 100644 --- a/HGame/Classes/Menu/FEMainPage.uc +++ b/HGame/Classes/Menu/FEMainPage.uc @@ -69,7 +69,7 @@ function Created() Super.Created(); LegalText = Localize("all","legal_title_01","Pickup"); VersionButton = UWindowSmallButton(CreateControl(Class'UWindowSmallButton',WinWidth - 84,WinHeight - 30,84.0,25.0)); - VersionButton.SetFont(0); + VersionButton.SetFont(F_Normal); VersionButton.TextColor.R = 250; VersionButton.TextColor.G = 250; VersionButton.TextColor.B = 250; @@ -87,7 +87,7 @@ function Created() if ( LevelList[I].LevelName != "" ) { LevelList[I].Button = UWindowButton(CreateControl(Class'UWindowButton',X,Y,W,H)); - LevelList[I].Button.SetFont(4); + LevelList[I].Button.SetFont(F_HPMenuLarge); LevelList[I].Button.TextColor.R = 250; LevelList[I].Button.TextColor.G = 250; LevelList[I].Button.TextColor.B = 250; @@ -104,7 +104,7 @@ function Created() } Y += H; ExitButton = UWindowButton(CreateControl(Class'UWindowButton',X,Y,W,H)); - ExitButton.SetFont(4); + ExitButton.SetFont(F_HPMenuLarge); ExitButton.TextColor.R = 250; ExitButton.TextColor.G = 250; ExitButton.TextColor.B = 250; @@ -124,7 +124,7 @@ function Created() if ( LevelList[I].LevelName != "" ) { LevelList[I].Button = UWindowButton(CreateControl(Class'UWindowButton',X,Y,W,H)); - LevelList[I].Button.SetFont(4); + LevelList[I].Button.SetFont(F_HPMenuLarge); LevelList[I].Button.TextColor.R = 96; LevelList[I].Button.TextColor.G = 96; LevelList[I].Button.TextColor.B = 112; @@ -141,10 +141,10 @@ function Created() } } } else { - E3DemoStartButton = UWindowButton(CreateControl(Class'UWindowButton',WinWidth / 2 - 80,WinHeight - 100,160.0,60.0)); + E3DemoStartButton = UWindowButton(CreateControl(Class'UWindowButton',(WinWidth / 2) - 80,WinHeight - 100,160.0,60.0)); E3DemoStartButton.ToolTipString = "Start Demo"; ExitButton = UWindowButton(CreateControl(Class'UWindowButton',WinWidth - 50,WinHeight - 60,50.0,30.0)); - ExitButton.SetFont(4); + ExitButton.SetFont(F_HPMenuLarge); ExitButton.TextColor.R = 250; ExitButton.TextColor.G = 250; ExitButton.TextColor.B = 250; @@ -176,12 +176,12 @@ function bool KeyEvent (byte Key, byte Action, float Delta) if ( (Action == 1) && (Key == 27) ) { ConfirmExit = doHPMessageBox("Are you sure you want to exit?","Yes","No"); - } else { + } else //{ if ( (Action == 1) && (Key == 123) ) { FEBook(book).CloseBook(); } - } + //} } function Notify (UWindowDialogControl C, byte E) diff --git a/HGame/Classes/Menu/FEMapPage.uc b/HGame/Classes/Menu/FEMapPage.uc index 98ec30bc..c3520aae 100644 --- a/HGame/Classes/Menu/FEMapPage.uc +++ b/HGame/Classes/Menu/FEMapPage.uc @@ -5,46 +5,46 @@ class FEMapPage extends baseFEPage; //texture shape imports -AdamJD -#exec Texture Import File=Textures\Icons\CircleTexture.PNG GROUP=Icons Name=CircleTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\DiamondTexture.PNG GROUP=Icons Name=DiamondTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\DiffindoTexture.PNG GROUP=Icons Name=DiffindoTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\DownArrowTexture.PNG GROUP=Icons Name=DownArrowTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\HarryLocationTexture.PNG GROUP=Icons Name=HarryLocationTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\HexTexture.PNG GROUP=Icons Name=HexTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\LeftArrowTexture.PNG GROUP=Icons Name=LeftArrowTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\RectangleTexture.PNG GROUP=Icons Name=RectangleTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\RictusempraTexture.PNG GROUP=Icons Name=RictusempraTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\RightArrowTexture.PNG GROUP=Icons Name=RightArrowTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\SkurgeTexture.PNG GROUP=Icons Name=SkurgeTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\SquareGreenTexture.PNG GROUP=Icons Name=SquareGreenTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\tSpongifyTexture.PNG GROUP=Icons Name=tSpongifyTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\UpArrowTexture.PNG GROUP=Icons Name=UpArrowTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\CircleTexture.PNG GROUP=Icons Name=CircleTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\DiamondTexture.PNG GROUP=Icons Name=DiamondTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\DiffindoTexture.PNG GROUP=Icons Name=DiffindoTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\DownArrowTexture.PNG GROUP=Icons Name=DownArrowTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\HarryLocationTexture.PNG GROUP=Icons Name=HarryLocationTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\HexTexture.PNG GROUP=Icons Name=HexTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\LeftArrowTexture.PNG GROUP=Icons Name=LeftArrowTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\RectangleTexture.PNG GROUP=Icons Name=RectangleTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\RictusempraTexture.PNG GROUP=Icons Name=RictusempraTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\RightArrowTexture.PNG GROUP=Icons Name=RightArrowTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\SkurgeTexture.PNG GROUP=Icons Name=SkurgeTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\SquareGreenTexture.PNG GROUP=Icons Name=SquareGreenTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\tSpongifyTexture.PNG GROUP=Icons Name=tSpongifyTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\UpArrowTexture.PNG GROUP=Icons Name=UpArrowTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 //texture background imports -AdamJD -#exec Texture Import File=Textures\Icons\Map0Texture1.PNG GROUP=Icons Name=Map0Texture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map0Texture2.PNG GROUP=Icons Name=Map0Texture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map0Texture3.PNG GROUP=Icons Name=Map0Texture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map0Texture4.PNG GROUP=Icons Name=Map0Texture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map0Texture5.PNG GROUP=Icons Name=Map0Texture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map0Texture6.PNG GROUP=Icons Name=Map0Texture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture1.PNG GROUP=Icons Name=Map1Texture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture2.PNG GROUP=Icons Name=Map1Texture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture3.PNG GROUP=Icons Name=Map1Texture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture4.PNG GROUP=Icons Name=Map1Texture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture5.PNG GROUP=Icons Name=Map1Texture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map1Texture6.PNG GROUP=Icons Name=Map1Texture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture1.PNG GROUP=Icons Name=Map2Texture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture2.PNG GROUP=Icons Name=Map2Texture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture3.PNG GROUP=Icons Name=Map2Texture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture4.PNG GROUP=Icons Name=Map2Texture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture5.PNG GROUP=Icons Name=Map2Texture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map2Texture6.PNG GROUP=Icons Name=Map2Texture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture1.PNG GROUP=Icons Name=Map3Texture1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture2.PNG GROUP=Icons Name=Map3Texture2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture3.PNG GROUP=Icons Name=Map3Texture3 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture4.PNG GROUP=Icons Name=Map3Texture4 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture5.PNG GROUP=Icons Name=Map3Texture5 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 -#exec Texture Import File=Textures\Icons\Map3Texture6.PNG GROUP=Icons Name=Map3Texture6 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture1.PNG GROUP=Icons Name=Map0Texture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture2.PNG GROUP=Icons Name=Map0Texture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture3.PNG GROUP=Icons Name=Map0Texture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture4.PNG GROUP=Icons Name=Map0Texture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture5.PNG GROUP=Icons Name=Map0Texture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map0Texture6.PNG GROUP=Icons Name=Map0Texture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture1.PNG GROUP=Icons Name=Map1Texture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture2.PNG GROUP=Icons Name=Map1Texture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture3.PNG GROUP=Icons Name=Map1Texture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture4.PNG GROUP=Icons Name=Map1Texture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture5.PNG GROUP=Icons Name=Map1Texture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map1Texture6.PNG GROUP=Icons Name=Map1Texture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture1.PNG GROUP=Icons Name=Map2Texture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture2.PNG GROUP=Icons Name=Map2Texture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture3.PNG GROUP=Icons Name=Map2Texture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture4.PNG GROUP=Icons Name=Map2Texture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture5.PNG GROUP=Icons Name=Map2Texture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map2Texture6.PNG GROUP=Icons Name=Map2Texture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture1.PNG GROUP=Icons Name=Map3Texture1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture2.PNG GROUP=Icons Name=Map3Texture2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture3.PNG GROUP=Icons Name=Map3Texture3 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture4.PNG GROUP=Icons Name=Map3Texture4 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture5.PNG GROUP=Icons Name=Map3Texture5 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 +#exec Texture Import File=Textures\Icons\Map3Texture6.PNG GROUP=Icons Name=Map3Texture6 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 const NUM_HARRYLOC_INFO= 43; const MAX_MAP_BUTTONS= 40; @@ -241,15 +241,15 @@ function Created() StatusBarTextWindow = UWindowWrappedTextArea(CreateControl(Class'UWindowWrappedTextArea',16.0,WinHeight - 26,500.0,26.0)); StatusBarTextWindow.Clear(); StatusBarTextWindow.AddText(""); - StatusBarTextWindow.Font = 4; + StatusBarTextWindow.Font = F_HPMenuLarge; StatusBarTextWindow.WinTop = GetStatusY(); } function AddMapButton (int X, int Y, int W, int H, Texture t, string ButtonText, optional string MapLink) { - if ( TotalNumMapButtons >= 40 ) + if ( TotalNumMapButtons >= MAX_MAP_BUTTONS ) { - TotalNumMapButtons = 40 - 1; + TotalNumMapButtons = MAX_MAP_BUTTONS - 1; } Buttons[TotalNumMapButtons].MapButton = UWindowButton(CreateWindow(Class'UWindowButton',X,Y,W,H)); Buttons[TotalNumMapButtons].MapButton.DownTexture = t; @@ -317,7 +317,7 @@ function UpdateDisplayDetails() S = GetCurrentUnrFileName(); N = PlayerHarry.HarryAtMapMarker(); - for(I = 0; I < 43; I++) + for(I = 0; I < NUM_HARRYLOC_INFO; I++) { if ( (nCurrPage == HarryLocInfo[I].MapIdx) && (S ~= HarryLocInfo[I].UnrName) && (HarryLocInfo[I].Tag == N) ) { @@ -505,7 +505,7 @@ function SetInitialSelection() nCurrPage = -1; HarryAtMapMarkerName = PlayerHarry.HarryAtMapMarker(); - for(I = 0; I < 43; I++) + for(I = 0; I < NUM_HARRYLOC_INFO; I++) { if ( (S ~= HarryLocInfo[I].UnrName) && (HarryLocInfo[I].Tag != 'None') && (HarryLocInfo[I].Tag == HarryAtMapMarkerName) ) { @@ -515,7 +515,7 @@ function SetInitialSelection() } if ( nCurrPage == -1 ) { - for(I = 0; I < 43; I++) + for(I = 0; I < NUM_HARRYLOC_INFO; I++) { if ( (S ~= HarryLocInfo[I].UnrName) && (HarryLocInfo[I].Tag == HarryAtMapMarkerName) ) { diff --git a/HGame/Classes/Menu/FEOptionsPage.uc b/HGame/Classes/Menu/FEOptionsPage.uc index fd2cffdb..e72ae05e 100644 --- a/HGame/Classes/Menu/FEOptionsPage.uc +++ b/HGame/Classes/Menu/FEOptionsPage.uc @@ -72,7 +72,7 @@ function Created() InputButton.DownTexture = textureLionClick; InputButton.OverTexture = textureLionRO; InputLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',182.0 - 50,310.0 + 60,200.0,64.0)); - InputLabel.SetFont(4); + InputLabel.SetFont(F_HPMenuLarge); InputLabel.TextColor.R = 215; InputLabel.TextColor.G = 0; InputLabel.TextColor.B = 215; @@ -85,7 +85,7 @@ function Created() SoundVideoButton.DownTexture = textureLionClick; SoundVideoButton.OverTexture = textureLionRO; SoundVideoLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',252.0 - 50,120.0 + 108,200.0,64.0)); - SoundVideoLabel.SetFont(4); + SoundVideoLabel.SetFont(F_HPMenuLarge); SoundVideoLabel.TextColor.R = 215; SoundVideoLabel.TextColor.G = 0; SoundVideoLabel.TextColor.B = 215; @@ -98,7 +98,7 @@ function Created() QuitButton.DownTexture = textureLionClick; QuitButton.OverTexture = textureLionRO; QuitLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',394.0 + 30 - 50,310.0 + 62,200.0,64.0)); - QuitLabel.SetFont(4); + QuitLabel.SetFont(F_HPMenuLarge); QuitLabel.TextColor.R = 215; QuitLabel.TextColor.G = 0; QuitLabel.TextColor.B = 215; @@ -144,6 +144,7 @@ function Notify (UWindowDialogControl C, byte E) FEBook(book).ChangePageNamed("SOUNDVIDEO"); break; default: + break; } } } diff --git a/HGame/Classes/Menu/FEQuidPage.uc b/HGame/Classes/Menu/FEQuidPage.uc index c8dfea47..66d74fb2 100644 --- a/HGame/Classes/Menu/FEQuidPage.uc +++ b/HGame/Classes/Menu/FEQuidPage.uc @@ -5,7 +5,7 @@ class FEQuidPage extends baseFEPage; //texture import -AdamJD -#exec Texture Import File=Textures\Icons\QuidMatchBoxTexture.PNG GROUP=Icons Name=QuidMatchBoxTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\QuidMatchBoxTexture.PNG GROUP=Icons Name=QuidMatchBoxTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var HPMessageBox ConfirmReplay; var harry PlayerHarry; @@ -20,165 +20,10 @@ var UWindowLabelControl matchLabel[6]; var UWindowButton NimbusButton; var UWindowButton QArmorButton; -/* -function PreSwitchPage() -{ - local int I; - local int nGameState; - local StatusManager managerStatus; - local StatusItem si; - local Texture crestIcons[4]; - local Texture crestIconsGrey[4]; - local bool bCameFromMenu; - local int playedCount; - PlayerHarry = harry(HPConsole(Root.Console).Viewport.Actor); - nGameState = PlayerHarry.ConvertGameStateToNumber(); - HPConsole(Root.Console).Viewport.Actor.ClientMessage("Launching Quidditch menu curGameState:" $ string(nGameState)); - if ( (FEBook(book).prevPage == None) || PlayerHarry.bWithOlly ) - { - bCameFromMenu = False; - } else { - bCameFromMenu = True; - } - if ( PlayerHarry.bWithOlly ) - { - // I = 0; - // if ( I < 6 ) - for(I = 0; I < 6; I++) - { - PlayerHarry.quidGameResults[I].bLocked = False; - // I++; - // goto JL00FD; - } - } else { - if ( nGameState >= 40 ) - { - PlayerHarry.quidGameResults[0].bLocked = False; - } - if ( nGameState >= 50 ) - { - PlayerHarry.quidGameResults[1].bLocked = False; - } - if ( nGameState >= 80 ) - { - PlayerHarry.quidGameResults[2].bLocked = False; - } - if ( nGameState >= 100 ) - { - PlayerHarry.quidGameResults[3].bLocked = False; - } - if ( nGameState >= 130 ) - { - PlayerHarry.quidGameResults[4].bLocked = False; - } - if ( nGameState >= 145 ) - { - playedCount = 0; - PlayerHarry.quidGameResults[5].bLocked = True; - // I = 0; - // if ( I < 5 ) - for(I = 0; I < 5; I++) - { - if ( PlayerHarry.quidGameResults[I].bWon ) - { - playedCount++; - } - // I++; - // goto JL021C; - } - if ( playedCount >= 5 ) - { - PlayerHarry.quidGameResults[5].bLocked = False; - } - if ( (PlayerHarry.quidGameResults[5].myScore > 0) || (PlayerHarry.quidGameResults[5].OpponentScore > 0) ) - { - PlayerHarry.quidGameResults[5].bLocked = False; - } - } - } - crestIcons[0] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2GriffindorCrestSm",Class'Texture')); - crestIcons[1] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2HufflepuffCrestSm",Class'Texture')); - crestIcons[2] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2RavenclawCrestSm",Class'Texture')); - crestIcons[3] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2SlytherinCrestSm",Class'Texture')); - crestIconsGrey[0] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2GriffindorBlank",Class'Texture')); - crestIconsGrey[1] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2HufflepuffBlank",Class'Texture')); - crestIconsGrey[2] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2RavenclawBlank",Class'Texture')); - crestIconsGrey[3] = Texture(DynamicLoadObject("HP2_Menu.icon.HP2SlytherinBlank",Class'Texture')); - // I = 0; - // if ( I < 6 ) - for(I = 0; I < 6; I++) - { - if ( PlayerHarry.quidGameResults[I].bLocked ) - { - if ( bCameFromMenu ) - { - startGameButtons[I].ToolTipString = ""; - } else { - startGameButtons[I].ToolTipString = GetLocalFEString("Quidditch_0045"); - } - startGameButtons[I].UpTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].DownTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].OverTexture = Texture'QuidMatchBoxTexture'; - myCrests[I].UpTexture = crestIconsGrey[0]; - myCrests[I].DownTexture = crestIconsGrey[0]; - myCrests[I].OverTexture = crestIconsGrey[0]; - opponentCrests[I].UpTexture = crestIconsGrey[1 + (I % 3)]; - opponentCrests[I].DownTexture = crestIconsGrey[1 + (I % 3)]; - opponentCrests[I].OverTexture = crestIconsGrey[1 + (I % 3)]; - myScores[I].SetText(""); - opponentScores[I].SetText(""); - myPoints[I].SetText(""); - } - else - { - if ( bCameFromMenu ) - { - startGameButtons[I].ToolTipString = ""; - } - else - { - startGameButtons[I].ToolTipString = GetLocalFEString("Quidditch_0020") $ " " $I + 1; - } - startGameButtons[I].UpTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].DownTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].OverTexture = Texture'QuidMatchBoxTexture'; - myCrests[I].UpTexture = crestIcons[0]; - myCrests[I].DownTexture = crestIcons[0]; - myCrests[I].OverTexture = crestIcons[0]; - opponentCrests[I].UpTexture = crestIcons[1 + (I % 3)]; - opponentCrests[I].DownTexture = crestIcons[1 + (I % 3)]; - opponentCrests[I].OverTexture = crestIcons[1 + (I % 3)]; - myScores[I].SetText("" $PlayerHarry.quidGameResults[I].myScore); - opponentScores[I].SetText("" $PlayerHarry.quidGameResults[I].OpponentScore); - myPoints[I].SetText(GetLocalFEString("Quidditch_0046") $ " " $PlayerHarry.quidGameResults[I].HousePoints); - } - // I++; - // goto JL04AD; - } - managerStatus = harry(Root.Console.Viewport.Actor).managerStatus; - si = managerStatus.GetStatusItem(Class'StatusGroupQGear',Class'StatusItemNimbus'); - if ( si.GetCount() >= 1 ) - { - NimbusButton.ShowWindow(); - } else { - NimbusButton.HideWindow(); - } - si = managerStatus.GetStatusItem(Class'StatusGroupQGear',Class'StatusItemQArmor'); - if ( si.GetCount() >= 1 ) - { - QArmorButton.ShowWindow(); - } else { - QArmorButton.HideWindow(); - } - Super.PreSwitchPage(); -} -*/ - -//rewritten this function because the original is broken -AdamJD function PreSwitchPage() { - local int i; + local int I; local int nGameState; local StatusManager managerStatus; local StatusItem si; @@ -187,10 +32,10 @@ function PreSwitchPage() local bool bCameFromMenu; local int playedCount; - playerHarry= Harry(HPConsole(root.console).Viewport.Actor); - nGameState= playerHarry.ConvertGameStateToNumber(); + PlayerHarry= harry(HPConsole(Root.Console).Viewport.Actor); + nGameState= PlayerHarry.ConvertGameStateToNumber(); - HPConsole(root.console).Viewport.Actor.ClientMessage("Launching Quidditch menu curGameState:"$nGameState); + HPConsole(Root.Console).Viewport.Actor.ClientMessage("Launching Quidditch menu curGameState:"$nGameState); if ( (FEBook(book).prevPage == None) || PlayerHarry.bWithOlly ) { @@ -203,7 +48,7 @@ function PreSwitchPage() if ( PlayerHarry.bWithOlly ) { - for(I = 0; I < ArrayCount(playerHarry.quidGameResults); I++) + for(I = 0; I < ArrayCount(PlayerHarry.quidGameResults); I++) { PlayerHarry.quidGameResults[I].bLocked= False; } @@ -263,9 +108,12 @@ function PreSwitchPage() crestIconsGrey[2]= Texture(DynamicLoadObject("HP2_Menu.icon.HP2RavenclawBlank",Class'Texture')); crestIconsGrey[3]= Texture(DynamicLoadObject("HP2_Menu.icon.HP2SlytherinBlank",Class'Texture')); - for(i = 0; i < ArrayCount(playerHarry.quidGameResults); i++) + for(I = 0; I < ArrayCount(PlayerHarry.quidGameResults); I++) { - if ( playerHarry.quidGameResults[i].bLocked ) + startGameButtons[I].UpTexture= Texture'QuidMatchBoxTexture'; + startGameButtons[I].DownTexture= Texture'QuidMatchBoxTexture'; + startGameButtons[I].OverTexture= Texture'QuidMatchBoxTexture'; + if ( PlayerHarry.quidGameResults[I].bLocked ) { if ( bCameFromMenu ) { @@ -275,18 +123,15 @@ function PreSwitchPage() { startGameButtons[I].ToolTipString = GetLocalFEString("Quidditch_0045"); } - startGameButtons[i].UpTexture=texture 'QuidMatchBoxTexture'; - startGameButtons[i].DownTexture=texture 'QuidMatchBoxTexture'; - startGameButtons[i].OverTexture=texture 'QuidMatchBoxTexture'; myCrests[I].UpTexture = crestIconsGrey[0]; myCrests[I].DownTexture = crestIconsGrey[0]; myCrests[I].OverTexture = crestIconsGrey[0]; opponentCrests[I].UpTexture = crestIconsGrey[1 + (I % 3)]; opponentCrests[I].DownTexture = crestIconsGrey[1 + (I % 3)]; opponentCrests[I].OverTexture = crestIconsGrey[1 + (I % 3)]; - myScores[i].setText(""); - opponentScores[i].setText(""); - myPoints[i].setText(""); + myScores[I].SetText(""); + opponentScores[I].SetText(""); + myPoints[I].SetText(""); } else @@ -299,10 +144,6 @@ function PreSwitchPage() { startGameButtons[I].ToolTipString = GetLocalFEString("Quidditch_0020") $ " " $I + 1; } - startGameButtons[i].UpTexture=texture 'QuidMatchBoxTexture'; - startGameButtons[i].DownTexture=texture 'QuidMatchBoxTexture'; - startGameButtons[i].OverTexture=texture 'QuidMatchBoxTexture'; - myCrests[I].UpTexture = crestIcons[0]; myCrests[I].DownTexture = crestIcons[0]; myCrests[I].OverTexture = crestIcons[0]; @@ -310,9 +151,9 @@ function PreSwitchPage() opponentCrests[I].DownTexture = crestIcons[1 + (I % 3)]; opponentCrests[I].OverTexture = crestIcons[1 + (I % 3)]; - myScores[i].setText(""$playerHarry.quidGameResults[i].myScore); - opponentScores[i].setText(""$playerHarry.quidGameResults[i].opponentScore); - myPoints[i].setText("Points " $playerHarry.quidGameResults[i].housePoints); + myScores[I].SetText(""$PlayerHarry.quidGameResults[I].myScore); + opponentScores[I].SetText(""$PlayerHarry.quidGameResults[I].OpponentScore); + myPoints[I].SetText(GetLocalFEString("Quidditch_0046") $" " $PlayerHarry.quidGameResults[I].HousePoints); } } @@ -357,120 +198,6 @@ function Paint (Canvas Canvas, float X, float Y) Super.Paint(Canvas,X,Y); } -/* -function Created() -{ - local int StartX; - local int StartY; - local int gameBoxWidth; - local int gameBoxHeight; - local int gameSpaceX; - local int gameSpaceY; - local int I; - local int Row; - local int Col; - local Texture crestIcons[4]; - - gameBoxWidth = 128; - gameBoxHeight = 128; - gameSpaceX = 64 + gameBoxWidth; - gameSpaceY = 32 + gameBoxHeight; - StartX = (WinWidth / 2) - ((3 * gameBoxWidth + (2 * 64)) / 2); - StartY = 100; - PlayerHarry = harry(HPConsole(Root.Console).Viewport.Actor); - crestIcons[0] = Texture'GryfCrestTexture'; - crestIcons[1] = Texture'HuffCrestTexture'; - crestIcons[2] = Texture'RaveCrestTexture'; - crestIcons[3] = Texture'SlytCrestTexture'; - lockedTexture = Texture'QuidMatchLockTexture'; - CreateBackPageButton(); - CreateTitleButton(GetLocalFEString("Quidditch_0007")); - // I = 0; - // if ( I < 6 ) - for(I = 0; I < 6; I++) - { - if ( I > 2 ) - { - Row = 1; - Col = I - 3; - } else { - Row = 0; - Col = I; - } - matchLabel[I] = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',StartX + (Col * gameSpaceX),StartY + (Row * gameSpaceY) - 20,gameBoxWidth,30.0)); - matchLabel[I].SetFont(4); - matchLabel[I].TextColor.R = 215; - matchLabel[I].TextColor.G = 100; - matchLabel[I].TextColor.B = 215; - matchLabel[I].Align = 2; - matchLabel[I].bShadowText = True; - myCrests[I] = UWindowButton(CreateControl(Class'UWindowButton',StartX + Col * gameSpaceX,StartY + Row * gameSpaceY + 5,64.0,64.0)); - myCrests[I].Align = 2; - myCrests[I].UpTexture = crestIcons[0]; - myCrests[I].DownTexture = crestIcons[0]; - myCrests[I].OverTexture = crestIcons[0]; - opponentCrests[I] = UWindowButton(CreateControl(Class'UWindowButton',StartX + Col * gameSpaceX + 64,StartY + Row * gameSpaceY + 5,64.0,64.0)); - opponentCrests[I].Align = 2; - opponentCrests[I].UpTexture = crestIcons[1 + (I % 3)]; - opponentCrests[I].DownTexture = crestIcons[1 + (I % 3)]; - opponentCrests[I].OverTexture = crestIcons[1 + (I % 3)]; - startGameButtons[I].SetFont(4); - startGameButtons[I].Align = 2; - startGameButtons[I].bShadowText = True; - startGameButtons[I].ToolTipString = GetLocalFEString("Quidditch_0020") $ " " $ string(I); - startGameButtons[I].UpTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].DownTexture = Texture'QuidMatchBoxTexture'; - startGameButtons[I].OverTexture = Texture'QuidMatchBoxTexture'; - myScores[I] = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',StartX + (Col * gameSpaceX),StartY + (Row * gameSpaceY) + 5 + 64,64.0,20.0)); - myScores[I].SetFont(4); - myScores[I].TextColor.R = 255; - myScores[I].TextColor.G = 255; - myScores[I].TextColor.B = 255; - myScores[I].Align = 2; - myScores[I].bShadowText = True; - myScores[I].SetText(""); - opponentScores[I] = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',StartX + (Col * gameSpaceX) + 64,StartY + (Row * gameSpaceY) + 5 + 64,64.0,20.0)); - opponentScores[I].SetFont(4); - opponentScores[I].TextColor.R = 255; - opponentScores[I].TextColor.G = 255; - opponentScores[I].TextColor.B = 255; - opponentScores[I].Align = 2; - opponentScores[I].bShadowText = True; - opponentScores[I].SetText(""); - myPoints[I] = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',StartX + (Col * gameSpaceX) + 0,StartY + (Row * gameSpaceY) + 100,128.0,20.0)); - myPoints[I].SetFont(4); - myPoints[I].TextColor.R = 255; - myPoints[I].TextColor.G = 255; - myPoints[I].TextColor.B = 255; - myPoints[I].Align = 2; - myPoints[I].bShadowText = True; - myPoints[I].SetText(""); - // I++; - // goto JL00F8; - } - matchLabel[0].SetText(GetLocalFEString("Quidditch_0009")); - matchLabel[1].SetText(GetLocalFEString("Quidditch_0010")); - matchLabel[2].SetText(GetLocalFEString("Quidditch_0011")); - matchLabel[3].SetText(GetLocalFEString("Quidditch_0012")); - matchLabel[4].SetText(GetLocalFEString("Quidditch_0013")); - matchLabel[5].SetText(GetLocalFEString("Quidditch_0014")); - QArmorButton = UWindowButton(CreateControl(Class'UWindowButton',5.0,5.0,64.0,64.0)); - QArmorButton.ToolTipString = GetLocalFEString("Main_Menu_0012"); - QArmorButton.UpTexture = Texture(DynamicLoadObject("HP2_Menu.Icons.HP2QuidditchArmor",Class'Texture')); - QArmorButton.OverTexture = QArmorButton.UpTexture; - QArmorButton.DownTexture = QArmorButton.OverTexture; - QArmorButton.DownSound = None; - NimbusButton = UWindowButton(CreateControl(Class'UWindowButton',570.0,5.0,64.0,64.0)); - NimbusButton.ToolTipString = GetLocalFEString("Main_Menu_0013"); - NimbusButton.UpTexture = Texture(DynamicLoadObject("HP2_Menu.Hud.HP2Nimbus2001",Class'Texture')); - NimbusButton.OverTexture = NimbusButton.UpTexture; - NimbusButton.DownTexture = NimbusButton.OverTexture; - NimbusButton.DownSound = None; - Super.Created(); -} -*/ - -//rewritten this function because the original is broken -AdamJD function Created() { local int startX; @@ -493,7 +220,7 @@ function Created() startX = (WinWidth / 2) - ((3 * gameBoxWidth + (2 * 64)) / 2); startY = 100; - playerHarry=Harry(HPConsole(root.console).Viewport.Actor); + PlayerHarry = harry(HPConsole(Root.Console).Viewport.Actor); CreateBackPageButton(); CreateTitleButton(GetLocalFEString("Quidditch_0007")); @@ -512,7 +239,7 @@ function Created() } matchLabel[i]= UWindowLabelControl(CreateControl(class'UWindowLabelControl',startX + (col * gameSpaceX),startY + (row * gameSpaceY) - 20,gameBoxWidth,30)); - matchLabel[i].setFont(4); + matchLabel[i].SetFont(F_HPMenuLarge); matchLabel[i].TextColor.r= 215; matchLabel[i].TextColor.g= 100; matchLabel[i].TextColor.b= 215; @@ -527,12 +254,12 @@ function Created() opponentCrests[i]= UWindowButton(CreateControl(class'UWindowButton',startX + (col * gameSpaceX) + 64,startY + (row * gameSpaceY) + 5,64,64)); opponentCrests[i].Align=TA_Center; - opponentCrests[i].UpTexture= crestIcons[1+(i%3)]; - opponentCrests[i].DownTexture= crestIcons[1+(i%3)]; - opponentCrests[i].OverTexture= crestIcons[1+(i%3)]; + opponentCrests[i].UpTexture= crestIcons[1 + (i % 3)]; + opponentCrests[i].DownTexture= crestIcons[1 + (i % 3)]; + opponentCrests[i].OverTexture= crestIcons[1 + (i % 3)]; startGameButtons[i]= UWindowButton(CreateControl(class'UWindowButton',startX + (col * gameSpaceX),startY + (row * gameSpaceY),gameBoxWidth,gameBoxHeight)); - startGameButtons[i].setFont(4); + startGameButtons[i].SetFont(F_HPMenuLarge); startGameButtons[i].Align= TA_Center; startGameButtons[i].bShadowText= true; startGameButtons[i].ToolTipString= GetLocalFEString("Quidditch_0020") $ " " $ I; @@ -541,31 +268,31 @@ function Created() startGameButtons[i].OverTexture= Texture 'QuidMatchBoxTexture'; myScores[i]=UWindowLabelControl(CreateControl(class'UWindowLabelControl',startX + (col * gameSpaceX),startY + (row * gameSpaceY) + 5 + 64,64,20)); - myScores[i].setFont(4); + myScores[i].SetFont(F_HPMenuLarge); myScores[i].TextColor.r= 255; myScores[i].TextColor.g= 255; myScores[i].TextColor.b= 255; myScores[i].Align= TA_Center; myScores[i].bShadowText= true; - myScores[i].setText(""); + myScores[i].SetText(""); opponentScores[i]= UWindowLabelControl(CreateControl(class'UWindowLabelControl',startX + (col * gameSpaceX) + 64, startY + (row * gameSpaceY) + 5 + 64,64,20)); - opponentScores[i].setFont(4); + opponentScores[i].SetFont(F_HPMenuLarge); opponentScores[i].TextColor.r= 255; opponentScores[i].TextColor.g= 255; opponentScores[i].TextColor.b= 255; opponentScores[i].Align= TA_Center; opponentScores[i].bShadowText= true; - opponentScores[i].setText(""); + opponentScores[i].SetText(""); - myPoints[i]= UWindowLabelControl(CreateControl(class'UWindowLabelControl',startX + (col * gameSpaceX) + 32,startY + (row * gameSpaceY) + 100,64,20)); - myPoints[i].setFont(4); + myPoints[i]= UWindowLabelControl(CreateControl(class'UWindowLabelControl',startX + (col * gameSpaceX) + 0,startY + (row * gameSpaceY) + 100,128,20)); + myPoints[i].SetFont(F_HPMenuLarge); myPoints[i].TextColor.r= 255; myPoints[i].TextColor.g= 255; myPoints[i].TextColor.b= 255; myPoints[i].Align= TA_Center; myPoints[i].bShadowText= true; - myPoints[i].setText(""); + myPoints[i].SetText(""); } matchLabel[0].SetText(GetLocalFEString("Quidditch_0009")); @@ -620,7 +347,7 @@ function Notify (UWindowDialogControl C, byte E) FEBook(book).DoEscapeFromPage(); } - for(I = 0; I < 6; I++) + for(I = 0; I < ArrayCount(startGameButtons); I++) { if ( startGameButtons[I] == C ) { diff --git a/HGame/Classes/Menu/FESoundBrowser.uc b/HGame/Classes/Menu/FESoundBrowser.uc index 750cd1cc..175d0d03 100644 --- a/HGame/Classes/Menu/FESoundBrowser.uc +++ b/HGame/Classes/Menu/FESoundBrowser.uc @@ -30,7 +30,7 @@ function Paint (Canvas Canvas, float X, float Y) Super.Paint(Canvas,X,Y); TextSize(Canvas,"Language Browser",W,H); - Root.SetPosScaled(Canvas,320.0 - W / 2,0.0); + Root.SetPosScaled(Canvas,320.0 - (W / 2),0.0); Canvas.DrawText("Language Browser"); HPHud(Root.Console.Viewport.Actor.myHUD).managerCutScene.RenderHudItemManager(Canvas,False,True,False); } diff --git a/HGame/Classes/Menu/FESoundVideoPage.uc b/HGame/Classes/Menu/FESoundVideoPage.uc index 00467118..4d92549d 100644 --- a/HGame/Classes/Menu/FESoundVideoPage.uc +++ b/HGame/Classes/Menu/FESoundVideoPage.uc @@ -121,7 +121,8 @@ function Created() local float textOffsetY; LocalizeStrings(); - + MusicVolume = int(float(GetPlayerOwner().ConsoleCommand("get ini:Engine.Engine.AudioDevice MusicVolume")) * 100); + SoundVolume = int(float(GetPlayerOwner().ConsoleCommand("get ini:Engine.Engine.AudioDevice SoundVolume")) * 100); offsetX = 0; offsetY = 0; ctlX = 180 - offsetX; @@ -148,19 +149,19 @@ function Created() labelWidth = 50 + ctlX - labelX; labelHeight = 24; textHeight = 10.0; - textOffsetY = buttonHeight / 2 - textHeight / 2; + textOffsetY = (buttonHeight / 2) - (textHeight / 2); VideoLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY,labelWidth,1.0)); VideoLabel.SetText(videoText); - VideoLabel.SetFont(1); + VideoLabel.SetFont(F_Bold); VideoLabel.TextColor = GoupLabelTextColor; ctlY += 40; I = 0; ResolutionLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY + textOffsetY,labelWidth,labelHeight)); ResolutionLabel.SetText(ResolutionText); - ResolutionLabel.SetFont(1); + ResolutionLabel.SetFont(F_Bold); ResolutionLabel.TextColor = LabelTextColor; ResolutionCombo = HPMenuOptionCombo(CreateControl(Class'HPMenuOptionCombo',fLeftMarginIndent,ctlY,buttonWidth,buttonHeight)); - ResolutionCombo.SetFont(1); + ResolutionCombo.SetFont(F_Bold); ResolutionCombo.SetEditable(False); ResolutionCombo.EditBoxWidth = buttonWidth; ResolutionCombo.TextColor = LabelTextColor; @@ -168,10 +169,10 @@ function Created() ctlY += vertSpacing[I++ ]; ColorDepthLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY + textOffsetY,labelWidth,labelHeight)); ColorDepthLabel.SetText(ColorDepthText); - ColorDepthLabel.SetFont(1); + ColorDepthLabel.SetFont(F_Bold); ColorDepthLabel.TextColor = LabelTextColor; ColorDepthCombo = HPMenuOptionCombo(CreateControl(Class'HPMenuOptionCombo',fLeftMarginIndent,ctlY,buttonWidth,buttonHeight)); - ColorDepthCombo.SetFont(1); + ColorDepthCombo.SetFont(F_Bold); ColorDepthCombo.SetEditable(False); ColorDepthCombo.EditBoxWidth = buttonWidth; ColorDepthCombo.TextColor = LabelTextColor; @@ -179,10 +180,10 @@ function Created() ctlY += vertSpacing[I++ ]; TextureDetailLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY + textOffsetY,labelWidth,labelHeight)); TextureDetailLabel.SetText(TextureDetailText); - TextureDetailLabel.SetFont(1); + TextureDetailLabel.SetFont(F_Bold); TextureDetailLabel.TextColor = LabelTextColor; TextureDetailCombo = HPMenuOptionCombo(CreateControl(Class'HPMenuOptionCombo',fLeftMarginIndent,ctlY,buttonWidth,buttonHeight)); - TextureDetailCombo.SetFont(1); + TextureDetailCombo.SetFont(F_Bold); TextureDetailCombo.SetEditable(False); TextureDetailCombo.EditBoxWidth = buttonWidth; TextureDetailCombo.TextColor = LabelTextColor; @@ -193,7 +194,7 @@ function Created() ctlY += 10 + vertSpacing[I++ ]; ObjectDetailLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY + textOffsetY,labelWidth,labelHeight)); ObjectDetailLabel.SetText(ObjectDetailText); - ObjectDetailLabel.SetFont(1); + ObjectDetailLabel.SetFont(F_Bold); ObjectDetailLabel.TextColor = LabelTextColor; ObjectDetailSlider = HPMenuOptionHSlider(CreateControl(Class'HPMenuOptionHSlider',fLeftMarginIndent,ctlY,SliderWidth,sliderHeight)); ObjectDetailSlider.bNoSlidingNotify = True; @@ -202,16 +203,16 @@ function Created() ctlY += 32; ObjectDetailLoText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMarginIndent,ctlY,labelWidth,labelHeight)); ObjectDetailLoText.SetText(VolumeLoText); - ObjectDetailLoText.SetFont(0); + ObjectDetailLoText.SetFont(F_Normal); ObjectDetailLoText.TextColor = GoupLabelTextColor; - ObjectDetailHiText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMarginIndent + SliderWidth - 20,ctlY,labelWidth,labelHeight)); + ObjectDetailHiText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',(fLeftMarginIndent + SliderWidth) - 20,ctlY,labelWidth,labelHeight)); ObjectDetailHiText.SetText(VolumeHiText); - ObjectDetailHiText.SetFont(0); + ObjectDetailHiText.SetFont(F_Normal); ObjectDetailHiText.TextColor = GoupLabelTextColor; ctlY += vertSpacing[I++ ]; BrightnessLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMargin,ctlY + textOffsetY,labelWidth,labelHeight)); BrightnessLabel.SetText(BrightnessText); - BrightnessLabel.SetFont(1); + BrightnessLabel.SetFont(F_Bold); BrightnessLabel.TextColor = LabelTextColor; BrightnessSlider = HPMenuOptionHSlider(CreateControl(Class'HPMenuOptionHSlider',fLeftMarginIndent,ctlY,SliderWidth,sliderHeight)); BrightnessSlider.bNoSlidingNotify = True; @@ -220,11 +221,11 @@ function Created() ctlY += 32; BrightnessLoText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMarginIndent,ctlY,labelWidth,labelHeight)); BrightnessLoText.SetText(VolumeLoText); - BrightnessLoText.SetFont(0); + BrightnessLoText.SetFont(F_Normal); BrightnessLoText.TextColor = GoupLabelTextColor; - BrightnessHiText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fLeftMarginIndent + SliderWidth - 20,ctlY,labelWidth,labelHeight)); + BrightnessHiText = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',(fLeftMarginIndent + SliderWidth) - 20,ctlY,labelWidth,labelHeight)); BrightnessHiText.SetText(VolumeHiText); - BrightnessHiText.SetFont(0); + BrightnessHiText.SetFont(F_Normal); BrightnessHiText.TextColor = GoupLabelTextColor; ctlY += vertSpacing[I++ ]; ctlY = 90 - offsetY; @@ -232,17 +233,16 @@ function Created() labelX = 470 - offsetX; AudioLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fRightMargin,ctlY,labelWidth,labelHeight)); AudioLabel.SetText(audioText); - AudioLabel.SetFont(1); + AudioLabel.SetFont(F_Bold); AudioLabel.TextColor = GoupLabelTextColor; ctlY += 30; - //UTPT didn't decompile this(added from UEExplorer) -AdamJD + //UTPT didn't decompile the rest of this function (all this is added from UEExplorer) -AdamJD MusicVolumeLabel = UWindowLabelControl(CreateControl(Class'UWindowLabelControl',fRightMargin,ctlY + textOffsetY,labelWidth,labelHeight)); MusicVolumeLabel.SetText( MusicVolumeText $" - " $int(MusicVolumeSlider.Value) ); - MusicVolumeLabel.SetFont(1); + MusicVolumeLabel.SetFont(F_Bold); MusicVolumeLabel.TextColor = LabelTextColor; ctlY += 30; - MusicVolume = int(float(GetPlayerOwner().ConsoleCommand("get ini:Engine.Engine.AudioDevice MusicVolume")) * 100); MusicVolumeSlider = HPMenuOptionHSlider(CreateControl(class'HPMenuOptionHSlider', fRightMargin, ctlY, SliderWidth, sliderHeight)); MusicVolumeSlider.SetRange(0.0, 100.0, 1); MusicVolumeSlider.SliderWidth = SliderWidth; @@ -251,20 +251,19 @@ function Created() ctlY += 32; MusicVolumeLoText = UWindowLabelControl(CreateControl(class'UWindowLabelControl', fRightMargin, ctlY, labelWidth, labelHeight)); MusicVolumeLoText.SetText(VolumeLoText); - MusicVolumeLoText.SetFont(0); + MusicVolumeLoText.SetFont(F_Normal); MusicVolumeLoText.TextColor = GoupLabelTextColor; MusicVolumeHiText = UWindowLabelControl(CreateControl(class'UWindowLabelControl', (fRightMargin + SliderWidth) - 20, ctlY, labelWidth, labelHeight)); MusicVolumeHiText.SetText(VolumeHiText); - MusicVolumeHiText.SetFont(0); + MusicVolumeHiText.SetFont(F_Normal); MusicVolumeHiText.TextColor = GoupLabelTextColor; ctlY += 30; Log("Options::SoundVideoPage: MusicVolume " $ string(MusicVolume)); SoundVolumeLabel = UWindowLabelControl(CreateControl(class'UWindowLabelControl', fRightMargin, ctlY + textOffsetY, labelWidth, labelHeight)); SoundVolumeLabel.SetText( SoundVolumeText $ " - " $int(SoundVolumeSlider.Value) ); - SoundVolumeLabel.SetFont(1); + SoundVolumeLabel.SetFont(F_Bold); SoundVolumeLabel.TextColor = LabelTextColor; - ctlY += 30; - SoundVolume = int(float(GetPlayerOwner().ConsoleCommand("get ini:Engine.Engine.AudioDevice SoundVolume")) * 100); + ctlY += 30; SoundVolumeSlider = HPMenuOptionHSlider(CreateControl(class'HPMenuOptionHSlider', fRightMargin, ctlY, SliderWidth, sliderHeight)); SoundVolumeSlider.SetRange(0.0, 100.0, 1); SoundVolumeSlider.SliderWidth = SliderWidth; @@ -273,11 +272,11 @@ function Created() ctlY += 32; SoundVolumeLoText = UWindowLabelControl(CreateControl(class'UWindowLabelControl', fRightMargin, ctlY, labelWidth, labelHeight)); SoundVolumeLoText.SetText(VolumeLoText); - SoundVolumeLoText.SetFont(0); + SoundVolumeLoText.SetFont(F_Normal); SoundVolumeLoText.TextColor = GoupLabelTextColor; SoundVolumeHiText = UWindowLabelControl(CreateControl(class'UWindowLabelControl', (fRightMargin + SliderWidth) - 20, ctlY, labelWidth, labelHeight)); SoundVolumeHiText.SetText(VolumeHiText); - SoundVolumeHiText.SetFont(0); + SoundVolumeHiText.SetFont(F_Normal); SoundVolumeHiText.TextColor = GoupLabelTextColor; ctlY += 38; Log("Options::SoundVideoPage: MusicVolume " $ string(SoundVolume)); @@ -309,12 +308,12 @@ function bool IsSupportedResolution (string TempStr) { return True; } - } else { + } else //{ if ( (TempStr ~= "640x480") || (TempStr ~= "800x600") || (TempStr ~= "1024x768") ) { return True; } - } + //} } return False; } @@ -528,12 +527,12 @@ function ObjectDetailChanged() break; default: } - GetPlayerOwner().ConsoleCommand("set ini:HGame.Harry ObjectDetail " $ string(GetPlayerOwner().ObjectDetail)); + GetPlayerOwner().ConsoleCommand("set ini:HGame.harry ObjectDetail " $ string(GetPlayerOwner().ObjectDetail)); } function MusicVolumeChanged() { - //UTPT didn't decompile this(added from UEExplorer) -AdamJD + //UTPT didn't decompile this (added from UEExplorer) -AdamJD MusicVolumeLabel.SetText( MusicVolumeText $" - " $int(MusicVolumeSlider.Value) ); GetPlayerOwner().ConsoleCommand("SETVOLUMES MUSIC=" $(MusicVolumeSlider.Value / 100)); GetPlayerOwner().ConsoleCommand("set ini:Engine.Engine.AudioDevice MusicVolume "$(MusicVolumeSlider.Value / 100)); @@ -541,7 +540,7 @@ function MusicVolumeChanged() function SoundVolumeChanged() { - //UTPT didn't decompile this(added from UEExplorer) -AdamJD + //UTPT didn't decompile this (added from UEExplorer) -AdamJD SoundVolumeLabel.SetText( SoundVolumeText $" - " $int(SoundVolumeSlider.Value) ); GetPlayerOwner().ConsoleCommand("SETVOLUMES SOUND=" $(SoundVolumeSlider.Value / 100)); GetPlayerOwner().ConsoleCommand("set ini:Engine.Engine.AudioDevice SoundVolume "$(SoundVolumeSlider.Value / 100)); @@ -588,7 +587,6 @@ function Notify (UWindowDialogControl C, byte E) } break; default: - break; } } diff --git a/HGame/Classes/Menu/HPMenuOptionCheckBox.uc b/HGame/Classes/Menu/HPMenuOptionCheckBox.uc index b2744255..767e8905 100644 --- a/HGame/Classes/Menu/HPMenuOptionCheckBox.uc +++ b/HGame/Classes/Menu/HPMenuOptionCheckBox.uc @@ -5,10 +5,10 @@ class HPMenuOptionCheckBox extends UWindowCheckbox; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FEOptionTickCheckedTex.PNG GROUP=Icons Name=FEOptionTickCheckedTex COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOptionTickCheckedOverTex.PNG GROUP=Icons Name=FEOptionTickCheckedOverTex COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOptionTickUncheckedTex.PNG GROUP=Icons Name=FEOptionTickUncheckedTex COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOptionTickUncheckedOverTex.PNG GROUP=Icons Name=FEOptionTickUncheckedOverTex COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FEOptionTickCheckedTex.PNG GROUP=Icons Name=FEOptionTickCheckedTex COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOptionTickCheckedOverTex.PNG GROUP=Icons Name=FEOptionTickCheckedOverTex COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOptionTickUncheckedTex.PNG GROUP=Icons Name=FEOptionTickUncheckedTex COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOptionTickUncheckedOverTex.PNG GROUP=Icons Name=FEOptionTickUncheckedOverTex COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 //texture vars for importing -AdamJD var Texture TBoxChecked; diff --git a/HGame/Classes/Menu/HPMenuOptionCombo.uc b/HGame/Classes/Menu/HPMenuOptionCombo.uc index 84a00748..62201508 100644 --- a/HGame/Classes/Menu/HPMenuOptionCombo.uc +++ b/HGame/Classes/Menu/HPMenuOptionCombo.uc @@ -5,8 +5,8 @@ class HPMenuOptionCombo extends UWindowComboControl; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FEComboIdleTexture.PNG GROUP=Icons Name=FEComboIdleTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEComboOverTexture.PNG GROUP=Icons Name=FEComboOverTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboIdleTexture.PNG GROUP=Icons Name=FEComboIdleTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboOverTexture.PNG GROUP=Icons Name=FEComboOverTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var Texture IdleTexture; var Texture OverTexture; @@ -63,14 +63,14 @@ function Paint (Canvas C, float X, float Y) if ( bListVisible ) { DrawClippedTexture(C,WinWidth - EditBoxWidth,1.0,OverTexture); - } else //{ + } else { if ( MouseIsOver() || EditBox.MouseIsOver() || Button.MouseIsOver() ) { DrawClippedTexture(C,WinWidth - EditBoxWidth,1.0,OverTexture); } else { DrawClippedTexture(C,WinWidth - EditBoxWidth,1.0,IdleTexture); } - //} + } } function CloseUpWithNoSound() diff --git a/HGame/Classes/Menu/HPMenuOptionComboList.uc b/HGame/Classes/Menu/HPMenuOptionComboList.uc index b1887c2a..4e3c14e0 100644 --- a/HGame/Classes/Menu/HPMenuOptionComboList.uc +++ b/HGame/Classes/Menu/HPMenuOptionComboList.uc @@ -5,9 +5,9 @@ class HPMenuOptionComboList extends UWindowComboList; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FEComboListBox.PNG GROUP=Icons Name=FEComboListBox COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEComboListLarge.PNG GROUP=Icons Name=FEComboListLarge COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEComboListSmall.PNG GROUP=Icons Name=FEComboListSmall COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboListBox.PNG GROUP=Icons Name=FEComboListBox COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboListLarge.PNG GROUP=Icons Name=FEComboListLarge COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEComboListSmall.PNG GROUP=Icons Name=FEComboListSmall COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var Texture bgImage; @@ -33,7 +33,7 @@ function BeforePaint (Canvas C, float X, float Y) local float ListY; local float ExtraWidth; - C.Font = Root.Fonts[0]; + C.Font = Root.Fonts[F_Normal]; C.SetPos(0.0,0.0); MaxWidth = 187.0; ExtraWidth = (HBorder + TextBorder) * 2; @@ -47,16 +47,14 @@ function BeforePaint (Canvas C, float X, float Y) bgImage = CListSmall; //Texture'FEComboListSmall'; } ItemHeight = (WinHeight - 7) / Count; - I = UWindowComboListItem(Items.Next); - // if ( I != None ) - while (I != None) + VertSB.Pos = 0; + for( I = UWindowComboListItem(Items.Next); I != None; I = UWindowComboListItem(I.Next) ) { TextSize(C,RemoveAmpersand(I.Value),W,H); if ( W + ExtraWidth > MaxWidth ) { MaxWidth = W + ExtraWidth; } - I = UWindowComboListItem(I.Next); // goto JL00F0; } WinWidth = MaxWidth; diff --git a/HGame/Classes/Menu/HPMenuOptionEditBox.uc b/HGame/Classes/Menu/HPMenuOptionEditBox.uc index ed5e5a9e..8f213ea9 100644 --- a/HGame/Classes/Menu/HPMenuOptionEditBox.uc +++ b/HGame/Classes/Menu/HPMenuOptionEditBox.uc @@ -13,10 +13,11 @@ function Paint (Canvas C, float X, float Y) local float W; local float H; //local float TextY; + local float fTextY; C.Font = Root.Fonts[Font]; TextSize(C,"A",W,H); - TextY = (WinHeight - H) / 2; + fTextY = (WinHeight - H) / 2; TextSize(C,Left(Value,CaretOffset),W,H); C.DrawColor.R = 255; C.DrawColor.G = 255; @@ -27,7 +28,7 @@ function Paint (Canvas C, float X, float Y) } if ( W + Offset > WinWidth - 2 ) { - Offset = WinWidth - 2 - W; + Offset = (WinWidth - 2) - W; if ( Offset > 0 ) { Offset = 0.0; @@ -36,26 +37,26 @@ function Paint (Canvas C, float X, float Y) C.DrawColor = TextColor; if ( bAllSelected ) { - DrawStretchedTexture(C,Offset + 1,TextY,W,H,Texture'WhiteTexture'); + DrawStretchedTexture(C,Offset + 1,fTextY,W,H,Texture'WhiteTexture'); C.DrawColor.R = 255 ^ C.DrawColor.R; C.DrawColor.G = 255 ^ C.DrawColor.G; C.DrawColor.B = 255 ^ C.DrawColor.B; } ClippingRegion.H += 5; - ClipText(C,Offset + 11,TextY,Value); + ClipText(C,Offset + 11,fTextY,Value); if ( !bHasKeyboardFocus || !bCanEdit ) { bShowCaret = False; - } else //{ + } else { if ( (GetLevel().TimeSeconds > LastDrawTime + 0.31) || (GetLevel().TimeSeconds < LastDrawTime) ) { LastDrawTime = GetLevel().TimeSeconds; bShowCaret = !bShowCaret; } - //} + } if ( bShowCaret ) { - ClipText(C,Offset + W - 1,TextY,"|"); + ClipText(C,Offset + W - 1,fTextY,"|"); } } diff --git a/HGame/Classes/Menu/HPMenuOptionHSlider.uc b/HGame/Classes/Menu/HPMenuOptionHSlider.uc index 15c68ef1..59dc9588 100644 --- a/HGame/Classes/Menu/HPMenuOptionHSlider.uc +++ b/HGame/Classes/Menu/HPMenuOptionHSlider.uc @@ -5,9 +5,9 @@ class HPMenuOptionHSlider extends UWindowHSliderControl; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\FESliderTexture.PNG GROUP=Icons Name=FESliderTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FEOverSliderTexture.PNG GROUP=Icons Name=FEOverSliderTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\FESliderKnobTexture.PNG GROUP=Icons Name=FESliderKnobTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\FESliderTexture.PNG GROUP=Icons Name=FESliderTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FEOverSliderTexture.PNG GROUP=Icons Name=FEOverSliderTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\FESliderKnobTexture.PNG GROUP=Icons Name=FESliderKnobTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var Texture Image; var Texture overImage; @@ -38,11 +38,11 @@ function BeforePaint (Canvas C, float X, float Y) local float H; TextSize(C,Text,W,H); - SliderDrawX = fSliderOffsetX + WinWidth - SliderWidth; + SliderDrawX = fSliderOffsetX + (WinWidth - SliderWidth); TextX = SliderDrawX - W - 23; SliderDrawY = (WinHeight - 2) / 2; TextY = (WinHeight - H) / 2; - TrackStart = SliderDrawX + (SliderWidth - TrackWidth) * (Value - MinValue) / (MaxValue - MinValue); + TrackStart = SliderDrawX + (SliderWidth - TrackWidth) * ((Value - MinValue) / (MaxValue - MinValue)); } function Paint (Canvas C, float X, float Y) diff --git a/HGame/Classes/Menu/baseSpellPage.uc b/HGame/Classes/Menu/baseSpellPage.uc index 1b65bd8e..a144c558 100644 --- a/HGame/Classes/Menu/baseSpellPage.uc +++ b/HGame/Classes/Menu/baseSpellPage.uc @@ -18,12 +18,12 @@ function Draw (Canvas Canvas) Canvas.DrawIcon(pagePieces[1],1.0); if ( pagePieces[2] != None ) { - Canvas.SetPos(Canvas.SizeX / 2 - (Width / 2),Canvas.SizeY - (yOffset + 256)); + Canvas.SetPos(Canvas.SizeX / 2 - (Width / 2),(Canvas.SizeY - yOffset) + 256); Canvas.DrawIcon(pagePieces[2],1.0); } if ( pagePieces[3] != None ) { - Canvas.SetPos(Canvas.SizeX / 2 - (Width / 2) + 256,Canvas.SizeY - (yOffset + 256)); + Canvas.SetPos(Canvas.SizeX / 2 - (Width / 2) + 256,(Canvas.SizeY - yOffset) + 256); Canvas.DrawIcon(pagePieces[3],1.0); } } diff --git a/HGame/Classes/Misc/Adv1TutManager.uc b/HGame/Classes/Misc/Adv1TutManager.uc index b0b8d601..7d2855bb 100644 --- a/HGame/Classes/Misc/Adv1TutManager.uc +++ b/HGame/Classes/Misc/Adv1TutManager.uc @@ -62,14 +62,12 @@ begin: do { - if ( Normal(Ron.Location - PlayerHarry.Cam.Location) Dot vector(PlayerHarry.Cam.Rotation) > Cos(LookAtRonConeAngle * 2 * 3.14159989 / 360) ) + if ( (Normal(Ron.Location - PlayerHarry.Cam.Location) Dot vector(PlayerHarry.Cam.Rotation)) > Cos(LookAtRonConeAngle * 2 * 3.14159989 / 360) ) { PlayerHarry.ClientMessage("**** See Ron"); break; - } //else { - Sleep(0.1); - //if (! False ) goto JL0000; - //} + } + Sleep(0.1); } until(false); diff --git a/HGame/Classes/Misc/AragogStickyWeb.uc b/HGame/Classes/Misc/AragogStickyWeb.uc index 1a5de9a4..2ac2a2a4 100644 --- a/HGame/Classes/Misc/AragogStickyWeb.uc +++ b/HGame/Classes/Misc/AragogStickyWeb.uc @@ -173,7 +173,7 @@ state DoneGrowing { Super.Tick(fTimeDelta); DamageTime -= fTimeDelta; - DamageTime -= fTimeDelta; + DamageTime -= fTimeDelta; if ( DamageTime <= 0 ) { if ( (aSlimedHPawn != None) && aSlimedHPawn.IsA('harry') ) @@ -222,7 +222,7 @@ state() stateHiding harry(aSlimedHPawn).WebAnimRefCountSub(); } aSlimedHPawn = None; - fShrinkTime *= RandRange(0.81,1.25); + fShrinkTime *= RandRange(0.81,1.20); PlaySound(ShrinkSound,SLOT_None,0.25); } @@ -231,7 +231,7 @@ state() stateHiding if ( bHidden == False ) { fTimeSpent += fTimeDelta; - DrawScale = grownDrawScale - fTimeSpent / fShrinkTime; + DrawScale = grownDrawScale - (fTimeSpent / fShrinkTime); if ( DrawScale <= 0.0 ) { DrawScale = 0.0; diff --git a/HGame/Classes/Misc/Basilisk2.uc b/HGame/Classes/Misc/Basilisk2.uc index b6e5ebdb..ec71378b 100644 --- a/HGame/Classes/Misc/Basilisk2.uc +++ b/HGame/Classes/Misc/Basilisk2.uc @@ -402,7 +402,7 @@ function PlayLungeAnim() local int I; local int W; - W = (HeadAttackFarthest - HeadAttackNearest) / (6 - 1); + W = (HeadAttackFarthest - HeadAttackNearest) / (HeadAttackCount - 1); I = ( VSize2D(PlayerHarry.Location - Location) - HeadAttackNearest + W / 2 ) / W; I = Clamp( I, 0, HeadAttackCount - 1 ); PlayAnim(HeadAttackAnimName[I],1.0,0.2); diff --git a/HGame/Classes/Misc/BasiliskSpell.uc b/HGame/Classes/Misc/BasiliskSpell.uc index 9de64226..98c04b41 100644 --- a/HGame/Classes/Misc/BasiliskSpell.uc +++ b/HGame/Classes/Misc/BasiliskSpell.uc @@ -74,7 +74,7 @@ function RepositionSpellFXs() // Count = 0; // if ( Count < 12 ) - for(Count = 0; Count < 12; Count++) + for(Count = 0; Count < NUM_SPELL_FX; Count++) { if ( SpellFX[Count] == None ) { @@ -134,7 +134,7 @@ event Destroyed() Super.Destroyed(); // Count = 0; // if ( Count < 12 ) - for(Count = 0; Count < 12; Count++) + for(Count = 0; Count < NUM_SPELL_FX; Count++) { if ( SpellFX[Count] != None ) { diff --git a/HGame/Classes/Misc/CauldronMixing.uc b/HGame/Classes/Misc/CauldronMixing.uc index 12eefc46..785acde4 100644 --- a/HGame/Classes/Misc/CauldronMixing.uc +++ b/HGame/Classes/Misc/CauldronMixing.uc @@ -57,7 +57,7 @@ event Bump (Actor Other) local int nGameState; nGameState = PlayerHarry.ConvertGameStateToNumber(); - if ( nGameState < 40 ) + if ( nGameState < nPOTIONS_AVAILABLE_STATE ) { GotoState('CauldronsNotAvailableYet'); } else //{ @@ -110,7 +110,7 @@ function SetCauldronFX (ECauldronFX FX) killAttachedParticleFX(0.0); vOffset.X = 0.0; vOffset.Y = 0.0; - vOffset.Z = 25.0; + vOffset.Z = TOP_OF_CAULDRON_OFFSET; attachedParticleOffset[0] = vOffset; switch (FX) { @@ -155,7 +155,7 @@ state CauldronsNotAvailableYet ignores Bump; function CutCue (string cue) { - if ( cue ~= "_MixingCauldronsNotAvailableYet" ) + if ( cue ~= strCUE_CAULDRON_NOT_AVAIL_LINE ) { GotoState('Idle'); } @@ -175,10 +175,10 @@ ignores Bump; strDialogID = "Shared_Menu_0010"; } strDialog = Localize("All",strDialogID,"HPMenu"); - fSoundLen = Len(strDialog) * 0.01 + 3.0; + fSoundLen = (Len(strDialog) * 0.01) + 3.0; tcue = Spawn(Class'TimedCue'); tcue.CutNotifyActor = self; - tcue.SetupTimer(fSoundLen + 0.5,"_MixingCauldronsNotAvailableYet"); + tcue.SetupTimer(fSoundLen + 0.5,strCUE_CAULDRON_NOT_AVAIL_LINE); harry(Level.PlayerHarryActor).myHUD.SetSubtitleText(strDialog,fSoundLen); } diff --git a/HGame/Classes/Misc/CreatureGenerator.uc b/HGame/Classes/Misc/CreatureGenerator.uc index 28faa39e..ca743a2a 100644 --- a/HGame/Classes/Misc/CreatureGenerator.uc +++ b/HGame/Classes/Misc/CreatureGenerator.uc @@ -55,8 +55,7 @@ function PostBeginPlay() } } HowManyBaseCreatures = 0; - - for(I = 0; I < 16; I++) + for(I = 0; I < NUM_BASE_CHARS; I++) { if ( BaseCreatureToSpawn[I] == None ) { @@ -221,7 +220,7 @@ function GenerateCreature() } } } - A = Spawn(BaseCreatureToSpawn[I],,,FirstPP.Location,rotator(FirstPP.NextPatrolPoint.Location - FirstPP.Location)); + A = Spawn(BaseCreatureToSpawn[I],,,[SpawnLocation]FirstPP.Location,[SpawnRotation]rotator(FirstPP.NextPatrolPoint.Location - FirstPP.Location)); A.DesiredRotation = A.Rotation; if ( A == None ) { diff --git a/HGame/Classes/Misc/Debris.uc b/HGame/Classes/Misc/Debris.uc index fe2e62a5..637a7064 100644 --- a/HGame/Classes/Misc/Debris.uc +++ b/HGame/Classes/Misc/Debris.uc @@ -43,8 +43,8 @@ auto state isFalling { local ParticleFX p; - SetRotation(Rotation + RandSpin * DeltaTime * 3); - Velocity.Z -= DeltaTime * 1000; + SetRotation(Rotation + (RandSpin * DeltaTime * 3)); + Velocity.Z -= (DeltaTime * 1000); MaxLiveTime -= DeltaTime; if ( MaxLiveTime < 0 ) { diff --git a/HGame/Classes/Misc/DebrisGenerator.uc b/HGame/Classes/Misc/DebrisGenerator.uc index 47e9ba0c..b7093fe6 100644 --- a/HGame/Classes/Misc/DebrisGenerator.uc +++ b/HGame/Classes/Misc/DebrisGenerator.uc @@ -36,7 +36,7 @@ function PostBeginPlay() ScaleDown = 1.0; NumMeshs = 0; - for(I = 0; I < 8; I++) + for(I = 0; I < NUM_ENTRIES; I++) { if ( BaseDebris[I].aMesh == None ) { @@ -45,15 +45,15 @@ function PostBeginPlay() } } - for(I = 0; I < 8; I++) + for(I = 0; I < NUM_ENTRIES; I++) { if ( BaseDebris[I].Velocity == 0 ) { - BaseDebris[I].Velocity = 250; + BaseDebris[I].Velocity = DEFAULT_VELOCITY; } } - for(I = 0; I < 8; I++) + for(I = 0; I < NUM_ENTRIES; I++) { if ( BaseDebris[I].DrawScale == 0 ) { diff --git a/HGame/Classes/Misc/FOVController.uc b/HGame/Classes/Misc/FOVController.uc index f583dcd2..30a1e233 100644 --- a/HGame/Classes/Misc/FOVController.uc +++ b/HGame/Classes/Misc/FOVController.uc @@ -21,9 +21,9 @@ function float EaseTo (float t) { return 0.0; } else //{ - if ( t < 1 - 0.29289323 ) + if ( t < 1 - EaseFromX ) { - return 1.1715734 * t + 0; + return EaseFromM * t + 0; } else //{ if ( t < 1.0 ) { diff --git a/HGame/Classes/Misc/FadeActorController.uc b/HGame/Classes/Misc/FadeActorController.uc index 27d86a6a..08ae76cb 100644 --- a/HGame/Classes/Misc/FadeActorController.uc +++ b/HGame/Classes/Misc/FadeActorController.uc @@ -48,7 +48,7 @@ event Tick (float fTimeDelta) TimeCur += fTimeDelta; if ( TimeCur < TimeEnd ) { - FadingActor.Opacity += (FadeEnd - FadeStart) * fTimeDelta / TimeEnd; + FadingActor.Opacity += (FadeEnd - FadeStart) * (fTimeDelta / TimeEnd); } else { Finish(); } diff --git a/HGame/Classes/Misc/FlyingCarHarry.uc b/HGame/Classes/Misc/FlyingCarHarry.uc index 54f03b79..6da9bf61 100644 --- a/HGame/Classes/Misc/FlyingCarHarry.uc +++ b/HGame/Classes/Misc/FlyingCarHarry.uc @@ -183,7 +183,7 @@ state PlayerWalking NewRotation = Rotation; fPitchLimitHi = PitchLimitUp * (16384 / 90.0); - fPitchLimitLo = 65536.0 - (PitchLimitDown * 16384 / 90.0); + fPitchLimitLo = 65536.0 - (PitchLimitDown * (16384 / 90.0)); if ( False ) { if ( fMousePitch > 0.151 ) @@ -330,7 +330,7 @@ state PlayerWalking vCurrentTetherDistance.Z = upDistance; vCurrentTetherDistance += vTurbulence; SetLocation(guide.Location + vCurrentTetherDistance); - NewRotation.Pitch += pitchAmount * fPitchControl; + NewRotation.Pitch += (pitchAmount * fPitchControl); guideRotation = guide.Rotation; guideRotation.Yaw += CarYawVal; guideRotation.Yaw += fLightningYaw; @@ -372,7 +372,7 @@ state PlayerWalking { return; } else { - fWallAvoidanceRate = 1.0 - Abs(HitNormal.Z) / 0.9851; + fWallAvoidanceRate = 1.0 - (Abs(HitNormal.Z) / 0.9851); } Up.X = 0.0; Up.Y = 0.0; @@ -389,13 +389,13 @@ state PlayerWalking } if ( bTurnToRight ) { - WallAvoidanceYaw = WallFaceRot.Yaw + 1000 - (Rotation.Yaw & 65535); + WallAvoidanceYaw = (WallFaceRot.Yaw + 1000 - Rotation.Yaw) & 65535; if ( WallAvoidanceYaw > 24576 ) { WallAvoidanceYaw = 24576; } } else { - WallAvoidanceYaw = WallFaceRot.Yaw + 32768 - (1000 - Rotation.Yaw & 65535); + WallAvoidanceYaw = (WallFaceRot.Yaw + 32768 - 1000 - Rotation.Yaw) & 65535; if ( WallAvoidanceYaw < 40960 ) { WallAvoidanceYaw = 40960; diff --git a/HGame/Classes/Misc/GenericSpawner.uc b/HGame/Classes/Misc/GenericSpawner.uc index 066cc143..3631a380 100644 --- a/HGame/Classes/Misc/GenericSpawner.uc +++ b/HGame/Classes/Misc/GenericSpawner.uc @@ -103,7 +103,7 @@ begin: if ( BaseParticles != None ) { FindBaseParticlePos(); - Spawn(BaseParticles,,,BaseParticlePos); + Spawn(BaseParticles,,,[SpawnLocation]BaseParticlePos); } if ( Limits.Min >= Limits.Max ) { @@ -120,13 +120,11 @@ begin: Sleep(GoodieDelay); SpawnObject(-1); // CurrentNum++; - // goto JL00E6; } } else { // CurrentNum = 0; -// JL00E6: // if ( CurrentNum < 8 ) - for(CurrentNum = 0; CurrentNum < 8; CurrentNum++) + for(CurrentNum = 0; CurrentNum < MAX_SPAWNED_GOODIES; CurrentNum++) { // CurrentNum1 = 0; // if ( CurrentNum1 < GoodiesNumber[CurrentNum] ) @@ -135,13 +133,10 @@ begin: Sleep(GoodieDelay); SpawnObject(CurrentNum); // CurrentNum1++; - // goto JL012F; } // CurrentNum++; - // goto JL011C; } } - // } if ( Snds.Spawning != None ) { PlaySound(Snds.Spawning,SLOT_Misc); @@ -182,7 +177,7 @@ function PostBeginPlay() } HowManyObjectsToSpawn = 0; - for(I = 0; I < 8; I++) + for(I = 0; I < MAX_SPAWNED_GOODIES; I++) { if ( GoodieToSpawn[I] == None ) { @@ -196,7 +191,7 @@ function PostBeginPlay() } bSpawnExactNumbers = False; - for(I = 0; I < 8; I++) + for(I = 0; I < MAX_SPAWNED_GOODIES; I++) { if ( GoodiesNumber[I] != 0 ) { @@ -257,7 +252,7 @@ function SpawnObject (int Index) // goto JL00CA; break; } - if ( V Dot N / VSize2D(N) > 0.69999999 ) + if ( (V Dot N) / VSize2D(N) > 0.69999999 ) { // goto JL00CA; break; @@ -282,9 +277,9 @@ function SpawnObject (int Index) Dir = Dir + Location; if ( Index < 0 ) { - newSpawn = Spawn(GoodieToSpawn[Rand(HowManyObjectsToSpawn)],,,Dir); + newSpawn = Spawn(GoodieToSpawn[Rand(HowManyObjectsToSpawn)],,,[SpawnLocation]Dir); } else { - newSpawn = Spawn(GoodieToSpawn[Index],,,Dir); + newSpawn = Spawn(GoodieToSpawn[Index],,,[SpawnLocation]Dir); } if ( (StartVel.X == 0) && (StartVel.Y == 0) && (StartVel.Z == 0) ) { @@ -296,13 +291,13 @@ function SpawnObject (int Index) switch (Rand(3)) { case 0: - Spawn(Class'Spawn_flash_1',,,Dir); + Spawn(Class'Spawn_flash_1',,,[SpawnLocation]Dir); break; case 1: - Spawn(Class'Spawn_flash_2',,,Dir); + Spawn(Class'Spawn_flash_2',,,[SpawnLocation]Dir); break; case 2: - Spawn(Class'Spawn_flash_3',,,Dir); + Spawn(Class'Spawn_flash_3',,,[SpawnLocation]Dir); break; default: } diff --git a/HGame/Classes/Misc/LumosLight.uc b/HGame/Classes/Misc/LumosLight.uc index 8360ffbb..ee2f8dd7 100644 --- a/HGame/Classes/Misc/LumosLight.uc +++ b/HGame/Classes/Misc/LumosLight.uc @@ -88,7 +88,7 @@ function Tick (float fTimeDelta) fLumosTime += fTimeDelta; if ( bInfiniteLumos ) { - ScaleParticles(0.75 - 0.5 * Abs(Sin(fLumosTime * 0.25))); + ScaleParticles(0.75 - (0.5 * Abs(Sin(fLumosTime * 0.25)))); return; } else //{ if ( fLumosTime > fLumosTimeToTurnOff ) @@ -131,7 +131,7 @@ function TurnOn() { Particles.Destroy(); } - Particles = Spawn(Class'LumosLightFX',self,,Location); + Particles = Spawn(Class'LumosLightFX',[SpawnOwner]self,,[SpawnLocation]Location); if ( Particles == None ) { PlayerHarry.ClientMessage("ERROR!!! Particles could not be spawned!!!!!"); diff --git a/HGame/Classes/Misc/MagicStrengthManager.uc b/HGame/Classes/Misc/MagicStrengthManager.uc index 33a450ec..e524a19b 100644 --- a/HGame/Classes/Misc/MagicStrengthManager.uc +++ b/HGame/Classes/Misc/MagicStrengthManager.uc @@ -45,9 +45,9 @@ event Tick (float fDelta) event PostBeginPlay() { Super.PostBeginPlay(); - textureSlider = Texture(DynamicLoadObject("HP_Menu.Hud.MagicStrengthSlider",Class'Texture')); - textureBarEmpty = Texture(DynamicLoadObject("HP_Menu.Hud.MagicStrengthEmpty",Class'Texture')); - textureBarFull = Texture(DynamicLoadObject("HP_Menu.Hud.MagicStrengthFull",Class'Texture')); + textureSlider = Texture(DynamicLoadObject(strSLIDER,Class'Texture')); + textureBarEmpty = Texture(DynamicLoadObject(strBAR_EMPTY,Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_FULL,Class'Texture')); } function StartMagicStrength() @@ -64,7 +64,7 @@ function EndMagicStrength() function UseUpStrength (int nPercent) { - fRemainingStrength -= 120 * (nPercent / 100.0); + fRemainingStrength -= (fTOTAL_STRENGTH * (float(nPercent) / 100.0)); PlayerHarry.ClientMessage("remaining strength " $ string(fRemainingStrength)); if ( fRemainingStrength < 0 ) { @@ -92,13 +92,13 @@ state DisplayStrength EndMagicStrength(); } fTimeSinceLastRecover += fDelta; - if ( fTimeSinceLastRecover >= 0.1 ) + if ( fTimeSinceLastRecover >= fRECOVER_RATE ) { fTimeSinceLastRecover = 0.0; - fRemainingStrength += 1 + (fTimeSinceLastRecover - 0.1); - if ( fRemainingStrength > 120 ) + fRemainingStrength += (1 + fTimeSinceLastRecover - fRECOVER_RATE); + if ( fRemainingStrength > fTOTAL_STRENGTH ) { - fRemainingStrength = 120.0; + fRemainingStrength = fTOTAL_STRENGTH; } } } @@ -113,22 +113,22 @@ state DisplayStrength local float fBarEmptyH; fScaleFactor = GetScaleFactor(Canvas); - fBarScaledX = 25.0 * fScaleFactor; - fBarScaledY = 25.0 * fScaleFactor; + fBarScaledX = fBAR_X * fScaleFactor; + fBarScaledY = fBAR_Y * fScaleFactor; Canvas.SetPos(fBarScaledX,fBarScaledY); Canvas.DrawIcon(textureBarFull,fScaleFactor); - fBarEmptyH = 120.0 - fRemainingStrength; + fBarEmptyH = fTOTAL_STRENGTH - fRemainingStrength; Canvas.SetPos(fBarScaledX,fBarScaledY); Canvas.DrawTile(textureBarEmpty,textureBarEmpty.USize * fScaleFactor,fBarEmptyH * fScaleFactor,0.0,0.0,textureBarEmpty.USize,fBarEmptyH); - fSliderX = fBarScaledX - (128 - 36.0 / 2) * fScaleFactor; - fSliderY = (25.0 + fBarEmptyH - 66) * fScaleFactor; + fSliderX = fBarScaledX - (((fSLIDER_W - fBAR_W) / 2) * fScaleFactor); + fSliderY = (fBAR_Y + fBarEmptyH - fSLIDER_POINTER_YOFFSET) * fScaleFactor; Canvas.SetPos(fSliderX,fSliderY); Canvas.DrawIcon(textureSlider,fScaleFactor); } event BeginState() { - fRemainingStrength = 120.0; + fRemainingStrength = fTOTAL_STRENGTH; } } diff --git a/HGame/Classes/Misc/MuggleMeterManager.uc b/HGame/Classes/Misc/MuggleMeterManager.uc index 91e77d98..98638dae 100644 --- a/HGame/Classes/Misc/MuggleMeterManager.uc +++ b/HGame/Classes/Misc/MuggleMeterManager.uc @@ -54,12 +54,12 @@ event Tick (float fDelta) event PostBeginPlay() { Super.PostBeginPlay(); - textureEye1 = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleEye1",Class'Texture')); - textureEye2 = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleEye2",Class'Texture')); - textureEye3 = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleEye3",Class'Texture')); - textureEye4 = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleEye4",Class'Texture')); - textureBarEmpty = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleBarEmpty",Class'Texture')); - textureBarFull = Texture(DynamicLoadObject("HP_Menu.Hud.MuggleBarFull",Class'Texture')); + textureEye1 = Texture(DynamicLoadObject(strEYE1,Class'Texture')); + textureEye2 = Texture(DynamicLoadObject(strEYE2,Class'Texture')); + textureEye3 = Texture(DynamicLoadObject(strEYE3,Class'Texture')); + textureEye4 = Texture(DynamicLoadObject(strEYE4,Class'Texture')); + textureBarEmpty = Texture(DynamicLoadObject(strBAR_EMPTY,Class'Texture')); + textureBarFull = Texture(DynamicLoadObject(strBAR_FULL,Class'Texture')); } function BeginDetection() @@ -99,7 +99,7 @@ state DetectMuggles return; } fTimeSinceLastUpdate += fDelta; - if ( fTimeSinceLastUpdate < 0.1 ) + if ( fTimeSinceLastUpdate < fUPDATE_RATE ) { return; } @@ -109,12 +109,12 @@ state DetectMuggles { fBarFullAmount = 0.0; } - if ( fBarFullAmount >= 128.0 ) + if ( fBarFullAmount >= fBAR_H ) { TriggerEvent(Event,None,None); EndDetection(); } else { - fPercentFull = fBarFullAmount / 128.0; + fPercentFull = fBarFullAmount / fBAR_H; if ( fPercentFull < 0.25 ) { textureCurrEye = textureEye1; @@ -147,22 +147,22 @@ state DetectMuggles local float fBottomOfBar; fScaleFactor = GetScaleFactor(Canvas); - fBarEmptyX = 25.0 * fScaleFactor; - fBarEmptyY = 25.0 * fScaleFactor; + fBarEmptyX = fMETER_X * fScaleFactor; + fBarEmptyY = fMETER_Y * fScaleFactor; Canvas.SetPos(fBarEmptyX,fBarEmptyY); Canvas.DrawIcon(textureBarEmpty,fScaleFactor); - fBottomOfBar = fBarEmptyY + 128.0 * fScaleFactor; - fBarFullH = fBarFullAmount + 14.0; - if ( fBarFullH >= 128.0 ) + fBottomOfBar = fBarEmptyY + (fBAR_H * fScaleFactor); + fBarFullH = fBarFullAmount + fBAR_FULL_EXTRA; + if ( fBarFullH >= fBAR_H ) { Canvas.SetPos(fBarEmptyX,fBarEmptyY); Canvas.DrawIcon(textureBarFull,fScaleFactor); } else { Canvas.SetPos(fBarEmptyX,fBottomOfBar - fBarFullH * fScaleFactor); - Canvas.DrawTile(textureBarFull,textureBarFull.USize * fScaleFactor,fBarFullH * fScaleFactor,0.0,128.0 - fBarFullH,textureBarFull.USize,fBarFullH); + Canvas.DrawTile(textureBarFull,textureBarFull.USize * fScaleFactor,fBarFullH * fScaleFactor,0.0,fBAR_H - fBarFullH,textureBarFull.USize,fBarFullH); } - fEyeX = fBarEmptyX - (64.0 - 31.0) / 2 * fScaleFactor; - fEyeY = fBottomOfBar - fBarFullAmount * fScaleFactor - (45.0 * fScaleFactor); + fEyeX = fBarEmptyX - (((fEYE_W - fBAR_W) / 2) * fScaleFactor); + fEyeY = fBottomOfBar - (fBarFullAmount * fScaleFactor) - (fEYE_POINTER_YOFFSET * fScaleFactor); Canvas.SetPos(fEyeX,fEyeY); Canvas.DrawIcon(textureCurrEye,fScaleFactor); } diff --git a/HGame/Classes/Misc/PixieMarker.uc b/HGame/Classes/Misc/PixieMarker.uc index 55e83f61..8b647d92 100644 --- a/HGame/Classes/Misc/PixieMarker.uc +++ b/HGame/Classes/Misc/PixieMarker.uc @@ -5,7 +5,7 @@ class PixieMarker extends Actor; //texture import -AdamJD -#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 const BOOL_DEBUG_AI= false; var() name GroupName; diff --git a/HGame/Classes/Misc/SnakeVenomPool.uc b/HGame/Classes/Misc/SnakeVenomPool.uc index c1d9cb67..419c94c2 100644 --- a/HGame/Classes/Misc/SnakeVenomPool.uc +++ b/HGame/Classes/Misc/SnakeVenomPool.uc @@ -30,29 +30,29 @@ function PreBeginPlay() DrawScale = 0.0; bHidden = True; } - fShrinkTime *= RandRange(0.81,1.25); - fGrowTime *= RandRange(0.81,1.25); + fShrinkTime *= RandRange(0.81,1.20); + fGrowTime *= RandRange(0.81,1.20); if ( FRand() > 0.75 ) { switch (Rand(6)) { case 0: - PlaySound(Sound'ss_COS_venomland_01E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_01E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; case 1: - PlaySound(Sound'ss_COS_venomland_05E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_05E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; case 2: - PlaySound(Sound'ss_COS_venomland_04E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_04E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; case 3: - PlaySound(Sound'ss_COS_venomland_03E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_03E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; case 4: - PlaySound(Sound'ss_COS_venomland_02E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_02E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; case 5: - PlaySound(Sound'ss_COS_venomland_06E',,RandRange(0.31,0.62),,,RandRange(0.81,1.25)); + PlaySound(Sound'ss_COS_venomland_06E',,RandRange(0.31,0.62),,,RandRange(0.81,1.20)); break; default: } diff --git a/HGame/Classes/Misc/SpellLessonInterpolationPoint.uc b/HGame/Classes/Misc/SpellLessonInterpolationPoint.uc index 6f0b6396..e0b442c6 100644 --- a/HGame/Classes/Misc/SpellLessonInterpolationPoint.uc +++ b/HGame/Classes/Misc/SpellLessonInterpolationPoint.uc @@ -29,18 +29,18 @@ var Texture RightTextures[3]; function PostBeginPlay() { - UpTextures[0] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_idle",Class'Texture')); - UpTextures[1] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_hit",Class'Texture')); - UpTextures[2] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_miss",Class'Texture')); - DownTextures[0] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_idle",Class'Texture')); - DownTextures[1] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_hit",Class'Texture')); - DownTextures[2] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_miss",Class'Texture')); - LeftTextures[0] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_idle",Class'Texture')); - LeftTextures[1] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_hit",Class'Texture')); - LeftTextures[2] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_miss",Class'Texture')); - RightTextures[0] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_idle",Class'Texture')); - RightTextures[1] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_hit",Class'Texture')); - RightTextures[2] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_miss",Class'Texture')); + UpTextures[nIDX_IDLE] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_idle",Class'Texture')); + UpTextures[nIDX_HIT] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_hit",Class'Texture')); + UpTextures[nIDX_MISS] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_up_miss",Class'Texture')); + DownTextures[nIDX_IDLE] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_idle",Class'Texture')); + DownTextures[nIDX_HIT] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_hit",Class'Texture')); + DownTextures[nIDX_MISS] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_dn_miss",Class'Texture')); + LeftTextures[nIDX_IDLE] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_idle",Class'Texture')); + LeftTextures[nIDX_HIT] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_hit",Class'Texture')); + LeftTextures[nIDX_MISS] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_lt_miss",Class'Texture')); + RightTextures[nIDX_IDLE] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_idle",Class'Texture')); + RightTextures[nIDX_HIT] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_hit",Class'Texture')); + RightTextures[nIDX_MISS] = Texture(DynamicLoadObject("SpellShapes.Shapes.spar_rt_miss",Class'Texture')); // SetArrowTexture(0,0); SetArrowTexture(nIDX_IDLE, 0); } @@ -114,7 +114,7 @@ function bool IsInLevel (int nLevel) function bool VerifyLevel (int nLevel) { - if ( (nLevel >= 0) && (nLevel < 3) ) + if ( (nLevel >= 0) && (nLevel < ArrayCount(DirectionArrow)) ) { return True; } else { @@ -184,7 +184,7 @@ function SetArrowTexture (int nIdx, int nLevel) { return; } - if ( (nIdx < 0) || (nIdx >= 3) ) + if ( (nIdx < 0) || (nIdx >= ArrayCount(UpTextures)) ) { Log("ERROR: Invalid SpellLessonInterpolationPoint texture index " $ string(nIdx)); return; @@ -218,7 +218,7 @@ function Texture GetArrowTexture (int nIdx, int nLevel) { return None; } - if ( (nIdx < 0) || (nIdx >= 3) ) + if ( (nIdx < 0) || (nIdx >= ArrayCount(UpTextures)) ) { Log("ERROR: Invalid SpellLessonInterpolationPoint texture index " $ string(nIdx)); return None; diff --git a/HGame/Classes/Misc/SpiderAttendent.uc b/HGame/Classes/Misc/SpiderAttendent.uc index 0ff8b1fa..aa492a77 100644 --- a/HGame/Classes/Misc/SpiderAttendent.uc +++ b/HGame/Classes/Misc/SpiderAttendent.uc @@ -108,7 +108,7 @@ state stateFlyIn { if ( bPlayScreamWhenInView ) { - if ( Normal(Location - PlayerHarry.Cam.Location) Dot (vector(PlayerHarry.Cam.Rotation)) > 0.64999998 ) + if ( (Normal(Location - PlayerHarry.Cam.Location) Dot vector(PlayerHarry.Cam.Rotation)) > 0.64999998 ) { bPlayScreamWhenInView = False; PlayScream(); @@ -237,13 +237,20 @@ state AttackHarry if ( ReadyPosition() == True && (BaseHud(PlayerHarry.myHud).bCutSceneMode == False) ) { - gotoState('stateBiteHarry'); + GotoState('stateBiteHarry'); } moveToHarryTime -= DeltaTime; if ( moveToHarryTime <= 0 ) { - gotoState('stateBeMenacing'); + GotoState('stateBeMenacing'); + } + + randomAttackSfx -= DeltaTime; + if ( randomAttackSfx <= 0 ) + { + randomAttackSfx = FRand() * 4 + 1; + playAttackSound(); } } @@ -276,13 +283,13 @@ state stateBeMenacing if ( ReadyPosition() == True && (BaseHud(Playerharry.myHud).bCutSceneMode == False) ) { - gotoState('stateBiteHarry'); + GotoState('stateBiteHarry'); } menacingTime -= DeltaTime; if ( menacingTime <= 0 ) { - gotoState('preAttackCheck'); + GotoState('preAttackCheck'); } vDir = Normal(PlayerHarry.Location - Location); @@ -349,11 +356,10 @@ state HitBySpell { Global.Tick(DeltaTime); - fStunned += DeltaTime; - - if(numSpells > 0) - { - if(fStunned > 5) + if ( bStunned ) + { + fStunned -= DeltaTime; + if( fStunned <= 0 ) { GoToState('preAttackCheck'); } diff --git a/HGame/Classes/Misc/SpiderDead.uc b/HGame/Classes/Misc/SpiderDead.uc index 13f7b629..e539a97f 100644 --- a/HGame/Classes/Misc/SpiderDead.uc +++ b/HGame/Classes/Misc/SpiderDead.uc @@ -15,7 +15,7 @@ function PlayerCutRelease() state StartPatrolling { begin: - LoopAnim('Walk',1.25); + LoopAnim('Walk',1.20); GotoState('patrol'); } diff --git a/HGame/Classes/Misc/SpiderMarker.uc b/HGame/Classes/Misc/SpiderMarker.uc index beed7292..24636cee 100644 --- a/HGame/Classes/Misc/SpiderMarker.uc +++ b/HGame/Classes/Misc/SpiderMarker.uc @@ -5,7 +5,7 @@ class SpiderMarker extends Actor; //texture import -AdamJD -#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\HiddenPawn.PNG Name=HiddenPawn COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 const BOOL_DEBUG_AI= false; var() bool bCenter; diff --git a/HGame/Classes/Misc/SpikyPlantHeadSpikes.uc b/HGame/Classes/Misc/SpikyPlantHeadSpikes.uc index df20b63a..c154fdd9 100644 --- a/HGame/Classes/Misc/SpikyPlantHeadSpikes.uc +++ b/HGame/Classes/Misc/SpikyPlantHeadSpikes.uc @@ -100,7 +100,7 @@ auto state fallOver } SetLocation(OldLocation); vMoveDirRot = rotator(HitNormal); - vMoveDirRot.Yaw += 65536.0 * (8.0 / 20.0) / 2.0 * (FRand() * 2.0 - 1.0); + vMoveDirRot.Yaw += 65536.0 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); vMoveDirRot.Pitch = 0; vMoveDirRot.Roll = 0; GotoState('TurnToNewDir'); @@ -111,9 +111,9 @@ auto state fallOver vMoveDir.Y = 1.0; vMoveDir.Z = 1.0; vMoveDirRot = Rotation; - vMoveDirRot.Yaw += 16384 * (8.0 / 20.0) / 2.0 * (FRand() * 2.0 - 1.0); - vMoveDirRot.Pitch += 8191 * (8.0/ 20.0) / 2.0 * (FRand() * 2.0 - 1.0); - vMoveDirRot.Roll += 16384 * (8.0/ 20.0) / 2.0 * (FRand() * 2.0 - 1.0); + vMoveDirRot.Yaw += 16384 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDirRot.Pitch += 8191 * (8.0/ 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDirRot.Roll += 16384 * (8.0/ 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); vMoveDir = vMoveDir >> vMoveDirRot; fRotVel = 0.0; SetRotation(rotator(vMoveDir)); @@ -123,6 +123,7 @@ state TurnToNewDir { begin: LoopAnim('Idle'); +wait: Sleep(0.5); TurnTo(Location + vMoveDir); GotoState('fallOver'); diff --git a/HGame/Classes/Props/Boeing747.uc b/HGame/Classes/Props/Boeing747.uc index 124f3efb..4c3aa261 100644 --- a/HGame/Classes/Props/Boeing747.uc +++ b/HGame/Classes/Props/Boeing747.uc @@ -47,6 +47,7 @@ function bool StartTransPath() TransPoint = I; fTransDistance = fDistance; iTransPoint = I.Position; + break; } } if ( TransPoint == None ) diff --git a/HGame/Classes/Props/BoulderChase.uc b/HGame/Classes/Props/BoulderChase.uc index c2c21f25..caa37a2f 100644 --- a/HGame/Classes/Props/BoulderChase.uc +++ b/HGame/Classes/Props/BoulderChase.uc @@ -18,7 +18,7 @@ function Trigger (Actor Other, Pawn EventInstigator) break; case 2: GroundRunSpeed = FinalGroundSpeed; - fPatrolAnimRate *= GroundRunSpeed / GroundSpeed; + fPatrolAnimRate *= (GroundRunSpeed / GroundSpeed); GroundSpeed = GroundRunSpeed; break; diff --git a/HGame/Classes/Props/BronzeCauldron.uc b/HGame/Classes/Props/BronzeCauldron.uc index abadc73e..35de3330 100644 --- a/HGame/Classes/Props/BronzeCauldron.uc +++ b/HGame/Classes/Props/BronzeCauldron.uc @@ -13,25 +13,10 @@ var() bool bRandomBean; var() bool bMakeSpawnPersistent; var bool bOpened; -//my failed attempt to fix floating cauldrons -AdamJD -/* -function PreBeginPlay() -{ - Super.PreBeginPlay(); - - if( eVulnerableToSpell == SPELL_None ) - { - Log("Setting new cauldron collision size and location..."); - SetCollisionSize(Default.CollisionRadius, Default.CollisionHeight / 2); - SetLocation(Default.Location); - } -} -*/ - function int GetMaxEjectedObjects() { // return 3; - return (nMAX_EJECTED_OBJECTS); + return nMAX_EJECTED_OBJECTS; } function SetupRandomBeans() @@ -46,7 +31,7 @@ function SetupRandomBeans() // if ( iBean < iNumberOfBeans ) for(iBean = 0; iBean < iNumberOfBeans; iBean++) { - if ( Rand(100) < (30 - PlayerHarry.GetHealth() * 30) && iBean == 0 ) + if ( Rand(100) < (30 - (PlayerHarry.GetHealth() * 30)) && iBean == 0 ) { EjectedObjects[iBean] = Class'ChocolateFrog'; } else { @@ -80,8 +65,6 @@ auto state waitforspell GotoState('turnover'); return True; } - - begin: } state turnover @@ -113,8 +96,8 @@ state turnover Dir = Dir >> SpawnDirection; Dir = Dir + Location; newSpawn = Spawn(Class'Spawn_flash_2',,,Dir,rot(0,0,0)); - // newSpawn = FancySpawn(EjectedObjects[iBean],,,Dir); - newSpawn = Spawn(EjectedObjects[iBean],,,Dir); //using spawn instead of fancyspawn stops the game lagging -AdamJD + //newSpawn = FancySpawn(EjectedObjects[iBean],,,Dir); + newSpawn = Spawn(EjectedObjects[iBean],,,Dir); //using spawn instead of fancyspawn stops the game lagging (to be compatible with the new engine) -AdamJD if ( newSpawn == None ) { cm("* ERROR: cauldron spawn failed."); @@ -153,10 +136,10 @@ state turnover bProjTarget = False; eVulnerableToSpell = SPELL_None; PlaySound(Sound'cauldron_flip'); - PlayAnim('tipover'/*, [RootBone] 'move'*/); //commenting out the rootbone stops floating cauldrons (thanks to MaxG for finding this) -AdamJD + PlayAnim('tipover'); FinishAnim(); generateobject(); - LoopAnim('tipped'/*, [RootBone] 'move'*/); //commenting out the rootbone stops floating cauldrons (thanks to MaxG for finding this) -AdamJD + LoopAnim('tipped'); } defaultproperties @@ -169,9 +152,9 @@ defaultproperties EjectedObjects(2)=Class'Jellybean' - // ObjectStartPoint(0)=(X=64.00,Y=0.00,Z=-20.00) - ObjectStartPoint(0)=(X=64.00,Y=0.00,Z=20.00) //now that rootbone is no longer used we need to set the Z start point of the first ObjectStartPoint - //to +20 otherwise beans/frogs fall through the floor when being spawned -AdamJD + //ObjectStartPoint(0)=(X=64.00,Y=0.00,Z=-20.00) + ObjectStartPoint(0)=(X=64.00,Y=0.00,Z=20.00) //now that spawn is used instead of fancyspawn we need to set the Z start point of the first ObjectStartPoint + //to +20 otherwise beans/frogs fall through the floor when being spawned (to be compatible with the new engine) -AdamJD ObjectStartPoint(1)=(X=64.00,Y=-20.00,Z=20.00) diff --git a/HGame/Classes/Props/ChocolateFrog.uc b/HGame/Classes/Props/ChocolateFrog.uc index 2ef78755..3a6fa6e4 100644 --- a/HGame/Classes/Props/ChocolateFrog.uc +++ b/HGame/Classes/Props/ChocolateFrog.uc @@ -28,19 +28,19 @@ function Sound GetRibbitOrHopsound() function JumpToNewLoc (Vector V, optional bool bJumpOutOfWay) { //local float JumpTime; - local float _JumpTime; + local float JumpFrogTime; - _JumpTime = fJumpTime; + JumpFrogTime = fJumpTime; if ( bJumpOutOfWay ) { DesiredRotation.Yaw = rotator(V - Location).Yaw; PlayAnim('hop2',1.0,0.05); - _JumpTime *= 0.5; + JumpFrogTime *= 0.5; JumpOutOfWayCount++; } // SetPhysics(2); SetPhysics(PHYS_Falling); - Velocity = ComputeTrajectoryByTime(Location,V,_JumpTime); + Velocity = ComputeTrajectoryByTime(Location,V,JumpFrogTime); GotoState('stateJump'); } diff --git a/HGame/Classes/Props/FlipendoVaseBronzeShard.uc b/HGame/Classes/Props/FlipendoVaseBronzeShard.uc index 2199bfff..b84ebe73 100644 --- a/HGame/Classes/Props/FlipendoVaseBronzeShard.uc +++ b/HGame/Classes/Props/FlipendoVaseBronzeShard.uc @@ -40,6 +40,7 @@ auto state Fall initfall(); DrawScale = RandRange(1.0,4.0); tickOn = True; + loop: Sleep(RandRange(1.0,2.0)); tickOn = False; Destroy(); diff --git a/HGame/Classes/Props/HProp.uc b/HGame/Classes/Props/HProp.uc index f0f30442..337de884 100644 --- a/HGame/Classes/Props/HProp.uc +++ b/HGame/Classes/Props/HProp.uc @@ -158,7 +158,6 @@ function TickPickupOrDropOff (float Delta) { // case 2: case FT_HudPosition: - //KW left this empty? -AdamJD // case 3: case FT_DropOffInWorld: fCurrFlyTime -= Delta; @@ -184,6 +183,8 @@ function TickPickupOrDropOff (float Delta) state DropOffProp { +ignores Touch; + event Tick (float Delta) { TickPickupOrDropOff(Delta); @@ -222,6 +223,8 @@ state DropOffProp state PickupProp { +ignores Touch; + event Tick (float Delta) { TickPickupOrDropOff(Delta); @@ -270,7 +273,7 @@ state PickupProp if ( PickupFlyTo == FT_Camera ) { FaceCamera(); - fCurrCameraZoomDist = 160.0; + fCurrCameraZoomDist = START_CAM_ZOOM_DIST; bReadyForFlyEffect = True; // if ( fCurrCameraZoomDist > 0 ) while ( fCurrCameraZoomDist > 0 ) @@ -305,6 +308,7 @@ state BounceIntoPlace Super.Tick(DeltaTime); NewRotation = Rotation; NewRotation.Yaw += 30000 * DeltaTime; + NewRotation.Yaw = NewRotation.Yaw & 65535; SetRotation(NewRotation); if ( bBounceIntoPlaceTiming ) { diff --git a/HGame/Classes/Props/HorklumpsHead.uc b/HGame/Classes/Props/HorklumpsHead.uc index 5a9527d8..7005b552 100644 --- a/HGame/Classes/Props/HorklumpsHead.uc +++ b/HGame/Classes/Props/HorklumpsHead.uc @@ -84,6 +84,7 @@ auto state fallOver SetLocation(OldLocation); vMoveDirRot = rotator(HitNormal); vMoveDirRot.Yaw += 65536.0 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDirRot.Pitch = 0; vMoveDirRot.Roll = 0; GotoState('TurnToNewDir'); } @@ -94,6 +95,9 @@ auto state fallOver vMoveDir.Z = 1.0; vMoveDirRot = Rotation; vMoveDirRot.Yaw += 16384 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDirRot.Pitch += 8191 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDirRot.Roll += 16384 * (8.0 / 20.0) / 2.0 * ((FRand() * 2.0) - 1.0); + vMoveDir = vMoveDir >> vMoveDirRot; fRotVel = 0.0; SetRotation(rotator(vMoveDir)); } @@ -102,6 +106,7 @@ state TurnToNewDir { begin: LoopAnim('Idle'); +wait: Sleep(0.5); TurnTo(Location + vMoveDir); GotoState('fallOver'); diff --git a/HGame/Classes/Props/JarBeans.uc b/HGame/Classes/Props/JarBeans.uc index e4507a2c..52716a6d 100644 --- a/HGame/Classes/Props/JarBeans.uc +++ b/HGame/Classes/Props/JarBeans.uc @@ -41,7 +41,7 @@ function bool CutCommand (string Command, optional string cue, optional bool bFa siJBeans.IncrementCount(nAddBeans); if ( cue != "" ) { - CutCue(cue); + Super.CutCue(cue); } } else { strCueAddBeansDone = cue; @@ -77,7 +77,7 @@ state GiveHarryBeans } if ( nAddBeans > 0 ) { - if ( fTimeBetweenBeans >= 0.1 ) + if ( fTimeBetweenBeans >= fSPAWN_BEAN_RATE ) { fTimeBetweenBeans = 0.0; if ( nAddBeans < nPointsPerBean ) @@ -117,7 +117,7 @@ state GiveHarryBeans siJBeans = sgJBeans.GetStatusItem(Class'StatusItemJellybeans'); sgJBeans.SetEffectTypeToPermanent(); sgJBeans.SetCutSceneRenderMode(True); - fTimeBetweenBeans = 0.1; + fTimeBetweenBeans = fSPAWN_BEAN_RATE; } function EndState() @@ -130,7 +130,7 @@ state GiveHarryBeans sgJBeans.SetCutSceneRenderModeToNormal(); if ( strCueAddBeansDone != "" ) { - CutCue(strCueAddBeansDone); + Super.CutCue(strCueAddBeansDone); } } diff --git a/HGame/Classes/Props/SnailTrail.uc b/HGame/Classes/Props/SnailTrail.uc index 73d93304..1220445f 100644 --- a/HGame/Classes/Props/SnailTrail.uc +++ b/HGame/Classes/Props/SnailTrail.uc @@ -42,7 +42,7 @@ event Tick (float fDelta) { if ( fTrailDuration - fCountDown >= fShrinkAfter ) { - DrawScale = fCountDown / (fTrailDuration - fShrinkAfter) * fStartDrawScale; + DrawScale = (fCountDown / (fTrailDuration - fShrinkAfter)) * fStartDrawScale; } fCountDown -= fDelta; } diff --git a/HGame/Classes/Props/SpongifyPad.uc b/HGame/Classes/Props/SpongifyPad.uc index f3d902bf..f7b9d90e 100644 --- a/HGame/Classes/Props/SpongifyPad.uc +++ b/HGame/Classes/Props/SpongifyPad.uc @@ -5,7 +5,7 @@ class SpongifyPad extends HProp; //texture import -AdamJD -#exec Texture Import File=Textures\SpongifyTexture.PNG Name=SpongifyTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\SpongifyTexture.PNG Name=SpongifyTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var Actor Target; var Vector vStartPosition; @@ -69,7 +69,7 @@ function PreBeginPlay() function Vector ProjectFuturePosition (float AtTime) { - return Location + (PadDir * PadSpeed * AtTime) + Region.Zone.ZoneGravity * AtTime; + return Location + ((PadDir * PadSpeed) * AtTime) + (Region.Zone.ZoneGravity * AtTime); } event Destroyed() diff --git a/HGame/Classes/Props/SpongifyTarget.uc b/HGame/Classes/Props/SpongifyTarget.uc index c9de1b22..c0c3c4a1 100644 --- a/HGame/Classes/Props/SpongifyTarget.uc +++ b/HGame/Classes/Props/SpongifyTarget.uc @@ -5,7 +5,7 @@ class SpongifyTarget extends HProp; //texture import -AdamJD -#exec Texture Import File=Textures\SpongifyTargetTexture.PNG Name=SpongifyTargetTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\SpongifyTargetTexture.PNG Name=SpongifyTargetTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 function PreBeginPlay() { diff --git a/HGame/Classes/Props/WiggenWell.uc b/HGame/Classes/Props/WiggenWell.uc index 970b3114..d631125c 100644 --- a/HGame/Classes/Props/WiggenWell.uc +++ b/HGame/Classes/Props/WiggenWell.uc @@ -32,7 +32,8 @@ auto state wwellbottlo local Rotator NewRotation; NewRotation = Rotation; - NewRotation.Yaw += 30000 * DeltaTime; + NewRotation.Yaw += (30000 * DeltaTime); + NewRotation.Yaw = NewRotation.Yaw & 65535; SetRotation(NewRotation); if ( bTiming ) { diff --git a/HGame/Classes/Props/chestbronze.uc b/HGame/Classes/Props/chestbronze.uc index de56f1fd..bbead829 100644 --- a/HGame/Classes/Props/chestbronze.uc +++ b/HGame/Classes/Props/chestbronze.uc @@ -23,31 +23,32 @@ function int GetMaxEjectedObjects() function SetupRandomBeans() { //local int iBean; + local int iBeanObject; // iBean = 0; // if ( iBean < iNumberOfBeans ) - for(iBean = 0; iBean < iNumberOfBeans; iBean++) + for(iBeanObject = 0; iBeanObject < iNumberOfBeans; iBeanObject++) { - if ( Rand(100) < (30 - PlayerHarry.GetHealth() * 30) && iBean == 0 ) + if ( Rand(100) < (30 - (PlayerHarry.GetHealth() * 30)) && iBeanObject == 0 ) { - EjectedObjects[iBean] = Class'ChocolateFrog'; + EjectedObjects[iBeanObject] = Class'ChocolateFrog'; } else { switch (Rand(5)) { case 0: - EjectedObjects[iBean] = Class'BlueJellyBean'; + EjectedObjects[iBeanObject] = Class'BlueJellyBean'; break; case 1: - EjectedObjects[iBean] = Class'GreenJellyBean'; + EjectedObjects[iBeanObject] = Class'GreenJellyBean'; break; case 2: - EjectedObjects[iBean] = Class'SpottedJellyBean'; + EjectedObjects[iBeanObject] = Class'SpottedJellyBean'; break; case 3: - EjectedObjects[iBean] = Class'GreenPurpleCheckerBean'; + EjectedObjects[iBeanObject] = Class'GreenPurpleCheckerBean'; break; case 4: - EjectedObjects[iBean] = Class'RedBlackStripeBean'; + EjectedObjects[iBeanObject] = Class'RedBlackStripeBean'; break; default: } @@ -111,7 +112,7 @@ state turnover local bool bPlayWCardSound; Vel = ObjectStartVelocity[iBean]; - Vel.X += -16 + Rand(96); + Vel.X += (-16 + Rand(96)); if ( Vel.X < 0 ) { Vel.X = 0.0; @@ -267,7 +268,7 @@ defaultproperties // eVulnerableToSpell=1 eVulnerableToSpell=SPELL_Alohomora - CentreOffset=(X=0.00,Y=0.00,Z=20.00), + CentreOffset=(X=0.00,Y=0.00,Z=20.00) Mesh=SkeletalMesh'HPModels.skbronzechestMesh' diff --git a/HGame/Classes/Quidditch/BEATER.uc b/HGame/Classes/Quidditch/BEATER.uc index 6eaa3540..c547fcd9 100644 --- a/HGame/Classes/Quidditch/BEATER.uc +++ b/HGame/Classes/Quidditch/BEATER.uc @@ -60,7 +60,7 @@ loop: defaultproperties { - HouseDisplayInfo(0)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skGeorgeWQuidMesh',MultiSkins[0]=None) + HouseDisplayInfo(0)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skGeorgeWQuidMesh',MultiSkins[0]=Texture'HPModels.Skins.skGeorgeWQuidTex0',MultiSkins[1]=Texture'HPModels.Skins.skGeorgeWQuidTex1',MultiSkins[2]=Texture'HPModels.Skins.skGeorgeWQuidTex2',MultiSkins[3]=Texture'HPModels.Skins.skGeorgeWQuidTex3',MultiSkins[4]=Texture'HPModels.Skins.skGeorgeWQuidTex4') HouseDisplayInfo(1)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skBeaterMesh',MultiSkins[0]=Texture'HPModels.Skins.skBeater_RTex0') diff --git a/HGame/Classes/Quidditch/Bludger.uc b/HGame/Classes/Quidditch/Bludger.uc index 8517c33e..e7e3dd79 100644 --- a/HGame/Classes/Quidditch/Bludger.uc +++ b/HGame/Classes/Quidditch/Bludger.uc @@ -32,7 +32,7 @@ function Touch (Actor Other) Subject = Pawn(Other); if ( (Subject != None) && (Subject != Emitter) ) { - if ( Level.TimeSeconds - fTimeOfLastDamage >= 1.0 ) + if ( Level.TimeSeconds - fTimeOfLastDamage >= fMinTimeBetweenDamages ) { if ( bMine ) { @@ -44,7 +44,7 @@ function Touch (Actor Other) FinishMine(); } } else { - PlaySound(HitSounds[Rand(2)],SLOT_Interact,,,2000.0); + PlaySound(HitSounds[Rand(NUM_HIT_SOUNDS)],SLOT_Interact,,,2000.0); Subject.TakeDamage(Damage,self,Location,100 * Normal(Velocity),'Bludgered'); fTimeOfLastDamage = Level.TimeSeconds; Super.Touch(Other); diff --git a/HGame/Classes/Quidditch/BroomHarry.uc b/HGame/Classes/Quidditch/BroomHarry.uc index f18287e5..1d5dc54a 100644 --- a/HGame/Classes/Quidditch/BroomHarry.uc +++ b/HGame/Classes/Quidditch/BroomHarry.uc @@ -644,8 +644,8 @@ function UpdateBroomSound() { fTurnFactor = 1.0; } - fVolume *= 1.0 + (2.0 * fTurnFactor); - fPitch *= 1.0 + (1.0 * fTurnFactor); + fVolume *= 1.0 + 2.0 * fTurnFactor; + fPitch *= 1.0 + 1.0 * fTurnFactor; if ( (fTurnFactor > 0.0) && (fTurnFactor < 0.1) ) { if ( fSpeedFactor > 0.69999999 ) @@ -703,6 +703,10 @@ function FlyOnPath (name CutScenePath, optional int StartPoint) { Log("Harry couldn't find path " $ string(CutScenePath)); } + else + { + //KW left this empty? -AdamJD + } } } @@ -880,7 +884,7 @@ function PlayerTrack (float DeltaTime) } //} GetAxes(LookForTarget.Rotation,TargetX,TargetY,TargetZ); - TargetTrackPoint = (LookForTarget.Location + (TargetY * fTargetTrackHorzOffset)) + (TargetZ * (fTargetTrackVertOffset - CollisionHeight)); + TargetTrackPoint = LookForTarget.Location + TargetY * fTargetTrackHorzOffset + TargetZ * (fTargetTrackVertOffset - CollisionHeight); TargetDir = TargetTrackPoint - Location; DesiredRotation = rotator(TargetDir); GetAxes(Rotation,X,Y,Z); @@ -898,12 +902,12 @@ function PlayerTrack (float DeltaTime) vDodgeVel = vect(0.00,0.00,0.00); } TargetDist = VSize(TargetDir) - fTargetTrackDist; - if ( TargetDist > 50 ) + if ( TargetDist > SlowdownRadius ) { AirSpeed = MaxSpeed; } else { TargetSpeed = VSize(LookForTarget.Velocity); - AirSpeed = TargetDist / 50 * (MaxSpeed - TargetSpeed) + TargetSpeed; + AirSpeed = TargetDist / SlowdownRadius * (MaxSpeed - TargetSpeed) + TargetSpeed; if ( AirSpeed < 0 ) { AirSpeed = 0.0; @@ -914,12 +918,12 @@ function PlayerTrack (float DeltaTime) { bEasingUpToSpeed = False; } - if ( (Level.TimeSeconds > fNextTimeSafeToWoosh) && (CurrentSpeed > 75) && ((Abs(fTargetTrackHorzOffset - fLastHorzOffset) / DeltaTime > 150) || (Abs(fTargetTrackVertOffset - fLastVertOffset) / DeltaTime > 150)) ) + if ( (Level.TimeSeconds > fNextTimeSafeToWoosh) && (CurrentSpeed > 75) && (((Abs(fTargetTrackHorzOffset - fLastHorzOffset) / DeltaTime) > 150) || ((Abs(fTargetTrackVertOffset - fLastVertOffset) / DeltaTime) > 150)) ) { - Woosh = SlowWooshSounds[Rand(5)]; + Woosh = SlowWooshSounds[Rand(NUM_SLOW_WOOSH_SOUNDS)]; fPitch = RandRange(1.0,1.5); PlaySound(Woosh,SLOT_Misc,1.0,,1000.0,fPitch); - fNextTimeSafeToWoosh = (Level.TimeSeconds + (GetSoundDuration(Woosh) / fPitch)) + 0.1; + fNextTimeSafeToWoosh = Level.TimeSeconds + ((GetSoundDuration(Woosh) / fPitch) + 0.1); } UpdateBroomSound(); } @@ -934,12 +938,9 @@ function TakeDamage (int Damage, Pawn InstigatedBy, Vector HitLocation, Vector M WatchTarget = None; PlayAnim('Bump',,0.2); bHit = True; - - //UTPT didn't seem to decompile this function right, no health used to be taken off BroomHarry when getting kicked the seeker -AdamJD - /* - if ( !InstigatedBy.IsA('Seeker') && DamageType != 'Kicked' ) + if ( !(InstigatedBy.IsA('Seeker') && DamageType != 'Kicked') ) { - PlaySound(HurtSound[Rand(15)],SLOT_Talk,,True); + PlaySound(HurtSound[Rand(NUM_HURT_SOUNDS)],SLOT_Talk,,True); if ( (DamageType == 'Kicked') || (DamageType == 'Bludgered') ) { if ( Director != None ) @@ -964,33 +965,6 @@ function TakeDamage (int Damage, Pawn InstigatedBy, Vector HitLocation, Vector M KillHarry(True); } } - } - */ - - if ( (DamageType == 'Kicked') || (DamageType == 'Bludgered') ) - { - if ( Director != None ) - { - Director.OnTakeDamage(self,Damage,InstigatedBy,DamageType); - } - } - if ( !bInvincible && DamageType != 'Collided' ) //Collided is used by the seeker when bumping into BroomHarry but not kicking him -AdamJD - { - if ( QuidArmorStatus.GetCount() > 0 ) - { - EffectiveDamage = (Damage * 0.5) * ArmorDamageScale; - } - else - { - EffectiveDamage = Damage * 0.5; - } - ClientMessage("BroomHarry Damage=" $ string(Damage) $ ", EffectiveDamage=" $ string(EffectiveDamage)); - PlaySound(HurtSound[Rand(15)],SLOT_Talk,,True); //only play the hurt sound if he's actually hitting something or kicked by the seeker -AdamJD - AddHealth(-EffectiveDamage); - if ( GetHealthCount() <= 0.0 ) - { - KillHarry(True); - } } } } @@ -1080,7 +1054,6 @@ state PlayerWalking { // Camera.SetCameraMode(4); Camera.SetCameraMode(CM_Quidditch); - // JL009D: // goto JL009D; break; } @@ -1113,10 +1086,10 @@ state PlayerWalking if ( !bLookingForTarget ) { bLookingForTarget = True; - SetTimer(FRand() * 3.0 + 1.0,False); + SetTimer(FRand() * 3.0 + 1.0,False); } } else { - if ( bLookingForTarget ) + if ( bLookingForTarget ) { bLookingForTarget = False; SetTimer(0.0,False); @@ -1243,7 +1216,7 @@ state PlayerWalking fMouseYaw += aBroomYaw * fBroomSensitivity; if ( Abs(aBroomYaw) > 0.05 ) { - //KW left this if statement empty? -AdamJD + //KW left this empty? -AdamJD } if ( fMouseYaw > 1.5 ) { @@ -1328,7 +1301,7 @@ state PlayerWalking NewRotation = Rotation; fPitchLimitHi = PitchLimitUp * (16384 / 90.0); - fPitchLimitLo = 65536.0 - (PitchLimitDown * 16384 / 90.0); + fPitchLimitLo = 65536.0 - (PitchLimitDown * (16384 / 90.0)); switch (ePitchControlDevice) { // case 1: @@ -1503,10 +1476,10 @@ state PlayerWalking bHitWall = True; fSpeed = VSize(Velocity); fVolume = fSpeed / AirSpeedNormal; - PlaySound(HitSounds[Rand(3)],SLOT_Interact,fVolume,,,RandRange(0.81,1.25)); + PlaySound(HitSounds[Rand(NUM_HIT_SOUNDS)],SLOT_Interact,fVolume,,,RandRange(0.81,1.25)); if ( WallDamage > 0 ) { - EffectiveDamage = (WallDamage * fSpeed) / AirSpeedNormal; + EffectiveDamage = WallDamage * fSpeed / AirSpeedNormal; if ( !bInvincible && (EffectiveDamage > 0) ) { PlaySound(HurtSound[Rand(15)],SLOT_Talk,,True); @@ -1529,7 +1502,7 @@ state PlayerWalking { return; } else { - fWallAvoidanceRate = 1.0 - Abs(HitNormal.Z) / 0.9851; + fWallAvoidanceRate = 1.0 - (Abs(HitNormal.Z) / 0.9851); //UTPT forgot to add brackets -AdamJD } vDodgeVel = GetDodgeVelFromHitwall(self,HitNormal,LookForTarget); bHittingWall = True; @@ -1541,14 +1514,14 @@ state PlayerWalking local Pawn pTarget; pTarget = Pawn(Other); - if ( (!bHit && !pTarget.IsA('QuidditchPlayer')) && !pTarget.IsA('Bludger') ) + if ( !bHit && (!pTarget.IsA('QuidditchPlayer') && !pTarget.IsA('Bludger')) ) { PlayAnim('React'); if ( pTarget.IsA('QuidGoal') ) { PlaySound(Sound'Q_BRM_HitPole_01',SLOT_Interact,0.69999999,,1000.0,RandRange(0.81,1.25)); } else { - PlaySound(HitSounds[Rand(3)],SLOT_Interact,0.69999999,,1000.0,RandRange(0.81,1.25)); + PlaySound(HitSounds[Rand(NUM_HIT_SOUNDS)],SLOT_Interact,0.69999999,,1000.0,RandRange(0.81,1.25)); } Velocity = vect(0.00,0.00,1.00); bHit = True; @@ -1600,9 +1573,9 @@ function Vector GetDodgeVelFromHitwall (Actor aSelf, Vector vHitNormal, Actor LF vVel = (V + vHitNormal * 0.81) / 2; if ( vVel.Z > 0 ) { - vVel.Z = Abs(vVel.X) + Abs(vVel.Y) / 2; + vVel.Z = Abs(vVel.X) + (Abs(vVel.Y) / 2); //UTPT forgot to add brackets -AdamJD } else { - vVel.Z = -Abs(vVel.X) + Abs(vVel.Y) / 2; + vVel.Z = -Abs(vVel.X) + (Abs(vVel.Y) / 2); //UTPT forgot to add brackets -AdamJD } vVel = Normal(vVel); return vVel; @@ -1706,7 +1679,7 @@ state Pursue Super.PlayerTick(DeltaTime); if ( (LookForTarget == None) || LookForTarget.bHidden ) { - GotoState('PlayerWalking'); + GotoState('PlayerWalking'); } TargetDir = LookForTarget.Location - Location; DesiredRotation = rotator(TargetDir); diff --git a/HGame/Classes/Quidditch/BroomHoop.uc b/HGame/Classes/Quidditch/BroomHoop.uc index 4acc29a6..bf106f1d 100644 --- a/HGame/Classes/Quidditch/BroomHoop.uc +++ b/HGame/Classes/Quidditch/BroomHoop.uc @@ -41,7 +41,7 @@ function changeAttachedParticleFX (Class newFX) fOriginalParticlesPerSec = attachedParticleFX[0].ParticlesPerSec.Base; if ( IsInState('HoopVisible') || IsInState('HoopAppearing') ) { - attachedParticleFX[0].ParticlesPerSec.Base = 50.0; + attachedParticleFX[0].ParticlesPerSec.Base = fSmallParticlesPerSec; } } } @@ -67,7 +67,7 @@ state HoopAppearing if ( attachedParticleFX[0] != None ) { attachedParticleFX[0].EnableEmission(True); - attachedParticleFX[0].ParticlesPerSec.Base = 50.0; + attachedParticleFX[0].ParticlesPerSec.Base = fSmallParticlesPerSec; } DrawScale = PlayScale; ScaleGlow = 1.0; @@ -90,7 +90,7 @@ state HoopVisible if ( attachedParticleFX[0] != None ) { attachedParticleFX[0].EnableEmission(True); - attachedParticleFX[0].ParticlesPerSec.Base = 50.0; + attachedParticleFX[0].ParticlesPerSec.Base = fSmallParticlesPerSec; } DrawScale = PlayScale; ScaleGlow = 1.0; diff --git a/HGame/Classes/Quidditch/BroomHoopTrail.uc b/HGame/Classes/Quidditch/BroomHoopTrail.uc index f38fd1e1..649ab36c 100644 --- a/HGame/Classes/Quidditch/BroomHoopTrail.uc +++ b/HGame/Classes/Quidditch/BroomHoopTrail.uc @@ -42,7 +42,7 @@ function PostBeginPlay() } CurrentStage = 1; - for(I = 0; I < 5; ++I) + for(I = 0; I < MaxHoops; ++I) { Position.X = (I + 1) * 20; Position.Y = 0.0; @@ -93,6 +93,10 @@ function ChangeHoopAppearance (BroomHoop Hoop, int ParticleStage) { Hoop.changeAttachedParticleFX(Hoop.attachedParticleClass[0]); } + else + { + //KW left this empty? -AdamJD + } } function SetTrailEnd (int NewTrailEnd) @@ -131,7 +135,7 @@ function SetTrailEnd (int NewTrailEnd) Hoop.GotoState('HoopNextToHit'); } ++I; - if ( I >= 5 ) + if ( I >= MaxHoops ) { I = 0; } @@ -176,7 +180,7 @@ state TrailOn TrailEnd = NextHoopToUse - InitialTrailEnd; if ( TrailEnd < 0 ) { - TrailEnd += 5; + TrailEnd += MaxHoops; } SetTrailEnd(TrailEnd); HoopsToGo = HoopsToHit; @@ -201,7 +205,7 @@ state TrailOn ++ValidHoops; fBirthTimeOfNewestHoop = Level.TimeSeconds; ++NextHoopToUse; - if ( NextHoopToUse >= 5 ) + if ( NextHoopToUse >= MaxHoops ) { NextHoopToUse = 0; } @@ -209,14 +213,14 @@ state TrailOn EndSetBack = NextHoopToUse - 1 - TrailEnd; if ( EndSetBack < 0 ) { - EndSetBack += 5; + EndSetBack += MaxHoops; } if ( EndSetBack > InitialTrailEnd ) { TrailEnd = NextHoopToUse - 1 - InitialTrailEnd; if ( TrailEnd < 0 ) { - TrailEnd += 5; + TrailEnd += MaxHoops; } NextHoopToHit = TrailEnd; SetTrailEnd(TrailEnd); @@ -251,7 +255,7 @@ state TrailOn local int VisibleLen; local int HoopSound; - if ( !Hoop.IsInState('HoopInvisible') || Hoop.IsInState('HoopDisappearing') ) + if ( !(Hoop.IsInState('HoopInvisible') || Hoop.IsInState('HoopDisappearing')) ) { OldHoopsToGo = HoopsToGo; --HoopsToGo; @@ -267,7 +271,7 @@ state TrailOn HoopsSkipped = Hoop.HoopNumber - NextHoopToHit; if ( HoopsSkipped < 0 ) { - HoopsSkipped += 5; + HoopsSkipped += MaxHoops; } HoopsToGo += HoopsSkipped; if ( HoopsToGo >= HoopsToHit ) @@ -277,7 +281,7 @@ state TrailOn } } NextHoopToHit = Hoop.HoopNumber + 1; - if ( NextHoopToHit >= 5 ) + if ( NextHoopToHit >= MaxHoops ) { NextHoopToHit = 0; } @@ -285,7 +289,7 @@ state TrailOn VisibleLen = NextHoopToUse - TrailEnd; if ( VisibleLen < 0 ) { - VisibleLen += 5; + VisibleLen += MaxHoops; } if ( HoopsToGo < VisibleLen ) { diff --git a/HGame/Classes/Quidditch/Chaser.uc b/HGame/Classes/Quidditch/Chaser.uc index 9b9cf78e..0b4a7503 100644 --- a/HGame/Classes/Quidditch/Chaser.uc +++ b/HGame/Classes/Quidditch/Chaser.uc @@ -43,7 +43,7 @@ Catch: defaultproperties { - HouseDisplayInfo(0)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=None) + HouseDisplayInfo(0)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerF_GTex0') HouseDisplayInfo(1)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skQuidPlayerMMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerM_RTex0') diff --git a/HGame/Classes/Quidditch/Keeper.uc b/HGame/Classes/Quidditch/Keeper.uc index 7920ea9c..bff2f3e7 100644 --- a/HGame/Classes/Quidditch/Keeper.uc +++ b/HGame/Classes/Quidditch/Keeper.uc @@ -35,7 +35,7 @@ loop: defaultproperties { - HouseDisplayInfo(0)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skOliverWoodQuidMesh',MultiSkins[0]=None) + HouseDisplayInfo(0)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skOliverWoodQuidMesh',MultiSkins[0]=Texture'HPModels.Skins.skOliverWoodQuidTex0',MultiSkins[1]=Texture'HPModels.Skins.skOliverWoodQuidTex1',MultiSkins[2]=Texture'HPModels.Skins.skOliverWoodQuidTex2',MultiSkins[3]=Texture'HPModels.Skins.skOliverWoodQuidTex3',MultiSkins[4]=Texture'HPModels.Skins.skOliverWoodQuidTex4') HouseDisplayInfo(1)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerF_RTex0') diff --git a/HGame/Classes/Quidditch/OliverWoodCommentMgr.uc b/HGame/Classes/Quidditch/OliverWoodCommentMgr.uc index 25b45891..fa1038a2 100644 --- a/HGame/Classes/Quidditch/OliverWoodCommentMgr.uc +++ b/HGame/Classes/Quidditch/OliverWoodCommentMgr.uc @@ -66,7 +66,7 @@ function PostBeginPlay() break; } fNextTimeACommentCanBeSaid = 0.0; - fGapTime = (FRand() * (fMaxGapTimeBetweenComments - fMinGapTimeBetweenComments)) + fMinGapTimeBetweenComments; + fGapTime = FRand() * (fMaxGapTimeBetweenComments - fMinGapTimeBetweenComments) + fMinGapTimeBetweenComments; bMute = False; fVolume = 0.69999999; @@ -92,7 +92,7 @@ function float TimeLeftUntilSafeToSayAComment (optional bool bNoGap) { local float fTimeLeft; - fTimeLeft = (fNextTimeACommentCanBeSaid - Level.TimeSeconds) + fNoGapTimeBetweenComments; + fTimeLeft = fNextTimeACommentCanBeSaid - Level.TimeSeconds + fNoGapTimeBetweenComments; if ( bNoGap ) { fTimeLeft += fNoGapTimeBetweenComments; @@ -129,12 +129,12 @@ function bool SayComment (WoodComment eComment, optional bool bNoGap) { return False; } - } else //{ + } else { if ( Level.TimeSeconds < fNextTimeACommentCanBeSaid + fGapTime ) { return False; } - //} + } iCandidate = 0; fTotalWeight = 0.0; bDone = False; @@ -144,18 +144,18 @@ function bool SayComment (WoodComment eComment, optional bool bNoGap) if ( !Comments[eComment].Variant[Variant].bHasBeenSaid ) { fAge = 300.0; - } else //{ + } else { if ( eComment == WC_QuidAdvice ) { fAge = -1.0; } else { - fAge = Level.TimeSeconds - Comments[eComment].Variant[Variant].fTimeLastSaid + fMinTimeBeforeCommentRepeat; + fAge = Level.TimeSeconds - (Comments[eComment].Variant[Variant].fTimeLastSaid + fMinTimeBeforeCommentRepeat); if ( fAge > 300 ) { fAge = 300.0; } } - //} + } if ( fAge > 0.0 ) { Candidates[iCandidate].Variant = Variant; @@ -212,7 +212,6 @@ function InitCommentArray() Comments[0].Variations = 0; - C = 1; for(C = 1; C < MAX_WOOD_COMMENT_NAMES; C++) { Comments[C].Variations = MAX_WOOD_COMMENT_NAMES; @@ -255,7 +254,7 @@ defaultproperties Comments(2)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_22",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[1]=(DlgName="PC_OWd_QuidTut1_28",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[2]=(DlgName="PC_OWd_QuidTut1_29",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[3]=(DlgName="PC_OWd_QuidTut1_31",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[4]=(DlgName="PC_OWd_QuidTut1_32",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[5]=(DlgName="PC_OWd_QuidTut1_33",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) - Comments(3)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_21",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[1]=(DlgName="PC_OWd_QuidIntro_25",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[2]=(DlgName="PC_OWd_QuidIntro_24",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) + Comments(3)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_21",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[1]=(DlgName="PC_OWd_QuidIntro_24",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[2]=(DlgName="PC_OWd_QuidIntro_25",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) Comments(4)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_13",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[1]=(DlgName="PC_OWd_QuidIntro_14",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) @@ -263,7 +262,7 @@ defaultproperties Comments(6)=(Variant[0]=(DlgName="PC_OWd_QuidTut1_34",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) - Comments(7)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_11",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) + Comments(7)=(Variant[0]=(DlgName="PC_OWd_QuidIntro_11",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variant[1]=(DlgName="PC_OWd_QuidIntro_12",dlgSound=None,DlgText="",bHasBeenSaid=False,fTimeLastSaid=0.00),Variations=0,bHasBeenSaid=False,fTimeLastSaid=0.00) bHidden=True diff --git a/HGame/Classes/Quidditch/QuidditchCommentator.uc b/HGame/Classes/Quidditch/QuidditchCommentator.uc index e0dd1068..34b2cbb4 100644 --- a/HGame/Classes/Quidditch/QuidditchCommentator.uc +++ b/HGame/Classes/Quidditch/QuidditchCommentator.uc @@ -130,7 +130,7 @@ function PostBeginPlay() break; } fNextTimeACommentCanBeSaid = 0.0; - fGapTime = (FRand() * (fMaxGapTimeBetweenComments - fMinGapTimeBetweenComments)) + fMinGapTimeBetweenComments; + fGapTime = FRand() * (fMaxGapTimeBetweenComments - fMinGapTimeBetweenComments) + fMinGapTimeBetweenComments; bMute = False; fVolume = 1.0; fillCommentArray(); @@ -156,7 +156,7 @@ function float TimeLeftUntilSafeToSayAComment (optional bool bNoGap) { local float fTimeLeft; - fTimeLeft = (fNextTimeACommentCanBeSaid - Level.TimeSeconds) + fNoGapTimeBetweenComments; + fTimeLeft = fNextTimeACommentCanBeSaid - Level.TimeSeconds + fNoGapTimeBetweenComments; if ( bNoGap ) { fTimeLeft += fNoGapTimeBetweenComments; @@ -226,12 +226,11 @@ function bool SayComment (QuidComment eComment, optional TeamAffiliation eTeam, { while ( Variant < Comments[eComment].House[eHouse].Variations ) { - // JL00DA: if ( !Comments[eComment].House[eHouse].Variant[Variant].bHasBeenSaid ) { fAge = 300.0; } else { - fAge = Level.TimeSeconds - Comments[eComment].House[eHouse].Variant[Variant].fTimeLastSaid + fMinTimeBeforeCommentRepeat; + fAge = Level.TimeSeconds - (Comments[eComment].House[eHouse].Variant[Variant].fTimeLastSaid + fMinTimeBeforeCommentRepeat); if ( fAge > 300 ) { fAge = 300.0; @@ -347,14 +346,11 @@ function fillCommentArray() { Comments[0].House[H].Variations = 0; } - C = 1; - for(C = 1; C < MAX_QUID_COMMENT_NAMES; C++) { for(H = 0; H < MAX_QUID_COMMENT_HOUSE_NAMES; H++) { Comments[C].House[H].Variations = QC_MAX_COMMENT_VARIANTS; - V = 0; for(V = 0; V < QC_MAX_COMMENT_VARIANTS; V++) { sndId = GetCommentId(C,H,V); diff --git a/HGame/Classes/Quidditch/QuidditchCrowd.uc b/HGame/Classes/Quidditch/QuidditchCrowd.uc index 6f05e4f1..8f66640b 100644 --- a/HGame/Classes/Quidditch/QuidditchCrowd.uc +++ b/HGame/Classes/Quidditch/QuidditchCrowd.uc @@ -55,27 +55,27 @@ function Cheer (CheerType eCheerType) { // case 0: case CT_Cheer: - CheerSound = CheerSounds[Rand(4)]; + CheerSound = CheerSounds[Rand(NUM_CHEER_SOUNDS)]; break; // case 1: case CT_CheerLong: - CheerSound = CheerLongSounds[Rand(2)]; + CheerSound = CheerLongSounds[Rand(NUM_CHEER_LONG_SOUNDS)]; break; // case 2: case CT_Boo: - CheerSound = BooSounds[Rand(5)]; + CheerSound = BooSounds[Rand(NUM_BOO_SOUNDS)]; break; // case 3: case CT_BooLong: - CheerSound = BooLongSounds[Rand(1)]; + CheerSound = BooLongSounds[Rand(NUM_BOO_LONG_SOUNDS)]; break; // case 4: case CT_Coax: - CheerSound = CoaxSounds[Rand(1)]; + CheerSound = CoaxSounds[Rand(NUM_COAX_SOUNDS)]; break; // case 5: case CT_Aw: - CheerSound = AwSounds[Rand(1)]; + CheerSound = AwSounds[Rand(NUM_AW_SOUNDS)]; break; default: } @@ -106,7 +106,6 @@ function Cheer (CheerType eCheerType) fRadius = CheerRadius * 7.0; break; default: - break; } PlaySound(CheerSound,SLOT_Misc,CheerVolume / 255.0,,fRadius,fPitch); if ( NextCrowd != None ) diff --git a/HGame/Classes/Quidditch/QuidditchCrowdDialogMgr.uc b/HGame/Classes/Quidditch/QuidditchCrowdDialogMgr.uc index 849947e4..66654f8e 100644 --- a/HGame/Classes/Quidditch/QuidditchCrowdDialogMgr.uc +++ b/HGame/Classes/Quidditch/QuidditchCrowdDialogMgr.uc @@ -102,7 +102,7 @@ function PostBeginPlay() CurrentSpeakingCrowd = SpeakingCrowds; PickNextSpeakingCrowd(); fNextTimeALineCanBeSaid = 0.0; - fGapTime = (FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines)) + fMinGapTimeBetweenLines; + fGapTime = FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines) + fMinGapTimeBetweenLines; } function SetOpponent (HouseAffiliation eNewOpponent) @@ -114,7 +114,7 @@ function SetOpponent (HouseAffiliation eNewOpponent) function StartDialog() { - fNextTimeALineCanBeSaid = (Level.TimeSeconds + (FRand() * 1.0)) + 1.0; + fNextTimeALineCanBeSaid = Level.TimeSeconds + (FRand() * 1.0) + 1.0; SetTimer((fNextTimeALineCanBeSaid + fGapTime) - Level.TimeSeconds,False); } @@ -197,12 +197,12 @@ function bool SayDialogLine (optional bool bNoGap) { return False; } - } else //{ + } else { if ( Level.TimeSeconds < fNextTimeALineCanBeSaid + fGapTime ) { return False; } - //} + } switch (CurrentSpeakingCrowd.Affiliation) { // case 0: @@ -238,7 +238,7 @@ function bool SayDialogLine (optional bool bNoGap) { fAge = 300.0; } else { - fAge = Level.TimeSeconds - Dialog.House[eHouse].Variant[Variant].fTimeLastSaid + fMinTimeBeforeLineRepeat; + fAge = Level.TimeSeconds - (Dialog.House[eHouse].Variant[Variant].fTimeLastSaid + fMinTimeBeforeLineRepeat); if ( fAge > 300 ) { fAge = 300.0; diff --git a/HGame/Classes/Quidditch/QuidditchDirector.uc b/HGame/Classes/Quidditch/QuidditchDirector.uc index 06ec3635..9aef5ea5 100644 --- a/HGame/Classes/Quidditch/QuidditchDirector.uc +++ b/HGame/Classes/Quidditch/QuidditchDirector.uc @@ -433,8 +433,8 @@ function SetHouses() Commentator.SetOpponent(HA_Slytherin); break; default: + Log("QuidditchDirector: Warning: Opponent property not set properly"); } - Log("QuidditchDirector: Warning: Opponent property not set properly"); } switch (Opponent) { @@ -849,7 +849,7 @@ state GamePlay } CameraTarget.SetTargetTrackDist(SnitchTrackDistMax); fTrackingOffset = (1.0 - (fProgressPercent / 100.0)) * fSnitchTrackingOffset; - fCompression = 1.0 - (fProgressPercent / 100.0) * (fSnitchNeutralRadiusAt0 - fSnitchNeutralRadiusAt100) / fSnitchNeutralRadiusAt0; + fCompression = 1.0 - (fProgressPercent / 100.0) * ((fSnitchNeutralRadiusAt0 - fSnitchNeutralRadiusAt100) / fSnitchNeutralRadiusAt0); fMaxGainRadius = fCompression * fSnitchMaxGainRadiusAt0; fNeutralRadius = fCompression * fSnitchNeutralRadiusAt0; fMaxLossRadius = fCompression * fSnitchMaxLossRadiusAt0; @@ -891,7 +891,7 @@ state GamePlay HarryHeading = vector(harry.Rotation); SnitchFromHarry = Snitch.Location - harry.Location; bSnitchInFront = (SnitchFromHarry Dot HarryHeading) > 0.0; - if ( !Snitch.bHidden && bSnitchInFront && (fProximity < 300) && SeekerIsOutOfWay() ) + if ( !Snitch.bHidden && bSnitchInFront && fProximity < 300 && SeekerIsOutOfWay() ) { if ( !bCanReachForSnitch ) { @@ -915,8 +915,7 @@ state GamePlay } } PercentDone = fProgressPercent; - //if ( (PercentDone < LastPercentDone) && !(PercentDone == 98.0) && (LastPercentDone > 98.0) ) - if ( (PercentDone < LastPercentDone) && !(PercentDone == 98.0 && (LastPercentDone > 98.0)) ) //fix for progress bar not flashing white when losing progress (thanks to UnDrew for finding this) -AdamJD + if ( (PercentDone < LastPercentDone) && !(PercentDone == 98.0 && (LastPercentDone > 98.0)) ) //UTPT forgot to add brackets -AdamJD { ProgressBar.SetProgress(PercentDone,True,1.0); } else { @@ -928,7 +927,7 @@ state GamePlay //KW left this empty? -AdamJD // goto JL055E; } - if ( bCanReachForSnitch && (fProgressPercent > 98.0) /*&& !bFinalMatch && !bInTrench*/ ) //UTPT decompiled this wrong -AdamJD + if ( bCanReachForSnitch && fProgressPercent > 98.0 && !(bFinalMatch && !bInTrench) ) //UTPT forgot to add brackets -AdamJD { Snitch.SetAltTrail(True); ProgressBar.SetFlashing(True); @@ -960,7 +959,7 @@ state GamePlay { bSnitchVisible = False; } else { - if ( !bSnitchVisible && ((Commentator == None) || Commentator.SayComment(QC_TheresTheSnitch)) ) + if ( !bSnitchVisible && (Commentator == None || Commentator.SayComment(QC_TheresTheSnitch)) ) { bSnitchVisible = True; } @@ -1015,12 +1014,12 @@ state GamePlay } } //} - } else //{ + } else { if ( (Commentator != None) && ((fProgressPercent < 98.0) || bSeekerJoinedPursuit) ) { Commentator.SayComment(QC_InTrenchRun); } - //} + } } } if ( Level.TimeSeconds > fTimeToCheer ) @@ -1256,7 +1255,6 @@ state GamePlay default: } } else { - // JL0117: Super.OnTouchEvent(Subject,Object); } } @@ -1362,7 +1360,7 @@ state GamePlay } GotoState('GameLost'); } else { - Trigger(Other,EventInstigator); + Super.Trigger(Other,EventInstigator); } //} } @@ -1415,7 +1413,7 @@ state GamePlay if ( bCanReachForSnitch ) { fProximity = VSize(harry.Location - Snitch.Location); - if ( (fProgressPercent > 98.0) /*&& !bFinalMatch && !bInTrench*/ ) //UTPT decompiled this wrong -AdamJD + if ( (fProgressPercent > 98.0) && !(bFinalMatch && !bInTrench) ) //UTPT forgot to add brackets -AdamJD { bCanReachForSnitch = False; harry.SetReaching(False); @@ -1796,7 +1794,7 @@ state GameLost Log(string(Name) $ " triggering event '" $ string(MatchEvents.Died) $ "'"); TriggerEvent(MatchEvents.Died,self,None); } - } else //{ + } else { if ( bInTrench ) { PlayerHarry.ClientMessage(string(Name) $ " triggering event '" $ string(MatchEvents_Final.Lost) $ "'"); @@ -1809,7 +1807,7 @@ state GameLost Log(string(Name) $ " triggering event '" $ string(MatchEvents.Lost) $ "'"); TriggerEvent(MatchEvents.Lost,self,None); } - //} + } } begin: @@ -1865,7 +1863,7 @@ begin: { Commentator.SayComment(QC_Dead,,True); Sleep(Commentator.TimeLeftUntilSafeToSayAComment(True)); - } else //{ + } else { if ( !bInTrench ) { Commentator.SayComment(QC_CaughtSnitch,TA_Opponent,True); @@ -1880,7 +1878,7 @@ begin: Commentator.SayComment(QC_SigningOff); Sleep(Commentator.TimeLeftUntilSafeToSayAComment(True)); } - //} + } } else { Sleep(0.2); } @@ -1954,7 +1952,7 @@ defaultproperties // Tuning_HarryProgress=(PursuitTime=25.00,PursuitTime_Nimbus2001=12.00,Penalties=12.00(Bludgered=25.00,Bumped=12.00,Hit=5.00,Kicked=10.00),), // - //All these are taken from the editor using a retail HGame because KW set up all the correct values in the editor -AdamJD + //all these are taken from the editor using a retail HGame because KW set up all the correct values in the editor -AdamJD Tuning_Seeker(0)=(PursuitTime=20.00,RecoveryTime=5.00,Penalties=(Bumped=10.00,Kicked=10.00),PositionChangeInterval=(Min=2.00,Max=4.00),KickInterval=(Min=2.00,Max=3.00),KickDamage=5) Tuning_Seeker(1)=(PursuitTime=18.20,RecoveryTime=5.00,Penalties=(Bumped=10.00,Kicked=10.00),PositionChangeInterval=(Min=1.50,Max=2.50),KickInterval=(Min=1.50,Max=3.00),KickDamage=5) @@ -1995,7 +1993,7 @@ defaultproperties CameraTrailDist=175.00 - RandSeed=(SeedA=1.14223976923713221E33,SeedB=14991598592.00,SeedC=4.56959290224864296E33,SeedD=1.71810775472789258E19) + RandSeed=(SeedA=1.1422397692371322E33,SeedB=14991598592E10,SeedC=4.569592902248643E33,SeedD=1.7181077547278926E19) bNeedsCommentator=True diff --git a/HGame/Classes/Quidditch/QuidditchLessonDirector.uc b/HGame/Classes/Quidditch/QuidditchLessonDirector.uc index 14fe4f03..04894000 100644 --- a/HGame/Classes/Quidditch/QuidditchLessonDirector.uc +++ b/HGame/Classes/Quidditch/QuidditchLessonDirector.uc @@ -137,7 +137,7 @@ state GameSnitchLesson extends GamePlay { bSaid = CommentMgr.SayComment(WC_CatchSnitch); } - if ( !bSaid && (fProgressPercent > 97) && !bCanReachForSnitch ) + if ( !bSaid && fProgressPercent > 97 && !bCanReachForSnitch ) { bSaid = CommentMgr.SayComment(WC_TooOffCenter); } @@ -205,7 +205,7 @@ state GameSnitchLesson extends GamePlay if ( fTimeLeft > 0.0 ) { SetTimer(fTimeLeft,False); - } else { + } else { if ( !bBlewEndWhistle ) { Wood.PlaySound(EndWhistle,SLOT_Interact,1.0,,20000.0); @@ -283,7 +283,7 @@ state GameMockGame extends GamePlay { bSaid = CommentMgr.SayComment(WC_CatchSnitch); } - if ( !bSaid && (fProgressPercent > 97) && !bCanReachForSnitch && SeekerIsOutOfWay() ) + if ( !bSaid && fProgressPercent > 97 && !bCanReachForSnitch && SeekerIsOutOfWay() ) { bSaid = CommentMgr.SayComment(WC_TooOffCenter); } @@ -329,7 +329,7 @@ state GameMockGame extends GamePlay } TriggerEventDelayed(FMax(5.0,CommentMgr.TimeLeftUntilSafeToSayAComment(True)),MatchEvents.End,'GameCutScene'); } else { - Trigger(Other,EventInstigator); + Super.Trigger(Other,EventInstigator); } } @@ -382,7 +382,7 @@ state GameMockGame extends GamePlay if ( fTimeLeft > 0.0 ) { SetTimer(fTimeLeft,False); - } else { + } else { if ( !bBlewEndWhistle ) { Wood.PlaySound(EndWhistle,SLOT_Interact,1.0,,20000.0); diff --git a/HGame/Classes/Quidditch/QuidditchPawn.uc b/HGame/Classes/Quidditch/QuidditchPawn.uc index 40c28e8a..03a7f377 100644 --- a/HGame/Classes/Quidditch/QuidditchPawn.uc +++ b/HGame/Classes/Quidditch/QuidditchPawn.uc @@ -351,7 +351,7 @@ function UpdateWoosh (float DeltaTime) fDistanceFromCamera = VSize(Location - PlayerHarry.Cam.Location); if ( bCanWoosh && (Level.TimeSeconds > fNextTimeSafeToWoosh) && (fLastDistanceFromCamera >= 180) && (fDistanceFromCamera < 180) && (VSize(Velocity) > 75) ) { - Woosh = WooshSounds[Rand(4)]; + Woosh = WooshSounds[Rand(NUM_WOOSH_SOUNDS)]; PlaySound(Woosh,SLOT_Interface,0.81,,500.0,RandRange(0.81,1.25)); fNextTimeSafeToWoosh = Level.TimeSeconds + GetSoundDuration(Woosh); } @@ -415,7 +415,7 @@ function SeekTarget (Pawn NewTarget, optional float fNewLaunchProximity) { GotoState('GetBackOnPath'); } else //{ - if ( !IsInState('Seeking') || IsInState('GetBackOnPath') ) + if ( !(IsInState('Seeking') || IsInState('GetBackOnPath')) ) //UTPT forgot to add brackets -AdamJD { GotoState('Seeking'); } @@ -449,7 +449,7 @@ function ConvertIntoProjectile (Actor NewEmitter, Vector NewVelocity, optional f Velocity = NewVelocity; Acceleration = vect(0.00,0.00,0.00); bProjectile = True; - SetCollision(,False,False); + SetCollision(,[NewBlockActors]False,[NewBlockPlayers]False); if ( fLife == 0 ) { fLifeSpanAsProjectile = fDefaultLifeSpanAsProjectile; @@ -514,7 +514,7 @@ function DeployAsMine (Pawn NewTarget, optional Actor NewEmitter, optional float Acceleration = vect(0.00,0.00,0.00); DeployedLocation = Location; bMine = True; - SetCollision(,False,False); + SetCollision(,[NewBlockActors]False,[NewBlockPlayers]False); if ( fLife == 0 ) { fLifeSpanAsMine = fDefaultLifeSpanAsMine; @@ -677,7 +677,7 @@ state Pursue } if ( Commentator != None ) { - Commentator.SayComment(/*21*/QC_BludgerPursuit,,True); + Commentator.SayComment(QC_BludgerPursuit,,True); } if ( fPursuitTimeLimit != 0 ) { @@ -709,9 +709,7 @@ state Pursue local vector TargetDir; local vector X,Y,Z; - Super.Tick( DeltaTime ); - - CheckIfTimeForSpeedChange(); + Global.Tick( DeltaTime ); if ( Target == None || Target.bHidden ) { @@ -745,12 +743,12 @@ state Pursue { if ( Commentator != None ) { - Commentator.SayComment(/*24*/QC_BludgerHit,,True); + Commentator.SayComment(QC_BludgerHit,,True); } } else { if ( Commentator != None ) { - Commentator.SayComment(/*23*/QC_BludgerMiss,,True); + Commentator.SayComment(QC_BludgerMiss,,True); } } GotoState('GetBackOnPath'); @@ -760,7 +758,7 @@ state Pursue { if ( Commentator != None ) { - Commentator.SayComment(/*23*/QC_BludgerMiss,,True); + Commentator.SayComment(QC_BludgerMiss,,True); } GotoState('GetBackOnPath'); } @@ -897,8 +895,7 @@ state GetBackOnPath //UTPT didn't add this for some reason -AdamJD event Tick( float DeltaTime ) { - Super.Tick( DeltaTime ); - CheckIfTimeForSpeedChange(); + Global.Tick( DeltaTime ); } event FinishedInterpolation (InterpolationPoint Other) diff --git a/HGame/Classes/Quidditch/QuidditchPlayer.uc b/HGame/Classes/Quidditch/QuidditchPlayer.uc index 3d49564a..a17f6633 100644 --- a/HGame/Classes/Quidditch/QuidditchPlayer.uc +++ b/HGame/Classes/Quidditch/QuidditchPlayer.uc @@ -266,7 +266,7 @@ function FlyOnPath (name Path, optional int StartPoint) if ( I != None ) { SetLocation(I.Location); - SetCollision(True,False,True); + SetCollision([NewColActors]True,[NewBlockActors]False,[NewBlockPlayers]True); bCollideWorld = False; bInterpolating = True; // SetPhysics(0); @@ -463,7 +463,7 @@ function DoKick (Pawn KickTarget) PlayAnim('PushRight',1.0,0.2); } } - PlaySound(Emotes[eSex].KickEmotes[Rand(8)],SLOT_Talk,,True); + PlaySound(Emotes[eSex].KickEmotes[Rand(NUM_KICK_EMOTES)],SLOT_Talk,,True); if ( TargetDist < CollisionRadius * 3.0 ) { KickTarget.TakeDamage(KickDamage,self,Location,100 * Normal(TargetDir),'Kicked'); @@ -514,7 +514,7 @@ function UpdateWoosh (float DeltaTime) fDistanceFromCamera = VSize(Location - harry.Cam.Location); if ( bCanWoosh && (Level.TimeSeconds > fNextTimeSafeToWoosh) && (fLastDistanceFromCamera >= 180) && (fDistanceFromCamera < 180) && (VSize(Velocity) > 200) ) { - Woosh = WooshSounds[Rand(4)]; + Woosh = WooshSounds[Rand(NUM_WOOSH_SOUNDS)]; PlaySound(Woosh,SLOT_Misc,0.69999999,,500.0,RandRange(0.81,1.25)); fNextTimeSafeToWoosh = Level.TimeSeconds + GetSoundDuration(Woosh); } @@ -575,7 +575,7 @@ function Bump (Actor Other) } else { PlayAnim('Bump'); } - PlaySound(HitSounds[Rand(3)],SLOT_Interact,0.69999999,,1000.0,RandRange(0.81,1.25)); + PlaySound(HitSounds[Rand(NUM_HIT_SOUNDS)],SLOT_Interact,0.69999999,,1000.0,RandRange(0.81,1.25)); pTarget.TakeDamage(Damage,self,Location,100 * Normal(Velocity),'Collided'); Velocity = vect(0.00,0.00,1.00); bHit = True; @@ -603,7 +603,7 @@ function TakeDamage (int Damage, Pawn InstigatedBy, Vector HitLocation, Vector M fHealth -= fBumpedPenalty; } //} - PlaySound(Emotes[eSex].OuchEmotes[Rand(8)],SLOT_Talk,,True); + PlaySound(Emotes[eSex].OuchEmotes[Rand(NUM_OUCH_EMOTES)],SLOT_Talk,,True); } else { Damage = 0; } @@ -774,6 +774,8 @@ state Pursue local vector TargetDir; local float TargetDist; local float TargetSpeed; + local float CurrentSpeed; + local float fLastHorzOffset, fLastVertOffset; local float fPitch; local sound Woosh; @@ -792,17 +794,28 @@ state Pursue GotoState( 'GetBackOnPath' ); } - if ( LookForTarget == None || LookForTarget.bHidden ) + if ( LookForTarget == None ) { PathToFly = Path_Recovery; GotoState( 'GetBackOnPath' ); } + + fLastHorzOffset = fTargetTrackHorzOffset; + fLastVertOffset = fTargetTrackVertOffset; if ( Level.TimeSeconds > fTimeForNextOffset ) { - fTargetTrackHorzOffset = RandRange( -TrackingOffsetRange_Horz, TrackingOffsetRange_Horz ); - fTargetTrackVertOffset = RandRange( -TrackingOffsetRange_Vert, TrackingOffsetRange_Vert ); - fTimeForNextOffset = Level.TimeSeconds + RandRange( 2.0, 4.0 ); + if ( fHealth < 95.0 ) + { + fTargetTrackHorzOffset = RandRange( -TrackingOffsetRange_Horz, TrackingOffsetRange_Horz ); + fTargetTrackVertOffset = RandRange( -TrackingOffsetRange_Vert, TrackingOffsetRange_Vert ); + } + else + { + fTargetTrackHorzOffset = 0.0; + fTargetTrackVertOffset = 0.0; + } + fTimeForNextOffset = Level.TimeSeconds + RandRange( fPositionChangeIntervalMin, fPositionChangeIntervalMax ); } GetAxes( LookForTarget.Rotation, TargetX, TargetY, TargetZ ); @@ -817,7 +830,7 @@ state Pursue { AccelRate = 500.0; } - if ( bStunned ) + else if ( bStunned ) { AccelRate = 1100.0; } @@ -842,16 +855,23 @@ state Pursue AirSpeed = 0; } } + + CurrentSpeed = VSize( Velocity ); + if ( CurrentSpeed >= 150 || Abs(CurrentSpeed - AirSpeed) < 75 ) + { + bEasingUpToSpeed = False; + } + + if ( (Level.TimeSeconds > fNextTimeSafeToWoosh && CurrentSpeed > 75) && (Abs(fTargetTrackHorzOffset - fLastHorzOffset) > SlowdownRadius || Abs(fTargetTrackVertOffset - fLastVertOffset) > SlowdownRadius) ) + { + Woosh = SlowWooshSounds[Rand(NUM_SLOW_WOOSH_SOUNDS)]; + fPitch = RandRange(1.0,1.5); + PlaySound(Woosh,SLOT_Misc,1.0,,1000.0,fPitch); + fNextTimeSafeToWoosh = Level.TimeSeconds + (GetSoundDuration(Woosh) / fPitch) + 0.1; + } - if ( !bStunned ) + if ( !bStunned && !bCatchingTarget ) { - if ( (Level.TimeSeconds > fNextTimeSafeToWoosh) ) - { - Woosh = SlowWooshSounds[Rand(5)]; - fPitch = RandRange(1.0,1.5); - PlaySound(Woosh,SLOT_Misc,1.0,,1000.0,fPitch); - fNextTimeSafeToWoosh = Level.TimeSeconds + (GetSoundDuration(Woosh) / fPitch) + 0.1; - } if ( Level.TimeSeconds > fTimeForNextKickUpdate || Level.TimeSeconds > fTimeForNextKick ) { UpdateKickTarget(); @@ -859,11 +879,11 @@ state Pursue } if ( Level.TimeSeconds > fTimeForNextKick ) { - if ( KickTarget != None && KickTargetDist <= CollisionRadius * 3.0 ) + if ( fHealth < 95.0 && (KickTarget != None && KickTargetDist <= CollisionRadius * 3.0) ) { DoKick( KickTarget ); } - fTimeForNextKick = Level.TimeSeconds + RandRange( 1.5, 3.0 ); + fTimeForNextKick = Level.TimeSeconds + RandRange( fKickIntervalMin, fKickIntervalMax ); } if ( Level.TimeSeconds > fTimeForNextWatchUpdate ) { @@ -931,7 +951,7 @@ Begin: state GetBackOnPath extends Fly { - //UTPT added this for some reason -AdamJD + //UTPT added these for some reason -AdamJD // ignores HitWall, Tick; function BeginState() @@ -1024,7 +1044,7 @@ state GetBackOnPath extends Fly GetAxes(Rotation,X,Y,Z); ReturnPath[0].StartControlPoint = 1000.0 * X; ReturnPath[0].EndControlPoint = -1000.0 * X; - SetCollision(True,False,True); + SetCollision([NewColActors]True,[NewBlockActors]False,[NewBlockPlayers]True); bCollideWorld = False; bInterpolating = True; // SetPhysics(0); @@ -1038,13 +1058,13 @@ state GetBackOnPath extends Fly //UTPT didn't add this for some reason -AdamJD event Tick( float DeltaTime ) { - Super.Tick( DeltaTime ); + Global.Tick( DeltaTime ); } //UTPT didn't add this for some reason -AdamJD function HitWall(Vector HitNormal, Actor Wall) { - Super.HitWall(HitNormal, Wall); + Global.HitWall(HitNormal, Wall); } function EndState() @@ -1130,7 +1150,7 @@ defaultproperties //UTPT didn't decompile the emote arrays correctly -AdamJD Emotes(0)=(KickEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick01',KickEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick02',KickEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick03',KickEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick04',KickEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick05',KickEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick06',KickEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick07',KickEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_kick08',OuchEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch01',OuchEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch02',OuchEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch03',OuchEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch04',OuchEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch05',OuchEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch06',OuchEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch07',OuchEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_mseeker_ouch08') - Emotes(1)=(KickEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick01',KickEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick02',KickEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick03',KickEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick04',KickEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick05',KickEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick06',KickEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick07',KickEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick08'),OuchEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch01',OuchEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch02',OuchEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch03',OuchEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch04',OuchEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch05',OuchEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch06',OuchEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch07',OuchEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch08') + Emotes(1)=(KickEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick01',KickEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick02',KickEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick03',KickEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick04',KickEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick05',KickEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick06',KickEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick07',KickEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_kick08',OuchEmotes[0]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch01',OuchEmotes[1]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch02',OuchEmotes[2]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch03',OuchEmotes[3]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch04',OuchEmotes[4]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch05',OuchEmotes[5]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch06',OuchEmotes[6]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch07',OuchEmotes[7]=Sound'HPSounds.Quidditch_sfx.Q_fseeker_ouch08') // eSex=2 eSex=SX_Neutral diff --git a/HGame/Classes/Quidditch/QuidditchPlayerDialogMgr.uc b/HGame/Classes/Quidditch/QuidditchPlayerDialogMgr.uc index 8b5abef3..03f6b708 100644 --- a/HGame/Classes/Quidditch/QuidditchPlayerDialogMgr.uc +++ b/HGame/Classes/Quidditch/QuidditchPlayerDialogMgr.uc @@ -103,7 +103,7 @@ function PostBeginPlay() CurrentSpeakingPlayer = SpeakingPlayers; PickNextSpeakingPlayer(); fNextTimeALineCanBeSaid = 0.0; - fGapTime = (FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines)) + fMinGapTimeBetweenLines; + fGapTime = FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines) + fMinGapTimeBetweenLines; fillDialogArray(); } @@ -115,7 +115,7 @@ function SetOpponent (HouseAffiliation eNewOpponent) function StartDialog() { - fNextTimeALineCanBeSaid = (Level.TimeSeconds + (FRand() * 1.0)) + 1.0; + fNextTimeALineCanBeSaid = Level.TimeSeconds + (FRand() * 1.0) + 1.0; SetTimer((fNextTimeALineCanBeSaid + fGapTime) - Level.TimeSeconds,False); } @@ -205,12 +205,12 @@ function bool SayDialogLine (optional bool bNoGap) { return False; } - } else //{ + } else { if ( Level.TimeSeconds < fNextTimeALineCanBeSaid + fGapTime ) { return False; } - //} + } switch (CurrentSpeakingPlayer.eSex) { case SX_Male: diff --git a/HGame/Classes/Quidditch/QuidditchTauntMgr.uc b/HGame/Classes/Quidditch/QuidditchTauntMgr.uc index 93644b98..400c4afe 100644 --- a/HGame/Classes/Quidditch/QuidditchTauntMgr.uc +++ b/HGame/Classes/Quidditch/QuidditchTauntMgr.uc @@ -101,7 +101,7 @@ function PostBeginPlay() break; } fNextTimeALineCanBeSaid = 0.0; - fGapTime = (FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines)) + fMinGapTimeBetweenLines; + fGapTime = FRand() * (fMaxGapTimeBetweenLines - fMinGapTimeBetweenLines) + fMinGapTimeBetweenLines; bSeekersInRange = False; fTimeInRange = -1.0; InitTauntArray(); @@ -186,7 +186,7 @@ function bool SayATaunt() harry.fTimeLastDrank = -1.0; } } - if ( !bSaid && (Level.TimeSeconds - fNextTimeALineCanBeSaid) > fMinGapTimeBetweenLines ) + if ( !bSaid && (Level.TimeSeconds - fNextTimeALineCanBeSaid > fMinGapTimeBetweenLines) ) { fHarryTimeSinceKicked = Level.TimeSeconds - harry.fTimeLastKicked; fSeekerTimeSinceKicked = Level.TimeSeconds - Seeker.fTimeLastKicked; @@ -228,7 +228,7 @@ function float TimeLeftUntilSafeToSayALine (optional bool bNoGap) { local float fTimeLeft; - fTimeLeft = (fNextTimeALineCanBeSaid - Level.TimeSeconds) + fNoGapTimeBetweenLines; + fTimeLeft = fNextTimeALineCanBeSaid - Level.TimeSeconds + fNoGapTimeBetweenLines; if ( bNoGap ) { fTimeLeft += fNoGapTimeBetweenLines; @@ -262,12 +262,12 @@ function bool SayTaunt (QuidTaunt eTaunt, optional TeamAffiliation eTeam, option { return False; } - } else //{ + } else { if ( Level.TimeSeconds < fNextTimeALineCanBeSaid + fGapTime ) { return False; } - //} + } switch (eTeam) { // case 0: @@ -296,7 +296,7 @@ function bool SayTaunt (QuidTaunt eTaunt, optional TeamAffiliation eTeam, option { fAge = 300.0; } else { - fAge = Level.TimeSeconds - Taunts[eTaunt].House[eHouse].Variant[Variant].fTimeLastSaid + 120.0; + fAge = Level.TimeSeconds - (Taunts[eTaunt].House[eHouse].Variant[Variant].fTimeLastSaid + fMinTimeBeforeLineRepeat); if ( fAge > 300 ) { fAge = 300.0; @@ -362,7 +362,6 @@ function InitTauntArray() { Taunts[0].House[H].Variations = 0; } - C = 1; for(C = 1; C < MAX_QUID_TAUNT_NAMES; C++) { for(H = 0; H < MAX_QUID_TAUNT_HOUSE_NAMES; H++) diff --git a/HGame/Classes/Quidditch/Seeker.uc b/HGame/Classes/Quidditch/Seeker.uc index bddf2a4c..07a6d7b6 100644 --- a/HGame/Classes/Quidditch/Seeker.uc +++ b/HGame/Classes/Quidditch/Seeker.uc @@ -73,13 +73,13 @@ state Fly defaultproperties { - HouseDisplayInfo(0)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=None) + HouseDisplayInfo(0)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerF_GTex0',MultiSkins[1]=Texture'HPModels.Skins.skQuidPlayerF_Tex1') - HouseDisplayInfo(1)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerF_RTex0') + HouseDisplayInfo(1)=(Sex=SX_Female,Mesh=SkeletalMesh'HPModels.skQuidPlayerFMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerF_RTex0',MultiSkins[1]=Texture'HPModels.Skins.skQuidPlayerF_Tex1') - HouseDisplayInfo(2)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skQuidPlayerMMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerM_HTex0') + HouseDisplayInfo(2)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skQuidPlayerMMesh',MultiSkins[0]=Texture'HPModels.Skins.skQuidPlayerM_HTex0',MultiSkins[1]=Texture'HPModels.Skins.skQuidPlayerM_Tex1') - HouseDisplayInfo(3)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skDracoQuidMesh',MultiSkins[0]=None) + HouseDisplayInfo(3)=(Sex=SX_Male,Mesh=SkeletalMesh'HPModels.skDracoQuidMesh',MultiSkins[0]=Texture'HPModels.Skins.skDracoQuidTex0',MultiSkins[1]=Texture'HPModels.Skins.skDracoQuidTex1',MultiSkins[2]=Texture'HPModels.Skins.skDracoQuidTex2') // EnemyHealthBar=4 EnemyHealthBar=EnemyBar_Seeker diff --git a/HGame/Classes/Quidditch/Snitch.uc b/HGame/Classes/Quidditch/Snitch.uc index 96817162..65c56bd6 100644 --- a/HGame/Classes/Quidditch/Snitch.uc +++ b/HGame/Classes/Quidditch/Snitch.uc @@ -260,6 +260,7 @@ event Tick (float DeltaTime) local Vector Dir; local Vector RelJerkOffset; //local float Dist; + local float fDist; if ( bJerking && (Level.TimeSeconds > fTimeForNextJerk) ) { @@ -271,14 +272,13 @@ event Tick (float DeltaTime) if ( bJerking ) { Dir = DestJerkOffset - JerkOffset; - Dist = VSize(Dir); - if ( Dist > 0.0 ) + fDist = VSize(Dir); + if ( fDist > 0.0 ) { - if ( Dist > 0.01 ) + if ( fDist > 0.01 ) { - JerkOffset += Normal(Dir) * Min(Dist,JerkSpeed * DeltaTime); + JerkOffset += Normal(Dir) * Min(fDist,JerkSpeed * DeltaTime); } - //UTPT added this in the if statement above, the snitch used to be too snappy/unnatural looking -AdamJD else { JerkOffset = DestJerkOffset; @@ -301,7 +301,7 @@ event Tick (float DeltaTime) { Halo.bHidden = !Halo.bHidden; } - fTimeForNextFlash += 0.05; + fTimeForNextFlash += FlashPeriod; if ( fTimeForNextFlash < Level.TimeSeconds ) { fTimeForNextFlash = Level.TimeSeconds; @@ -313,7 +313,7 @@ event Tick (float DeltaTime) HistoryTimer = 0.0; vPositionHistory[iNextHistorySlot] = Location; iNextHistorySlot++; - if ( iNextHistorySlot >= 4 ) + if ( iNextHistorySlot >= NUM_POSITION_HISTORY ) { iNextHistorySlot = 0; } diff --git a/HGame/Classes/SpellCursor.uc b/HGame/Classes/SpellCursor.uc index 2d22c062..ce769562 100644 --- a/HGame/Classes/SpellCursor.uc +++ b/HGame/Classes/SpellCursor.uc @@ -2,7 +2,7 @@ // SpellCursor. //================================================================================ -class SpellCursor extends ParticleFX; +class SpellCursor extends ParticleFX; //texture package import -AdamJD #exec OBJ LOAD FILE=..\Textures\SpellShapes.utx PACKAGE=SpellShapes.SpellFX @@ -114,13 +114,13 @@ function TurnOnSpellGestureFX (ESpellType SpellType, Vector vLocation, float fFX { return; } - if ( fFXSize < 50.0 ) + if ( fFXSize < MIN_GESTURE_SIZE ) { - fFXSize = 50.0; + fFXSize = MIN_GESTURE_SIZE; } else //{ - if ( fFXSize > 100.0 ) + if ( fFXSize > MAX_GESTURE_SIZE ) { - fFXSize = 100.0; + fFXSize = MAX_GESTURE_SIZE; } //} SpellGesture.SetLocation(vLocation); @@ -204,7 +204,7 @@ function UpdateCursor (optional bool bJustStopAtClosestPawnOrWall) //} vLOS_Dir = Normal(vLOS_End - vLOS_Start); aHitActor = Trace(vHitLocation,vHitNormal,vLOS_End,PlayerHarry.Cam.Location); - if ( (aHitActor != None) && !aHitActor.IsA('harry') ) + if ( (aHitActor != None) && !aHitActor.IsA('BaseHarry') ) { bHitSomething = True; vLOS_End = vHitLocation + (vLOS_Dir * 5.0); @@ -231,14 +231,17 @@ function UpdateCursor (optional bool bJustStopAtClosestPawnOrWall) } if ( PlayerHarry.IsInSpellBook(aHitActor.eVulnerableToSpell) || (bJustStopAtClosestPawnOrWall) ) { - if ( aHitActor.IsA('spellTrigger') && !spellTrigger(aHitActor).bInitiallyActive ) + if ( aHitActor.IsA('spellTrigger') ) { - continue; - } - if ( spellTrigger(aHitActor).bHitJustFromFront && !IsHarryFacingTarget(HitActor) ) - { - continue; - } + if( !spellTrigger(aHitActor).bInitiallyActive ) + { + continue; + } + if ( spellTrigger(aHitActor).bHitJustFromFront && !IsHarryFacingTarget(HitActor) ) + { + continue; + } + } if ( !bJustStopAtClosestPawnOrWall ) { aPossibleTarget = aHitActor; diff --git a/HGame/Classes/Spells/AragogSpellAttack.uc b/HGame/Classes/Spells/AragogSpellAttack.uc index c3193711..f02f0912 100644 --- a/HGame/Classes/Spells/AragogSpellAttack.uc +++ b/HGame/Classes/Spells/AragogSpellAttack.uc @@ -126,6 +126,7 @@ state StateFlying } } begin: + loop: Sleep(1.0); goto ('Loop'); } diff --git a/HGame/Classes/Spells/spellFire.uc b/HGame/Classes/Spells/spellFire.uc index ae888b6c..727f3b19 100644 --- a/HGame/Classes/Spells/spellFire.uc +++ b/HGame/Classes/Spells/spellFire.uc @@ -122,7 +122,7 @@ state StateFlying { Velocity.Z += -fGravityEffect * fTimeDelta; } else { - Velocity.Z += -fGravityEffect / 2 * fTimeDelta; + Velocity.Z += (-fGravityEffect / 2) * fTimeDelta; } if ( fxFlyParticleEffect != None ) { @@ -130,6 +130,7 @@ state StateFlying } } begin: + loop: Sleep(1.0); goto ('Loop'); } diff --git a/HGame/Classes/Spells/spellFireLarge.uc b/HGame/Classes/Spells/spellFireLarge.uc index 1c181359..5bbc8978 100644 --- a/HGame/Classes/Spells/spellFireLarge.uc +++ b/HGame/Classes/Spells/spellFireLarge.uc @@ -86,7 +86,7 @@ function ShootFireballs() NumFireballs = 5; rotate_fireball = rotator(harrys_head - Location); rotate_fireball.Roll = 0; - rotate_fireball.Pitch += 65536 * 10 / 4; + rotate_fireball.Pitch += (65536 * 10) / 4; PlayerHarry.ShakeView(0.31,200.0,200.0); // I = 0; // if ( I < NumFireballs ) @@ -140,7 +140,7 @@ function float SetAngle() local Vector vTarget; BehindHarry = rotator(Location - PlayerHarry.Location); - vTarget = PlayerHarry.Location + vector(BehindHarry) * (2 * PlayerHarry.CollisionRadius); //UTPT forgot to add BODMAS which made firecrab fire go above Harry's head instead of hitting him -AdamJD + vTarget = PlayerHarry.Location + (vector(BehindHarry) * (2 * PlayerHarry.CollisionRadius)); //UTPT forgot to add BODMAS which made firecrab fire go above Harry's head instead of hitting him -AdamJD Distance = VSize(Location - vTarget); GlobalSpeed = 300.0; if ( Distance > 550 ) @@ -155,7 +155,7 @@ function float SetAngle() } //} fSpeed = GlobalSpeed; - angle = Sin(Distance * Gravity / fSpeed * fSpeed) / 2; + angle = Sin(Distance * Gravity / (fSpeed * fSpeed)) / 2; return angle; } @@ -220,7 +220,7 @@ state StateFlying hitTarget = GetTarget(); timeToTarget = getTime(); Velocity = (hitTarget - Location) / timeToTarget; - Velocity.Z = (hitTarget.Z - Location.Z - 0.5 * fGravityEffect * timeToTarget * timeToTarget) / timeToTarget; + Velocity.Z = ((hitTarget.Z - Location.Z) - (0.5 * fGravityEffect * (timeToTarget * timeToTarget))) / timeToTarget; SetTimer(GrenadeBounceInterval,False); } @@ -253,9 +253,9 @@ state StateFlying Super.Tick(fTimeDelta); if ( bBounce == False ) { - Velocity.Z += fGravityEffect * fTimeDelta; + Velocity.Z += (fGravityEffect * fTimeDelta); } else { - Velocity.Z += fGravityEffect * fTimeDelta; + Velocity.Z += (fGravityEffect * fTimeDelta); } if ( fxFlyParticleEffect != None ) { @@ -266,7 +266,6 @@ state StateFlying fxHeadParticleEffect.SetLocation(Location); } } - begin: } state stateExplode diff --git a/HGame/Classes/Spells/spellFireSmall.uc b/HGame/Classes/Spells/spellFireSmall.uc index 3ffe502c..05ed0829 100644 --- a/HGame/Classes/Spells/spellFireSmall.uc +++ b/HGame/Classes/Spells/spellFireSmall.uc @@ -76,7 +76,7 @@ function float SetAngle() local Vector vTarget; BehindHarry = rotator(Location - PlayerHarry.Location); - vTarget = PlayerHarry.Location + vector(BehindHarry) * (2 * PlayerHarry.CollisionRadius); //UTPT forgot to add BODMAS which made firecrab fire go above Harry's head instead of hitting him -AdamJD + vTarget = PlayerHarry.Location + (vector(BehindHarry) * (2 * PlayerHarry.CollisionRadius)); //UTPT forgot to add BODMAS which made firecrab fire go above Harry's head instead of hitting him -AdamJD Distance = VSize(Location - vTarget); GlobalSpeed = 300.0; if ( Distance > 390.0 ) @@ -92,7 +92,7 @@ function float SetAngle() } //} fSpeed = GlobalSpeed; - angle = Sin(Distance * Gravity / fSpeed * fSpeed) / 2; + angle = Sin(Distance * Gravity / (fSpeed * fSpeed)) / 2; return angle; } @@ -155,7 +155,6 @@ state StateFlying fxFlyParticleEffect.SetLocation(Location); } } - begin: } state StateExplosion @@ -181,6 +180,7 @@ state StateExplosion } } begin: + loop: Sleep(1.0); goto ('Loop'); } diff --git a/HGame/Classes/Spells/spellRictusempra.uc b/HGame/Classes/Spells/spellRictusempra.uc index 0644d8b0..0bd687c6 100644 --- a/HGame/Classes/Spells/spellRictusempra.uc +++ b/HGame/Classes/Spells/spellRictusempra.uc @@ -17,7 +17,7 @@ function OnSpellInit() SeekSpeed += 1.0 - fDistMod; CurrentDir.X += (FRand() - 0.41) * fDistMod; CurrentDir.Y += (FRand() - 0.41) * fDistMod; - CurrentDir.Z += FRand() * 0.5 * fDistMod; + CurrentDir.Z += (FRand() * 0.5) * fDistMod; PlayerHarry.ClientMessage(" fDistMod = " $ string(fDistMod) $ " curDir = " $ string(CurrentDir)); SetRotation(rotator(CurrentDir)); } diff --git a/HGame/Classes/Spells/spellSwordFire.uc b/HGame/Classes/Spells/spellSwordFire.uc index 99f9679e..d2f6e253 100644 --- a/HGame/Classes/Spells/spellSwordFire.uc +++ b/HGame/Classes/Spells/spellSwordFire.uc @@ -127,7 +127,6 @@ auto state StateFlying } } } - begin: } defaultproperties diff --git a/HGame/Classes/Spells/spellWeb.uc b/HGame/Classes/Spells/spellWeb.uc index 867e620f..9582c5e6 100644 --- a/HGame/Classes/Spells/spellWeb.uc +++ b/HGame/Classes/Spells/spellWeb.uc @@ -2,8 +2,6 @@ // spellWeb. //================================================================================ -//this is an old leftover file which isn't used anywhere -AdamJD - class spellWeb extends baseSpell; var(VisualFX) ParticleFX fxHeadParticleEffect; @@ -71,7 +69,7 @@ function Vector GetTarget() AroundHarry = rotator(Location - PlayerHarry.Location); AroundHarry.Yaw = Rand(65534) + 1; - vTarget = PlayerHarry.Location + vector(AroundHarry) * PlayerHarry.CollisionRadius; + vTarget = PlayerHarry.Location + (vector(AroundHarry) * PlayerHarry.CollisionRadius); return vTarget; } @@ -98,7 +96,7 @@ function float SetAngle() AroundHarry = rotator(Location - PlayerHarry.Location); AroundHarry.Yaw = Rand(65534) + 1; - vTarget = PlayerHarry.Location + vector(AroundHarry) * PlayerHarry.CollisionRadius; + vTarget = PlayerHarry.Location + (vector(AroundHarry) * PlayerHarry.CollisionRadius); Distance = VSize(Location - vTarget); GlobalSpeed = 300.0; if ( Distance > 550 ) @@ -113,7 +111,7 @@ function float SetAngle() } //} fSpeed = GlobalSpeed; - angle = Sin(Distance * Gravity / fSpeed * fSpeed) / 2; + angle = Sin(Distance * Gravity / (fSpeed * fSpeed)) / 2; return angle; } @@ -179,7 +177,6 @@ state StateFlying fxHeadParticleEffect.SetLocation(Location); } } - begin: } state stateBouncing @@ -187,7 +184,7 @@ state stateBouncing event Tick (float fTimeDelta) { Super.Tick(fTimeDelta); - Velocity.Z += -fGravityEffect * fTimeDelta; + Velocity.Z += (-fGravityEffect) * fTimeDelta; if ( fxFlyParticleEffect != None ) { fxFlyParticleEffect.SetLocation(Location); diff --git a/HGame/Classes/StatusGroups/StatusGroup.uc b/HGame/Classes/StatusGroups/StatusGroup.uc index 48591027..8d834fef 100644 --- a/HGame/Classes/StatusGroups/StatusGroup.uc +++ b/HGame/Classes/StatusGroups/StatusGroup.uc @@ -3,7 +3,7 @@ //================================================================================ class StatusGroup extends Actor - Abstract; + Abstract; enum EMenuProps { @@ -355,8 +355,8 @@ function Vector GetItemLocation (Class classItem, bool bMenuMode, op if ( !bUpperLeft ) { si = GetStatusItem(classItem); - nHudX += si.GetHudIconUSize() / 4.0; - nHudY += si.GetHudIconVSize() / 4.0; + nHudX += (si.GetHudIconUSize() / 4.0); + nHudY += (si.GetHudIconVSize() / 4.0); } nCanvasHalfX = smParent.nCanvasSizeX / 2.0; nCanvasHalfY = smParent.nCanvasSizeY / 2.0; @@ -393,7 +393,7 @@ function Vector GetItemLocation (Class classItem, bool bMenuMode, op } vectReturn.X = fXVal; vectReturn.Y = fYVal; - vectReturn.Z = 150.0; + vectReturn.Z = FLY_TO_HUD_CAM_DIST; vectReturn = smParent.PlayerHarry.CameraToWorld(vectReturn); return vectReturn; } @@ -567,7 +567,7 @@ function float GetScaleFactor (int nCanvasSizeX) { local float fScale; - fScale = nCanvasSizeX / 640.0; + fScale = nCanvasSizeX / BASE_RESOLUTION_X; return fScale; } diff --git a/HGame/Classes/StatusGroups/StatusGroupHousePoints.uc b/HGame/Classes/StatusGroups/StatusGroupHousePoints.uc index 3fcaaa98..7d2813f7 100644 --- a/HGame/Classes/StatusGroups/StatusGroupHousePoints.uc +++ b/HGame/Classes/StatusGroups/StatusGroupHousePoints.uc @@ -8,7 +8,7 @@ const strCUT_NAME= "Housepoints"; event PostBeginPlay() { - CutName = "Housepoints"; + CutName = strCUT_NAME; } function GetGroupFinalXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int nIconHeight, out int nOutX, out int nOutY) @@ -21,7 +21,7 @@ function GetGroupFinalXY_2 (bool bMenuMode, int nCanvasSizeX, int nCanvasSizeY, local float fScaleFactor; fScaleFactor = GetScaleFactor(nCanvasSizeX); - nOutX = nCanvasSizeX - fScaleFactor * nIconWidth - fScaleFactor * 4; + nOutX = nCanvasSizeX - (fScaleFactor * nIconWidth) - (fScaleFactor * 4); nOutY = fScaleFactor * 4; } @@ -34,7 +34,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = -nIconHeight * fScaleFactor; + nOutY = -(nIconHeight * fScaleFactor); } function TransitionUpdateHousepoints (string strTransitionLetter) diff --git a/HGame/Classes/StatusGroups/StatusGroupJellyBeans.uc b/HGame/Classes/StatusGroups/StatusGroupJellyBeans.uc index 3b0eb229..42603fc0 100644 --- a/HGame/Classes/StatusGroups/StatusGroupJellyBeans.uc +++ b/HGame/Classes/StatusGroups/StatusGroupJellyBeans.uc @@ -27,7 +27,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nX = nFinalX; - nY = -fScaleFactor * nIconHeight; + nY = -(fScaleFactor * nIconHeight); } defaultproperties @@ -37,7 +37,4 @@ defaultproperties fTotalHoldTime=3.00 fTotalEffectOutTime=0.30 - - // Metallicafan212: Missing for some reason - GameEffectType=ET_Fade } \ No newline at end of file diff --git a/HGame/Classes/StatusGroups/StatusGroupLocks.uc b/HGame/Classes/StatusGroups/StatusGroupLocks.uc index 22150fba..9806cadc 100644 --- a/HGame/Classes/StatusGroups/StatusGroupLocks.uc +++ b/HGame/Classes/StatusGroups/StatusGroupLocks.uc @@ -27,7 +27,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = -nIconHeight * fScaleFactor; + nOutY = -(nIconHeight * fScaleFactor); } defaultproperties diff --git a/HGame/Classes/StatusGroups/StatusGroupPolyIngr.uc b/HGame/Classes/StatusGroups/StatusGroupPolyIngr.uc index 2178afdb..36a61980 100644 --- a/HGame/Classes/StatusGroups/StatusGroupPolyIngr.uc +++ b/HGame/Classes/StatusGroups/StatusGroupPolyIngr.uc @@ -14,7 +14,7 @@ function GetGroupFinalXY_2 (bool bMenuMode, int nCanvasSizeX, int nCanvasSizeY, local float fScaleFactor; fScaleFactor = GetScaleFactor(nCanvasSizeX); - nOutX = nCanvasSizeX - fScaleFactor * nIconWidth - fScaleFactor * 4; + nOutX = nCanvasSizeX - (fScaleFactor * nIconWidth) - (fScaleFactor * 4); nOutY = fScaleFactor * 166; } @@ -27,7 +27,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = -nIconHeight * fScaleFactor; + nOutY = -(nIconHeight * fScaleFactor); } defaultproperties diff --git a/HGame/Classes/StatusGroups/StatusGroupPotionIngr.uc b/HGame/Classes/StatusGroups/StatusGroupPotionIngr.uc index bdf013d7..91862729 100644 --- a/HGame/Classes/StatusGroups/StatusGroupPotionIngr.uc +++ b/HGame/Classes/StatusGroups/StatusGroupPotionIngr.uc @@ -20,12 +20,12 @@ function GetGroupFinalXY_2 (bool bMenuMode, int nCanvasSizeX, int nCanvasSizeY, if ( bMenuMode && smParent.PlayerHarry.HaveObjectiveText() ) { nObjectiveTop = HPConsole(smParent.PlayerHarry.Player.Console).menuBook.InGamePage.GetObjectiveAreaTop(nCanvasSizeX,nCanvasSizeY); - nOutY = nObjectiveTop - nIconHeight * fScaleFactor - 5 * fScaleFactor; + nOutY = nObjectiveTop - (nIconHeight * fScaleFactor) - (5 * fScaleFactor); } else { nCutBorderHeight = HPHud(smParent.PlayerHarry.myHUD).managerCutScene.GetMaxBorderHeightFromCanvasHeight(nCanvasSizeY); - nOutY = nCanvasSizeY - nIconHeight * fScaleFactor - nCutBorderHeight; + nOutY = nCanvasSizeY - (nIconHeight * fScaleFactor) - nCutBorderHeight; } } @@ -38,7 +38,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = Canvas.SizeY + nIconHeight * fScaleFactor; + nOutY = Canvas.SizeY + (nIconHeight * fScaleFactor); } defaultproperties diff --git a/HGame/Classes/StatusGroups/StatusGroupPotions.uc b/HGame/Classes/StatusGroups/StatusGroupPotions.uc index ff9ce55d..090baab5 100644 --- a/HGame/Classes/StatusGroups/StatusGroupPotions.uc +++ b/HGame/Classes/StatusGroups/StatusGroupPotions.uc @@ -16,16 +16,16 @@ function GetGroupFinalXY_2 (bool bMenuMode, int nCanvasSizeX, int nCanvasSizeY, local int nCutBorderHeight; fScaleFactor = GetScaleFactor(nCanvasSizeX); - nOutX = nCanvasSizeX - nIconWidth * fScaleFactor - fScaleFactor * 4; + nOutX = nCanvasSizeX - (nIconWidth * fScaleFactor) - (fScaleFactor * 4); if ( bMenuMode && smParent.PlayerHarry.HaveObjectiveText() ) { nObjectiveTop = HPConsole(smParent.PlayerHarry.Player.Console).menuBook.InGamePage.GetObjectiveAreaTop(nCanvasSizeX, nCanvasSizeY); - nOutY = nObjectiveTop - nIconHeight * fScaleFactor - 5 * fScaleFactor; + nOutY = nObjectiveTop - (nIconHeight * fScaleFactor) - (5 * fScaleFactor); } else { nCutBorderHeight = HPHud(smParent.PlayerHarry.myHUD).managerCutScene.GetMaxBorderHeightFromCanvasHeight(nCanvasSizeY); - nOutY = nCanvasSizeY - nIconHeight * fScaleFactor - nCutBorderHeight; + nOutY = nCanvasSizeY - (nIconHeight * fScaleFactor) - nCutBorderHeight; } } @@ -38,7 +38,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode,Canvas,nIconWidth,nIconHeight,nFinalX,nFinalY); nOutX = nFinalX; - nOutY = Canvas.SizeY + nIconHeight * fScaleFactor; + nOutY = Canvas.SizeY + (nIconHeight * fScaleFactor); } defaultproperties diff --git a/HGame/Classes/StatusGroups/StatusGroupQGear.uc b/HGame/Classes/StatusGroups/StatusGroupQGear.uc index c390b925..f9a4ea3a 100644 --- a/HGame/Classes/StatusGroups/StatusGroupQGear.uc +++ b/HGame/Classes/StatusGroups/StatusGroupQGear.uc @@ -27,7 +27,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = Canvas.SizeY + nIconHeight * fScaleFactor; + nOutY = Canvas.SizeY + (nIconHeight * fScaleFactor); } diff --git a/HGame/Classes/StatusGroups/StatusGroupStars.uc b/HGame/Classes/StatusGroups/StatusGroupStars.uc index 921a888e..ba4040dc 100644 --- a/HGame/Classes/StatusGroups/StatusGroupStars.uc +++ b/HGame/Classes/StatusGroups/StatusGroupStars.uc @@ -27,7 +27,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = -fScaleFactor * nIconHeight; + nOutY = -(fScaleFactor * nIconHeight); } defaultproperties @@ -39,8 +39,4 @@ defaultproperties fTotalEffectOutTime=0.20 MenuProps=Menu_IfCurrentlyHaveAny - - // Metallicafan212: Missing for some reason - GameEffectType=ET_Fade - } \ No newline at end of file diff --git a/HGame/Classes/StatusGroups/StatusGroupWizardCards.uc b/HGame/Classes/StatusGroups/StatusGroupWizardCards.uc index 06868596..32a79c7d 100644 --- a/HGame/Classes/StatusGroups/StatusGroupWizardCards.uc +++ b/HGame/Classes/StatusGroups/StatusGroupWizardCards.uc @@ -45,7 +45,7 @@ function GetGroupFlyOriginXY (bool bMenuMode, Canvas Canvas, int nIconWidth, int fScaleFactor = GetScaleFactor(Canvas.SizeX); GetGroupFinalXY(bMenuMode, Canvas, nIconWidth, nIconHeight, nFinalX, nFinalY); nOutX = nFinalX; - nOutY = -nIconHeight * fScaleFactor; + nOutY = -(nIconHeight * fScaleFactor); } function AssignAllSilverToVendors() @@ -57,17 +57,17 @@ function AssignAllSilverToVendors() siWC = StatusItemWizardCards(GetStatusItem(Class'StatusItemSilverCards')); - // Metallicafan212: Obious loop is obious + // Metallicafan212: Obvious loop - for(nCardId = 0; nCardId < 101; nCardId++) + for(nCardId = 0; nCardId < smParent.nTOTAL_WIZARD_CARDS; nCardId++) { classWC = siWC.GetCardClassFromId(nCardId); if ( (classWC != None) && ClassIsChildOf(classWC,Class'SilverCards') ) { smParent.PlayerHarry.ClientMessage("SilverCard " $ string(classWC) $ " " $ string(nCardId)); - if ( siWC.GetCardOwner(nCardId) != CardOwner_Harry ) + if ( siWC.GetCardOwner(nCardId) != siWC.ECardOwner.CardOwner_Harry ) { - siWC.SetCardOwner(nCardId, CardOwner_Vendor); + siWC.SetCardOwner(nCardId, siWC.ECardOwner.CardOwner_Vendor); } } } @@ -101,7 +101,7 @@ function AssignVendorCards() foreach AllActors(Class'chestbronze',Chest) { - for(I = 0; i < 8; i++) + for(I = 0; I < ArrayCount(Chest.EjectedObjects); I++) { if ( ClassIsChildOf(Chest.EjectedObjects[I],Class'WizardCardIcon') ) { @@ -123,7 +123,7 @@ function AssignVendorCards() } foreach AllActors(Class'bronzecauldron',Cauldron) { - for(I = 0; i < 8; i++) + for(I = 0; I < ArrayCount(Cauldron.EjectedObjects); I++) { if ( ClassIsChildOf(Cauldron.EjectedObjects[I],Class'WizardCardIcon') ) { @@ -159,9 +159,9 @@ function AssignVendorCards() { siCards = StatusItemWizardCards(GetStatusItem(Class'StatusItemGoldCards')); } - if ( siCards.GetCardOwner(WCard.Id) != CardOwner_Harry ) + if ( siCards.GetCardOwner(WCard.Id) != siCards.ECardOwner.CardOwner_Harry ) { - siCards.SetCardOwner(WCard.Id, CardOwner_Vendor); + siCards.SetCardOwner(WCard.Id, siCards.ECardOwner.CardOwner_Vendor); } } } @@ -196,9 +196,9 @@ function AssignVendorCardFromClass (Class classObject) siCards = StatusItemWizardCards(GetStatusItem(Class'StatusItemGoldCards')); } - if ( siCards.GetCardOwner(nId) != CardOwner_Harry ) + if ( siCards.GetCardOwner(nId) != siCards.ECardOwner.CardOwner_Harry ) { - siCards.SetCardOwner(nId, CardOwner_Vendor); + siCards.SetCardOwner(nId, siCards.ECardOwner.CardOwner_Vendor); } } } @@ -215,7 +215,7 @@ function RemoveHarryOwnedCardsFromLevel (WizardCardIcon wcExceptThisInstance) foreach AllActors(Class'chestbronze',Chest) { - for(I = 0; i < 8; i++) + for(I = 0; I < ArrayCount(Chest.EjectedObjects); I++) { if ( ClassIsChildOf(Chest.EjectedObjects[I],Class'WizardCardIcon') ) { @@ -319,13 +319,20 @@ function bool HasCardGameStatePassed (string strCardGameState) return False; */ - if( GetGameStateTokenIndex(smParent.PlayerHarry.CurrentGameState,nCurrStateTokenIdx) - && GetGameStateTokenIndex(strCardGameState,nCardStateTokenIdx) - && nCardStateTokenIdx <= nCurrStateTokenIdx - ) + if( GetGameStateTokenIndex(smParent.PlayerHarry.CurrentGameState,nCurrStateTokenIdx) ) { - smParent.PlayerHarry.ClientMessage("Game state passed " $ strCardGameState); - return True; + if( GetGameStateTokenIndex(strCardGameState,nCardStateTokenIdx) ) + { + if( nCardStateTokenIdx <= nCurrStateTokenIdx ) + { + smParent.PlayerHarry.ClientMessage("Game state passed " $strCardGameState); + return True; + } + } + else + { + smParent.PlayerHarry.ClientMessage("ERROR getting wizard card game state token idx " $strCardGameState); + } } return false; @@ -364,13 +371,13 @@ function SetLastObtainedCardTypeAsInt (int nLastCardType) { switch (nLastCardType) { - case 0: + case nCARDTYPE_BRONZE: LastObtainedCardType = CardType_Bronze; break; - case 1: + case nCARDTYPE_SILVER: LastObtainedCardType = CardType_Silver; break; - case 2: + case nCARDTYPE_GOLD: LastObtainedCardType = CardType_Gold; break; default: @@ -384,16 +391,13 @@ function int GetLastObtainedCardTypeAsInt() switch (LastObtainedCardType) { case CardType_Bronze: - return 0; + return nCARDTYPE_BRONZE; case CardType_Silver: - return 1; + return nCARDTYPE_SILVER; case CardType_Gold: - return 2; + return nCARDTYPE_GOLD; case CardType_None: - return 3; - default: - // Metallicafan212: It's not valid to return nothing, so I made it 4 - return 4; + return nCARDTYPE_NONE; } } @@ -410,6 +414,5 @@ defaultproperties fTotalEffectOutTime=0.20 // Metallicafan212: Missing for some reason - GameEffectType=ET_Fade - + MenuProps=Menu_Never } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItem.uc b/HGame/Classes/StatusItems/StatusItem.uc index 432c10ec..cfd6173b 100644 --- a/HGame/Classes/StatusItems/StatusItem.uc +++ b/HGame/Classes/StatusItems/StatusItem.uc @@ -3,7 +3,7 @@ //================================================================================ class StatusItem extends Actor - Abstract; + Abstract; var StatusItem siNext; var StatusGroup sgParent; @@ -56,24 +56,18 @@ function SetCount (int nNum) { nCount = 0; } - else + else if ( nCurrCountPotential != 0 ) { - if ( nCurrCountPotential != 0 ) + if ( nCount > nCurrCountPotential ) { - if ( nCount > nCurrCountPotential ) - { - nCount = nCurrCountPotential; - } - } - else + nCount = nCurrCountPotential; + } + } + else if ( nMaxCount != 0 ) + { + if ( nCount > nMaxCount ) { - if ( nMaxCount != 0 ) - { - if ( nCount > nMaxCount ) - { - nCount = nMaxCount; - } - } + nCount = nMaxCount; } } } @@ -95,12 +89,9 @@ function IncrementCountPotential (int nNum) { nCurrCountPotential = 0; } - else + else if ( (nMaxCount != 0) && (nCurrCountPotential > nMaxCount) ) { - if ( (nMaxCount != 0) && (nCurrCountPotential > nMaxCount) ) - { - nCurrCountPotential = nMaxCount; - } + nCurrCountPotential = nMaxCount; } } @@ -159,19 +150,19 @@ function Color GetCountColor (optional bool bShadow) colorRet.R = 0; colorRet.G = 0; colorRet.B = 0; - break; + break; case CountColor_White: colorRet.R = 255; colorRet.G = 255; colorRet.B = 255; - break; + break; case CountColor_NearWhite: colorRet.R = 206; colorRet.G = 200; colorRet.B = 190; - break; + break; default: - break; + break; } return colorRet; } @@ -184,16 +175,13 @@ function Font GetCountFont (Canvas Canvas) { fontRet = baseConsole(sgParent.smParent.PlayerHarry.Player.Console).LocalSmallFont; } + else if ( Canvas.SizeX <= 640 ) + { + fontRet = baseConsole(sgParent.smParent.PlayerHarry.Player.Console).LocalMedFont; + } else { - if ( Canvas.SizeX <= 640 ) - { - fontRet = baseConsole(sgParent.smParent.PlayerHarry.Player.Console).LocalMedFont; - } - else - { - fontRet = baseConsole(sgParent.smParent.PlayerHarry.Player.Console).LocalBigFont; - } + fontRet = baseConsole(sgParent.smParent.PlayerHarry.Player.Console).LocalBigFont; } return fontRet; } @@ -227,15 +215,15 @@ function DrawSpecifiedCount (Canvas Canvas, int nCurrX, int nCurrY, float fScale } Canvas.Font = GetCountFont(Canvas); Canvas.TextSize(strCountDisplay,fXTextLen,fYTextLen); - fXPos = nCurrX + nCountMiddleX * fScaleFactor - fXTextLen / 2; - fYPos = nCurrY + nCountMiddleY * fScaleFactor - fYTextLen / 2; + fXPos = nCurrX + (nCountMiddleX * fScaleFactor) - fXTextLen / 2; + fYPos = nCurrY + (nCountMiddleY * fScaleFactor) - fYTextLen / 2; if ( fXPos + fXTextLen > Canvas.SizeX ) { - fXPos = Canvas.SizeX - fXTextLen - 2; + fXPos = Canvas.SizeX - (fXTextLen - 2); } if ( fYPos + fYTextLen > Canvas.SizeY ) { - fYPos = Canvas.SizeY - fYTextLen - 2; + fYPos = Canvas.SizeY - (fYTextLen - 2); } Canvas.SetPos(fXPos,fYPos); Canvas.DrawShadowText(strCountDisplay,GetCountColor(),GetCountColor(True)); diff --git a/HGame/Classes/StatusItems/StatusItemFlobberMucus.uc b/HGame/Classes/StatusItems/StatusItemFlobberMucus.uc index a79aff72..a1b9ce2f 100644 --- a/HGame/Classes/StatusItems/StatusItemFlobberMucus.uc +++ b/HGame/Classes/StatusItems/StatusItemFlobberMucus.uc @@ -11,6 +11,4 @@ defaultproperties bDisplayCount=True strToolTipId="InGameMenu_0008" - - CountColor=CountColor_NearWhite } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemGryffindorPts.uc b/HGame/Classes/StatusItems/StatusItemGryffindorPts.uc index 490d8c2d..1fe48afb 100644 --- a/HGame/Classes/StatusItems/StatusItemGryffindorPts.uc +++ b/HGame/Classes/StatusItems/StatusItemGryffindorPts.uc @@ -19,7 +19,4 @@ defaultproperties nCountMiddleY=86 strToolTipId="InGameMenu_0009" - - CountColor=CountColor_NearWhite - } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemHealth.uc b/HGame/Classes/StatusItems/StatusItemHealth.uc index acd48a32..95b574ee 100644 --- a/HGame/Classes/StatusItems/StatusItemHealth.uc +++ b/HGame/Classes/StatusItems/StatusItemHealth.uc @@ -96,7 +96,7 @@ function DrawItem (Canvas Canvas, int nCurrX, int nCurrY, float fScaleFactor) nY = 5 * fScaleFactor; fSegmentHeight = 0.0; fSegmentStartAt = 0.0; - nTotalOffsets = 1 + 11; + nTotalOffsets = TOP_OFFSET + BOTTOM_OFFSET; nNumHealthIcons = nCurrCountPotential / nUnitsPerIcon; if ( nCurrCountPotential % nUnitsPerIcon > 0 ) { @@ -107,12 +107,12 @@ function DrawItem (Canvas Canvas, int nCurrX, int nCurrY, float fScaleFactor) colorSave = Canvas.DrawColor; // Metallicafan212: This is a for loop - for(i = 0; i < nNumHealthIcons; i++) + for(I = 0; I < nNumHealthIcons; I++) { //I = 0; //if ( I < nNumHealthIcons ) //{ - nY = 4 * fScaleFactor; + nY = nHEALTH_Y * fScaleFactor; if ( nRemainingCount >= nUnitsPerIcon ) { fFillRatio = 1.0; @@ -146,12 +146,12 @@ function DrawItem (Canvas Canvas, int nCurrX, int nCurrY, float fScaleFactor) if ( fFillRatio > 0 ) { fSegmentHeight = fFillRatio * (textureHudIcon.VSize - nTotalOffsets); - fSegmentStartAt = textureHudIcon.VSize - 11 - fSegmentHeight; - fSegmentHeight += 11; + fSegmentStartAt = textureHudIcon.VSize - BOTTOM_OFFSET - fSegmentHeight; + fSegmentHeight += BOTTOM_OFFSET; Canvas.SetPos(nX, nY + fSegmentStartAt * fScaleFactor); Canvas.DrawTile(textureHealthOrangeInside, textureHudIcon.USize * fScaleFactor, fSegmentHeight * fScaleFactor, 0.0, fSegmentStartAt, textureHudIcon.USize, fSegmentHeight); } - nX += nActualIconW * fScaleFactor; + nX += (nActualIconW * fScaleFactor); } Canvas.DrawColor = colorSave; } @@ -203,7 +203,7 @@ state HoldChange { local float fHoldTime; - fHoldTime = (Abs(nCurrChange) - 1) * 0.055 + 0.2; + fHoldTime = ((Abs(nCurrChange) - 1) * CHANGE_PERPOINT_HOLD) + CHANGE_BASE_HOLD; if ( fHoldTime > 5.0 ) { fHoldTime = 5.0; @@ -220,7 +220,8 @@ state HoldChange state FadeChangeOut { - ignores GetChangeInHealthDrawColor, GetHealthDrawColor; + //UTPT added this for some reason -AdamJD + // ignores GetChangeInHealthDrawColor, GetHealthDrawColor; event Tick (float fDelta) { @@ -236,12 +237,47 @@ state FadeChangeOut } } } + + //UTPT didn't add this for some reason -AdamJD + function Color GetHealthDrawColor() + { + local Color colorReturn; + local float fFade; + + fFade = 255 * (fCurrFadeTime / fTotalFadeTime); + if ( nCurrChange <= 0 ) + { + colorReturn.R = 255; + colorReturn.G = fFade; + colorReturn.B = fFade; + } + else + { + colorReturn.R = fFade; + colorReturn.G = 255; + colorReturn.B = fFade; + } + return colorReturn; + } + + //UTPT didn't add this for some reason -AdamJD + function Color GetChangeInHealthDrawColor() + { + local Color colorReturn; + local float fColor; + + fColor = 255 - (255 * (fCurrFadeTime / fTotalFadeTime)); + colorReturn.R = fColor; + colorReturn.G = fColor; + colorReturn.B = fColor; + return colorReturn; + } function float GetFadeChangeTime() { local float fChangeTime; - fChangeTime = (Abs(nCurrChange) - 1) * 0.026 + 0.2; + fChangeTime = ((Abs(nCurrChange) - 1) * CHANGE_PERPOINT_FADE) + CHANGE_BASE_FADE; if ( fChangeTime > 5.0 ) { fChangeTime = 5.0; diff --git a/HGame/Classes/StatusItems/StatusItemHufflePuffPts.uc b/HGame/Classes/StatusItems/StatusItemHufflePuffPts.uc index ffdf1296..6dd92252 100644 --- a/HGame/Classes/StatusItems/StatusItemHufflePuffPts.uc +++ b/HGame/Classes/StatusItems/StatusItemHufflePuffPts.uc @@ -17,7 +17,4 @@ defaultproperties nCountMiddleY=86 strToolTipId="InGameMenu_0010" - - CountColor=CountColor_NearWhite - } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemJellybeans.uc b/HGame/Classes/StatusItems/StatusItemJellybeans.uc index 682b80de..19c97138 100644 --- a/HGame/Classes/StatusItems/StatusItemJellybeans.uc +++ b/HGame/Classes/StatusItems/StatusItemJellybeans.uc @@ -7,7 +7,8 @@ class StatusItemJellybeans extends StatusItem; defaultproperties { strHudIcon="HP2_Menu.Icons.HP2BeanCounter" - bDisplayCount=True - strToolTipId="InGameMenu_0013" - CountColor=CountColor_NearWhite + + bDisplayCount=True + + strToolTipId="InGameMenu_0013" } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemRavenclawPts.uc b/HGame/Classes/StatusItems/StatusItemRavenclawPts.uc index a5ddb5e1..39473f39 100644 --- a/HGame/Classes/StatusItems/StatusItemRavenclawPts.uc +++ b/HGame/Classes/StatusItems/StatusItemRavenclawPts.uc @@ -17,7 +17,4 @@ defaultproperties nCountMiddleY=86 strToolTipId="InGameMenu_0011" - - CountColor=CountColor_NearWhite - } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemSilverCards.uc b/HGame/Classes/StatusItems/StatusItemSilverCards.uc index cdce7d07..967049c3 100644 --- a/HGame/Classes/StatusItems/StatusItemSilverCards.uc +++ b/HGame/Classes/StatusItems/StatusItemSilverCards.uc @@ -27,11 +27,9 @@ function UpdateCount() sgParent.smParent.GetStatusGroup(Class'StatusGroupLocks').IncrementCount(Class'StatusItemLock4',1); break; default: + break; } } - else - { - } } defaultproperties diff --git a/HGame/Classes/StatusItems/StatusItemSlytherinPts.uc b/HGame/Classes/StatusItems/StatusItemSlytherinPts.uc index 2d2286ef..4424a47c 100644 --- a/HGame/Classes/StatusItems/StatusItemSlytherinPts.uc +++ b/HGame/Classes/StatusItems/StatusItemSlytherinPts.uc @@ -17,7 +17,4 @@ defaultproperties nCountMiddleY=86 strToolTipId="InGameMenu_0012" - - CountColor=CountColor_NearWhite - } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemStars.uc b/HGame/Classes/StatusItems/StatusItemStars.uc index cbf49ee2..77ef074e 100644 --- a/HGame/Classes/StatusItems/StatusItemStars.uc +++ b/HGame/Classes/StatusItems/StatusItemStars.uc @@ -15,7 +15,4 @@ defaultproperties strToolTipId="InGameMenu_0018" bTravelStatus=False - - CountColor=CountColor_NearWhite - } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemWiggenBark.uc b/HGame/Classes/StatusItems/StatusItemWiggenBark.uc index b3083814..f593dcc8 100644 --- a/HGame/Classes/StatusItems/StatusItemWiggenBark.uc +++ b/HGame/Classes/StatusItems/StatusItemWiggenBark.uc @@ -11,6 +11,4 @@ defaultproperties bDisplayCount=True strToolTipId="InGameMenu_0019" - - CountColor=CountColor_NearWhite } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemWiggenWell.uc b/HGame/Classes/StatusItems/StatusItemWiggenWell.uc index c00e5662..0b244f94 100644 --- a/HGame/Classes/StatusItems/StatusItemWiggenWell.uc +++ b/HGame/Classes/StatusItems/StatusItemWiggenWell.uc @@ -11,6 +11,4 @@ defaultproperties bDisplayCount=True strToolTipId="InGameMenu_0020" - - CountColor=CountColor_NearWhite } \ No newline at end of file diff --git a/HGame/Classes/StatusItems/StatusItemWizardCards.uc b/HGame/Classes/StatusItems/StatusItemWizardCards.uc index 6d2e8484..da4e0be3 100644 --- a/HGame/Classes/StatusItems/StatusItemWizardCards.uc +++ b/HGame/Classes/StatusItems/StatusItemWizardCards.uc @@ -5,8 +5,6 @@ class StatusItemWizardCards extends StatusItem Abstract; -const MAX_CARDS = 50; - enum ECardOwner { CardOwner_None, @@ -21,7 +19,7 @@ struct TCardData var ECardOwner Owner; }; -var TCardData WizardCards[MAX_CARDS]; +var TCardData WizardCards[50]; @@ -50,11 +48,11 @@ function ECardOwner GetCardOwner (int nId) } */ - for(i = 0; i < MAX_CARDS; i++) + for(I = 0; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].nID == nID) + if(WizardCards[I].nId == nId) { - return WizardCards[i].Owner; + return WizardCards[I].Owner; } } @@ -116,21 +114,21 @@ function SetCardOwner (int nId, ECardOwner Owner) UpdateCount(); */ - for(i = 0; i < MAX_CARDS; i++) + for(I = 0; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].nId == nID) + if(WizardCards[I].nId == nId) { - WizardCards[i].Owner = Owner; + WizardCards[I].Owner = Owner; if(Owner == CardOwner_Harry) { - MoveCardToEnd(i); + MoveCardToEnd(I); } break; } - else if(WizardCards[i].nID == 0) + else if(WizardCards[I].nId == 0) { - WizardCards[i].nID = nId; - WizardCards[i].Owner = Owner; + WizardCards[I].nId = nId; + WizardCards[I].Owner = Owner; break; } } @@ -141,7 +139,6 @@ function SetCardOwner (int nId, ECardOwner Owner) } UpdateCount(); - } function MoveCardToEnd (int nStartIdx) @@ -172,12 +169,12 @@ function MoveCardToEnd (int nStartIdx) WizardCards[I].Owner = MovedCardOwner; */ - for(i = nStartIdx + 1; i < MAX_CARDS; i++) + for(I = nStartIdx + 1; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].nID > 0) + if(WizardCards[I].nId > 0) { - WizardCards[i - 1].nID = WizardCards[i].nID; - WizardCards[i - 1].Owner = WizardCards[i].Owner; + WizardCards[I - 1].nId = WizardCards[I].nId; + WizardCards[I - 1].Owner = WizardCards[I].Owner; } else { @@ -185,10 +182,9 @@ function MoveCardToEnd (int nStartIdx) } } - i--; - WizardCards[i].nID = nMovedCardId; - WizardCards[i].Owner = MovedCardOwner; - + --I; + WizardCards[I].nId = nMovedCardId; + WizardCards[I].Owner = MovedCardOwner; } function UpdateCount() @@ -215,18 +211,17 @@ function UpdateCount() } */ - for(i = 0; i < MAX_CARDS; i++) + for(I = 0; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].nID == 0) + if(WizardCards[I].nId == 0) { return; } - else if(WizardCards[i].Owner == CardOwner_Harry) + else if(WizardCards[I].Owner == CardOwner_Harry) { ++nCount; } } - } function bool GetFirstVendorCardId (out int nCardId) @@ -253,17 +248,17 @@ function bool GetFirstVendorCardId (out int nCardId) } */ - for(i = 0; i < MAX_CARDS; i++) + for(I = 0; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].Owner == CardOwner_None) + if(WizardCards[I].nId == 0) { - nCardID = 0; + nCardId = 0; return false; } - if(WizardCards[i].Owner == CardOwner_Vendor) + if(WizardCards[I].Owner == CardOwner_Vendor) { - nCardID = WizardCards[i].nID; + nCardId = WizardCards[I].nId; return true; } } @@ -274,7 +269,7 @@ function bool GetFirstVendorCardId (out int nCardId) function bool GetFirstVendorCardIdAndClass (out int nCardId, out Class classWC) { - if (!GetFirstVendorCardId(nCardId) ) + if ( !GetFirstVendorCardId(nCardId) ) { return False; } @@ -627,7 +622,7 @@ function bool VerifyCardClass (int nCardId, Class classWC) function GetCardData (int nIdx, out int nId, out int nOwner) { - if ( (nIdx >= 0) && (nIdx < 50) ) + if ( (nIdx >= 0) && (nIdx < ArrayCount(WizardCards)) ) { nId = WizardCards[nIdx].nId; nOwner = WizardCards[nIdx].Owner; @@ -651,30 +646,24 @@ function int GetCardId (int nIdx) function SetCardData (int nIdx, int nId, int nOwner) { - if ( (nIdx >= 0) && (nIdx < 50) ) + if ( (nIdx >= 0) && (nIdx < ArrayCount(WizardCards)) ) { WizardCards[nIdx].nId = nId; if ( nOwner == 0 ) { WizardCards[nIdx].Owner = CardOwner_None; } + else if ( nOwner == 1 ) + { + WizardCards[nIdx].Owner = CardOwner_Harry; + } + else if ( nOwner == 2 ) + { + WizardCards[nIdx].Owner = CardOwner_Vendor; + } else { - if ( nOwner == 1 ) - { - WizardCards[nIdx].Owner = CardOwner_Harry; - } - else - { - if ( nOwner == 2 ) - { - WizardCards[nIdx].Owner = CardOwner_Vendor; - } - else - { - sgParent.smParent.PlayerHarry.ClientMessage("ERROR: Invalid owner in SetCardData"); - } - } + sgParent.smParent.PlayerHarry.ClientMessage("ERROR: Invalid owner in SetCardData"); } } else @@ -703,16 +692,15 @@ function ShowCardData() } */ - for(i = 0; i < MAX_CARDS; i++) + for(I = 0; I < ArrayCount(WizardCards); I++) { - if(WizardCards[i].nID == 0) + if(WizardCards[I].nID == 0) { break; } sgParent.smParent.PlayerHarry.ClientMessage("ID: " $ string(WizardCards[I].nId) $ " Owner: " $ string(WizardCards[I].Owner)); } - } defaultproperties diff --git a/HGame/Classes/Triggers/BossEncounterTrigger.uc b/HGame/Classes/Triggers/BossEncounterTrigger.uc index 2dcfb055..bab38581 100644 --- a/HGame/Classes/Triggers/BossEncounterTrigger.uc +++ b/HGame/Classes/Triggers/BossEncounterTrigger.uc @@ -29,7 +29,7 @@ function DoTrigger (Actor Other, Pawn EventInstigator) if ( !bDisabled ) { ProcessTrigger(); - Touch(Other); + Super.Touch(Other); if ( bSendTriggerToBoss ) { foreach AllActors(Class'baseBoss',Boss,Event) diff --git a/HGame/Classes/Triggers/FadeViewTrigger.uc b/HGame/Classes/Triggers/FadeViewTrigger.uc index 765a13b1..4a0145ac 100644 --- a/HGame/Classes/Triggers/FadeViewTrigger.uc +++ b/HGame/Classes/Triggers/FadeViewTrigger.uc @@ -46,8 +46,7 @@ defaultproperties fadetime=0.25 - // Metallicafan212: This is incorrect, it has to be 0 at first - A=0.0 + A=255.00 R=255.00 @@ -56,5 +55,4 @@ defaultproperties B=255.00 bStatic=True - } diff --git a/HGame/Classes/Triggers/JumpLineTrigger.uc b/HGame/Classes/Triggers/JumpLineTrigger.uc index aa78bf9c..c1c32cee 100644 --- a/HGame/Classes/Triggers/JumpLineTrigger.uc +++ b/HGame/Classes/Triggers/JumpLineTrigger.uc @@ -28,15 +28,21 @@ function Tick (float t) local int I; local Vector Facing; local Vector other_facing; + local PlayerPawn pp; //added by me for compatibility code -AdamJD if ( !bEnabled ) { return; } - for(I = 0; I < 4; I++) + //updated to make this compatible with the new engine -AdamJD + // + //for(I = 0; I < ArrayCount(Touching); I++) + foreach TouchingActors(class'PlayerPawn', pp) { Facing = GetFacing(self); + + /* if ( PlayerPawn(Touching[I]) != None ) { if ( ((Touching[I].Location - Location) Dot Facing >= 0.0) && ((Touching[I].OldLocation - Location) Dot Facing < 0.0) ) @@ -47,6 +53,19 @@ function Tick (float t) MakeJump(Touching[I]); } } + } + */ + + if ( pp != None ) + { + if ( ((pp.Location - Location) Dot Facing >= 0.0) && ((pp.OldLocation - Location) Dot Facing < 0.0) ) + { + other_facing = GetFacing(pp); + if ( other_facing Dot Facing >= MinCosTrigger ) + { + MakeJump(pp); + } + } } } } diff --git a/HGame/Classes/Triggers/LumosSparkles.uc b/HGame/Classes/Triggers/LumosSparkles.uc index c81912dd..639c0fcc 100644 --- a/HGame/Classes/Triggers/LumosSparkles.uc +++ b/HGame/Classes/Triggers/LumosSparkles.uc @@ -84,58 +84,30 @@ function TurnOnEdgeEffects() fxEdgeSparkles[I].SourceHeight.Base = fEdgeSparklesThickness; // ++I; // goto JL0090; - } - //these are not bytes... -AdamJD - /* - fxEdgeSparkles[0].SetLocation(Location + Vec(fBoxWidth / byte(2),0.0,fBoxHeight / byte(2))); - fxEdgeSparkles[0].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[1].SetLocation(Location + Vec(fBoxWidth / byte(2),0.0, -fBoxHeight / byte(2))); - fxEdgeSparkles[1].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[2].SetLocation(Location + Vec( -fBoxWidth / byte(2),0.0,fBoxHeight / byte(2))); - fxEdgeSparkles[2].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[3].SetLocation(Location + Vec( -fBoxWidth / byte(2),0.0, -fBoxHeight / byte(2))); - fxEdgeSparkles[3].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[4].SetLocation(Location + Vec(0.0,fBoxDepth / byte(2),fBoxHeight / byte(2))); - fxEdgeSparkles[4].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[5].SetLocation(Location + Vec(0.0,fBoxDepth / byte(2), -fBoxHeight / byte(2))); - fxEdgeSparkles[5].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[6].SetLocation(Location + Vec(0.0, -fBoxDepth / byte(2),fBoxHeight / byte(2))); - fxEdgeSparkles[6].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[7].SetLocation(Location + Vec(0.0, -fBoxDepth / byte(2), -fBoxHeight / byte(2))); - fxEdgeSparkles[7].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[8].SetLocation(Location + Vec(fBoxWidth / byte(2),fBoxDepth / byte(2),0.0)); - fxEdgeSparkles[8].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[9].SetLocation(Location + Vec( -fBoxWidth / byte(2),fBoxDepth / byte(2),0.0)); - fxEdgeSparkles[9].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[10].SetLocation(Location + Vec(fBoxWidth / byte(2), -fBoxDepth / byte(2),0.0)); - fxEdgeSparkles[10].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[11].SetLocation(Location + Vec( -fBoxWidth / byte(2), -fBoxDepth / byte(2),0.0)); - fxEdgeSparkles[11].SourceHeight.Base = fBoxHeight; - */ - + } fxEdgeSparkles[0].SetLocation(Location + Vec(fBoxWidth / 2,0.0,fBoxHeight / 2)); fxEdgeSparkles[0].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[1].SetLocation(Location + Vec(fBoxWidth / 2,0.0, -fBoxHeight / 2)); + fxEdgeSparkles[1].SetLocation(Location + Vec(fBoxWidth / 2,0.0, -(fBoxHeight / 2))); fxEdgeSparkles[1].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[2].SetLocation(Location + Vec( -fBoxWidth / 2,0.0,fBoxHeight / 2)); + fxEdgeSparkles[2].SetLocation(Location + Vec( -(fBoxWidth / 2),0.0,fBoxHeight / 2)); fxEdgeSparkles[2].SourceWidth.Base = fBoxDepth; - fxEdgeSparkles[3].SetLocation(Location + Vec( -fBoxWidth / 2,0.0, -fBoxHeight / 2)); + fxEdgeSparkles[3].SetLocation(Location + Vec( -(fBoxWidth / 2),0.0, -(fBoxHeight / 2))); fxEdgeSparkles[3].SourceWidth.Base = fBoxDepth; fxEdgeSparkles[4].SetLocation(Location + Vec(0.0,fBoxDepth / 2,fBoxHeight / 2)); fxEdgeSparkles[4].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[5].SetLocation(Location + Vec(0.0,fBoxDepth / 2, -fBoxHeight / 2)); + fxEdgeSparkles[5].SetLocation(Location + Vec(0.0,fBoxDepth / 2, -(fBoxHeight / 2))); fxEdgeSparkles[5].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[6].SetLocation(Location + Vec(0.0, -fBoxDepth / 2,fBoxHeight / 2)); + fxEdgeSparkles[6].SetLocation(Location + Vec(0.0, -(fBoxDepth / 2),fBoxHeight / 2)); fxEdgeSparkles[6].SourceDepth.Base = fBoxWidth; - fxEdgeSparkles[7].SetLocation(Location + Vec(0.0, -fBoxDepth / 2, -fBoxHeight / 2)); + fxEdgeSparkles[7].SetLocation(Location + Vec(0.0, -(fBoxDepth / 2), -(fBoxHeight / 2))); fxEdgeSparkles[7].SourceDepth.Base = fBoxWidth; fxEdgeSparkles[8].SetLocation(Location + Vec(fBoxWidth / 2,fBoxDepth / 2,0.0)); fxEdgeSparkles[8].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[9].SetLocation(Location + Vec( -fBoxWidth / 2,fBoxDepth / 2,0.0)); + fxEdgeSparkles[9].SetLocation(Location + Vec( -(fBoxWidth / 2),fBoxDepth / 2,0.0)); fxEdgeSparkles[9].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[10].SetLocation(Location + Vec(fBoxWidth / 2, -fBoxDepth / 2,0.0)); + fxEdgeSparkles[10].SetLocation(Location + Vec(fBoxWidth / 2, -(fBoxDepth / 2),0.0)); fxEdgeSparkles[10].SourceHeight.Base = fBoxHeight; - fxEdgeSparkles[11].SetLocation(Location + Vec( -fBoxWidth / 2, -fBoxDepth / 2,0.0)); + fxEdgeSparkles[11].SetLocation(Location + Vec( -(fBoxWidth / 2), -(fBoxDepth / 2),0.0)); fxEdgeSparkles[11].SourceHeight.Base = fBoxHeight; } PlaySound(Sound'Lumos_glow_loop',SLOT_Interact,0.5,True,,,,True); @@ -172,7 +144,7 @@ function UpdateSparkles() { TurnOnAreaEffects(); fxAreaSparkles.ParticlesPerSec.Base = fArea * fAreaSparklesPerSquareGameUnit; - fxAreaSparkles.ParticlesPerSec.Base -= fDistanceToLumosSource * 0.015; + fxAreaSparkles.ParticlesPerSec.Base -= (fDistanceToLumosSource * 0.015); if ( fxAreaSparkles.ParticlesPerSec.Base < 0.025 ) { fxAreaSparkles.ParticlesPerSec.Base = 0.025; @@ -195,8 +167,6 @@ auto state StateLumosOff { GotoState('StateWaitingToTurnOn'); } - - begin: } state StateWaitingToTurnOn @@ -214,8 +184,6 @@ state StateWaitingToTurnOn { GotoState('StateLumosOff'); } - - begin: } state StateLumosOn @@ -229,8 +197,6 @@ state StateLumosOn { GotoState('StateLumosOff'); } - - begin: } defaultproperties diff --git a/HGame/Classes/Triggers/LumosTrigger.uc b/HGame/Classes/Triggers/LumosTrigger.uc index c0ba1c33..2f7b8411 100644 --- a/HGame/Classes/Triggers/LumosTrigger.uc +++ b/HGame/Classes/Triggers/LumosTrigger.uc @@ -44,7 +44,6 @@ auto state StateLumosOff GotoState('StateWaitingToTurnOn'); } } - begin: } state StateWaitingToTurnOn @@ -74,8 +73,6 @@ state StateWaitingToTurnOn { GotoState('StateLumosOff'); } - - begin: } state StateLumosOn @@ -109,7 +106,6 @@ state StateLumosOn } GotoState('StateLumosOff'); } - begin: } defaultproperties diff --git a/HGame/Classes/Triggers/SpawnThingy.uc b/HGame/Classes/Triggers/SpawnThingy.uc index b37e9bff..931bef77 100644 --- a/HGame/Classes/Triggers/SpawnThingy.uc +++ b/HGame/Classes/Triggers/SpawnThingy.uc @@ -5,7 +5,7 @@ class SpawnThingy extends Triggers; //texture import -AdamJD -#exec Texture Import File=Textures\SthingE.PNG Name=SthingE COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\SthingE.PNG Name=SthingE COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var() Class SpawnClass; var() float fVelocityModifier; diff --git a/HGame/Classes/Triggers/SpellLessonTrigger.uc b/HGame/Classes/Triggers/SpellLessonTrigger.uc index d19ca48b..5ff84643 100644 --- a/HGame/Classes/Triggers/SpellLessonTrigger.uc +++ b/HGame/Classes/Triggers/SpellLessonTrigger.uc @@ -130,14 +130,14 @@ function CheckForMissedArrows() // I = 0; // if ( I < 3 ) - for(I = 0; I < 3; I++) //for loop -AdamJD + for(I = 0; I < ArrayCount(IPPassedArrow); I++) //for loop -AdamJD { if ( IPPassedArrow[I] != None ) { if ( IPPassedArrow[I].IsActive(nLevel) ) { fDist = VSize(IPPassedArrow[I].Location - GameWand.Location); - fAdjustedMissRange = 17.0 + VSize(GameWand.Location - vectLastWandLoc) + 0.01; + fAdjustedMissRange = (fHITPOINT_PREV_MISS_RANGE + VSize(GameWand.Location - vectLastWandLoc)) + 0.01; if ( fDist > fAdjustedMissRange ) { IPPassedArrow[I].OnPlayerMissed(nLevel); @@ -420,7 +420,7 @@ function bool WandAtInterpolationPoint (InterpolationPoint IPoint, Interpolation ++nHitPointsPassed; // I = 0; // if ( I < 3 ) - for(I = 0; I < 3; I++) //for loop -AdamJD + for(I = 0; I < ArrayCount(IPPassedArrow); I++) //for loop -AdamJD { if ( IPPassedArrow[I] != None ) { @@ -437,11 +437,12 @@ function bool WandAtInterpolationPoint (InterpolationPoint IPoint, Interpolation { // I = 0; // if ( I < 3 ) - for(I = 0; I < 3; I++) //for loop -AdamJD + for(I = 0; I < ArrayCount(IPPassedArrow); I++) //for loop -AdamJD { if ( IPPassedArrow[I] == None ) { IPPassedArrow[I] = SpellLessonInterpolationPoint(IPoint); + break; } } } @@ -514,7 +515,7 @@ function DoArrowKeyPressed (ELessonKey LessonKey) local float fAdjustedHitRange; local float fAdjustedMissRange; - fAdjustedHitRange = 14.0 + VSize(GameWand.Location - vectLastWandLoc) + 0.01; + fAdjustedHitRange = (fHITPOINT_RANGE + VSize(GameWand.Location - vectLastWandLoc)) + 0.01; IPTemp = SpellLessonInterpolationPoint(GameWand.SplineManager.Dest.Prev); nLastPosition = IPTemp.Position; // if ( IPTemp != None ) @@ -579,9 +580,9 @@ function DoArrowKeyPressed (ELessonKey LessonKey) { if ( IPClosest == IPNext ) { - fAdjustedMissRange = fAdjustedHitRange + (26 - 14); + fAdjustedMissRange = fAdjustedHitRange + (fHITPOINT_NEXT_MISS_RANGE - fHITPOINT_RANGE); } else { - fAdjustedMissRange = fAdjustedHitRange + (17 - 14); + fAdjustedMissRange = fAdjustedHitRange + (fHITPOINT_PREV_MISS_RANGE - fHITPOINT_RANGE); } if ( KeyMatchesIPArrow(LessonKey,IPClosest) && (fIPClosestDistance <= fAdjustedHitRange) ) { @@ -618,8 +619,8 @@ function bool KeyMatchesIPArrow (ELessonKey LessonKey, SpellLessonInterpolationP case(LessonKey_Right): return IP.IsDirectionArrowRight(nLevel); default: + return False; } - return False; } function RenderHudItems (Canvas Canvas, bool bMenuMode, bool bFullCutMode, bool bHalfCutMode) @@ -680,7 +681,7 @@ function float SayLessonDialog (string strDialogID, bool bDisplayText) Professor.PlaySound(soundDialog,,,,10000.0,,True); } } else { - fSoundLen = Len(strDialog) * 0.01 + 3.0; + fSoundLen = (Len(strDialog) * 0.01) + 3.0; } //added from the proto because UTPT didn't decompile this -AdamJD @@ -713,12 +714,16 @@ function SayTryAgain (bool bLastTimeAround) { // I = 0; // if ( I < 2 ) - for(iSayTryAgain = 0; iSayTryAgain < 2; iSayTryAgain++) //for loop -AdamJD + for(iSayTryAgain = 0; iSayTryAgain < ArrayCount(strTryOneLastTime); iSayTryAgain++) //for loop -AdamJD { if ( strTryOneLastTime[iSayTryAgain] != "" ) { ++nTryLastTimeEntries; } + else + { + break; + } } } if ( bLastTimeAround && (nTryLastTimeEntries > 0) ) @@ -728,12 +733,16 @@ function SayTryAgain (bool bLastTimeAround) } else { // I = 0; // if ( I < 3 ) - for(iSayTryAgain = 0; iSayTryAgain < 3; iSayTryAgain++) //for loop -AdamJD + for(iSayTryAgain = 0; iSayTryAgain < ArrayCount(strTryAgain); iSayTryAgain++) //for loop -AdamJD { if ( strTryAgain[iSayTryAgain] != "" ) { ++nTryAgainEntries; } + else + { + break; + } } if ( nTryAgainEntries > 0 ) { @@ -762,12 +771,16 @@ function SayEncouragement() { // I = 0; // if ( I < 2 ) - for(iSayEncouragement = 0; iSayEncouragement < 2; iSayEncouragement++) //for loop -AdamJD + for(iSayEncouragement = 0; iSayEncouragement < ArrayCount(strEncourageDoingGood); iSayEncouragement++) //for loop -AdamJD { if ( strEncourageDoingGood[iSayEncouragement] != "" ) { ++nDoingGoodEntries; } + else + { + break; + } } } if ( bDoingGood && (nDoingGoodEntries > 0) ) @@ -777,12 +790,16 @@ function SayEncouragement() } else { // I = 0; // if ( I < 2 ) - for(iSayEncouragement = 0; iSayEncouragement < 2; iSayEncouragement++) //for loop -AdamJD + for(iSayEncouragement = 0; iSayEncouragement < ArrayCount(strEncourageAny); iSayEncouragement++) //for loop -AdamJD { if ( strEncourageAny[iSayEncouragement] != "" ) { ++nEncourageAnyEntries; } + else + { + break; + } } if ( nEncourageAnyEntries > 0 ) { @@ -892,8 +909,6 @@ auto state Idle PlayerHarry.ClientMessage("Activate spelllesson trigger"); Activate(Other,EventInstigator); } - - begin: } state GameIntro @@ -1024,13 +1039,13 @@ state PlayGame case(LessonShape_Rictusempra): // case 2: case(LessonShape_Diffindo): - PlayerHarry.PlayMusic("sm_bur_playful_01_loopedit",0.5); + PlayerHarry.PlayMusic(strRICTU_DIFF_GAME_MUSIC,0.5); break; // case 1: case(LessonShape_Skurge): // case 3: case(LessonShape_Spongify): - PlayerHarry.PlayMusic("sm_bur_playful_01V2",0.5); + PlayerHarry.PlayMusic(strSKURGE_SPONG_GAME_MUSIC,0.5); break; default: break; @@ -1063,22 +1078,22 @@ state LevelOver StartCutSequence(); if ( nHitPointHits >= nHitPointsInLevel ) { - if ( nLevel < 3 - 1 ) + if ( nLevel < nNUM_LEVELS - 1 ) { Sleep(SayLessonDialog(strLevelCompleteId,True)); } else { - PlayerHarry.PlayMusic("sm_bur_PlayfulReward_01",0.5); - fMusicSleep = 7.5; + PlayerHarry.PlayMusic(strWON_MUSIC,0.5); + fMusicSleep = fWON_MUSIC_LEN; fDialogSleep = SayLessonDialog(strAllLevelsCompleteId,True); - if ( fMusicSleep + 0.5 < fDialogSleep ) + if ( fMusicSleep + fEND_MUSIC_FADE_OUT < fDialogSleep ) { - Sleep(fMusicSleep - 0.5); - PlayerHarry.StopAllMusic(0.5); - Sleep(fDialogSleep - fMusicSleep - 0.5); + Sleep(fMusicSleep - fEND_MUSIC_FADE_OUT); + PlayerHarry.StopAllMusic(fEND_MUSIC_FADE_OUT); + Sleep(fDialogSleep - (fMusicSleep - fEND_MUSIC_FADE_OUT)); } else { Sleep(fDialogSleep); - PlayerHarry.StopAllMusic(0.5); - Sleep(0.5); + PlayerHarry.StopAllMusic(fEND_MUSIC_FADE_OUT); + Sleep(fEND_MUSIC_FADE_OUT); } } sgHousePts.SetEffectTypeToPermanent(); @@ -1115,7 +1130,7 @@ state LevelOver Sleep(fDialogSleep); EndCutSequence(); ++nLevel; - if ( nLevel < 3 ) + if ( nLevel < nNUM_LEVELS ) { // JL01C8: ResetForNextLevel(); @@ -1124,18 +1139,18 @@ state LevelOver EndLesson(); } } else { - PlayerHarry.PlayMusic("sm_bur_PlayfulFail_01",0.5); - fMusicSleep = 9.0; + PlayerHarry.PlayMusic(strFAIL_MUSIC,0.5); + fMusicSleep = fFAIL_MUSIC_LEN; fDialogSleep = SayLessonDialog(strMoveOnAnywayId,True); - if ( fMusicSleep + 0.5 < fDialogSleep ) + if ( fMusicSleep + fEND_MUSIC_FADE_OUT < fDialogSleep ) { - Sleep(fMusicSleep - 0.5); - PlayerHarry.StopAllMusic(0.5); - Sleep(fDialogSleep - fMusicSleep - 0.5); + Sleep(fMusicSleep - fEND_MUSIC_FADE_OUT); + PlayerHarry.StopAllMusic(fEND_MUSIC_FADE_OUT); + Sleep(fDialogSleep - (fMusicSleep - fEND_MUSIC_FADE_OUT)); } else { Sleep(fDialogSleep); - PlayerHarry.StopAllMusic(0.5); - Sleep(0.5); + PlayerHarry.StopAllMusic(fEND_MUSIC_FADE_OUT); + Sleep(fEND_MUSIC_FADE_OUT); } EndCutSequence(); EndLesson(); diff --git a/HGame/Classes/Triggers/TriggerSpwnBsChrOnPPnt.uc b/HGame/Classes/Triggers/TriggerSpwnBsChrOnPPnt.uc index c413240c..c90aee89 100644 --- a/HGame/Classes/Triggers/TriggerSpwnBsChrOnPPnt.uc +++ b/HGame/Classes/Triggers/TriggerSpwnBsChrOnPPnt.uc @@ -52,7 +52,7 @@ function ProcessTrigger() } // N = 0; // if ( N < 8 ) - for(N = 0; N < 8; N++) + for(N = 0; N < NUM_BASE_CHARS; N++) { if ( BaseCharToSpawn[N] == None ) { @@ -68,7 +68,7 @@ function ProcessTrigger() return; } I = Rand(N); - A = Spawn(BaseCharToSpawn[I],,,sp.Location,rotator(sp.NextPatrolPoint.Location - sp.Location)); + A = Spawn(BaseCharToSpawn[I],,,[SpawnLocation]sp.Location,[SpawnRotation]rotator(sp.NextPatrolPoint.Location - sp.Location)); if ( A == None ) { Log("TriggerSpwnBsChrOnPPnt: couldn't spawn the baseChar:" $ string(BaseCharToSpawn[I])); diff --git a/HGame/Classes/Triggers/hideTrigger.uc b/HGame/Classes/Triggers/hideTrigger.uc index 3440bafb..22d4476b 100644 --- a/HGame/Classes/Triggers/hideTrigger.uc +++ b/HGame/Classes/Triggers/hideTrigger.uc @@ -10,7 +10,7 @@ event Trigger (Actor Other, Pawn EventInstigator) { local Actor A; - if ( ReTriggerDelay >0 ) + if ( ReTriggerDelay > 0 ) { if ( Level.TimeSeconds - TriggerTime < ReTriggerDelay ) { @@ -37,12 +37,12 @@ event Trigger (Actor Other, Pawn EventInstigator) if ( bTriggerOnceOnly ) { SetCollision(False); - } else { + } else //{ if ( RepeatTriggerTime > 0 ) { SetTimer(RepeatTriggerTime,False); } - } + //} } function Touch (Actor Other) @@ -78,12 +78,12 @@ function Touch (Actor Other) if ( bTriggerOnceOnly ) { SetCollision(False); - } else { + } else //{ if ( RepeatTriggerTime > 0 ) { SetTimer(RepeatTriggerTime,False); } - } + //} } } diff --git a/HGame/Classes/Triggers/spellTrigger.uc b/HGame/Classes/Triggers/spellTrigger.uc index 4bbeb92f..8d115f47 100644 --- a/HGame/Classes/Triggers/spellTrigger.uc +++ b/HGame/Classes/Triggers/spellTrigger.uc @@ -5,7 +5,7 @@ class spellTrigger extends Trigger; //texture import -AdamJD -#exec Texture Import File=Textures\spell_trigger.PNG Name=spell_trigger COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\spell_trigger.PNG Name=spell_trigger COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var() bool bHitJustFromFront; @@ -58,8 +58,8 @@ function Touch (Actor Other) { if ( bTriggerOnceOnly ) { - SetCollision(False); - bProjTarget = False; + SetCollision(False); + bProjTarget = False; } } Super.Touch(Other); diff --git a/HGame/Classes/WhompingWillow/WhompWRController.uc b/HGame/Classes/WhompingWillow/WhompWRController.uc index 777687a6..5c3b9a68 100644 --- a/HGame/Classes/WhompingWillow/WhompWRController.uc +++ b/HGame/Classes/WhompingWillow/WhompWRController.uc @@ -78,114 +78,50 @@ state ThrashingAndSmashing } } } - - for(I = 0; I < 3; I++) - { - /* - // if ( bool(PlayerHarry.Physics) == bool(2) ) - if ( PlayerHarry.Physics == PHYS_Falling ) - { - // goto JL03D7; - continue; - } - if ( !ColObj[I].bBlockPlayers ) - { - // goto JL03D7; - continue; - } - vHLoc = PlayerHarry.Location; - if ( VSize(vHLoc - ColObj[I].Location) > 200 ) - { - // goto JL03D7; - continue; - } - GetAxes(ColObj[I].Rotation,vX,vY,vZ); - V = vX * (ColObj[I].CollisionRadius / 2); - D = ColObj[I].CollisionRadius / 2 + PlayerHarry.CollisionRadius; - if ( ((vHLoc - ColObj[I].Location + V) Dot vX) > D ) - { - // goto JL03D7; - continue; - } - if ( ((vHLoc - ColObj[I].Location - V) Dot -vX) > D ) - { - // goto JL03D7; - continue; - } - V = vY * (ColObj[I].CollisionWidth / 2); - D = ColObj[I].CollisionWidth / 2 + PlayerHarry.CollisionRadius; - if ( ((vHLoc - ColObj[I].Location + V) Dot vY) > D ) - { - // goto JL03D7; - continue; - } - if ( ((vHLoc - ColObj[I].Location - V) Dot -vY) > D ) - { - // goto JL03D7; - continue; - } - if ( !PlayerHarry.HarryIsDead() ) - { - PlayerHarry.TakeDamage(Damage,tree,vect(0.00,0.00,0.00),vect(0.00,0.00,0.00),'None'); - PlayerHarry.DoJump(); - if ( ((vHLoc - ColObj[I].Location) Dot vX) > 0 ) - { - PlayerHarry.Velocity = (vX + vect(0.00,0.00,1.00)) * 200; - } else { - PlayerHarry.Velocity = ( -vX + vect(0.00,0.00,1.00)) * 200; - } - } - - // goto JL03E1; - // I++; - // goto JL00D1; - break; - } - */ - //rewritten this code because the original doesn't work -AdamJD - // + for(I = 0; I < 3; I++) + { if(PlayerHarry.Physics == PHYS_Falling) { continue; } - if( !ColObj[i].bBlockPlayers ) + if( !ColObj[I].bBlockPlayers ) { continue; } vHLoc = PlayerHarry.Location; - if(VSize(vHLoc - ColObj[i].Location) > 200) + if(VSize(vHLoc - ColObj[I].Location) > 200) { continue; } - GetAxes( ColObj[i].Rotation, vX, vY, vZ ); + GetAxes( ColObj[I].Rotation, vX, vY, vZ ); - v = vX * (ColObj[i].CollisionRadius / 2); - d = ColObj[i].CollisionRadius/2 + PlayerHarry.CollisionRadius; + V = vX * (ColObj[I].CollisionRadius / 2); + D = ColObj[I].CollisionRadius / 2 + PlayerHarry.CollisionRadius; - if( ((vHLoc - (ColObj[i].Location + v)) dot vX) > d ) + if( ((vHLoc - (ColObj[I].Location + V)) Dot vX) > D ) { continue; } - if( ((vHLoc - (ColObj[i].Location - v)) dot -vX) > d ) + if( ((vHLoc - (ColObj[I].Location - V)) Dot -vX) > D ) { continue; } - v = vY * (ColObj[i].CollisionWidth / 2); - d = ColObj[i].CollisionWidth/2 + PlayerHarry.CollisionRadius; + V = vY * (ColObj[I].CollisionWidth / 2); + D = ColObj[I].CollisionWidth / 2 + PlayerHarry.CollisionRadius; - if( ((vHLoc - (ColObj[i].Location + v)) dot vY) > d ) + if( ((vHLoc - (ColObj[I].Location + V)) Dot vY) > D ) { continue; } - if( ((vHLoc - (ColObj[i].Location - v)) dot -vY) > d ) + if( ((vHLoc - (ColObj[I].Location - V)) Dot -vY) > D ) { continue; } @@ -195,13 +131,13 @@ state ThrashingAndSmashing PlayerHarry.TakeDamage( Damage, tree, vect(0,0,0), Vect(0,0,0), ''); PlayerHarry.DoJump(); - if( ((vHLoc - ColObj[i].Location) dot vX) > 0 ) + if( ((vHLoc - ColObj[I].Location) Dot vX) > 0 ) { - PlayerHarry.velocity = ( vX + vect(0,0,1)) * 200; + PlayerHarry.Velocity = ( vX + vect(0,0,1)) * 200; } else { - PlayerHarry.velocity = (-vX + vect(0,0,1)) * 200; + PlayerHarry.Velocity = (-vX + vect(0,0,1)) * 200; } } @@ -216,23 +152,23 @@ state ThrashingAndSmashing } else { BackGroundRootSound = Sound'willow_base_woodmovement'; } - ColObj[1].PlaySound(BackGroundRootSound,SLOT_Misc,RandRange(0.81,1.0) * 0.5,,,RandRange(0.62,0.81)); - ColObj[1].PlaySound(Sound'pig_squeal1',SLOT_Pain,RandRange(0.41,0.41),,,RandRange(0.23,0.25999999)); - switch (Rand(3)) - { - case 0: - ColObj[1].PlaySound(Sound'Root_up_creak1',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); - break; - case 1: - ColObj[1].PlaySound(Sound'Root_up_creak2',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); - break; - case 2: - ColObj[1].PlaySound(Sound'Root_up_creak3',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); - break; - default: - } do { + ColObj[1].PlaySound(BackGroundRootSound,SLOT_Misc,RandRange(0.81,1.0) * 0.5,,,RandRange(0.62,0.81)); + ColObj[1].PlaySound(Sound'pig_squeal1',SLOT_Pain,RandRange(0.41,0.41),,,RandRange(0.23,0.25999999)); + switch (Rand(3)) + { + case 0: + ColObj[1].PlaySound(Sound'Root_up_creak1',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); + break; + case 1: + ColObj[1].PlaySound(Sound'Root_up_creak2',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); + break; + case 2: + ColObj[1].PlaySound(Sound'Root_up_creak3',SLOT_None,RandRange(0.81,1.0) * 0.5,,,RandRange(0.81,1.25)); + break; + default: + } PlayAnim(RootAnimNameUp,tree.GetUpAnimRate(WhichRoot,TimingStage),0.1); FinishAnim(); PlayAnim(RootAnimNameLoop,1.0,0.1); @@ -256,7 +192,7 @@ state ThrashingAndSmashing TimingStage = 0; } } - until((VSize2D(PlayerHarry.Location - ColObj[1].Location) > 500) || bGoDisabled) + until((VSize2D(PlayerHarry.Location - ColObj[1].Location) > 500) || bGoDisabled); GotoState('stateIdle'); } @@ -269,32 +205,30 @@ function DoHitGroundEffects() local int NumDustParts; GetAxes(ColObj[0].Rotation,vX,vY,vZ); - if ( (PlayerHarry.Location - ColObj[0].Location) Dot vX < 0 ) + if ( ((PlayerHarry.Location - ColObj[0].Location) Dot vX) < 0 ) { vX = -vX; } vX *= ColObj[0].CollisionRadius / 2; vY *= ColObj[0].CollisionWidth; vZ *= -ColObj[0].CollisionHeight; - NumDustParts = RandRange(3.0,4.0); + NumDustParts = RandRange(3.0,4.0); for(I = 0; I < NumDustParts; I++) { - Spawn(PickRandomDustParticle(),None,,ColObj[0].Location + vX + vY * RandRange(-1.0,1.0) + vZ); + Spawn(PickRandomDustParticle(),None,,[SpawnLocation]ColObj[0].Location + vX + vY * RandRange(-1.0,1.0) + vZ); } NumDustParts = RandRange(2.0,4.0); - for(I = 0; I < NumDustParts; I++) { - Spawn(PickRandomDustParticle(),None,,ColObj[1].Location + vX + vY * RandRange(-1.0,1.0) + vZ); + Spawn(PickRandomDustParticle(),None,,[SpawnLocation]ColObj[1].Location + vX + vY * RandRange(-1.0,1.0) + vZ); } NumDustParts = RandRange(1.0,2.0); - for(I = 0; I < NumDustParts; I++) { - Spawn(PickRandomDustParticle(),None,,ColObj[2].Location + vX + vY * RandRange(-1.0,1.0) + vZ); + Spawn(PickRandomDustParticle(),None,,[SpawnLocation]ColObj[2].Location + vX + vY * RandRange(-1.0,1.0) + vZ); } switch (Rand(3)) diff --git a/HGame/Classes/WizardCards/WCAgrippa.uc b/HGame/Classes/WizardCards/WCAgrippa.uc index 7634d7a4..44f312a5 100644 --- a/HGame/Classes/WizardCards/WCAgrippa.uc +++ b/HGame/Classes/WizardCards/WCAgrippa.uc @@ -5,7 +5,7 @@ class WCAgrippa extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardAgrippaBigTexture.PNG GROUP=Icons Name=WizCardAgrippaBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAgrippaBigTexture.PNG GROUP=Icons Name=WizCardAgrippaBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardAgrippaTex0.PNG GROUP=Skins Name=WizardCardAgrippaTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCAlderton.uc b/HGame/Classes/WizardCards/WCAlderton.uc index 38ac4f54..0d804c67 100644 --- a/HGame/Classes/WizardCards/WCAlderton.uc +++ b/HGame/Classes/WizardCards/WCAlderton.uc @@ -5,7 +5,7 @@ class WCAlderton extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardAldertonBigTexture.PNG GROUP=Icons Name=WizCardAldertonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAldertonBigTexture.PNG GROUP=Icons Name=WizCardAldertonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardAldertonTex0.PNG GROUP=Skins Name=WizardCardAldertonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCAndros.uc b/HGame/Classes/WizardCards/WCAndros.uc index 19076b60..d7b1c999 100644 --- a/HGame/Classes/WizardCards/WCAndros.uc +++ b/HGame/Classes/WizardCards/WCAndros.uc @@ -5,7 +5,7 @@ class WCAndros extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardAndrosBigTexture.PNG GROUP=Icons Name=WizCardAndrosBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAndrosBigTexture.PNG GROUP=Icons Name=WizCardAndrosBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardAndrosTex0.PNG GROUP=Skins Name=WizardCardAndrosTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBarbary.uc b/HGame/Classes/WizardCards/WCBarbary.uc index 3777d103..f233a03a 100644 --- a/HGame/Classes/WizardCards/WCBarbary.uc +++ b/HGame/Classes/WizardCards/WCBarbary.uc @@ -5,7 +5,7 @@ class WCBarbary extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBarbaryBigTexture.PNG GROUP=Icons Name=WizCardBarbaryBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBarbaryBigTexture.PNG GROUP=Icons Name=WizCardBarbaryBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBarbaryTex0.PNG GROUP=Skins Name=WizardCardBarbaryTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBarkwith.uc b/HGame/Classes/WizardCards/WCBarkwith.uc index 54885984..2e66cdd7 100644 --- a/HGame/Classes/WizardCards/WCBarkwith.uc +++ b/HGame/Classes/WizardCards/WCBarkwith.uc @@ -5,7 +5,7 @@ class WCBarkwith extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBarkwithBigTexture.PNG GROUP=Icons Name=WizCardBarkwithBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBarkwithBigTexture.PNG GROUP=Icons Name=WizCardBarkwithBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBarkwithTex0.PNG GROUP=Skins Name=WizardCardBarkwithTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBeamish.uc b/HGame/Classes/WizardCards/WCBeamish.uc index 314d8535..18a09d1b 100644 --- a/HGame/Classes/WizardCards/WCBeamish.uc +++ b/HGame/Classes/WizardCards/WCBeamish.uc @@ -5,7 +5,7 @@ class WCBeamish extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBeamishBigTexture.PNG GROUP=Icons Name=WizCardBeamishBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBeamishBigTexture.PNG GROUP=Icons Name=WizCardBeamishBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBeamishTex0.PNG GROUP=Skins Name=WizardCardBeamishTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBelby.uc b/HGame/Classes/WizardCards/WCBelby.uc index 79c36451..25918fe5 100644 --- a/HGame/Classes/WizardCards/WCBelby.uc +++ b/HGame/Classes/WizardCards/WCBelby.uc @@ -5,7 +5,7 @@ class WCBelby extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBelbyBigTexture.PNG GROUP=Icons Name=WizCardBelbyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBelbyBigTexture.PNG GROUP=Icons Name=WizCardBelbyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBelbyTex0.PNG GROUP=Skins Name=WizardCardBelbyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBlane.uc b/HGame/Classes/WizardCards/WCBlane.uc index c41d5722..794a3807 100644 --- a/HGame/Classes/WizardCards/WCBlane.uc +++ b/HGame/Classes/WizardCards/WCBlane.uc @@ -5,7 +5,7 @@ class WCBlane extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBlaneBigTexture.PNG GROUP=Icons Name=WizCardBlaneBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBlaneBigTexture.PNG GROUP=Icons Name=WizCardBlaneBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBlaneTex0.PNG GROUP=Skins Name=WizardCardBlaneTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBloxam.uc b/HGame/Classes/WizardCards/WCBloxam.uc index ba3896f4..dce35f22 100644 --- a/HGame/Classes/WizardCards/WCBloxam.uc +++ b/HGame/Classes/WizardCards/WCBloxam.uc @@ -5,7 +5,7 @@ class WCBloxam extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBloxamBigTexture.PNG GROUP=Icons Name=WizCardBloxamBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBloxamBigTexture.PNG GROUP=Icons Name=WizCardBloxamBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBloxamTex0.PNG GROUP=Skins Name=WizardCardBloxamTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBonham.uc b/HGame/Classes/WizardCards/WCBonham.uc index 12a13bec..c13dd523 100644 --- a/HGame/Classes/WizardCards/WCBonham.uc +++ b/HGame/Classes/WizardCards/WCBonham.uc @@ -5,7 +5,7 @@ class WCBonham extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBonhamBigTexture.PNG GROUP=Icons Name=WizCardBonhamBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBonhamBigTexture.PNG GROUP=Icons Name=WizCardBonhamBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBonhamTex0.PNG GROUP=Skins Name=WizardCardBonhamTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCBott.uc b/HGame/Classes/WizardCards/WCBott.uc index 2038eb84..d9f7cea6 100644 --- a/HGame/Classes/WizardCards/WCBott.uc +++ b/HGame/Classes/WizardCards/WCBott.uc @@ -5,10 +5,10 @@ class WCBott extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardBottBigTexture.PNG GROUP=Icons Name=WizCardBottBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer0.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer1.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer2.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBottBigTexture.PNG GROUP=Icons Name=WizCardBottBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer0.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer1.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardBertieBigTextureLayer2.PNG GROUP=Icons Name=WizCardBertieBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardBottTex0.PNG GROUP=Skins Name=WizardCardBottTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCCatchlove.uc b/HGame/Classes/WizardCards/WCCatchlove.uc index 6f2b9638..a9baebd2 100644 --- a/HGame/Classes/WizardCards/WCCatchlove.uc +++ b/HGame/Classes/WizardCards/WCCatchlove.uc @@ -5,7 +5,7 @@ class WCCatchlove extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardCatchloveBigTexture.PNG GROUP=Icons Name=WizCardCatchloveBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCatchloveBigTexture.PNG GROUP=Icons Name=WizCardCatchloveBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardCatchloveTex0.PNG GROUP=Skins Name=WizardCardCatchloveTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCChittock.uc b/HGame/Classes/WizardCards/WCChittock.uc index 8506f3cc..8a922edb 100644 --- a/HGame/Classes/WizardCards/WCChittock.uc +++ b/HGame/Classes/WizardCards/WCChittock.uc @@ -5,7 +5,7 @@ class WCChittock extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardChittockBigTexture.PNG GROUP=Icons Name=WizCardChittockBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardChittockBigTexture.PNG GROUP=Icons Name=WizCardChittockBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardChittockTex0.PNG GROUP=Skins Name=WizardCardChittockTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCCirce.uc b/HGame/Classes/WizardCards/WCCirce.uc index f792d54e..a83ad036 100644 --- a/HGame/Classes/WizardCards/WCCirce.uc +++ b/HGame/Classes/WizardCards/WCCirce.uc @@ -5,7 +5,7 @@ class WCCirce extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardCirceBigTexture.PNG GROUP=Icons Name=WizCardCirceBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCirceBigTexture.PNG GROUP=Icons Name=WizCardCirceBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardCirceTex0.PNG GROUP=Skins Name=WizardCardCirceTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCClagg.uc b/HGame/Classes/WizardCards/WCClagg.uc index dd9603b1..1d524a6e 100644 --- a/HGame/Classes/WizardCards/WCClagg.uc +++ b/HGame/Classes/WizardCards/WCClagg.uc @@ -5,7 +5,7 @@ class WCClagg extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardClaggBigTexture.PNG GROUP=Icons Name=WizCardClaggBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardClaggBigTexture.PNG GROUP=Icons Name=WizCardClaggBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardClaggTex0.PNG GROUP=Skins Name=WizardCardClaggTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCCliodne.uc b/HGame/Classes/WizardCards/WCCliodne.uc index f23c5d48..a1815bea 100644 --- a/HGame/Classes/WizardCards/WCCliodne.uc +++ b/HGame/Classes/WizardCards/WCCliodne.uc @@ -5,7 +5,7 @@ class WCCliodne extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardCliodneBigTexture.PNG GROUP=Icons Name=WizCardCliodneBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCliodneBigTexture.PNG GROUP=Icons Name=WizCardCliodneBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardCliodneTex0.PNG GROUP=Skins Name=WizardCardCliodneTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCCronk.uc b/HGame/Classes/WizardCards/WCCronk.uc index 83226c15..5642dfa7 100644 --- a/HGame/Classes/WizardCards/WCCronk.uc +++ b/HGame/Classes/WizardCards/WCCronk.uc @@ -5,7 +5,7 @@ class WCCronk extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardCronkBigTexture.PNG GROUP=Icons Name=WizCardCronkBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCronkBigTexture.PNG GROUP=Icons Name=WizCardCronkBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardCronkTex0.PNG GROUP=Skins Name=WizardCardCronkTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCCrumb.uc b/HGame/Classes/WizardCards/WCCrumb.uc index 1a44c1b6..ff5b82f3 100644 --- a/HGame/Classes/WizardCards/WCCrumb.uc +++ b/HGame/Classes/WizardCards/WCCrumb.uc @@ -5,7 +5,7 @@ class WCCrumb extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardCrumbBigTexture.PNG GROUP=Icons Name=WizCardCrumbBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCrumbBigTexture.PNG GROUP=Icons Name=WizCardCrumbBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardCrumbTex0.PNG GROUP=Skins Name=WizardCardCrumbTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCDodderidge.uc b/HGame/Classes/WizardCards/WCDodderidge.uc index dbf6a51d..dcf52653 100644 --- a/HGame/Classes/WizardCards/WCDodderidge.uc +++ b/HGame/Classes/WizardCards/WCDodderidge.uc @@ -5,7 +5,7 @@ class WCDodderidge extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardDodderidgeBigTexture.PNG GROUP=Icons Name=WizCardDodderidgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardDodderidgeBigTexture.PNG GROUP=Icons Name=WizCardDodderidgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardDodderidgeTex0.PNG GROUP=Skins Name=WizardCardDodderidgeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCDuke.uc b/HGame/Classes/WizardCards/WCDuke.uc index 35999c9b..3656f637 100644 --- a/HGame/Classes/WizardCards/WCDuke.uc +++ b/HGame/Classes/WizardCards/WCDuke.uc @@ -5,7 +5,7 @@ class WCDuke extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardDukeBigTexture.PNG GROUP=Icons Name=WizCardDukeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardDukeBigTexture.PNG GROUP=Icons Name=WizCardDukeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardDukeTex0.PNG GROUP=Skins Name=WizardCardDukeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCDumbledore.uc b/HGame/Classes/WizardCards/WCDumbledore.uc index 9ce9f77e..2c0ce077 100644 --- a/HGame/Classes/WizardCards/WCDumbledore.uc +++ b/HGame/Classes/WizardCards/WCDumbledore.uc @@ -5,10 +5,10 @@ class WCDumbledore extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardDumbledoreBigTexture.PNG GROUP=Icons Name=WizCardDumbledoreBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer0.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer1.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer2.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardDumbledoreBigTexture.PNG GROUP=Icons Name=WizCardDumbledoreBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer0.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer1.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardAlbusBigTextureLayer2.PNG GROUP=Icons Name=WizCardAlbusBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardDumbledoreTex0.PNG GROUP=Skins Name=WizardCardDumbledoreTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCElphick.uc b/HGame/Classes/WizardCards/WCElphick.uc index 4aba1a6e..fa23edf5 100644 --- a/HGame/Classes/WizardCards/WCElphick.uc +++ b/HGame/Classes/WizardCards/WCElphick.uc @@ -5,7 +5,7 @@ class WCElphick extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardElphickBigTexture.PNG GROUP=Icons Name=WizCardElphickBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardElphickBigTexture.PNG GROUP=Icons Name=WizCardElphickBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardElphickTex0.PNG GROUP=Skins Name=WizardCardElphickTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCEthelred.uc b/HGame/Classes/WizardCards/WCEthelred.uc index 5d26f4a5..7c0f451b 100644 --- a/HGame/Classes/WizardCards/WCEthelred.uc +++ b/HGame/Classes/WizardCards/WCEthelred.uc @@ -5,7 +5,7 @@ class WCEthelred extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardEthelredBigTexture.PNG GROUP=Icons Name=WizCardEthelredBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardEthelredBigTexture.PNG GROUP=Icons Name=WizCardEthelredBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardEthelredTex0.PNG GROUP=Skins Name=WizardCardEthelredTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCFancourt.uc b/HGame/Classes/WizardCards/WCFancourt.uc index 12d7946d..df726003 100644 --- a/HGame/Classes/WizardCards/WCFancourt.uc +++ b/HGame/Classes/WizardCards/WCFancourt.uc @@ -5,7 +5,7 @@ class WCFancourt extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardFancourtBigTexture.PNG GROUP=Icons Name=WizCardFancourtBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardFancourtBigTexture.PNG GROUP=Icons Name=WizCardFancourtBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardFancourtTex0.PNG GROUP=Skins Name=WizardCardFancourtTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCFay.uc b/HGame/Classes/WizardCards/WCFay.uc index afff0f7a..443f2f62 100644 --- a/HGame/Classes/WizardCards/WCFay.uc +++ b/HGame/Classes/WizardCards/WCFay.uc @@ -5,7 +5,7 @@ class WCFay extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardFayBigTexture.PNG GROUP=Icons Name=WizCardFayBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardFayBigTexture.PNG GROUP=Icons Name=WizCardFayBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardFayTex0.PNG GROUP=Skins Name=WizardCardFayTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCFulbert.uc b/HGame/Classes/WizardCards/WCFulbert.uc index 40f59bd5..e2c79770 100644 --- a/HGame/Classes/WizardCards/WCFulbert.uc +++ b/HGame/Classes/WizardCards/WCFulbert.uc @@ -5,7 +5,7 @@ class WCFulbert extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardFulbertBigTexture.PNG GROUP=Icons Name=WizCardFulbertBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardFulbertBigTexture.PNG GROUP=Icons Name=WizCardFulbertBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardFulbertTex0.PNG GROUP=Skins Name=WizardCardFulbertTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCFurmage.uc b/HGame/Classes/WizardCards/WCFurmage.uc index b2ac599b..1f1d07ff 100644 --- a/HGame/Classes/WizardCards/WCFurmage.uc +++ b/HGame/Classes/WizardCards/WCFurmage.uc @@ -5,7 +5,7 @@ class WCFurmage extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardFurmageBigTexture.PNG GROUP=Icons Name=WizCardFurmageBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardFurmageBigTexture.PNG GROUP=Icons Name=WizCardFurmageBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardFurmageTex0.PNG GROUP=Skins Name=WizardCardFurmageTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGoshawk.uc b/HGame/Classes/WizardCards/WCGoshawk.uc index 2a44a8a9..22efd376 100644 --- a/HGame/Classes/WizardCards/WCGoshawk.uc +++ b/HGame/Classes/WizardCards/WCGoshawk.uc @@ -5,7 +5,7 @@ class WCGoshawk extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGoshawkBigTexture.PNG GROUP=Icons Name=WizCardGoshawkBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGoshawkBigTexture.PNG GROUP=Icons Name=WizCardGoshawkBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGoshawkTex0.PNG GROUP=Skins Name=WizardCardGoshawkTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGraves.uc b/HGame/Classes/WizardCards/WCGraves.uc index c62f8933..f906516a 100644 --- a/HGame/Classes/WizardCards/WCGraves.uc +++ b/HGame/Classes/WizardCards/WCGraves.uc @@ -5,7 +5,7 @@ class WCGraves extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGravesBigTexture.PNG GROUP=Icons Name=WizCardGravesBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGravesBigTexture.PNG GROUP=Icons Name=WizCardGravesBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGravesTex0.PNG GROUP=Skins Name=WizardCardGravesTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGregory.uc b/HGame/Classes/WizardCards/WCGregory.uc index 3b9426ae..0b3f2b35 100644 --- a/HGame/Classes/WizardCards/WCGregory.uc +++ b/HGame/Classes/WizardCards/WCGregory.uc @@ -5,7 +5,7 @@ class WCGregory extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGregoryBigTexture.PNG GROUP=Icons Name=WizCardGregoryBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGregoryBigTexture.PNG GROUP=Icons Name=WizCardGregoryBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGregoryTex0.PNG GROUP=Skins Name=WizardCardGregoryTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGriffindor.uc b/HGame/Classes/WizardCards/WCGriffindor.uc index 2654874e..3e41b397 100644 --- a/HGame/Classes/WizardCards/WCGriffindor.uc +++ b/HGame/Classes/WizardCards/WCGriffindor.uc @@ -5,7 +5,7 @@ class WCGriffindor extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGryffindorBigTexture.PNG GROUP=Icons Name=WizCardGryffindorBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGryffindorBigTexture.PNG GROUP=Icons Name=WizCardGryffindorBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGryffindorTex0.PNG GROUP=Skins Name=WizardCardGryffindorTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGrunnion.uc b/HGame/Classes/WizardCards/WCGrunnion.uc index 6a14bd42..ca54b968 100644 --- a/HGame/Classes/WizardCards/WCGrunnion.uc +++ b/HGame/Classes/WizardCards/WCGrunnion.uc @@ -5,7 +5,7 @@ class WCGrunnion extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGrunnionBigTexture.PNG GROUP=Icons Name=WizCardGrunnionBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGrunnionBigTexture.PNG GROUP=Icons Name=WizCardGrunnionBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGrunnionTex0.PNG GROUP=Skins Name=WizardCardGrunnionTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCGunhilda.uc b/HGame/Classes/WizardCards/WCGunhilda.uc index 55da7777..5e0587cf 100644 --- a/HGame/Classes/WizardCards/WCGunhilda.uc +++ b/HGame/Classes/WizardCards/WCGunhilda.uc @@ -5,7 +5,7 @@ class WCGunhilda extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardGunhildaBigTexture.PNG GROUP=Icons Name=WizCardGunhildaBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardGunhildaBigTexture.PNG GROUP=Icons Name=WizCardGunhildaBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardGunhildaTex0.PNG GROUP=Skins Name=WizardCardGunhildaTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCHerpo.uc b/HGame/Classes/WizardCards/WCHerpo.uc index 4efa013a..4f7a6342 100644 --- a/HGame/Classes/WizardCards/WCHerpo.uc +++ b/HGame/Classes/WizardCards/WCHerpo.uc @@ -5,10 +5,10 @@ class WCHerpo extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardHerpoBigTexture.PNG GROUP=Icons Name=WizCardHerpoBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer0.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer1.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer2.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHerpoBigTexture.PNG GROUP=Icons Name=WizCardHerpoBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer0.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer1.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHerpoBigTextureLayer2.PNG GROUP=Icons Name=WizCardHerpoBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardHerpoTex0.PNG GROUP=Skins Name=WizardCardHerpoTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCHipworth.uc b/HGame/Classes/WizardCards/WCHipworth.uc index 57abf3f3..8375dd23 100644 --- a/HGame/Classes/WizardCards/WCHipworth.uc +++ b/HGame/Classes/WizardCards/WCHipworth.uc @@ -5,7 +5,7 @@ class WCHipworth extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardHipworthBigTexture.PNG GROUP=Icons Name=WizCardHipworthBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHipworthBigTexture.PNG GROUP=Icons Name=WizCardHipworthBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardHipworthTex0.PNG GROUP=Skins Name=WizardCardHipworthTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCHufflepuff.uc b/HGame/Classes/WizardCards/WCHufflepuff.uc index 60ecd6ee..4e87b01b 100644 --- a/HGame/Classes/WizardCards/WCHufflepuff.uc +++ b/HGame/Classes/WizardCards/WCHufflepuff.uc @@ -5,10 +5,10 @@ class WCHufflepuff extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardHufflepuffBigTexture.PNG GROUP=Icons Name=WizCardHufflepuffBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer0.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer1.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer2.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHufflepuffBigTexture.PNG GROUP=Icons Name=WizCardHufflepuffBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer0.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer1.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHelgaBigTextureLayer2.PNG GROUP=Icons Name=WizCardHelgaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardHufflepuffTex0.PNG GROUP=Skins Name=WizardCardHufflepuffTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCJones.uc b/HGame/Classes/WizardCards/WCJones.uc index 2c68ff57..50ae5c8f 100644 --- a/HGame/Classes/WizardCards/WCJones.uc +++ b/HGame/Classes/WizardCards/WCJones.uc @@ -5,7 +5,7 @@ class WCJones extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardJonesBigTexture.PNG GROUP=Icons Name=WizCardJonesBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardJonesBigTexture.PNG GROUP=Icons Name=WizCardJonesBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardJonesTex0.PNG GROUP=Skins Name=WizardCardJonesTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCKegg.uc b/HGame/Classes/WizardCards/WCKegg.uc index 4c6c6135..e8973a23 100644 --- a/HGame/Classes/WizardCards/WCKegg.uc +++ b/HGame/Classes/WizardCards/WCKegg.uc @@ -5,7 +5,7 @@ class WCKegg extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardKeggBigTexture.PNG GROUP=Icons Name=WizCardKeggBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardKeggBigTexture.PNG GROUP=Icons Name=WizCardKeggBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardKeggTex0.PNG GROUP=Skins Name=WizardCardKeggTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCKetteridge.uc b/HGame/Classes/WizardCards/WCKetteridge.uc index 0db5b0af..5dd6f6e4 100644 --- a/HGame/Classes/WizardCards/WCKetteridge.uc +++ b/HGame/Classes/WizardCards/WCKetteridge.uc @@ -5,7 +5,7 @@ class WCKetteridge extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardKetteridgeBigTexture.PNG GROUP=Icons Name=WizCardKetteridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardKetteridgeBigTexture.PNG GROUP=Icons Name=WizCardKetteridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardKetteridgeTex0.PNG GROUP=Skins Name=WizardCardKetteridgeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCKnightley.uc b/HGame/Classes/WizardCards/WCKnightley.uc index a6498200..6040cb2e 100644 --- a/HGame/Classes/WizardCards/WCKnightley.uc +++ b/HGame/Classes/WizardCards/WCKnightley.uc @@ -5,10 +5,10 @@ class WCKnightley extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardKnightleyBigTexture.PNG GROUP=Icons Name=WizCardKnightleyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer0.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer1.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer2.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardKnightleyBigTexture.PNG GROUP=Icons Name=WizCardKnightleyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer0.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer1.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMontagueBigTextureLayer2.PNG GROUP=Icons Name=WizCardMontagueBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardKnightleyTex0.PNG GROUP=Skins Name=WizardCardKnightleyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCLufkin.uc b/HGame/Classes/WizardCards/WCLufkin.uc index 6323a75a..624e261a 100644 --- a/HGame/Classes/WizardCards/WCLufkin.uc +++ b/HGame/Classes/WizardCards/WCLufkin.uc @@ -5,7 +5,7 @@ class WCLufkin extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardLufkinBigTexture.PNG GROUP=Icons Name=WizCardLufkinBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardLufkinBigTexture.PNG GROUP=Icons Name=WizCardLufkinBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardLufkinTex0.PNG GROUP=Skins Name=WizardCardLufkinTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMaeve.uc b/HGame/Classes/WizardCards/WCMaeve.uc index b234c7df..68b4f8bf 100644 --- a/HGame/Classes/WizardCards/WCMaeve.uc +++ b/HGame/Classes/WizardCards/WCMaeve.uc @@ -5,7 +5,7 @@ class WCMaeve extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMaeveBigTexture.PNG GROUP=Icons Name=WizCardMaeveBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMaeveBigTexture.PNG GROUP=Icons Name=WizCardMaeveBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMaeveTex0.PNG GROUP=Skins Name=WizardCardMaeveTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMarjoribanks.uc b/HGame/Classes/WizardCards/WCMarjoribanks.uc index 3c7123af..104687a3 100644 --- a/HGame/Classes/WizardCards/WCMarjoribanks.uc +++ b/HGame/Classes/WizardCards/WCMarjoribanks.uc @@ -5,7 +5,7 @@ class WCMarjoribanks extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMarjoribanksBigTexture.PNG GROUP=Icons Name=WizCardMarjoribanksBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMarjoribanksBigTexture.PNG GROUP=Icons Name=WizCardMarjoribanksBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMarjoribanksTex0.PNG GROUP=Skins Name=WizardCardMarjoribanksTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMerlin.uc b/HGame/Classes/WizardCards/WCMerlin.uc index 64fd34ab..a1760891 100644 --- a/HGame/Classes/WizardCards/WCMerlin.uc +++ b/HGame/Classes/WizardCards/WCMerlin.uc @@ -5,7 +5,7 @@ class WCMerlin extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMerlinBigTexture.PNG GROUP=Icons Name=WizCardMerlinBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMerlinBigTexture.PNG GROUP=Icons Name=WizCardMerlinBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMerlinTex0.PNG GROUP=Skins Name=WizardCardMerlinTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMerwyn.uc b/HGame/Classes/WizardCards/WCMerwyn.uc index 14f439e1..a6631851 100644 --- a/HGame/Classes/WizardCards/WCMerwyn.uc +++ b/HGame/Classes/WizardCards/WCMerwyn.uc @@ -5,7 +5,7 @@ class WCMerwyn extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMerwynBigTexture.PNG GROUP=Icons Name=WizCardMerwynBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMerwynBigTexture.PNG GROUP=Icons Name=WizCardMerwynBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMerwynTex0.PNG GROUP=Skins Name=WizardCardMerwynTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMontmorency.uc b/HGame/Classes/WizardCards/WCMontmorency.uc index 845aa162..7f44eed7 100644 --- a/HGame/Classes/WizardCards/WCMontmorency.uc +++ b/HGame/Classes/WizardCards/WCMontmorency.uc @@ -5,7 +5,7 @@ class WCMontmorency extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMontmorencyBigTexture.PNG GROUP=Icons Name=WizCardMontmorencyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMontmorencyBigTexture.PNG GROUP=Icons Name=WizCardMontmorencyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMontmorencyTex0.PNG GROUP=Skins Name=WizardCardMontmorencyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMopsus.uc b/HGame/Classes/WizardCards/WCMopsus.uc index 16e5dd91..c25c8efa 100644 --- a/HGame/Classes/WizardCards/WCMopsus.uc +++ b/HGame/Classes/WizardCards/WCMopsus.uc @@ -5,7 +5,7 @@ class WCMopsus extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMopsusBigTexture.PNG GROUP=Icons Name=WizCardMopsusBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMopsusBigTexture.PNG GROUP=Icons Name=WizCardMopsusBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMopsusTex0.PNG GROUP=Skins Name=WizardCardMopsusTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCMuldoon.uc b/HGame/Classes/WizardCards/WCMuldoon.uc index 427ed2a3..2f95f64e 100644 --- a/HGame/Classes/WizardCards/WCMuldoon.uc +++ b/HGame/Classes/WizardCards/WCMuldoon.uc @@ -5,7 +5,7 @@ class WCMuldoon extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardMuldoonBigTexture.PNG GROUP=Icons Name=WizCardMuldoonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardMuldoonBigTexture.PNG GROUP=Icons Name=WizCardMuldoonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardMuldoonTex0.PNG GROUP=Skins Name=WizardCardMuldoonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCNutcombe.uc b/HGame/Classes/WizardCards/WCNutcombe.uc index 4b389085..c18b163e 100644 --- a/HGame/Classes/WizardCards/WCNutcombe.uc +++ b/HGame/Classes/WizardCards/WCNutcombe.uc @@ -5,7 +5,7 @@ class WCNutcombe extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardNutcombeBigTexture.PNG GROUP=Icons Name=WizCardNutcombeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardNutcombeBigTexture.PNG GROUP=Icons Name=WizCardNutcombeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardNutcombeTex0.PNG GROUP=Skins Name=WizardCardNutcombeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCOglethorpe.uc b/HGame/Classes/WizardCards/WCOglethorpe.uc index 0c10f4c0..9dfb2734 100644 --- a/HGame/Classes/WizardCards/WCOglethorpe.uc +++ b/HGame/Classes/WizardCards/WCOglethorpe.uc @@ -5,7 +5,7 @@ class WCOglethorpe extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardOglethorpeBigTexture.PNG GROUP=Icons Name=WizCardOglethorpeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardOglethorpeBigTexture.PNG GROUP=Icons Name=WizCardOglethorpeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardOglethorpeTex0.PNG GROUP=Skins Name=WizardCardOglethorpeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCOldridge.uc b/HGame/Classes/WizardCards/WCOldridge.uc index 3e8e0424..c5ee9416 100644 --- a/HGame/Classes/WizardCards/WCOldridge.uc +++ b/HGame/Classes/WizardCards/WCOldridge.uc @@ -5,7 +5,7 @@ class WCOldridge extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardOldridgeBigTexture.PNG GROUP=Icons Name=WizCardOldridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardOldridgeBigTexture.PNG GROUP=Icons Name=WizCardOldridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardOldridgeTex0.PNG GROUP=Skins Name=WizardCardOldridgeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCOliphant.uc b/HGame/Classes/WizardCards/WCOliphant.uc index e1c1c591..f1f6bbd7 100644 --- a/HGame/Classes/WizardCards/WCOliphant.uc +++ b/HGame/Classes/WizardCards/WCOliphant.uc @@ -5,7 +5,7 @@ class WCOliphant extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardOliphantBigTexture.PNG GROUP=Icons Name=WizCardOliphantBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardOliphantBigTexture.PNG GROUP=Icons Name=WizCardOliphantBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardOliphantTex0.PNG GROUP=Skins Name=WizardCardOliphantTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCOllerton.uc b/HGame/Classes/WizardCards/WCOllerton.uc index 3fd13364..731b6630 100644 --- a/HGame/Classes/WizardCards/WCOllerton.uc +++ b/HGame/Classes/WizardCards/WCOllerton.uc @@ -5,7 +5,7 @@ class WCOllerton extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardOllertonBigTexture.PNG GROUP=Icons Name=WizCardOllertonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardOllertonBigTexture.PNG GROUP=Icons Name=WizCardOllertonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardOllertonTex0.PNG GROUP=Skins Name=WizardCardOllertonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCParacelsus.uc b/HGame/Classes/WizardCards/WCParacelsus.uc index 22065836..26742269 100644 --- a/HGame/Classes/WizardCards/WCParacelsus.uc +++ b/HGame/Classes/WizardCards/WCParacelsus.uc @@ -5,7 +5,7 @@ class WCParacelsus extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardParacelsusBigTexture.PNG GROUP=Icons Name=WizCardParacelsusBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardParacelsusBigTexture.PNG GROUP=Icons Name=WizCardParacelsusBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardParacelsusTex0.PNG GROUP=Skins Name=WizardCardParacelsusTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPeakes.uc b/HGame/Classes/WizardCards/WCPeakes.uc index a8290321..1cb496e2 100644 --- a/HGame/Classes/WizardCards/WCPeakes.uc +++ b/HGame/Classes/WizardCards/WCPeakes.uc @@ -5,7 +5,7 @@ class WCPeakes extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPeakesBigTexture.PNG GROUP=Icons Name=WizCardPeakesBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPeakesBigTexture.PNG GROUP=Icons Name=WizCardPeakesBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPeakesTex0.PNG GROUP=Skins Name=WizardCardPeakesTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPilliwickle.uc b/HGame/Classes/WizardCards/WCPilliwickle.uc index 13e9b46e..636cbdd7 100644 --- a/HGame/Classes/WizardCards/WCPilliwickle.uc +++ b/HGame/Classes/WizardCards/WCPilliwickle.uc @@ -5,7 +5,7 @@ class WCPilliwickle extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPilliwickleBigTexture.PNG GROUP=Icons Name=WizCardPilliwickleBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPilliwickleBigTexture.PNG GROUP=Icons Name=WizCardPilliwickleBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPilliwickleTex0.PNG GROUP=Skins Name=WizardCardPilliwickleTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPinkstone.uc b/HGame/Classes/WizardCards/WCPinkstone.uc index a303ce23..401e1097 100644 --- a/HGame/Classes/WizardCards/WCPinkstone.uc +++ b/HGame/Classes/WizardCards/WCPinkstone.uc @@ -5,10 +5,10 @@ class WCPinkstone extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPinkstoneBigTexture.PNG GROUP=Icons Name=WizCardPinkstoneBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer0.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer1.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer2.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPinkstoneBigTexture.PNG GROUP=Icons Name=WizCardPinkstoneBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer0.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer1.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardCarlottaBigTextureLayer2.PNG GROUP=Icons Name=WizCardCarlottaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPinkstoneTex0.PNG GROUP=Skins Name=WizardCardPinkstoneTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() @@ -32,5 +32,7 @@ defaultproperties textureLayers(2)=Texture'HGame.Icons.WizCardCarlottaBigTextureLayer2' Skin=Texture'HGame.Skins.WizardCardPinkstoneTex0' + + bIsLayered=True } diff --git a/HGame/Classes/WizardCards/WCPlatt.uc b/HGame/Classes/WizardCards/WCPlatt.uc index a50a6a13..6737f683 100644 --- a/HGame/Classes/WizardCards/WCPlatt.uc +++ b/HGame/Classes/WizardCards/WCPlatt.uc @@ -5,7 +5,7 @@ class WCPlatt extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPlattBigTexture.PNG GROUP=Icons Name=WizCardPlattBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPlattBigTexture.PNG GROUP=Icons Name=WizCardPlattBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPlattTex0.PNG GROUP=Skins Name=WizardCardPlattTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPlumpton.uc b/HGame/Classes/WizardCards/WCPlumpton.uc index 567866ca..a48748d4 100644 --- a/HGame/Classes/WizardCards/WCPlumpton.uc +++ b/HGame/Classes/WizardCards/WCPlumpton.uc @@ -5,7 +5,7 @@ class WCPlumpton extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPlumptonBigTexture.PNG GROUP=Icons Name=WizCardPlumptonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPlumptonBigTexture.PNG GROUP=Icons Name=WizCardPlumptonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPlumptonTex0.PNG GROUP=Skins Name=WizardCardPlumptonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPlunkett.uc b/HGame/Classes/WizardCards/WCPlunkett.uc index 86442d90..6b1038a4 100644 --- a/HGame/Classes/WizardCards/WCPlunkett.uc +++ b/HGame/Classes/WizardCards/WCPlunkett.uc @@ -5,7 +5,7 @@ class WCPlunkett extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPlunkettBigTexture.PNG GROUP=Icons Name=WizCardPlunkettBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPlunkettBigTexture.PNG GROUP=Icons Name=WizCardPlunkettBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPlunkettTex0.PNG GROUP=Skins Name=WizardCardPlunkettTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPo.uc b/HGame/Classes/WizardCards/WCPo.uc index 06636c83..cbc0adfe 100644 --- a/HGame/Classes/WizardCards/WCPo.uc +++ b/HGame/Classes/WizardCards/WCPo.uc @@ -5,7 +5,7 @@ class WCPo extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPoBigTexture.PNG GROUP=Icons Name=WizCardPoBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPoBigTexture.PNG GROUP=Icons Name=WizCardPoBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPoTex0.PNG GROUP=Skins Name=WizardCardPoTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPokeby.uc b/HGame/Classes/WizardCards/WCPokeby.uc index b9dad44f..c0bb64d2 100644 --- a/HGame/Classes/WizardCards/WCPokeby.uc +++ b/HGame/Classes/WizardCards/WCPokeby.uc @@ -5,7 +5,7 @@ class WCPokeby extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPokebyBigTexture.PNG GROUP=Icons Name=WizCardPokebyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPokebyBigTexture.PNG GROUP=Icons Name=WizCardPokebyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPokebyTex0.PNG GROUP=Skins Name=WizardCardPokebyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCPotter.uc b/HGame/Classes/WizardCards/WCPotter.uc index 10db0708..6f2bb375 100644 --- a/HGame/Classes/WizardCards/WCPotter.uc +++ b/HGame/Classes/WizardCards/WCPotter.uc @@ -5,10 +5,10 @@ class WCPotter extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardPotterBigTexture.PNG GROUP=Icons Name=WizCardPotterBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer0.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer1.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer2.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardPotterBigTexture.PNG GROUP=Icons Name=WizCardPotterBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer0.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer1.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardHarryBigTextureLayer2.PNG GROUP=Icons Name=WizCardHarryBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardPotterTex0.PNG GROUP=Skins Name=WizardCardPotterTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCRastrick.uc b/HGame/Classes/WizardCards/WCRastrick.uc index 512ec816..16d3ca6a 100644 --- a/HGame/Classes/WizardCards/WCRastrick.uc +++ b/HGame/Classes/WizardCards/WCRastrick.uc @@ -5,7 +5,7 @@ class WCRastrick extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardRastrickBigTexture.PNG GROUP=Icons Name=WizCardRastrickBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardRastrickBigTexture.PNG GROUP=Icons Name=WizCardRastrickBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardRastrickTex0.PNG GROUP=Skins Name=WizardCardRastrickTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCRavenclaw.uc b/HGame/Classes/WizardCards/WCRavenclaw.uc index b0a749fc..44bad087 100644 --- a/HGame/Classes/WizardCards/WCRavenclaw.uc +++ b/HGame/Classes/WizardCards/WCRavenclaw.uc @@ -5,10 +5,10 @@ class WCRavenclaw extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardRavenclawBigTexture.PNG GROUP=Icons Name=WizCardRavenclawBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer0.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer1.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 -#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer2.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardRavenclawBigTexture.PNG GROUP=Icons Name=WizCardRavenclawBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer0.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer0 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer1.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer1 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardRowenaBigTextureLayer2.PNG GROUP=Icons Name=WizCardRowenaBigTextureLayer2 COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardRavenclawTex0.PNG GROUP=Skins Name=WizardCardRavenclawTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSawbridge.uc b/HGame/Classes/WizardCards/WCSawbridge.uc index 990a34e9..3a2790ab 100644 --- a/HGame/Classes/WizardCards/WCSawbridge.uc +++ b/HGame/Classes/WizardCards/WCSawbridge.uc @@ -5,7 +5,7 @@ class WCSawbridge extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSawbridgeBigTexture.PNG GROUP=Icons Name=WizCardSawbridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSawbridgeBigTexture.PNG GROUP=Icons Name=WizCardSawbridgeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSawbridgeTex0.PNG GROUP=Skins Name=WizardCardSawbridgeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCScamander.uc b/HGame/Classes/WizardCards/WCScamander.uc index 650c2e87..4403fea4 100644 --- a/HGame/Classes/WizardCards/WCScamander.uc +++ b/HGame/Classes/WizardCards/WCScamander.uc @@ -5,7 +5,7 @@ class WCScamander extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardScamanderBigTexture.PNG GROUP=Icons Name=WizCardScamanderBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardScamanderBigTexture.PNG GROUP=Icons Name=WizCardScamanderBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardScamanderTex0.PNG GROUP=Skins Name=WizardCardScamanderTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCShimpling.uc b/HGame/Classes/WizardCards/WCShimpling.uc index 675dce97..cbaf9a7d 100644 --- a/HGame/Classes/WizardCards/WCShimpling.uc +++ b/HGame/Classes/WizardCards/WCShimpling.uc @@ -5,7 +5,7 @@ class WCShimpling extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardShimplingBigTexture.PNG GROUP=Icons Name=WizCardShimplingBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardShimplingBigTexture.PNG GROUP=Icons Name=WizCardShimplingBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardShimplingTex0.PNG GROUP=Skins Name=WizardCardShimplingTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCShingleton.uc b/HGame/Classes/WizardCards/WCShingleton.uc index 41c5fb7a..1ea50cc3 100644 --- a/HGame/Classes/WizardCards/WCShingleton.uc +++ b/HGame/Classes/WizardCards/WCShingleton.uc @@ -5,7 +5,7 @@ class WCShingleton extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardShingletonBigTexture.PNG GROUP=Icons Name=WizCardShingletonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardShingletonBigTexture.PNG GROUP=Icons Name=WizCardShingletonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardShingletonTex0.PNG GROUP=Skins Name=WizardCardShingletonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSlytherin.uc b/HGame/Classes/WizardCards/WCSlytherin.uc index 19078e97..e6d80b02 100644 --- a/HGame/Classes/WizardCards/WCSlytherin.uc +++ b/HGame/Classes/WizardCards/WCSlytherin.uc @@ -5,7 +5,7 @@ class WCSlytherin extends Goldcards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSlytherinBigTexture.PNG GROUP=Icons Name=WizCardSlytherinBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSlytherinBigTexture.PNG GROUP=Icons Name=WizCardSlytherinBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSlytherinTex0.PNG GROUP=Skins Name=WizardCardSlytherinTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSmethwyck.uc b/HGame/Classes/WizardCards/WCSmethwyck.uc index 26706d77..9b4109dc 100644 --- a/HGame/Classes/WizardCards/WCSmethwyck.uc +++ b/HGame/Classes/WizardCards/WCSmethwyck.uc @@ -5,7 +5,7 @@ class WCSmethwyck extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSmethwyckBigTexture.PNG GROUP=Icons Name=WizCardSmethwyckBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSmethwyckBigTexture.PNG GROUP=Icons Name=WizCardSmethwyckBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSmethwyckTex0.PNG GROUP=Skins Name=WizardCardSmethwyckTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCStalk.uc b/HGame/Classes/WizardCards/WCStalk.uc index cd898f48..7cf0e7a0 100644 --- a/HGame/Classes/WizardCards/WCStalk.uc +++ b/HGame/Classes/WizardCards/WCStalk.uc @@ -5,7 +5,7 @@ class WCStalk extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardStalkBigTexture.PNG GROUP=Icons Name=WizCardStalkBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardStalkBigTexture.PNG GROUP=Icons Name=WizCardStalkBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardStalkTex0.PNG GROUP=Skins Name=WizardCardStalkTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCStarkey.uc b/HGame/Classes/WizardCards/WCStarkey.uc index 01819a09..ac89ae46 100644 --- a/HGame/Classes/WizardCards/WCStarkey.uc +++ b/HGame/Classes/WizardCards/WCStarkey.uc @@ -5,7 +5,7 @@ class WCStarkey extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardStarkeyBigTexture.PNG GROUP=Icons Name=WizCardStarkeyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardStarkeyBigTexture.PNG GROUP=Icons Name=WizCardStarkeyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardStarkeyTex0.PNG GROUP=Skins Name=WizardCardStarkeyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCStroulger.uc b/HGame/Classes/WizardCards/WCStroulger.uc index ebb81a06..d8cea719 100644 --- a/HGame/Classes/WizardCards/WCStroulger.uc +++ b/HGame/Classes/WizardCards/WCStroulger.uc @@ -5,7 +5,7 @@ class WCStroulger extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardStroulgerBigTexture.PNG GROUP=Icons Name=WizCardStroulgerBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardStroulgerBigTexture.PNG GROUP=Icons Name=WizCardStroulgerBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardStroulgerTex0.PNG GROUP=Skins Name=WizardCardStroulgerTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCStump.uc b/HGame/Classes/WizardCards/WCStump.uc index cf2ce4bb..abb38573 100644 --- a/HGame/Classes/WizardCards/WCStump.uc +++ b/HGame/Classes/WizardCards/WCStump.uc @@ -5,7 +5,7 @@ class WCStump extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardStumpBigTexture.PNG GROUP=Icons Name=WizCardStumpBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardStumpBigTexture.PNG GROUP=Icons Name=WizCardStumpBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardStumpTex0.PNG GROUP=Skins Name=WizardCardStumpTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSummerbee.uc b/HGame/Classes/WizardCards/WCSummerbee.uc index 2826c56e..8c91fad7 100644 --- a/HGame/Classes/WizardCards/WCSummerbee.uc +++ b/HGame/Classes/WizardCards/WCSummerbee.uc @@ -5,7 +5,7 @@ class WCSummerbee extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSummerbeeBigTexture.PNG GROUP=Icons Name=WizCardSummerbeeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSummerbeeBigTexture.PNG GROUP=Icons Name=WizCardSummerbeeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSummerbeeTex0.PNG GROUP=Skins Name=WizardCardSummerbeeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSweeting.uc b/HGame/Classes/WizardCards/WCSweeting.uc index 004e5261..1b332bb7 100644 --- a/HGame/Classes/WizardCards/WCSweeting.uc +++ b/HGame/Classes/WizardCards/WCSweeting.uc @@ -5,7 +5,7 @@ class WCSweeting extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSweetingBigTexture.PNG GROUP=Icons Name=WizCardSweetingBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSweetingBigTexture.PNG GROUP=Icons Name=WizCardSweetingBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSweetingTex0.PNG GROUP=Skins Name=WizardCardSweetingTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCSykes.uc b/HGame/Classes/WizardCards/WCSykes.uc index ba7d18cd..8df97b1f 100644 --- a/HGame/Classes/WizardCards/WCSykes.uc +++ b/HGame/Classes/WizardCards/WCSykes.uc @@ -5,7 +5,7 @@ class WCSykes extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardSykesBigTexture.PNG GROUP=Icons Name=WizCardSykesBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardSykesBigTexture.PNG GROUP=Icons Name=WizCardSykesBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardSykesTex0.PNG GROUP=Skins Name=WizardCardSykesTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCThruston.uc b/HGame/Classes/WizardCards/WCThruston.uc index c52b501f..cedad646 100644 --- a/HGame/Classes/WizardCards/WCThruston.uc +++ b/HGame/Classes/WizardCards/WCThruston.uc @@ -5,7 +5,7 @@ class WCThruston extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardThrustonBigTexture.PNG GROUP=Icons Name=WizCardThrustonBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardThrustonBigTexture.PNG GROUP=Icons Name=WizCardThrustonBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardThrustonTex0.PNG GROUP=Skins Name=WizardCardThrustonTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCThurkell.uc b/HGame/Classes/WizardCards/WCThurkell.uc index 2a5be8dd..949db6c7 100644 --- a/HGame/Classes/WizardCards/WCThurkell.uc +++ b/HGame/Classes/WizardCards/WCThurkell.uc @@ -5,7 +5,7 @@ class WCThurkell extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardThurkellBigTexture.PNG GROUP=Icons Name=WizCardThurkellBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardThurkellBigTexture.PNG GROUP=Icons Name=WizCardThurkellBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardThurkellTex0.PNG GROUP=Skins Name=WizardCardThurkellTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCToke.uc b/HGame/Classes/WizardCards/WCToke.uc index e423be7a..4411d0c4 100644 --- a/HGame/Classes/WizardCards/WCToke.uc +++ b/HGame/Classes/WizardCards/WCToke.uc @@ -5,7 +5,7 @@ class WCToke extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardTokeBigTexture.PNG GROUP=Icons Name=WizCardTokeBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardTokeBigTexture.PNG GROUP=Icons Name=WizCardTokeBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardTokeTex0.PNG GROUP=Skins Name=WizardCardTokeTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCToothill.uc b/HGame/Classes/WizardCards/WCToothill.uc index 5f758e4d..b751ccbb 100644 --- a/HGame/Classes/WizardCards/WCToothill.uc +++ b/HGame/Classes/WizardCards/WCToothill.uc @@ -5,7 +5,7 @@ class WCToothill extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardToothillBigTexture.PNG GROUP=Icons Name=WizCardToothillBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardToothillBigTexture.PNG GROUP=Icons Name=WizCardToothillBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardToothillTex0.PNG GROUP=Skins Name=WizardCardToothillTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCTremlett.uc b/HGame/Classes/WizardCards/WCTremlett.uc index 50c1652b..9045f534 100644 --- a/HGame/Classes/WizardCards/WCTremlett.uc +++ b/HGame/Classes/WizardCards/WCTremlett.uc @@ -5,7 +5,7 @@ class WCTremlett extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardTremlettBigTexture.PNG GROUP=Icons Name=WizCardTremlettBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardTremlettBigTexture.PNG GROUP=Icons Name=WizCardTremlettBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardTremlettTex0.PNG GROUP=Skins Name=WizardCardTremlettTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCTugwood.uc b/HGame/Classes/WizardCards/WCTugwood.uc index 1ebe7d9c..e552ab3a 100644 --- a/HGame/Classes/WizardCards/WCTugwood.uc +++ b/HGame/Classes/WizardCards/WCTugwood.uc @@ -5,7 +5,7 @@ class WCTugwood extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardTugwoodBigTexture.PNG GROUP=Icons Name=WizCardTugwoodBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardTugwoodBigTexture.PNG GROUP=Icons Name=WizCardTugwoodBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardTugwoodTex0.PNG GROUP=Skins Name=WizardCardTugwoodTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCTwonk.uc b/HGame/Classes/WizardCards/WCTwonk.uc index 962d873d..0b669baf 100644 --- a/HGame/Classes/WizardCards/WCTwonk.uc +++ b/HGame/Classes/WizardCards/WCTwonk.uc @@ -5,7 +5,7 @@ class WCTwonk extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardTwonkBigTexture.PNG GROUP=Icons Name=WizCardTwonkBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardTwonkBigTexture.PNG GROUP=Icons Name=WizCardTwonkBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardTwonkTex0.PNG GROUP=Skins Name=WizardCardTwonkTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCUlric.uc b/HGame/Classes/WizardCards/WCUlric.uc index c007e419..750c9558 100644 --- a/HGame/Classes/WizardCards/WCUlric.uc +++ b/HGame/Classes/WizardCards/WCUlric.uc @@ -5,7 +5,7 @@ class WCUlric extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardUricBigTexture.PNG GROUP=Icons Name=WizCardUricBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardUricBigTexture.PNG GROUP=Icons Name=WizCardUricBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardUricTex0.PNG GROUP=Skins Name=WizardCardUricTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCVablatsky.uc b/HGame/Classes/WizardCards/WCVablatsky.uc index dba64bd7..8494147d 100644 --- a/HGame/Classes/WizardCards/WCVablatsky.uc +++ b/HGame/Classes/WizardCards/WCVablatsky.uc @@ -5,7 +5,7 @@ class WCVablatsky extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardVablatskyBigTexture.PNG GROUP=Icons Name=WizCardVablatskyBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardVablatskyBigTexture.PNG GROUP=Icons Name=WizCardVablatskyBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardVablatskyTex0.PNG GROUP=Skins Name=WizardCardVablatskyTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWadcock.uc b/HGame/Classes/WizardCards/WCWadcock.uc index b9f4b649..960e9801 100644 --- a/HGame/Classes/WizardCards/WCWadcock.uc +++ b/HGame/Classes/WizardCards/WCWadcock.uc @@ -5,7 +5,7 @@ class WCWadcock extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWadcockBigTexture.PNG GROUP=Icons Name=WizCardWadcockBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWadcockBigTexture.PNG GROUP=Icons Name=WizCardWadcockBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWadcockTex0.PNG GROUP=Skins Name=WizardCardWadcockTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWaffling.uc b/HGame/Classes/WizardCards/WCWaffling.uc index c8a957c0..e012e8b6 100644 --- a/HGame/Classes/WizardCards/WCWaffling.uc +++ b/HGame/Classes/WizardCards/WCWaffling.uc @@ -5,7 +5,7 @@ class WCWaffling extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWafflingBigTexture.PNG GROUP=Icons Name=WizCardWafflingBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWafflingBigTexture.PNG GROUP=Icons Name=WizCardWafflingBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWafflingTex0.PNG GROUP=Skins Name=WizardCardWafflingTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWagtail.uc b/HGame/Classes/WizardCards/WCWagtail.uc index 3587c23e..23c71f94 100644 --- a/HGame/Classes/WizardCards/WCWagtail.uc +++ b/HGame/Classes/WizardCards/WCWagtail.uc @@ -5,7 +5,7 @@ class WCWagtail extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWagtailBigTexture.PNG GROUP=Icons Name=WizCardWagtailBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWagtailBigTexture.PNG GROUP=Icons Name=WizCardWagtailBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWagtailTex0.PNG GROUP=Skins Name=WizardCardWagtailTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWarbeck.uc b/HGame/Classes/WizardCards/WCWarbeck.uc index d6bef3a1..6289cc35 100644 --- a/HGame/Classes/WizardCards/WCWarbeck.uc +++ b/HGame/Classes/WizardCards/WCWarbeck.uc @@ -5,7 +5,7 @@ class WCWarbeck extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWarbeckBigTexture.PNG GROUP=Icons Name=WizCardWarbeckBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWarbeckBigTexture.PNG GROUP=Icons Name=WizCardWarbeckBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWarbeckTex0.PNG GROUP=Skins Name=WizardCardWarbeckTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWellbeloved.uc b/HGame/Classes/WizardCards/WCWellbeloved.uc index c9ddc608..935e60f0 100644 --- a/HGame/Classes/WizardCards/WCWellbeloved.uc +++ b/HGame/Classes/WizardCards/WCWellbeloved.uc @@ -5,7 +5,7 @@ class WCWellbeloved extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWellbelovedBigTexture.PNG GROUP=Icons Name=WizCardWellbelovedBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWellbelovedBigTexture.PNG GROUP=Icons Name=WizCardWellbelovedBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWellbelovedTex0.PNG GROUP=Skins Name=WizardCardWellbelovedTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWendelin.uc b/HGame/Classes/WizardCards/WCWendelin.uc index 9a27a3ce..e685b80f 100644 --- a/HGame/Classes/WizardCards/WCWendelin.uc +++ b/HGame/Classes/WizardCards/WCWendelin.uc @@ -5,7 +5,7 @@ class WCWendelin extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWendelinBigTexture.PNG GROUP=Icons Name=WizCardWendelinBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWendelinBigTexture.PNG GROUP=Icons Name=WizCardWendelinBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWendelinTex0.PNG GROUP=Skins Name=WizardCardWendelinTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWenlock.uc b/HGame/Classes/WizardCards/WCWenlock.uc index abb5fc3c..282f05e0 100644 --- a/HGame/Classes/WizardCards/WCWenlock.uc +++ b/HGame/Classes/WizardCards/WCWenlock.uc @@ -5,7 +5,7 @@ class WCWenlock extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWenlockBigTexture.PNG GROUP=Icons Name=WizCardWenlockBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWenlockBigTexture.PNG GROUP=Icons Name=WizCardWenlockBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWenlockTex0.PNG GROUP=Skins Name=WizardCardWenlockTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWhitehorn.uc b/HGame/Classes/WizardCards/WCWhitehorn.uc index d6c4ee37..f38378da 100644 --- a/HGame/Classes/WizardCards/WCWhitehorn.uc +++ b/HGame/Classes/WizardCards/WCWhitehorn.uc @@ -5,7 +5,7 @@ class WCWhitehorn extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWhitehornBigTexture.PNG GROUP=Icons Name=WizCardWhitehornBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWhitehornBigTexture.PNG GROUP=Icons Name=WizCardWhitehornBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWhitehornTex0.PNG GROUP=Skins Name=WizardCardWhitehornTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWildsmith.uc b/HGame/Classes/WizardCards/WCWildsmith.uc index af3fb34e..afafc01f 100644 --- a/HGame/Classes/WizardCards/WCWildsmith.uc +++ b/HGame/Classes/WizardCards/WCWildsmith.uc @@ -5,7 +5,7 @@ class WCWildsmith extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWildsmithBigTexture.PNG GROUP=Icons Name=WizCardWildsmithBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWildsmithBigTexture.PNG GROUP=Icons Name=WizCardWildsmithBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWildsmithTex0.PNG GROUP=Skins Name=WizardCardWildsmithTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWintringham.uc b/HGame/Classes/WizardCards/WCWintringham.uc index f9e4915b..841b8dde 100644 --- a/HGame/Classes/WizardCards/WCWintringham.uc +++ b/HGame/Classes/WizardCards/WCWintringham.uc @@ -5,7 +5,7 @@ class WCWintringham extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWintringhamBigTexture.PNG GROUP=Icons Name=WizCardWintringhamBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWintringhamBigTexture.PNG GROUP=Icons Name=WizCardWintringhamBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWintringhamTex0.PNG GROUP=Skins Name=WizardCardWintringhamTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWithers.uc b/HGame/Classes/WizardCards/WCWithers.uc index 8ff04601..42419947 100644 --- a/HGame/Classes/WizardCards/WCWithers.uc +++ b/HGame/Classes/WizardCards/WCWithers.uc @@ -5,7 +5,7 @@ class WCWithers extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWithersBigTexture.PNG GROUP=Icons Name=WizCardWithersBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWithersBigTexture.PNG GROUP=Icons Name=WizCardWithersBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWithersTex0.PNG GROUP=Skins Name=WizardCardWithersTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWoodcroft.uc b/HGame/Classes/WizardCards/WCWoodcroft.uc index 9b7075a3..06e2c6b0 100644 --- a/HGame/Classes/WizardCards/WCWoodcroft.uc +++ b/HGame/Classes/WizardCards/WCWoodcroft.uc @@ -5,7 +5,7 @@ class WCWoodcroft extends BronzeCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWoodcroftBigTexture.PNG GROUP=Icons Name=WizCardWoodcroftBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWoodcroftBigTexture.PNG GROUP=Icons Name=WizCardWoodcroftBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWoodcroftTex0.PNG GROUP=Skins Name=WizardCardWoodcroftTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCWright.uc b/HGame/Classes/WizardCards/WCWright.uc index 745a6117..5614b06a 100644 --- a/HGame/Classes/WizardCards/WCWright.uc +++ b/HGame/Classes/WizardCards/WCWright.uc @@ -5,7 +5,7 @@ class WCWright extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardWrightBigTexture.PNG GROUP=Icons Name=WizCardWrightBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardWrightBigTexture.PNG GROUP=Icons Name=WizCardWrightBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardWrightTex0.PNG GROUP=Skins Name=WizardCardWrightTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WCYoudle.uc b/HGame/Classes/WizardCards/WCYoudle.uc index d427fdfa..920bf6aa 100644 --- a/HGame/Classes/WizardCards/WCYoudle.uc +++ b/HGame/Classes/WizardCards/WCYoudle.uc @@ -5,7 +5,7 @@ class WCYoudle extends SilverCards; //texture imports -AdamJD -#exec Texture Import File=Textures\Icons\WizCardYoudleBigTexture.PNG GROUP=Icons Name=WizCardYoudleBigTexture COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\WizCardYoudleBigTexture.PNG GROUP=Icons Name=WizCardYoudleBigTexture COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 #exec Texture Import File=Textures\Skins\WizardCardYoudleTex0.PNG GROUP=Skins Name=WizardCardYoudleTex0 COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 function PostBeginPlay() diff --git a/HGame/Classes/WizardCards/WizardCardIcon.uc b/HGame/Classes/WizardCards/WizardCardIcon.uc index ec8b7e3a..8c0a5a79 100644 --- a/HGame/Classes/WizardCards/WizardCardIcon.uc +++ b/HGame/Classes/WizardCards/WizardCardIcon.uc @@ -37,8 +37,8 @@ function Spawned() // SetPhysics(2); SetPhysics(PHYS_Falling); bBouncingState = True; - explosion = Spawn(Class'WizCard_Explo',,,Location); - explosion = Spawn(Class'Spawn_flash_1',,,Location); + explosion = Spawn(Class'WizCard_Explo',,,[SpawnLocation]Location); + explosion = Spawn(Class'Spawn_flash_1',,,[SpawnLocation]Location); GotoState('bouncing'); } @@ -52,6 +52,7 @@ function Touch (Actor Other) local harry harry; local StatusGroupWizardCards sgCards; //local Class classStatusItem; + local Class classStatusItemWizCard; local StatusItemWizardCards siCard; local int nNewCardCount; local int nOldCardCount; @@ -75,22 +76,22 @@ function Touch (Actor Other) } if ( IsA('BronzeCards') ) { - classStatusItem = Class'StatusItemBronzeCards'; + classStatusItemWizCard = Class'StatusItemBronzeCards'; } else //{ if ( IsA('SilverCards') ) { - classStatusItem = Class'StatusItemSilverCards'; + classStatusItemWizCard = Class'StatusItemSilverCards'; } else //{ if ( IsA('Goldcards') ) { - classStatusItem = Class'StatusItemGoldCards'; + classStatusItemWizCard = Class'StatusItemGoldCards'; } else { harry.ClientMessage("Error WizardCard class " $ string(Class) $ " not recognized"); } //} //} sgCards = StatusGroupWizardCards(harry.managerStatus.GetStatusGroup(Class'StatusGroupWizardCards')); - siCard = StatusItemWizardCards(sgCards.GetStatusItem(classStatusItem)); + siCard = StatusItemWizardCards(sgCards.GetStatusItem(classStatusItemWizCard)); nOldCardCount = siCard.nCount; //siCard.SetCardOwner(Id,siCard.1); siCard.SetCardOwner(Id,siCard.ECardOwner.CardOwner_Harry); @@ -149,7 +150,7 @@ state bouncing function Tick (float Delta) { NewRot = Rotation; - NewRot.Yaw = NewRot.Yaw + 50000 * Delta; + NewRot.Yaw = NewRot.Yaw + (50000 * Delta); SetRotation(NewRot); } @@ -169,7 +170,7 @@ auto state Wait GotoState('bouncing'); } NewRot = Rotation; - NewRot.Yaw = NewRot.Yaw + 50000 * Delta; + NewRot.Yaw = NewRot.Yaw + (50000 * Delta); SetRotation(NewRot); } diff --git a/HGame/Classes/baseSpell.uc b/HGame/Classes/baseSpell.uc index 42d69e9d..e182acd9 100644 --- a/HGame/Classes/baseSpell.uc +++ b/HGame/Classes/baseSpell.uc @@ -2,10 +2,10 @@ // baseSpell. //================================================================================ -class baseSpell extends Projectile; +class baseSpell extends Projectile; //texture import -AdamJD -#exec Texture Import File=Textures\Icons\defaultSpellIcon.PNG GROUP=Icons Name=defaultSpellIcon COMPRESSION=3 UPSCALE=1 Mips=1 Flags=2 +#exec Texture Import File=Textures\Icons\defaultSpellIcon.PNG GROUP=Icons Name=defaultSpellIcon COMPRESSION=3 UPSCALE=1 Mips=0 Flags=2 var ESpellType SpellType; var Texture SpellIcon; diff --git a/HGame/Classes/baseWand.uc b/HGame/Classes/baseWand.uc index 6f5d72c6..d86007ab 100644 --- a/HGame/Classes/baseWand.uc +++ b/HGame/Classes/baseWand.uc @@ -2,7 +2,7 @@ // baseWand. //================================================================================ -class baseWand extends HWeapon; +class baseWand extends HWeapon; const MAX_NUM_CASTED_SPELLS= 8; var bool bAutoSelectSpell; @@ -369,9 +369,9 @@ function ShowCastedSpellList (optional int iNumSpells) { local int I; - if ( (iNumSpells == 0) || (iNumSpells > 8) ) + if ( (iNumSpells == 0) || (iNumSpells > MAX_NUM_CASTED_SPELLS) ) { - iNumSpells = 8; + iNumSpells = MAX_NUM_CASTED_SPELLS; } PlayerHarry.ClientMessage("***Number of Casted Spells: " $ string(NumCastedSpells)); @@ -390,9 +390,9 @@ function AddToCastedSpellList (baseSpell spell) CastedSpellList[NumCastedSpells] = spell; LastCastedSpell = spell; NumCastedSpells++; - if ( NumCastedSpells > 8 - 1 ) + if ( NumCastedSpells > MAX_NUM_CASTED_SPELLS - 1 ) { - NumCastedSpells = 8 - 1; + NumCastedSpells = MAX_NUM_CASTED_SPELLS - 1; PlayerHarry.ClientMessage("!!!MAX NUMBER OF CASTED SPELLS REACHED for " $ string(self.Owner) $ " !!!!!!"); } } @@ -417,7 +417,7 @@ function SubtractFromCastedSpellList (baseSpell spell) } if ( bFound ) { - for ( I=iIndex; I < 8 - 1; ++I ) + for ( I=iIndex; I < MAX_NUM_CASTED_SPELLS - 1; ++I ) { CastedSpellList[I] = CastedSpellList[I + 1]; } @@ -474,7 +474,7 @@ function CastSpell (optional Actor aTarget, optional Vector aTargetOffset, optio { LastCastedSpell.ProcessTouch(aTarget,aTarget.Location); PlayerHarry.cm("Spell AutoHit Target " $ string(aTarget) $ " because TargetDist " $ string(VSize(Location - aTarget.Location)) $ " < " $ string(fAutoHitDistance)); - } else { + } else //{ if ( aTarget.IsA('harry') ) { if ( PlayerHarry.Difficulty == DifficultyMedium ) @@ -487,7 +487,7 @@ function CastSpell (optional Actor aTarget, optional Vector aTargetOffset, optio } } //} - } + //} } function bool SwordChargedUpEnough() diff --git a/HGame/Classes/baseWarning.uc b/HGame/Classes/baseWarning.uc index fd95c1c8..877db52d 100644 --- a/HGame/Classes/baseWarning.uc +++ b/HGame/Classes/baseWarning.uc @@ -5,7 +5,7 @@ class baseWarning extends basePopup; //texture import -AdamJD -#exec Texture Import File=Textures\Icons\leftPanel.PNG GROUP=Icons Name=leftPanel COMPRESSION=3 UPSCALE=1 Mips=1 Flags=0 +#exec Texture Import File=Textures\Icons\leftPanel.PNG GROUP=Icons Name=leftPanel COMPRESSION=3 UPSCALE=1 Mips=0 Flags=0 var string DisplayText; var float fFlashTime; diff --git a/HGame/Classes/cAnimChannel.uc b/HGame/Classes/cAnimChannel.uc index 287e5d50..72ce0161 100644 --- a/HGame/Classes/cAnimChannel.uc +++ b/HGame/Classes/cAnimChannel.uc @@ -20,8 +20,6 @@ auto state stateIdle { Duellist(Owner).PlayIdle(); } - - begin: } function DoCast() @@ -54,7 +52,7 @@ state stateCast } begin: - PlayAnim('Cast',,0.31); + PlayAnim('Cast',,[TweenTime]0.31); FinishAnim(); Duellist(Owner).DuellistAnimType = AT_Replace; bCasting = False; @@ -73,7 +71,7 @@ state stateCharging { begin: Duellist(Owner).DuellistAnimType = AT_Combine; - LoopAnim('duel_charge',,0.31); + LoopAnim('duel_charge',,[TweenTime]0.31); GotoState('stateIdle'); } @@ -96,7 +94,7 @@ state stateDefence begin: Duellist(Owner).Defence(); - PlayAnim('cast_Expelliarmus',,0.31); + PlayAnim('cast_Expelliarmus',,[TweenTime]0.31); FinishAnim(); Duellist(Owner).DuellistAnimType = AT_Replace; Duellist(Owner).bReboundingSpells = False; @@ -116,7 +114,7 @@ state stateKnockBack { begin: Duellist(Owner).DuellistAnimType = AT_Combine; - PlayAnim('react_backfire',,0.31); + PlayAnim('react_backfire',,[TweenTime]0.31); FinishAnim(); Duellist(Owner).DuellistAnimType = AT_Replace; GotoState('stateIdle'); @@ -159,7 +157,7 @@ state stateReactRictusempra begin: Duellist(Owner).StopCharging(); - PlayAnim('react_rictusempra',,0.31); + PlayAnim('react_rictusempra',,[TweenTime]0.31); Sleep(0.1); FinishAnim(); Duellist(Owner).DuellistAnimType = AT_Replace; @@ -193,7 +191,7 @@ state stateReactMimbleWimble begin: Duellist(Owner).StopCharging(); - PlayAnim('mimblewimble',,0.31); + PlayAnim('mimblewimble',,[TweenTime]0.31); Sleep(0.1); FinishAnim(); Duellist(Owner).DuellistAnimType = AT_Replace; diff --git a/HGame/Classes/cHarryAnimChannel.uc b/HGame/Classes/cHarryAnimChannel.uc index d457d812..59e0e562 100644 --- a/HGame/Classes/cHarryAnimChannel.uc +++ b/HGame/Classes/cHarryAnimChannel.uc @@ -48,8 +48,6 @@ auto state stateIdle { harry(Owner).PlayIdle(); } - - begin: } state statePickupItem @@ -120,7 +118,7 @@ state stateDuelingCast begin: harry(Owner).Cast(); harry(Owner).HarryAnimType = AT_Combine; - PlayAnim('duel_cast',,0.31); + PlayAnim('duel_cast',,[TweenTime]0.31); FinishAnim(); if ( harry(Owner).bAltFire == 0 ) { @@ -143,7 +141,7 @@ begin: } harry(Owner).Cast(); harry(Owner).HarryAnimType = AT_Combine; - PlayAnim('cast_Expelliarmus',,0.31); + PlayAnim('cast_Expelliarmus',,[TweenTime]0.31); FinishAnim(); harry(Owner).bReboundingSpells = False; if ( harry(Owner).bAltFire == 0 ) @@ -279,7 +277,7 @@ state stateDrinkWiggenwell propTemp = HProp(FancySpawn(Class'WWellGreenBottle',harry(Owner),,,harry(Owner).Rotation)); harry(Owner).ActorToCarry = propTemp; harry(Owner).AttachCarryActor('bip01 L Forearm'); - PlayAnim('DrinkPotion',,0.41); + PlayAnim('DrinkPotion',,[TweenTime]0.41); Sleep(0.5); switch (Rand(3)) { @@ -397,7 +395,7 @@ state stateReactRictusempra } begin: - PlayAnim('react_rictusempra',,0.31); + PlayAnim('react_rictusempra',,[TweenTime]0.31); FinishAnim(); harry(Owner).HarryAnimType = AT_Replace; if ( harry(Owner).PlayerIsAiming() ) @@ -423,7 +421,7 @@ state stateReactMimbleWimble } begin: - PlayAnim('mimblewimble',,0.31); + PlayAnim('mimblewimble',,[TweenTime]0.31); FinishAnim(); harry(Owner).HarryAnimType = AT_Replace; if ( harry(Owner).PlayerIsAiming() ) diff --git a/HGame/Classes/harry.uc b/HGame/Classes/harry.uc index 196244cb..d32f1eaa 100644 --- a/HGame/Classes/harry.uc +++ b/HGame/Classes/harry.uc @@ -302,7 +302,7 @@ var bool bForceBlackScreen; var travel bool bHarryKilled; var int iMinHealthAfterDeath; -/* + event PreBeginPlay() { Super.PreBeginPlay(); @@ -324,64 +324,6 @@ event PreBeginPlay() bNoSpellBookCheck = False; menuBook = HPConsole(Player.Console).menuBook; } -*/ - -event PreBeginPlay() -{ - // Initialize - Super.PreBeginPlay(); - -/* - //If collision values are true, spawn will fail cause it tries to spawn HarryPawn where Harry is standing. - // Something somewhere will set these to true again, but we set them to false again in PlayerWalking::BeginState. - SetCollision(false,false,false); - - foreach AllActors(class'HarryPawn', HarryPawn) - break; - - if( HarryPawn == none ) - { - HarryPawn = spawn( class'HarryPawn' ); - - if( HarryPawn == none ) - ClientMessage("Error: Couldn't make a HarryPawn puppet."); - } - else - { - ClientMessage("HarryPawn already in map"); - } -*/ - - // Find mini-game director, if any - foreach AllActors( class'Director', Director ) - break; - - // Create the Spell Cursor - SpellCursor = spawn(class'SpellCursor'); - - // Create StatusManager - if(managerStatus == None) - { - managerStatus = spawn(class'StatusManager'); - - // Save off reference to harry in status manager - managerStatus.PlayerHarry = self; - - // Create status items that need to exist at startup. Other status items - // will get created as an attempt to access them is made. - managerStatus.CreateStartupItems(); - } - - // Make sure Harry has the default spells - AddToSpellBook( class'spellFlipendo' ); // 1 - pushes things - AddToSpellBook( class'spellLumos' ); // 2 - lights up your wand - AddToSpellBook( class'spellAlohomora' ); // 3 - unlock doors, secret areas - - // Reset our NoSpellBookCheck - bNoSpellBookCheck = false; - - menuBook = HPConsole(Player.Console).menuBook; -} /* function PostBeginPlay() @@ -579,28 +521,17 @@ function PlayPeevesHack() { } -/* function AddToSpellBook (Class spellClass) { - if ( spellClass.Default.SpellType < 32) && (SpellBook[spellClass.Default.SpellType] == None) ) + if ( (spellClass.Default.SpellType < MAX_NUM_SPELLS) && (SpellBook[spellClass.Default.SpellType] == None) ) { SpellBook[spellClass.Default.SpellType] = spellClass; } } -*/ -function AddToSpellBook( class spellClass ) -{ - if( spellClass.default.spellType < MAX_NUM_SPELLS && - SpellBook[ spellClass.default.spellType ] == None ) - { - // Add this spell - SpellBook[ spellClass.default.spellType ] = spellClass; - } -} function bool IsInSpellBook (ESpellType ESpellType) { - if ( ESpellType >= 32 ) + if ( ESpellType >= MAX_NUM_SPELLS ) { return False; } @@ -678,6 +609,7 @@ function ClearSpellBook() } } */ + function ClearSpellBook() { local int i; @@ -742,7 +674,7 @@ function HandleDuelPlayerInput() { bSpellCyclePressed = False; CurrentDuelSpell = CurrentDuelSpell + 1; - if ( CurrentDuelSpell > 3 - 1 ) + if ( CurrentDuelSpell > NUM_DUEL_SPELLS - 1 ) { CurrentDuelSpell = 0; } @@ -773,7 +705,7 @@ function HandleDuelPlayerInput() //} switch (CurrentDuelSpell) { - /* + /* case 0: HudSpellSelector.SetSelection(HudSpellSelector.0); break; @@ -850,7 +782,6 @@ function SleepyAnimTimerSub() function SetMaxSleepyAnim (float t) { iMaxSleepyAnim = t; - return; } function WebAnimRefCountAdd() @@ -982,10 +913,10 @@ event PreClientTravel() event TravelPostAccept() { - local SmartStart StartPoint; - local Characters Ch; - local Weapon weap; - local bool bFoundSmartStart; + local SmartStart StartPoint; + local Characters Ch; + local Weapon weap; + local bool bFoundSmartStart; Super.TravelPostAccept(); Log("weapon is" $ string(Weapon)); @@ -1028,26 +959,9 @@ event TravelPostAccept() cm("***Found SmartStart from:" $ PreviousLevelName); Log("***Found SmartStart from:" $ PreviousLevelName); bFoundSmartStart = True; + break; } } - - // Metallicafan212: I do it in cpp now, more reliable - /* - // Metallicafan212: Find the portal - if(Level.StartPortal != '') - { - foreach AllActors(Class'SmartStart', StartPoint, Level.StartPortal) - { - SetLocation(StartPoint.Location); - SetRotation(StartPoint.Rotation); - if ( StartPoint.bDoLevelSave ) - { - harry(Level.PlayerHarryActor).SaveGame(); - } - bFoundSmartStart = True; - } - } - */ } if ( !bFoundSmartStart ) { @@ -1182,8 +1096,6 @@ function CopyCardCardStatusFromHarryToManager() //sgCards.ShowCardData(); } - - function int getnumHousePointsHarry() { return numHousePointsHarry; @@ -1594,7 +1506,7 @@ function int FindNearestSavePointID() Str = Mid(string(SavePointInstance.Name),SearchStrLen); Log("Found ID Str = " $ Str); ReturnID = int(Str); - + break; } } return ReturnID; @@ -1669,7 +1581,7 @@ state stateDead } function vector FindFaintLocation() - { + { local float d; local vector n; local vector v, vLast, vSave, vDest; @@ -1762,69 +1674,8 @@ state stateDead //v should now be where we're moving to... return v; - } - - /* - function Vector FindFaintLocation() - { - local float D; - local Vector N; - local Vector V; - local Vector vLast; - local Vector vSave; - local Vector vDest; - local float CheckDist; - - CheckDist = 70.0; - D = CheckDist; - vSave = Location; - N = -Vector(Rotation); - vDest = Location + N * CheckDist; - V = Location; - vLast = V; - JL0053: - V += N * byte(10); - MoveSmooth(N * byte(10)); - if ( Location != V ) - { - V = vLast; - } else { - D -= byte(10); - if (! (D <= byte(0)) ) goto JL0053; - } - if ( D <= byte(0) ) - { - D = 0.0; - V = vDest; - } - SetLocation(vSave); - if ( D < byte(20) ) - { - D = 20.0; - } - N = -N; - V = Location; - vLast = V; - V += N * byte(10); - MoveSmooth(N * byte(10)); - if ( Location != V ) - { - V = vLast; - } else { - MoveSmooth(vect(0.00,0.00,-20.00)); - if ( V.Z - Location.Z > byte(19) ) - { - V = vLast; - } else { - SetLocation(V); - D -= byte(10); - if (! (D <= byte(0)) ) break; - } - } - SetLocation(vSave); - return V; } - */ + begin: RotationRate.Yaw = 0; AccelRate = 70.0; @@ -2010,11 +1861,11 @@ state LookAtActor { ignores AltFire, Fire; - begin: +Begin: Enable('Tick'); -Loop: CurrIdleAnimName = GetCurrIdleAnimName(); LoopAnim(CurrIdleAnimName); +Loop: Sleep(0.1); goto ('Loop'); } @@ -2217,6 +2068,10 @@ function StartBossEncounter (baseBoss Boss, bool in_bHarryShouldLockOntoBoss, bo } else { SpellCursor.SetLOSDistance(0.0); } + if ( bStrafe == 0 ) + { + //KW left this empty? -AdamJD + } if ( in_bHarryShouldLockOntoBoss && Boss != None ) { if ( !Boss.SetCamMode() ) @@ -2691,7 +2546,7 @@ function DoJump (optional float f) local Vector V; local float S; - log("CALLED JUMP"); + //log("CALLED JUMP"); if ( bKeepStationary || bInDuelingMode ) { @@ -2715,9 +2570,8 @@ function DoJump (optional float f) } if ( Physics == PHYS_Walking ) { - log("JUMP FROM PHYS_WALKING!"); - PlayJumpEmoteSound(); //decide which jump sound to play -AdamJD - PlayOwnedSound(JumpSound, SLOT_Talk, 1.5, true, 1200, 1.0 ); + //log("JUMP FROM PHYS_WALKING!"); + PlayJumpEmoteSound(); //decide which jump sound to play (UTPT didn't add this) -AdamJD if ( (Level.Game != None) && Level.Game.Difficulty > 0 ) { MakeNoise(0.1 * Level.Game.Difficulty); @@ -2840,7 +2694,7 @@ function PlayHurtEmoteSound() default: } } else { - PlaySound(HurtSound[Rand(15)],SLOT_Talk); + PlaySound(HurtSound[Rand(NUM_HURT_SOUNDS)],SLOT_Talk); } } @@ -3032,7 +2886,8 @@ function PlayJumpEmoteSound() break; default: } - } else + } + else { PlayOwnedSound(JumpSound,SLOT_Talk,1.5,False,1200.0,1.0); } @@ -3440,22 +3295,12 @@ function PlayLandedSound() if( Location.z < fFallingZ - 40 ) vol *= 2; -// PlaySound(step, SLOT_Interact, vol, false, 1000.0, 0.9); - - PlayLandedEmoteSound(); //decide which landed sound to play -AdamJD + PlaySound(step, SLOT_Interact, vol, false, 1000.0, 0.9); - PlaySound(step, SLOT_Misc, vol, false, 1000.0); +// PlaySound(step, SLOT_Misc, vol, false, 1000.0); HearHarryRecipient.PawnHearHarryNoise(); MakeNoise( 10 ); - - // Metallicafan212: Fatness fix - if(Fatness >= 200) - { - PlaySound(Sound'Big_whomp2',SLOT_None,RandRange(0.41,0.69999999),False,500.0,RandRange(0.5,1.0)); - ShakeView(0.22,50.0,50.0); - AutoHitAreaEffect(256); - } } function PlayTurning() @@ -3756,18 +3601,24 @@ event Mount (Vector Delta) state Mounting { - ignores ProcessMove, AltFire, Mount; + ignores AltFire, Mount; function BeginState() { DebugState(); - // bFallingMount = Physics == PHYS_Walking; - bFallingMount = Physics != PHYS_Walking; //thanks to Metallicafan212 for finding this -AdamJD + bFallingMount = Physics == PHYS_Falling; Velocity = vect(0.00,0.00,0.00); Acceleration = vect(0.00,0.00,0.00); SetPhysics(PHYS_Projectile); SetBase(MountBase); } + + //UTPT didn't add this for some reason -AdamJD + function ProcessMove(float DeltaTime, vector NewAccel, eDodgeDir DodgeMove, rotator DeltaRot) + { + Global.ProcessMove(DeltaTime, vect(0,0,0), DodgeMove, DeltaRot); + } + begin: Velocity = vect(0.00,0.00,0.00); Acceleration = vect(0.00,0.00,0.00); @@ -3781,35 +3632,29 @@ state Mounting PlayAnim('climb96end',,0.2,,[RootBone] 'Move'); PlayFallingPullupEmoteSound(); } + else if ( MountDelta.Z < 48 * DrawScale ) + { + MountDelta.Z -= 32 * DrawScale; + PlayAnim('climb32',1.0,,,[RootBone] 'Move'); + PlayEasyPullupEmoteSound(); + } + else if ( MountDelta.Z < 80 * DrawScale ) + { + MountDelta.Z -= 64 * DrawScale; + PlayAnim('climb64',,,,[RootBone] 'Move'); + PlayHardPullupEmoteSound(); + } else { - if ( MountDelta.Z < 48 * DrawScale ) - { - MountDelta.Z -= 32 * DrawScale; - PlayAnim('climb32',1.0,,,[RootBone] 'Move'); - PlayEasyPullupEmoteSound(); - } - else - { - if ( MountDelta.Z < 80 * DrawScale ) - { - MountDelta.Z -= 64 * DrawScale; - PlayAnim('climb64',,,,[RootBone] 'Move'); - PlayHardPullupEmoteSound(); - } - else - { - MountDelta.Z -= 96 * DrawScale; - PlayAnim('climb96start',,,,[RootBone] 'Move'); - } - } + MountDelta.Z -= 96 * DrawScale; + PlayAnim('climb96start',,,,[RootBone] 'Move'); } GotoState('MountFinish'); } state MountFinish { - ignores ProcessMove, AltFire, Mount; + ignores AltFire, Mount; event PlayerTick (float DeltaTime) { @@ -3830,11 +3675,18 @@ state MountFinish PrePivot.Z -= CollisionHeight; } + //UTPT didn't add this for some reason -AdamJD + function ProcessMove(float DeltaTime, vector NewAccel, eDodgeDir DodgeMove, rotator DeltaRot) + { + Global.ProcessMove(DeltaTime, vect(0,0,0), DodgeMove, DeltaRot); + } + function EndState() { PrePivot.Z += CollisionHeight; SetCollisionSize(CollisionRadius * 2,CollisionHeight * 2,0.0); } + begin: if ( AnimSequence == 'climb96start' ) { @@ -3931,17 +3783,6 @@ function Bump (Actor Other) PickupActor(Other); } -//turn on no falling damage if Harry has touched the NoFallingDamageTrigger -AdamJD -function Touch(Actor Other) -{ - Super.Touch(Other); - - if(Other.IsA('NoFallingDamageTrigger')) - { - bNoFallingDamage = true; - } -} - function StartAimSoundFX() { if ( bInDuelingMode && (CurrentDuelSpell == 2) ) @@ -3988,6 +3829,7 @@ function StopAiming() } } */ + function StopAiming() { //ClientMessage("StopAiming()"); @@ -4050,8 +3892,7 @@ function bool PlayerIsAimingWithCharge() function PlayerTick (float dtime) { - - //cm("Current state is " $ GetStateName()); + //cm("Current state is " $ GetStateName()); if ( fTimeAfterShield > 0 ) { @@ -4271,7 +4112,7 @@ function AutoHitAreaEffect (float fRadius) { if ( VSize(Pawn.Location - Location) < fRadius ) { - if ( Pawn.eVulnerableToSpell != 0 ) + if ( Pawn.eVulnerableToSpell != ESpellType.SPELL_None ) { Pawn.CallHandleSpellBySpellType(Pawn.eVulnerableToSpell,Pawn.Location); } @@ -4289,9 +4130,6 @@ function AutoHitAreaEffect (float fRadius) spTrigger.Activate(self,self); } } - - // Metallicafan212: Correct particles? - SpawnParticles(Class'DustCloud03_med'); } /* @@ -4324,7 +4162,7 @@ function CreateSpongifyEffects() { local int i; -return; + return; if( SpongifyFX[0] == none ) { SpongifyFX[0] = spawn( class'SpellVoldTrackingFX', self ); SpongifyFX[0].AttachToOwner( 'Bip01 R Foot' ); @@ -4349,6 +4187,7 @@ function StopSpongifyEffects() } } */ + function StopSpongifyEffects() { local int i; @@ -4362,7 +4201,6 @@ state PlayerWalking //ignores PlayerTick, Landed, TakeDamage, HitWall, Bump, UnTouch, Touch; ignores SeePlayer, HearNoise; - //UTPT didn't add these events... -AdamJD event Touch( Actor Other ) { // Let the director (if any) know when Harry touches things @@ -4441,31 +4279,28 @@ state PlayerWalking TweenToWaiting(0.41); } } - else + else if (bIsWalking) + { + if ( (MyAnimGroup == 'Waiting') || (MyAnimGroup == 'Landing') ) + { + TweenToWalking(0.41); + bAnimTransition = True; + } + else + { + PlayWalking(); + } + } + else { - if ( bIsWalking ) + if ( (MyAnimGroup == 'Waiting') || (MyAnimGroup == 'Landing') ) { - if ( (MyAnimGroup == 'Waiting') || (MyAnimGroup == 'Landing') ) - { - TweenToWalking(0.41); - bAnimTransition = True; - } - else - { - PlayWalking(); - } + bAnimTransition = True; + TweenToRunning(0.41); } else { - if ( (MyAnimGroup == 'Waiting') || (MyAnimGroup == 'Landing') ) - { - bAnimTransition = True; - TweenToRunning(0.41); - } - else - { - PlayRunning(); - } + PlayRunning(); } } } @@ -4502,13 +4337,20 @@ state PlayerWalking { local float fFallDistanceZ; local int i; + local SpongifyPad sp; //added by me for compatibility code -AdamJD clientMessage("landed: jump dist = " $VSize(Location-MountDelta) $ " tia="$fTimeInAir); Global.Landed(HitNormal); PlayLandedSound(); - + + //only do this if not hidden (UTPT didn't add this) -AdamJD + if(!bHidden) + { + PlayLandedEmoteSound(); + } + playanim(HarryAnims[HarryAnimSet].land, [TweenTime]0.1, [Type] HarryAnimType); //log("PLOG PWalking landed"); @@ -4518,13 +4360,18 @@ state PlayerWalking SpellCursor.SetLOSDistance( 0 ); // See if we laneded on spongify! - for(i=0; i 0 ) + { + NoFallingDamageTimer -= DeltaTime; + + //make sure the NoFallingDamageTimer doesn't go under 0 (UTPT didn't add this) -AdamJD + if ( NoFallingDamageTimer < 0 ) + { + NoFallingDamageTimer = 0.0; + } + } + //if ( bUpdatePosition ) Might not be able to just remove this. // ClientUpdatePosition(); @@ -4647,7 +4518,7 @@ state PlayerWalking } else HarryAnimChannel.GotoState( 'stateDuelingCast' ); - } + } else if( SpellCursor.IsLockedOn() //If harry's locked on, he's in normal aim mode, so cast || bHarryUsingSword && baseWand(weapon).SwordChargedUpEnough() //if using sword, and sword is charged up enough @@ -4713,54 +4584,6 @@ state PlayerWalking DesiredRotation.Yaw = cam.rotation.Yaw & 0xFFFF; } } - - /* - function ProcessFalling (float DeltaTime) - { - local float fLastTimeInAir; - - log("ProcessFalling!"); - - if ( Physics == PHYS_Falling ) - { - log("ProcessFalling when falling!"); - if ( eLastPhysState != PHYS_Falling ) - { - fFallingZ = Location.Z; - fHighestZ = Location.Z; - } - else - { - if ( fHighestZ < Location.Z ) - { - fHighestZ = Location.Z; - } - } - fLastTimeInAir = fTimeInAir; - fTimeInAir += DeltaTime; - if ( !bPlayedFallSound && (fTimeInAir > 1.5) ) - { - bPlayedFallSound = True; - if ( AnimFalling != SpongifyFallAnim ) - { - log("Playing fall deep sound!"); - PlayFallDeepEmoteSound(); - } - } - if ( (fLastTimeInAir <= 0.35) && (fTimeInAir > 0.35) ) - { - log("Play in air!"); - PlayInAir(); - } - } - else - { - bPlayedFallSound = False; - fTimeInAir = 0.0; - } - eLastPhysState = Physics; - } - */ //Try and save how long you've been falling, and what you're original height was when you started falling //When you land, it uses this info to set the sound volume. @@ -4789,13 +4612,13 @@ state PlayerWalking bPlayedFallSound = true; if( AnimFalling != SpongifyFallAnim ) - // PlaySound( sound'HPSounds.HAR_emotes.falldeep2' ); - PlayFallDeepEmoteSound(); //decide which fall deep sound to play -AdamJD + //PlaySound( sound'HPSounds.HAR_emotes.falldeep2' ); + PlayFallDeepEmoteSound(); //decide which fall deep sound to play (UTPT didn't add this) -AdamJD } if( fLastTimeInAir <= 0.35 && fTimeInAir > 0.35 ) PlayInAir(); - } + } else { bPlayedFallSound = false; @@ -4934,50 +4757,8 @@ state PlayerWalking } } - /* - function ProcessMove (float DeltaTime, Vector NewAccel, EDodgeDir DodgeMove, Rotator DeltaRot) - { - local Vector OldAccel; - local float Speed; - - OldAccel = Acceleration; - Acceleration = NewAccel; - bIsTurning = Abs(byte(DeltaRot.Yaw) / DeltaTime) > byte(5000); - if ( bJustAltFired || bJustFired ) - { - Velocity = vect(0.00,0.00,0.00); - return; - } - if ( bPressedJump ) - { - DoJump(); - bPressedJump = False; - } - if ( Physics == 1 ) - { - Speed = VSize2D(Velocity); - if ( ( !bAnimTransition || (AnimFrame > byte(0))) && !(AnimSequence == HarryAnims[HarryAnimSet].Land) && ((Speed < byte(5)) || (VSize2D(Acceleration) == byte(0))) ) - { - if ( Speed > byte(5) ) - { - fTimeWalking += DeltaTime; - } else { - fTimeWalking = 0.0; - } - if ( (Acceleration != vect(0.00,0.00,0.00)) && (Speed > byte(1)) ) - { - bAnimTransition = True; - TweenToRunning(0.41); - } else { - bAnimTransition = True; - TweenToWaiting(0.41); - } - } - } - } - */ function ProcessMove(float DeltaTime, vector NewAccel, eDodgeDir DodgeMove, rotator DeltaRot) - { + { local vector OldAccel; local float Speed; @@ -5033,7 +4814,7 @@ state PlayerWalking } } } - } + } function BeginState() { @@ -5047,7 +4828,6 @@ state PlayerWalking bIsCrouching = False; bIsTurning = False; bPressedJump = False; - DesiredRotation.Pitch = Default.DesiredRotation.Pitch; //sometimes after a cutscene or when Harry has picked something up he tilts, this fixes that -AdamJD if ( Physics != PHYS_Falling ) { SetPhysics(PHYS_WALKING); @@ -5142,7 +4922,7 @@ function Vector ProcessAccel() V = KeepPawnInsidePlane(V,B.v2,B.n2); V = KeepPawnInsidePlane(V,B.v4, -B.n1); // if ( (V.X != 0) || (V.Y != 0) && fLargestAForward != 0 ) - if ( (V.X != 0 || V.Y != 0) && fLargestAForward != 0 ) //removed wrong brackets so Harry can move in the Peeves fight -AdamJD + if ( (V.X != 0 || V.Y != 0) && fLargestAForward != 0 ) //removed wrong decomped brackets so Harry can move in the Peeves fight -AdamJD { V = Normal(V) * fLargestAForward; } @@ -5169,8 +4949,8 @@ function Vector KeepPawnInsidePlane (Vector vAccel, Vector vPlanePoint, Vector v y2 = vect(0.00,0.00,1.00) Cross x2; // xMag = vAccel Dot x2; // yMag = vAccel Dot y2; - xMag = (vAccel Dot x2); //added brackets -AdamJD - yMag = (vAccel Dot y2); //added brackets -AdamJD + xMag = (vAccel Dot x2); //UTPT forgot to add brackets -AdamJD + yMag = (vAccel Dot y2); //UTPT forgot to add brackets -AdamJD if ( xMag < 0 ) { xMag = D * 10; @@ -5248,7 +5028,7 @@ function float TurnWhileStrafingMult() if ( Basilisk(BossTarget) != None ) { //return 0.01 + 0.14 * 1 - baseWand(Weapon).ChargingLevel(); - return 0.01 + 0.14 * (1 - baseWand(Weapon).ChargingLevel()); //UTPT forgot to add brackets which made Harry walk around in a small 360 circle when fighting basilisk instead of strafing... -AdamJD + return 0.01 + 0.14 * (1 - baseWand(Weapon).ChargingLevel()); //UTPT forgot to add brackets which made Harry walk around in a small 360 circle when fighting the basilisk instead of strafing... -AdamJD } return 0.0; } @@ -5312,11 +5092,11 @@ function name GetCurrIdleAnimName() } if ( IdleNums == 0 ) { - return HarryAnims[int(HarryAnimSet)].Idle; + return HarryAnims[HarryAnimSet].Idle; } if ( (HarryAnimSet == HARRY_ANIM_SET_SLEEPY) || (HarryAnimSet == HARRY_ANIM_SET_SWORD) ) { - return HarryAnims[int(HarryAnimSet)].Idle; + return HarryAnims[HarryAnimSet].Idle; } iIndex = 1 + Rand(IdleNums); AnimName = "idle_" $iIndex; @@ -5477,6 +5257,7 @@ function AddHousePoints (int Num) numLastHousePointsHarry = Num; numHousePointsHarry += Num; numHousePointsGryffindor = numHousePointsHarry; + if ( numHousePointsGryffindor < 58 ) { temp = numHousePointsGryffindor + Rand(numHousePointsGryffindor) + 1; @@ -5485,22 +5266,24 @@ function AddHousePoints (int Num) { temp = numHousePointsGryffindor + Rand(58) + 1; } + if ( numHousePointsSlytherin < temp ) { numHousePointsSlytherin = temp; } ftemp = numHousePointsGryffindor * (0.5 + FRand() * 0.2); - - if ( numHousePointsHufflepuff < ftemp ) { - numHousePointsHufflepuff = numHousePointsGryffindor * (0.7 + FRand() * 0.2); + numHousePointsHufflepuff = ftemp; } + + ftemp = numHousePointsGryffindor * (0.7 + FRand() * 0.2); if ( numHousePointsRavenclaw < ftemp ) { numHousePointsRavenclaw = ftemp; } + Log("###### House Points"); Log("added" @ string(numLastHousePointsHarry)); Log("Harry total" @ string(numHousePointsHarry)); @@ -5521,71 +5304,6 @@ state stateCutIdle } } -/* -function bool CutQuestion (string question) -{ - local ChallengeScoreManager managerChallenge; - local bool bAnswer; - - CutErrorString = ""; - if ( Director != None ) - { - bAnswer = Director.CutQuestion(question); - if ( !(CutErrorString ~= "Unanswered" ) ) - { - return bAnswer; - } - CutErrorString = ""; - } - question = Caps(question); - if ( InStr(question,"GSTATE") > -1 ) - { - cm("CutQuestion about game state:" $ question $ " CurrentGameState is:" $ CurrentGameState); - if ( CurrentGameState ~= question ) - { - return True; - } else { - return False; - } - } - if ( question ~= "EnoughBeans" ) - { - return True; - } else { - if ( (question ~= "IsGryffindorAhead") || (question ~= "IsSlytherinAhead") || (question ~= "IsHufflepuffAhead") || (question ~= "IsRavenclawAhead") ) - { - return managerStatus.GetStatusGroup(Class'StatusGroupHousePoints').CutQuestion(question); - } else { - if ( (question ~= "ChallengeIsFirstTime") || (question ~= "ChallengePreviouslyBeaten") || (question ~= "ChallengePreviouslyMastered") || (question ~= "ChallengeWorseThanBefore") || (question ~= "ChallengeJustWonFirstTime") || (question ~= "ChallengeJustMastered") || (question ~= "ChallengeMissedStars") || (question ~= "ChallengeNewBestScore") ) - { - foreach AllActors(Class'ChallengeScoreManager',managerChallenge) - { - goto JL02D1; - } - if ( managerChallenge != None ) - { - return managerChallenge.CutQuestion(question); - } else { - return Super.CutQuestion(question); - } - } else { - if ( question ~= "ReadyForTransitionE" ) - { - return (bHub9CeremonyFlag == True) && (managerStatus.GetStatusItem(Class'StatusGroupPolyIngr',Class'StatusItemBoomslang').nCount > 0) && (managerStatus.GetStatusItem(Class'StatusGroupPolyIngr',Class'StatusItemBicorn').nCount > 0); - } else { - if ( question ~= "HaveAllSilverCards" ) - { - return managerStatus.GetStatusItem(Class'StatusGroupWizardCards',Class'StatusItemSilverCards').nCount >= 40; - } else { - return Super.CutQuestion(question); - } - } - } - } - } -} -*/ - function bool CutQuestion(string question) { local ChallengeScoreManager managerChallenge; @@ -5675,7 +5393,7 @@ function bool CutCommand (string Command, optional string cue, optional bool bFa local string sSayTextID; local Characters CurrCharacter; - ClientMessage(self$" CutCommand:" $command $" Cue:" $cue); + //ClientMessage(self$" CutCommand:" $command $" Cue:" $cue); sActualCommand = ParseDelimitedString(Command," ",1,False); if ( sActualCommand ~= "Capture" ) @@ -5703,7 +5421,7 @@ function bool CutCommand (string Command, optional string cue, optional bool bFa GotoState('PlayerWalking'); RotationRate = Default.RotationRate; - CM("M212: Harry release!"); + //CM("M212: Harry release!"); return True; } @@ -5885,7 +5603,6 @@ event PlayerInput (float DeltaTime) aLookUp = 0.0; return; } - if ( bInDuelingMode ) { bStrafe = 1; @@ -5905,46 +5622,36 @@ event PlayerInput (float DeltaTime) HandleDuelPlayerInput(); } } - else if ( bAltFire > 0 ) + else { - if ( GetCurrentKeyState(IK_LeftMouse) || GetCurrentKeyState(IK_RightMouse) || GetCurrentKeyState(IK_MiddleMouse) ) - { - bMoveWhileCasting = True; - //log("Move while casting!"); - } - else + if ( bAltFire > 0 ) { - bMoveWhileCasting = False; - //log("No move while casting!"); + if ( GetCurrentKeyState(IK_LeftMouse) || GetCurrentKeyState(IK_RightMouse) || GetCurrentKeyState(IK_MiddleMouse) ) + { + bMoveWhileCasting = True; + //log("Move while casting!"); + } + else + { + bMoveWhileCasting = False; + //log("No move while casting!"); + } } - } - - //this is not really needed, state PlayerWalking and HarryAnimChannel deal with it -AdamJD - /* - else if( bIsAiming ) - { - // Metallicafan212: Turn off casting - // IDK how they did it in the normal game, but this is the only way I know to do it - // StopAiming(); - // HarryAnimChannel.Cast(); - BaseWand(Weapon).Finish(); - } - */ - - if ( bOpenMap == 1 && !bMapQuickLook ) - { - bMapQuickLook = True; - } - else if ( bOpenMap == 0 && bMapQuickLook ) - { - cm("FEBook ToggleMap"); - HPConsole(Player.Console).menuBook.ToggleMap(); - bMapQuickLook = False; - } - if ( bDrinkWiggenwell == 1 && IsInState('PlayerWalking') && Physics == PHYS_Walking && !IsA('BroomHarry') || (bDrinkWiggenwell == 1 && IsInState('PlayerWalking') && IsA('BroomHarry') ) ) - { - DoDrinkWiggenwell(); - } + if ( bOpenMap == 1 && !bMapQuickLook ) + { + bMapQuickLook = True; + } + else if ( bOpenMap == 0 && bMapQuickLook ) + { + cm("FEBook ToggleMap"); + HPConsole(Player.Console).menuBook.ToggleMap(); + bMapQuickLook = False; + } + if ( (bDrinkWiggenwell == 1 && IsInState('PlayerWalking') && Physics == PHYS_Walking && !IsA('BroomHarry')) || (bDrinkWiggenwell == 1 && IsInState('PlayerWalking') && IsA('BroomHarry')) ) + { + DoDrinkWiggenwell(); + } + } if ( CurrVendorManager != None ) { CurrVendorManager.PlayerInput(DeltaTime); @@ -6246,7 +5953,7 @@ function CheckIfHarryLostDuel() Duellist(DuelOpponent).SentEvent(Duellist(DuelOpponent).LostEventName); } else { // Duellist(DuelOpponent).SayComment(DC_DuelWin,Duellist(DuelOpponent).eHouse,True); - Duellist(DuelOpponent).SayComment( DC_DuelOpp, Duellist(DuelOpponent).eHouse, true ); //the old code by UTPT made Snape say Harry had won when Harry got hit... -AdamJD + Duellist(DuelOpponent).SayComment(DC_DuelOpp,Duellist(DuelOpponent).eHouse,True); //the old code by UTPT made Snape say Harry had won when Harry got hit... -AdamJD } } @@ -6291,7 +5998,7 @@ function bool HandleSpellDuelRictusempra (optional baseSpell spell, optional Vec CheckIfHarryLostDuel(); PlayHurtEmoteSound(); HarryAnimChannel.DoReactRictusempra(); - fTimeAfterHitNew = 1.0 /*UTPT didn't add this bit.. -AdamJD*/ * (1 + Duellist(DuelOpponent).Intellect); + fTimeAfterHitNew = 1.0 * (1 + Duellist(DuelOpponent).Intellect); //UTPT didn't add the bit after 1.0... -AdamJD if ( fTimeAfterHitNew > fTimeAfterHit ) { fTimeAfterHit = fTimeAfterHitNew; @@ -6396,19 +6103,19 @@ function UpdateChallengeScores (string strLevelURL, int nHighScore, int nMaxScor strLevelURL = Caps(strLevelURL); if ( InStr(strLevelURL,"CH1RICTUSEMPRA") != -1 ) { - nIdx = 0; + nIdx = nRICTUSEMPRA_CHALLENGE_IDX; } else //{ if ( InStr(strLevelURL,"CH2SKURGE") != -1 ) { - nIdx = 1; + nIdx = nSKURGE_CHALLENGE_IDX; } else //{ if ( InStr(strLevelURL,"CH3DIFFINDO") != -1 ) { - nIdx = 2; + nIdx = nDIFFINDO_CHALLENGE_IDX; } else //{ if ( InStr(strLevelURL,"CH4SPONGIFY") != -1 ) { - nIdx = 3; + nIdx = nSPONGIFY_CHALLENGE_IDX; } else { ClientMessage("ERROR: Invalid Challenge Level URL passed in" $ strLevelURL); return; @@ -6416,16 +6123,16 @@ function UpdateChallengeScores (string strLevelURL, int nHighScore, int nMaxScor // } // } // } - if ( (nIdx < 0) || (nIdx >= 4) ) + if ( (nIdx < nRICTUSEMPRA_CHALLENGE_IDX) || (nIdx >= 4) ) { ClientMessage("ERROR: Unrecognized challenge level"); - } else //{ + } else { if ( nHighScore > ChallengeScores[nIdx].nHighScore ) { ChallengeScores[nIdx].nHighScore = nHighScore; } ChallengeScores[nIdx].nMaxScore = nMaxScore; - //} + } } function GetRictusempraChallengeScore (out int nHighScore, out int nMaxScore)