From: terencehill Date: Mon, 10 Jun 2024 21:35:19 +0000 (+0200) Subject: Add "_simple" versions of powerup models (simpler than "_luma" ones) X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7ee0acaf174f646ccb2b2e317434c745b239982;p=xonotic%2Fxonotic-data.pk3dir.git Add "_simple" versions of powerup models (simpler than "_luma" ones) --- diff --git a/models/items/g_invincible_simple.tga b/models/items/g_invincible_simple.tga index 76cb4142f..217b24cbf 100644 Binary files a/models/items/g_invincible_simple.tga and b/models/items/g_invincible_simple.tga differ diff --git a/models/items/g_strength_simple.tga b/models/items/g_strength_simple.tga index 09aa45c1a..9d21e02fe 100644 Binary files a/models/items/g_strength_simple.tga and b/models/items/g_strength_simple.tga differ diff --git a/models/relics/relic_powerup_simple.iqm b/models/relics/relic_powerup_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/relics/relic_powerup_simple.iqm differ diff --git a/models/relics/relic_powerup_simple.iqm_0.skin b/models/relics/relic_powerup_simple.iqm_0.skin new file mode 100644 index 000000000..4b4ab49cb --- /dev/null +++ b/models/relics/relic_powerup_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,models/items/g_strength_simple diff --git a/models/relics/relic_powerup_simple.iqm_1.skin b/models/relics/relic_powerup_simple.iqm_1.skin new file mode 100644 index 000000000..b49778b10 --- /dev/null +++ b/models/relics/relic_powerup_simple.iqm_1.skin @@ -0,0 +1 @@ +Plane,models/items/g_invincible_simple diff --git a/models/relics/relic_powerup_simple.iqm_2.skin b/models/relics/relic_powerup_simple.iqm_2.skin new file mode 100644 index 000000000..5faa0fe22 --- /dev/null +++ b/models/relics/relic_powerup_simple.iqm_2.skin @@ -0,0 +1 @@ +Plane,models/items/g_speed_simple diff --git a/models/relics/relic_powerup_simple.iqm_3.skin b/models/relics/relic_powerup_simple.iqm_3.skin new file mode 100644 index 000000000..bdd3378e8 --- /dev/null +++ b/models/relics/relic_powerup_simple.iqm_3.skin @@ -0,0 +1 @@ +Plane,models/items/g_invisibility_simple diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader index dca9671f6..3e6ff14b3 100644 --- a/scripts/simpleitems.shader +++ b/scripts/simpleitems.shader @@ -407,7 +407,7 @@ g_h100_simple // 100hp ////////// POWERUPS ////////// -g_strength_simple // strength +models/items/g_strength_simple { deformVertexes autosprite cull none @@ -419,7 +419,7 @@ g_strength_simple // strength } } -g_invincible_simple // shield +models/items/g_invincible_simple { deformVertexes autosprite cull none @@ -431,6 +431,28 @@ g_invincible_simple // shield } } +models/items/g_invisibility_simple +{ + deformVertexes autosprite + cull none + nopicmip + { + map models/items/g_invisibility_simple + blendfunc blend + } +} + +models/items/g_speed_simple +{ + deformVertexes autosprite + cull none + nopicmip + { + map models/items/g_speed_simple + blendfunc blend + } +} + g_jetpack_simple // jetpack { deformVertexes autosprite @@ -511,4 +533,4 @@ models/items/g_speed_luma // speed map models/items/g_speed_luma blendfunc blend } -} \ No newline at end of file +}