amar-rpg 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fcd5d2e4b7db6ac279f1f301aff82718adb4d86dd29b9574c93104b4abe5e0
-  data.tar.gz: c6d0940d54cb054f26dbd4f3f98e88ead1175dcaac640a9d72819e0d1bbaa1bf
+  metadata.gz: 58d7a7e1e8688949f6e0beed811aeab31928d09cd6a2c7b602aba9706b617b5d
+  data.tar.gz: 776ed77dce45af1ab2d8eb412beebf733e7ba509738c8b7328fe048e32227913
 SHA512:
-  metadata.gz: 6fb4c2d0a34065cfc99ba6bda571522bb081d516dc34d2d6b90d170ac9484511cbf757c69a2b7aa3126a8d79ea798360cf1d56018d7dcbf0bcf87fdbd622310b
-  data.tar.gz: 60bbe96c3c52e38cdf0a86abf5d093f131fea507e1c1aa9bd37c81a6cd84f62258540afa9f4b7563e49fa08283ce750ab8e1d5ce27ad0a3e364d7a77d74151f7
+  metadata.gz: bc917d0a80ff2b84a2aa2a87196609fc880aeca6f9f267b60492e523c41860bc529af1d73885942c7030c4fed07eb7869dcce7c4a4fd6cf76764babdbd05c1de
+  data.tar.gz: c5e7639280c0aa684396b6b669ff0a5d5d0301b16b6c0408f3a3bb2b7409fbb2d0e7eebe0471679cb643d7c3f404bacf78610e854a67ed374356d7bb444e400b

data/amar-tui.rb

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

data/cli_npc_output_new.rb

@@ -231,8 +231,9 @@ def npc_output_new(n, cli, custom_width = nil)
   end
   
   # Check if we have original weapon data and display it
-  if n.respond_to?(:melee1) && !n.melee1.to_s.empty?
-    # Display ORIGINAL weapon format
+  # DISABLED: Old weapon format only shows 2-3 weapons, new format shows all skills
+  if false && n.respond_to?(:melee1) && !n.melee1.to_s.empty?
+    # Display ORIGINAL weapon format (DEPRECATED)
     f += "─" * width + "\n"
     f += "#{@weapon_color}WEAPON             SKILL    INI     OFF    DEF    DAM    HP    RANGE#{@reset}\n"
 
@@ -273,68 +274,108 @@ def npc_output_new(n, cli, custom_width = nil)
       f += "\n"
     end
   else
-    # Fall back to 3-tier weapon display
-    melee_weapons = n.tiers["BODY"]["Melee Combat"]["skills"].select { |_, v| v > 0 }
-    missile_weapons = n.tiers["BODY"]["Missile Combat"]["skills"].select { |_, v| v > 0 }
-  
+    # 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}WEAPONS:#{@reset}\n"
-    
-    # Headers
-    melee_header = "Melee Weapon".ljust(15) + "Skill  Init  Off  Def  Damage"
-    missile_header = "Missile Weapon".ljust(15) + "Skill  Range     Damage"
-    f += "#{melee_header.ljust(60)} │ #{missile_header}\n"
-    f += "─" * 61 + "┼" + "─" * 58 + "\n"
-    
-    # Format weapons with calculated totals
-    melee_lines = []
-    missile_lines = []
-    
+    f += "#{@weapon_color}WEAPON             SKILL    INI     OFF    DEF    DAM    HP    RANGE#{@reset}\n"
+
     body_char = n.get_characteristic("BODY")
-    
+
     # Calculate Dodge bonus for defense (Dodge/5 rounded down)
     dodge_total = n.get_skill_total("BODY", "Athletics", "Dodge") || 0
     dodge_bonus = (dodge_total / 5).to_i
-    
-    melee_weapons.each do |weapon, skill|
-      wpn_stats = get_weapon_stats(weapon)
+
+    # Get reaction speed for initiative
+    reaction_speed = n.get_skill_total("MIND", "Awareness", "Reaction speed") || 0
+
+    # Display melee weapons
+    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
-      
-      # Calculate weapon totals with correct initiative formula
-      # Initiative = Weapon Init + Reaction Speed skill total
-      reaction_speed = n.get_skill_total("MIND", "Awareness", "Reaction speed") || 0
-      init = reaction_speed + (wpn_stats[:init] || 0)
-      off = skill_total + (wpn_stats[:off] || 0)
-      defense = skill_total + (wpn_stats[:def] || 0) + dodge_bonus  # Include Dodge/5
-      dmg_mod = wpn_stats[:dmg].to_s =~ /special/ ? 0 : (wpn_stats[:dmg].to_s.to_i || 0)
-      dmg = (n.DB || 0) + dmg_mod
-      
-      line = "#{weapon.ljust(15)} #{skill_total.to_s.rjust(3)}  #{init.to_s.rjust(4)}  #{off.to_s.rjust(3)}  #{defense.to_s.rjust(3)}  #{dmg.to_s.rjust(3)}"
-      melee_lines << line
+
+      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 += "#{actual_weapon_name.ljust(19)}"
+      f += "#{skill_total.to_s.ljust(9)}"
+      f += "#{init.to_s.ljust(8)}"
+      f += "#{off.to_s.ljust(7)}"
+      f += "#{defense.to_s.ljust(7)}"
+      f += "#{dmg.to_s.ljust(7)}"
+      f += "#{hp.to_s.ljust(6)}"
+      f += "\n"
     end
-    
-    missile_weapons.each do |weapon, skill|
-      wpn_stats = get_missile_stats(weapon)
+
+    # Display missile weapons
+    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
-      
-      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
-      
-      line = "#{weapon.ljust(15)} #{skill_total.to_s.rjust(3)}  #{range.ljust(10)} #{dmg.to_s.rjust(3)}"
-      missile_lines << line
-    end
-    
-    # Balance weapon columns
-    max_wpn_lines = [melee_lines.length, missile_lines.length].max
-    melee_lines += [""] * (max_wpn_lines - melee_lines.length)
-    missile_lines += [""] * (max_wpn_lines - missile_lines.length)
-    
-    max_wpn_lines.times do |i|
-      f += "#{melee_lines[i].ljust(60)} │ #{missile_lines[i]}\n"
+
+      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 += "#{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)}"
+      f += "#{' '.ljust(7)}"  # No def for missile
+      f += "#{dmg.to_s.ljust(7)}"
+      f += "#{hp.to_s.ljust(6)}"
+      f += "#{range}"
+      f += "\n"
     end
   end
   end  # Close the original/3-tier weapon display if/else block

data/includes/class_npc_new.rb

@@ -406,10 +406,22 @@ class NpcNew
                   else 0.5
                   end
     
-    # Use square root for more realistic progression
-    level = (base * Math.sqrt(npc_level + 1) * growth_rate).to_i
-    
-    # Add minimal variation ONLY if base > 0
+    # Use scaling that produces desired total skill progression
+    # Target totals: L1: 4-5, L2: 6-7, L3: 8-9, L4: 10-11, L5: 12-13, L6: 14+
+    # Typical warrior has BODY 1-2, Melee Combat 2-3, Weapon skill 2-3 at mid-levels
+    level_multiplier = case npc_level
+                       when 1 then 0.7
+                       when 2 then 0.95
+                       when 3 then 1.2
+                       when 4 then 1.45
+                       when 5 then 1.7
+                       when 6 then 1.95
+                       else 2.2
+                       end
+
+    level = (base * level_multiplier * growth_rate).to_i
+
+    # Add variation ONLY if base > 0
     if base > 0
       variation = rand(3) - 1  # -1, 0, or 1
       level += variation
@@ -448,22 +460,138 @@ class NpcNew
     level
   end
   
+  def select_actual_weapon(skill_name, strength_total, is_missile = false)
+    # Map skill name to actual weapon from $Melee or $Missile table
+    # Load weapon tables if needed
+    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
+      # Map missile skill names to actual weapons
+      case skill_name.downcase
+      when /bow/
+        # Select bow based on strength: L(2), M(4), H(6), H2(8), H3(10)
+        if strength_total >= 10
+          "Bow(H3) [1]"
+        elsif strength_total >= 8
+          "Bow(H2) [1]"
+        elsif strength_total >= 6
+          "Bow(H)  [1]"
+        elsif strength_total >= 4
+          "Bow(M) [1]"
+        else
+          "Bow(L) [1]"
+        end
+      when /crossbow|x-bow/
+        # Select crossbow based on strength
+        if strength_total >= 4
+          "X-bow(H) [¼]"
+        elsif strength_total >= 3
+          "X-bow(M) [⅓]"
+        else
+          "X-bow(L) [½]"
+        end
+      when /throwing|knife/
+        "Th Knife [2]"
+      when /javelin/
+        "Javelin [1]"
+      when /sling/
+        "Sling [1]"
+      when /net/
+        skill_name  # Net is just "Net"
+      when /spear/
+        "Javelin [1]"  # Thrown spear = javelin
+      else
+        "Rock [2]"  # Default
+      end
+    else
+      # Map melee skill names to actual weapons from $Melee table
+      case skill_name.downcase
+      when /sword/
+        strength_total >= 4 ? "Longsword" : "Short sword"
+      when /axe/
+        strength_total >= 4 ? "B. axe 2H" : "Hatchet"
+      when /spear/
+        strength_total >= 4 ? "Spear 2H" : "Spear"
+      when /mace/
+        strength_total >= 4 ? "H. mace 2H" : "Light mace"
+      when /dagger|knife/
+        "Knife"
+      when /staff/
+        "Staff"
+      when /club/
+        "Club"
+      when /net/
+        "Net"
+      when /shield/
+        "Buckler"
+      when /unarmed/
+        "Unarmed"
+      else
+        skill_name  # Return as-is if no match
+      end
+    end
+  end
+
   def add_weapon_skills(template)
-    # Add melee weapon skills
+    # Add melee weapon skills with primary weapon specialization
+    # Also store actual weapon selections based on skill names
     if template["melee_weapons"]
       @tiers["BODY"]["Melee Combat"]["skills"] ||= {}
-      template["melee_weapons"].each do |weapon, skill_level|
+      @tiers["BODY"]["Melee Combat"]["actual_weapons"] ||= {}
+
+      # Find primary weapon (highest base value)
+      primary_weapon = template["melee_weapons"].max_by { |_, v| v }
+
+      # Get strength total for weapon selection
+      strength_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)
+
+        # Boost primary weapon by 1-2 points for specialization
+        if weapon == primary_weapon[0] && skill_level >= 4
+          boost = rand(2) + 1  # +1 or +2
+          base_level += boost
+        end
+
         @tiers["BODY"]["Melee Combat"]["skills"][weapon] = base_level
+
+        # Select actual weapon based on skill name and strength
+        actual_weapon = select_actual_weapon(weapon, strength_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 strength total for missile weapon selection
+      strength_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)
+
+        # Boost primary missile weapon
+        if weapon == primary_missile[0] && skill_level >= 3
+          boost = rand(2) + 1  # +1 or +2
+          base_level += boost
+        end
+
         @tiers["BODY"]["Missile Combat"]["skills"][weapon] = base_level
+
+        # Select actual weapon based on skill name and strength
+        actual_weapon = select_actual_weapon(weapon, strength_total, true)
+        @tiers["BODY"]["Missile Combat"]["actual_weapons"][weapon] = actual_weapon
       end
     end
     

data/includes/spell_catalog.rb

@@ -369,11 +369,13 @@ def assign_spells_to_npc(npc)
 
   max_spells = case magic_skill
                when 0..5 then 0      # No spells for beginners
-               when 6..10 then 1     # 1 spell for novices
-               when 11..15 then 2    # 2 spells for competent
-               when 16..20 then 3    # 3 spells for skilled
-               when 21..25 then 4    # 4 spells for experts
-               else 5                # 5 spells for masters
+               when 6..8 then 2      # 2 spells for novices
+               when 9..11 then 4     # 4 spells for apprentices
+               when 12..14 then 6    # 6 spells for competent
+               when 15..17 then 8    # 8 spells for skilled
+               when 18..20 then 10   # 10 spells for experts
+               when 21..25 then 12   # 12 spells for masters
+               else 15               # 15 spells for legendary
                end
 
   # Get character's strongest magical domains
@@ -388,6 +390,7 @@ def assign_spells_to_npc(npc)
     can_cast = true
     spell_data[:skill_path].each do |skill_part|
       # Simplified check - character should have some relevant skills
+      # Also check abbreviated names (e.g., "Prot." for "Protection")
       case skill_part
       when "Fire" then can_cast &&= (all_magic_skills["Fire"] || 0) > 0
       when "Water" then can_cast &&= (all_magic_skills["Water"] || 0) > 0
@@ -395,11 +398,13 @@ def assign_spells_to_npc(npc)
       when "Earth" then can_cast &&= (all_magic_skills["Earth"] || 0) > 0
       when "Mind" then can_cast &&= (all_magic_skills["Mind"] || 0) > 0
       when "Nature" then can_cast &&= (all_magic_skills["Nature"] || 0) > 0
-      when "Protection" then can_cast &&= (all_magic_skills["Protection"] || 0) > 0
-      when "Illusion" then can_cast &&= (all_magic_skills["Illusion"] || 0) > 0
+      when "Protection" then can_cast &&= ((all_magic_skills["Protection"] || 0) > 0 || (all_magic_skills["Prot."] || 0) > 0)
+      when "Illusion" then can_cast &&= ((all_magic_skills["Illusion"] || 0) > 0 || (all_magic_skills["Ill."] || 0) > 0)
       when "Shadow" then can_cast &&= (all_magic_skills["Shadow"] || 0) > 0
       when "Self" then can_cast &&= (all_magic_skills["Self"] || 0) > 0
       when "Life" then can_cast &&= (all_magic_skills["Life"] || 0) > 0
+      when "Time" then can_cast &&= (all_magic_skills["Time"] || 0) > 0
+      when "Death" then can_cast &&= (all_magic_skills["Death"] || 0) > 0
       end
     end
     can_cast

metadata

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