amar-rpg 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d7a7e1e8688949f6e0beed811aeab31928d09cd6a2c7b602aba9706b617b5d
-  data.tar.gz: 776ed77dce45af1ab2d8eb412beebf733e7ba509738c8b7328fe048e32227913
+  metadata.gz: 2bdc61cf6d9ff6b07fc95dfc822d63a5bca306892ce47e6f9dd6dd81333d0f7e
+  data.tar.gz: 7727d43ea06e90644243c5285c5377606e858ce720692d47412d2a6a61061aaf
 SHA512:
-  metadata.gz: bc917d0a80ff2b84a2aa2a87196609fc880aeca6f9f267b60492e523c41860bc529af1d73885942c7030c4fed07eb7869dcce7c4a4fd6cf76764babdbd05c1de
-  data.tar.gz: c5e7639280c0aa684396b6b669ff0a5d5d0301b16b6c0408f3a3bb2b7409fbb2d0e7eebe0471679cb643d7c3f404bacf78610e854a67ed374356d7bb444e400b
+  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.1"
+@version = "2.1.2"
 $pgmdir = File.dirname(__FILE__)  # Global for includes
 
 # Debug logging

data/includes/class_npc_new.rb

@@ -460,9 +460,9 @@ 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
+  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
@@ -471,75 +471,72 @@ class NpcNew
     end
 
     if is_missile
-      # Map missile skill names to actual weapons
+      # 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_total >= 10
+        if strength_char >= 10
           "Bow(H3) [1]"
-        elsif strength_total >= 8
+        elsif strength_char >= 8
           "Bow(H2) [1]"
-        elsif strength_total >= 6
+        elsif strength_char >= 6
           "Bow(H)  [1]"
-        elsif strength_total >= 4
+        elsif strength_char >= 4
           "Bow(M) [1]"
         else
           "Bow(L) [1]"
         end
       when /crossbow|x-bow/
-        # Select crossbow based on strength
-        if strength_total >= 4
+        if strength_char >= 4
           "X-bow(H) [¼]"
-        elsif strength_total >= 3
+        elsif strength_char >= 3
           "X-bow(M) [⅓]"
         else
           "X-bow(L) [½]"
         end
-      when /throwing|knife/
+      when /throwing/
         "Th Knife [2]"
       when /javelin/
         "Javelin [1]"
       when /sling/
         "Sling [1]"
       when /net/
-        skill_name  # Net is just "Net"
+        "Net"
       when /spear/
-        "Javelin [1]"  # Thrown spear = javelin
+        "Javelin [1]"
       else
-        "Rock [2]"  # Default
+        "Rock [2]"
       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"
+      # 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  # Return as-is if no match
+        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 based on skill names
+    # Also store actual weapon selections from $Melee/$Missile tables
     if template["melee_weapons"]
       @tiers["BODY"]["Melee Combat"]["skills"] ||= {}
       @tiers["BODY"]["Melee Combat"]["actual_weapons"] ||= {}
@@ -547,8 +544,9 @@ class NpcNew
       # 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
+      # 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)
@@ -561,8 +559,8 @@ class NpcNew
 
         @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)
+        # 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
@@ -575,8 +573,8 @@ class NpcNew
       # 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
+      # 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)
@@ -589,8 +587,8 @@ class NpcNew
 
         @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)
+        # 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.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Geir Isene
@@ -123,7 +123,7 @@ metadata:
 post_install_message: |2+
 
     ===========================================
-    AMAR RPG Tools v2.1.1 has been installed!
+    AMAR RPG Tools v2.1.2 has been installed!
     ===========================================
 
     To start the application: