amar-tui 2.1.0 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f7cb9713df0714bb8a88ac5df6a747a59d38e6662b3973fec420a433bdf102e
-  data.tar.gz: 45d1b65f5843cd246bc859e4401096eabb501e2d7afc627fa77e9fb824fac0e4
+  metadata.gz: 125a3a252cf7e2f0da6837a2dfb7f3a526e0f24a712183ba8acc699afc9dba1a
+  data.tar.gz: 0ed40220339f8bf83eb908c756c0677557bef623da788541e59ec154a437264e
 SHA512:
-  metadata.gz: 739c135e0766e52a4fbc11aa907607ade259d460a8f8fa8ff6c88521ec92645721e7c4988db001ad904a3303ec1fc79178aefc25b49ed123a28aa96f2fa1745a
-  data.tar.gz: cea4d789ae52ab397e5d4cff7a3ccf5856a77ed4e1415ae53d70bd4819514bab17edf2c971597c005a01d94f9e78bf56959b83e1573b24d7c65802546b4a8fbc
+  metadata.gz: 56bc6852d14d0434a8a5c53c19d862554c4db0b020e31e8dbc6e63f8d6ff85aaace4c0570d0663d5223304a9d450893ab7bc12ea77a3a35a3353b86fc27c899c
+  data.tar.gz: '014357922ee46c72392a3dee618569d2d785445cfcd6ab521083921ca68697cb771fdf6c745047bff2d5140c73d04c3e4aca36d042775e639b335f22ab6b5f06'

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.5"
 $pgmdir = File.dirname(__FILE__)  # Global for includes
 
 # Debug logging
@@ -2048,17 +2048,20 @@ def npc_input_new_tui
   show_content(type_text)
   type_input = get_text_input("")
   return nil if type_input == :cancelled
-  
+
   type = ""
   if type_input && type_input.to_i > 0 && type_input.to_i <= types.length
     type = types[type_input.to_i - 1]
+  else
+    # Random type selection (0 or empty input)
+    type = types.sample
   end
-  
+
   # If race is not Human and type doesn't already include race, prepend it
   if race != "Human" && !type.include?(":")
     type = "#{race}: #{type}" if !type.empty?
   end
-  
+
   inputs << type
   
   # Level selection

data/cli_npc_output_new.rb

@@ -94,10 +94,21 @@ def npc_output_new(n, cli, custom_width = nil)
   n.tiers["BODY"].each do |attr_name, attr_data|
     # Skip if attr_data is not a hash or doesn't have skills
     next unless attr_data.is_a?(Hash) && attr_data["skills"].is_a?(Hash)
-    
+
     non_zero_skills = attr_data["skills"].select { |_, v| v > 0 }
+
+    # For Melee Combat and Missile Combat, show attribute but not individual weapon skills
+    if attr_name == "Melee Combat" || attr_name == "Missile Combat"
+      # Show attribute only if there are any skills
+      if non_zero_skills.any?
+        attr_level = attr_data["level"]
+        body_lines << " #{@attr_color}#{attr_name} (#{attr_level.to_s.rjust(2)})#{@reset}"
+      end
+      next  # Skip individual weapon skills
+    end
+
     next if non_zero_skills.empty?
-    
+
     attr_level = attr_data["level"]
     body_lines << " #{@attr_color}#{attr_name} (#{attr_level.to_s.rjust(2)})#{@reset}"
     non_zero_skills.each do |skill_name, skill_level|
@@ -274,11 +285,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 nil) || {}
+    actual_missile = (n.tiers["BODY"]["Missile Combat"]["actual_weapons"] rescue nil) || {}
 
   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 +313,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 +352,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

@@ -18,7 +18,7 @@ class NpcNew
     # Generate random values for missing data
     @name = name && !name.empty? ? name : generate_random_name(sex)
     @type = type
-    @level = level.to_i
+    @level = level.to_i > 0 ? level.to_i : rand(1..6)  # Random level 1-6 if 0 or invalid
     @area = area && !area.empty? ? area : ["Amaronir", "Merisir", "Calaronir", "Feronir", "Rauinir"].sample
     @sex = sex && !sex.empty? ? sex : ["M", "F"].sample
     
@@ -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
     
@@ -1166,6 +1258,15 @@ class NpcNew
     unless @tiers["MIND"]["Awareness"]["skills"].key?("Reaction speed")
       @tiers["MIND"]["Awareness"]["skills"]["Reaction speed"] = 0
     end
+
+    # Ensure Social Knowledge attribute exists for Spoken Language
+    @tiers["MIND"]["Social Knowledge"] ||= {"level" => 0, "skills" => {}}
+    @tiers["MIND"]["Social Knowledge"]["skills"] ||= {}
+
+    # Ensure Spoken Language is at least 2 (native tongue)
+    # All characters start with 2 in Spoken Language per character creation rules
+    current_spoken = @tiers["MIND"]["Social Knowledge"]["skills"]["Spoken Language"] || 0
+    @tiers["MIND"]["Social Knowledge"]["skills"]["Spoken Language"] = [current_spoken, 2].max
   end
 
   def apply_predetermined_stats

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amar-tui
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.5
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-10-04 00:00:00.000000000 Z
+date: 2026-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -122,15 +122,11 @@ metadata:
   changelog_uri: https://github.com/isene/Amar-Tools/blob/master/README.md
 post_install_message: |2+
 
-    ==========================================
-    AMAR Tools TUI v2.1.0 has been installed!
-    ==========================================
+    ===========================================
+    AMAR RPG Tools v2.1.5 has been installed!
+    ===========================================
 
-    NOTE: This gem has been renamed to 'amar-rpg'.
-    Please install 'amar-rpg' instead:
-      gem install amar-rpg
-
-    To start the TUI application:
+    To start the application:
       amar-tui.rb
 
     For more information:
@@ -156,6 +152,6 @@ requirements: []
 rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
-summary: AMAR Tools TUI - Terminal UI for Amar RPG
+summary: AMAR RPG Tools - Terminal UI and utilities for Amar RPG
 test_files: []
 ...