From 1c25c4279084248ffc63ff5ed55ce8df44d23f7a Mon Sep 17 00:00:00 2001 From: Marrub Date: Thu, 10 Aug 2017 02:30:35 -0400 Subject: [PATCH] Add minor module changes --- source/mod_base.rb | 3 ++- source/mod_doomrla.rb | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/mod_base.rb b/source/mod_base.rb index a80a4d1..948c72a 100644 --- a/source/mod_base.rb +++ b/source/mod_base.rb @@ -43,8 +43,9 @@ module Vrobot4::Server end def c_modr m, argv - check_args argv, "S" + check_args argv, "S", "S" m.serv.drop_mod argv[0] + load argv[1], true if argv.length > 1 m.serv.load_mod argv[0] end diff --git a/source/mod_doomrla.rb b/source/mod_doomrla.rb index 463d94f..d80ca8a 100644 --- a/source/mod_doomrla.rb +++ b/source/mod_doomrla.rb @@ -34,10 +34,10 @@ class Mod_DoomRLA < Vrobot4::Module::Module name = argv.join(" ") w = @winfo.select {|wep| wep if wep["Name"].casecmp? name}[0] t = "%s %s damage\n" % [w["Damage"], w["DamageType"]] - t << "%s shots" % [w["Shots"]] if w["Shots"].to_i > 1 - t << ", uses %s %s" % [w["AmmoUsage"], w["AmmoType"]] \ + t << "%s shots\n" % [w["Shots"]] if w["Shots"].to_i > 1 + t << "Uses %s %s\n" % [w["AmmoUsage"], w["AmmoType"]] \ if w["AmmoType"] != "None" - t << ", %s capacity" % [w["Capacity"]] if w["Capacity"] + t << "%s capacity\n" % [w["Capacity"]] if w["Capacity"] t << "\n" t << "%s explosion damage, %s radius\n" % [w["ExplosionDamage"], w["ExplosionRadius"]] if w["ExplosionDamage"]