From: Mario Date: Fri, 26 Apr 2013 01:00:10 +0000 (+1000) Subject: Fixes for some issues on the bug tracker X-Git-Tag: xonotic-v0.7.0~71^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0b9a6d8d8dcea7e1f8d6dfa53edfa7b5754f4ee;p=xonotic%2Fxonotic-data.pk3dir.git Fixes for some issues on the bug tracker --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2af290f9a..d6ff51862 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -900,7 +900,7 @@ seta "userbind8_press" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_ seta "userbind9_press" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"; seta "userbind9_release" ""; seta "userbind9_description" "team: defending, icon" seta "userbind10_press" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"; seta "userbind10_release" ""; seta "userbind10_description" "team: roaming, icon" seta "userbind11_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"; seta "userbind11_release" ""; seta "userbind11_description" "team: attacking, icon" -seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon" +seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon" seta "userbind13_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon" seta "userbind14_press" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon" // TODO change this to "use" once we can diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 67b5f243e..7d436c383 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -518,7 +518,7 @@ void Send_Notification_WOVA( MSG_CENTER_NOTIF(1, CENTER_NIX_COUNTDOWN, 0, 2, "item_wepname", CPID_NIX, "1 f2", _("^F2^COUNT^BG until weapon change...\nNext weapon: ^F1%s"), "") \ MSG_CENTER_NOTIF(1, CENTER_NIX_NEWWEAPON, 0, 1, "item_wepname", CPID_NIX, "0 0", _("^F2Active weapon: ^F1%s"), "") \ MSG_CENTER_NOTIF(1, CENTER_OVERTIME_FRAG, 0, 0, "", CPID_OVERTIME, "0 0", _("^F2Now playing ^F4OVERTIME^F2!\nKeep fragging until we have a winner!"), _("^F2Now playing ^F4OVERTIME^F2!\nKeep scoring until we have a winner!")) \ - MSG_CENTER_NOTIF(1, CENTER_OVERTIME_TIME, 0, 1, "f1time", CPID_OVERTIME, "0 0", _("^F2Now playing ^F4OVERTIME^F2!\nAdded ^F4%s^F2 to the game!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_OVERTIME_TIME, 0, 1, "f1time", CPID_OVERTIME, "0 0", _("^F2Now playing ^F4OVERTIME^F2!\n^BGAdded ^F4%s^BG to the game!"), "") \ MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_INVISIBILITY, 0, 0, "", CPID_POWERUP, "0 0", _("^F2Invisibility has worn off"), "") \ MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_SHIELD, 0, 0, "", CPID_POWERUP, "0 0", _("^F2Shield has worn off"), "") \ MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_SPEED, 0, 0, "", CPID_POWERUP, "0 0", _("^F2Speed has worn off"), "") \ diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index b61fbfa91..5bc0178f5 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2732,7 +2732,10 @@ void PlayerPreThink (void) Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_CAMPCHECK); // FIXME KadaverJack: gibbing player here causes playermodel to bounce around, instead of eye.md3 // I wasn't able to find out WHY that happens, so I put a workaround in place that shall prevent players from being gibbed :( - Damage(self, self, self, bound(0, autocvar_g_lms_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP, self.origin, '0 0 0'); + if(self.vehicle) + Damage(self.vehicle, self, self, autocvar_g_lms_campcheck_damage * 2, DEATH_CAMP, self.vehicle.origin, '0 0 0'); + else + Damage(self, self, self, bound(0, autocvar_g_lms_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP, self.origin, '0 0 0'); } self.lms_nextcheck = time + autocvar_g_lms_campcheck_interval; self.lms_traveled_distance = 0; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 25cd56658..ed194ef0d 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1350,7 +1350,7 @@ void IntermissionThink() && ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) ) { self.autoscreenshot = -1; - if(clienttype(self) == CLIENTTYPE_REAL) { stuffcmd(self, sprintf("\nscreenshot screenshots/autoscreenshot/%s-%s.jpg; echo \"^5A screenshot has been taken at request of the server.\"", GetMapname(), strftime(FALSE, "%s"))); } + if(clienttype(self) == CLIENTTYPE_REAL) { stuffcmd(self, sprintf("\nscreenshot screenshots/autoscreenshot/%s-%s.jpg; echo \"^5A screenshot has been taken at request of the server.\"\n", GetMapname(), strftime(FALSE, "%s"))); } return; } @@ -1592,7 +1592,7 @@ void NextLevel() PlayerStats_AddGlobalInfo(e); PlayerStats_Shutdown(); WeaponStats_Shutdown(); - + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, 0); // kill all centerprints now if(autocvar_sv_eventlog) @@ -1678,7 +1678,7 @@ void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true tl += autocvar_timelimit_overtime; cvar_set("timelimit", ftos(tl)); - Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_OVERTIME_TIME, autocvar_timelimit_overtime); + Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_OVERTIME_TIME, autocvar_timelimit_overtime * 60); } float GetWinningCode(float fraglimitreached, float equality) diff --git a/qcsrc/server/tturrets/units/unit_machinegun.qc b/qcsrc/server/tturrets/units/unit_machinegun.qc index 9358cd7ba..8f18d845a 100644 --- a/qcsrc/server/tturrets/units/unit_machinegun.qc +++ b/qcsrc/server/tturrets/units/unit_machinegun.qc @@ -31,6 +31,7 @@ void turret_machinegun_std_init() } self.damage_flags |= TFL_DMG_HEADSHAKE; + self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK; // Our fire routine self.turret_firefunc = turret_machinegun_attack; diff --git a/unit_fusreac.cfg b/unit_fusreac.cfg index c575f1bf5..c9373f68f 100644 --- a/unit_fusreac.cfg +++ b/unit_fusreac.cfg @@ -11,3 +11,22 @@ set g_turrets_unit_fusreac_std_target_range_min 1 set g_turrets_unit_fusreac_std_ammo_max 100 set g_turrets_unit_fusreac_std_ammo 0 set g_turrets_unit_fusreac_std_ammo_recharge 100 + +set g_turrets_unit_fusreac_std_shot_radius 0 +set g_turrets_unit_fusreac_std_shot_spread 0 +set g_turrets_unit_fusreac_std_shot_force 0 +set g_turrets_unit_fusreac_std_shot_volly 0 +set g_turrets_unit_fusreac_std_shot_volly_refire 0 +set g_turrets_unit_fusreac_std_target_range_optimal 0 +set g_turrets_unit_fusreac_std_target_select_rangebias 0 +set g_turrets_unit_fusreac_std_target_select_samebias 0 +set g_turrets_unit_fusreac_std_target_select_anglebias 0 +set g_turrets_unit_fusreac_std_target_select_playerbias 0 +set g_turrets_unit_fusreac_std_aim_firetolerance_dist 0 +set g_turrets_unit_fusreac_std_aim_speed 0 +set g_turrets_unit_fusreac_std_aim_maxrot 0 +set g_turrets_unit_fusreac_std_aim_maxpitch 0 +set g_turrets_unit_fusreac_std_track_type 0 +set g_turrets_unit_fusreac_std_track_accel_pitch 0 +set g_turrets_unit_fusreac_std_track_accel_rot 0 +set g_turrets_unit_fusreac_std_track_blendrate 0 \ No newline at end of file