amar-rpg 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536b86190b86f88e7cf0fbcb996b3777d763db1355cf7d00c5888ace8215cae5
-  data.tar.gz: 2e5b19fc161bc0075360119726e8ae7ff6afcdf845569400276e4015fea4b536
+  metadata.gz: 2bdc61cf6d9ff6b07fc95dfc822d63a5bca306892ce47e6f9dd6dd81333d0f7e
+  data.tar.gz: 7727d43ea06e90644243c5285c5377606e858ce720692d47412d2a6a61061aaf
 SHA512:
-  metadata.gz: 15600fb55d0b19e8b27cdde1714f33d94fb9a2129b41017241a158c3d4346a3b1418bcd6361905394c6b0daaca433b32395a65469ebbf0207ff37f3f73c23b57
-  data.tar.gz: ded060cb9604355162869df99af628daa0e51f4bba38178d092579ce9776e5807d3d488e11280f993db53fd1978e2132e59a1a6d46b3459db84ff61e6ddbc36f
+  metadata.gz: 244dc76fd72a90221b996a45c4d34b2c277974578c3adf2decff59c12bb80d75d1673fd10d41a30868debb0ba51795682310a8a738406ed796e8385196cc7a60
+  data.tar.gz: fad7b596d3c51a13c850adea69c5f497cd55e46768bb4955b84cac7f2a95277b5411349878cae45a0e29464574ae075a8fd003c7a33e7a89264356005ffa70a8

data/amar-tui.rb

@@ -60,7 +60,7 @@ require 'stringio'  # For suppressing output
 require 'fcntl'  # For non-blocking IO
 
 # GLOBAL VARS & CONSTANTS
-@version = "2.1.0"
+@version = "2.1.2"
 $pgmdir = File.dirname(__FILE__)  # Global for includes
 
 # Debug logging

data/cli_npc_output_new.rb

@@ -274,11 +274,21 @@ def npc_output_new(n, cli, custom_width = nil)
       f += "\n"
     end
   else
-    # 3-tier weapon display - show ALL weapon skills
+    # 3-tier weapon display - show ALL weapon skills with actual weapon names
     melee_weapons = n.tiers["BODY"]["Melee Combat"]["skills"].select { |_, v| v > 0 } rescue {}
     missile_weapons = n.tiers["BODY"]["Missile Combat"]["skills"].select { |_, v| v > 0 } rescue {}
+    actual_melee = n.tiers["BODY"]["Melee Combat"]["actual_weapons"] rescue {}
+    actual_missile = n.tiers["BODY"]["Missile Combat"]["actual_weapons"] rescue {}
 
   if melee_weapons.any? || missile_weapons.any?
+    # Load weapon tables for stats lookup
+    unless defined?($Melee)
+      load File.join($pgmdir, "includes/tables/melee.rb")
+    end
+    unless defined?($Missile)
+      load File.join($pgmdir, "includes/tables/missile.rb")
+    end
+
     f += "─" * width + "\n"
     f += "#{@weapon_color}WEAPON             SKILL    INI     OFF    DEF    DAM    HP    RANGE#{@reset}\n"
 
@@ -292,19 +302,35 @@ def npc_output_new(n, cli, custom_width = nil)
     reaction_speed = n.get_skill_total("MIND", "Awareness", "Reaction speed") || 0
 
     # Display melee weapons
-    melee_weapons.sort_by { |_, skill| -skill }.each do |weapon, skill|
-      wpn_stats = get_weapon_stats(weapon)
+    melee_weapons.sort_by { |_, skill| -skill }.each do |weapon_skill, skill|
+      # Get actual weapon name
+      actual_weapon_name = actual_melee[weapon_skill] || weapon_skill
+
+      # Find weapon in $Melee table
+      weapon_data = $Melee.find { |w| w && w[0] && w[0].strip == actual_weapon_name.strip }
+
       attr = n.get_attribute("BODY", "Melee Combat") || 0
       skill_total = body_char + attr + skill
 
-      init = reaction_speed + (wpn_stats[:init] || 0)
-      off = skill_total + (wpn_stats[:off] || 0)
-      defense = skill_total + (wpn_stats[:def] || 0) + dodge_bonus
-      dmg_mod = wpn_stats[:dmg].to_s =~ /special/ ? 0 : (wpn_stats[:dmg].to_s.to_i || 0)
-      dmg = (n.DB || 0) + dmg_mod
-      hp = wpn_stats[:hp] || 0
+      if weapon_data
+        # Use actual weapon stats from table: [Name, Type, Str, Dam, Init, Off, Def, HP, Wt]
+        init = reaction_speed + weapon_data[4]
+        off = skill_total + weapon_data[5]
+        defense = skill_total + weapon_data[6] + dodge_bonus
+        dmg = (n.DB || 0) + weapon_data[3]
+        hp = weapon_data[7]
+      else
+        # Fallback to pattern matching
+        wpn_stats = get_weapon_stats(actual_weapon_name)
+        init = reaction_speed + (wpn_stats[:init] || 0)
+        off = skill_total + (wpn_stats[:off] || 0)
+        defense = skill_total + (wpn_stats[:def] || 0) + dodge_bonus
+        dmg_mod = wpn_stats[:dmg].to_s =~ /special/ ? 0 : (wpn_stats[:dmg].to_s.to_i || 0)
+        dmg = (n.DB || 0) + dmg_mod
+        hp = wpn_stats[:hp] || 0
+      end
 
-      f += "#{weapon.ljust(19)}"
+      f += "#{actual_weapon_name.ljust(19)}"
       f += "#{skill_total.to_s.ljust(9)}"
       f += "#{init.to_s.ljust(8)}"
       f += "#{off.to_s.ljust(7)}"
@@ -315,18 +341,33 @@ def npc_output_new(n, cli, custom_width = nil)
     end
 
     # Display missile weapons
-    missile_weapons.sort_by { |_, skill| -skill }.each do |weapon, skill|
-      wpn_stats = get_missile_stats(weapon)
+    missile_weapons.sort_by { |_, skill| -skill }.each do |weapon_skill, skill|
+      # Get actual weapon name
+      actual_weapon_name = actual_missile[weapon_skill] || weapon_skill
+
+      # Find weapon in $Missile table
+      weapon_data = $Missile.find { |w| w && w[0] && w[0].strip == actual_weapon_name.strip }
+
       attr = n.get_attribute("BODY", "Missile Combat") || 0
       skill_total = body_char + attr + skill
 
-      off = skill_total + (wpn_stats[:off] || 0)
-      range = wpn_stats[:range] || "30m"
-      dmg_mod = wpn_stats[:dmg].to_s =~ /special/ ? 0 : (wpn_stats[:dmg].to_s.to_i || 0)
-      dmg = (n.DB || 0) + dmg_mod
-      hp = wpn_stats[:hp] || 0
+      if weapon_data
+        # Use actual weapon stats from table: [Name, Type, Str, Dam, Off, Rng, Max, Init, Wt]
+        off = skill_total + weapon_data[4]
+        dmg = (n.DB || 0) + weapon_data[3]
+        range = "#{weapon_data[5]}m"
+        hp = weapon_data[7]
+      else
+        # Fallback to pattern matching
+        wpn_stats = get_missile_stats(actual_weapon_name)
+        off = skill_total + (wpn_stats[:off] || 0)
+        range = wpn_stats[:range] || "30m"
+        dmg_mod = wpn_stats[:dmg].to_s =~ /special/ ? 0 : (wpn_stats[:dmg].to_s.to_i || 0)
+        dmg = (n.DB || 0) + dmg_mod
+        hp = wpn_stats[:hp] || 0
+      end
 
-      f += "#{weapon.ljust(19)}"
+      f += "#{actual_weapon_name.ljust(19)}"
       f += "#{skill_total.to_s.ljust(9)}"
       f += "#{' '.ljust(8)}"  # No init for missile
       f += "#{off.to_s.ljust(7)}"

data/includes/class_npc_new.rb

@@ -460,14 +460,94 @@ class NpcNew
     level
   end
   
+  def select_actual_weapon_from_table(skill_name, strength_char, is_missile = false)
+    # Select actual weapon from $Melee or $Missile table based on skill and strength
+    # This mimics the original weapon selection system
+    unless defined?($Melee)
+      load File.join($pgmdir, "includes/tables/melee.rb")
+    end
+    unless defined?($Missile)
+      load File.join($pgmdir, "includes/tables/missile.rb")
+    end
+
+    if is_missile
+      # Select from $Missile table based on skill type
+      case skill_name.downcase
+      when /bow/
+        # Select bow based on strength: L(2), M(4), H(6), H2(8), H3(10)
+        if strength_char >= 10
+          "Bow(H3) [1]"
+        elsif strength_char >= 8
+          "Bow(H2) [1]"
+        elsif strength_char >= 6
+          "Bow(H)  [1]"
+        elsif strength_char >= 4
+          "Bow(M) [1]"
+        else
+          "Bow(L) [1]"
+        end
+      when /crossbow|x-bow/
+        if strength_char >= 4
+          "X-bow(H) [¼]"
+        elsif strength_char >= 3
+          "X-bow(M) [⅓]"
+        else
+          "X-bow(L) [½]"
+        end
+      when /throwing/
+        "Th Knife [2]"
+      when /javelin/
+        "Javelin [1]"
+      when /sling/
+        "Sling [1]"
+      when /net/
+        "Net"
+      when /spear/
+        "Javelin [1]"
+      else
+        "Rock [2]"
+      end
+    else
+      # Select from $Melee table based on Wield Weapon total (replaces old STRENGTH)
+      # This is BODY + Strength + Wield weapon skill
+      # Determine weapon level range based on Wield Weapon total
+      wpn_level = case strength_char
+                  when 0..1 then 2
+                  when 2..3 then 4
+                  when 4..6 then 11
+                  when 7..9 then 18
+                  when 10..12 then 22
+                  when 13..15 then 26
+                  when 16..18 then 28
+                  else 30
+                  end
+
+      # Select random weapon from available range
+      weapon_idx = rand(wpn_level) + 1
+      weapon_data = $Melee[weapon_idx]
+
+      if weapon_data
+        weapon_data[0].strip  # Return weapon name like "Longsword/Buc"
+      else
+        skill_name  # Fallback to skill name
+      end
+    end
+  end
+
   def add_weapon_skills(template)
     # Add melee weapon skills with primary weapon specialization
+    # Also store actual weapon selections from $Melee/$Missile tables
     if template["melee_weapons"]
       @tiers["BODY"]["Melee Combat"]["skills"] ||= {}
+      @tiers["BODY"]["Melee Combat"]["actual_weapons"] ||= {}
 
       # Find primary weapon (highest base value)
       primary_weapon = template["melee_weapons"].max_by { |_, v| v }
 
+      # Get Wield Weapon total for weapon table selection (replaces old STRENGTH)
+      # This is BODY + Strength + Wield weapon skill
+      wield_total = get_skill_total("BODY", "Strength", "Wield weapon") rescue 3
+
       template["melee_weapons"].each_with_index do |(weapon, skill_level), index|
         base_level = calculate_tier_level(skill_level, @level, 0.6)
 
@@ -478,16 +558,24 @@ class NpcNew
         end
 
         @tiers["BODY"]["Melee Combat"]["skills"][weapon] = base_level
+
+        # Select actual weapon from $Melee table based on Wield Weapon total
+        actual_weapon = select_actual_weapon_from_table(weapon, wield_total, false)
+        @tiers["BODY"]["Melee Combat"]["actual_weapons"][weapon] = actual_weapon
       end
     end
 
     # Add missile weapon skills
     if template["missile_weapons"]
       @tiers["BODY"]["Missile Combat"]["skills"] ||= {}
+      @tiers["BODY"]["Missile Combat"]["actual_weapons"] ||= {}
 
       # Find primary missile weapon
       primary_missile = template["missile_weapons"].max_by { |_, v| v }
 
+      # Get Wield Weapon total for missile weapon selection (bow strength requirements)
+      wield_total = get_skill_total("BODY", "Strength", "Wield weapon") rescue 3
+
       template["missile_weapons"].each do |weapon, skill_level|
         base_level = calculate_tier_level(skill_level, @level, 0.6)
 
@@ -498,6 +586,10 @@ class NpcNew
         end
 
         @tiers["BODY"]["Missile Combat"]["skills"][weapon] = base_level
+
+        # Select actual weapon based on Wield Weapon total
+        actual_weapon = select_actual_weapon_from_table(weapon, wield_total, true)
+        @tiers["BODY"]["Missile Combat"]["actual_weapons"][weapon] = actual_weapon
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amar-rpg
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Geir Isene
@@ -123,7 +123,7 @@ metadata:
 post_install_message: |2+
 
     ===========================================
-    AMAR RPG Tools v2.1.0 has been installed!
+    AMAR RPG Tools v2.1.2 has been installed!
     ===========================================
 
     To start the application: