fix: minor patches

SaitoTech · Jan 23, 2024 · 76270a4 · 76270a4
1 parent b0233a9
commit 76270a4
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 20 deletions.
diff --git a/mods/his/his.js b/mods/his/his.js
@@ -28395,17 +28395,39 @@ return;
 
       let space = his_self.game.spaces[spacekey];
 
+      his_self.field_battle_overlay.hide();
+
+      his_self.playerSelectSpaceWithFilter(
+
+                  "Choose Destination for Retreat:" ,
+
+        	  function(space2) {
+	            if (space.neighbours.includes(space2.key)) {
+		      if (loser === attacker) {
+	  		if (space2.key === attacker_comes_from_this_spacekey) {
+          		  return 1;
+	  		}
+		      } else {
+          		if (his_self.canFactionRetreatToSpace(loser, space2.key, "") && space2.key !== attacker_comes_from_this_spacekey) {
+          		  return 1;
+	  		}
+		      }
+		    }
+		  },
+
+      		  function(spacekey) {
+                    onFinishSelect(his_self, spacekey);
+		  },
+
+	    	  null, 
+
+	    	  true 
+
+      );
+
+/****
+
       let html = "<ul>";
-      for (let i = 0; i < space.neighbours.length; i++) {
-	if (loser === attacker) {
-	  if (space.neighbours[i] === attacker_comes_from_this_spacekey) {
-            html += `<li class="option" id="${space.neighbours[i]}">${his_self.game.spaces[space.neighbours[i]].key}</li>`;
-	  }
-	} else {
-          if (his_self.canFactionRetreatToSpace(loser, space.neighbours[i], "") && space.neighbours[i] !== attacker_comes_from_this_spacekey) {
-            html += `<li class="option" id="${space.neighbours[i]}">${his_self.game.spaces[space.neighbours[i]].key}</li>`;
-	  }
-	}
       }
       html += "</ul>";
 
@@ -28417,6 +28439,8 @@ return;
         onFinishSelect(his_self, id);
       });
 
+***/
+
     };
 
 

diff --git a/mods/his/src/his-player.js b/mods/his/src/his-player.js
@@ -2876,17 +2876,39 @@ return;
 
       let space = his_self.game.spaces[spacekey];
 
+      his_self.field_battle_overlay.hide();
+
+      his_self.playerSelectSpaceWithFilter(
+
+                  "Choose Destination for Retreat:" ,
+
+        	  function(space2) {
+	            if (space.neighbours.includes(space2.key)) {
+		      if (loser === attacker) {
+	  		if (space2.key === attacker_comes_from_this_spacekey) {
+          		  return 1;
+	  		}
+		      } else {
+          		if (his_self.canFactionRetreatToSpace(loser, space2.key, "") && space2.key !== attacker_comes_from_this_spacekey) {
+          		  return 1;
+	  		}
+		      }
+		    }
+		  },
+
+      		  function(spacekey) {
+                    onFinishSelect(his_self, spacekey);
+		  },
+
+	    	  null, 
+
+	    	  true 
+
+      );
+
+/****
+
       let html = "<ul>";
-      for (let i = 0; i < space.neighbours.length; i++) {
-	if (loser === attacker) {
-	  if (space.neighbours[i] === attacker_comes_from_this_spacekey) {
-            html += `<li class="option" id="${space.neighbours[i]}">${his_self.game.spaces[space.neighbours[i]].key}</li>`;
-	  }
-	} else {
-          if (his_self.canFactionRetreatToSpace(loser, space.neighbours[i], "") && space.neighbours[i] !== attacker_comes_from_this_spacekey) {
-            html += `<li class="option" id="${space.neighbours[i]}">${his_self.game.spaces[space.neighbours[i]].key}</li>`;
-	  }
-	}
       }
       html += "</ul>";
 
@@ -2898,6 +2920,8 @@ return;
         onFinishSelect(his_self, id);
       });
 
+***/
+
     };