From 3736bde45a21d9e0eff8b92d6379270f8aa027f8 Mon Sep 17 00:00:00 2001
From: NightFox <nightfox@dev.null>
Date: Fri, 10 Nov 2023 15:22:16 +0300
Subject: [PATCH] add new rock texture, update materials

---
 .../halflife.wad/+LASER1FALL/+LASER1FALL.mat  | 25 +++++++++++--------
 .../-[OUT_RK]/-OUT_RK3/-0OUT_RK3.old.png      |  3 +++
 .../-[OUT_RK]/-OUT_RK3/-0OUT_RK3.png          |  4 +--
 .../-[OUT_RK]/-OUT_RK3/-0OUT_RK3_normal.png   |  3 +++
 .../-[OUT_RK]/-OUT_RK3/-OUT_RK3.mat           | 22 +++++++++++-----
 valve/pbr/halflife.wad/halflife.mat           |  1 +
 6 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.old.png
 create mode 100644 valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3_normal.png

diff --git a/valve/pbr/halflife.wad/+LASER1FALL/+LASER1FALL.mat b/valve/pbr/halflife.wad/+LASER1FALL/+LASER1FALL.mat
index c565012..1df628a 100644
--- a/valve/pbr/halflife.wad/+LASER1FALL/+LASER1FALL.mat
+++ b/valve/pbr/halflife.wad/+LASER1FALL/+LASER1FALL.mat
@@ -1,44 +1,49 @@
+// FIXME: change rendermode
 {
 "new" "generic_laser1fall"
-"base_color" "1 1 1 0.5"
+"basecolor_map" "/colors/white.png"
+"base_color" "1 1 1 0.1"
 "metalness" "0.5"
 "roughness" "0.1"
 }
 
-// FIXME: change rendermode
 {
 "for" "+0LASER1FALL"
-//"basecolor_map" "+0LASER1FALL.png"
+"inherit" "generic_laser1fall"
+"basecolor_map" "+0LASER1FALL.png"
+"base_color" "1 1 1 0.1"
 //"normal_map" "+0LASER1FALL_normal.png"
 //"metal_map" "+0LASER1FALL_metal.png"
 //"roughness_map" "+0LASER1FALL_roughness.png"
 //"basecolor_map" "/colors/white.png"
-"inherit" "generic_laser1fall"
 }
 
 {
 "for" "+1LASER1FALL"
-//"basecolor_map" "+1LASER1FALL.png"
+"inherit" "generic_laser1fall"
+"basecolor_map" "+1LASER1FALL.png"
+"base_color" "1 1 1 0.1"
 //"normal_map" "+1LASER1FALL_normal.png"
 //"metal_map" "+1LASER1FALL_metal.png"
 //"roughness_map" "+1LASER1FALL_roughness.png"
-"inherit" "generic_laser1fall"
 }
 
 {
 "for" "+2LASER1FALL"
-//"basecolor_map" "+2LASER1FALL.png"
+"inherit" "generic_laser1fall"
+"basecolor_map" "+2LASER1FALL.png"
+"base_color" "1 1 1 0.1"
 //"normal_map" "+2LASER1FALL_normal.png"
 //"metal_map" "+2LASER1FALL_metal.png"
 //"roughness_map" "+2LASER1FALL_roughness.png"
-"inherit" "generic_laser1fall"
 }
 
 {
 "for" "+3LASER1FALL"
-//"basecolor_map" "+3LASER1FALL.png"
+"inherit" "generic_laser1fall"
+"basecolor_map" "+3LASER1FALL.png"
+"base_color" "1 1 1 0.1"
 //"normal_map" "+3LASER1FALL_normal.png"
 //"metal_map" "+3LASER1FALL_metal.png"
 //"roughness_map" "+3LASER1FALL_roughness.png"
-"inherit" "generic_laser1fall"
 }
diff --git a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.old.png b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.old.png
new file mode 100644
index 0000000..5cab040
--- /dev/null
+++ b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.old.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2164866e99837bf9739748f2895ba042f5770ab11718959b6981841864071b9
+size 780650
diff --git a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.png b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.png
index 5cab040..8ae2c1b 100644
--- a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.png
+++ b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2164866e99837bf9739748f2895ba042f5770ab11718959b6981841864071b9
-size 780650
+oid sha256:1be1ec28f91f55a440ef0c3ed6fe012f6984c7e4ede16c3f00ef7c7942085c79
+size 2009481
diff --git a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3_normal.png b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3_normal.png
new file mode 100644
index 0000000..a7d17c1
--- /dev/null
+++ b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-0OUT_RK3_normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d625d6d7931d4e82e49d0a90303fe26f8ccfcad960213b4be3c29d09f12bc4b0
+size 2225994
diff --git a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-OUT_RK3.mat b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-OUT_RK3.mat
index 150d239..c5add0b 100644
--- a/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-OUT_RK3.mat
+++ b/valve/pbr/halflife.wad/-[OUT_RK]/-OUT_RK3/-OUT_RK3.mat
@@ -1,8 +1,14 @@
-
+{ // TODO: more textures
+"new" "generic_rock1"
+"basecolor_map" "-0OUT_RK3.png"
+//"basecolor_map" "/colors/white.png"
+"normal_map" "-0OUT_RK3_normal.png"
+}
 {
 "for" "-0OUT_RK3"
 //"force_reload" "1"
-"basecolor_map" "-0OUT_RK3.png"
+//"basecolor_map" "-0OUT_RK3.png"
+"inherit" "generic_rock1"
 //"normal_map" "-0OUT_RK3_normal.png"
 //"normal_map" "-1OUT_RK3-1xTexnorm.png"
 //"metal_map" "-0OUT_RK3_metal.png"
@@ -14,7 +20,8 @@
 {
 "for" "-1OUT_RK3"
 //"force_reload" "1"
-"basecolor_map" "-1OUT_RK3.png"
+//"basecolor_map" "-1OUT_RK3.png"
+"inherit" "generic_rock1"
 //"normal_map" "-1OUT_RK3_normal.png"
 //"metal_map" "-1OUT_RK3_metal.png"
 //"roughness_map" "-1OUT_RK3_roughness.png"
@@ -25,7 +32,8 @@
 {
 "for" "-2OUT_RK3"
 //"force_reload" "1"
-"basecolor_map" "-2OUT_RK3.png"
+//"basecolor_map" "-2OUT_RK3.png"
+"inherit" "generic_rock1"
 //"normal_map" "-2OUT_RK3_normal.png"
 //"metal_map" "-2OUT_RK3_metal.png"
 //"roughness_map" "-2OUT_RK3_roughness.png"
@@ -36,7 +44,8 @@
 {
 "for" "-3OUT_RK3"
 //"force_reload" "1"
-"basecolor_map" "-3OUT_RK3.png"
+//"basecolor_map" "-3OUT_RK3.png"
+"inherit" "generic_rock1"
 //"normal_map" "-3OUT_RK3_normal.png"
 //"metal_map" "-3OUT_RK3_metal.png"
 //"roughness_map" "-3OUT_RK3_roughness.png"
@@ -47,7 +56,8 @@
 {
 "for" "-4OUT_RK3"
 //"force_reload" "1"
-"basecolor_map" "-4OUT_RK3.png"
+//"basecolor_map" "-4OUT_RK3.png"
+"inherit" "generic_rock1"
 //"normal_map" "-4OUT_RK3_normal.png"
 //"metal_map" "-4OUT_RK3_metal.png"
 //"roughness_map" "-4OUT_RK3_roughness.png"
diff --git a/valve/pbr/halflife.wad/halflife.mat b/valve/pbr/halflife.wad/halflife.mat
index 6bf8971..fe6f253 100644
--- a/valve/pbr/halflife.wad/halflife.mat
+++ b/valve/pbr/halflife.wad/halflife.mat
@@ -7512,6 +7512,7 @@ include "-[~LIGHT]/-[~LIGHT].mat"
 {
 "for" "LAB1_BRD3C"
 //"basecolor_map" "LAB1_BRD3C.png"
+//"basecolor_map" "/colors/white.png"
 //"base_color" "1.5 1.5 1.5"
 //"normal_map" "LAB1_BRD3C_normal.png"
 //"metal_map" "LAB1_BRD3C_metal.png"