From b7daf93f2e2058768925694474fd36aebad5218a Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 29 May 2019 02:35:15 +0200
Subject: [PATCH] dual:: movement orbs are replaced with Speed

---
 game.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/game.cpp b/game.cpp
index 0343f13b..7e55ee51 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6967,7 +6967,7 @@ bool collectItem(cell *c2, bool telekinesis) {
     }
   else if(orbcharges(c2->item)) {
     eItem it = c2->item;
-    if(it == itOrbRecall) {
+    if(it == itOrbRecall && !dual::state) {
       cellwalker cw2 = cwt;
       cw2++;
       cw2.at = c2;
@@ -6981,6 +6981,10 @@ bool collectItem(cell *c2, bool telekinesis) {
     else playSound(c2, "pickup-orb");
     if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true;
     int oc = orbcharges(it);
+    if(dual::state && among(it, itOrbTeleport, itOrbFrog, itOrbPhasing, itOrbDash, itOrbRecall)) {
+      oc = 10;
+      it = itOrbSpeed;
+      }
     if(c2->land == laAsteroids) oc = 10;
     if(markOrb(itOrbIntensity)) oc = oc * 6 / 5;
     if(!items[it]) items[it]++;