From b737f3a84ef32a57f878c3161405d7c33d98a012 Mon Sep 17 00:00:00 2001
From: James Lambert <lambertjamesd@gmail.com>
Date: Thu, 19 Oct 2023 21:33:39 -0600
Subject: [PATCH] Use symbolic link to portal instead of copying individual
 files

---
 Makefile            | 10 ++++++----
 vpk/add_vpk_here.md | 40 ++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 5a14ba9..0cb401b 100644
--- a/Makefile
+++ b/Makefile
@@ -149,10 +149,10 @@ src/models/sphere.h src/models/sphere_geo.inc.h: assets/fbx/Sphere.fbx
 ## vpk extraction
 ####################
 
-portal_pak_dir: vpk/portal_pak_dir.vpk
-	vpk -x portal_pak_dir vpk/portal_pak_dir.vpk
-	vpk -x portal_pak_dir vpk/hl2_sound_misc_dir.vpk
-	vpk -x portal_pak_dir vpk/hl2_misc_dir.vpk
+portal_pak_dir: vpk/Portal/portal/portal_pak_dir.vpk
+	vpk -x portal_pak_dir vpk/Portal/portal/portal_pak_dir.vpk
+	vpk -x portal_pak_dir vpk/Portal/hl2/hl2_sound_misc_dir.vpk
+	vpk -x portal_pak_dir vpk/Portal/hl2/hl2_misc_dir.vpk
 
 TEXTURE_SCRIPTS = $(shell find assets/ -type f -name '*.ims')
 TEXTURE_IMAGES = $(TEXTURE_SCRIPTS:assets/%.ims=portal_pak_modified/%.png) \
@@ -478,6 +478,8 @@ build/src/decor/decor_object_list.o: build/src/audio/clips.h
 ## Subtitles
 ####################
 
+# TODO pull translations from vpk/Portal/portal/resource once the translations are loaded dynamically
+
 build/src/audio/subtitles.h build/src/audio/subtitles.c: resource/closecaption_english.txt tools/level_scripts/subtitle_generate.py 
 	@python3 tools/level_scripts/subtitle_generate.py
 
diff --git a/vpk/add_vpk_here.md b/vpk/add_vpk_here.md
index d79b873..79edfae 100644
--- a/vpk/add_vpk_here.md
+++ b/vpk/add_vpk_here.md
@@ -1,28 +1,9 @@
 # Source Portal Files
 
-- Copy `portal_pak` files commonly found in `SteamLibrary\steamapps\common\Portal\portal` to this directory
-  ```
-  portal_pak_000.vpk  
-  portal_pak_001.vpk  
-  portal_pak_002.vpk  
-  portal_pak_003.vpk  
-  portal_pak_004.vpk  
-  portal_pak_005.vpk  
-  portal_pak_dir.vpk
-  ```
-- Copy `hl2_*_misc` files commonly found in `SteamLibrary\steamapps\common\Portal\hl2` to this directory
-  ```
-  hl2_sound_misc_000.vpk
-  hl2_sound_misc_001.vpk
-  hl2_sound_misc_002.vpk
-  hl2_sound_misc_dir.vpk
+Copy the entire Portal folder, or create a symbolic link, in this folder
+
+`ln -s SteamLibrary\steamapps\common\Portal\ Portal`
 
-  hl2_misc_000.vpk
-  hl2_misc_001.vpk
-  hl2_misc_002.vpk
-  hl2_misc_003.vpk
-  hl2_misc_dir.vpk
-  ```
 - If you want multi-language support, copy `portal_sound_vo_*.vpk` files commonly found in `SteamLibrary\steamapps\common\Portal\` to this directory
   - German:
   ```
@@ -47,3 +28,18 @@
   portal/portal_sound_vo_spanish_000.vpk
   portal/portal_sound_vo_spanish_dir.vpk
   ```
+
+The end results should be a folder structure like this
+
+```
+vpk/
+  Portal/ -- symbolic link to Portal
+  portal_sound_vo_german_000.vpk
+  portal_sound_vo_german_dir.vpk
+  portal_sound_vo_french_000.vpk
+  portal_sound_vo_french_dir.vpk
+  portal/portal_sound_vo_russian_000.vpk
+  portal/portal_sound_vo_russian_dir.vpk
+  portal/portal_sound_vo_spanish_000.vpk
+  portal/portal_sound_vo_spanish_dir.vpk
+```
\ No newline at end of file