[dr][drdefs.rb] Simplify npc detection and add ordinals to them

We now parse room_objects once and detect live and dead NPCs in one place, adding ordinals to all NPCs.

Works well for me, but should wait till the next release is out, so don't merge it yet, please.

Author: MahtraDR

lib/dragonrealms/drinfomon/drdefs.rb

@@ -57,26 +57,33 @@ def find_pcs_sitting(room_players)
                   .map { |obj| obj.strip.scan(/\w+$/).first }
     end
 
-    def find_npcs(room_objs)
+    def find_all_npcs(room_objs)
       room_objs.sub(/You also see/, '').sub(/ with a [\w\s]+ sitting astride its back/, '').strip
-               .scan(%r{<pushBold/>[^<>]*<popBold/> which appears dead|<pushBold/>[^<>]*<popBold/> \(dead\)|<pushBold/>[^<>]*<popBold/>})
-               .reject { |obj| obj =~ /which appears dead|\(dead\)/ }
-               .map { |obj| obj.sub(/.*alfar warrior.*/, 'alfar warrior') }
-               .map { |obj| obj.sub(/.*sinewy leopard.*/, 'sinewy leopard') }
-               .map { |obj| obj.sub(/.*lesser naga.*/, 'lesser naga') }
-               .map { |obj| obj.sub(/.*Shadow Servant.*/, 'Shadow Servant') }
-               .map { |obj| obj.sub('<pushBold/>', '').sub(%r{<popBold/>.*}, '') }
-               .map { |obj| obj.split(/\sand\s/).last.sub(/(?:\sglowing)?\swith\s.*/, '') }
-               .map { |obj| obj.strip.scan(/[A-z'-]+$/).first }
+                .scan(%r{<pushBold/>[^<>]*<popBold/> which appears dead|<pushBold/>[^<>]*<popBold/> \(dead\)|<pushBold/>[^<>]*<popBold/>})
+    
     end
-
+    
+    def clean_npc_string(npc_string)
+      tmp_npc_string = npc_string.map { |obj| obj.sub(/.*alfar warrior.*/, 'alfar warrior') }
+                .map { |obj| obj.sub(/.*sinewy leopard.*/, 'sinewy leopard') }
+                .map { |obj| obj.sub(/.*lesser naga.*/, 'lesser naga') }
+                .map { |obj| obj.sub('<pushBold/>', '').sub(%r{<popBold/>.*}, '') }
+                .map { |obj| obj.split(/\sand\s/).last.sub(/(?:\sglowing)?\swith\s.*/, '') }
+                .map { |obj| obj.strip.scan(/[A-z'-]+$/).first }
+                .sort
+      flat_npcs = []
+      tmp_npc_string.uniq.each { |npc| flat_npcs << tmp_npc_string.size.times.select {|i| tmp_npc_string[i] == npc}.size.times.map { |number| number.zero? ? tmp_npc_string[0] : tmp_npc_string[number].sub(npc, "#{$ORDINALS[number]} #{npc}") } }
+      flat_npcs.flatten
+    end
+    
+    def find_npcs(room_objs)
+      npcs = find_all_npcs(room_objs).reject { |obj| obj =~ /which appears dead|\(dead\)/ }
+      clean_npc_string(npcs)
+    end
+    
     def find_dead_npcs(room_objs)
-      room_objs.sub(/You also see/, '').sub(/ with a [\w\s]+ sitting astride its back/, '')
-               .strip.scan(%r{<pushBold/>[^<>]*<popBold/> which appears dead|<pushBold/>[^<>]*<popBold/> \(dead\)|<pushBold/>[^<>]*<popBold/>})
-               .select { |obj| obj =~ /which appears dead|\(dead\)/ }
-               .map { |obj| obj.sub('<pushBold/>', '').sub(%r{<popBold/>.*}, '') }
-               .map { |obj| obj.split(/\sand\s/).last.sub(/(?:\sglowing)?\swith\s.*/, '') }
-               .map { |obj| obj.strip.scan(/[A-z'-]+$/).first }
+      dead_npcs = find_all_npcs(room_objs).select { |obj| obj =~ /which appears dead|\(dead\)/ }
+      clean_npc_string(dead_npcs)
     end
 
     def find_objects(room_objs)