tournament: Implement new tournament winnings calculations

Should be closer to the original than the previous were.

Author: mrannanj

src/game/scenes/arena.c

@@ -25,6 +25,7 @@
 #include "game/objects/scrap.h"
 #include "game/protos/object.h"
 #include "game/scenes/arena.h"
+#include "game/scenes/mechlab/har_economy.h"
 #include "game/scenes/mechlab/lab_menu_customize.h"
 #include "game/utils/score.h"
 #include "game/utils/settings.h"
@@ -267,16 +268,6 @@ static void arena_end(scene *sc) {
 
     // if tournament player won
     if(is_tournament(gs) && local->winner == 0) {
-        // TODO The repair costs formula here is completely bogus
-        int trade_value = calculate_trade_value(player_winner->pilot) / 100;
-        float hp_percentage = (float)winner_har->health / (float)winner_har->health_max;
-        fight_stats->repair_cost = (1.0f - hp_percentage) * trade_value;
-
-        float winnings_multiplier = player_winner->chr->winnings_multiplier;
-        fight_stats->winnings =
-            winnings_multiplier * (calculate_winnings(player_winner->pilot, false) +
-                                   calculate_winnings(player_loser->pilot, true) + player_loser->pilot->winnings);
-
         // secret players have no rank, and don't increase your own ranking
         if(!gs->match_settings.sim && player_loser->pilot->rank > 0) {
             player_winner->pilot->rank--;
@@ -290,6 +281,14 @@ static void arena_end(scene *sc) {
                 }
             }
         }
+
+        // TODO: The repair costs formula here is completely bogus
+        int trade_value = calculate_trade_value(player_winner->pilot) / 100;
+        float hp_percentage = (float)winner_har->health / (float)winner_har->health_max;
+        fight_stats->repair_cost = (1.0f - hp_percentage) * trade_value;
+
+        fight_stats->winnings =
+            calculate_winnings(player_winner->pilot, player_loser->pilot, player_winner->chr->winnings_multiplier);
     }
     // if tournament player lost
     else if(is_tournament(gs) && local->winner == 1) {

src/game/scenes/mechlab/har_economy.c

@@ -1,5 +1,6 @@
 #include "game/scenes/mechlab/har_economy.h"
 #include "formats/pilot.h"
+#include "utils/c_array_util.h"
 #include "utils/log.h"
 #include "utils/random.h"
 
@@ -113,3 +114,68 @@ void upgrade_har(sd_pilot *pilot, enum HAR_UPGRADE upgrade) {
             abort();
     }
 }
+
+static void update_total_value(sd_pilot *pilot) {
+    int value = har_prices[pilot->har_id];
+    for(int i = 1; i < pilot->arm_power; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * arm_leg_multiplier;
+    }
+
+    for(int i = 1; i < pilot->arm_speed; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * arm_leg_multiplier;
+    }
+
+    for(int i = 1; i < pilot->leg_power; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * arm_leg_multiplier;
+    }
+
+    for(int i = 1; i < pilot->leg_speed; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * arm_leg_multiplier;
+    }
+
+    for(int i = 1; i < pilot->armor; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * armor_multiplier;
+    }
+
+    for(int i = 1; i < pilot->stun_resistance; i++) {
+        value += har_upgrade_price[pilot->har_id] * upgrade_level_multiplier[i] * stun_res_multiplier;
+    }
+
+    pilot->total_value = (value * 70) / 100;
+}
+
+static int rank_additions[] = {
+    500, 200, 160, 120, 100, 90, 80, 70, 60, 55, 50, 45, 40, 35, 30, 25, 20,
+    17,  15,  14,  13,  12,  11, 11, 10, 9,  8,  8,  7,  7,  6,  6,  5,  0,
+};
+
+static float rank_scale(unsigned rank) {
+    assert(rank >= 1);
+    rank -= 1;
+    float a = rank * 0.1 + 1.0;
+    float b = rank * 0.2 + 1.0;
+    return b * a * a;
+}
+
+static float rank_bonus(unsigned rank) {
+    assert(rank >= 1);
+    rank -= 1;
+    if(rank < N_ELEMENTS(rank_additions)) {
+        return rank_additions[rank];
+    }
+    return 5.0;
+}
+
+float calculate_winnings(sd_pilot *winner, sd_pilot *loser, float winnings_multiplier) {
+    update_total_value(winner);
+    update_total_value(loser);
+
+    int adjusted_value = winner->total_value - (har_prices[0] * 85) / 100 - 500;
+    float loser_value = (loser->total_value + loser->money) / 45.0 + (int)loser->winnings;
+    float winnings = loser_value + (adjusted_value / rank_scale(winner->rank) / 30.0);
+
+    winnings += winner->trn_rank_money * rank_bonus(winner->rank);
+    winnings *= 0.7f;
+    winnings *= winnings_multiplier;
+    return winnings;
+}

src/game/scenes/mechlab/har_economy.h

@@ -29,6 +29,7 @@ static const int32_t arm_leg_multiplier = 2;
 static const int32_t stun_res_multiplier = 3;
 static const int32_t armor_multiplier = 5;
 
+float calculate_winnings(sd_pilot *winner, sd_pilot *loser, float winnings_multiplier);
 bool har_can_upgrade(sd_pilot *pilot, enum HAR_UPGRADE upgrade);
 void purchase_random_har(sd_pilot *pilot);
 void purchase_random_har_upgrades(sd_pilot *pilot);

src/game/scenes/mechlab/lab_menu_customize.c

@@ -54,36 +54,6 @@ int calculate_trade_value(sd_pilot *pilot) {
     return trade_value * 0.85;
 }
 
-static const int32_t arm_leg_value[10] = {0, 9, 34, 94, 197, 351, 606, 1034, 1675, 2700};
-static const int32_t armor_value[10] = {0, 22, 86, 235, 492, 876, 1516, 2584, 4186, 6748};
-static const int32_t stun_value[10] = {0, 13, 51, 141, 294, 526, 910, 1551, 2511, 4463};
-
-int calculate_winnings(sd_pilot *pilot, bool add_har_base) {
-    int winnings = 0;
-    if(add_har_base) {
-        winnings = (har_prices[pilot->har_id] + 29000) / 89;
-    }
-    for(int i = 1; i <= pilot->arm_power; i++) {
-        winnings += arm_leg_value[i];
-    }
-    for(int i = 1; i <= pilot->arm_speed; i++) {
-        winnings += arm_leg_value[i];
-    }
-    for(int i = 1; i <= pilot->leg_power; i++) {
-        winnings += arm_leg_value[i];
-    }
-    for(int i = 1; i <= pilot->leg_speed; i++) {
-        winnings += arm_leg_value[i];
-    }
-    for(int i = 1; i <= pilot->armor; i++) {
-        winnings += armor_value[i];
-    }
-    for(int i = 1; i <= pilot->stun_resistance; i++) {
-        winnings += stun_value[i];
-    }
-    return winnings;
-}
-
 int har_price(int har_id) {
     return har_prices[har_id];
 }

src/game/scenes/mechlab/lab_menu_customize.h

@@ -6,7 +6,6 @@
 
 component *lab_menu_customize_create(scene *s);
 int calculate_trade_value(sd_pilot *pilot);
-int calculate_winnings(sd_pilot *pilot, bool add_har_base);
 int sell_highest_value_upgrade(sd_pilot *pilot, char *sold);
 int har_price(int har_id);