fix: keep similar idkit values when changing gender

Author: Indio3

data/src/scripts/areas/area_falador/scripts/makeover_mage.rs2

@@ -46,14 +46,15 @@ if_openmain(makeover_mage);
 [if_button,makeover_mage:com_101] %option2 = 8;
 
 [if_button,makeover_mage:com_89]
-if (%option1 = 0 | %option2 = 0) {
-    mes("You must make a selection from both categories."); // guess based off thessalia
+if (%option1 = 0 & %option2 = 0) {
+    mes("You haven't changed anything."); // current OSRS
     return;
 }
 
+// https://youtu.be/sKxvSaYuAYU?si=gYlSZJQC4rp9dAY0&t=136
 if_close;
-setgender(calc(%option1 - 1));
-setskincolour(calc(%option2 - 1));
+if(%option1 > 0) setgender(calc(%option1 - 1));
+if(%option2 > 0) setskincolour(calc(%option2 - 1));
 
 buildappearance(worn);
 inv_del(inv, coins, 3000);

src/engine/entity/Player.ts

@@ -112,6 +112,24 @@ export default class Player extends PathingEntity {
         [4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574]
     ];
 
+    static readonly MALE_FEMALE_MAP = new Map<number, number>([
+        [0, 45], [1, 47], [2, 48], [3, 49], [4, 50], [5, 51], [6, 52], [7, 53], [8, 54], [9, 55],
+        [18, 56], [19, 56], [20, 56], [21, 56], [22, 56], [23, 56], [24, 56], [25, 56],
+        [26, 61], [27, 63], [28, 62], [29, 65], [30, 64], [31, 63], [32, 66],
+        [33, 67], [34, 68], [35, 69], 
+        [36, 70], [37, 71], [38, 72], [39, 76], [40, 75], [41, 78],
+        [42, 79], [43, 80], [44, 81]
+    ]);
+
+    static readonly FEMALE_MALE_MAP = new Map<number, number>([
+        [45, 0], [46, 0], [47, 1], [48, 2], [49, 3], [50, 4], [51, 5], [52, 6], [53, 7], [54, 8], [55, 9],
+        [56, 18], [57, 18], [58, 18], [59, 18], [60, 18], 
+        [61, 26], [62, 27], [63, 28], [64, 29], [65, 29], [66, 32],
+        [67, 33], [68, 34], [69, 35], 
+        [70, 36], [71, 37], [72, 38], [73, 36], [74, 36], [75, 40], [76, 39], [77, 36], [78, 41],
+        [79, 42], [80, 43], [81, 44]
+    ]);
+
     save() {
         const sav = Packet.alloc(1);
         sav.p2(0x2004); // magic

src/engine/script/handlers/PlayerOps.ts

@@ -993,14 +993,12 @@ const PlayerOps: CommandHandlers = {
 
     [ScriptOpcode.SETGENDER]: (state) => {
         const gender = check(state.popInt(), GenderValid);
-        // convert idkit
+        // convert idkit, have to use a mapping cause order + there's not always an equivalence
         for (let i = 0; i < 7; i++) {
-            state.activePlayer.body[i] = -1;
-            for (let j = 0; j < IdkType.count; j++) {
-                if (!IdkType.get(j).disable && IdkType.get(j).type == i + (gender === 0 ? 0 : 7)) {
-                    state.activePlayer.body[i] = j;
-                    break;
-                }
+            if(gender === 1) {
+                state.activePlayer.body[i] = Player.MALE_FEMALE_MAP.get(state.activePlayer.body[i]) ?? -1;
+            } else {
+                state.activePlayer.body[i] = Player.FEMALE_MALE_MAP.get(state.activePlayer.body[i]) ?? -1;
             }
         }
         state.activePlayer.gender = gender;