amar-tui 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d28d42499aa8df4a0a2a6f62ab64d7bfec665d48e701b3fb7c074ee4f32cbca6
-  data.tar.gz: 060c895d35474417f11377a2a9c724eb1f84c67c2120f145392701fd11313da0
+  metadata.gz: 4f7cb9713df0714bb8a88ac5df6a747a59d38e6662b3973fec420a433bdf102e
+  data.tar.gz: 45d1b65f5843cd246bc859e4401096eabb501e2d7afc627fa77e9fb824fac0e4
 SHA512:
-  metadata.gz: '08be97a101529689d81fa37c542d51a075b39bd4db842f3365d55958ef7a330366fd8d31306b6cbed3581797a68cc1e993efb23d5a2064af7ffd041e43600e1b'
-  data.tar.gz: 3f6bc67d121048a8208101d9b9bb01be60554e706ae054974b1d8609eeda466cec9c54c72e9ab3d42d09a9df0fcec2716979430837c3787691968cd49d6d10ee
+  metadata.gz: 739c135e0766e52a4fbc11aa907607ade259d460a8f8fa8ff6c88521ec92645721e7c4988db001ad904a3303ec1fc79178aefc25b49ed123a28aa96f2fa1745a
+  data.tar.gz: cea4d789ae52ab397e5d4cff7a3ccf5856a77ed4e1415ae53d70bd4819514bab17edf2c971597c005a01d94f9e78bf56959b83e1573b24d7c65802546b4a8fbc

data/README.md

@@ -7,6 +7,11 @@
 
 <img src="images/amarcover.jpg" align="left" width="150" height="150"> Welcome to the swiss army knife for the Amar Role-Playing Game (http://d6gaming.org).
 
+## Version 2.0 Released!
+
+Complete rewrite with both Terminal User Interface (TUI) and Web interface.
+Install the gem with `gem install amar-tui` and run with `amar-tui`.
+
 This program suite runs on any GNU/Linux system where the scripting
 language Ruby is installed. Ruby is available as tar.gz, rpm packages or
 deb-packages as needed for your specific Linux distribution. For more info
@@ -15,7 +20,7 @@ on Ruby, see http://www.ruby-lang.org.
 This tool box for the Amar RPG is designed for generating random
 or specific encounters and Non-Player Characters for the Amar RPG, random
 settlements and relationship maps for inhabitants of villages/towns/cities
-as well as random names for various races and for making Open Ended Dice Rolls. 
+as well as random names for various races and for making Open Ended Dice Rolls.
 
 In order to make real use of this program, you should be running an Amar
 game as the Game Master.
@@ -23,7 +28,7 @@ game as the Game Master.
 For more info on the Amar RPG, game rules, adventures and more, see
 http://www.d6gaming.org/.
 
-For an online version of this program, go to http://isene.org
+For an online version of this program, go to https://isene.com/amar3.html
 
 ## Requirements
 GraphViz is a requirement for generating relationship maps for towns and

data/amar-tui.rb

@@ -60,7 +60,7 @@ require 'stringio'  # For suppressing output
 require 'fcntl'  # For non-blocking IO
 
 # GLOBAL VARS & CONSTANTS
-@version = "1.0.0"
+@version = "2.1.0"
 $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,67 @@ 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
+    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 {}
+
   if melee_weapons.any? || missile_weapons.any?
     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|
+
+    # 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|
       wpn_stats = get_weapon_stats(weapon)
       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
+      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
-      
-      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
+      hp = wpn_stats[:hp] || 0
+
+      f += "#{weapon.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|
+
+    # Display missile weapons
+    missile_weapons.sort_by { |_, skill| -skill }.each do |weapon, skill|
       wpn_stats = get_missile_stats(weapon)
       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
-      
-      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"
+      hp = wpn_stats[:hp] || 0
+
+      f += "#{weapon.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
@@ -449,20 +461,42 @@ class NpcNew
   end
   
   def add_weapon_skills(template)
-    # Add melee weapon skills
+    # Add melee weapon skills with primary weapon specialization
     if template["melee_weapons"]
       @tiers["BODY"]["Melee Combat"]["skills"] ||= {}
-      template["melee_weapons"].each do |weapon, skill_level|
+
+      # Find primary weapon (highest base value)
+      primary_weapon = template["melee_weapons"].max_by { |_, v| v }
+
+      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
       end
     end
-    
+
     # Add missile weapon skills
     if template["missile_weapons"]
       @tiers["BODY"]["Missile Combat"]["skills"] ||= {}
+
+      # Find primary missile weapon
+      primary_missile = template["missile_weapons"].max_by { |_, v| v }
+
       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
       end
     end
@@ -787,7 +821,7 @@ class NpcNew
       get_skill_total("BODY", "Missile Combat", "Sling")
     when /javelin/
       get_skill_total("BODY", "Missile Combat", "Javelin")
-    when /rock|stone|throwing/
+    when /rock|stone|throwing|th\s|knife/
       get_skill_total("BODY", "Missile Combat", "Throwing")
     else
       get_skill_total("BODY", "Missile Combat", "Bow") || 0

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amar-tui
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-09-30 00:00:00.000000000 Z
+date: 2025-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -122,9 +122,13 @@ metadata:
   changelog_uri: https://github.com/isene/Amar-Tools/blob/master/README.md
 post_install_message: |2+
 
-    ========================================
-    AMAR Tools TUI v2.0 has been installed!
-    ========================================
+    ==========================================
+    AMAR Tools TUI v2.1.0 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:
       amar-tui.rb