From a1eba406a77a9a7591e0bf201df4b83fb439f640 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 Jun 2022 11:03:13 +1000 Subject: [PATCH] Remove commented out legacy keyframe information from monster codefiles and update the wyvern's model to match its name --- models/monsters/dragon.dpm.framegroups | 14 -------- models/monsters/{dragon.dpm => wyvern.dpm} | Bin 3385068 -> 3385068 bytes models/monsters/wyvern.dpm.framegroups | 14 ++++++++ monsters.cfg | 2 +- qcsrc/client/weapons/projectile.qc | 2 +- qcsrc/common/monsters/monster/golem.qc | 12 ------- qcsrc/common/monsters/monster/mage.qc | 9 ----- qcsrc/common/monsters/monster/spider.qc | 7 ---- qcsrc/common/monsters/monster/wyvern.qc | 8 ----- qcsrc/common/monsters/monster/wyvern.qh | 2 +- qcsrc/common/monsters/monster/zombie.qc | 34 ------------------ textures/{monsters/Dragon.tga => wyvern.tga} | Bin .../Dragon_Spec.tga => wyvern_gloss.tga} | Bin .../Dragon_Norm.tga => wyvern_norm.tga} | Bin .../Dragon_Shirt.tga => wyvern_shirt.tga} | Bin 15 files changed, 17 insertions(+), 87 deletions(-) delete mode 100644 models/monsters/dragon.dpm.framegroups rename models/monsters/{dragon.dpm => wyvern.dpm} (99%) create mode 100644 models/monsters/wyvern.dpm.framegroups rename textures/{monsters/Dragon.tga => wyvern.tga} (100%) rename textures/{monsters/Dragon_Spec.tga => wyvern_gloss.tga} (100%) rename textures/{monsters/Dragon_Norm.tga => wyvern_norm.tga} (100%) rename textures/{monsters/Dragon_Shirt.tga => wyvern_shirt.tga} (100%) 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/dragon.dpm b/models/monsters/wyvern.dpm similarity index 99% rename from models/monsters/dragon.dpm rename to models/monsters/wyvern.dpm index bbab196d4f152ba9ca04aeaa94c0032fc470fb89..3d2bab7efdc3c4377e8c7b32a4e7b2ee34c1ca71 100644 GIT binary patch delta 1903 zcma)-yKmD_7{wFXq#+4;*?H18P+Iy-6WTKH5>EE1`s2b|fT_Gb|yIm@yKfJUpQkVc`jp4wg`cakzk)wwUbx_JA#_iH-efP0clQlK9Ibo~i+nvUpmZC_V-Bwd(x?@bT zYqKp;XEy89kcw9!OuIEJ^%=L!Q#TTvC1zNH{pc^RFKX|}Ejr7Ca_~I*tuJ2R){v!G zU>mr{9J?K=+u&abwe|+<#+`Y}L#(}E*H!;BQdVb1y6ARe=d7^g)~raE-LfOn6=H@( zs=xkhCCaw66QvA1QT_J^E6`I173ey#qY)^zG!JyENO_1ruiABvCU=3$cugNri2t{wWMO_VNqc?}Nqr>!`$8*b8+5e!TNZq|wr@>Tv{Ka5*M(^@t?VojB z`LO%6Bk!;F_@78qg_nuYt3=2P&VUgx3Vgs1#y|j^1wp`S!{8iU4{Rj>x~VEt1fRQU1s E1n0FINB{r; delta 2852 zcma);$!-%t6h%8^GI0nQoDf3hkdTnU@jwtrOd?1Kd0{261v;cLEwu;P4PjRc7HmN* zSg_$Q*zyDL6)dyj2jISH+j-ShF1e*sj^m^Is`^zAr@wypoPtl^M;=v5f!}zuxLSNTKtIfPnU|+LK|wf1 zXi$56&}EOwV^gCb#~GzT&(m5g#>}GD<8ia6^?1VOv1z6vPw?x3Rw4s=k8Ob&7C2=o z%v-GH33(y53-caNTLO8H)j%~*_Ly>T%+R2=NdGhD>FsFNk2lev9Y7n@hepIcr{CTq&pP#c}_Tuw%7R?^tThabsGK<#=JcdYQbE723*`z^T33+U4Bsk6%4Z6pBOop>fgYF5f$2(>*@>uz_#p6A;<>j-j z`!B-eDbQya?FDwKI zXSpYJtgi8~=N{7pl;akCQ@tnd$&3B!Nk#E)o4seXFE9V5V(&mtT|bB~$#hR7kL`!3 z-W|OVdF(7k-d*Ok-hoJzy@-@(yvM}mI}mxY7u>tAd-N(&4BYT_wcdPRGQZ4a>G5M0 zL+^d~w(d33NPzQT2#`ArE`Skm5sZQ{ zFb*a_3QU42a0yI<%U}jv0kdEZ%!3862$sMySOHhTDp&*8z&h9f*TE*(0^48*q`@x8 Mfb5S%GWX}(e`*kW<^TWy 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/wyvern.tga similarity index 100% rename from textures/monsters/Dragon.tga rename to textures/wyvern.tga diff --git a/textures/monsters/Dragon_Spec.tga b/textures/wyvern_gloss.tga similarity index 100% rename from textures/monsters/Dragon_Spec.tga rename to textures/wyvern_gloss.tga diff --git a/textures/monsters/Dragon_Norm.tga b/textures/wyvern_norm.tga similarity index 100% rename from textures/monsters/Dragon_Norm.tga rename to textures/wyvern_norm.tga diff --git a/textures/monsters/Dragon_Shirt.tga b/textures/wyvern_shirt.tga similarity index 100% rename from textures/monsters/Dragon_Shirt.tga rename to textures/wyvern_shirt.tga -- 2.39.2