The conversion of base items is complete.

gldefs.pickups

@@ -65,16 +65,40 @@ Brightmap Texture "models/GhostArtifact.png"
 	Map "models/GhostArtifact_bright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/GhostArtifact.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/GhostArtifact_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
+}
 Brightmap Texture "models/Gravity.png"
 {
 	Map "models/Gravity_bright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/Gravity.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Gravity_mask.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+}
 Brightmap Texture "models/Ragekit.png"
 {
 	Map "models/Ragekit_bright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/Ragekit.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Ragekit_mask.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+}
 Brightmap Texture "models/Omnisight.png"
 {
 	Map "models/Omnisight_bright.png"
@@ -85,11 +109,35 @@ Brightmap Texture "models/Lamp.png"
 	Map "models/Lamp_bright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/Lamp.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Lamp_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/Lamp_off.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Lamp_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
+}
 Brightmap Texture "models/Invinciball.png"
 {
 	Map "brightmaps/nobright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/Invinciball.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Invinciball_mask.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+}
 Brightmap Texture "models/Moth_Mashiro.png"
 {
 	Map "models/Moth_Mashiro_bright.png"
@@ -99,6 +147,14 @@ Brightmap Texture "models/Barrier.png"
 	Map "models/Barrier_bright.png"
 	DisableFullbright
 }
+HardwareShader Texture "models/Barrier.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/Barrier_mask.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+}
 HardwareShader Sprite "MKRVA0"
 {
 	Shader "shaders/glsl/Mykradvo.fp"
@@ -150,7 +206,8 @@ HardwareShader Texture "models/SafetyTether.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT" = ".8"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/SafetyTether_off.png"
 {
@@ -159,7 +216,8 @@ HardwareShader Texture "models/SafetyTether_off.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT" = ".8"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = ".8"
 }
 
 PointLight ARMORNUGGETLIGHT

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r633 \cu(Fri 25 Nov 23:39:29 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r633 \cu(2022-11-25 23:39:29)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r634 \cu(Sat 26 Nov 03:04:30 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r634 \cu(2022-11-26 03:04:30)\c-";

modeldef.collectibles

@@ -40,9 +40,9 @@ Model "NutatcoBar"
 {
 	Path "models"
 
-	Model 0 "Nutatco_d.3d"
+	Model 0 "Nutatco.iqm"
 	Skin 0 "Nutatco.png"
-	Scale 0.018 0.018 0.018
+	Scale 4 4 4
 	ZOffset 16
 	PitchOffset -60
 	RollOffset 90
@@ -54,10 +54,11 @@ Model "FrispyCorn"
 {
 	Path "models"
 
-	Model 0 "FrispyCorn_d.3d"
+	Model 0 "FrispyCorn.iqm"
 	Skin 0 "FrispyCorn.png"
-	Scale 0.025 0.025 0.025
+	Scale 6 6 6
 	ZOffset 16
+	AngleOffset -90
 	RollOffset 30
 	ROTATING
 
@@ -67,9 +68,9 @@ Model "SayaBean"
 {
 	Path "models"
 
-	Model 0 "SayaBean_d.3d"
+	Model 0 "SayaBean.iqm"
 	Skin 0 "SayaBean.png"
-	Scale 0.025 0.025 0.025
+	Scale 6 6 6
 	ZOffset 16
 	RollOffset 30
 	ROTATING
@@ -80,9 +81,9 @@ Model "MothPlushy"
 {
 	Path "models"
 
-	Model 0 "MothPlush_d.3d"
+	Model 0 "MothPlush.iqm"
 	Skin 0 "MothPlush.png"
-	Scale 0.06 0.06 0.06
+	Scale 15 15 15
 	ZOffset 20
 	RollOffset 30
 	ROTATING
@@ -93,9 +94,9 @@ Model "SayasMug"
 {
 	Path "models"
 
-	Model 0 "SayasMug_d.3d"
+	Model 0 "SayasMug.iqm"
 	Skin 0 "SayasMug.png"
-	Scale 0.02 0.02 0.02
+	Scale 50 50 50
 	ZOffset 16
 	AngleOffset 90
 	PitchOffset 30
@@ -107,10 +108,10 @@ Model "DemoPlush"
 {
 	Path "models"
 
-	Model 0 "DemoPlush_d.3d"
+	Model 0 "DemoPlush.iqm"
 	SurfaceSkin 0 0 "DemoPlush.png"
 	SurfaceSkin 0 1 "DemoPlush2.png"
-	Scale 0.075 0.075 0.075
+	Scale 15 15 15
 	ZOffset 20
 	RollOffset 30
 	ROTATING
@@ -121,10 +122,10 @@ Model "KirinCummies"
 {
 	Path "models"
 
-	Model 0 "TootFroot_d.3d"
+	Model 0 "TootFroot.iqm"
 	SurfaceSkin 0 0 "TootFroot.png"
 	SurfaceSkin 0 1 "envmap/silverenv.png"
-	Scale 0.015 0.015 0.015
+	Scale 4 4 4
 	ZOffset 16
 	PitchOffset 30
 	ROTATING
@@ -135,9 +136,9 @@ Model "MilkBreads"
 {
 	Path "models"
 
-	Model 0 "MilkBreads_d.3d"
+	Model 0 "MilkBreads.iqm"
 	Skin 0 "MilkBreads.png"
-	Scale 0.016 0.016 0.016
+	Scale 4 4 4
 	ZOffset 16
 	ROTATING
 
@@ -160,9 +161,9 @@ Model "KirinPlush"
 {
 	Path "models"
 
-	Model 0 "KirinPlush_d.3d"
+	Model 0 "KirinPlush.iqm"
 	Skin 0 "KirinPlush.png"
-	Scale 0.08 0.08 0.08
+	Scale 40 40 40
 	ZOffset 20
 	RollOffset 30
 	ROTATING

modeldef.demolitionist

@@ -543,9 +543,10 @@ Model "Demolitionist"
 Model "SWWMVoodooDoll"
 {
 	Path "models"
-	Model 0 "VoodooDoll_d.3d"
+	Model 0 "VoodooDoll.iqm"
+	Animation 0 "VoodooDoll.iqm"
 	SurfaceSkin 0 0 "VoodooDoll.png"
-	Scale 0.0025 0.0025 0.0025
+	Scale 40.96 40.96 40.96
 	AngleOffset -90
 	IGNORETRANSLATION
 

modeldef.keys

@@ -212,9 +212,9 @@ Model "SWWMFakePurpleSkull"
 Model "SWWMKeyGreen"
 {
 	Path "models"
-	Model 0 "HereticGreenKey_d.3d"
+	Model 0 "HereticGreenKey.iqm"
 	Skin 0 "envmap/greenenv.png"
-	Scale 0.05 0.05 0.05
+	Scale 10 10 10
 	RollOffset 15
 	ZOffset 16
 	ROTATING
@@ -224,9 +224,9 @@ Model "SWWMKeyGreen"
 Model "SWWMKeyBlue"
 {
 	Path "models"
-	Model 0 "HereticBlueKey_d.3d"
+	Model 0 "HereticBlueKey.iqm"
 	Skin 0 "envmap/bluenv.png"
-	Scale 0.04 0.04 0.04
+	Scale 10 10 10
 	RollOffset 15
 	ZOffset 16
 	ROTATING
@@ -236,9 +236,9 @@ Model "SWWMKeyBlue"
 Model "SWWMKeyYellow"
 {
 	Path "models"
-	Model 0 "HereticYellowKey_d.3d"
+	Model 0 "HereticYellowKey.iqm"
 	Skin 0 "envmap/goldenv.png"
-	Scale 0.05 0.05 0.05
+	Scale 10 10 10
 	RollOffset 15
 	ZOffset 16
 	ROTATING
@@ -248,9 +248,9 @@ Model "SWWMKeyYellow"
 Model "SWWMKeyRed"
 {
 	Path "models"
-	Model 0 "HereticRedKey_d.3d"
+	Model 0 "HereticRedKey.iqm"
 	Skin 0 "envmap/redenv.png"
-	Scale 0.05 0.05 0.05
+	Scale 10 10 10
 	RollOffset 15
 	ZOffset 16
 	ROTATING

modeldef.pickups

@@ -62,9 +62,9 @@ Model "CubeHealthItem"
 Model "RefresherItem"
 {
 	Path "models"
-	Model 0 "Refresher_d.3d"
+	Model 0 "Refresher.iqm"
 	Skin 0 "Refresher.png"
-	Scale 0.04 0.04 0.04
+	Scale 10 10 10
 	ZOffset 16
 	RollOffset 30
 	ROTATING
@@ -87,9 +87,9 @@ Model "BlastSuitItem"
 Model "WarArmorItem"
 {
 	Path "models"
-	Model 0 "WarArmor_d.3d"
+	Model 0 "WarArmor.iqm"
 	Skin 0 "WarArmor.png"
-	Scale 0.07 0.07 0.07
+	Scale 18 18 18
 	ZOffset 20
 	ROTATING
 
@@ -99,10 +99,10 @@ Model "WarArmorItem"
 Model "GrilledCheeseSandwich"
 {
 	Path "models"
-	Model 0 "Sandwich_d.3d"
+	Model 0 "Sandwich.iqm"
 	SurfaceSkin 0 0 "envmap/goldenv.png"
 	SurfaceSkin 0 1 "Sandwich.png"
-	Scale 0.04 0.04 0.04
+	Scale 10 10 10
 	PitchOffset -45
 	ZOffset 16
 	ROTATING
@@ -113,9 +113,9 @@ Model "GrilledCheeseSandwich"
 Model "GhostArtifact"
 {
 	Path "models"
-	Model 0 "GhostArtifact_d.3d"
-	SurfaceSkin 0 1 "GhostArtifact.png"
-	Scale 0.05 0.05 0.05
+	Model 0 "GhostArtifact.iqm"
+	Skin 0 "GhostArtifact.png"
+	Scale 12 12 12
 	ZOffset 16
 	ROTATING
 
@@ -124,9 +124,9 @@ Model "GhostArtifact"
 Model "GhostArtifactX"
 {
 	Path "models"
-	Model 0 "GhostArtifact_d.3d"
-	SurfaceSkin 0 0 "envmap/darkenv.png"
-	Scale 0.05 0.05 0.05
+	Model 0 "GhostArtifactX.iqm"
+	Skin 0 "envmap/darkenv.png"
+	Scale 12 12 12
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
@@ -135,9 +135,9 @@ Model "GhostArtifactX"
 Model "GravitySuppressor"
 {
 	Path "models"
-	Model 0 "Gravity_d.3d"
-	SurfaceSkin 0 0 "Gravity.png"
-	Scale 0.06 0.06 0.06
+	Model 0 "Gravity.iqm"
+	Skin 0 "Gravity.png"
+	Scale 16 16 16
 	ZOffset 16
 	ROTATING
 
@@ -146,9 +146,9 @@ Model "GravitySuppressor"
 Model "GravityX"
 {
 	Path "models"
-	Model 0 "Gravity_d.3d"
-	SurfaceSkin 0 1 "envmap/watrenv.png"
-	Scale 0.06 0.06 0.06
+	Model 0 "GravityX.iqm"
+	Skin 0 "envmap/watrenv.png"
+	Scale 16 16 16
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
@@ -157,9 +157,9 @@ Model "GravityX"
 Model "FuckingInvinciball"
 {
 	Path "models"
-	Model 0 "Invinciball_d.3d"
-	SurfaceSkin 0 0 "Invinciball.png"
-	Scale 0.04 0.04 0.04
+	Model 0 "Invinciball.iqm"
+	Skin 0 "Invinciball.png"
+	Scale 10 10 10
 	ZOffset 16
 	ROTATING
 
@@ -168,9 +168,9 @@ Model "FuckingInvinciball"
 Model "InvinciballX"
 {
 	Path "models"
-	Model 0 "Invinciball_d.3d"
-	SurfaceSkin 0 1 "envmap/redenv.png"
-	Scale 0.04 0.04 0.04
+	Model 0 "InvinciballX.iqm"
+	Skin 0 "envmap/redenv.png"
+	Scale 10 10 10
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
@@ -179,9 +179,9 @@ Model "InvinciballX"
 Model "Ragekit"
 {
 	Path "models"
-	Model 0 "Ragekit_d.3d"
-	SurfaceSkin 0 0 "Ragekit.png"
-	Scale 0.05 0.05 0.05
+	Model 0 "Ragekit.iqm"
+	Skin 0 "Ragekit.png"
+	Scale 12 12 12
 	ZOffset 16
 	ROTATING
 
@@ -190,9 +190,9 @@ Model "Ragekit"
 Model "RagekitX"
 {
 	Path "models"
-	Model 0 "Ragekit_d.3d"
-	SurfaceSkin 0 1 "envmap/lavaenv.png"
-	Scale 0.05 0.05 0.05
+	Model 0 "RagekitX.iqm"
+	Skin 0 "envmap/lavaenv.png"
+	Scale 12 12 12
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
@@ -201,9 +201,9 @@ Model "RagekitX"
 Model "Omnisight"
 {
 	Path "models"
-	Model 0 "Omnisight_d.3d"
+	Model 0 "Omnisight.iqm"
 	Skin 0 "Omnisight.png"
-	Scale 0.04 0.04 0.04
+	Scale 8 8 8
 	RollOffset 30
 	ZOffset 16
 	ROTATING
@@ -214,10 +214,11 @@ Model "Omnisight"
 Model "LampMoth"
 {
 	Path "models"
-	Model 0 "Moth_d.3d"
+	Model 0 "Moth.md3"
 	Skin 0 "Moth.png"
-	Scale 0.005 0.005 0.005
+	Scale 0.008 0.008 0.008
 	ZOffset 0.5
+	AngleOffset -90
 	USEACTORPITCH
 	DONTCULLBACKFACES
 
@@ -227,10 +228,11 @@ Model "LampMoth"
 Model "LampMoth2"
 {
 	Path "models"
-	Model 0 "Moth_d.3d"
+	Model 0 "Moth.md3"
 	Skin 0 "Moth_Mashiro.png"
-	Scale 0.008 0.008 0.008
+	Scale 0.012 0.012 0.012
 	ZOffset 0.5
+	AngleOffset -90
 	USEACTORPITCH
 	DONTCULLBACKFACES
 
@@ -241,9 +243,9 @@ Model "LampMoth2"
 Model "CompanionLamp"
 {
 	Path "models"
-	Model 0 "Lamp_d.3d"
+	Model 0 "Lamp.iqm"
 	Skin 0 "Lamp_off.png"
-	Scale 0.03 0.03 0.03
+	Scale 8 8 8
 	ZOffset 8
 
 	FrameIndex XZW1 A 0 0
@@ -254,9 +256,9 @@ Model "CompanionLamp"
 Model "SWWMLamp"
 {
 	Path "models"
-	Model 0 "Lamp_d.3d"
+	Model 0 "Lamp.iqm"
 	Skin 0 "Lamp_off.png"
-	Scale 0.05 0.05 0.05
+	Scale 12 12 12
 	ZOffset 16
 	ROTATING
 
@@ -303,9 +305,9 @@ Model "SafetyTether"
 {
 	Path "models"
 
-	Model 0 "SafetyTether_d.3d"
+	Model 0 "SafetyTether.iqm"
 	Skin 0 "SafetyTether_off.png"
-	Scale 0.02 0.02 0.02
+	Scale 5 5 5
 	ZOffset 16
 	PitchOffset 30
 	ROTATING