Changeset 488 for binary-improvements/MapRendering

Timestamp:

Jun 21, 2024, 2:58:18 PM (6 months ago)

Author:

alloc

Message:

27_32_48

• V1.0 compatibility

Location:

binary-improvements/MapRendering

Files:

• API/GetPlayerInventory.cs (modified) (2 diffs)
• ModInfo.xml (modified) (1 diff)
• WebAndMapRendering.csproj (modified) (1 diff)
• WebTokens_Legacy.cs (modified) (1 diff)

binary-improvements/MapRendering/API/GetPlayerInventory.cs

@@ -94 +94 @@
                         _writer.WriteBeginObject ();
                         
-                        AddEquipment (ref _writer, "head", _equ, EquipmentSlots.Headgear, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "eyes", _equ, EquipmentSlots.Eyewear, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "face", _equ, EquipmentSlots.Face, _showIconColor, _showIconName);
+                        AddEquipment (ref _writer, "head", _equ, EquipmentSlots.Head, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
 
-                        AddEquipment (ref _writer, "armor", _equ, EquipmentSlots.ChestArmor, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "jacket", _equ, EquipmentSlots.Jacket, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "shirt", _equ, EquipmentSlots.Shirt, _showIconColor, _showIconName);
+                        AddEquipment (ref _writer, "armor", _equ, EquipmentSlots.Chest, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
 
-                        AddEquipment (ref _writer, "legarmor", _equ, EquipmentSlots.LegArmor, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "pants", _equ, EquipmentSlots.Legs, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
                         AddEquipment (ref _writer, "boots", _equ, EquipmentSlots.Feet, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
@@ -123 +111 @@
                         _writer.WritePropertyName (_slotname);
 
-                        int[] slotindices = XUiM_PlayerEquipment.GetSlotIndicesByEquipmentSlot (_slot);
+                        int slotindex = (int)_slot;
 
-                        for (int i = 0; i < slotindices.Length; i++) {
-                                if (_items? [slotindices [i]] != null) {
-                                        InvItem item = _items [slotindices [i]];
-                                        
-                                        GetJsonForItem (ref _writer, item, _showIconColor, _showIconName);
-                                        return;
-                                }
+                        if (_items == null || _items[slotindex] == null) {
+                                // Slot not found / empty
+                                _writer.WriteNull ();
+                                return;
                         }
-
-                        // Slot not found / empty
-                        _writer.WriteNull ();
+                        
+                        InvItem item = _items [slotindex];
+                        GetJsonForItem (ref _writer, item, _showIconColor, _showIconName);
                 }
 

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="Christian 'Alloc' Illy" />
-        <Version value="47" />
+        <Version value="48" />
         <Website value="https://7dtd.illy.bz" />
 </xml>

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -48 +48 @@
     <Reference Include="LogLibrary">
       <HintPath>..\7dtd-binaries\LogLibrary.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MapRendering, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\7dtd-binaries\MapRendering.dll</HintPath>
       <Private>False</Private>
     </Reference>

binary-improvements/MapRendering/WebTokens_Legacy.cs

@@ -5 +5 @@
                 private const string notUsedMessage = "NOT USED - WebTokens are managed through vanilla 7DTD now. Please use the 'webtokens' command instead.";
                 
-                protected override string[] getCommands () {
+                public override string[] getCommands () {
                         return new[] {"webtokens_legacy"};
                 }
 
-                protected override string getDescription () {
+                public override string getDescription () {
                         return notUsedMessage;
                 }
 
-                protected override string getHelp () {
+                public override string getHelp () {
                         return notUsedMessage;
                 }