Data hosted with ♥ by Pastebin.com - Download Raw - See Original
  1. diff --git a/Classes/Conversation.uc b/Classes/Conversation.uc
  2. index e79a07e..feb7df7 100644
  3. --- a/Classes/Conversation.uc
  4. +++ b/Classes/Conversation.uc
  5. @@ -2,7 +2,7 @@ class Conversation extends baseProps;
  6.  
  7. //#exec Texture Import File=..\engine\Textures\Path_B.pcx Name=Path_B Mips=Off Flags=2
  8.  
  9. -#exec OBJ LOAD FILE=..\textures\hpedit.utx PACKAGE=HPBase.HPEdit
  10. +#exec OBJ LOAD FILE=Textures\HPEdit.utx PACKAGE=HPBase.HPEdit
  11.  
  12. struct ScriptLine{
  13. var() string message;
  14. diff --git a/Classes/CutCameraPos.uc b/Classes/CutCameraPos.uc
  15. index d5144e1..56e3672 100644
  16. --- a/Classes/CutCameraPos.uc
  17. +++ b/Classes/CutCameraPos.uc
  18. @@ -1,6 +1,6 @@
  19. class CutCameraPos expands NavigationPoint;
  20.  
  21. -#EXEC TEXTURE IMPORT NAME=CutCamIcon FILE=TEXTURES\CutCamIcon.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
  22. +#EXEC TEXTURE IMPORT NAME=CutCamIcon FILE=Textures\Icons\CutCamIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  23.  
  24. defaultproperties
  25. {
  26. diff --git a/Classes/FireSeeds.uc b/Classes/FireSeeds.uc
  27. index 184db4c..410668c 100644
  28. --- a/Classes/FireSeeds.uc
  29. +++ b/Classes/FireSeeds.uc
  30. @@ -6,9 +6,9 @@
  31. //class FireSeeds extends basechar;
  32. class FireSeeds extends projectile;
  33.  
  34. -#exec MESH MODELIMPORT MESH=FireSeedMesh MODELFILE=..\hprops\models\FireSeed.PSK LODSTYLE=10
  35. +#exec MESH MODELIMPORT MESH=FireSeedMesh MODELFILE=SkeletalMeshes\FireSeedMesh.psk LODSTYLE=10
  36. #exec MESH ORIGIN MESH=FireSeedMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  37. -#exec ANIM IMPORT ANIM=FireSeedAnims ANIMFILE=..\hprops\models\FireSeed.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  38. +#exec ANIM IMPORT ANIM=FireSeedAnims ANIMFILE=Animations\FireSeedAnims.psa IMPORTSEQS=1
  39. #exec MESHMAP SCALE MESHMAP=FireSeedMesh X=1.0 Y=1.0 Z=1.0
  40. #exec MESH DEFAULTANIM MESH=FireSeedMesh ANIM=FireSeedAnims
  41.  
  42. @@ -16,7 +16,7 @@ class FireSeeds extends projectile;
  43. // 'VERBOSE' gives more debugging info in UCC.log
  44. #exec ANIM DIGEST ANIM=FireSeedAnims VERBOSE
  45.  
  46. -#EXEC TEXTURE IMPORT NAME=FireSeedTex0 FILE=..\hprops\TEXTURES\fireseed_128.bmp GROUP=Skins
  47. +#EXEC TEXTURE IMPORT NAME=FireSeedTex0 FILE=Textures\Skins\FireSeedTex0.bmp GROUP=Skins
  48.  
  49. #EXEC MESHMAP SETTEXTURE MESHMAP=FireSeedMesh NUM=0 TEXTURE=FireSeedTex0
  50.  
  51. diff --git a/Classes/HPMessageBox.uc b/Classes/HPMessageBox.uc
  52. index 3fe2482..eed83d5 100644
  53. --- a/Classes/HPMessageBox.uc
  54. +++ b/Classes/HPMessageBox.uc
  55. @@ -1,7 +1,7 @@
  56. class HPMessageBox expands UWindowDialogClientWindow;
  57.  
  58. -#EXEC TEXTURE IMPORT NAME=FEMessageBoxBg FILE=TEXTURES\ConfirmDialog\confirmload.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
  59. -#EXEC TEXTURE IMPORT NAME=FEMessageBoxBtn FILE=TEXTURES\ConfirmDialog\confirmover.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
  60. +#EXEC TEXTURE IMPORT NAME=FEMessageBoxBg FILE=Textures\Icons\FEMessageBoxBg.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
  61. +#EXEC TEXTURE IMPORT NAME=FEMessageBoxBtn FILE=Textures\Icons\FEMessageBoxBtn.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
  62.  
  63. var string Result;
  64.  
  65. diff --git a/Classes/ModTarget1.uc b/Classes/ModTarget1.uc
  66. index 9f62410..c0d8d91 100644
  67. --- a/Classes/ModTarget1.uc
  68. +++ b/Classes/ModTarget1.uc
  69. @@ -3,9 +3,9 @@
  70. //===============================================================================
  71.  
  72. class ModTarget1 extends Actor;
  73. -#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=models\ModTarget1.PSK LODSTYLE=10
  74. +#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=SkeletalMeshes\ModTarget1Mesh.psk LODSTYLE=10
  75. #exec MESH ORIGIN MESH=ModTarget1Mesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  76. -#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=models\ModTarget1.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  77. +#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=Animations\ModTarget1Anims.psa IMPORTSEQS=1
  78. #exec MESHMAP SCALE MESHMAP=ModTarget1Mesh X=1.0 Y=1.0 Z=1.0
  79. #exec MESH DEFAULTANIM MESH=ModTarget1Mesh ANIM=ModTarget1Anims
  80.  
  81. @@ -13,7 +13,7 @@ class ModTarget1 extends Actor;
  82. // 'VERBOSE' gives more debugging info in UCC.log
  83. #exec ANIM DIGEST ANIM=ModTarget1Anims VERBOSE
  84.  
  85. -#EXEC TEXTURE IMPORT NAME=ModTarget1Tex0 FILE=TEXTURES\Target1.bmp GROUP=Skins
  86. +#EXEC TEXTURE IMPORT NAME=ModTarget1Tex0 FILE=Textures\Skins\ModTarget1Tex0.bmp GROUP=Skins
  87.  
  88. #EXEC MESHMAP SETTEXTURE MESHMAP=ModTarget1Mesh NUM=0 TEXTURE=ModTarget1Tex0
  89.  
  90. diff --git a/Classes/NullMesh.uc b/Classes/NullMesh.uc
  91. index 63ad0e1..7a28913 100644
  92. --- a/Classes/NullMesh.uc
  93. +++ b/Classes/NullMesh.uc
  94. @@ -3,9 +3,9 @@
  95. //===============================================================================
  96.  
  97. class NullMesh extends baseProps;
  98. -#exec MESH MODELIMPORT MESH=NullMeshMesh MODELFILE=models\NullMesh.PSK LODSTYLE=10
  99. +#exec MESH MODELIMPORT MESH=NullMeshMesh MODELFILE=SkeletalMeshes\NullMeshMesh.psk LODSTYLE=10
  100. #exec MESH ORIGIN MESH=NullMeshMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  101. -#exec ANIM IMPORT ANIM=NullMeshAnims ANIMFILE=models\NullMesh.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  102. +#exec ANIM IMPORT ANIM=NullMeshAnims ANIMFILE=Animations\NullMeshAnims.psa IMPORTSEQS=1
  103. #exec MESHMAP SCALE MESHMAP=NullMeshMesh X=1.0 Y=1.0 Z=1.0
  104. #exec MESH DEFAULTANIM MESH=NullMeshMesh ANIM=NullMeshAnims
  105.  
  106. @@ -13,7 +13,7 @@ class NullMesh extends baseProps;
  107. // 'VERBOSE' gives more debugging info in UCC.log
  108. #exec ANIM DIGEST ANIM=NullMeshAnims VERBOSE
  109.  
  110. -#EXEC TEXTURE IMPORT NAME=NullMeshTex0 FILE=TEXTURES\ectopgoo_64.bmp GROUP=Skins
  111. +#EXEC TEXTURE IMPORT NAME=NullMeshTex0 FILE=Textures\Skins\NullMeshTex0.bmp GROUP=Skins
  112.  
  113. #EXEC MESHMAP SETTEXTURE MESHMAP=NullMeshMesh NUM=0 TEXTURE=NullMeshTex0
  114.  
  115. diff --git a/Classes/SPELLLEV.uc b/Classes/SPELLLEV.uc
  116. index 34aee30..0bc43b6 100644
  117. --- a/Classes/SPELLLEV.uc
  118. +++ b/Classes/SPELLLEV.uc
  119. @@ -3,9 +3,9 @@
  120. //===============================================================================
  121.  
  122. class SPELLLEV extends BASESPELL;
  123. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  124. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  125. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  126. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  127. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  128. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  129. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  130.  
  131. @@ -13,7 +13,7 @@ class SPELLLEV extends BASESPELL;
  132. // 'VERBOSE' gives more debugging info in UCC.log
  133. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  134.  
  135. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  136. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  137.  
  138. //#EXEC TEXTURE IMPORT NAME=SPELLLEVTex0 FILE=TEXTURES\Lev.bmp GROUP=Skins
  139.  
  140. @@ -21,12 +21,12 @@ class SPELLLEV extends BASESPELL;
  141.  
  142. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  143.  
  144. -#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=..\HPMenu\TEXTURES\HUD\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  145. +#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=Textures\Icons\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  146.  
  147. // Original material [0] is [Material #1] SkinIndex: 0 Bitmap: Lev.bmp Path: C:\HarryPotter\FX
  148.  
  149. // Import the pattern
  150. -#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns/Wingardium.hpg
  151. +#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns\LevPattern.hpg
  152.  
  153. // ImpactSound=Sound'HPSounds.magic_sfx.s_lev_hit'
  154. // CastSound=Sound'HPSounds.magic_sfx.s_spell_wing_throw'
  155. diff --git a/Classes/SPELLPostLEV.uc b/Classes/SPELLPostLEV.uc
  156. index 1e4f4d3..36c5a45 100644
  157. --- a/Classes/SPELLPostLEV.uc
  158. +++ b/Classes/SPELLPostLEV.uc
  159. @@ -3,9 +3,9 @@
  160. //===============================================================================
  161.  
  162. class SPELLPostLEV extends BASESPELL;
  163. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  164. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  165. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  166. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  167. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  168. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  169. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  170.  
  171. @@ -13,7 +13,7 @@ class SPELLPostLEV extends BASESPELL;
  172. // 'VERBOSE' gives more debugging info in UCC.log
  173. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  174.  
  175. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  176. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  177.  
  178. //#EXEC TEXTURE IMPORT NAME=SPELLLEVTex0 FILE=TEXTURES\Lev.bmp GROUP=Skins
  179.  
  180. @@ -21,12 +21,12 @@ class SPELLPostLEV extends BASESPELL;
  181.  
  182. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  183.  
  184. -#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=..\HPMenu\TEXTURES\HUD\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  185. +#EXEC TEXTURE IMPORT NAME=levSpellIcon FILE=Textures\Icons\levSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  186.  
  187. // Original material [0] is [Material #1] SkinIndex: 0 Bitmap: Lev.bmp Path: C:\HarryPotter\FX
  188.  
  189. // Import the pattern
  190. -#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns/Wingardium.hpg
  191. +#exec PATTERN IMPORT PATTERN=LevPattern FILE=Patterns\LevPattern.hpg
  192. var rotator rot;
  193.  
  194. function tick(float deltatime)
  195. diff --git a/Classes/SpellBlackboard.uc b/Classes/SpellBlackboard.uc
  196. index 2d94991..f048ab8 100644
  197. --- a/Classes/SpellBlackboard.uc
  198. +++ b/Classes/SpellBlackboard.uc
  199. @@ -1,6 +1,6 @@
  200. class SpellBlackboard expands actor;
  201.  
  202. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPparticle.hp_fx
  203. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPparticle.hp_fx
  204. #exec OBJ LOAD FILE=..\textures\Particles.utx PACKAGE=HPparticle.particle_fx
  205.  
  206. // texture=Texture'HPParticle.hp_fx.Particles.bluefog_01'
  207. diff --git a/Classes/Target.uc b/Classes/Target.uc
  208. index 57f1993..a0de4ec 100644
  209. --- a/Classes/Target.uc
  210. +++ b/Classes/Target.uc
  211. @@ -4,16 +4,16 @@
  212.  
  213. class target extends ParticleFX;
  214.  
  215. -#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=models\ModTarget1.PSK LODSTYLE=10
  216. +#exec MESH MODELIMPORT MESH=ModTarget1Mesh MODELFILE=SkeletalMeshes\ModTarget1Mesh.psk LODSTYLE=10
  217. #exec MESH ORIGIN MESH=ModTarget1Mesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  218. -#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=models\ModTarget1.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  219. +#exec ANIM IMPORT ANIM=ModTarget1Anims ANIMFILE=Animations\ModTarget1Anims.psa IMPORTSEQS=1
  220. #exec MESHMAP SCALE MESHMAP=ModTarget1Mesh X=1.0 Y=1.0 Z=1.0
  221. #exec MESH DEFAULTANIM MESH=ModTarget1Mesh ANIM=ModTarget1Anims
  222.  
  223. // Digest and compress the animation data. Must come after the sequence declarations.
  224. // 'VERBOSE' gives more debugging info in UCC.log
  225. #exec ANIM DIGEST ANIM=ModTarget1Anims VERBOSE
  226. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  227. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  228. #exec MESHMAP SETTEXTURE MESHMAP=ModTarget1Mesh NUM=1 TEXTURE=HPBase.FXPackage.Target1
  229.  
  230.  
  231. diff --git a/Classes/baseFEPage.uc b/Classes/baseFEPage.uc
  232. index 4ceb25c..27cea2c 100644
  233. --- a/Classes/baseFEPage.uc
  234. +++ b/Classes/baseFEPage.uc
  235. @@ -33,8 +33,12 @@ function PreOpenBook()
  236. function HPMessageBox doHPMessageBox(string msg, string textButton1, optional string textButton2, optional float timeOut)
  237. {
  238. local HPMessageBox w;
  239. -
  240. - w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', (640-246)/2, (480-102)/2, 246, 102, Self));
  241. + local int xoffset, yoffset;
  242. +
  243. + xoffset = ((Root.WinWidth/2)-320);
  244. + yoffset = ((Root.WinHeight/2)-240);
  245. +
  246. + w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', xoffset+(640-246)/2, yoffset+(480-102)/2, 246, 102, Self));
  247. w.Setup (msg, textButton1, textButton2, timeOut);
  248.  
  249. root.ShowModal(w);
  250. diff --git a/Classes/baseHud.uc b/Classes/baseHud.uc
  251. index 174d59b..1b39765 100644
  252. --- a/Classes/baseHud.uc
  253. +++ b/Classes/baseHud.uc
  254. @@ -3,22 +3,20 @@
  255. //=============================================================================
  256. class baseHud extends HUD;
  257.  
  258. -#EXEC TEXTURE IMPORT NAME=HudTextBox1 FILE=TEXTURES\HUDTextBox1.bmp GROUP=Icons
  259. -#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=TEXTURES\HUDTextBox2.bmp GROUP=Icons
  260. +#EXEC TEXTURE IMPORT NAME=HudTextBox1 FILE=Textures\Icons\HudTextBox1.bmp GROUP=Icons
  261. +#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=Textures\Icons\HudTextBox2.bmp GROUP=Icons
  262.  
  263. -#EXEC TEXTURE IMPORT NAME=leftPanel FILE=..\HPMENU\TEXTURES\HUD\leftPanel.pcx GROUP=Icons MIPS=off
  264. -#EXEC TEXTURE IMPORT NAME=middlePanel FILE=..\HPMENU\TEXTURES\HUD\middlePanel.pcx GROUP=Icons MIPS=off
  265. -#EXEC TEXTURE IMPORT NAME=rightPanel FILE=..\HPMENU\TEXTURES\HUD\rightPanel.pcx GROUP=Icons MIPS=off
  266. +#EXEC TEXTURE IMPORT NAME=leftPanel FILE=Textures\Icons\leftPanel.bmp GROUP=Icons MIPS=off
  267. +#EXEC TEXTURE IMPORT NAME=middlePanel FILE=Textures\Icons\middlePanel.bmp GROUP=Icons MIPS=off
  268. +#EXEC TEXTURE IMPORT NAME=rightPanel FILE=Textures\Icons\rightPanel.bmp GROUP=Icons MIPS=off
  269.  
  270.  
  271.  
  272. -#EXEC TEXTURE IMPORT NAME=HarryBarFull FILE=..\HPMENU\TEXTURES\HUD\HarryHealth.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  273. -#EXEC TEXTURE IMPORT NAME=HarryBarEmpty FILE=..\HPMENU\TEXTURES\HUD\HarryHealthEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  274. +#EXEC TEXTURE IMPORT NAME=HarryBarFull FILE=Textures\Icons\HarryBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  275. +#EXEC TEXTURE IMPORT NAME=HarryBarEmpty FILE=Textures\Icons\HarryBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  276.  
  277. -#EXEC TEXTURE IMPORT NAME=HudTextBox2 FILE=TEXTURES\HUDTextBox2.bmp GROUP=Icons
  278. -
  279. -#EXEC TEXTURE IMPORT NAME=TimerBarFull FILE=TEXTURES\HUD\Timer.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  280. -#EXEC TEXTURE IMPORT NAME=TimerBarEmpty FILE=TEXTURES\HUD\EmptyBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  281. +#EXEC TEXTURE IMPORT NAME=TimerBarFull FILE=Textures\Icons\TimerBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  282. +#EXEC TEXTURE IMPORT NAME=TimerBarEmpty FILE=Textures\Icons\TimerBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  283.  
  284. //#exec new TrueTypeFontFactory Name=InkFont FontName="InkPotFitCaps" Height=16 AntiAlias=1 CharactersPerPage=32
  285. //#exec new TrueTypeFontFactory Name=InkFont FontName="Georgia" Height=16 AntiAlias=1 CharactersPerPage=32
  286. @@ -367,11 +365,14 @@ function DrawIconMessageBox(Canvas canvas)
  287.  
  288. function DrawIconMessages(Canvas canvas)
  289. {
  290. -local int xpos;
  291. +local int xpos, ypos;
  292. local float w, h;
  293. local int lines,AvailLines;
  294. local Font saveFont;
  295.  
  296. + local string TextLine, SearchStr;
  297. + local int iOrgPos, iNewPos;
  298. +
  299. if(curIconMessage.valid!=true)
  300. return;
  301.  
  302. @@ -397,7 +398,7 @@ local Font saveFont;
  303. xpos+=curIconMessage.icon.USize+10;
  304. }
  305. if(curIconMessage.message!="")
  306. - {
  307. + {
  308. Canvas.Style = 2;
  309.  
  310. Canvas.DrawColor.r=127;
  311. @@ -406,29 +407,139 @@ local Font saveFont;
  312.  
  313. canvas.TextSize(curIconMessage.message, w, h);
  314.  
  315. - if ( w < canvas.SizeX - 16 - xpos)
  316. - {
  317. - xpos = (canvas.SizeX - w - xpos) / 2;
  318. - }
  319. -
  320. //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.
  321. //specificly to fix German storybook_new_20
  322. - lines=((w+90)/Canvas.SizeX)+1;
  323. - AvailLines=((canvas.SizeY)/8)/h;
  324. + lines=((w+90)/Canvas.SizeX)+1;
  325. + AvailLines=((canvas.SizeY)/8)/h;
  326.  
  327. //baseHarry(owner).clientMessage(self $" " $lines $" " $AvailLines $"Width:" $w $"Height:" $h);
  328. - if(lines>AvailLines)
  329. - Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalTinyFont;
  330. + if(lines>AvailLines)
  331. + {
  332. + Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalMedFont;
  333. + canvas.TextSize(curIconMessage.message, w, h);
  334. + lines=((w+90)/Canvas.SizeX)+1;
  335. + AvailLines=((canvas.SizeY)/8)/h;
  336. + if(lines>AvailLines)
  337. + {
  338. + Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalSmallFont;
  339. + canvas.TextSize(curIconMessage.message, w, h);
  340. + lines=((w+90)/Canvas.SizeX)+1;
  341. + AvailLines=((canvas.SizeY)/8)/h;
  342. +
  343. + if(lines>AvailLines)
  344. + {
  345. + Canvas.Font=baseConsole(playerpawn(owner).player.console).LocalTinyFont;
  346. + canvas.TextSize(curIconMessage.message, w, h);
  347. + lines=((w+90)/Canvas.SizeX)+1;
  348. + AvailLines=((canvas.SizeY)/8)/h;
  349. + }
  350. + }
  351. + }
  352.  
  353. +// log("original " $curIconMessage.message);
  354. + if (caps(GetLanguage()) == "THA")
  355. + {
  356. + TextLine = "";
  357.  
  358. - Canvas.SetPos(xpos, (canvas.SizeY-fCutSceneBoarderOffset)+1);
  359. - Canvas.DrawText(curIconMessage.message, False);
  360. + iOrgPos = 0;
  361.  
  362. - Canvas.DrawColor.r=255;
  363. - Canvas.DrawColor.g=255;
  364. - Canvas.DrawColor.b=255;
  365. + ypos = (canvas.SizeY - fCutSceneBoarderOffset) + 1;
  366. + Canvas.SetPos(xpos, ypos);
  367. +
  368. + SearchStr = curIconMessage.message;
  369. +
  370. + while (iOrgPos <= Len(curIconMessage.message))
  371. + {
  372. + iNewPos = InStr(SearchStr, "_");
  373. +
  374. + log("_ found at " $iNewPos);
  375. + if (iNewPos != -1)
  376. + {
  377. + TextLine = TextLine $Left(SearchStr, iNewPos);
  378. + }
  379. + else
  380. + {
  381. + TextLine = TextLine $SearchStr;
  382. + }
  383. +
  384. + canvas.TextSize(TextLine, w, h);
  385. +// log("new line is " $TextLine);
  386. +
  387. + if ( w > canvas.SizeX - 16 - xpos)
  388. + {
  389. + // We've gone past the line, go back and print out the string
  390. + TextLine = Left(TextLine, iOrgPos - 1);
  391. + Canvas.DrawText(TextLine, False);
  392. + ypos += h;
  393. + Canvas.SetPos(xpos, ypos);
  394. + TextLine = "";
  395. + }
  396. + else
  397. + {
  398. + if (iNewPos != -1)
  399. + {
  400. + iOrgPos += iNewPos;
  401. + SearchStr = Right(SearchStr, Len(SearchStr) - iNewPos - 1);
  402. + }
  403. + else
  404. + {
  405. + break;
  406. + }
  407. + }
  408. +
  409. +// log("New search str " $SearchStr);
  410. + }
  411. + canvas.TextSize(TextLine, w, h);
  412. +
  413. + if ( w < canvas.SizeX - 16 - xpos)
  414. + {
  415. + xpos = (canvas.SizeX - w - xpos) / 2;
  416. + }
  417. + Canvas.SetPos(xpos, ypos);
  418. + Canvas.DrawText(TextLine, False);
  419. +
  420. +/* lines = 1;
  421. + while (lines > 0)
  422. + {
  423. + iOrgPos = 0;
  424. + iNewPos = 0;
  425. +
  426. + while (Mid(curIconMessage.message, iOrgPos, 1) != " "
  427. + && Mid(curIconMessage.message, iOrgPos, 1) != "\n"
  428. + && Mid(curIconMessage.message, iOrgPos, 1) != "\0")
  429. + {
  430. +// if (Mid(curIconMessage.message, iOrgPos, 1) != "_")
  431. +// {
  432. + TextLine = TextLine $Mid(curIconMessage.message, iOrgPos, 1);
  433. +// }
  434. + iOrgPos ++;
  435. + }
  436. +
  437. + TextLine = TextLine $Mid(curIconMessage.message, iOrgPos, 1);
  438. +
  439. + Canvas.DrawText(TextLine, False);
  440. + lines --;
  441. + ypos += h;
  442. + Canvas.SetPos(xpos, ypos);
  443. + }*/
  444. }
  445. + else
  446. + {
  447.  
  448. + if ( w < canvas.SizeX - 16 - xpos)
  449. + {
  450. + xpos = (canvas.SizeX - w - xpos) / 2;
  451. + }
  452. +
  453. +
  454. + Canvas.SetPos(xpos, (canvas.SizeY-fCutSceneBoarderOffset)+1);
  455. + Canvas.DrawText(curIconMessage.message, False);
  456. +
  457. + }
  458. + }
  459. + Canvas.DrawColor.r=255;
  460. + Canvas.DrawColor.g=255;
  461. + Canvas.DrawColor.b=255;
  462. Canvas.Font=saveFont;
  463. }
  464.  
  465. diff --git a/Classes/baseQHudGame.uc b/Classes/baseQHudGame.uc
  466. index b430f5c..65b412e 100644
  467. --- a/Classes/baseQHudGame.uc
  468. +++ b/Classes/baseQHudGame.uc
  469. @@ -1,14 +1,14 @@
  470. class baseQHudGame expands actor;
  471.  
  472. -#EXEC TEXTURE IMPORT NAME=HandBar FILE=TEXTURES\HUD\HandBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  473. -#EXEC TEXTURE IMPORT NAME=BarTip FILE=TEXTURES\HUD\BarTip.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  474. -#EXEC TEXTURE IMPORT NAME=ClosedHand FILE=TEXTURES\HUD\ClosedHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  475. -#EXEC TEXTURE IMPORT NAME=ClosedHandKey FILE=TEXTURES\HUD\ClosedHandKey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  476. -#EXEC TEXTURE IMPORT NAME=ClosedHandSnitch FILE=TEXTURES\HUD\ClosedHandSnitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  477. -#EXEC TEXTURE IMPORT NAME=HalfOpenHand FILE=TEXTURES\HUD\HalfOpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  478. -#EXEC TEXTURE IMPORT NAME=OpenHand FILE=TEXTURES\HUD\OpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  479. -#EXEC TEXTURE IMPORT NAME=Snitch FILE=TEXTURES\HUD\Snitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  480. -#EXEC TEXTURE IMPORT NAME=Key FILE=TEXTURES\HUD\Key.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  481. +#EXEC TEXTURE IMPORT NAME=HandBar FILE=Textures\Icons\HandBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  482. +#EXEC TEXTURE IMPORT NAME=BarTip FILE=Textures\Icons\BarTip.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  483. +#EXEC TEXTURE IMPORT NAME=ClosedHand FILE=Textures\Icons\ClosedHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  484. +#EXEC TEXTURE IMPORT NAME=ClosedHandKey FILE=Textures\Icons\ClosedHandKey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  485. +#EXEC TEXTURE IMPORT NAME=ClosedHandSnitch FILE=Textures\Icons\ClosedHandSnitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  486. +#EXEC TEXTURE IMPORT NAME=HalfOpenHand FILE=Textures\Icons\HalfOpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  487. +#EXEC TEXTURE IMPORT NAME=OpenHand FILE=Textures\Icons\OpenHand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  488. +#EXEC TEXTURE IMPORT NAME=Snitch FILE=Textures\Icons\Snitch.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  489. +#EXEC TEXTURE IMPORT NAME=Key FILE=Textures\Icons\Key.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  490.  
  491. /*var texture image;
  492. var float xOffset,yOffset;
  493. diff --git a/Classes/baseScript.uc b/Classes/baseScript.uc
  494. index 01cc671..b58baee 100644
  495. --- a/Classes/baseScript.uc
  496. +++ b/Classes/baseScript.uc
  497. @@ -1,6 +1,6 @@
  498. class baseScript expands actor;
  499.  
  500. -#EXEC TEXTURE IMPORT NAME=CutSceneIcon FILE=TEXTURES\CutSceneIcon.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
  501. +#EXEC TEXTURE IMPORT NAME=CutSceneIcon FILE=Textures\Icons\CutSceneIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  502.  
  503. var baseHarry playerHarry;
  504. var baseNarrator theNarrator;
  505. diff --git a/Classes/baseSpell.uc b/Classes/baseSpell.uc
  506. index f5579ae..da541b8 100644
  507. --- a/Classes/baseSpell.uc
  508. +++ b/Classes/baseSpell.uc
  509. @@ -3,19 +3,19 @@
  510. //=============================================================================
  511. class baseSpell extends Projectile;
  512.  
  513. -#exec MESH IMPORT MESH=spellProj ANIVFILE=MODELS\Cross_a.3D DATAFILE=MODELS\Cross_d.3D X=0 Y=0 Z=0
  514. +#exec MESH IMPORT MESH=spellProj ANIVFILE=Meshes\spellProj_a.3d DATAFILE=Meshes\spellProj_d.3d X=0 Y=0 Z=0
  515.  
  516. #exec MESH ORIGIN MESH=spellProj X=0 Y=0 Z=0 YAW=64
  517. #exec MESH SEQUENCE MESH=spellProj SEQ=All STARTFRAME=0 NUMFRAMES=1
  518. #exec MESH SEQUENCE MESH=spellProj SEQ=Still STARTFRAME=0 NUMFRAMES=1
  519. #exec MESHMAP SCALE MESHMAP=spellProj X=0.2 Y=0.2 Z=0.2
  520.  
  521. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  522. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  523.  
  524.  
  525.  
  526.  
  527. -#EXEC TEXTURE IMPORT NAME=defaultSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  528. +#EXEC TEXTURE IMPORT NAME=defaultSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  529.  
  530. var Texture spellIcon;
  531. var string spellName;
  532. diff --git a/Classes/baseStation.uc b/Classes/baseStation.uc
  533. index 584c830..f0de71d 100644
  534. --- a/Classes/baseStation.uc
  535. +++ b/Classes/baseStation.uc
  536. @@ -2,7 +2,7 @@ class baseStation extends basePath;
  537.  
  538.  
  539.  
  540. -#exec Texture Import File=..\engine\Textures\station.pcx Name=station Mips=Off Flags=2
  541. +#exec Texture Import File=Textures\station.bmp Name=station Mips=Off Flags=2
  542.  
  543.  
  544. struct stationData
  545. diff --git a/Classes/baseWand.uc b/Classes/baseWand.uc
  546. index c19f68c..26f9dad 100644
  547. --- a/Classes/baseWand.uc
  548. +++ b/Classes/baseWand.uc
  549. @@ -2,9 +2,9 @@
  550. // baseWand
  551. //=============================================================================
  552. class baseWand extends Weapon;
  553. -#exec MESH MODELIMPORT MESH=WandMesh MODELFILE=models\Wand.PSK LODSTYLE=10
  554. +#exec MESH MODELIMPORT MESH=WandMesh MODELFILE=SkeletalMeshes\WandMesh.psk LODSTYLE=10
  555. #exec MESH ORIGIN MESH=WandMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  556. -#exec ANIM IMPORT ANIM=WandAnims ANIMFILE=models\Wand.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  557. +#exec ANIM IMPORT ANIM=WandAnims ANIMFILE=Animations\WandAnims.psa IMPORTSEQS=1
  558. #exec MESHMAP SCALE MESHMAP=WandMesh X=1.0 Y=1.0 Z=1.0
  559. #exec MESH DEFAULTANIM MESH=WandMesh ANIM=WandAnims
  560.  
  561. @@ -12,7 +12,7 @@ class baseWand extends Weapon;
  562. // 'VERBOSE' gives more debugging info in UCC.log
  563. #exec ANIM DIGEST ANIM=WandAnims VERBOSE
  564.  
  565. -#EXEC TEXTURE IMPORT NAME=WandTex0 FILE=TEXTURES\WandTexture.bmp GROUP=Skins
  566. +#EXEC TEXTURE IMPORT NAME=WandTex0 FILE=Textures\Skins\WandTex0.bmp GROUP=Skins
  567.  
  568. #EXEC MESHMAP SETTEXTURE MESHMAP=WandMesh NUM=0 TEXTURE=WandTex0
  569.  
  570. diff --git a/Classes/ectoMark.uc b/Classes/ectoMark.uc
  571. index f85d601..d30ef8d 100644
  572. --- a/Classes/ectoMark.uc
  573. +++ b/Classes/ectoMark.uc
  574. @@ -1,7 +1,7 @@
  575. class ectoMark expands Scorch;
  576.  
  577. -#exec TEXTURE IMPORT NAME=ectosplat FILE=TEXTURES\goo_splat.PCX LODSET=2
  578. -#exec TEXTURE IMPORT NAME=ectosplat2 FILE=TEXTURES\goo_splat2.PCX LODSET=2
  579. +#exec TEXTURE IMPORT NAME=ectosplat FILE=Textures\ectosplat.bmp LODSET=2
  580. +#exec TEXTURE IMPORT NAME=ectosplat2 FILE=Textures\ectosplat2.bmp LODSET=2
  581.  
  582. simulated function BeginPlay()
  583. {
  584. diff --git a/Classes/levHitEffect.uc b/Classes/levHitEffect.uc
  585. index cfd021b..f4186d5 100644
  586. --- a/Classes/levHitEffect.uc
  587. +++ b/Classes/levHitEffect.uc
  588. @@ -3,9 +3,9 @@
  589. //===============================================================================
  590.  
  591. class levhiteffect extends basevisualeffect;
  592. -#exec MESH MODELIMPORT MESH=levhiteffectMesh MODELFILE=models\LevLasting.PSK LODSTYLE=10
  593. +#exec MESH MODELIMPORT MESH=levhiteffectMesh MODELFILE=SkeletalMeshes\levhiteffectMesh.psk LODSTYLE=10
  594. #exec MESH ORIGIN MESH=levhiteffectMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  595. -#exec ANIM IMPORT ANIM=levhiteffectAnims ANIMFILE=models\LevLasting.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  596. +#exec ANIM IMPORT ANIM=levhiteffectAnims ANIMFILE=Animations\levhiteffectAnims.psa IMPORTSEQS=1
  597. #exec MESHMAP SCALE MESHMAP=levhiteffectMesh X=1.0 Y=1.0 Z=1.0
  598. #exec MESH DEFAULTANIM MESH=levhiteffectMesh ANIM=levhiteffectAnims
  599.  
  600. @@ -13,7 +13,7 @@ class levhiteffect extends basevisualeffect;
  601. // 'VERBOSE' gives more debugging info in UCC.log
  602. #exec ANIM DIGEST ANIM=levhiteffectAnims VERBOSE
  603.  
  604. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  605. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  606.  
  607.  
  608.  
  609. diff --git a/Classes/spellAloho.uc b/Classes/spellAloho.uc
  610. index 8c3aba1..3631619 100644
  611. --- a/Classes/spellAloho.uc
  612. +++ b/Classes/spellAloho.uc
  613. @@ -1,23 +1,23 @@
  614. //===============================================================================
  615.  
  616. class spellAloho extends BASESPELL;
  617. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  618. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  619. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  620. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  621. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  622. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  623. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  624.  
  625. // Digest and compress the animation data. Must come after the sequence declarations.
  626. // 'VERBOSE' gives more debugging info in UCC.log
  627. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  628. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  629. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  630.  
  631. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  632. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  633.  
  634. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  635.  
  636. // Import the pattern
  637. -#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
  638. +#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
  639.  
  640. function PostBeginPlay()
  641. {
  642. diff --git a/Classes/spellAvif.uc b/Classes/spellAvif.uc
  643. index 12c1a80..7f4c263 100644
  644. --- a/Classes/spellAvif.uc
  645. +++ b/Classes/spellAvif.uc
  646. @@ -1,24 +1,24 @@
  647. //===============================================================================
  648.  
  649. class spellAvif extends BASESPELL;
  650. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  651. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  652. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  653. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  654. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  655. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  656. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  657.  
  658. // Digest and compress the animation data. Must come after the sequence declarations.
  659. // 'VERBOSE' gives more debugging info in UCC.log
  660. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  661. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  662. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  663.  
  664.  
  665. -#EXEC TEXTURE IMPORT NAME=avifSpellIcon FILE=..\HPMenu\TEXTURES\HUD\avifSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  666. +#EXEC TEXTURE IMPORT NAME=avifSpellIcon FILE=Textures\Icons\avifSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  667.  
  668. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  669.  
  670. // Import the pattern
  671. -#exec PATTERN IMPORT PATTERN=AvifPattern FILE=Patterns/Avifores.hpg
  672. +#exec PATTERN IMPORT PATTERN=AvifPattern FILE=Patterns\AvifPattern.hpg
  673.  
  674. function PostBeginPlay()
  675. {
  676. diff --git a/Classes/spellEcto.uc b/Classes/spellEcto.uc
  677. index 6e95550..605037c 100644
  678. --- a/Classes/spellEcto.uc
  679. +++ b/Classes/spellEcto.uc
  680. @@ -1,6 +1,6 @@
  681. class spellEcto extends BASESPELL;
  682.  
  683. -#exec MESH IMPORT MESH=BioGelm ANIVFILE=MODELS\nGel_a.3D DATAFILE=MODELS\nGel_d.3D X=0 Y=0 Z=0
  684. +#exec MESH IMPORT MESH=BioGelm ANIVFILE=Meshes\BioGelm_a.3d DATAFILE=Meshes\BioGelm_d.3d X=0 Y=0 Z=0
  685. #exec MESH ORIGIN MESH=BioGelm X=-45 Y=0 Z=0 YAW=0 PITCH=-64 ROLL=0
  686. #exec MESH SEQUENCE MESH=BioGelm SEQ=All STARTFRAME=0 NUMFRAMES=56
  687. #exec MESH SEQUENCE MESH=BioGelm SEQ=Flying STARTFRAME=0 NUMFRAMES=13
  688. @@ -9,7 +9,7 @@ class spellEcto extends BASESPELL;
  689. #exec MESH SEQUENCE MESH=BioGelm SEQ=Drip STARTFRAME=24 NUMFRAMES=13
  690. #exec MESH SEQUENCE MESH=BioGelm SEQ=Slide STARTFRAME=37 NUMFRAMES=7
  691. #exec MESH SEQUENCE MESH=BioGelm SEQ=Shrivel STARTFRAME=44 NUMFRAMES=12
  692. -#exec TEXTURE IMPORT NAME=Jgreen FILE=MODELS\green.PCX
  693. +#exec TEXTURE IMPORT NAME=Jgreen FILE=Textures\Jgreen.bmp
  694. #exec MESHMAP SCALE MESHMAP=BioGelm X=0.04 Y=0.04 Z=0.08
  695. #exec MESHMAP SETTEXTURE MESHMAP=BioGelm NUM=1 TEXTURE=Jgreen
  696. #exec MESH NOTIFY MESH=BioGelm SEQ=Drip TIME=0.6 FUNCTION=DropDrip
  697. @@ -22,7 +22,7 @@ var int numBio;
  698. var float wallTime;
  699. var float BaseOffset;
  700.  
  701. -#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  702. +#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  703.  
  704. function PostBeginPlay()
  705. {
  706. diff --git a/Classes/spellFire.uc b/Classes/spellFire.uc
  707. index 047c606..c901f53 100644
  708. --- a/Classes/spellFire.uc
  709. +++ b/Classes/spellFire.uc
  710. @@ -1,23 +1,23 @@
  711. //===============================================================================
  712.  
  713. class spellFire extends BASESPELL;
  714. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  715. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  716. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  717. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  718. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  719. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  720. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  721.  
  722. // Digest and compress the animation data. Must come after the sequence declarations.
  723. // 'VERBOSE' gives more debugging info in UCC.log
  724. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  725. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  726. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  727.  
  728. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  729. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  730.  
  731. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  732.  
  733. // Import the pattern
  734. -#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
  735. +#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
  736.  
  737. function PostBeginPlay()
  738. {
  739. diff --git a/Classes/spellFireCracker.uc b/Classes/spellFireCracker.uc
  740. index 3c8507e..8f567d5 100644
  741. --- a/Classes/spellFireCracker.uc
  742. +++ b/Classes/spellFireCracker.uc
  743. @@ -1,20 +1,5 @@
  744. class spellFireCracker extends BASESPELL;
  745.  
  746. -/*
  747. -#exec MESH IMPORT MESH=BioGelm ANIVFILE=MODELS\nGel_a.3D DATAFILE=MODELS\nGel_d.3D X=0 Y=0 Z=0
  748. -#exec MESH ORIGIN MESH=BioGelm X=-45 Y=0 Z=0 YAW=0 PITCH=-64 ROLL=0
  749. -#exec MESH SEQUENCE MESH=BioGelm SEQ=All STARTFRAME=0 NUMFRAMES=56
  750. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Flying STARTFRAME=0 NUMFRAMES=13
  751. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Still STARTFRAME=13 NUMFRAMES=1
  752. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Hit STARTFRAME=14 NUMFRAMES=10
  753. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Drip STARTFRAME=24 NUMFRAMES=13
  754. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Slide STARTFRAME=37 NUMFRAMES=7
  755. -#exec MESH SEQUENCE MESH=BioGelm SEQ=Shrivel STARTFRAME=44 NUMFRAMES=12
  756. -#exec TEXTURE IMPORT NAME=Jgreen FILE=MODELS\green.PCX
  757. -#exec MESHMAP SCALE MESHMAP=BioGelm X=0.04 Y=0.04 Z=0.08
  758. -#exec MESHMAP SETTEXTURE MESHMAP=BioGelm NUM=1 TEXTURE=Jgreen
  759. -#exec MESH NOTIFY MESH=BioGelm SEQ=Drip TIME=0.6 FUNCTION=DropDrip
  760. -*/
  761.  
  762. var vector SurfaceNormal;
  763. var bool bOnGround;
  764. @@ -39,7 +24,7 @@ var vector vInitialVelSave;
  765.  
  766. var baseHarry playerHarry;
  767.  
  768. -#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  769. +#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  770.  
  771. //*********************************************************************************************************
  772. function PostBeginPlay()
  773. diff --git a/Classes/spellFlint.uc b/Classes/spellFlint.uc
  774. index d806c6f..d8709d0 100644
  775. --- a/Classes/spellFlint.uc
  776. +++ b/Classes/spellFlint.uc
  777. @@ -2,18 +2,18 @@
  778. //===============================================================================
  779.  
  780. class spellFlint extends BASESPELL;
  781. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  782. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  783. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  784. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  785. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  786. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  787. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  788.  
  789. // Digest and compress the animation data. Must come after the sequence declarations.
  790. // 'VERBOSE' gives more debugging info in UCC.log
  791. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  792. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  793. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  794.  
  795. -#EXEC TEXTURE IMPORT NAME=flintSpellIcon FILE=..\HPMenu\TEXTURES\HUD\flintSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  796. +#EXEC TEXTURE IMPORT NAME=flintSpellIcon FILE=Textures\Icons\flintSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  797.  
  798. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  799.  
  800. diff --git a/Classes/spellFlip.uc b/Classes/spellFlip.uc
  801. index 37e2895..252e44e 100644
  802. --- a/Classes/spellFlip.uc
  803. +++ b/Classes/spellFlip.uc
  804. @@ -2,23 +2,23 @@
  805.  
  806. class spellFlip extends BASESPELL;
  807.  
  808. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  809. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  810. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  811. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  812. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  813. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  814. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  815.  
  816. // Digest and compress the animation data. Must come after the sequence declarations.
  817. // 'VERBOSE' gives more debugging info in UCC.log
  818. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  819. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  820. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  821.  
  822. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  823. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  824.  
  825. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  826.  
  827. // Import the pattern
  828. -#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
  829. +#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
  830.  
  831. function PostBeginPlay()
  832. {
  833. diff --git a/Classes/spellIncendio.uc b/Classes/spellIncendio.uc
  834. index 6c06c36..32ccd70 100644
  835. --- a/Classes/spellIncendio.uc
  836. +++ b/Classes/spellIncendio.uc
  837. @@ -1,23 +1,23 @@
  838. //===============================================================================
  839.  
  840. class spellIncendio extends BASESPELL;
  841. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  842. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  843. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  844. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  845. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  846. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  847. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  848.  
  849. // Digest and compress the animation data. Must come after the sequence declarations.
  850. // 'VERBOSE' gives more debugging info in UCC.log
  851. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  852. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  853. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  854.  
  855. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  856. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  857.  
  858. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  859.  
  860. // Import the pattern
  861. -#exec PATTERN IMPORT PATTERN=IncendioPattern FILE=Patterns/Incendio.hpg
  862. +#exec PATTERN IMPORT PATTERN=IncendioPattern FILE=Patterns\IncendioPattern.hpg
  863.  
  864. // ImpactSound=Sound'HPSounds.magic_sfx.s_spell_Alohomora_hit'
  865. // CastSound=Sound'HPSounds.magic_sfx.s_spell_throw5'
  866. diff --git a/Classes/spellPuffapod.uc b/Classes/spellPuffapod.uc
  867. index 8666afd..9bc1028 100644
  868. --- a/Classes/spellPuffapod.uc
  869. +++ b/Classes/spellPuffapod.uc
  870. @@ -11,7 +11,7 @@ var() float GravityBoost;
  871. var() float LifeTimer;
  872. var() float ExplosionRadius;
  873.  
  874. -#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  875. +#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  876.  
  877. //*********************************************************************************************************
  878. function PostBeginPlay()
  879. diff --git a/Classes/spellRepairo.uc b/Classes/spellRepairo.uc
  880. index f54c500..369932b 100644
  881. --- a/Classes/spellRepairo.uc
  882. +++ b/Classes/spellRepairo.uc
  883. @@ -2,18 +2,18 @@
  884.  
  885. class spellRepairo extends BASESPELL;
  886.  
  887. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  888. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  889. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  890. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  891. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  892. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  893. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  894.  
  895. // Digest and compress the animation data. Must come after the sequence declarations.
  896. // 'VERBOSE' gives more debugging info in UCC.log
  897. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  898. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  899. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  900.  
  901. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  902. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  903.  
  904. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  905.  
  906. diff --git a/Classes/spellTrans.uc b/Classes/spellTrans.uc
  907. index 49258a6..8796c2f 100644
  908. --- a/Classes/spellTrans.uc
  909. +++ b/Classes/spellTrans.uc
  910. @@ -4,7 +4,7 @@
  911. class spellTrans extends baseSpell;
  912.  
  913.  
  914. -#EXEC TEXTURE IMPORT NAME=transSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  915. +#EXEC TEXTURE IMPORT NAME=transSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  916.  
  917. defaultproperties
  918. {
  919. diff --git a/Classes/spellTrollRock.uc b/Classes/spellTrollRock.uc
  920. index 28b714f..2d471ca 100644
  921. --- a/Classes/spellTrollRock.uc
  922. +++ b/Classes/spellTrollRock.uc
  923. @@ -37,7 +37,7 @@ var() float ShadowDrawScaleFactor;
  924.  
  925. var float FloorZ;
  926.  
  927. -#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  928. +#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  929.  
  930. //*********************************************************************************************************
  931. function PostBeginPlay()
  932. diff --git a/Classes/spellVerd.uc b/Classes/spellVerd.uc
  933. index b4cdf4a..1f47bc3 100644
  934. --- a/Classes/spellVerd.uc
  935. +++ b/Classes/spellVerd.uc
  936. @@ -1,18 +1,18 @@
  937. //===============================================================================
  938.  
  939. class spellVerd extends BASESPELL;
  940. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  941. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  942. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  943. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  944. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  945. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  946. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  947.  
  948. // Digest and compress the animation data. Must come after the sequence declarations.
  949. // 'VERBOSE' gives more debugging info in UCC.log
  950. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  951. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  952. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  953.  
  954. -#EXEC TEXTURE IMPORT NAME=verdSpellIcon FILE=..\HPMenu\TEXTURES\HUD\verdSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  955. +#EXEC TEXTURE IMPORT NAME=verdSpellIcon FILE=Textures\Icons\verdSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  956.  
  957. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  958.  
  959. diff --git a/Classes/spellVoldemortStraight.uc b/Classes/spellVoldemortStraight.uc
  960. index bbdb21b..215f4d1 100644
  961. --- a/Classes/spellVoldemortStraight.uc
  962. +++ b/Classes/spellVoldemortStraight.uc
  963. @@ -2,23 +2,23 @@
  964.  
  965. class spellVoldemortStraight extends baseSpell;
  966.  
  967. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  968. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  969. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  970. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  971. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  972. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  973. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  974.  
  975. // Digest and compress the animation data. Must come after the sequence declarations.
  976. // 'VERBOSE' gives more debugging info in UCC.log
  977. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  978. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  979. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  980.  
  981. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  982. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  983.  
  984. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  985.  
  986. // Import the pattern
  987. -#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns/Alohomora.hpg
  988. +#exec PATTERN IMPORT PATTERN=AlohoPattern FILE=Patterns\AlohoPattern.hpg
  989.  
  990. function Touch(Actor Other)
  991. {
  992. diff --git a/Classes/spellVoldemortTracking.uc b/Classes/spellVoldemortTracking.uc
  993. index 17ab503..af5ac4d 100644
  994. --- a/Classes/spellVoldemortTracking.uc
  995. +++ b/Classes/spellVoldemortTracking.uc
  996. @@ -3,9 +3,9 @@
  997.  
  998. class spellVoldemortTracking extends BASESPELL;
  999.  
  1000. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  1001. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  1002. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  1003. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1004. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  1005. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  1006. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  1007.  
  1008. diff --git a/Classes/spelldud.uc b/Classes/spelldud.uc
  1009. index 287fedc..e62ffa8 100644
  1010. --- a/Classes/spelldud.uc
  1011. +++ b/Classes/spelldud.uc
  1012. @@ -2,24 +2,24 @@
  1013.  
  1014. class spelldud extends BASESPELL;
  1015.  
  1016. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  1017. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  1018. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  1019. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1020. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  1021. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  1022. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  1023.  
  1024. // Digest and compress the animation data. Must come after the sequence declarations.
  1025. // 'VERBOSE' gives more debugging info in UCC.log
  1026. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  1027. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  1028. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  1029.  
  1030. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1031. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1032.  
  1033. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  1034.  
  1035.  
  1036. // Import the pattern
  1037. -#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
  1038. +#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
  1039.  
  1040. function PostBeginPlay()
  1041. {
  1042. diff --git a/Classes/spelllumas.uc b/Classes/spelllumas.uc
  1043. index 4d0951c..47d0681 100644
  1044. --- a/Classes/spelllumas.uc
  1045. +++ b/Classes/spelllumas.uc
  1046. @@ -2,24 +2,24 @@
  1047.  
  1048. class spelllumas extends BASESPELL;
  1049.  
  1050. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  1051. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  1052. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  1053. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1054. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  1055. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  1056. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  1057.  
  1058. // Digest and compress the animation data. Must come after the sequence declarations.
  1059. // 'VERBOSE' gives more debugging info in UCC.log
  1060. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  1061. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  1062. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  1063.  
  1064. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1065. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1066.  
  1067. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  1068.  
  1069.  
  1070. // Import the pattern
  1071. -#exec PATTERN IMPORT PATTERN=LumosPattern FILE=Patterns/Lumos.hpg
  1072. +#exec PATTERN IMPORT PATTERN=LumosPattern FILE=Patterns\LumosPattern.hpg
  1073.  
  1074. function PostBeginPlay()
  1075. {
  1076. diff --git a/Classes/spellnone.uc b/Classes/spellnone.uc
  1077. index cb8c4ce..a184898 100644
  1078. --- a/Classes/spellnone.uc
  1079. +++ b/Classes/spellnone.uc
  1080. @@ -2,24 +2,24 @@
  1081.  
  1082. class spellnone extends BASESPELL;
  1083.  
  1084. -#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=models\LevProjectile.PSK LODSTYLE=10
  1085. +#exec MESH MODELIMPORT MESH=SPELLLEVMesh MODELFILE=SkeletalMeshes\SPELLLEVMesh.psk LODSTYLE=10
  1086. #exec MESH ORIGIN MESH=SPELLLEVMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  1087. -#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=models\LevProjectile.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1088. +#exec ANIM IMPORT ANIM=SPELLLEVAnims ANIMFILE=Animations\SPELLLEVAnims.psa IMPORTSEQS=1
  1089. #exec MESHMAP SCALE MESHMAP=SPELLLEVMesh X=2.0 Y=2.0 Z=2.0
  1090. #exec MESH DEFAULTANIM MESH=SPELLLEVMesh ANIM=SPELLLEVAnims
  1091.  
  1092. // Digest and compress the animation data. Must come after the sequence declarations.
  1093. // 'VERBOSE' gives more debugging info in UCC.log
  1094. #exec ANIM DIGEST ANIM=SPELLLEVAnims VERBOSE
  1095. -#exec OBJ LOAD FILE=..\textures\HP_FX.utx PACKAGE=HPBase.FXPackage
  1096. +#exec OBJ LOAD FILE=Textures\FXPackage.utx PACKAGE=HPBase.FXPackage
  1097.  
  1098. -#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\alohSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1099. +#EXEC TEXTURE IMPORT NAME=alohoSpellIcon FILE=Textures\Icons\alohoSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1100.  
  1101. #EXEC MESHMAP SETTEXTURE MESHMAP=SPELLLEVMesh NUM=0 TEXTURE=HPBase.FXPackage.win_p
  1102.  
  1103.  
  1104. // Import the pattern
  1105. -#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns/Flipendo.hpg
  1106. +#exec PATTERN IMPORT PATTERN=FlipPattern FILE=Patterns\FlipPattern.hpg
  1107.  
  1108. function PostBeginPlay()
  1109. {
  1110. diff --git a/Classes/spellpeevesthrow.uc b/Classes/spellpeevesthrow.uc
  1111. index f993db1..71970b0 100644
  1112. --- a/Classes/spellpeevesthrow.uc
  1113. +++ b/Classes/spellpeevesthrow.uc
  1114. @@ -1,9 +1,9 @@
  1115. class spellpeevesthrow extends BASESPELL;
  1116.  
  1117.  
  1118. -#exec MESH MODELIMPORT MESH=PeeveThrowAppleMesh MODELFILE=..\hprops\models\PeeveThrowApple.PSK LODSTYLE=10
  1119. +#exec MESH MODELIMPORT MESH=PeeveThrowAppleMesh MODELFILE=SkeletalMeshes\PeeveThrowAppleMesh.psk LODSTYLE=10
  1120. #exec MESH ORIGIN MESH=PeeveThrowAppleMesh X=0 Y=0 Z=0 YAW=0 PITCH=0 ROLL=0
  1121. -#exec ANIM IMPORT ANIM=PeeveThrowAppleAnims ANIMFILE=..\hprops\models\PeeveThrowApple.PSA COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1122. +#exec ANIM IMPORT ANIM=PeeveThrowAppleAnims ANIMFILE=Animations\PeeveThrowAppleAnims.psa COMPRESS=1 MAXKEYS=999999 IMPORTSEQS=1
  1123. #exec MESHMAP SCALE MESHMAP=PeeveThrowAppleMesh X=1.0 Y=1.0 Z=1.0
  1124. #exec MESH DEFAULTANIM MESH=PeeveThrowAppleMesh ANIM=PeeveThrowAppleAnims
  1125.  
  1126. @@ -11,7 +11,7 @@ class spellpeevesthrow extends BASESPELL;
  1127. // 'VERBOSE' gives more debugging info in UCC.log
  1128. #exec ANIM DIGEST ANIM=PeeveThrowAppleAnims VERBOSE
  1129.  
  1130. -#EXEC TEXTURE IMPORT NAME=PeeveThrowAppleTex0 FILE=..\hprops\TEXTURES\pveapple_64.bmp GROUP=Skins
  1131. +#EXEC TEXTURE IMPORT NAME=PeeveThrowAppleTex0 FILE=Textures\Skins\PeeveThrowAppleTex0.bmp GROUP=Skins
  1132.  
  1133. #EXEC MESHMAP SETTEXTURE MESHMAP=PeeveThrowAppleMesh NUM=0 TEXTURE=PeeveThrowAppleTex0
  1134.  
  1135. @@ -25,7 +25,7 @@ var float wallTime;
  1136. var float BaseOffset;
  1137. var vector PreviousLocation;
  1138.  
  1139. -#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=..\HPMenu\TEXTURES\HUD\transSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1140. +#EXEC TEXTURE IMPORT NAME=ectoSpellIcon FILE=Textures\Icons\defaultSpellIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
  1141.  
  1142. function PostBeginPlay()
  1143. {
  1144. diff --git a/Classes/transHitEffect.uc b/Classes/transHitEffect.uc
  1145. index c338e59..7204c1d 100644
  1146. --- a/Classes/transHitEffect.uc
  1147. +++ b/Classes/transHitEffect.uc
  1148. @@ -1,14 +1,14 @@
  1149. class transHitEffect expands baseVisualEffect;
  1150.  
  1151.  
  1152. -#exec MESH IMPORT MESH=Tele2 ANIVFILE=MODELS\Tele2_a.3d DATAFILE=MODELS\Tele2_d.3d X=0 Y=0 Z=0
  1153. +#exec MESH IMPORT MESH=Tele2 ANIVFILE=Meshes\Tele2_a.3d DATAFILE=Meshes\Tele2_d.3d X=0 Y=0 Z=0
  1154.  
  1155. #exec MESH SEQUENCE MESH=Tele2 SEQ=All STARTFRAME=0 NUMFRAMES=100
  1156. #exec MESH SEQUENCE MESH=Tele2 SEQ=Teleport STARTFRAME=0 NUMFRAMES=100
  1157. #exec MESHMAP NEW MESHMAP=Tele2 MESH=Tele2
  1158. #exec MESHMAP SCALE MESHMAP=Tele2 X=0.1 Y=0.1 Z=0.2
  1159.  
  1160. -#exec TEXTURE IMPORT NAME=JTele2_01 FILE=Textures\Trail.PCX GROUP=Skins
  1161. +#exec TEXTURE IMPORT NAME=JTele2_01 FILE=Textures\Skins\JTele2_01.bmp GROUP=Skins
  1162. #exec MESHMAP SETTEXTURE MESHMAP=Tele2 NUM=1 TEXTURE=JTele2_01
  1163.  
  1164.  
  1165. diff --git a/Meshes/BioGelm_a.3d b/Meshes/BioGelm_a.3d
  1166. index 447ff22..2f9f2aa 100644
  1167. Binary files a/Meshes/BioGelm_a.3d and b/Meshes/BioGelm_a.3d differ
  1168. diff --git a/Meshes/BioGelm_d.3d b/Meshes/BioGelm_d.3d
  1169. index 2557804..0bd0783 100644
  1170. Binary files a/Meshes/BioGelm_d.3d and b/Meshes/BioGelm_d.3d differ
  1171. diff --git a/Meshes/Tele2_a.3d b/Meshes/Tele2_a.3d
  1172. index e7ad51a..41a0dd0 100644
  1173. Binary files a/Meshes/Tele2_a.3d and b/Meshes/Tele2_a.3d differ
  1174. diff --git a/Meshes/Tele2_d.3d b/Meshes/Tele2_d.3d
  1175. index 9a4789c..8e7330e 100644
  1176. Binary files a/Meshes/Tele2_d.3d and b/Meshes/Tele2_d.3d differ
  1177. diff --git a/Meshes/spellProj_a.3d b/Meshes/spellProj_a.3d
  1178. index 195c226..2e1495a 100644
  1179. Binary files a/Meshes/spellProj_a.3d and b/Meshes/spellProj_a.3d differ
  1180. diff --git a/Meshes/spellProj_d.3d b/Meshes/spellProj_d.3d
  1181. index d76b008..549db99 100644
  1182. Binary files a/Meshes/spellProj_d.3d and b/Meshes/spellProj_d.3d differ
  1183. diff --git a/SkeletalMeshes/FireSeedMesh.psk b/SkeletalMeshes/FireSeedMesh.psk
  1184. index 0d202dd..0bba945 100644
  1185. Binary files a/SkeletalMeshes/FireSeedMesh.psk and b/SkeletalMeshes/FireSeedMesh.psk differ
  1186. diff --git a/SkeletalMeshes/ModTarget1Mesh.psk b/SkeletalMeshes/ModTarget1Mesh.psk
  1187. index a98342b..f64365f 100644
  1188. Binary files a/SkeletalMeshes/ModTarget1Mesh.psk and b/SkeletalMeshes/ModTarget1Mesh.psk differ
  1189. diff --git a/SkeletalMeshes/NullMeshMesh.psk b/SkeletalMeshes/NullMeshMesh.psk
  1190. index 3fa8f1a..1023149 100644
  1191. Binary files a/SkeletalMeshes/NullMeshMesh.psk and b/SkeletalMeshes/NullMeshMesh.psk differ
  1192. diff --git a/SkeletalMeshes/PeeveThrowAppleMesh.psk b/SkeletalMeshes/PeeveThrowAppleMesh.psk
  1193. index 6e6007a..c94fd66 100644
  1194. Binary files a/SkeletalMeshes/PeeveThrowAppleMesh.psk and b/SkeletalMeshes/PeeveThrowAppleMesh.psk differ
  1195. diff --git a/SkeletalMeshes/SPELLLEVMesh.psk b/SkeletalMeshes/SPELLLEVMesh.psk
  1196. index 4be9c9a..872a165 100644
  1197. Binary files a/SkeletalMeshes/SPELLLEVMesh.psk and b/SkeletalMeshes/SPELLLEVMesh.psk differ
  1198. diff --git a/SkeletalMeshes/WandMesh.psk b/SkeletalMeshes/WandMesh.psk
  1199. index 4833ff4..3c562c3 100644
  1200. Binary files a/SkeletalMeshes/WandMesh.psk and b/SkeletalMeshes/WandMesh.psk differ
  1201. diff --git a/SkeletalMeshes/levhiteffectMesh.psk b/SkeletalMeshes/levhiteffectMesh.psk
  1202. index 8574f3c..2c918ab 100644
  1203. Binary files a/SkeletalMeshes/levhiteffectMesh.psk and b/SkeletalMeshes/levhiteffectMesh.psk differ