From: Mario Date: Tue, 4 Aug 2015 02:30:37 +0000 (+1000) Subject: Merge branch 'master' into Mario/buff_updates X-Git-Tag: xonotic-v0.8.1~18^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e3eea33053f3a86b7b44b755c31b3147075598e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/buff_updates # Conflicts: # effectinfo.txt # qcsrc/common/notifications.qh # qcsrc/common/stats.qh --- 0e3eea33053f3a86b7b44b755c31b3147075598e diff --cc effectinfo.txt index 49ae480df,f7bdc1d23..7990d74d7 --- a/effectinfo.txt +++ b/effectinfo.txt @@@ -9177,241 -9177,187 +9177,425 @@@ effect arc_overheat_fire // arc overhea liquidfriction 5 velocitymultiplier 80 + // yellowflag_touch -- effects for touching the yellow flag + // used nowhere in code + effect yellowflag_touch + count 35 + type spark + tex 40 40 + color 0xFFFF0F 0xFFFF0F + size 1 3 + alpha 0 256 556 + gravity 1 + bounce 1.5 + originjitter 1 1 1 + velocityjitter 300 300 300 + velocitymultiplier 0.5 + airfriction 3 + + // pinkflag_touch -- effects for touching the pink flag + // used nowhere in code + effect pinkflag_touch + count 35 + type spark + tex 40 40 + color 0xFF0FFF 0xFF0FFF + size 1 3 + alpha 0 256 556 + gravity 1 + bounce 1.5 + originjitter 1 1 1 + velocityjitter 300 300 300 + velocitymultiplier 0.5 + airfriction 3 + + // neutralflag_touch -- effects for touching the neutral flag + // used nowhere in code + effect neutralflag_touch + count 35 + type spark + tex 40 40 + color 0xFFFFFF 0xFFFFFF + size 1 3 + alpha 0 256 556 + gravity 1 + bounce 1.5 + originjitter 1 1 1 + velocityjitter 300 300 300 + velocitymultiplier 0.5 + airfriction 3 + + // yellow_pass + // used nowhere in code + effect yellow_pass + trailspacing 64 + color 0xFFFF0F 0xFFFF0F + size 2 2 + tex 32 32 + alpha 64 128 64 + airfriction 5 + sizeincrease 2 + type static + effect yellow_pass + trailspacing 12 + color 0xFFFF0F 0xFFFF0F + size 1 1 + tex 0 8 + alpha 32 64 32 + airfriction 9 + sizeincrease 8 + velocityjitter 64 64 64 + type static + effect yellow_pass + trailspacing 12 + color 0xFFFF0F 0xFFFF0F + size 4 4 + //tex 48 55 + alpha 256 256 1280 + type static + + // pink_pass + // used nowhere in code + effect pink_pass + trailspacing 64 + color 0xFFFFFF 0xFFFFFF + size 2 2 + tex 32 32 + alpha 64 128 64 + airfriction 5 + sizeincrease 2 + type static + effect pink_pass + trailspacing 12 + color 0xFFFFFF 0xFFFFFF + size 1 1 + tex 0 8 + alpha 32 64 32 + airfriction 9 + sizeincrease 8 + velocityjitter 64 64 64 + type static + effect pink_pass + trailspacing 12 + color 0xFFFFFF 0xFFFFFF + size 4 4 + //tex 48 55 + alpha 256 256 1280 + type static + + // neutral_pass + // used nowhere in code + effect neutral_pass + trailspacing 64 + color 0xFFFFFF 0xFFFFFF + size 2 2 + tex 32 32 + alpha 64 128 64 + airfriction 5 + sizeincrease 2 + type static + effect neutral_pass + trailspacing 12 + color 0xFFFFFF 0xFFFFFF + size 1 1 + tex 0 8 + alpha 32 64 32 + airfriction 9 + sizeincrease 8 + velocityjitter 64 64 64 + type static + effect neutral_pass + trailspacing 12 + color 0xFFFFFF 0xFFFFFF + size 4 4 + //tex 48 55 + alpha 256 256 1280 + type static + + // yellow_cap -- yellow team capture effect + effect yellow_cap + count 500 + type spark + tex 64 64 + color 0xFFFF0F 0xFFFF0F + size 1 1 + alpha 0 256 100 + stretchfactor 2 + //gravity 1 + bounce 1.5 + originjitter 1 1 1 + velocityjitter 1000 1000 1500 + velocitymultiplier 0.5 + airfriction 2 + stretchfactor 0.6 + effect yellow_cap + countabsolute 1 + type smoke + tex 65 65 + size 150 150 + alpha 190 190 180 + sizeincrease -80 + color 0xFFFF0F 0xFFFF0F + + // pink_cap -- pink team capture effect + effect pink_cap + count 500 + type spark + tex 64 64 + color 0xFF0FFF 0xFF0FFF + size 1 1 + alpha 0 256 100 + stretchfactor 2 + //gravity 1 + bounce 1.5 + originjitter 1 1 1 + velocityjitter 1000 1000 1500 + velocitymultiplier 0.5 + airfriction 2 + stretchfactor 0.6 + effect pink_cap + countabsolute 1 + type smoke + tex 65 65 + size 150 150 + alpha 190 190 180 + sizeincrease -80 + color 0xFF0FFF 0xFF0FFF + +// 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 diff --cc qcsrc/common/notifications.qh index 13487ad83,1f1e9828c..d26f47b79 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@@ -352,21 -375,6 +375,7 @@@ void Send_Notification_WOCOVA MSG_INFO_NOTIF(2, INFO_SUPERSPEC_MISSING_UID, 0, 0, "", "", "", _("^F2You lack a UID, superspec options will not be saved/restored"), "") \ MSG_INFO_NOTIF(1, INFO_CA_JOIN_LATE, 0, 0, "", "", "", _("^F1Round already started, you will join the game in the next round"), "") \ MSG_INFO_NOTIF(1, INFO_CA_LEAVE, 0, 0, "", "", "", _("^F2You will spectate in the next round"), "") \ - MULTITEAM_INFO(1, INFO_CTF_CAPTURE_, 2, 1, 0, "s1", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag"), "") \ - MULTITEAM_INFO(1, INFO_CTF_CAPTURE_BROKEN_, 2, 2, 2, "s1 f1p2dec s2 f2p2dec", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG%s^BG's previous record of ^F2%s^BG seconds"), "") \ - MULTITEAM_INFO(1, INFO_CTF_CAPTURE_TIME_, 2, 1, 1, "s1 f1p2dec", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds"), "") \ - MULTITEAM_INFO(1, INFO_CTF_CAPTURE_UNBROKEN_, 2, 2, 2, "s1 f1p2dec s2 f2p2dec", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F2%s^BG seconds, failing to break ^BG%s^BG's previous record of ^F1%s^BG seconds"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_ABORTRUN_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was returned to base by its owner"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_DAMAGED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_DROPPED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_NEEDKILL_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to base"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_SPEEDRUN_, 2, 0, 1, "f1p2dec", "", "", _("^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned itself"), "") \ - MULTITEAM_INFO(1, INFO_CTF_FLAGRETURN_TIMEOUT_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag has returned to the base"), "") \ - MULTITEAM_INFO(1, INFO_CTF_LOST_, 2, 1, 0, "s1", "s1", "notify_%s_lost", _("^BG%s^BG lost the ^TC^TT^BG flag"), "") \ - MULTITEAM_INFO(1, INFO_CTF_PICKUP_, 2, 1, 0, "s1", "s1", "notify_%s_taken", _("^BG%s^BG got the ^TC^TT^BG flag"), "") \ - MULTITEAM_INFO(1, INFO_CTF_RETURN_, 2, 1, 0, "s1", "s1", "notify_%s_returned", _("^BG%s^BG returned the ^TC^TT^BG flag"), "") \ - MULTITEAM_INFO(1, INFO_CTF_RETURN_MONSTER_, 2, 1, 0, "s1", "s1", "notify_%s_returned", _("^BG%s^BG returned the ^TC^TT^BG flag"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_BUFF, 3, 3, "spree_inf s1 s2 f3buffname s3loc spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was killed by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"), _("^BG%s%s^K1 was scored against by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s")) \ MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_CHEAT, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was unfairly eliminated by ^BG%s^K1%s%s"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_DROWN, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_water", _("^BG%s%s^K1 was drowned by ^BG%s^K1%s%s"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_fall", _("^BG%s%s^K1 was grounded by ^BG%s^K1%s%s"), "") \ diff --cc qcsrc/common/stats.qh index e6e93a660,fdb9da2a9..8778a77f0 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@@ -109,12 -109,12 +109,11 @@@ const int STAT_OK_AMMO_CHARGE const int STAT_OK_AMMO_CHARGEPOOL = 86; const int STAT_FROZEN = 87; const int STAT_REVIVE_PROGRESS = 88; - const int STAT_BUFF_TIME = 89; - // 90 empty? - // 91 empty? - // 92 empty? -const int STAT_WEAPONSINMAP = 89; -const int STAT_WEAPONSINMAP2 = 90; -const int STAT_WEAPONSINMAP3 = 91; -const int STAT_CTF_FLAGSTATUS = 92; --// 93 empty? --// 94 empty? ++const int STAT_BUFF_TIME = 90; ++const int STAT_WEAPONSINMAP = 91; ++const int STAT_WEAPONSINMAP2 = 92; ++const int STAT_WEAPONSINMAP3 = 93; ++const int STAT_CTF_FLAGSTATUS = 94; // 95 empty? // 96 empty? // 97 empty?