From: otta8634 Date: Fri, 9 May 2025 17:32:30 +0000 (+0800) Subject: Merge remote-tracking branch 'origin' into TimePath/guide X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41feed4f96753158e9c561a46f9d012fd9b80f31;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin' into TimePath/guide --- 41feed4f96753158e9c561a46f9d012fd9b80f31 diff --cc qcsrc/common/gamemodes/gamemode/cts/cts.qh index 166ae53376,87ecd23ac6..5030ca00db --- a/qcsrc/common/gamemodes/gamemode/cts/cts.qh +++ b/qcsrc/common/gamemodes/gamemode/cts/cts.qh @@@ -6,31 -6,31 +6,31 @@@ #endif CLASS(RaceCTS, Gametype) - INIT(RaceCTS) - { - this.gametype_init(this, _("Race CTS"),"cts","g_cts",0,"cloaked","timelimit=20",_("Race to the finish line for the fastest time")); - } - METHOD(RaceCTS, m_generate_mapinfo, void(Gametype this, string v)) - { - if(v == "target_startTimer") - MapInfo_Map_supportedGametypes |= this.gametype_flags; - } - METHOD(RaceCTS, m_setTeams, void(string sa)) - { - // this is the skill of the map - // not parsed by anything yet - // for map databases - // cvar_set("fraglimit", sa); - } - METHOD(RaceCTS, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns)) - { - TC(Gametype, this); - returns(menu, _("Point limit:"), 50, 500, 10, string_null, string_null, string_null); - } + INIT(RaceCTS) + { - this.gametype_init(this, _("Race CTS"),"cts","g_cts",0,"cloaked","timelimit=20",_("Race for fastest time.")); ++ this.gametype_init(this, _("Race CTS"),"cts","g_cts",0,"cloaked","timelimit=20",_("Race to the finish line for the fastest time")); + } + METHOD(RaceCTS, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "target_startTimer") + MapInfo_Map_supportedGametypes |= this.gametype_flags; + } + METHOD(RaceCTS, m_setTeams, void(string sa)) + { + // this is the skill of the map + // not parsed by anything yet + // for map databases + // cvar_set("fraglimit", sa); + } + METHOD(RaceCTS, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns)) + { + TC(Gametype, this); + returns(menu, _("Point limit:"), 50, 500, 10, string_null, string_null, string_null); + } #ifdef CSQC - ATTRIB(RaceCTS, m_modicons, void(vector pos, vector mySize), HUD_Mod_Race); + ATTRIB(RaceCTS, m_modicons, void(vector pos, vector mySize), HUD_Mod_Race); #endif - ATTRIB(RaceCTS, m_legacydefaults, string, "20 0 0"); + ATTRIB(RaceCTS, m_legacydefaults, string, "20 0 0"); ENDCLASS(RaceCTS) REGISTER_GAMETYPE(CTS, NEW(RaceCTS)); #define g_cts IS_GAMETYPE(CTS) diff --cc qcsrc/common/mutators/mutator/nades/nade/ice.qc index 8c8ca1637d,2d679fad00..ca40d95c87 --- a/qcsrc/common/mutators/mutator/nades/nade/ice.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/ice.qc @@@ -114,12 -114,3 +114,12 @@@ void nade_ice_boom(entity this setmodel(fountain, MDL_Null); } #endif // SVQC +#ifdef MENUQC +METHOD(IceNade, describe, string(IceNade this)) +{ + TC(IceNade, this); + return sprintf(_("The %s detonates after a short delay, freezing any enemies who walk within the explosion radius for a few seconds after the explosion. " - "While frozen, players can't move or shoot, leaving them vulnerable to damage."), ++ "While frozen, players can't move or shoot, leaving them vulnerable to damage, but if left too long they'll unfreeze and run away!"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --cc qcsrc/common/mutators/mutator/nades/nade/monster.qc index 67aa9c3d81,4c5c7d1654..2d35090acb --- a/qcsrc/common/mutators/mutator/nades/nade/monster.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/monster.qc @@@ -19,11 -19,3 +19,11 @@@ void nade_monster_boom(entity this e.monster_skill = MONSTER_SKILL_INSANE; } #endif // SVQC +#ifdef MENUQC +METHOD(MonsterNade, describe, string(MonsterNade this)) +{ + TC(MonsterNade, this); - return sprintf(_("The %s explodes after a short delay, spawning one of four monster types."), ++ return sprintf(_("The %s detonates after a short delay, spawning one of four monster types."), + COLORED_NAME(this)); +} +#endif // MENUQC diff --cc qcsrc/common/mutators/mutator/nades/nade/napalm.qc index 2170d70b23,ed0aecb9c3..ffe7fefa1d --- a/qcsrc/common/mutators/mutator/nades/nade/napalm.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/napalm.qc @@@ -176,12 -176,3 +176,12 @@@ void nade_napalm_boom(entity this CSQCProjectile(fountain, true, PROJECTILE_NAPALM_FOUNTAIN, true); } #endif // SVQC +#ifdef MENUQC +METHOD(NapalmNade, describe, string(NapalmNade this)) +{ + TC(NapalmNade, this); - return sprintf(_("The %s explodes after a short delay, spreading fiery napalm globs around in the fountain. " ++ return sprintf(_("The %s detonates after a short delay, spreading fiery napalm globs around in the fountain. " + "The napalm fire balls burn for a while, and damage players who get too close."), + COLORED_NAME(this)); +} +#endif // MENUQC diff --cc qcsrc/common/mutators/mutator/nades/nade/normal.qc index f1dcb57d3f,1e133fdfb1..2f56cba7df --- a/qcsrc/common/mutators/mutator/nades/nade/normal.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/normal.qc @@@ -9,12 -9,3 +9,13 @@@ void nade_normal_boom(entity this autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, this.projectiledeathtype, 0, this); } #endif // SVQC +#ifdef MENUQC +METHOD(NormalNade, describe, string(NormalNade this)) +{ + TC(NormalNade, this); - return sprintf(_("The (normal) %s explodes after a short delay, dealing damage to nearby players.\n\n" ++ return sprintf(_("The (normal) %s explodes after a short delay, dealing damage to nearby players. " ++ "If other nade types are destroyed before they detonate, they will instead explode similarly, without doing their special effects.\n\n" + "Make sure you remember to throw it with ^3drop weapon^7, or else it will blow up in your hands!"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --cc qcsrc/common/mutators/mutator/powerups/powerups.qh index 6e6bdc660d,b8f5b731ab..6694b574d7 --- a/qcsrc/common/mutators/mutator/powerups/powerups.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerups.qh @@@ -6,16 -12,9 +12,16 @@@ CLASS(Powerup, Pickup ATTRIB(Powerup, m_maxs, vector, ITEM_L_MAXS); ATTRIB(Powerup, m_botvalue, int, 11000); ATTRIB(Powerup, m_itemflags, int, FL_POWERUP); - ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup)); - ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup)); + ATTRIB(Powerup, m_respawntime, float, autocvar_g_pickup_respawntime_powerup); + ATTRIB(Powerup, m_respawntimejitter, float, autocvar_g_pickup_respawntimejitter_powerup); #endif +#ifdef MENUQC + METHOD(Powerup, describe, string(Powerup this)) + { + TC(Powerup, this); + return SUPER(Powerup).describe(this); + } +#endif ENDCLASS(Powerup) #include