diff --git a/Classes/Conversation.uc b/Classes/Conversation.uc
index e79a07e..feb7df7 100644
--- a/Classes/Conversation.uc
+++ b/Classes/Conversation.uc
@@ -2,7 +2,7 @@ class Conversation extends baseProps;
//#exec Texture Import File=..\engine\Textures\Path_B.pcx Name=Path_B Mips=Off Flags=2
-#exec OBJ LOAD FILE=..\textures\hpedit.utx PACKAGE=HPBase.HPEdit
+#exec OBJ LOAD FILE=Textures\HPEdit.utx PACKAGE=HPBase.HPEdit
struct ScriptLine{
var() string message;
diff --git a/Classes/CutCameraPos.uc b/Classes/CutCameraPos.uc
index d5144e1..56e3672 100644
--- a/Classes/CutCameraPos.uc
+++ b/Classes/CutCameraPos.uc
@@ -1,6 +1,6 @@
class CutCameraPos expands NavigationPoint;
-#EXEC TEXTURE IMPORT NAME=CutCamIcon FILE=TEXTURES\CutCamIcon.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=CutCamIcon FILE=Textures\Icons\CutCamIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/FireSeeds.uc b/Classes/FireSeeds.uc
index 184db4c..410668c 100644
--- a/Classes/FireSeeds.uc
+++ b/Classes/FireSeeds.uc
@@ -6,9 +6,9 @@
//class FireSeeds extends basechar;
class FireSeeds extends projectile;
-#exec MESH MODELIMPORT MESH=FireSeedMesh MODELFILE=..\hprops\models\FireSeed.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=FireSeedMesh MODELFILE=SkeletalMeshes\FireSeedMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=FireSeedMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=FireSeedAnims ANIMFILE=..\hprops\models\FireSeed.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=FireSeedAnims ANIMFILE=Animations\FireSeedAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=FireSeedMesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=FireSeedMesh ANIM=FireSeedAnims
@@ -16,7 +16,7 @@ class FireSeeds extends projectile;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=FireSeedAnims VERBOSE
-#EXEC TEXTURE IMPORT NAME=FireSeedTex0 FILE=..\hprops\TEXTURES\fireseed_128.bmp GROUP=Skins
+#EXEC TEXTURE IMPORT NAME=FireSeedTex0 FILE=Textures\Skins\FireSeedTex0.bmp GROUP=Skins
#EXEC MESHMAP SETTEXTURE MESHMAP=FireSeedMesh NUM=0 TEXTURE=FireSeedTex0
diff --git a/Classes/HPMessageBox.uc b/Classes/HPMessageBox.uc
index 3fe2482..eed83d5 100644
--- a/Classes/HPMessageBox.uc
+++ b/Classes/HPMessageBox.uc
@@ -1,7 +1,7 @@
class HPMessageBox expands UWindowDialogClientWindow;
-#EXEC TEXTURE IMPORT NAME=FEMessageBoxBg FILE=TEXTURES\ConfirmDialog\confirmload.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEMessageBoxBtn FILE=TEXTURES\ConfirmDialog\confirmover.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEMessageBoxBg FILE=Textures\Icons\FEMessageBoxBg.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEMessageBoxBtn FILE=Textures\Icons\FEMessageBoxBtn.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
var string Result;
diff --git a/Classes/ModTarget1.uc b/Classes/ModTarget1.uc
index 9f62410..c0d8d91 100644
--- a/Classes/ModTarget1.uc
+++ b/Classes/ModTarget1.uc
@@ -3,9 +3,9 @@
//===============================================================================
class ModTarget1 extends Actor;
-#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=models\ModTarget1.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=SkeletalMeshes\ModTarget1Mesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=ModTarget1Mesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=models\ModTarget1.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=Animations\ModTarget1Anims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=ModTarget1Mesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=ModTarget1Mesh ANIM=ModTarget1Anims
@@ -13,7 +13,7 @@ class ModTarget1 extends Actor;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=ModTarget1Anims VERBOSE
-#EXEC TEXTURE IMPORT NAME=ModTarget1Tex0 FILE=TEXTURES\Target1.bmp GROUP=Skins
+#EXEC TEXTURE IMPORT NAME=ModTarget1Tex0 FILE=Textures\Skins\ModTarget1Tex0.bmp GROUP=Skins
#EXEC MESHMAP SETTEXTURE MESHMAP=ModTarget1Mesh NUM=0 TEXTURE=ModTarget1Tex0
diff --git a/Classes/NullMesh.uc b/Classes/NullMesh.uc
index 63ad0e1..7a28913 100644
--- a/Classes/NullMesh.uc
+++ b/Classes/NullMesh.uc
@@ -3,9 +3,9 @@
//===============================================================================
class NullMesh extends baseProps;
-#exec MESH MODELIMPORT MESH=NullMeshMesh MODELFILE=models\NullMesh.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=NullMeshMesh MODELFILE=SkeletalMeshes\NullMeshMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=NullMeshMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=NullMeshAnims ANIMFILE=models\NullMesh.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=NullMeshAnims ANIMFILE=Animations\NullMeshAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=NullMeshMesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=NullMeshMesh ANIM=NullMeshAnims
@@ -13,7 +13,7 @@ class NullMesh extends baseProps;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=NullMeshAnims VERBOSE
-#EXEC TEXTURE IMPORT NAME=NullMeshTex0 FILE=TEXTURES\ectopgoo_64.bmp GROUP=Skins
+#EXEC TEXTURE IMPORT NAME=NullMeshTex0 FILE=Textures\Skins\NullMeshTex0.bmp GROUP=Skins
#EXEC MESHMAP SETTEXTURE MESHMAP=NullMeshMesh NUM=0 TEXTURE=NullMeshTex0
diff --git a/Classes/SPELLLEV.uc b/Classes/SPELLLEV.uc
index 34aee30..0bc43b6 100644
--- a/Classes/SPELLLEV.uc
+++ b/Classes/SPELLLEV.uc
@@ -3,9 +3,9 @@
//===============================================================================
class SPELLLEV extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
@@ -13,7 +13,7 @@ class SPELLLEV extends BASESPELL;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
//#EXEC TEXTURE IMPORT NAME=SPELLLEVTex0 FILE=TEXTURES\Lev.bmp GROUP=Skins
@@ -21,12 +21,12 @@ class SPELLLEV extends BASESPELL;
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
-#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=..\HPMenu\TEXTURES\HUD\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=Textures\Icons\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
// Original material [0] is [Material #1] SkinIndex: 0 Bitmap: Lev.bmp Path: C:\HarryPotter\FX
// Import the pattern
-#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns/Wingardium.hpg
+#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns\LevPattern.hpg
// ImpactSound=Sound'HPSounds.magic_sfx.s_lev_hit'
// CastSound=Sound'HPSounds.magic_sfx.s_spell_wing_throw'
diff --git a/Classes/SPELLPostLEV.uc b/Classes/SPELLPostLEV.uc
index 1e4f4d3..36c5a45 100644
--- a/Classes/SPELLPostLEV.uc
+++ b/Classes/SPELLPostLEV.uc
@@ -3,9 +3,9 @@
//===============================================================================
class SPELLPostLEV extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
@@ -13,7 +13,7 @@ class SPELLPostLEV extends BASESPELL;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
//#EXEC TEXTURE IMPORT NAME=SPELLLEVTex0 FILE=TEXTURES\Lev.bmp GROUP=Skins
@@ -21,12 +21,12 @@ class SPELLPostLEV extends BASESPELL;
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
-#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=..\HPMenu\TEXTURES\HUD\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=Textures\Icons\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
// Original material [0] is [Material #1] SkinIndex: 0 Bitmap: Lev.bmp Path: C:\HarryPotter\FX
// Import the pattern
-#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns/Wingardium.hpg
+#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns\LevPattern.hpg
var rotator rot;
function tick(float deltatime)
diff --git a/Classes/SpellBlackboard.uc b/Classes/SpellBlackboard.uc
index 2d94991..f048ab8 100644
--- a/Classes/SpellBlackboard.uc
+++ b/Classes/SpellBlackboard.uc
@@ -1,6 +1,6 @@
class SpellBlackboard expands actor;
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPparticle.hp_fx
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPparticle.hp_fx
#exec OBJ LOAD FILE=..\textures\Particles.utx PACKAGE=HPparticle.particle_fx
// texture=Texture'HPParticle.hp_fx.Particles.bluefog_01'
diff --git a/Classes/Target.uc b/Classes/Target.uc
index 57f1993..a0de4ec 100644
--- a/Classes/Target.uc
+++ b/Classes/Target.uc
@@ -4,16 +4,16 @@
class target extends ParticleFX;
-#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=models\ModTarget1.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=SkeletalMeshes\ModTarget1Mesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=ModTarget1Mesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=models\ModTarget1.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=Animations\ModTarget1Anims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=ModTarget1Mesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=ModTarget1Mesh ANIM=ModTarget1Anims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=ModTarget1Anims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
#exec MESHMAP SETTEXTURE MESHMAP=ModTarget1Mesh NUM=1 TEXTURE=HPBase.FXPackage.Target1
diff --git a/Classes/baseFEPage.uc b/Classes/baseFEPage.uc
index 4ceb25c..27cea2c 100644
--- a/Classes/baseFEPage.uc
+++ b/Classes/baseFEPage.uc
@@ -33,8 +33,12 @@ function PreOpenBook()
function HPMessageBox doHPMessageBox(string msg, string textButton1, optional string textButton2, optional float timeOut)
{
local HPMessageBox w;
-
- w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', (640-246)/2, (480-102)/2, 246, 102, Self));
+ local int xoffset, yoffset;
+
+ xoffset = ((Root.WinWidth/2)-320);
+ yoffset = ((Root.WinHeight/2)-240);
+
+ w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', xoffset+(640-246)/2, yoffset+(480-102)/2, 246, 102, Self));
w.Setup (msg, textButton1, textButton2, timeOut);
root.ShowModal(w);
diff --git a/Classes/baseHud.uc b/Classes/baseHud.uc
index 174d59b..1b39765 100644
--- a/Classes/baseHud.uc
+++ b/Classes/baseHud.uc
@@ -3,22 +3,20 @@
//=============================================================================
class baseHud extends HUD;
-#EXEC TEXTURE IMPORT NAME=HudTextBox1 FILE=TEXTURES\HUDTextBox1.bmp GROUP=Icons
-#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=TEXTURES\HUDTextBox2.bmp GROUP=Icons
+#EXEC TEXTURE IMPORT NAME=HudTextBox1 FILE=Textures\Icons\HudTextBox1.bmp GROUP=Icons
+#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=Textures\Icons\HudTextBox2.bmp GROUP=Icons
-#EXEC TEXTURE IMPORT NAME=leftPanel FILE=..\HPMENU\TEXTURES\HUD\leftPanel.pcx GROUP=Icons MIPS=off
-#EXEC TEXTURE IMPORT NAME=middlePanel FILE=..\HPMENU\TEXTURES\HUD\middlePanel.pcx GROUP=Icons MIPS=off
-#EXEC TEXTURE IMPORT NAME=rightPanel FILE=..\HPMENU\TEXTURES\HUD\rightPanel.pcx GROUP=Icons MIPS=off
+#EXEC TEXTURE IMPORT NAME=leftPanel FILE=Textures\Icons\leftPanel.bmp GROUP=Icons MIPS=off
+#EXEC TEXTURE IMPORT NAME=middlePanel FILE=Textures\Icons\middlePanel.bmp GROUP=Icons MIPS=off
+#EXEC TEXTURE IMPORT NAME=rightPanel FILE=Textures\Icons\rightPanel.bmp GROUP=Icons MIPS=off
-#EXEC TEXTURE IMPORT NAME=HarryBarFull FILE=..\HPMENU\TEXTURES\HUD\HarryHealth.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HarryBarEmpty FILE=..\HPMENU\TEXTURES\HUD\HarryHealthEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HarryBarFull FILE=Textures\Icons\HarryBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HarryBarEmpty FILE=Textures\Icons\HarryBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=TEXTURES\HUDTextBox2.bmp GROUP=Icons
-
-#EXEC TEXTURE IMPORT NAME=TimerBarFull FILE=TEXTURES\HUD\Timer.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=TimerBarEmpty FILE=TEXTURES\HUD\EmptyBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=TimerBarFull FILE=Textures\Icons\TimerBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=TimerBarEmpty FILE=Textures\Icons\TimerBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#exec new TrueTypeFontFactory Name=InkFont FontName="InkPotFitCaps" Height=16 AntiAlias=1 CharactersPerPage=32
//#exec new TrueTypeFontFactory Name=InkFont FontName="Georgia" Height=16 AntiAlias=1 CharactersPerPage=32
@@ -367,11 +365,14 @@ function DrawIconMessageBox(Canvas canvas)
function DrawIconMessages(Canvas canvas)
{
-local int xpos;
+local int xpos, ypos;
local float w, h;
local int lines,AvailLines;
local Font saveFont;
+ local string TextLine, SearchStr;
+ local int iOrgPos, iNewPos;
+
if(curIconMessage.valid!=true)
return;
@@ -397,7 +398,7 @@ local Font saveFont;
xpos+=curIconMessage.icon.USize+10;
}
if(curIconMessage.message!="")
- {
+ {
Canvas.Style = 2;
Canvas.DrawColor.r=127;
@@ -406,29 +407,139 @@ local Font saveFont;
canvas.TextSize(curIconMessage.message, w, h);
- if ( w < canvas.SizeX - 16 - xpos)
- {
- xpos = (canvas.SizeX - w - xpos) / 2;
- }
-
//Massive KLUDGE. cmp 10-18 The +90 below is a fudge factor to overcome the spaces added to a string when it gets word wrapped.
//specificly to fix German storybook_new_20
- lines=((w+90)/Canvas.SizeX)+1;
- AvailLines=((canvas.SizeY)/8)/h;
+ lines=((w+90)/Canvas.SizeX)+1;
+ AvailLines=((canvas.SizeY)/8)/h;
//baseHarry(owner).clientMessage(self $" " $lines $" " $AvailLines $"Width:" $w $"Height:" $h);
- if(lines>AvailLines)
- Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalTinyFont;
+ if(lines>AvailLines)
+ {
+ Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalMedFont;
+ canvas.TextSize(curIconMessage.message, w, h);
+ lines=((w+90)/Canvas.SizeX)+1;
+ AvailLines=((canvas.SizeY)/8)/h;
+ if(lines>AvailLines)
+ {
+ Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalSmallFont;
+ canvas.TextSize(curIconMessage.message, w, h);
+ lines=((w+90)/Canvas.SizeX)+1;
+ AvailLines=((canvas.SizeY)/8)/h;
+
+ if(lines>AvailLines)
+ {
+ Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalTinyFont;
+ canvas.TextSize(curIconMessage.message, w, h);
+ lines=((w+90)/Canvas.SizeX)+1;
+ AvailLines=((canvas.SizeY)/8)/h;
+ }
+ }
+ }
+// log("original " $curIconMessage.message);
+ if (caps(GetLanguage()) == "THA")
+ {
+ TextLine = "";
- Canvas.SetPos(xpos, (canvas.SizeY-fCutSceneBoarderOffset)+1);
- Canvas.DrawText(curIconMessage.message, False);
+ iOrgPos = 0;
- Canvas.DrawColor.r=255;
- Canvas.DrawColor.g=255;
- Canvas.DrawColor.b=255;
+ ypos = (canvas.SizeY - fCutSceneBoarderOffset) + 1;
+ Canvas.SetPos(xpos, ypos);
+
+ SearchStr = curIconMessage.message;
+
+ while (iOrgPos <= Len(curIconMessage.message))
+ {
+ iNewPos = InStr(SearchStr, "_");
+
+ log("_ found at " $iNewPos);
+ if (iNewPos != -1)
+ {
+ TextLine = TextLine $Left(SearchStr, iNewPos);
+ }
+ else
+ {
+ TextLine = TextLine $SearchStr;
+ }
+
+ canvas.TextSize(TextLine, w, h);
+// log("new line is " $TextLine);
+
+ if ( w > canvas.SizeX - 16 - xpos)
+ {
+ // We've gone past the line, go back and print out the string
+ TextLine = Left(TextLine, iOrgPos - 1);
+ Canvas.DrawText(TextLine, False);
+ ypos += h;
+ Canvas.SetPos(xpos, ypos);
+ TextLine = "";
+ }
+ else
+ {
+ if (iNewPos != -1)
+ {
+ iOrgPos += iNewPos;
+ SearchStr = Right(SearchStr, Len(SearchStr) - iNewPos - 1);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+// log("New search str " $SearchStr);
+ }
+ canvas.TextSize(TextLine, w, h);
+
+ if ( w < canvas.SizeX - 16 - xpos)
+ {
+ xpos = (canvas.SizeX - w - xpos) / 2;
+ }
+ Canvas.SetPos(xpos, ypos);
+ Canvas.DrawText(TextLine, False);
+
+/* lines = 1;
+ while (lines > 0)
+ {
+ iOrgPos = 0;
+ iNewPos = 0;
+
+ while (Mid(curIconMessage.message, iOrgPos, 1) != " "
+ && Mid(curIconMessage.message, iOrgPos, 1) != "\n"
+ && Mid(curIconMessage.message, iOrgPos, 1) != "\0")
+ {
+// if (Mid(curIconMessage.message, iOrgPos, 1) != "_")
+// {
+ TextLine = TextLine $Mid(curIconMessage.message, iOrgPos, 1);
+// }
+ iOrgPos ++;
+ }
+
+ TextLine = TextLine $Mid(curIconMessage.message, iOrgPos, 1);
+
+ Canvas.DrawText(TextLine, False);
+ lines --;
+ ypos += h;
+ Canvas.SetPos(xpos, ypos);
+ }*/
}
+ else
+ {
+ if ( w < canvas.SizeX - 16 - xpos)
+ {
+ xpos = (canvas.SizeX - w - xpos) / 2;
+ }
+
+
+ Canvas.SetPos(xpos, (canvas.SizeY-fCutSceneBoarderOffset)+1);
+ Canvas.DrawText(curIconMessage.message, False);
+
+ }
+ }
+ Canvas.DrawColor.r=255;
+ Canvas.DrawColor.g=255;
+ Canvas.DrawColor.b=255;
Canvas.Font=saveFont;
}
diff --git a/Classes/baseQHudGame.uc b/Classes/baseQHudGame.uc
index b430f5c..65b412e 100644
--- a/Classes/baseQHudGame.uc
+++ b/Classes/baseQHudGame.uc
@@ -1,14 +1,14 @@
class baseQHudGame expands actor;
-#EXEC TEXTURE IMPORT NAME=HandBar FILE=TEXTURES\HUD\HandBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BarTip FILE=TEXTURES\HUD\BarTip.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ClosedHand FILE=TEXTURES\HUD\ClosedHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ClosedHandKey FILE=TEXTURES\HUD\ClosedHandKey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ClosedHandSnitch FILE=TEXTURES\HUD\ClosedHandSnitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HalfOpenHand FILE=TEXTURES\HUD\HalfOpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=OpenHand FILE=TEXTURES\HUD\OpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=Snitch FILE=TEXTURES\HUD\Snitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=Key FILE=TEXTURES\HUD\Key.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HandBar FILE=Textures\Icons\HandBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BarTip FILE=Textures\Icons\BarTip.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ClosedHand FILE=Textures\Icons\ClosedHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ClosedHandKey FILE=Textures\Icons\ClosedHandKey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ClosedHandSnitch FILE=Textures\Icons\ClosedHandSnitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HalfOpenHand FILE=Textures\Icons\HalfOpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=OpenHand FILE=Textures\Icons\OpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=Snitch FILE=Textures\Icons\Snitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=Key FILE=Textures\Icons\Key.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
/*var texture image;
var float xOffset,yOffset;
diff --git a/Classes/baseScript.uc b/Classes/baseScript.uc
index 01cc671..b58baee 100644
--- a/Classes/baseScript.uc
+++ b/Classes/baseScript.uc
@@ -1,6 +1,6 @@
class baseScript expands actor;
-#EXEC TEXTURE IMPORT NAME=CutSceneIcon FILE=TEXTURES\CutSceneIcon.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=CutSceneIcon FILE=Textures\Icons\CutSceneIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var baseHarry playerHarry;
var baseNarrator theNarrator;
diff --git a/Classes/baseSpell.uc b/Classes/baseSpell.uc
index f5579ae..da541b8 100644
--- a/Classes/baseSpell.uc
+++ b/Classes/baseSpell.uc
@@ -3,19 +3,19 @@
//=============================================================================
class baseSpell extends Projectile;
-#exec MESH IMPORT MESH=spellProj ANIVFILE=MODELS\Cross_a.3D DATAFILE=MODELS\Cross_d.3D X=0 Y=0 Z=0
+#exec MESH IMPORT MESH=spellProj ANIVFILE=Meshes\spellProj_a.3d DATAFILE=Meshes\spellProj_d.3d X=0 Y=0 Z=0
#exec MESH ORIGIN MESH=spellProj X=0 Y=0 Z=0 YAW=64
#exec MESH SEQUENCE MESH=spellProj SEQ=All STARTFRAME=0 NUMFRAMES=1
#exec MESH SEQUENCE MESH=spellProj SEQ=Still STARTFRAME=0 NUMFRAMES=1
#exec MESHMAP SCALE MESHMAP=spellProj X=0.2 Y=0.2 Z=0.2
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=defaultSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=defaultSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var Texture spellIcon;
var string spellName;
diff --git a/Classes/baseStation.uc b/Classes/baseStation.uc
index 584c830..f0de71d 100644
--- a/Classes/baseStation.uc
+++ b/Classes/baseStation.uc
@@ -2,7 +2,7 @@ class baseStation extends basePath;
-#exec Texture Import File=..\engine\Textures\station.pcx Name=station Mips=Off Flags=2
+#exec Texture Import File=Textures\station.bmp Name=station Mips=Off Flags=2
struct stationData
diff --git a/Classes/baseWand.uc b/Classes/baseWand.uc
index c19f68c..26f9dad 100644
--- a/Classes/baseWand.uc
+++ b/Classes/baseWand.uc
@@ -2,9 +2,9 @@
// baseWand
//=============================================================================
class baseWand extends Weapon;
-#exec MESH MODELIMPORT MESH=WandMesh MODELFILE=models\Wand.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=WandMesh MODELFILE=SkeletalMeshes\WandMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=WandMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=WandAnims ANIMFILE=models\Wand.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=WandAnims ANIMFILE=Animations\WandAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=WandMesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=WandMesh ANIM=WandAnims
@@ -12,7 +12,7 @@ class baseWand extends Weapon;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=WandAnims VERBOSE
-#EXEC TEXTURE IMPORT NAME=WandTex0 FILE=TEXTURES\WandTexture.bmp GROUP=Skins
+#EXEC TEXTURE IMPORT NAME=WandTex0 FILE=Textures\Skins\WandTex0.bmp GROUP=Skins
#EXEC MESHMAP SETTEXTURE MESHMAP=WandMesh NUM=0 TEXTURE=WandTex0
diff --git a/Classes/ectoMark.uc b/Classes/ectoMark.uc
index f85d601..d30ef8d 100644
--- a/Classes/ectoMark.uc
+++ b/Classes/ectoMark.uc
@@ -1,7 +1,7 @@
class ectoMark expands Scorch;
-#exec TEXTURE IMPORT NAME=ectosplat FILE=TEXTURES\goo_splat.PCX LODSET=2
-#exec TEXTURE IMPORT NAME=ectosplat2 FILE=TEXTURES\goo_splat2.PCX LODSET=2
+#exec TEXTURE IMPORT NAME=ectosplat FILE=Textures\ectosplat.bmp LODSET=2
+#exec TEXTURE IMPORT NAME=ectosplat2 FILE=Textures\ectosplat2.bmp LODSET=2
simulated function BeginPlay()
{
diff --git a/Classes/levHitEffect.uc b/Classes/levHitEffect.uc
index cfd021b..f4186d5 100644
--- a/Classes/levHitEffect.uc
+++ b/Classes/levHitEffect.uc
@@ -3,9 +3,9 @@
//===============================================================================
class levhiteffect extends basevisualeffect;
-#exec MESH MODELIMPORT MESH=levhiteffectMesh MODELFILE=models\LevLasting.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=levhiteffectMesh MODELFILE=SkeletalMeshes\levhiteffectMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=levhiteffectMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=levhiteffectAnims ANIMFILE=models\LevLasting.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=levhiteffectAnims ANIMFILE=Animations\levhiteffectAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=levhiteffectMesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=levhiteffectMesh ANIM=levhiteffectAnims
@@ -13,7 +13,7 @@ class levhiteffect extends basevisualeffect;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=levhiteffectAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
diff --git a/Classes/spellAloho.uc b/Classes/spellAloho.uc
index 8c3aba1..3631619 100644
--- a/Classes/spellAloho.uc
+++ b/Classes/spellAloho.uc
@@ -1,23 +1,23 @@
//===============================================================================
class spellAloho extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
+#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellAvif.uc b/Classes/spellAvif.uc
index 12c1a80..7f4c263 100644
--- a/Classes/spellAvif.uc
+++ b/Classes/spellAvif.uc
@@ -1,24 +1,24 @@
//===============================================================================
class spellAvif extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=avifSpellIcon FILE=..\HPMenu\TEXTURES\HUD\avifSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=avifSpellIcon FILE=Textures\Icons\avifSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=AvifPattern FILE=Patterns/Avifores.hpg
+#exec PATTERN IMPORT PATTERN=AvifPattern FILE=Patterns\AvifPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellEcto.uc b/Classes/spellEcto.uc
index 6e95550..605037c 100644
--- a/Classes/spellEcto.uc
+++ b/Classes/spellEcto.uc
@@ -1,6 +1,6 @@
class spellEcto extends BASESPELL;
-#exec MESH IMPORT MESH=BioGelm ANIVFILE=MODELS\nGel_a.3D DATAFILE=MODELS\nGel_d.3D X=0 Y=0 Z=0
+#exec MESH IMPORT MESH=BioGelm ANIVFILE=Meshes\BioGelm_a.3d DATAFILE=Meshes\BioGelm_d.3d X=0 Y=0 Z=0
#exec MESH ORIGIN MESH=BioGelm X=-45 Y=0 Z=0 YAW=0 PITCH=-64 ROLL=0
#exec MESH SEQUENCE MESH=BioGelm SEQ=All STARTFRAME=0 NUMFRAMES=56
#exec MESH SEQUENCE MESH=BioGelm SEQ=Flying STARTFRAME=0 NUMFRAMES=13
@@ -9,7 +9,7 @@ class spellEcto extends BASESPELL;
#exec MESH SEQUENCE MESH=BioGelm SEQ=Drip STARTFRAME=24 NUMFRAMES=13
#exec MESH SEQUENCE MESH=BioGelm SEQ=Slide STARTFRAME=37 NUMFRAMES=7
#exec MESH SEQUENCE MESH=BioGelm SEQ=Shrivel STARTFRAME=44 NUMFRAMES=12
-#exec TEXTURE IMPORT NAME=Jgreen FILE=MODELS\green.PCX
+#exec TEXTURE IMPORT NAME=Jgreen FILE=Textures\Jgreen.bmp
#exec MESHMAP SCALE MESHMAP=BioGelm X=0.04 Y=0.04 Z=0.08
#exec MESHMAP SETTEXTURE MESHMAP=BioGelm NUM=1 TEXTURE=Jgreen
#exec MESH NOTIFY MESH=BioGelm SEQ=Drip TIME=0.6 FUNCTION=DropDrip
@@ -22,7 +22,7 @@ var int numBio;
var float wallTime;
var float BaseOffset;
-#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
function PostBeginPlay()
{
diff --git a/Classes/spellFire.uc b/Classes/spellFire.uc
index 047c606..c901f53 100644
--- a/Classes/spellFire.uc
+++ b/Classes/spellFire.uc
@@ -1,23 +1,23 @@
//===============================================================================
class spellFire extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
+#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellFireCracker.uc b/Classes/spellFireCracker.uc
index 3c8507e..8f567d5 100644
--- a/Classes/spellFireCracker.uc
+++ b/Classes/spellFireCracker.uc
@@ -1,20 +1,5 @@
class spellFireCracker extends BASESPELL;
-/*
-#exec MESH IMPORT MESH=BioGelm ANIVFILE=MODELS\nGel_a.3D DATAFILE=MODELS\nGel_d.3D X=0 Y=0 Z=0
-#exec MESH ORIGIN MESH=BioGelm X=-45 Y=0 Z=0 YAW=0 PITCH=-64 ROLL=0
-#exec MESH SEQUENCE MESH=BioGelm SEQ=All STARTFRAME=0 NUMFRAMES=56
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Flying STARTFRAME=0 NUMFRAMES=13
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Still STARTFRAME=13 NUMFRAMES=1
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Hit STARTFRAME=14 NUMFRAMES=10
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Drip STARTFRAME=24 NUMFRAMES=13
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Slide STARTFRAME=37 NUMFRAMES=7
-#exec MESH SEQUENCE MESH=BioGelm SEQ=Shrivel STARTFRAME=44 NUMFRAMES=12
-#exec TEXTURE IMPORT NAME=Jgreen FILE=MODELS\green.PCX
-#exec MESHMAP SCALE MESHMAP=BioGelm X=0.04 Y=0.04 Z=0.08
-#exec MESHMAP SETTEXTURE MESHMAP=BioGelm NUM=1 TEXTURE=Jgreen
-#exec MESH NOTIFY MESH=BioGelm SEQ=Drip TIME=0.6 FUNCTION=DropDrip
-*/
var vector SurfaceNormal;
var bool bOnGround;
@@ -39,7 +24,7 @@ var vector vInitialVelSave;
var baseHarry playerHarry;
-#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//*********************************************************************************************************
function PostBeginPlay()
diff --git a/Classes/spellFlint.uc b/Classes/spellFlint.uc
index d806c6f..d8709d0 100644
--- a/Classes/spellFlint.uc
+++ b/Classes/spellFlint.uc
@@ -2,18 +2,18 @@
//===============================================================================
class spellFlint extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=flintSpellIcon FILE=..\HPMenu\TEXTURES\HUD\flintSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=flintSpellIcon FILE=Textures\Icons\flintSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
diff --git a/Classes/spellFlip.uc b/Classes/spellFlip.uc
index 37e2895..252e44e 100644
--- a/Classes/spellFlip.uc
+++ b/Classes/spellFlip.uc
@@ -2,23 +2,23 @@
class spellFlip extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
+#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellIncendio.uc b/Classes/spellIncendio.uc
index 6c06c36..32ccd70 100644
--- a/Classes/spellIncendio.uc
+++ b/Classes/spellIncendio.uc
@@ -1,23 +1,23 @@
//===============================================================================
class spellIncendio extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=IncendioPattern FILE=Patterns/Incendio.hpg
+#exec PATTERN IMPORT PATTERN=IncendioPattern FILE=Patterns\IncendioPattern.hpg
// ImpactSound=Sound'HPSounds.magic_sfx.s_spell_Alohomora_hit'
// CastSound=Sound'HPSounds.magic_sfx.s_spell_throw5'
diff --git a/Classes/spellPuffapod.uc b/Classes/spellPuffapod.uc
index 8666afd..9bc1028 100644
--- a/Classes/spellPuffapod.uc
+++ b/Classes/spellPuffapod.uc
@@ -11,7 +11,7 @@ var() float GravityBoost;
var() float LifeTimer;
var() float ExplosionRadius;
-#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//*********************************************************************************************************
function PostBeginPlay()
diff --git a/Classes/spellRepairo.uc b/Classes/spellRepairo.uc
index f54c500..369932b 100644
--- a/Classes/spellRepairo.uc
+++ b/Classes/spellRepairo.uc
@@ -2,18 +2,18 @@
class spellRepairo extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
diff --git a/Classes/spellTrans.uc b/Classes/spellTrans.uc
index 49258a6..8796c2f 100644
--- a/Classes/spellTrans.uc
+++ b/Classes/spellTrans.uc
@@ -4,7 +4,7 @@
class spellTrans extends baseSpell;
-#EXEC TEXTURE IMPORT NAME=transSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=transSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/spellTrollRock.uc b/Classes/spellTrollRock.uc
index 28b714f..2d471ca 100644
--- a/Classes/spellTrollRock.uc
+++ b/Classes/spellTrollRock.uc
@@ -37,7 +37,7 @@ var() float ShadowDrawScaleFactor;
var float FloorZ;
-#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//*********************************************************************************************************
function PostBeginPlay()
diff --git a/Classes/spellVerd.uc b/Classes/spellVerd.uc
index b4cdf4a..1f47bc3 100644
--- a/Classes/spellVerd.uc
+++ b/Classes/spellVerd.uc
@@ -1,18 +1,18 @@
//===============================================================================
class spellVerd extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=verdSpellIcon FILE=..\HPMenu\TEXTURES\HUD\verdSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=verdSpellIcon FILE=Textures\Icons\verdSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
diff --git a/Classes/spellVoldemortStraight.uc b/Classes/spellVoldemortStraight.uc
index bbdb21b..215f4d1 100644
--- a/Classes/spellVoldemortStraight.uc
+++ b/Classes/spellVoldemortStraight.uc
@@ -2,23 +2,23 @@
class spellVoldemortStraight extends baseSpell;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
+#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
function Touch(Actor Other)
{
diff --git a/Classes/spellVoldemortTracking.uc b/Classes/spellVoldemortTracking.uc
index 17ab503..af5ac4d 100644
--- a/Classes/spellVoldemortTracking.uc
+++ b/Classes/spellVoldemortTracking.uc
@@ -3,9 +3,9 @@
class spellVoldemortTracking extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
diff --git a/Classes/spelldud.uc b/Classes/spelldud.uc
index 287fedc..e62ffa8 100644
--- a/Classes/spelldud.uc
+++ b/Classes/spelldud.uc
@@ -2,24 +2,24 @@
class spelldud extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
+#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spelllumas.uc b/Classes/spelllumas.uc
index 4d0951c..47d0681 100644
--- a/Classes/spelllumas.uc
+++ b/Classes/spelllumas.uc
@@ -2,24 +2,24 @@
class spelllumas extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=LumosPattern FILE=Patterns/Lumos.hpg
+#exec PATTERN IMPORT PATTERN=LumosPattern FILE=Patterns\LumosPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellnone.uc b/Classes/spellnone.uc
index cb8c4ce..a184898 100644
--- a/Classes/spellnone.uc
+++ b/Classes/spellnone.uc
@@ -2,24 +2,24 @@
class spellnone extends BASESPELL;
-#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
#exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
// Digest and compress the animation data. Must come after the sequence declarations.
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
-#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
+#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
-#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
// Import the pattern
-#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
+#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
function PostBeginPlay()
{
diff --git a/Classes/spellpeevesthrow.uc b/Classes/spellpeevesthrow.uc
index f993db1..71970b0 100644
--- a/Classes/spellpeevesthrow.uc
+++ b/Classes/spellpeevesthrow.uc
@@ -1,9 +1,9 @@
class spellpeevesthrow extends BASESPELL;
-#exec MESH MODELIMPORT MESH=PeeveThrowAppleMesh MODELFILE=..\hprops\models\PeeveThrowApple.PSK LODSTYLE=10
+#exec MESH MODELIMPORT MESH=PeeveThrowAppleMesh MODELFILE=SkeletalMeshes\PeeveThrowAppleMesh.psk LODSTYLE=10
#exec MESH ORIGIN MESH=PeeveThrowAppleMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
-#exec ANIM IMPORT ANIM=PeeveThrowAppleAnims ANIMFILE=..\hprops\models\PeeveThrowApple.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
+#exec ANIM IMPORT ANIM=PeeveThrowAppleAnims ANIMFILE=Animations\PeeveThrowAppleAnims.psa COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
#exec MESHMAP SCALE MESHMAP=PeeveThrowAppleMesh X=1.0 Y=1.0 Z=1.0
#exec MESH DEFAULTANIM MESH=PeeveThrowAppleMesh ANIM=PeeveThrowAppleAnims
@@ -11,7 +11,7 @@ class spellpeevesthrow extends BASESPELL;
// 'VERBOSE' gives more debugging info in UCC.log
#exec ANIM DIGEST ANIM=PeeveThrowAppleAnims VERBOSE
-#EXEC TEXTURE IMPORT NAME=PeeveThrowAppleTex0 FILE=..\hprops\TEXTURES\pveapple_64.bmp GROUP=Skins
+#EXEC TEXTURE IMPORT NAME=PeeveThrowAppleTex0 FILE=Textures\Skins\PeeveThrowAppleTex0.bmp GROUP=Skins
#EXEC MESHMAP SETTEXTURE MESHMAP=PeeveThrowAppleMesh NUM=0 TEXTURE=PeeveThrowAppleTex0
@@ -25,7 +25,7 @@ var float wallTime;
var float BaseOffset;
var vector PreviousLocation;
-#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
function PostBeginPlay()
{
diff --git a/Classes/transHitEffect.uc b/Classes/transHitEffect.uc
index c338e59..7204c1d 100644
--- a/Classes/transHitEffect.uc
+++ b/Classes/transHitEffect.uc
@@ -1,14 +1,14 @@
class transHitEffect expands baseVisualEffect;
-#exec MESH IMPORT MESH=Tele2 ANIVFILE=MODELS\Tele2_a.3d DATAFILE=MODELS\Tele2_d.3d X=0 Y=0 Z=0
+#exec MESH IMPORT MESH=Tele2 ANIVFILE=Meshes\Tele2_a.3d DATAFILE=Meshes\Tele2_d.3d X=0 Y=0 Z=0
#exec MESH SEQUENCE MESH=Tele2 SEQ=All STARTFRAME=0 NUMFRAMES=100
#exec MESH SEQUENCE MESH=Tele2 SEQ=Teleport STARTFRAME=0 NUMFRAMES=100
#exec MESHMAP NEW MESHMAP=Tele2 MESH=Tele2
#exec MESHMAP SCALE MESHMAP=Tele2 X=0.1 Y=0.1 Z=0.2
-#exec TEXTURE IMPORT NAME=JTele2_01 FILE=Textures\Trail.PCX GROUP=Skins
+#exec TEXTURE IMPORT NAME=JTele2_01 FILE=Textures\Skins\JTele2_01.bmp GROUP=Skins
#exec MESHMAP SETTEXTURE MESHMAP=Tele2 NUM=1 TEXTURE=JTele2_01
diff --git a/Meshes/BioGelm_a.3d b/Meshes/BioGelm_a.3d
index 447ff22..2f9f2aa 100644
Binary files a/Meshes/BioGelm_a.3d and b/Meshes/BioGelm_a.3d differ
diff --git a/Meshes/BioGelm_d.3d b/Meshes/BioGelm_d.3d
index 2557804..0bd0783 100644
Binary files a/Meshes/BioGelm_d.3d and b/Meshes/BioGelm_d.3d differ
diff --git a/Meshes/Tele2_a.3d b/Meshes/Tele2_a.3d
index e7ad51a..41a0dd0 100644
Binary files a/Meshes/Tele2_a.3d and b/Meshes/Tele2_a.3d differ
diff --git a/Meshes/Tele2_d.3d b/Meshes/Tele2_d.3d
index 9a4789c..8e7330e 100644
Binary files a/Meshes/Tele2_d.3d and b/Meshes/Tele2_d.3d differ
diff --git a/Meshes/spellProj_a.3d b/Meshes/spellProj_a.3d
index 195c226..2e1495a 100644
Binary files a/Meshes/spellProj_a.3d and b/Meshes/spellProj_a.3d differ
diff --git a/Meshes/spellProj_d.3d b/Meshes/spellProj_d.3d
index d76b008..549db99 100644
Binary files a/Meshes/spellProj_d.3d and b/Meshes/spellProj_d.3d differ
diff --git a/SkeletalMeshes/FireSeedMesh.psk b/SkeletalMeshes/FireSeedMesh.psk
index 0d202dd..0bba945 100644
Binary files a/SkeletalMeshes/FireSeedMesh.psk and b/SkeletalMeshes/FireSeedMesh.psk differ
diff --git a/SkeletalMeshes/ModTarget1Mesh.psk b/SkeletalMeshes/ModTarget1Mesh.psk
index a98342b..f64365f 100644
Binary files a/SkeletalMeshes/ModTarget1Mesh.psk and b/SkeletalMeshes/ModTarget1Mesh.psk differ
diff --git a/SkeletalMeshes/NullMeshMesh.psk b/SkeletalMeshes/NullMeshMesh.psk
index 3fa8f1a..1023149 100644
Binary files a/SkeletalMeshes/NullMeshMesh.psk and b/SkeletalMeshes/NullMeshMesh.psk differ
diff --git a/SkeletalMeshes/PeeveThrowAppleMesh.psk b/SkeletalMeshes/PeeveThrowAppleMesh.psk
index 6e6007a..c94fd66 100644
Binary files a/SkeletalMeshes/PeeveThrowAppleMesh.psk and b/SkeletalMeshes/PeeveThrowAppleMesh.psk differ
diff --git a/SkeletalMeshes/SPELLLEVMesh.psk b/SkeletalMeshes/SPELLLEVMesh.psk
index 4be9c9a..872a165 100644
Binary files a/SkeletalMeshes/SPELLLEVMesh.psk and b/SkeletalMeshes/SPELLLEVMesh.psk differ
diff --git a/SkeletalMeshes/WandMesh.psk b/SkeletalMeshes/WandMesh.psk
index 4833ff4..3c562c3 100644
Binary files a/SkeletalMeshes/WandMesh.psk and b/SkeletalMeshes/WandMesh.psk differ
diff --git a/SkeletalMeshes/levhiteffectMesh.psk b/SkeletalMeshes/levhiteffectMesh.psk
index 8574f3c..2c918ab 100644
Binary files a/SkeletalMeshes/levhiteffectMesh.psk and b/SkeletalMeshes/levhiteffectMesh.psk differ