From: LegendaryGuard Date: Mon, 13 Dec 2021 23:08:58 +0000 (+0100) Subject: Add new monster models, textures and sounds X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7cdf8ce882833bd1e8a6643ab35944ead4eb999e;p=xonotic%2Fxonotic-data.pk3dir.git Add new monster models, textures and sounds --- diff --git a/models/monsters/mage.dpm b/models/monsters/mage.dpm index 2e50fb5ca..b7c44ddb4 100644 Binary files a/models/monsters/mage.dpm and b/models/monsters/mage.dpm differ diff --git a/models/monsters/mage.dpm.framegroups b/models/monsters/mage.dpm.framegroups index 4a72c65c1..d3a64efa5 100644 --- a/models/monsters/mage.dpm.framegroups +++ b/models/monsters/mage.dpm.framegroups @@ -1,11 +1,18 @@ /* -Generated framegroups file for mage +Generated framegroups file for nanomage Used by DarkPlaces to simulate frame groups in DPM models. */ -1 31 30 1 // mage idle -32 31 30 1 // mage walk -63 16 30 1 // mage attack -79 16 30 1 // mage hit -95 31 30 0 // mage die -126 31 60 1 // mage walk +1 61 12 1 // nanomage idle +62 9 10 1 // nanomage run +71 71 30 1 // nanomage attack01 +142 43 30 1 // nanomage attack02 +185 61 30 1 // nanomage attack03 +246 101 30 1 // nanomage attack04 +347 11 30 1 // nanomage pain01 +358 16 30 1 // nanomage pain02 +374 31 30 1 // nanomage pain03 +405 86 30 0 // nanomage death01 +491 56 30 0 // nanomage death02 +547 2 1 0 // nanomage dead01 +549 2 1 0 // nanomage dead02 diff --git a/models/monsters/shambler.mdl b/models/monsters/shambler.mdl index 2e23dfa90..667ebd501 100644 Binary files a/models/monsters/shambler.mdl and b/models/monsters/shambler.mdl differ diff --git a/models/monsters/shambler.mdl.framegroups b/models/monsters/shambler.mdl.framegroups index b003d568d..b5cdca3d5 100644 --- a/models/monsters/shambler.mdl.framegroups +++ b/models/monsters/shambler.mdl.framegroups @@ -1 +1,29 @@ -1 16 10 1 // shambler stand 18 11 10 1 // shambler walk 31 5 10 1 // shambler run 37 11 10 1 // shambler smash 49 8 10 1 // shambler swing right 58 8 10 1 // shambler swing left 67 11 10 1 // shambler magic 79 5 10 0 // shambler pain 85 10 10 0 // shambler death \ No newline at end of file +/* +Generated framegroups file for golem +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 21 5 1 // golem idle +22 61 30 1 // golem run +83 21 30 1 // golem runangry +104 36 30 0 // golem melee01 +140 36 30 0 // golem melee02 +176 61 30 0 // golem melee03 +237 61 30 0 // golem melee04 +298 21 30 0 // golem hit01 +319 21 30 0 // golem hit02 +340 21 30 0 // golem hit03 +361 21 30 0 // golem hit04 +382 61 30 0 // golem hithard +443 101 30 0 // golem enrage +544 61 30 0 // golem death01 +605 2 30 0 // golem dead01 +607 36 30 0 // golem death02 +643 2 30 0 // golem dead01 +645 46 30 0 // golem deathback +691 2 30 0 // golem deadback +693 2 30 0 // golem dead01 +695 2 30 0 // golem dead01 +697 2 30 0 // golem dead01 +699 2 30 0 // golem dead01 +701 2 30 0 // golem dead01 diff --git a/models/monsters/spider.dpm b/models/monsters/spider.dpm index d0bc9ce5f..b1e8d11e5 100644 Binary files a/models/monsters/spider.dpm and b/models/monsters/spider.dpm differ diff --git a/models/monsters/spider.dpm.framegroups b/models/monsters/spider.dpm.framegroups index 039a7c3ca..5cbb24017 100644 --- a/models/monsters/spider.dpm.framegroups +++ b/models/monsters/spider.dpm.framegroups @@ -3,7 +3,21 @@ Generated framegroups file for spider Used by DarkPlaces to simulate frame groups in DPM models. */ -1 60 60 1 // spider idle -61 41 120 1 // spider walk -102 24 60 1 // spider attack -125 10 60 1 // spider attack2 \ No newline at end of file +1 51 30 1 // spider spiderbite +52 51 30 0 // spider spiderdeath01 +103 51 30 0 // spider spiderdeath02 +154 11 30 1 // spider spiderfire01 +165 31 30 1 // spider spiderfire02 +196 51 5 1 // spider spideridle +247 51 30 0 // spider spiderintimidate +298 11 25 0 // spider spiderpain01 +309 11 25 0 // spider spiderpain02 +320 11 15 0 // spider spiderpain03 +331 101 30 1 // spider spiderwalkforward +432 101 30 1 // spider spiderwalkforwardright +533 101 30 1 // spider spiderwalkright +634 101 30 1 // spider spiderwalkbackright +735 101 30 1 // spider spiderwalkback +836 101 30 1 // spider spiderwalkbackleft +937 101 30 1 // spider spiderwalkleft +1038 101 30 1 // spider spiderwalkforwardleft diff --git a/models/monsters/wizard.mdl b/models/monsters/wizard.mdl index b130ba031..bbab196d4 100644 Binary files a/models/monsters/wizard.mdl and b/models/monsters/wizard.mdl differ diff --git a/models/monsters/wizard.mdl.framegroups b/models/monsters/wizard.mdl.framegroups index c51109aac..e9fce438e 100644 --- a/models/monsters/wizard.mdl.framegroups +++ b/models/monsters/wizard.mdl.framegroups @@ -1 +1,14 @@ -1 14 10 1 // wizard hover 16 13 10 1 // wizard fly 30 12 10 1 // wizard magic attack 43 3 10 0 // wizard pain 47 7 10 0 // wizard death \ No newline at end of file +/* +Generated framegroups file for Dragon +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 101 30 1 // dragon idle +102 101 30 1 // dragon glide +203 101 30 1 // dragon fly +304 26 30 0 // dragon pain1 +330 26 30 0 // dragon pain2 +356 51 30 1 // dragon melee +407 51 30 1 // dragon fireball +458 101 30 1 // dragon dying +559 26 30 0 // dragon dead diff --git a/models/monsters/wyvern.dpm b/models/monsters/wyvern.dpm new file mode 100644 index 000000000..bbab196d4 Binary files /dev/null and b/models/monsters/wyvern.dpm differ diff --git a/models/monsters/wyvern.dpm.framegroups b/models/monsters/wyvern.dpm.framegroups new file mode 100644 index 000000000..e9fce438e --- /dev/null +++ b/models/monsters/wyvern.dpm.framegroups @@ -0,0 +1,14 @@ +/* +Generated framegroups file for Dragon +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 101 30 1 // dragon idle +102 101 30 1 // dragon glide +203 101 30 1 // dragon fly +304 26 30 0 // dragon pain1 +330 26 30 0 // dragon pain2 +356 51 30 1 // dragon melee +407 51 30 1 // dragon fireball +458 101 30 1 // dragon dying +559 26 30 0 // dragon dead diff --git a/scripts/monsters.shader b/scripts/monsters.shader index 25f1ca3ca..51ca953e1 100644 --- a/scripts/monsters.shader +++ b/scripts/monsters.shader @@ -1,16 +1,26 @@ -textures/spider/spidertex +nanomage { - cull none - - { - map textures/spidertex + dpreflectcube cubemaps/default/sky + { + map textures/nanomage.tga + rgbgen lightingDiffuse } } -mage -{ - cull none - { - map textures/mage +spider +{ + dpreflectcube cubemaps/default/sky + { + map textures/spider.tga + rgbgen lightingDiffuse } } + +golem +{ + dpreflectcube cubemaps/default/sky + { + map textures/golem.tga + rgbgen lightingDiffuse + } +} \ No newline at end of file diff --git a/sound/monsters/mage/death.ogg b/sound/monsters/mage/death.ogg new file mode 100644 index 000000000..11471d225 Binary files /dev/null and b/sound/monsters/mage/death.ogg differ diff --git a/sound/monsters/mage/melee.ogg b/sound/monsters/mage/melee.ogg new file mode 100644 index 000000000..34cfb3067 Binary files /dev/null and b/sound/monsters/mage/melee.ogg differ diff --git a/sound/monsters/mage/pain.ogg b/sound/monsters/mage/pain.ogg new file mode 100644 index 000000000..dc10d2f29 Binary files /dev/null and b/sound/monsters/mage/pain.ogg differ diff --git a/sound/monsters/mage/ranged.ogg b/sound/monsters/mage/ranged.ogg new file mode 100644 index 000000000..7416843ed Binary files /dev/null and b/sound/monsters/mage/ranged.ogg differ diff --git a/sound/monsters/mage/spawn.ogg b/sound/monsters/mage/spawn.ogg new file mode 100644 index 000000000..55680f519 Binary files /dev/null and b/sound/monsters/mage/spawn.ogg differ diff --git a/sound/monsters/spider/death.ogg b/sound/monsters/spider/death.ogg new file mode 100644 index 000000000..43309865a Binary files /dev/null and b/sound/monsters/spider/death.ogg differ diff --git a/sound/monsters/spider/idle.ogg b/sound/monsters/spider/idle.ogg new file mode 100644 index 000000000..9361ea9f7 Binary files /dev/null and b/sound/monsters/spider/idle.ogg differ diff --git a/sound/monsters/spider/melee.ogg b/sound/monsters/spider/melee.ogg new file mode 100644 index 000000000..0254951e1 Binary files /dev/null and b/sound/monsters/spider/melee.ogg differ diff --git a/sound/monsters/spider/pain.ogg b/sound/monsters/spider/pain.ogg new file mode 100644 index 000000000..e552a3569 Binary files /dev/null and b/sound/monsters/spider/pain.ogg differ diff --git a/sound/monsters/spider/sight.ogg b/sound/monsters/spider/sight.ogg new file mode 100644 index 000000000..cac94088c Binary files /dev/null and b/sound/monsters/spider/sight.ogg differ diff --git a/sound/monsters/spider/spawn.ogg b/sound/monsters/spider/spawn.ogg new file mode 100644 index 000000000..1d4b567db Binary files /dev/null and b/sound/monsters/spider/spawn.ogg differ diff --git a/textures/Spider.jpg b/textures/Spider.jpg new file mode 100644 index 000000000..f59fe8fd4 Binary files /dev/null and b/textures/Spider.jpg differ diff --git a/textures/Spider_gloss.jpg b/textures/Spider_gloss.jpg new file mode 100644 index 000000000..1c99d01e3 Binary files /dev/null and b/textures/Spider_gloss.jpg differ diff --git a/textures/Spider_gloss_alpha.jpg b/textures/Spider_gloss_alpha.jpg new file mode 100644 index 000000000..ef01c7100 Binary files /dev/null and b/textures/Spider_gloss_alpha.jpg differ diff --git a/textures/Spider_glow.jpg b/textures/Spider_glow.jpg new file mode 100644 index 000000000..3bc96b55d Binary files /dev/null and b/textures/Spider_glow.jpg differ diff --git a/textures/Spider_norm.jpg b/textures/Spider_norm.jpg new file mode 100644 index 000000000..88320ebaa Binary files /dev/null and b/textures/Spider_norm.jpg differ diff --git a/textures/Spider_norm_alpha.jpg b/textures/Spider_norm_alpha.jpg new file mode 100644 index 000000000..0bba63021 Binary files /dev/null and b/textures/Spider_norm_alpha.jpg differ diff --git a/textures/Spider_reflect.jpg b/textures/Spider_reflect.jpg new file mode 100644 index 000000000..35bd70bcb Binary files /dev/null and b/textures/Spider_reflect.jpg differ diff --git a/textures/Spider_shirt.jpg b/textures/Spider_shirt.jpg new file mode 100644 index 000000000..b83c8fd44 Binary files /dev/null and b/textures/Spider_shirt.jpg differ diff --git a/textures/glow_reflect.jpg b/textures/glow_reflect.jpg new file mode 100644 index 000000000..abec3a449 Binary files /dev/null and b/textures/glow_reflect.jpg differ diff --git a/textures/golem.jpg b/textures/golem.jpg new file mode 100644 index 000000000..d47d24495 Binary files /dev/null and b/textures/golem.jpg differ diff --git a/textures/golem_gloss.jpg b/textures/golem_gloss.jpg new file mode 100644 index 000000000..bcb099f97 Binary files /dev/null and b/textures/golem_gloss.jpg differ diff --git a/textures/golem_gloss_alpha.jpg b/textures/golem_gloss_alpha.jpg new file mode 100644 index 000000000..967104eec Binary files /dev/null and b/textures/golem_gloss_alpha.jpg differ diff --git a/textures/golem_glow.jpg b/textures/golem_glow.jpg new file mode 100644 index 000000000..9677ad2c1 Binary files /dev/null and b/textures/golem_glow.jpg differ diff --git a/textures/golem_norm.jpg b/textures/golem_norm.jpg new file mode 100644 index 000000000..d03a7f12c Binary files /dev/null and b/textures/golem_norm.jpg differ diff --git a/textures/golem_norm_alpha.jpg b/textures/golem_norm_alpha.jpg new file mode 100644 index 000000000..dd3d9a3b1 Binary files /dev/null and b/textures/golem_norm_alpha.jpg differ diff --git a/textures/golem_reflect.jpg b/textures/golem_reflect.jpg new file mode 100644 index 000000000..7f0fa7569 Binary files /dev/null and b/textures/golem_reflect.jpg differ diff --git a/textures/golem_shirt.jpg b/textures/golem_shirt.jpg new file mode 100644 index 000000000..9501eb11f Binary files /dev/null and b/textures/golem_shirt.jpg differ diff --git a/textures/mage.tga b/textures/mage.tga deleted file mode 100644 index 55aadbaff..000000000 Binary files a/textures/mage.tga and /dev/null differ diff --git a/textures/mage_glow.tga b/textures/mage_glow.tga deleted file mode 100644 index 8498c467f..000000000 Binary files a/textures/mage_glow.tga and /dev/null differ diff --git a/textures/mage_pants.tga b/textures/mage_pants.tga deleted file mode 100644 index a3d2e132b..000000000 Binary files a/textures/mage_pants.tga and /dev/null differ diff --git a/textures/monsters/Dragon.jpg b/textures/monsters/Dragon.jpg new file mode 100644 index 000000000..9b2c71db4 Binary files /dev/null and b/textures/monsters/Dragon.jpg differ diff --git a/textures/monsters/Dragon_norm.jpg b/textures/monsters/Dragon_norm.jpg new file mode 100644 index 000000000..64f321947 Binary files /dev/null and b/textures/monsters/Dragon_norm.jpg differ diff --git a/textures/monsters/Dragon_norm_alpha.jpg b/textures/monsters/Dragon_norm_alpha.jpg new file mode 100644 index 000000000..3a6b0e14a Binary files /dev/null and b/textures/monsters/Dragon_norm_alpha.jpg differ diff --git a/textures/monsters/Dragon_shirt.jpg b/textures/monsters/Dragon_shirt.jpg new file mode 100644 index 000000000..0ab7c2f0c Binary files /dev/null and b/textures/monsters/Dragon_shirt.jpg differ diff --git a/textures/monsters/Dragon_spec.jpg b/textures/monsters/Dragon_spec.jpg new file mode 100644 index 000000000..42b81a2b6 Binary files /dev/null and b/textures/monsters/Dragon_spec.jpg differ diff --git a/textures/nanomage.jpg b/textures/nanomage.jpg new file mode 100644 index 000000000..68293a7a3 Binary files /dev/null and b/textures/nanomage.jpg differ diff --git a/textures/nanomage_gloss.jpg b/textures/nanomage_gloss.jpg new file mode 100644 index 000000000..50b49a900 Binary files /dev/null and b/textures/nanomage_gloss.jpg differ diff --git a/textures/nanomage_glow.jpg b/textures/nanomage_glow.jpg new file mode 100644 index 000000000..1ecdf47ca Binary files /dev/null and b/textures/nanomage_glow.jpg differ diff --git a/textures/nanomage_norm.jpg b/textures/nanomage_norm.jpg new file mode 100644 index 000000000..735e3fe29 Binary files /dev/null and b/textures/nanomage_norm.jpg differ diff --git a/textures/nanomage_reflect.jpg b/textures/nanomage_reflect.jpg new file mode 100644 index 000000000..9ba8509ac Binary files /dev/null and b/textures/nanomage_reflect.jpg differ diff --git a/textures/nanomage_shirt.jpg b/textures/nanomage_shirt.jpg new file mode 100644 index 000000000..d351763fa Binary files /dev/null and b/textures/nanomage_shirt.jpg differ diff --git a/textures/spidertex.tga b/textures/spidertex.tga deleted file mode 100644 index c1c40c0de..000000000 Binary files a/textures/spidertex.tga and /dev/null differ diff --git a/textures/spidertex_glow.tga b/textures/spidertex_glow.tga deleted file mode 100644 index 8c7d3dc8e..000000000 Binary files a/textures/spidertex_glow.tga and /dev/null differ diff --git a/textures/spidertex_pants.tga b/textures/spidertex_pants.tga deleted file mode 100644 index 09263af9b..000000000 Binary files a/textures/spidertex_pants.tga and /dev/null differ