From: Mario Date: Mon, 23 Apr 2018 17:24:04 +0000 (+1000) Subject: Remove troll (not up to standards) X-Git-Tag: xonotic-v0.8.5~7^2~1^2~55 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9de6ea87ed7b396d80383c42999c1cd3b56301ee;p=xonotic%2Fxonotic-data.pk3dir.git Remove troll (not up to standards) --- diff --git a/models/monsters/troll.dpm b/models/monsters/troll.dpm deleted file mode 100644 index 53bd7ac320..0000000000 Binary files a/models/monsters/troll.dpm and /dev/null differ diff --git a/models/monsters/troll.dpm.framegroups b/models/monsters/troll.dpm.framegroups deleted file mode 100644 index 90b58199a7..0000000000 --- a/models/monsters/troll.dpm.framegroups +++ /dev/null @@ -1,11 +0,0 @@ -/* -Generated framegroups file for troll -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 38 30 1 // troll attack -39 63 30 1 // troll melee_hold -102 51 30 1 // troll walk -153 45 30 0 // troll death -198 2 30 0 // troll dead -102 51 60 1 // troll run diff --git a/models/monsters/troll.dpm_0.sounds b/models/monsters/troll.dpm_0.sounds deleted file mode 100644 index 57492165ee..0000000000 --- a/models/monsters/troll.dpm_0.sounds +++ /dev/null @@ -1,8 +0,0 @@ -//TAG: troll -death sound/monsters/troll/death 0 -sight sound/monsters/troll/sight 0 -//ranged sound/monsters/troll/ranged 0 -melee sound/monsters/troll/melee 0 -pain sound/monsters/troll/pain 2 -//spawn sound/monsters/troll/spawn 0 -idle sound/monsters/troll/idle 2 diff --git a/qcsrc/common/monsters/monster/_mod.inc b/qcsrc/common/monsters/monster/_mod.inc index 796e8d4bd0..df8decfa30 100644 --- a/qcsrc/common/monsters/monster/_mod.inc +++ b/qcsrc/common/monsters/monster/_mod.inc @@ -2,6 +2,5 @@ #include #include #include -#include #include #include diff --git a/qcsrc/common/monsters/monster/_mod.qh b/qcsrc/common/monsters/monster/_mod.qh index 07cb2e48c9..0b1d099057 100644 --- a/qcsrc/common/monsters/monster/_mod.qh +++ b/qcsrc/common/monsters/monster/_mod.qh @@ -2,6 +2,5 @@ #include #include #include -#include #include #include diff --git a/qcsrc/common/monsters/monster/troll.qc b/qcsrc/common/monsters/monster/troll.qc deleted file mode 100644 index 312745892f..0000000000 --- a/qcsrc/common/monsters/monster/troll.qc +++ /dev/null @@ -1,110 +0,0 @@ -#include "troll.qh" - -#ifdef SVQC -float autocvar_g_monster_troll_health = 900; -float autocvar_g_monster_troll_damageforcescale = 0.1; -float autocvar_g_monster_troll_attack_claw_damage = 90; -float autocvar_g_monster_troll_speed_stop = 300; -float autocvar_g_monster_troll_speed_run = 300; -float autocvar_g_monster_troll_speed_walk = 190; - -/* -const float troll_anim_attack = 0; -const float troll_anim_idle = 1; -const float troll_anim_walk = 2; -const float troll_anim_death = 3; -const float troll_anim_dead = 4; -const float troll_anim_run = 5; -*/ - -void M_Troll_Attack_Swing(entity this) -{ - Monster_Attack_Melee(this, this.enemy, (autocvar_g_monster_troll_attack_claw_damage), this.anim_melee1, this.attack_range, 0.5, DEATH_MONSTER_TROLL_MELEE.m_id, true); -} - -bool M_Troll_Attack(int attack_type, entity actor, entity targ, .entity weaponentity) -{ - switch(attack_type) - { - case MONSTER_ATTACK_MELEE: - { - actor.state = MONSTER_ATTACK_MELEE; // freeze monster - setanim(actor, actor.anim_melee1, false, true, true); - Monster_Delay(actor, 1, 0.6, M_Troll_Attack_Swing); - actor.anim_finished = actor.attack_finished_single[0] = time + 0.6; // set this for the delay - return true; - } - case MONSTER_ATTACK_RANGED: - { - // troll has no ranged attack - return false; - } - } - - return false; -} - -spawnfunc(monster_troll) { Monster_Spawn(this, true, MON_TROLL.monsterid); } -#endif // SVQC - -#ifdef SVQC -METHOD(Troll, mr_think, bool(Troll this, entity actor)) -{ - TC(Troll, this); - return true; -} - -METHOD(Troll, mr_pain, float(Troll this, entity actor, float damage_take, entity attacker, float deathtype)) -{ - TC(Troll, this); - actor.pain_finished = time + 0.5; - // no pain animation yet - //setanim(actor, actor.anim_pain1, true, true, false); - return damage_take; -} - -METHOD(Troll, mr_death, bool(Troll this, entity actor)) -{ - TC(Troll, this); - setanim(actor, actor.anim_die1, false, true, true); - return true; -} -#endif -#ifdef GAMEQC -METHOD(Troll, mr_anim, bool(Troll this, entity actor)) -{ - TC(Troll, this); - vector none = '0 0 0'; - actor.anim_die1 = animfixfps(actor, '3 1 1', none); // 2 seconds - actor.anim_walk = animfixfps(actor, '2 1 1', none); - actor.anim_idle = animfixfps(actor, '1 1 1', none); - actor.anim_melee1 = animfixfps(actor, '0 1 1', none); // analyze models and set framerate - actor.anim_run = animfixfps(actor, '5 1 1', none); - return true; -} -#endif -#ifdef SVQC -.float animstate_endtime; -METHOD(Troll, mr_setup, bool(Troll this, entity actor)) -{ - TC(Troll, this); - if(!actor.health) actor.health = (autocvar_g_monster_troll_health); - if(!actor.attack_range) actor.attack_range = 150; - if(!actor.speed) { actor.speed = (autocvar_g_monster_troll_speed_walk); } - if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_troll_speed_run); } - if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_troll_speed_stop); } - if(!actor.damageforcescale) { actor.damageforcescale = (autocvar_g_monster_troll_damageforcescale); } - - actor.view_ofs = '0 0 35'; // we swing at a lower height than our eyes - - actor.monster_loot = ITEM_ArmorBig; - actor.weapon = WEP_MORTAR.m_id; - - setanim(actor, actor.anim_idle, false, true, true); - actor.spawn_time = actor.animstate_endtime; - actor.spawnshieldtime = actor.spawn_time; - actor.monster_attackfunc = M_Troll_Attack; - - return true; -} -#endif diff --git a/qcsrc/common/monsters/monster/troll.qh b/qcsrc/common/monsters/monster/troll.qh deleted file mode 100644 index d5cc1f37a4..0000000000 --- a/qcsrc/common/monsters/monster/troll.qh +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#ifdef GAMEQC -MSG_INFO_NOTIF(DEATH_SELF_MON_TROLL_MELEE, 1, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", "^BG%s^K1 was ripped apart by a Troll%s%s", "") -MSG_MULTI_NOTIF(DEATH_SELF_MON_TROLL_MELEE, 1, NULL, INFO_DEATH_SELF_MON_TROLL_MELEE, CENTER_DEATH_SELF_MONSTER) -REGISTER_DEATHTYPE(MONSTER_TROLL_MELEE, DEATH_SELF_MON_TROLL_MELEE, DEATH_MURDER_MONSTER, "monster") -#endif - -#ifdef GAMEQC -MODEL(MON_TROLL, M_Model("troll.dpm")); -#endif - -CLASS(Troll, Monster) - ATTRIB(Troll, spawnflags, int, MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE); - ATTRIB(Troll, m_mins, vector, '-45 -45 -24'); - ATTRIB(Troll, m_maxs, vector, '45 45 160'); -#ifdef GAMEQC - ATTRIB(Troll, m_model, Model, MDL_MON_TROLL); -#endif - ATTRIB(Troll, netname, string, "troll"); - ATTRIB(Troll, monster_name, string, _("Troll")); -ENDCLASS(Troll) - -REGISTER_MONSTER(TROLL, NEW(Troll)); diff --git a/textures/forest-monster-skin1.jpg b/textures/forest-monster-skin1.jpg deleted file mode 100644 index 6a227d0409..0000000000 Binary files a/textures/forest-monster-skin1.jpg and /dev/null differ diff --git a/textures/forest-monster-skin1_norm.jpg b/textures/forest-monster-skin1_norm.jpg deleted file mode 100644 index 142823e09d..0000000000 Binary files a/textures/forest-monster-skin1_norm.jpg and /dev/null differ diff --git a/textures/forest-monster-skin1_pants.jpg b/textures/forest-monster-skin1_pants.jpg deleted file mode 100644 index 61f6667422..0000000000 Binary files a/textures/forest-monster-skin1_pants.jpg and /dev/null differ diff --git a/textures/forest-monster-skin1_spec.jpg b/textures/forest-monster-skin1_spec.jpg deleted file mode 100644 index 14e57c51cd..0000000000 Binary files a/textures/forest-monster-skin1_spec.jpg and /dev/null differ diff --git a/textures/tree.tga b/textures/tree.tga deleted file mode 100644 index 8fa7816654..0000000000 Binary files a/textures/tree.tga and /dev/null differ diff --git a/textures/tree_norm.tga b/textures/tree_norm.tga deleted file mode 100644 index 3bef163bee..0000000000 Binary files a/textures/tree_norm.tga and /dev/null differ diff --git a/textures/tree_spec.tga b/textures/tree_spec.tga deleted file mode 100644 index 6a44d55e29..0000000000 Binary files a/textures/tree_spec.tga and /dev/null differ