From bf82960a25399564fb12585c98112af799531eef Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 30 Mar 2009 09:17:28 +0000 Subject: [PATCH] more consistency regarding fuel git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6362 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 7 +++++-- data/qcsrc/server/cl_client.qc | 3 ++- data/qcsrc/server/cl_impulse.qc | 4 ++++ data/qcsrc/server/cl_weapons.qc | 3 +++ data/qcsrc/server/constants.qh | 4 ++-- data/qcsrc/server/miscfunctions.qc | 19 ++++++++++++++++--- data/weapons.cfg | 5 ++++- data/weaponsHavoc.cfg | 5 ++++- 8 files changed, 40 insertions(+), 10 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index a1df8eac2..aa6341b59 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -24,7 +24,7 @@ alias if_dedicated "_detect_dedicated_$qport $*" seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar) -set cvar_check_default 2a59bbf4495c7cbfdf132a76bbbda463 +set cvar_check_default 779a1c2f508f65a13bad23ce1758beb8 // Nexuiz version (formatted for machines) // used to determine if a client version is compatible @@ -256,6 +256,7 @@ set g_warmup_start_ammo_shells 50 set g_warmup_start_ammo_nails 150 set g_warmup_start_ammo_rockets 50 set g_warmup_start_ammo_cells 50 +set g_warmup_start_ammo_fuel 0 set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage" set sv_vote_nospectators 0 "if set only players can call a vote (thus spectators and observers can't call a vote)" @@ -612,6 +613,7 @@ set g_lms_start_ammo_shells 50 set g_lms_start_ammo_nails 150 set g_lms_start_ammo_rockets 50 set g_lms_start_ammo_cells 50 +set g_lms_start_ammo_fuel 0 set g_lms_regenerate 0 set g_lms_campcheck_interval 10 set g_lms_campcheck_message "^1Don't camp!" @@ -925,11 +927,13 @@ set g_balance_nixnex_ammo_shells 15 set g_balance_nixnex_ammo_nails 45 set g_balance_nixnex_ammo_rockets 15 set g_balance_nixnex_ammo_cells 15 +set g_balance_nixnex_ammo_fuel 0 // ammo increment per second set g_balance_nixnex_ammoincr_shells 2 set g_balance_nixnex_ammoincr_nails 6 set g_balance_nixnex_ammoincr_rockets 2 set g_balance_nixnex_ammoincr_cells 2 +set g_balance_nixnex_ammoincr_fuel 2 // score log set sv_logscores_console 0 "print scores to server console" @@ -1431,7 +1435,6 @@ set g_balance_fuel_regenlinear 0 set g_balance_fuel_rotlinear 0 set g_balance_fuel_stable 100 set g_balance_fuel_limit 999 -set g_balance_fuel_start 0 set g_balance_pause_fuel_regen 1 // other than this, fuel uses the health regen counter set g_balance_pause_fuel_rot 5 set g_balance_pause_fuel_rot_spawn 10 diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 499e7fcae..c2c6239e8 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -746,6 +746,7 @@ void PutClientInServer (void) self.ammo_nails = warmup_start_ammo_nails; self.ammo_rockets = warmup_start_ammo_rockets; self.ammo_cells = warmup_start_ammo_cells; + self.ammo_fuel = warmup_start_ammo_fuel; self.health = warmup_start_health; self.armorvalue = warmup_start_armorvalue; self.weapons = warmup_start_weapons; @@ -756,11 +757,11 @@ void PutClientInServer (void) self.ammo_nails = start_ammo_nails; self.ammo_rockets = start_ammo_rockets; self.ammo_cells = start_ammo_cells; + self.ammo_fuel = start_ammo_fuel; self.health = start_health; self.armorvalue = start_armorvalue; self.weapons = start_weapons; } - self.ammo_fuel = start_fuel; self.items = start_items; self.switchweapon = w_getbestweapon(self); self.cnt = self.switchweapon; diff --git a/data/qcsrc/server/cl_impulse.qc b/data/qcsrc/server/cl_impulse.qc index 02244505f..2cb579ee0 100644 --- a/data/qcsrc/server/cl_impulse.qc +++ b/data/qcsrc/server/cl_impulse.qc @@ -340,10 +340,12 @@ void ImpulseCommands (void) self.ammo_nails = g_pickup_nails_max; self.ammo_rockets = g_pickup_rockets_max; self.ammo_cells = g_pickup_cells_max; + self.ammo_fuel = g_pickup_fuel_max; self.health = g_pickup_healthsmall_max; self.armorvalue = g_pickup_armorsmall_max; self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn"); self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn"); + self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn"); self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn"); // precache weapon models/sounds wep = WEP_FIRST; @@ -379,11 +381,13 @@ void ImpulseCommands (void) self.ammo_nails = 999; self.ammo_cells = 999; self.ammo_shells = 999; + self.ammo_fuel = 999; self.health = start_health; self.armorvalue = start_armorvalue; self.weapons |= weaponsInMap; self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn"); self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn"); + self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn"); self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn"); } else if(self.deadflag != DEAD_NO) diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index 8e425fa2d..4283d0e97 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -436,6 +436,7 @@ void Nixnex_GiveCurrentWeapon() self.ammo_nails = cvar("g_pickup_nails_max"); self.ammo_rockets = cvar("g_pickup_rockets_max"); self.ammo_cells = cvar("g_pickup_cells_max"); + self.ammo_fuel = cvar("g_pickup_fuel_max"); } else { @@ -443,6 +444,7 @@ void Nixnex_GiveCurrentWeapon() self.ammo_nails = cvar("g_balance_nixnex_ammo_nails"); self.ammo_rockets = cvar("g_balance_nixnex_ammo_rockets"); self.ammo_cells = cvar("g_balance_nixnex_ammo_cells"); + self.ammo_fuel = cvar("g_balance_nixnex_ammo_fuel"); } self.nixnex_nextincr = time + cvar("g_balance_nixnex_incrtime"); if(dt >= 1 && dt <= 5) @@ -463,6 +465,7 @@ void Nixnex_GiveCurrentWeapon() self.ammo_nails = self.ammo_nails + cvar("g_balance_nixnex_ammoincr_nails"); self.ammo_rockets = self.ammo_rockets + cvar("g_balance_nixnex_ammoincr_rockets"); self.ammo_cells = self.ammo_cells + cvar("g_balance_nixnex_ammoincr_cells"); + self.ammo_fuel = self.ammo_fuel + cvar("g_balance_nixnex_ammoincr_fuel"); self.nixnex_nextincr = time + cvar("g_balance_nixnex_incrtime"); } diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 30c4b5f49..931a3f1ec 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,5 +1,5 @@ -string CVAR_CHECK_DEFAULT = "2a59bbf4495c7cbfdf132a76bbbda463"; -string CVAR_CHECK_WEAPONS = "6dd73b6c78519153d50f876be23bfe77"; +string CVAR_CHECK_DEFAULT = "779a1c2f508f65a13bad23ce1758beb8"; +string CVAR_CHECK_WEAPONS = "a370ceef5c41fcdcc46462ca3f728002"; float FALSE = 0; float TRUE = 1; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index aef9fbfaf..4fa84e8f4 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -701,6 +701,8 @@ float g_pickup_rockets; float g_pickup_rockets_max; float g_pickup_cells; float g_pickup_cells_max; +float g_pickup_fuel; +float g_pickup_fuel_max; float g_pickup_armorsmall; float g_pickup_armorsmall_max; float g_pickup_armormedium; @@ -726,6 +728,7 @@ float start_ammo_shells; float start_ammo_nails; float start_ammo_rockets; float start_ammo_cells; +float start_ammo_fuel; float start_health; float start_armorvalue; float warmup_start_weapons; @@ -733,9 +736,9 @@ float warmup_start_ammo_shells; float warmup_start_ammo_nails; float warmup_start_ammo_rockets; float warmup_start_ammo_cells; +float warmup_start_ammo_fuel; float warmup_start_health; float warmup_start_armorvalue; -float start_fuel; float g_weapon_stay; entity get_weaponinfo(float w); @@ -754,7 +757,6 @@ void readplayerstartcvars() start_ammo_rockets = 0; start_ammo_cells = 0; start_health = cvar("g_balance_health_start"); - start_fuel = cvar("g_balance_fuel_start"); start_armorvalue = cvar("g_balance_armor_start"); g_weaponarena = 0; @@ -818,6 +820,7 @@ void readplayerstartcvars() start_ammo_shells = 999; start_ammo_cells = 999; start_ammo_nails = 999; + start_ammo_fuel = 999; start_items |= IT_UNLIMITED_AMMO; } else if(g_nixnex) @@ -840,6 +843,7 @@ void readplayerstartcvars() weapon_action(WEP_MINSTANEX, WR_PRECACHE); start_ammo_cells = cvar("g_minstagib_ammo_start"); g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha"); + start_ammo_fuel = cvar("g_start_ammo_fuel"); if(g_minstagib_invis_alpha <= 0) g_minstagib_invis_alpha = -1; @@ -852,6 +856,7 @@ void readplayerstartcvars() start_ammo_nails = cvar("g_lms_start_ammo_nails"); start_ammo_rockets = cvar("g_lms_start_ammo_rockets"); start_ammo_cells = cvar("g_lms_start_ammo_cells"); + start_ammo_fuel = cvar("g_lms_start_ammo_fuel"); start_health = cvar("g_lms_start_health"); start_armorvalue = cvar("g_lms_start_armor"); } else if (cvar("g_use_ammunition")) { @@ -859,11 +864,13 @@ void readplayerstartcvars() start_ammo_nails = cvar("g_start_ammo_nails"); start_ammo_rockets = cvar("g_start_ammo_rockets"); start_ammo_cells = cvar("g_start_ammo_cells"); + start_ammo_fuel = cvar("g_start_ammo_fuel"); } else { start_ammo_shells = cvar("g_pickup_shells_max"); start_ammo_nails = cvar("g_pickup_nails_max"); start_ammo_rockets = cvar("g_pickup_rockets_max"); start_ammo_cells = cvar("g_pickup_cells_max"); + start_ammo_fuel = cvar("g_pickup_fuel_max"); start_items |= IT_UNLIMITED_AMMO; } @@ -954,7 +961,7 @@ void readplayerstartcvars() g_grappling_hook = 0; // these two can't coexist, as they use the same button start_items |= IT_JETPACK; start_items |= IT_FUEL_REGEN; - start_fuel = max(start_fuel, cvar("g_balance_fuel_stable")); + start_ammo_fuel = max(start_ammo_fuel, cvar("g_balance_fuel_stable")); } if(g_weapon_stay == 2) @@ -963,21 +970,25 @@ void readplayerstartcvars() if(!start_ammo_nails) start_ammo_nails = g_pickup_nails; if(!start_ammo_cells) start_ammo_cells = g_pickup_cells; if(!start_ammo_rockets) start_ammo_rockets = g_pickup_rockets; + if(!start_ammo_fuel) start_ammo_fuel = g_pickup_fuel; if(!warmup_start_ammo_shells) warmup_start_ammo_shells = g_pickup_shells; if(!warmup_start_ammo_nails) warmup_start_ammo_nails = g_pickup_nails; if(!warmup_start_ammo_cells) warmup_start_ammo_cells = g_pickup_cells; if(!warmup_start_ammo_rockets) warmup_start_ammo_rockets = g_pickup_rockets; + if(!warmup_start_ammo_fuel) warmup_start_ammo_fuel = g_pickup_fuel; } start_ammo_shells = max(0, start_ammo_shells); start_ammo_nails = max(0, start_ammo_nails); start_ammo_cells = max(0, start_ammo_cells); start_ammo_rockets = max(0, start_ammo_rockets); + start_ammo_fuel = max(0, start_ammo_fuel); warmup_start_ammo_shells = max(0, warmup_start_ammo_shells); warmup_start_ammo_nails = max(0, warmup_start_ammo_nails); warmup_start_ammo_cells = max(0, warmup_start_ammo_cells); warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets); + warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel); } float g_bugrigs; @@ -1077,6 +1088,8 @@ void readlevelcvars(void) g_pickup_rockets_max = cvar("g_pickup_rockets_max"); g_pickup_cells = cvar("g_pickup_cells"); g_pickup_cells_max = cvar("g_pickup_cells_max"); + g_pickup_fuel = cvar("g_pickup_fuel"); + g_pickup_fuel_max = cvar("g_pickup_fuel_max"); g_pickup_armorsmall = cvar("g_pickup_armorsmall"); g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max"); g_pickup_armormedium = cvar("g_pickup_armormedium"); diff --git a/data/weapons.cfg b/data/weapons.cfg index bc17fb4e8..0d30df937 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit weaponsHavoc.cfg too. -set cvar_check_weapons 6dd73b6c78519153d50f876be23bfe77 +set cvar_check_weapons a370ceef5c41fcdcc46462ca3f728002 // NOTE: this only replaces weapons on the map // use g_start_weapon_* to also replace the on-startup weapons! @@ -45,6 +45,7 @@ set g_start_ammo_shells 40 set g_start_ammo_nails 0 set g_start_ammo_rockets 0 set g_start_ammo_cells 0 +set g_start_ammo_fuel 0 set g_pickup_shells 15 set g_pickup_shells_max 999 set g_pickup_nails 80 @@ -53,6 +54,8 @@ set g_pickup_rockets 15 set g_pickup_rockets_max 999 set g_pickup_cells 25 set g_pickup_cells_max 999 +set g_pickup_fuel 25 +set g_pickup_fuel_max 999 set g_pickup_armorsmall 5 set g_pickup_armorsmall_max 999 set g_pickup_armormedium 25 diff --git a/data/weaponsHavoc.cfg b/data/weaponsHavoc.cfg index 5cf57c43e..e7a9adb2a 100644 --- a/data/weaponsHavoc.cfg +++ b/data/weaponsHavoc.cfg @@ -1,4 +1,4 @@ -set cvar_check_weapons 6dd73b6c78519153d50f876be23bfe77 +set cvar_check_weapons a370ceef5c41fcdcc46462ca3f728002 // NOTE: this only replaces weapons on the map // use g_start_weapon_* to also replace the on-startup weapons! @@ -40,6 +40,7 @@ set g_start_ammo_shells 60 set g_start_ammo_nails 0 set g_start_ammo_rockets 0 set g_start_ammo_cells 0 +set g_start_ammo_fuel 0 set g_pickup_shells 30 set g_pickup_shells_max 120 set g_pickup_nails 50 @@ -48,6 +49,8 @@ set g_pickup_rockets 30 set g_pickup_rockets_max 120 set g_pickup_cells 50 set g_pickup_cells_max 200 +set g_pickup_fuel 25 +set g_pickup_fuel_max 999 set g_pickup_armorsmall 5 set g_pickup_armorsmall_max 200 set g_pickup_armormedium 25 -- 2.39.2