Patches #424

Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/mutator_relics

Added by git-manager over 3 years ago. Updated 2 months ago.

Status:ClosedStart date:04/22/2011
Priority:HighDue date:
Assignee:Samual% Done:

100%

Category:-
Target version:Xonotic - 0.9

Description

Purpose of the branch:

Now that Morphed's models are in (and textured with per-relic symbols), I declare this code officially finished. Feel free to include, or if more testing is required, it can be fully tested now. Please contact me anytime to let me know how it goes, and if anything else needs to be done.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 02be28a01e585a336967034a314a6e6ae16ce29c
Branch: mirceakitsune/mutator_relics

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '02be28a01e585a336967034a314a6e6ae16ce29c'..'origin/mirceakitsune/mutator_relics'
git merge --no-ff 'origin/mirceakitsune/mutator_relics'
git push && git push --delete origin 'mirceakitsune/mutator_relics'

Diffstat:

 defaultXonotic.cfg                                 |   64 ++
 effectinfo.txt                                     |  238 ++++++++
 keybinds.txt                                       |    3 +
 models/relic/relic.md3                             |  Bin 0 -> 1126892 bytes
 models/relic/relic.md3.framegroups                 |    1 +
 models/relic/relic.md3_0.skin                      |    3 +
 models/relic/relic.md3_1.skin                      |    3 +
 models/relic/relic.md3_10.skin                     |    3 +
 models/relic/relic.md3_11.skin                     |    3 +
 models/relic/relic.md3_12.skin                     |    3 +
 models/relic/relic.md3_13.skin                     |    3 +
 models/relic/relic.md3_14.skin                     |    3 +
 models/relic/relic.md3_15.skin                     |    3 +
 models/relic/relic.md3_2.skin                      |    3 +
 models/relic/relic.md3_3.skin                      |    3 +
 models/relic/relic.md3_4.skin                      |    3 +
 models/relic/relic.md3_5.skin                      |    3 +
 models/relic/relic.md3_6.skin                      |    3 +
 models/relic/relic.md3_7.skin                      |    3 +
 models/relic/relic.md3_8.skin                      |    3 +
 models/relic/relic.md3_9.skin                      |    3 +
 models/relic/relic.tga                             |  Bin 0 -> 786476 bytes
 models/relic/relic_gloss.tga                       |  Bin 0 -> 786476 bytes
 models/relic/relic_glow.tga                        |  Bin 0 -> 786476 bytes
 models/relic/relic_norm.tga                        |  Bin 0 -> 1048620 bytes
 models/relic/relic_reflect.tga                     |  Bin 0 -> 786476 bytes
 models/relic/relic_ring.tga                        |  Bin 0 -> 65580 bytes
 models/relic/relic_ring_glow.tga                   |  Bin 0 -> 49196 bytes
 models/relic/sign_ammo.tga                         |  Bin 0 -> 65580 bytes
 models/relic/sign_ammo_glow.tga                    |  Bin 0 -> 65580 bytes
 models/relic/sign_damage.tga                       |  Bin 0 -> 65580 bytes
 models/relic/sign_damage_glow.tga                  |  Bin 0 -> 65580 bytes
 models/relic/sign_disability.tga                   |  Bin 0 -> 65580 bytes
 models/relic/sign_disability_glow.tga              |  Bin 0 -> 65580 bytes
 models/relic/sign_firingspeed.tga                  |  Bin 0 -> 65580 bytes
 models/relic/sign_firingspeed_glow.tga             |  Bin 0 -> 65580 bytes
 models/relic/sign_flight.tga                       |  Bin 0 -> 65580 bytes
 models/relic/sign_flight_glow.tga                  |  Bin 0 -> 65580 bytes
 models/relic/sign_invisible.tga                    |  Bin 0 -> 65580 bytes
 models/relic/sign_invisible_glow.tga               |  Bin 0 -> 65580 bytes
 models/relic/sign_jump.tga                         |  Bin 0 -> 65580 bytes
 models/relic/sign_jump_glow.tga                    |  Bin 0 -> 65580 bytes
 models/relic/sign_radioactive.tga                  |  Bin 0 -> 65580 bytes
 models/relic/sign_radioactive_glow.tga             |  Bin 0 -> 65580 bytes
 models/relic/sign_regeneration.tga                 |  Bin 0 -> 65580 bytes
 models/relic/sign_regeneration_glow.tga            |  Bin 0 -> 65580 bytes
 models/relic/sign_resistance.tga                   |  Bin 0 -> 65580 bytes
 models/relic/sign_resistance_glow.tga              |  Bin 0 -> 65580 bytes
 models/relic/sign_resurrection.tga                 |  Bin 0 -> 65580 bytes
 models/relic/sign_resurrection_glow.tga            |  Bin 0 -> 65580 bytes
 models/relic/sign_speed.tga                        |  Bin 0 -> 65580 bytes
 models/relic/sign_speed_glow.tga                   |  Bin 0 -> 65580 bytes
 models/relic/sign_splashdamage.tga                 |  Bin 0 -> 65580 bytes
 models/relic/sign_splashdamage_glow.tga            |  Bin 0 -> 65580 bytes
 models/relic/sign_teamboost.tga                    |  Bin 0 -> 65580 bytes
 models/relic/sign_teamboost_glow.tga               |  Bin 0 -> 65580 bytes
 models/relic/sign_vampire.tga                      |  Bin 0 -> 65580 bytes
 models/relic/sign_vampire_glow.tga                 |  Bin 0 -> 65580 bytes
 models/relic/sign_vengeance.tga                    |  Bin 0 -> 65580 bytes
 models/relic/sign_vengeance_glow.tga               |  Bin 0 -> 65580 bytes
 qcsrc/client/Main.qc                               |    1 +
 qcsrc/common/constants.qh                          |    4 +
 qcsrc/common/items.qh                              |    1 +
 .../xonotic/dialog_multiplayer_create_mutators.c   |   11 +-
 qcsrc/server/autocvars.qh                          |   65 ++
 qcsrc/server/bot/aim.qc                            |    4 +-
 qcsrc/server/cl_client.qc                          |    2 +
 qcsrc/server/cl_physics.qc                         |   18 +-
 qcsrc/server/cl_weaponsystem.qc                    |   16 +-
 qcsrc/server/constants.qh                          |    1 +
 qcsrc/server/defs.qh                               |   11 +-
 qcsrc/server/extensions.qh                         |    1 +
 qcsrc/server/g_damage.qc                           |    8 +-
 qcsrc/server/miscfunctions.qc                      |   15 +-
 qcsrc/server/mutators/base.qh                      |    9 +
 qcsrc/server/mutators/mutator_relics.qc            |  620 ++++++++++++++++++++
 qcsrc/server/mutators/mutators.qh                  |    1 +
 qcsrc/server/progs.src                             |    1 +
 qcsrc/server/teamplay.qc                           |    2 +
 qcsrc/server/w_crylink.qc                          |    4 +-
 qcsrc/server/w_rocketlauncher.qc                   |    4 +-
 qcsrc/server/w_shotgun.qc                          |    2 +-
 scripts/relic.shader                               |  160 +++++
 sound/relics/relic_effect.wav                      |  Bin 0 -> 132344 bytes
 84 files changed, 1280 insertions(+), 35 deletions(-)

Revision log:

commit 02be28a01e585a336967034a314a6e6ae16ce29c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Ah, there is no autosprite1. Remove that from the shaders.

commit 12c1e3aa4742cc97916db82818c8480240fc7d89
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    We need to use self.weaponratefactor_mod separately in shotgun code, in order to make it affect shotgun primary fire. Not sure how right this is, or why for shotgun it doesn't work automatically.

commit 197afe614a1dd9967fcea98882a0d92dce81afc3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Increase automated relic respawn time

commit 88cb35ee5d9793665dd06469414b108034e47906
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Change relic action particle colors to the relic colors decided with the new models.

commit 1d780e09520ca9f33662859e9f32c275fec25d84
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Make Damage relic not come into effect if the owner also have the Strength powerup, and Resistance relic not come into effect if the owner has the Invincible powerup.

commit cba0f73fe0d32518a0cdb3b74edd1dac0b46af34
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Another tiny brightness tweak

commit 44b67b3f4b4428a93dcb7fae703aa6f5fb11c16b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Brightness adjustments to some of the symbols

commit 884d3d8094bce0399860186f0775da0d8719e26d
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Different (prettier) texture for the Regeneration relic symbol

commit 7cfc153fd6885694c01cce5c4f8abe14e99bccbc
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    And lastly, the Vengeance relic. All of the skins are now done.

commit 0419a2cae112bb0d5b44ee748df9552a4f8685f2
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Resurrection skin. One more relic left!

commit b1b3952e071e2c356e8a173ce5aece705b879998
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Invisibility with Radioactive, only two symbols left

commit bc6f763bd8f34dbf1853cc1eda6e835b13a103e8
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Speed, Jump and Flight

commit 8ed976575884eeb8038c1e3c639d53f249c42a87
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disability and Team Boost symbols

commit c4dda893111436f0d54e1a586f6bdf09b03bc95c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Symbols for Damage, Splash Damage, and Firing Speed relics

commit e795544eea87c8621718eb0a95c5ceaed9b9972d
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Update shaders as well

commit b39c624c8cdfa8fd4d093a3058174b7ddc0db3c5
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Rename sign textures and skins, to separate them a bit from the relic model's main textures.

commit 626f5684db656878da9e865e0b80e5054181388c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Vampire and Ammo symbols

commit 82ed7a0b128aa23b6f503c056c7606e56b7f1531
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Switch to glowmod system for relics. They are now colored via code. Symbol textures go grayscale (no alpha channel so no worries).

commit 3ccfa968cc1e597fa83a6aa613270d952bd3e0a0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Textures, shaders and settings for the first two relics.

commit 339859c01e17aee5901c9f81ebd5607cab418519
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Set all relic skins to 0 for now. As i advance with textures for each, I'll enable them manually, to make testing easier.

commit ffa9e303ec843a648de2f1c78bce18c40ad1245b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Set the relics code to use morphed's new model. The skin textures are to follow next.

commit a98d02d0da533001f7a4a499c30773aecdd4f696
Merge: 9b71e16 db45a56
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge remote-tracking branch 'remotes/origin/morphed/relic' into mirceakitsune/mutator_relics

commit 9b71e16f67235ef8a9a2ee69bf42e2083668224f
Merge: 394e4c0 396be1f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit db45a560ba71b7560437519488a54fafaca3f60f
Author: Morphed <Morphed@o2.pl>
Commit: Morphed <Morphed@o2.pl>

    relic model for taokis mutator

commit 394e4c05d71fc8aa42d0280a76589152a7cf3971
Merge: 3136046 0731fd6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit 313604695489ed88b55915513aaaa37edbc446d8
Merge: 44a7bba 57c2420
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit 44a7bba1e8c0825f858d7a0165989705528cc360
Merge: 7c4af88 05b7ffd
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit 7c4af886b969580e82fdf4749def0ac23fadc50c
Merge: f369af1 a264c5e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit f369af125642e2b96c3ee2db3ddb6c26224620c3
Merge: bcee30e d7cca4c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit bcee30e347e2ed7b1d40328b387cee14a9c3ccde
Merge: ac60757 9d50e84
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

    Conflicts:
        qcsrc/client/hud.qc
        qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c

commit ac60757f55f62823841b1111a2f09377bbee9eac
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Get rid of all the useless 'returns 1' lines

commit 1171a3dc7bc46a1917028aed3885481714eaf277
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use a different method of respawning relics when they are used rather than just dropped

commit 746deb3bb0b1946762fc39358b322c5a1a59d57b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Randomize relic respawn time. They still spawn at the same time when the game starts however (that would be harder to change and would also mean less relics at game start, which IMO wouldn't be preferred).

commit 94f2c152808db4acfd06afed0b4fce0fbf82f38f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Clear relic curses / boosts when the player dies or spectates

commit b6339813925206609c7645f248ef8ba81c5567a3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Don't execute some relic effects when entities are not players or are dead players

commit 01d39da71fff424ed932e43419918deff54b54d6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Relics shall not be FL_ITEM, as that brakes stuff.

commit 7ad00c72d35b66d6f21004b37b88f6bd71708603
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Relics will eventually use one model with several skins, so adapt the code to that (but comment it out till we have the models)

commit f774466dd0d0d8a270223a48bc8fdd8136f11499
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix forgotten priority orders

commit efbef57699c8a7e2c58b82cfeee49157487d9c76
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Drop relics under some circumstances. For freezetag, when the player gets frozen. For keepaway, when the ball carrier picks up the ball (to avoid over-powering him).

commit 1931b03f4b9d47d8ab57d7ac8837d7689706cd5d
Merge: bce3c64 000100e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit bce3c6487f4bb721afe713d9e05036f0c65270f0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use nexball model temporarily, instead of the fake orbs

commit 0d0b32b836216f7680808631d95b1123ed1ea92c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Relic autoreplace: Make it a client setting rather than server setting, so it's an user option

commit d57345369255fdf9ed8c585315dee93c4d513991
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Delete the relic system removal code, as it obviously doesn't run during the game if you toggle the cvar (so you could enable / disable relics on the go like I thought at first)

commit 8805d400cd6c1729de3dc6285a78755d8d5e7e04
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disability relic: Cvar whether shooting ourselves should curse us too (disabled by default). I won't be adding this switch to the team boost relic however, as that's team specific and must do team-related things only (not boost the carrier).

commit c25e448c4beb3f4851e619de1e3a981f4900bcef
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Don't pickup a relic if the player is holding the 'drop relic' button while touching it

commit f125b6151bf58d03304e9b317240377f8048b416
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Auto-replace cvar. When enabled, touching a different relic than the one you are holding will cause you to drop your old relic automatically and pickup the new one. Should encourage relic circulation too. Currently, due to some unknown bug, you drop both relics when this is enabled :/

commit 7ba152d023d1d3232afb24d6b6cfeb1cb1088001
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disability relic: Don't allow disabling yourself if you shoot yourself. Could make more sense to allow that still... perhaps should be cvared

commit fcb7a443be9d1606ad8bee8256560fa3a3070b30
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Reset some relic effects when the relic is dropped, rather than each frame

commit fe4e3eb0eb1908c462a428cd15cd842bfc2debd2
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Flight relic. Helps players fly around instead of walking.

commit e656455ce6717646e1ca7b900ec702fb57de04e0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove debug print

commit a3f020aac5f542ab17c26d43460fb32920e0ed05
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Don't include self for team boost relic!

commit 4067f9df6ceef229e50da4d72c023396fa2481d5
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Smaller radius by default for the team boost relic

commit 6568c6c30fa264efc525c08810fcd07e4d470e89
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Team Boost relic. Only spawns in team games, and gives team mates the boosts that the curse relic does to opponents (movement speed, jump height, firing speed). Dedicated to morphed :)

commit e9f4f093332ba509e129207569c88354add151ca
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Finally, play sounds and particles properly

commit 9d226983b058d7ea86cb5a672fb86a3763e8b5c7
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix firingspeed relic particles

commit 31b715fbc2abc0d7038248851f3ed65fe70c5277
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove testing dprint

commit 8233f223ddfdbe7a0366a3cd0cdb9377dbddde15
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Split the firing speed relic in two parts (to play sounds and effects properly), and tweak the new modifier for it

commit 1d06b9431ebafc6f81e05a3321c44507f4edd46e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Make the firing speed modifier dependent on the last changes, and implement it properly

commit fa85573c5587a657376bc7d7a4f867c92c01bb66
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    cvar all g_weapon property cvars. Done in this branch as it's needed for a change of the firing relic

commit b3b396f731fc54d215f038a98fa5cbbe0284ea55
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Execute jump hook every actual jump, rather than when holding the jump button. to be done about the firing hook next

commit 3d9f904414ed758dd55a6c6e7dbec1d225b9c512
Merge: 1d52812 1e7dcfb
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit 1d52812361c55b823e92ecfb21635d769831df93
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Cvar relic drop speed and make it bigger by default

commit 4d5499ecd990b27e219e381f6fa95e3a52ad87f5
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Tiny comment fixes

commit 90d8e53d7816bc23d7d82a01c4d92b9ea3418ec0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Moar comments

commit 4a8b57df119c4478c13adeb9f329725d316cf7cc
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Make the relic sound less spammy

commit 62e9e1cb7659816f4a80f19f1f015326975d14ec
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use autocvars where possible

commit cc90b8acac80e0d90d37804da4722d44e9e219d0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove forgotten autocvar

commit 96eb11d8047ef0dbb1c8eb48cfd8cbb8ba7bd303
Merge: 0e3e1d5 d8dc92d
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Merge branch 'master' into mirceakitsune/mutator_relics

commit 0e3e1d56b507baaf44e714ead2e57f1a2db8239c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Create and use IT_RELIC

commit ffd1263cf1642972aaf74c9962477cf32f2ac5b2
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    MOVETYPE_TOSS to MOVETYPE_BOUNCE

commit a431625f025d43d1a20da117878cf9a03838b9f9
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Properly precache everything

commit 0c59789104e4a66bee353d3811e5d3fb11a3e477
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Edit numbers for relic death types, in a way which should be better

commit 86117230f961453538346367dfc3be79972e17f0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    I think the jump relic can be considered non-idle and have a sound

commit d54924c8ca4fbb399f52f929114eae1d71da5ce0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Relic sounds at last. Play whenever a relic comes into effect (except for relics that work idly, such as regeneration and speed)

commit 0f0c1eee55974aa73d75ec215642a016e23addba
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix sound system. Still no sounds added yet

commit 60ef1de0b8c2cca2b68a21dfe337e5e6bde3ceaf
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix locals with names of globals, pointed on IRC earlier

commit 4e27e057f82c690adfca3b4abc2075f545c5ed98
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Greater particle count, and brighter particles for damage relic

commit eb2d5ae51163eb249ca5ee154f475ccf506d5cb9
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Give one-time particle effects more count. Eg: The speed relic particles need a count of 1, because they're executed continuously, But resistance relic particles are only executed when you are shot, which isn't as often, so the count needs to be bigger.

commit 255947ac5371a22ab8a2a0a6ad6b944201ff3181
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Properly call the PlayerFiring hook only when the player is firing

commit 08aea8fc3683aad67561e10a5d8f1a422cf8f759
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Cvar relics effects, leave them on by default

commit 6be4fd37313a3229e549a2562e5675ba93931d30
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disability relic: Those cursed by it also generate particle effects

commit bfaa64d23a92f5da22d6d2bc9824f836eac7a60c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Radioactive relic: Don't step and cause particles when we don't damage someone.

commit 8abeb7bdb16e6349e02ad2add4b255faec145c3d
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Particles for all relics when they come into effect. Copied from the stardust effect and only colors were changed (they need to be made more specific)

commit 7cfe22b0f0dd22a36f9f03a5041c6679b6ad8002
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix comments and forgotten code

commit 44f2b6e61b34b7233f290be29078137ae26612e3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Port all relic effects to the mutator system using hooks (major change!) Needs to be re-tested. Please report any malfunctioning relics on IRC to Taoki!

commit 4a00c723902296d608d52940ddf46bc23518fd57
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    The relic names can now go back to normal

commit 33cc70c8d529e03eefed5b8c479aeda6faf898e4
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove per-relic trail colors, and only show trails on dropped relics. Instead of showing trails on the player, relics should cause particle effects whenever they go into effect.

commit d615a9ca7b3a0d278c56dda390948798d356bacc
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Arrange and tweak the Disability relic cvars

commit dd1f65c48ff03ef055efd5a980b471886fc76fc3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disability relic. The player who is shot by the carrier of this relic is cursed for several seconds. The curses are: Slower walking speed, lower jump speed, lower firing rate.

commit fe342f61bb8749804a71aa335fc6c62e4ac99fa3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix cvar names, to properly get the trails cvars

commit 5a7cef6ddc2b45d4c427bfee4fa5f659a21faa59
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix death message

commit ace478929e6648174a667eae22500db803d027a6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Disallow self damage with all relics

commit 5baa2862db8d6123f0c52b15790309e7cef9ea8a
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Reorder Splash Damage relic

commit 64e99f3bb672b937d8a1497796da24e66b1ecb85
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Base the transmitted damage on the initial damage you have dealt.

commit c1b4fc762508e9eec4aca2e50077d9f7541e05d1
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Splash damage relic. When the player shoots someone, anyone near the person who got shot will also take damage.

commit 214a468da8d3c0cb598f7b0d92cc0ead24d6402e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Move the firing rate modifier so it's dynamically updated

commit cc4c3f48faaaca2a651944800db69c92f5a2fd85
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Firing Rate relic: Create a global firing speed float, rather than calculating it in each location. This should also make it easier to modify the firing speed of all weapons for other new features (eg: a reimplementation of the Dual Weilding mutator)

commit fb1fa10c143d3132dd5da9e1f273fdca61f8bb43
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix keybind.

commit b31c15790c7b1d78e85f54d66ca92232ca43eaa6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix a forgotten = instead of ==

commit fbba9907b21cb91b553d727705ce8dfccb9a89c5
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Better way of dropping relics upon dying, spectating or disconnecting.

commit 391977996e3d29989d9015dcb8212eb88075ec6e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Drop relics if the player disconnects while holding them

commit b64e317e7236501a3dd207b550f48fbac91d699c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix several bugs in the relic code, and do some cleanups.

commit 81f34afa9adb9de42a41f222794e2c517961ac54
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Reorder a relic in the code.

commit fe69c3e0c536127b4392b3a544e97c00f6697f81
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Lastly, the last relic in my list, the radioactive relic. Those who sit close to the person who has it get damaged (that does include team mates, so be careful)

commit 1eb29c55a0966373c23da4d42a3f72c5a8fa4334
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Ammo regeneration relic.

commit 29697ef74dca6d1effd607fb62a5ad070bccd702
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Health regeneration relic. Does not spawn when normal health regen / rot is enabled (which means it won't work by default).

commit 5f67a1ff331406b9d5b0285a4a988f4a04cbee32
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Firing speed relic. This one must be self explanatory

commit 23d6b0b0f9328e9b220c297da14534e9a13cef8a
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Don't allow certain relics to work with suicides or team kills.

commit ffec63be666c45a3e4cad7261d2691c1f7f466c6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Vampire relic. Does not spawn when the vampire mutator is active.

commit 23a5288cf8af023862e0f1502364db042a7a8688
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Jump relic, name says it all

commit b5267815e6df14c8c5e5699cd290d1b91d5406ec
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Vengeance relic: Give it its own deathtype and death messages.

commit 20864ff4670917c0b06529c4a8f30bfa6017d92e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Vengeance relic: Gie score to the owner of the relic if someone dies in the explosion

commit aa2980a7015828e73d88857f25aa68b43fa18ef2
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    I also don't think relic carriers need to cast lightning

commit 97c4ddd7d244e1dd5ba5438cfb2ed13e730838ce
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    No trail color for invisibility by default, it's against it's purpose :P

commit 717dc007c9034b68bf209f3a78115623f8883a5f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Invisibility relic. Makes players harder to see

commit b2ccb9008a3808adf6f6a1c6646d1a3ac8f1a974
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Vengeance relic. When the carrier dies, he causes a big explosion, harming anyone who is close.

commit 09c91f5c5d325129aa7c043313ed369d9a2f35d3
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix some messages and improve the relic using code.

commit c96ef828b86da2eccbe5a959039ca4316d5f9c6c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Resurrection relic. Saves your life if you die while holding it, and resets your health back to spawn default.

commit 63e0f4deee604f885db0d4300d352741f2947076
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Minor tweaks here and there, and some balancing. I now consider the code ready.

commit 05d8a5b34cf1745d9529d69c4159426590e9374b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Relics in the menu

commit fd6d5e977f9fe1b1222a88f1170c336971b6cced
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Add keybind for dropping relics as well

commit e637cac63049e78d0f90ed9b4ccc4e7e79c3418f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Per-relic trail colors, with possibility to disable trails

commit a9a5ba3f850188ee679d92f9a8e402f0c4e1b6e0
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove a comment.

commit 3507140e75572d9c300d7a78bbc8c6c435b148d9
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Messages when picking up / dropping relics.

commit 0548800b40636a96e836a08cbe35e8b23d15fd11
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Tweak sounds to be better. Relics use Keepaway sounds, but IMO they're good.

commit 1648f3bb7d371e6b2728cc3462523a9351fc12dc
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Implement 3 relics: Resistance, Damage, and Speed. Their names are self explanatory. Also, Relics are now test-able!

commit c286a4bddfc1ce28167756b7905e45648f63bd4c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    I don't think relics should make the player change alpha, as they're meant to be rather discrete powerups.

commit f2df4b569e9e3e6bb636a9da09ae03a48b8a6929
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Remove relics when mutator is disabled. Should work, but doesn't seem to for some reason.

commit cc43b76b023f588039e09795710bb04019758837
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Forgotten init options

commit 3c8508a7bf340db5c145b0428fcda21ff862f64f
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Let there be cvars!

commit e95a3470ac220767155c812c66278e01b538c554
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Make model specific to relic type.

commit 785be49dbc9258cbf637bd29926413632e46e610
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Oops... fix something I forgot.

commit b7fa85ac4bc48e9aa390ff4ba51bd4cde2ff6951
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Add the waiting back as well.

commit 4860d9dece3cbe70108caed783e71ed6797407a2
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Actually, relics should be invisible when held. Some relics should also be hidden from opponents, for surprise effects.

commit f200e5dda4f263eeb03250d6430b77ee3763b1e8
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Position that code properly

commit f2d35526b3c727762458a5ba7aa391ba97053414
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Don't allow picking up a relic when we're already holding one.

commit 5b48875000e02cab6559506cb7a7538f6a203985
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Drop relics when dying or spectating. TODO: Make a Drop Relic key as well? Also more work on the first relic (health regeneration).

commit eeab2986ae28a1e20223e0a3b05e589b04e650a4
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Properly initialize the entity and make fix a crash. We now have a relic that spawns around the map and can be picked up.

commit f84bb52f7426e2ba9dab4ef5111c9fbd6573905e
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    More progress, and include forgotten file from last commit. Still not functional.

commit f4a20a3b36640c3a2910e5337d1b6d2e385c2b93
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Attempt to create a Relics mutator, similar to the one in UT (to replace Runematch). No functional code yet. Description of the mutator:

    Several relics (items) spawn around the map. Each grants a special ability (no penalty) to the person carrying it. A player can only carry one relic at a time. When the player dies, they drop the relic and someone else can pick it up again. Abilities can include: Health regeneration, stronger weapons, faster speed, and many others.

User agreed to the GPLv2+.

Diff:

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6aa33a8..9a2ef10 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -541,6 +541,68 @@ alias clearmap "disconnect" 

 set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up" 

+set g_relics 0 "Relics spawn around the map, each granting a reward to the player holding it" 
+set g_relics_damageforcescale 2 "Scale of force which is applied to the relic by weapons / explosions / etc" 
+set g_relics_respawntime_min 15 "If no one picks up a relic, how long to wait until it respawns, minimum time" 
+set g_relics_respawntime_max 30 "If no one picks up a relic, how long to wait until it respawns, maximum time" 
+set g_relics_dropforce 300 "Maximum velocity at which players drop their relics" 
+set g_relics_trail_color 254 "Particle trail color from the relic, 0 disables" 
+set g_relics_effects 1 "Enable particles and sounds when relics go into effect" 
+set g_relics_type_resistance 1 "How many Resistance relics to place on the map" 
+set g_relics_type_resistance_amount 1.35 "How much holding the Resistance relic protects you" 
+set g_relics_type_regeneration 1 "How many Regeneration relics to place on the map" 
+set g_relics_type_regeneration_speed 1 "How fast holding the Regeneration relic heals you" 
+set g_relics_type_regeneration_limit 0 "Health regeneration limit. 0 uses default health regen limit" 
+set g_relics_type_vampire 1 "How many Vampire relics to place on the map" 
+set g_relics_type_vampire_amount 0.25 "How much health the Vampire relic gives you. 1 = all damage you dealt, 0.5 half of the damage you dealt" 
+set g_relics_type_vampire_limit 0 "How much health the Vampire relic can give you. 0 uses global maximum health" 
+set g_relics_type_ammo 1 "How many Ammo relics to place on the map" 
+set g_relics_type_ammo_shells_speed 0.5 "How fast holding the Ammo relic gives you Shells" 
+set g_relics_type_ammo_nails_speed 2 "How fast holding the Ammo relic gives you Nails" 
+set g_relics_type_ammo_cells_speed 1.5 "How fast holding the Ammo relic gives you Cells" 
+set g_relics_type_ammo_rockets_speed 1 "How fast holding the Ammo relic gives you Rockets" 
+set g_relics_type_ammo_fuel_speed 1 "How fast holding the Ammo relic gives you Fuel" 
+set g_relics_type_damage 1 "How many Damage relics to place on the map" 
+set g_relics_type_damage_amount 1.35 "How much holding the Damage relic boosts your damage" 
+set g_relics_type_splashdamage 1 "How many Splash Damage relics to place on the map" 
+set g_relics_type_splashdamage_damage 0.5 "How much of the damage you dealt is transmitted by the Splash Damage relic" 
+set g_relics_type_splashdamage_edgedamage 0 "How much of the damage you dealt is transmitted by the Splash Damage relic around its edge" 
+set g_relics_type_splashdamage_radius 250 "Radius of the Splash Damage relic" 
+set g_relics_type_firingspeed 1 "How many Firing Speed relics to place on the map" 
+set g_relics_type_firingspeed_amount 1.25 "How much holding the Firing Speed relic boosts your firing speed" 
+set g_relics_type_disability 1 "How many Disability relics to place on the map" 
+set g_relics_type_disability_allowself 0 "If the relic owner shoots himself, he is also cursed" 
+set g_relics_type_disability_firingspeed_cut 1.35 "How much the Disability relic's curse decreases firing rate, 0 disables this curse" 
+set g_relics_type_disability_speed_cut 1.35 "How much the Disability relic's curse decreases walking speed, 0 disables this curse" 
+set g_relics_type_disability_jump_cut 1.5 "How much the Disability relic's curse decreases jump height, 0 disables this curse" 
+set g_relics_type_disability_duraton 4 "How much the Disability relic's curse lasts" 
+set g_relics_type_teamboost 1 "How many Team Boost relics to place on the map" 
+set g_relics_type_teamboost_firingspeed_boost 1.35 "How much the Team Boost relic's curse increases firing rate, 0 disables this boost" 
+set g_relics_type_teamboost_speed_boost 1.35 "How much the Team Boost relic's curse increases walking speed, 0 disables this boost" 
+set g_relics_type_teamboost_jump_boost 1.5 "How much the Team Boost relic's curse increases jump height, 0 disables this boost" 
+set g_relics_type_teamboost_duraton 4 "How much the Team Boost relic's boost lasts" 
+set g_relics_type_teamboost_radius 350 "Radius around which team mates are boosted" 
+set g_relics_type_speed 1 "How many Speed relics to place on the map" 
+set g_relics_type_speed_amount 1.25 "How much holding the Speed relic increases your velocity" 
+set g_relics_type_jump 1 "How many Jump relics to place on the map" 
+set g_relics_type_jump_amount 1.5 "How much holding the Jump relic increases your jump height" 
+set g_relics_type_flight 1 "How many Flight relics to place on the map" 
+set g_relics_type_flight_speed 1.5 "How much to boost speed while flying" 
+set g_relics_type_invisibility 1 "How many Invisibility relics to place on the map" 
+set g_relics_type_invisibility_alpha 0.25 "Player alpha while holding the Invisibility relic" 
+set g_relics_type_radioactive 1 "How many Radioactive relics to place on the map" 
+set g_relics_type_radioactive_damage 15 "How much damage the Radioactive relic deals" 
+set g_relics_type_radioactive_edgedamage 0 "How much damage the Radioactive relic deals around its edge" 
+set g_relics_type_radioactive_radius 350 "Radius of the Radioactive relic" 
+set g_relics_type_resurrection 1 "How many Resurrect relics to place on the map" 
+set g_relics_type_resurrection_health 0 "How much health the Resurrect relic revives you with, 0 uses default spawn health" 
+set g_relics_type_vengeance 1 "How many Vengeance relics to place on the map" 
+set g_relics_type_vengeance_damage 100 "How much damage the Vengence relic deals" 
+set g_relics_type_vengeance_edgedamage 50 "How much damage the Vengence relic deals around its edge" 
+set g_relics_type_vengeance_force 100 "How much push the Vengence relic deals" 
+set g_relics_type_vengeance_radius 1000 "Radius of the Vengence relic" 
+set cl_relics_autoreplace 0 "If you touch a different relic than the one you are holding, you will automatically pick it up and drop the old one" 
+
 set g_dodging 0 "set to 1 to enable dodging in games" 
 set g_rocket_flying 0 "set to 1 to enable rocket flying in all balance configs" 

@@ -961,6 +1023,8 @@ alias +attack2 +button3 // old alias from Nexuiz
 alias -attack2 -button3 // old alias name from Nexuiz
 alias +crouch +button5
 alias -crouch -button5
+alias +droprelic +button9
+alias -droprelic -button9
 alias weapnext "_weapnext_${cl_weaponpriority_useforcycling}" 
 alias _weapnext_0 "impulse 18" 
 alias _weapnext_1 "impulse 15" 
diff --git a/effectinfo.txt b/effectinfo.txt
index e2b476c..55681b0 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -5195,6 +5195,244 @@ velocitymultiplier 15
 airfriction -1
 rotate 0 360 -180 180

+// relic_resistance effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_resistance
+count 20
+type static
+color 0x00ff80 0x00ff80
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_regeneration effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_regeneration
+count 1
+type static
+color 0x00ffff 0x00ffff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_vempire effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_vampire
+count 20
+type static
+color 0xff00ff 0xff00ff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_ammo effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_ammo
+count 1
+type static
+color 0x80ff00 0x80ff00
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_damage effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_damage
+count 20
+type static
+color 0xff0000 0xff0000
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_splashdamage effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_ssplashdamage
+count 20
+type static
+color 0xff8000 0xff8000
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_firingspeed effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_firingspeed
+count 20
+type static
+color 0xffff00 0xffff00
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_disability effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_disability
+count 20
+type static
+color 0x0000ff 0x0000ff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_disability_curse effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_disability_curse
+count 1
+type static
+color 0x000080 0x000080
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_teamboost effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_teamboost
+count 20
+type static
+color 0xffffff 0xffffff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_teamboost_boost effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_teamboost_boost
+count 1
+type static
+color 0x808080 0x808080
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_speed effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_speed
+count 1
+type static
+color 0x80ffff 0x80ffff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_jump effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_jump
+count 20
+type static
+color 0xffff80 0xffff80
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_flight effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_flight
+count 1
+type static
+color 0x8080ff 0x8080ff
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_radioactive effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_radioactive
+count 20
+type static
+color 0x00ff00 0x00ff00
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_resurrection effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_resurrection
+count 20
+type static
+color 0xff0080 0xff0080
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
+// relic_vengeance effect, used by the relics mutator
+// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
+effect relic_vengeance
+count 20
+type static
+color 0xff8080 0xff8080
+size 1.5 1.5
+alpha 128 256 256
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 8 8 32
+velocityjitter 64 64 32
+
 // seeker missile trail
 effect TR_SEEKER
 trailspacing 10
diff --git a/keybinds.txt b/keybinds.txt
index 56ff29d..53f32cb 100644
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -56,6 +56,9 @@
 "dropweapon"                            "drop weapon" 
 "+use"                                  "drop key / drop flag" 
 ""                                      "" 
+""                                      "Mutators" 
+"+droprelic"                            "drop relic" 
+""                                      "" 
 ""                                      "User defined" 
 "+userbind 1"                           "$userbind1" 
 "+userbind 2"                           "$userbind2" 
diff --git a/models/relic/relic.md3 b/models/relic/relic.md3
new file mode 100644
index 0000000..7e65e4c
Binary files /dev/null and b/models/relic/relic.md3 differ
diff --git a/models/relic/relic.md3.framegroups b/models/relic/relic.md3.framegroups
new file mode 100644
index 0000000..4e33f6f
--- /dev/null
+++ b/models/relic/relic.md3.framegroups
@@ -0,0 +1 @@
+0 99 30 1
\ No newline at end of file
diff --git a/models/relic/relic.md3_0.skin b/models/relic/relic.md3_0.skin
new file mode 100644
index 0000000..75b5545
--- /dev/null
+++ b/models/relic/relic.md3_0.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_resistance
\ No newline at end of file
diff --git a/models/relic/relic.md3_1.skin b/models/relic/relic.md3_1.skin
new file mode 100644
index 0000000..70e0ef0
--- /dev/null
+++ b/models/relic/relic.md3_1.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_regeneration
\ No newline at end of file
diff --git a/models/relic/relic.md3_10.skin b/models/relic/relic.md3_10.skin
new file mode 100644
index 0000000..1c7f136
--- /dev/null
+++ b/models/relic/relic.md3_10.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_jump
\ No newline at end of file
diff --git a/models/relic/relic.md3_11.skin b/models/relic/relic.md3_11.skin
new file mode 100644
index 0000000..13eff1d
--- /dev/null
+++ b/models/relic/relic.md3_11.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_flight
\ No newline at end of file
diff --git a/models/relic/relic.md3_12.skin b/models/relic/relic.md3_12.skin
new file mode 100644
index 0000000..261b1ef
--- /dev/null
+++ b/models/relic/relic.md3_12.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_invisible
\ No newline at end of file
diff --git a/models/relic/relic.md3_13.skin b/models/relic/relic.md3_13.skin
new file mode 100644
index 0000000..05622b5
--- /dev/null
+++ b/models/relic/relic.md3_13.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_radioactive
\ No newline at end of file
diff --git a/models/relic/relic.md3_14.skin b/models/relic/relic.md3_14.skin
new file mode 100644
index 0000000..a20a82a
--- /dev/null
+++ b/models/relic/relic.md3_14.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_resurrection
\ No newline at end of file
diff --git a/models/relic/relic.md3_15.skin b/models/relic/relic.md3_15.skin
new file mode 100644
index 0000000..8b2c2fd
--- /dev/null
+++ b/models/relic/relic.md3_15.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_vengeance
\ No newline at end of file
diff --git a/models/relic/relic.md3_2.skin b/models/relic/relic.md3_2.skin
new file mode 100644
index 0000000..185935a
--- /dev/null
+++ b/models/relic/relic.md3_2.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_vampire
\ No newline at end of file
diff --git a/models/relic/relic.md3_3.skin b/models/relic/relic.md3_3.skin
new file mode 100644
index 0000000..f1eafed
--- /dev/null
+++ b/models/relic/relic.md3_3.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_ammo
\ No newline at end of file
diff --git a/models/relic/relic.md3_4.skin b/models/relic/relic.md3_4.skin
new file mode 100644
index 0000000..f313b58
--- /dev/null
+++ b/models/relic/relic.md3_4.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_damage
\ No newline at end of file
diff --git a/models/relic/relic.md3_5.skin b/models/relic/relic.md3_5.skin
new file mode 100644
index 0000000..ff1c9db
--- /dev/null
+++ b/models/relic/relic.md3_5.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_splashdamage
\ No newline at end of file
diff --git a/models/relic/relic.md3_6.skin b/models/relic/relic.md3_6.skin
new file mode 100644
index 0000000..b9b63c8
--- /dev/null
+++ b/models/relic/relic.md3_6.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_firingspeed
\ No newline at end of file
diff --git a/models/relic/relic.md3_7.skin b/models/relic/relic.md3_7.skin
new file mode 100644
index 0000000..6c0e448
--- /dev/null
+++ b/models/relic/relic.md3_7.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_disability
\ No newline at end of file
diff --git a/models/relic/relic.md3_8.skin b/models/relic/relic.md3_8.skin
new file mode 100644
index 0000000..371887c
--- /dev/null
+++ b/models/relic/relic.md3_8.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_teamboost
\ No newline at end of file
diff --git a/models/relic/relic.md3_9.skin b/models/relic/relic.md3_9.skin
new file mode 100644
index 0000000..71d7955
--- /dev/null
+++ b/models/relic/relic.md3_9.skin
@@ -0,0 +1,3 @@
+ring,models/relic/relic_ring
+mesh,models/relic/relic
+sign,models/relic/sign_speed
\ No newline at end of file
diff --git a/models/relic/relic.tga b/models/relic/relic.tga
new file mode 100644
index 0000000..be9b747
Binary files /dev/null and b/models/relic/relic.tga differ
diff --git a/models/relic/relic_gloss.tga b/models/relic/relic_gloss.tga
new file mode 100644
index 0000000..975cd2d
Binary files /dev/null and b/models/relic/relic_gloss.tga differ
diff --git a/models/relic/relic_glow.tga b/models/relic/relic_glow.tga
new file mode 100644
index 0000000..aba79cf
Binary files /dev/null and b/models/relic/relic_glow.tga differ
diff --git a/models/relic/relic_norm.tga b/models/relic/relic_norm.tga
new file mode 100644
index 0000000..5712ac4
Binary files /dev/null and b/models/relic/relic_norm.tga differ
diff --git a/models/relic/relic_reflect.tga b/models/relic/relic_reflect.tga
new file mode 100644
index 0000000..eb867b5
Binary files /dev/null and b/models/relic/relic_reflect.tga differ
diff --git a/models/relic/relic_ring.tga b/models/relic/relic_ring.tga
new file mode 100644
index 0000000..612c819
Binary files /dev/null and b/models/relic/relic_ring.tga differ
diff --git a/models/relic/relic_ring_glow.tga b/models/relic/relic_ring_glow.tga
new file mode 100644
index 0000000..4c30f89
Binary files /dev/null and b/models/relic/relic_ring_glow.tga differ
diff --git a/models/relic/sign_ammo.tga b/models/relic/sign_ammo.tga
new file mode 100644
index 0000000..b6227f6
Binary files /dev/null and b/models/relic/sign_ammo.tga differ
diff --git a/models/relic/sign_ammo_glow.tga b/models/relic/sign_ammo_glow.tga
new file mode 100644
index 0000000..8849e92
Binary files /dev/null and b/models/relic/sign_ammo_glow.tga differ
diff --git a/models/relic/sign_damage.tga b/models/relic/sign_damage.tga
new file mode 100644
index 0000000..a5658aa
Binary files /dev/null and b/models/relic/sign_damage.tga differ
diff --git a/models/relic/sign_damage_glow.tga b/models/relic/sign_damage_glow.tga
new file mode 100644
index 0000000..b595139
Binary files /dev/null and b/models/relic/sign_damage_glow.tga differ
diff --git a/models/relic/sign_disability.tga b/models/relic/sign_disability.tga
new file mode 100644
index 0000000..e858a8a
Binary files /dev/null and b/models/relic/sign_disability.tga dif

History

#1 Updated by Samual over 3 years ago

I'll review/test it when I get back from vacation. (Assign to me)

#2 Updated by divVerent over 3 years ago

  • Assignee set to Samual

He asked for it.

#3 Updated by divVerent over 3 years ago

  • Status changed from New to In Progress

#4 Updated by divVerent about 3 years ago

Having a great vacation? ;)

#5 Updated by Samual about 3 years ago

Sorry for taking so long :P I think i'll simply work on this one myself for a while -- It needs quite some things re-written, especially how he implemented specific relics and their support. You don't need to add so many hooks, for example..

Another thing i'm discouraged by is this using the same sounds as keepaway. However, I asked one of my friends who does audio work for a living to look into creating new sounds specifically for relics. He just wants a gameplay video for it if that could be provided (I can make one if not) -- he'll also make relic-specific sounds too.

#6 Updated by MirceaKitsune about 3 years ago

  • % Done changed from 0 to 70

From what I remember, I put many relic effects on the same hooks, which should be good. I couldn't find a more optimal way to do it at the time. But sure, feel free to re-write the code however you see fit. Just please don't remove any relics or change functionality without talking about it first (though I think the way they work now should be good).

I'm not a sound artist, and used the sounds from Keepaway because there were no better sounds. If anyone can make some, that would be excellent! And yes, I have an older video of the relics over here: http://www.youtube.com/watch?v=hFvEnWepZ5o Also, I think this should be mostly done, so setting to 70%

#7 Updated by divVerent almost 3 years ago

Any news on this?

#8 Updated by divVerent over 2 years ago

IIRC there was consensus that some of these relics are very weird and should not be allowed by default.

Anyone wanting to take over this?

#9 Updated by MirceaKitsune over 2 years ago

divVerent wrote:

IIRC there was consensus that some of these relics are very weird and should not be allowed by default.

Anyone wanting to take over this?

I think all relics should be allowed by default. Relics are meant to be weird after all, since they give special abilities :P I guess I'm ok with disabling some if really needed, but prefer not to. Also, which were proposed for disabling?

#10 Updated by divVerent over 2 years ago

  • Status changed from In Progress to Waiting for Decision

#11 Updated by divVerent over 2 years ago

  • Status changed from Waiting for Decision to Rejected

I think we can consider this rejected.

Doesn't mean it can't get accepted after changes to make it more sane, though.

#12 Updated by MirceaKitsune over 2 years ago

What changes does it need to be made sane? I thought we're waiting for Samual to test them and they're ok. I see no reason why this one should be rejected, and it would be a large amount of work on a nice feature (IMO) getting lost :( What changes do you consider necessary to get this in soon?

#13 Updated by divVerent over 2 years ago

For starters, it'd be a lot nicer if it'd only have the "standard" runes, i.e. strength, speed, regen, haste by default.

But anyway... there has been no work on this for months, so apparently nobody cared for it. Best would be for you to talk to Samual, then fixing the issues he has, and making a new merge request then.

#14 Updated by MirceaKitsune over 2 years ago

Defaults can be disabled via cvars. I haven't worked on it because it's been finished IIRC, and I waited for Samual to test it. Last time there weren't any bugs I can remember. I'll poke Samual about it then.

#15 Updated by MirceaKitsune over 2 years ago

  • Status changed from Rejected to Feedback

An year passed since this branch has been merge requested (no major changes being done or requested since). Although I agree with divVerent on me being more patient, this really is waiting for an year. And no, the feature is NOT rejected... at least not under a discussion or demand that I refused to add. So again, I'm waiting for feedback.

I'm asking again, and would really appreciate it if the developers could please give a reply: The only complaint I remember being active is "some relics are too weird, disable them by default". WHICH relics do you want disabled? Can you post a list of the ones you want enabled normally, and the ones you want off? Note that I don't agree with removing any from the code, just by cvar setting.

If you don't want to try out the branch, that's ok. There's still a list of relics and what each does available here: http://dev.xonotic.org/projects/xonotic/wiki/Relics Just please let me know which to disable for this to be finalized. If there's no feedback, I'll disable the ones I find appropriate myself, and consider that final. So far only div mentioned his exact list.

#16 Updated by merlijn about 2 years ago

  • Priority changed from Normal to High

At this point it makes sense to file a new Merge Request for this feature. I suppose we can safely say from the lack of interest that this branch as it is now has been rejected.

@Samual: Can you PLEASE provide clear instructions on what needs to be changed/fixed so that a new MR could be accepted?

#17 Updated by Samual over 1 year ago

  • Target version set to 0.9

#18 Updated by Mario 2 months ago

  • Status changed from Feedback to Closed
  • % Done changed from 70 to 100

A new branch (Mario/buffs) based loosely on relics is being requested for merge:
[[http://dev.xonotic.org/issues/1980]]

Also available in: Atom PDF