From: Mario Date: Thu, 2 Jun 2022 01:03:13 +0000 (+1000) Subject: Remove commented out legacy keyframe information from monster codefiles and update... X-Git-Tag: xonotic-v0.8.5~7^2~1^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1eba406a77a9a7591e0bf201df4b83fb439f640;p=xonotic%2Fxonotic-data.pk3dir.git Remove commented out legacy keyframe information from monster codefiles and update the wyvern's model to match its name --- diff --git a/models/monsters/dragon.dpm b/models/monsters/dragon.dpm deleted file mode 100644 index bbab196d4..000000000 Binary files a/models/monsters/dragon.dpm and /dev/null differ diff --git a/models/monsters/dragon.dpm.framegroups b/models/monsters/dragon.dpm.framegroups deleted file mode 100644 index 016c89eaa..000000000 --- a/models/monsters/dragon.dpm.framegroups +++ /dev/null @@ -1,14 +0,0 @@ -/* -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 0 // dragon melee -407 51 30 0 // 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..3d2bab7ef 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..0791d6fe2 --- /dev/null +++ b/models/monsters/wyvern.dpm.framegroups @@ -0,0 +1,14 @@ +/* +Generated framegroups file for wyvern +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 101 30 1 // wyvern idle +102 101 30 1 // wyvern glide +203 101 30 1 // wyvern fly +304 26 30 0 // wyvern pain1 +330 26 30 0 // wyvern pain2 +356 51 30 0 // wyvern melee +407 51 30 0 // wyvern fireball +458 101 30 1 // wyvern dying +559 26 30 0 // wyvern dead diff --git a/monsters.cfg b/monsters.cfg index 372746349..355b497a7 100644 --- a/monsters.cfg +++ b/monsters.cfg @@ -68,7 +68,7 @@ set g_monster_wyvern_speed_run 250 set g_monster_wyvern_speed_stop 300 set g_monster_wyvern_speed_walk 120 // }}} -// {{{ #5: Shambler +// {{{ #5: Golem set g_monster_golem_attack_claw_damage 60 set g_monster_golem_attack_lightning_damage 25 set g_monster_golem_attack_lightning_damage_zap 15 diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 604799ca7..b4c9f86b2 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -317,7 +317,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew) HANDLE(SEEKER) this.traileffect = EFFECT_SEEKER_TRAIL.m_id; break; HANDLE(MAGE_SPIKE) this.traileffect = EFFECT_TR_VORESPIKE.m_id; break; - HANDLE(GOLEM_LIGHTNING) this.traileffect = EFFECT_TR_NEXUIZPLASMA.m_id; break; + HANDLE(GOLEM_LIGHTNING) this.traileffect = EFFECT_TR_NEXUIZPLASMA.m_id; break; HANDLE(RAPTORBOMB) this.gravity = 1; this.avelocity = '0 0 180'; this.traileffect = EFFECT_Null.m_id; break; HANDLE(RAPTORBOMBLET) this.gravity = 1; this.avelocity = '0 0 180'; this.traileffect = EFFECT_Null.m_id; break; diff --git a/qcsrc/common/monsters/monster/golem.qc b/qcsrc/common/monsters/monster/golem.qc index a9d9224da..8762dd9e4 100644 --- a/qcsrc/common/monsters/monster/golem.qc +++ b/qcsrc/common/monsters/monster/golem.qc @@ -18,18 +18,6 @@ float autocvar_g_monster_golem_speed_stop; float autocvar_g_monster_golem_speed_run; float autocvar_g_monster_golem_speed_walk; -/* -const float golem_anim_stand = 0; -const float golem_anim_walk = 1; -const float golem_anim_run = 2; -const float golem_anim_smash = 3; -const float golem_anim_swingr = 4; -const float golem_anim_swingl = 5; -const float golem_anim_magic = 6; -const float golem_anim_pain = 7; -const float golem_anim_death = 8; -*/ - .float golem_lastattack; // delay attacks separately void M_Golem_Attack_Smash(entity this) diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index f307b8aa1..ccdc0223f 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -75,15 +75,6 @@ float autocvar_g_monster_mage_speed_stop; float autocvar_g_monster_mage_speed_run; float autocvar_g_monster_mage_speed_walk; -/* -const float mage_anim_idle = 0; -const float mage_anim_walk = 1; -const float mage_anim_attack = 2; -const float mage_anim_pain = 3; -const float mage_anim_death = 4; -const float mage_anim_run = 5; -*/ - void M_Mage_Defend_Heal(entity this); void M_Mage_Defend_Shield(entity this); diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 90b1d3218..dafe36d59 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -81,13 +81,6 @@ float autocvar_g_monster_spider_speed_stop; float autocvar_g_monster_spider_speed_run; float autocvar_g_monster_spider_speed_walk; -/* -const float spider_anim_idle = 0; -const float spider_anim_walk = 1; -const float spider_anim_attack = 2; -const float spider_anim_attack2 = 3; -*/ - void M_Spider_Attack_Web_Explode(entity this) { if(this) diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index 450aa2df3..783c2fd34 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -57,14 +57,6 @@ float autocvar_g_monster_wyvern_speed_stop; float autocvar_g_monster_wyvern_speed_run; float autocvar_g_monster_wyvern_speed_walk; -/* -const float wyvern_anim_hover = 0; -const float wyvern_anim_fly = 1; -const float wyvern_anim_magic = 2; -const float wyvern_anim_pain = 3; -const float wyvern_anim_death = 4; -*/ - void M_Wyvern_Attack_Fireball_Explode(entity this) { Send_Effect(EFFECT_FIREBALL_EXPLODE, this.origin, '0 0 0', 1); diff --git a/qcsrc/common/monsters/monster/wyvern.qh b/qcsrc/common/monsters/monster/wyvern.qh index 026e5038a..ed89b9785 100644 --- a/qcsrc/common/monsters/monster/wyvern.qh +++ b/qcsrc/common/monsters/monster/wyvern.qh @@ -3,7 +3,7 @@ #include "../all.qh" #ifdef GAMEQC -MODEL(MON_WYVERN, M_Model("dragon.dpm")); +MODEL(MON_WYVERN, M_Model("wyvern.dpm")); #endif CLASS(Wyvern, Monster) diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index 551a9b42a..4cb442770 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -13,40 +13,6 @@ float autocvar_g_monster_zombie_speed_stop; float autocvar_g_monster_zombie_speed_run; float autocvar_g_monster_zombie_speed_walk; -/* -const float zombie_anim_attackleap = 0; -const float zombie_anim_attackrun1 = 1; -const float zombie_anim_attackrun2 = 2; -const float zombie_anim_attackrun3 = 3; -const float zombie_anim_attackstanding1 = 4; -const float zombie_anim_attackstanding2 = 5; -const float zombie_anim_attackstanding3 = 6; -const float zombie_anim_blockend = 7; -const float zombie_anim_blockstart = 8; -const float zombie_anim_deathback1 = 9; -const float zombie_anim_deathback2 = 10; -const float zombie_anim_deathback3 = 11; -const float zombie_anim_deathfront1 = 12; -const float zombie_anim_deathfront2 = 13; -const float zombie_anim_deathfront3 = 14; -const float zombie_anim_deathleft1 = 15; -const float zombie_anim_deathleft2 = 16; -const float zombie_anim_deathright1 = 17; -const float zombie_anim_deathright2 = 18; -const float zombie_anim_idle = 19; -const float zombie_anim_painback1 = 20; -const float zombie_anim_painback2 = 21; -const float zombie_anim_painfront1 = 22; -const float zombie_anim_painfront2 = 23; -const float zombie_anim_runbackwards = 24; -const float zombie_anim_runbackwardsleft = 25; -const float zombie_anim_runbackwardsright = 26; -const float zombie_anim_runforward = 27; -const float zombie_anim_runforwardleft = 28; -const float zombie_anim_runforwardright = 29; -const float zombie_anim_spawn = 30; -*/ - .vector moveto; void M_Zombie_Attack_Leap_Touch(entity this, entity toucher) diff --git a/textures/monsters/Dragon.tga b/textures/monsters/Dragon.tga deleted file mode 100644 index 69bc82fb5..000000000 Binary files a/textures/monsters/Dragon.tga and /dev/null differ diff --git a/textures/monsters/Dragon_Norm.tga b/textures/monsters/Dragon_Norm.tga deleted file mode 100644 index 3f749b10b..000000000 Binary files a/textures/monsters/Dragon_Norm.tga and /dev/null differ diff --git a/textures/monsters/Dragon_Shirt.tga b/textures/monsters/Dragon_Shirt.tga deleted file mode 100644 index 5cdb81bbf..000000000 Binary files a/textures/monsters/Dragon_Shirt.tga and /dev/null differ diff --git a/textures/monsters/Dragon_Spec.tga b/textures/monsters/Dragon_Spec.tga deleted file mode 100644 index 60cafa4bd..000000000 Binary files a/textures/monsters/Dragon_Spec.tga and /dev/null differ diff --git a/textures/wyvern.tga b/textures/wyvern.tga new file mode 100644 index 000000000..69bc82fb5 Binary files /dev/null and b/textures/wyvern.tga differ diff --git a/textures/wyvern_gloss.tga b/textures/wyvern_gloss.tga new file mode 100644 index 000000000..60cafa4bd Binary files /dev/null and b/textures/wyvern_gloss.tga differ diff --git a/textures/wyvern_norm.tga b/textures/wyvern_norm.tga new file mode 100644 index 000000000..3f749b10b Binary files /dev/null and b/textures/wyvern_norm.tga differ diff --git a/textures/wyvern_shirt.tga b/textures/wyvern_shirt.tga new file mode 100644 index 000000000..5cdb81bbf Binary files /dev/null and b/textures/wyvern_shirt.tga differ