Merge pull request freeciv#409 from kvilhaugsvik/bugfix

Be more careful about interpreting arrow keys while transported as disembark.
kmodexc · Jul 8, 2021 · ff71233 · ff71233
2 parents 74d9a1b + 53749ad
commit ff71233
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 17 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/control.js b/freeciv-web/src/main/webapp/javascript/control.js
@@ -3154,21 +3154,6 @@ function key_unit_move(dir)
       return;
     }
 
-    if (punit['transported']) {
-      if (unit_can_do_action(punit, ACTION_TRANSPORT_DISEMBARK1)) {
-        request_new_unit_activity(punit, ACTIVITY_IDLE, EXTRA_NONE);
-        request_unit_do_action(ACTION_TRANSPORT_DISEMBARK1, punit['id'],
-                               newtile['index']);
-        unit_move_sound_play(punit);
-      } else if (unit_can_do_action(punit, ACTION_TRANSPORT_DISEMBARK2)) {
-        request_new_unit_activity(punit, ACTIVITY_IDLE, EXTRA_NONE);
-        request_unit_do_action(ACTION_TRANSPORT_DISEMBARK2, punit['id'],
-                               newtile['index']);
-        unit_move_sound_play(punit);
-      }
-      return;
-    }
-
     /* Send the order to move using the orders system. */
     var order = {
       "order"      : ORDER_ACTION_MOVE,
@@ -3179,6 +3164,20 @@ function key_unit_move(dir)
       "action"     : ACTION_COUNT
     };
 
+    if (punit['transported']
+        /* No non domestic units */
+        && newtile['units'].every(function(ounit) {
+             return ounit['owner'] == client.conn.playing.playerno;
+           })
+        /* No non domestic cities */
+        && (tile_city(newtile) == null
+            || tile_city(newtile)['owner'] == client.conn.playing.playerno)
+        && !tile_has_extra(newtile, EXTRA_HUT)
+        && (newtile['extras_owner'] == client.conn.playing.playerno
+            || !tile_has_territory_claiming_extra(newtile))) {
+      order["order"] = ORDER_MOVE;
+    }
+
     var packet = {
       "pid"      : packet_unit_orders,
       "unit_id"  : punit['id'],

diff --git a/freeciv-web/src/main/webapp/javascript/extra.js b/freeciv-web/src/main/webapp/javascript/extra.js
@@ -63,3 +63,11 @@ function is_extra_removed_by(pextra, rmcause)
 {
   return pextra.rmcauses.isSet(rmcause);
 }
+
+/************************************************************************//**
+  Does this extra type claim territory?
+****************************************************************************/
+function territory_claiming_extra(pextra)
+{
+  return pextra['base'] && pextra['base']['border_sq'] > -1;
+}
diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js
@@ -1507,14 +1507,46 @@ function handle_ruleset_extra_flag(packet)
   /* TODO: implement */
 }
 
+/************************************************************************//**
+  Handle a packet about a particular base type.
+****************************************************************************/
 function handle_ruleset_base(packet)
 {
-  /* TODO: Implement */
+  var i;
+
+  for (i = 0; i < MAX_EXTRA_TYPES; i++) {
+    if (is_extra_caused_by(extras[i], EC_BASE)
+        && extras[i]['base'] == null) {
+      /* This is the first base without base data */
+      extras[i]['base'] = packet;
+      extras[extras[i]['name']]['base'] = packet;
+      return;
+    }
+  }
+
+  console.log("Didn't find Extra to put Base on");
+  console.log(packet);
 }
 
+/************************************************************************//**
+  Handle a packet about a particular road type.
+****************************************************************************/
 function handle_ruleset_road(packet)
 {
-  /* TODO: Implement */
+  var i;
+
+  for (i = 0; i < MAX_EXTRA_TYPES; i++) {
+    if (is_extra_caused_by(extras[i], EC_ROAD)
+        && extras[i]['road'] == null) {
+      /* This is the first road without road data */
+      extras[i]['road'] = packet;
+      extras[extras[i]['name']]['road'] = packet;
+      return;
+    }
+  }
+
+  console.log("Didn't find Extra to put Road on");
+  console.log(packet);
 }
 
 /************************************************************************//**

diff --git a/freeciv-web/src/main/webapp/javascript/tile.js b/freeciv-web/src/main/webapp/javascript/tile.js
@@ -65,6 +65,23 @@ function tile_resource(tile)
   return null;
 }
 
+/************************************************************************//**
+  Check if tile contains an extra type that claim territory
+****************************************************************************/
+function tile_has_territory_claiming_extra(ptile)
+{
+  var extra;
+
+  for (extra = 0; extra < MAX_EXTRA_TYPES; extra++) {
+    if (tile_has_extra(ptile, extra)
+        && territory_claiming_extra(extra_by_number(extra))) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 function tile_owner(tile)
 {
   return tile['owner'];