diff --git a/README.md b/README.md index 4705fcd6..90fee45e 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ * Deposited points resets each game * Gain 10% interest on deposited points at the end of each round * No longer costs 100 points to withdraw +* Players can deposit and withdraw less than 1000 points * Account value is shown when depositing, withdrawing, and going near the triggers * Disabled trading points diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 2e700aaf..f3888efa 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -16,8 +16,6 @@ #include scripts/zm/replaced/_zm_powerups; #include scripts/zm/replaced/_zm_pers_upgrades; #include scripts/zm/replaced/_zm_equipment; -#include scripts/zm/replaced/_zm_banking; -#include scripts/zm/replaced/_zm_weapon_locker; #include scripts/zm/replaced/_zm_ai_basic; main() @@ -52,11 +50,6 @@ main() replaceFunc(maps/mp/zombies/_zm_pers_upgrades::is_pers_system_disabled, scripts/zm/replaced/_zm_pers_upgrades::is_pers_system_disabled); replaceFunc(maps/mp/zombies/_zm_equipment::show_equipment_hint, scripts/zm/replaced/_zm_equipment::show_equipment_hint); replaceFunc(maps/mp/zombies/_zm_equipment::placed_equipment_think, scripts/zm/replaced/_zm_equipment::placed_equipment_think); - replaceFunc(maps/mp/zombies/_zm_banking::init, scripts/zm/replaced/_zm_banking::init); - replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_box, scripts/zm/replaced/_zm_banking::bank_deposit_box); - replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_unitrigger, scripts/zm/replaced/_zm_banking::bank_deposit_unitrigger); - replaceFunc(maps/mp/zombies/_zm_banking::bank_withdraw_unitrigger, scripts/zm/replaced/_zm_banking::bank_withdraw_unitrigger); - replaceFunc(maps/mp/zombies/_zm_weapon_locker::main, scripts/zm/replaced/_zm_weapon_locker::main); replaceFunc(maps/mp/zombies/_zm_ai_basic::inert_wakeup, scripts/zm/replaced/_zm_ai_basic::inert_wakeup); } @@ -176,6 +169,7 @@ post_all_players_spawned() maps/mp/zombies/_zm::register_player_damage_callback( ::player_damage_override ); level.near_miss = 2; // makes screecher not run away first time on solo + level.weapon_locker_online = 0; level.magicbox_timeout = 9; level.packapunch_timeout = 12; level.perk_purchase_limit = 9; diff --git a/scripts/zm/replaced/_zm_banking.gsc b/scripts/zm/replaced/_zm_banking.gsc index c46bfc9e..bde44f2f 100644 --- a/scripts/zm/replaced/_zm_banking.gsc +++ b/scripts/zm/replaced/_zm_banking.gsc @@ -135,7 +135,6 @@ trigger_withdraw_think() { player thread do_player_general_vox( "general", "exert_laugh", 10, 50 ); } - player thread player_withdraw_fee(); if ( player.account_value <= 0 ) { self sethintstring( "" ); diff --git a/scripts/zm/replaced/_zm_weapon_locker.gsc b/scripts/zm/replaced/_zm_weapon_locker.gsc deleted file mode 100644 index 2464d1c6..00000000 --- a/scripts/zm/replaced/_zm_weapon_locker.gsc +++ /dev/null @@ -1,15 +0,0 @@ -#include maps\mp\_utility; -#include common_scripts\utility; -#include maps\mp\zombies\_zm_utility; -#include maps/mp/zombies/_zm_weapon_locker; - -main() -{ - if ( !isDefined( level.weapon_locker_map ) ) - { - level.weapon_locker_map = level.script; - } - level.weapon_locker_online = 0; - weapon_lockers = getstructarray( "weapons_locker", "targetname" ); - array_thread( weapon_lockers, ::triggerweaponslockerwatch ); -} \ No newline at end of file diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.gsc b/scripts/zm/zm_buried/zm_buried_reimagined.gsc index aa87a202..0235fe21 100644 --- a/scripts/zm/zm_buried/zm_buried_reimagined.gsc +++ b/scripts/zm/zm_buried/zm_buried_reimagined.gsc @@ -3,12 +3,17 @@ #include maps\mp\zombies\_zm_utility; #include scripts/zm/replaced/_zm_equip_subwoofer; +#include scripts/zm/replaced/_zm_banking; main() { precachemodel( "collision_wall_128x128x10_standard" ); //replaceFunc(maps/mp/zombies/_zm_equip_subwoofer::startsubwooferdecay, scripts/zm/replaced/_zm_equip_subwoofer::startsubwooferdecay); + replaceFunc(maps/mp/zombies/_zm_banking::init, scripts/zm/replaced/_zm_banking::init); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_box, scripts/zm/replaced/_zm_banking::bank_deposit_box); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_unitrigger, scripts/zm/replaced/_zm_banking::bank_deposit_unitrigger); + replaceFunc(maps/mp/zombies/_zm_banking::bank_withdraw_unitrigger, scripts/zm/replaced/_zm_banking::bank_withdraw_unitrigger); } init() diff --git a/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc b/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc index 3902939d..59c37e30 100644 --- a/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc +++ b/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc @@ -4,11 +4,16 @@ #include scripts/zm/replaced/zm_highrise_classic; #include scripts/zm/replaced/_zm_chugabud; +#include scripts/zm/replaced/_zm_banking; main() { replaceFunc(maps/mp/zm_highrise_classic::insta_kill_player, scripts/zm/replaced/zm_highrise_classic::insta_kill_player); replaceFunc(maps/mp/zombies/_zm_chugabud::chugabud_bleed_timeout, scripts/zm/replaced/_zm_chugabud::chugabud_bleed_timeout); + replaceFunc(maps/mp/zombies/_zm_banking::init, scripts/zm/replaced/_zm_banking::init); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_box, scripts/zm/replaced/_zm_banking::bank_deposit_box); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_unitrigger, scripts/zm/replaced/_zm_banking::bank_deposit_unitrigger); + replaceFunc(maps/mp/zombies/_zm_banking::bank_withdraw_unitrigger, scripts/zm/replaced/_zm_banking::bank_withdraw_unitrigger); } init() diff --git a/scripts/zm/zm_transit/zm_transit_reimagined.gsc b/scripts/zm/zm_transit/zm_transit_reimagined.gsc index b57b5fd1..94b20f8d 100644 --- a/scripts/zm/zm_transit/zm_transit_reimagined.gsc +++ b/scripts/zm/zm_transit/zm_transit_reimagined.gsc @@ -7,6 +7,7 @@ #include scripts/zm/replaced/_zm_weap_emp_bomb; #include scripts/zm/replaced/_zm_equip_electrictrap; #include scripts/zm/replaced/_zm_equip_turret; +#include scripts/zm/replaced/_zm_banking; main() { @@ -15,6 +16,10 @@ main() replaceFunc(maps/mp/zombies/_zm_weap_emp_bomb::emp_detonate, scripts/zm/replaced/_zm_weap_emp_bomb::emp_detonate); replaceFunc(maps/mp/zombies/_zm_equip_electrictrap::startelectrictrapdeploy, scripts/zm/replaced/_zm_equip_electrictrap::startelectrictrapdeploy); replaceFunc(maps/mp/zombies/_zm_equip_turret::startturretdeploy, scripts/zm/replaced/_zm_equip_turret::startturretdeploy); + replaceFunc(maps/mp/zombies/_zm_banking::init, scripts/zm/replaced/_zm_banking::init); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_box, scripts/zm/replaced/_zm_banking::bank_deposit_box); + replaceFunc(maps/mp/zombies/_zm_banking::bank_deposit_unitrigger, scripts/zm/replaced/_zm_banking::bank_deposit_unitrigger); + replaceFunc(maps/mp/zombies/_zm_banking::bank_withdraw_unitrigger, scripts/zm/replaced/_zm_banking::bank_withdraw_unitrigger); include_weapons_grief(); }