Enemies fight back\!

Platform/Apple/virtual/src/font/fontEngine.s

@@ -96,6 +96,12 @@ DisplayStr	JMP DoParse	; API call address
 ;Does not do line breaking
 CalcWidth	JMP DoCWdth
 
+;Save the cursor position
+SaveCursor	JMP SvCurs
+
+;Restore the cursor position
+RestCursor	JMP RsCurs
+
 ;If you know which of the {0..110} bitmapped characters
 ;you want plotted, you can bypass testing for control 
 ;codes, making this a faster way to plot.
@@ -520,6 +526,27 @@ WtL_Prs	LDA #0 	;	if wait interrupted then do
 	STA ChBflip
 	RTS
 
+;Routine: Save the cursor position. There is exactly one save slot.
+BCursColL	!byte 0		;Saved Lo-byte of 16-bit horz X-pos value 
+BCursColH	!byte 0		;Saved Hi-byte X-position {0..279}
+BCursRow	!byte 0		;Saved vertical Y-position {0..191}
+SvCurs	LDA CursColL
+	STA BCursColL
+	LDA CursColH
+	STA BCursColH
+	LDA CursRow
+	STA BCursRow
+	RTS
+
+;Routine: Restore the cursor position. There is exactly one save slot.
+RsCurs	LDA BCursColL
+	STA CursColL
+	LDA BCursColH
+	STA CursColH
+	LDA BCursRow
+	STA CursRow
+	RTS
+
 ;Routine: Set window boundaries. Paramaters are pushed on the PLASMA
 ;stack in the order Top, Bottom, Left, Right. But because that stack
 ;grows downward, we see them in this order:

Platform/Apple/virtual/src/include/fontEngine.i

@@ -21,3 +21,5 @@ CopyWindow	= ClearWindow+3
 DisplayChar	= CopyWindow+3
 DisplayStr	= DisplayChar+3
 CalcWidth	= DisplayStr+3
+SaveCursor	= CalcWidth+3
+RestCursor	= SaveCursor+3

Platform/Apple/virtual/src/plasma/gameloop.pla

@@ -667,6 +667,24 @@ asm setWindow
   jmp SetWindow
 end
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Save the cursor position (1 save slot)
+asm saveCursor
+  +asmPlasm 0
+  bit setLcRW+lcBank2
+  bit setLcRW+lcBank2
+  jmp SaveCursor
+end
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Restore the cursor position (1 save slot)
+asm restoreCursor
+  +asmPlasm 0
+  bit setLcRW+lcBank2
+  bit setLcRW+lcBank2
+  jmp RestCursor
+end
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Use the font engine to clear the current text window
 // Params: None
@@ -800,6 +818,26 @@ def fatal(msg)
   mmgr(FATAL_ERROR, msg)
 end
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Return the max of two unsigned 16-bit numbers
+def max(a, b)
+  if a < b
+    return b
+  else
+    return a
+  fin
+end
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Return the min of two unsigned 16-bit numbers
+def min(a, b)
+  if a < b
+    return a
+  else
+    return b
+  fin
+end
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Convert signed decimal to string in decimalBuf
 def convertDec(n)
@@ -1038,7 +1076,10 @@ end
 // Display the party data on the screen
 def showParty()
   word p
+
+  saveCursor()
   setWindow3()
+  clearWindow()
 
   // Display header
   rawDisplayStr("^LName")  // begin underline mode
@@ -1056,6 +1097,7 @@ def showParty()
   // Finish up
   if mapIs3D; copyWindow(); fin
   setWindow2()
+  restoreCursor()
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1452,9 +1494,7 @@ def setPortrait(portraitNum)
   flipToPage1()
   
   // We're going to switch windows. Save the cursor pos in the text window.
-  //FIXME: This is from old font engine, need to change for new eng.
-  //cx = ^cursh
-  //cy = ^cursv
+  saveCursor()
 
   // Now clear out the map area
   setMapWindow()
@@ -1462,9 +1502,7 @@ def setPortrait(portraitNum)
 
   // Restore the cursor position
   setWindow2()
-  //FIXME: This is from old font engine, need to change for new eng.
-  //^cursh = cx
-  //^cursv = cy
+  restoreCursor()
 
   // Load the portrait image and display it
   srcData = auxMmgr(QUEUE_LOAD, portraitNum<<8 | RES_TYPE_PORTRAIT)
@@ -1499,7 +1537,7 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def countList(p)
-  word n
+  byte n
   n = 0
   while p
     n = n+1
@@ -1510,7 +1548,7 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def countListFiltered(p, offset, filterFunc)
-  word n
+  byte n
   n = 0
   while p
     if filterFunc(p)
@@ -1521,6 +1559,20 @@ def countListFiltered(p, offset, filterFunc)
   return n
 end
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+def randomFromListFiltered(p, offset, filterFunc)
+  byte n
+  n = rand16() % countListFiltered(p, offset, filterFunc)
+  while p
+    if filterFunc(p)
+      if n == 0; return p; fin
+      n = n+1
+    fin
+    p = *(p + offset)
+  loop
+  return NULL
+end
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Call like this: addToList(player + items, itemToAdd)
 def addToList(addTo, p)
@@ -1792,8 +1844,33 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def enemyCombatTurn(pe)
-  isPlural = FALSE
-  displayf1("\nTODO: Enemy turn for %s.\n", pe=>s_name)
+  word pl
+  byte roll, dam
+
+  // Choose a target
+  pl = randomFromListFiltered(global=>p_players, p_nextObj, @canFight)
+  if !pl; return; fin
+
+  buildString(@addToString)
+  printf3("\n%s %s %s ", pe=>s_name, pe=>s_attackText, pl=>s_name)
+
+  // Roll to hit
+  roll = rand16() % 100
+  if roll <= pe->b_chanceToHit
+    dam = rollDice(pe=>r_enemyDmg)
+    printf1("and hits for %d damage!", dam)
+    pl=>w_health = max(0, pl=>w_health - dam)
+    if pl=>w_health == 0
+      printf1(" %s is killed!", pl=>s_name)
+    fin
+    showParty()
+  else
+    puts("and misses.")
+  fin
+  puts("\n")
+
+  displayStr(finishString(0))
+  printf2("chance=%d roll=%d\n", pe->b_chanceToHit, roll)
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////