Revert "turmoil"

Author: NBKelly

resources/public/i18n/en.ftl

@@ -718,16 +718,6 @@ ingame-settings_sort-heap = Sort Heap
 
 ingame-settings_stack-cards = Stack cards
 
-lobby_turmoil = Turmoil
-
-lobby_turmoil-details = The fickle winds of fate shall decide your future.
-
-lobby_turmoil-theme = "FINUKA DISPOSES"
-
-lobby_turmoil-info = This lobby is running in turmoil mode. The winds of fate shall decide your path to the future.
-
-lobby_span-turmoil = (turmoil)
-
 lobby_aborted = Connection aborted
 
 lobby_api-access = Allow API access to game information

src/clj/game/core/actions.clj

@@ -628,7 +628,7 @@
   [state _ {:keys [card]}]
   (if-let [card (get-card state card)]
     (if (expendable? state card)
-      (swap! state assoc-in [:corp :install-list] (conj (installable-servers state card) "Cast as a Sorcery")) ;;april fools we can make this "cast as a sorcery"
+      (swap! state assoc-in [:corp :install-list] (conj (installable-servers state card) "Expend")) ;;april fools we can make this "cast as a sorcery"
       (swap! state assoc-in [:corp :install-list] (installable-servers state card)))
     (swap! state dissoc-in [:corp :install-list])))
 

src/clj/game/core/set_up.clj

@@ -78,7 +78,7 @@
 
 (defn- init-game-state
   "Initialises the game state"
-  [{:keys [players gameid timer spectatorhands api-access save-replay room turmoil] :as game}]
+  [{:keys [players gameid timer spectatorhands api-access save-replay room] :as game}]
   (let [corp (some #(when (corp? %) %) players)
         runner (some #(when (runner? %) %) players)
         corp-deck (create-deck (:deck corp))
@@ -106,7 +106,6 @@
         (inst/now)
         {:timer timer
          :spectatorhands spectatorhands
-         :turmoil turmoil
          :api-access api-access
          :save-replay save-replay}
         (new-corp (:user corp) corp-identity corp-options (map #(assoc % :zone [:deck]) corp-deck) corp-deck-id corp-quote)

src/clj/game/core/turmoil.clj

@@ -15,7 +15,6 @@
     [game.core.say :refer [system-msg]]
     [game.core.set-aside :refer [clean-set-aside!]]
     [game.core.toasts :refer [toast]]
-    [game.core.turmoil :as turmoil]
     [game.core.update :refer [update!]]
     [game.core.winning :refer [flatline]]
     [game.macros :refer [continue-ability req wait-for]]
@@ -74,10 +73,6 @@
     (swap! state assoc :click-states [])
     (swap! state assoc :turn-state (dissoc @state :log :history :turn-state))
 
-    ;; resolve turmoil (april fools)
-    (when (get-in @state [:options :turmoil])
-      (turmoil/shuffle-cards-for-side state side))
-
     (when (= side :corp)
       (swap! state update-in [:turn] inc))
 

src/clj/game/core/turns.clj

@@ -85,8 +85,7 @@
     user :user
     {:keys [gameid now
             allow-spectator api-access format mute-spectators password room save-replay
-            precon gateway-type side singleton spectatorhands timer title open-decklists
-            turmoil]
+            precon gateway-type side singleton spectatorhands timer title open-decklists]
      :or {gameid (random-uuid)
           now (inst/now)}} :options}]
   (let [player {:user user
@@ -110,7 +109,6 @@
      :mute-spectators mute-spectators
      :password (when (not-empty password) (bcrypt/encrypt password))
      :room room
-     :turmoil turmoil
      :save-replay save-replay
      :spectatorhands spectatorhands
      :singleton (when (some #{format} `("standard" "startup" "casual" "eternal")) singleton)
@@ -191,7 +189,6 @@
    :save-replay
    :singleton
    :spectators
-   :turmoil
    :corp-spectators
    :runner-spectators
    :spectatorhands

src/clj/web/lobby.clj

@@ -191,13 +191,12 @@
   (when (and open-decklists (not precon))
     [:span.open-decklists (str " " (tr [:lobby_open-decklists-b] "(open decklists)"))]))
 
-(defn game-format [{fmt :format singleton? :singleton turmoil? :turmoil precon :precon open-decklists :open-decklists}]
+(defn game-format [{fmt :format singleton? :singleton precon :precon open-decklists :open-decklists}]
   [:div {:class "game-format"}
    [:span.format-label (tr [:lobby_format "Format"]) ":  "]
    [:span.format-type (tr-format (slug->format fmt "Unknown"))]
    [precon-span precon]
    [:span.format-singleton (str (when singleton? (str " " (tr [:lobby_singleton-b "(singleton)"]))))]
-   [:span.turmoil (when turmoil? (str " " (tr [:lobby_span-turmoil "(turmoil)"])))]
    [open-decklists-span precon open-decklists]
    [precon-under-span precon]])
 

src/cljs/nr/game_row.cljs

@@ -444,7 +444,7 @@
                   ^{:key label}
                   [card-menu-item (label-fn label)
                    #(do (close-card-menu)
-                        (if (= "Cast as a Sorcery" label)
+                        (if (= "Expend" label)
                           (send-command "expend" {:card card :server label})
                           (send-command "play" {:card card :server label})))])
                 servers))]])))

src/cljs/nr/gameboard/board.cljs

@@ -18,7 +18,6 @@
    :save-replay
    :side
    :singleton
-   :turmoil
    :spectatorhands
    :precon
    :gateway-type
@@ -80,12 +79,6 @@
             :on-change #(swap! options assoc :singleton (.. % -target -checked))}]
    (tr [:lobby_singleton "Singleton"])])
 
-(defn turmoil-mode [options]
-  [:span [:label
-          [:input {:type "checkbox" :checked (:turmoil @options)
-                   :on-change #(swap! options assoc :turmoil (.. % -target -checked))}]
-          (tr [:lobby_turmoil "Turmoil"])]])
-
 (defn open-decklists [options]
   [:label
    [:input {:type "checkbox" :checked (:open-decklists @options)
@@ -131,13 +124,8 @@
         ^{:key k}
         [:option {:value k} (tr-format v)]))]
    [singleton-only options fmt-state]
-   [turmoil-mode options]
    [gateway-constructed-choice fmt-state gateway-type]
    [precon-choice fmt-state precon]
-   [:div.infobox.blue-shade
-    {:style {:display (if (:turmoil @options) "block" "none")}}
-    [:p (tr [:lobby_turmoil-details "The fickle winds of fate shall decide your future."])]
-    [:p (tr [:lobby_turmoil-theme "\"FINUKA DISPOSES\""])]]
    [:div.infobox.blue-shade
     {:style {:display (if (:singleton @options) "block" "none")}}
     [:p (tr [:lobby_singleton-details "This will restrict decklists to only those which do not contain any duplicate cards. It is recommended you use the listed singleton-based identities."])]
@@ -258,7 +246,6 @@
                                 :protected false
                                 :save-replay (not= "casual" (:room @lobby-state))
                                 :singleton false
-                                :turmoil false
                                 :spectatorhands false
                                 :open-decklists false
                                 :timed false

src/cljs/nr/new_game.cljs

@@ -99,11 +99,6 @@
     [:div.infobox.blue-shade
      [:p (tr [:lobby_singleton-restriction "This lobby is running in singleton mode. This means decklists will be restricted to only those which do not contain any duplicate cards."])]]))
 
-(defn turmoil-info-box [current-game]
-  (when (:turmoil-mode @current-game)
-    [:div.infobox.blue-shade
-     [:p (tr [:lobby_turmoil-info "This lobby is running in turmoil mode. The winds of fate shall decide your path to the future."])]]))
-
 (defn swap-sides-button [user gameid players]
   (when (first-user? @players @user)
     (if (< 1 (count @players))
@@ -210,7 +205,6 @@
       [:h2 (:title @current-game)]
       [precon-info-box current-game]
       [singleton-info-box current-game]
-      [turmoil-info-box current-game]
       (when-not (or (every? :deck @players)
                     (not (is-constructed? current-game)))
         [:div.flash-message