diff --git a/Makefile b/Makefile index 37beccc..944abf8 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,12 @@ plugin/Data/Scripts/%.pex: Source/Scripts/%.psc "$(SKYRIM_BASE)/Papyrus Compiler/PapyrusCompiler.exe" \ "$(current_dir)/$^" \ "-f=$(SKYRIM_BASE)/Data/Source/Scripts/TESV_Papyrus_Flags.flg" \ - "-i=$(SKYRIM_BASE)/Data/Source/Scripts;$(current_dir)/Source/Scripts" \ + "-i=$(SKYRIM_BASE)/Data/Source/Scripts;$(SKYRIM_BASE)/Data/Scripts/Source;$(current_dir)/Source/Scripts" \ "-o=$(dir $(current_dir)/$@)" textures: $(textureFiles) -plugin/Data/Textures/_EQ_ItemRoulette/%.dds: Source/Textures/_EQ_ItemRoulette/%.xcf +plugin/Data/Textures/_EQ_ItemRoulette/%.dds: Source/Textures/_EQ_ItemRoulette/%.xcf export_gimp_textures.py GIMP=$$(powershell -Command '(Get-Item "$(ProgramW6432)/GIMP*/bin/gimp-console*.exe").FullName') "$$GIMP" -n -i --batch-interpreter python-fu-eval -b 'import export_gimp_textures ; export_gimp_textures.main("$<", "$@")' @@ -100,10 +100,12 @@ plugin/Data/Meshes/_EQ_ItemRoulette/%_final.nif: Source/Meshes/_EQ_ItemRoulette/ build/ChunkMerge/ChunkMerge.exe & powershell -Command '$$env:ChunkMerge_NifFile=Split-Path (Join-Path "$@" "."); $$env:ChunkMerge_CollisionFile=Split-Path (Join-Path "$(filter %_collision.nif,$^)" ".") ; $$env:ChunkMerge_TemplateFile="$(notdir $(filter %_template.nif,$^))" ; Start-Process -Wait -FilePath AutoHotKey -ArgumentList @("ChunkMerge.ahk") ; Stop-Process -Name ChunkMerge' +.PRECIOUS: plugin/Data/Meshes/_EQ_ItemRoulette/%_mesh.nif plugin/Data/Meshes/_EQ_ItemRoulette/%_mesh.nif: Source/Meshes/_EQ_ItemRoulette/%_mesh.blend BLENDER=$$(powershell -Command '(Get-Item "$(ProgramW6432)/Blender*/Blender*/blender.exe").FullName') "$$BLENDER" --background --python "./export_blender_models.py" -- "$^" "$@" +.PRECIOUS: plugin/Data/Meshes/_EQ_ItemRoulette/%_collision.nif plugin/Data/Meshes/_EQ_ItemRoulette/%_collision.nif: Source/Meshes/_EQ_ItemRoulette/%_collision.blend BLENDER=$$(powershell -Command '(Get-Item "$(ProgramW6432)/Blender*/Blender*/blender.exe").FullName') "$$BLENDER" --background --python "./export_blender_models.py" -- "$^" "$@" \ No newline at end of file diff --git a/Source/Meshes/_EQ_ItemRoulette/roulette_container_mesh.blend b/Source/Meshes/_EQ_ItemRoulette/roulette_container_mesh.blend index 2da1e05..4682687 100644 Binary files a/Source/Meshes/_EQ_ItemRoulette/roulette_container_mesh.blend and b/Source/Meshes/_EQ_ItemRoulette/roulette_container_mesh.blend differ diff --git a/Source/Scripts/_EQ_ItemRoulette_Quest.psc b/Source/Scripts/_EQ_ItemRoulette_Quest.psc index d93359a..2375d32 100644 --- a/Source/Scripts/_EQ_ItemRoulette_Quest.psc +++ b/Source/Scripts/_EQ_ItemRoulette_Quest.psc @@ -7,9 +7,10 @@ ObjectReference[] DisplayItems ObjectReference Roulette Int MAX_ITEMS = 5 -Float UI_DISTANCE = 32.0 +Float UI_DISTANCE = 48.0 Float UI_DEGREES = 7.0 Float UI_ZEES = 4.0 +Float UI_ITEM_SCALE = 0.2 Event OnInit() DisplayItems = New ObjectReference[127] @@ -36,11 +37,11 @@ Event OnUpdate() Float handZ = VRIK.VrikGetHandZ(true) Float playerAngle = PlayerRef.GetAngleZ() - Roulette.MoveTo(PlayerRef, UI_DISTANCE * Math.sin(playerAngle), UI_DISTANCE * Math.cos(playerAngle), VRIK.VrikGetHmdZ(), true) + Roulette.TranslateTo(PlayerRef.X + UI_DISTANCE * Math.sin(playerAngle), PlayerRef.Y + UI_DISTANCE * Math.cos(playerAngle), VRIK.VrikGetHmdZ(), 0, 0, playerAngle, 1000) Int index = 0 While index < MAX_ITEMS && DisplayItems[index] != None - ; TLRB + ; T-LCR-B Float top = 0 Float left = 0 If index == 0 @@ -72,7 +73,7 @@ Event OnMyAction(string eventName, string strArg, float numArg, Form sender) count = numItems - formIndex Form invItem = PlayerRef.GetNthForm(formIndex) ObjectReference invItemInst = PlayerRef.DropObject(invItem) - invItemInst.SetScale(0.1) + invItemInst.SetScale(UI_ITEM_SCALE) invItemInst.SetMotionType(invItemInst.Motion_Keyframed) DisplayItems[count - 1] = invItemInst EndWhile diff --git a/Source/Textures/_EQ_ItemRoulette/roulette_container.xcf b/Source/Textures/_EQ_ItemRoulette/roulette_container.xcf index 2bd8f0d..34dd0d2 100644 Binary files a/Source/Textures/_EQ_ItemRoulette/roulette_container.xcf and b/Source/Textures/_EQ_ItemRoulette/roulette_container.xcf differ diff --git a/export_gimp_textures.py b/export_gimp_textures.py index d2495e2..960a5f9 100644 --- a/export_gimp_textures.py +++ b/export_gimp_textures.py @@ -21,7 +21,7 @@ def main(xcf_path, dds_path): pdb.file_dds_save( image, # (13, 'image', 'Input image'), - image.flatten(), + pdb.gimp_image_merge_visible_layers(image, 1), # (16, 'drawable', 'Drawable to save'), dds_path, # (4, 'filename', 'The name of the file to save the image as'),