1.6.0 refill ammo or stamina on cp

ObstacleSM · Mar 8, 2020 · 886db59 · 886db59
1 parent a118a9b
commit 886db59
Show file tree

Hide file tree

Showing 5 changed files with 353 additions and 337 deletions.
diff --git a/ManiaPlanetTitle.xml b/ManiaPlanetTitle.xml
@@ -4,7 +4,7 @@
  <desc></desc>
  <url>ObstacleMP4</url>
  <download_url></download_url>
- <title_version>1.5.3</title_version>
+ <title_version>1.6.0</title_version>
  <allowed_client_title_version></allowed_client_title_version>
  <maker>SMStormMaker@nadeo</maker>
  <base>SMStorm</base>

diff --git a/Scripts/Libs/smokegun/Weapons.Script.txt b/Scripts/Libs/smokegun/Weapons.Script.txt
@@ -52,13 +52,28 @@ Void SetWeapon(CSmPlayer _Player, Integer _WeaponType, Real _Gain, Integer _Coun
  SetPlayerAmmoMax(_Player, Weapon, _Count);
 }
 
+Void FillUpPlayerAmmo(CSmPlayer _Player) {
+ if (_Player == Null || _Player.SpawnStatus != CSmPlayer::ESpawnStatus::Spawned) {
+ declare PlayerHasRespawned for _Player = False;
+ PlayerHasRespawned = True;
+ } else {
+ SetPlayerAmmo(_Player, CSmMode::EWeapon::Rocket, 10);
+ SetPlayerAmmo(_Player, CSmMode::EWeapon::Laser, 10);
+ SetPlayerAmmo(_Player, CSmMode::EWeapon::Nucleus, 10);
+ SetPlayerAmmo(_Player, CSmMode::EWeapon::Arrow, 10);
+ }
+}
+
 Void ApplyEffects(CSmPlayer _Player, CSmMapLandmark _Anchor) {
  declare metadata Meta_Weapon for _Anchor = 1;
  declare metadata Meta_Weapon_Gain for _Anchor = 1.0;
  declare metadata Meta_Weapon_Amount for _Anchor = 4;
+ declare metadata Meta_RefillWeapon for _Anchor = False;
+
  declare metadata Meta_Stamina for _Anchor = 0;
  declare metadata Meta_Stamina_Gain for _Anchor = 1.0;
  declare metadata Meta_Stamina_Amount for _Anchor = 1.0;
+ declare metadata Meta_RefillStamina for _Anchor = False;
 
  SetWeapon(_Player, Meta_Weapon, Meta_Weapon_Gain, Meta_Weapon_Amount);
  _Player.StaminaMax = Meta_Stamina_Amount;
@@ -70,6 +85,14 @@ Void ApplyEffects(CSmPlayer _Player, CSmMapLandmark _Anchor) {
  _Player.StaminaMax = 3.;
  _Player.StaminaGain = 1.;
  }
+
+ if (Meta_RefillWeapon) {
+ FillUpPlayerAmmo(_Player);
+ }
+
+ if (Meta_RefillStamina) {
+ _Player.Stamina = _Player.StaminaMaxValue;
+ }
 }
 
 /*
@@ -104,15 +127,3 @@ Void ApplyWeaponForCheckpointType(CSmPlayer _Player, Integer _Type) {
  LastWeaponType = _Type;
  }
 }
-
-Void FillUpPlayerAmmo(CSmPlayer _Player) {
- if (_Player == Null || _Player.SpawnStatus != CSmPlayer::ESpawnStatus::Spawned) {
- declare PlayerHasRespawned for _Player = False;
- PlayerHasRespawned = True;
- } else {
- SetPlayerAmmo(_Player, CSmMode::EWeapon::Rocket, 10);
- SetPlayerAmmo(_Player, CSmMode::EWeapon::Laser, 10);
- SetPlayerAmmo(_Player, CSmMode::EWeapon::Nucleus, 10);
- SetPlayerAmmo(_Player, CSmMode::EWeapon::Arrow, 10);
- }
-}